From d1dc10cd3b5427966c7899fefc440b56f984fd0d Mon Sep 17 00:00:00 2001 From: Bryan Stine Date: Fri, 27 Mar 2009 22:24:25 +0000 Subject: Fix linux-mod usage regression, remove nv flag/nouveau module, add ewarn for missing intel. Fixes bug #263259. Package-Manager: portage-2.2_rc25/cvs/Linux x86_64 --- x11-base/x11-drm/ChangeLog | 9 ++++++++- x11-base/x11-drm/Manifest | 4 ++-- x11-base/x11-drm/x11-drm-20090320.ebuild | 18 ++++++++---------- 3 files changed, 18 insertions(+), 13 deletions(-) (limited to 'x11-base/x11-drm') diff --git a/x11-base/x11-drm/ChangeLog b/x11-base/x11-drm/ChangeLog index c4a719caf226..dba02a915a4b 100644 --- a/x11-base/x11-drm/ChangeLog +++ b/x11-base/x11-drm/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-base/x11-drm # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.70 2009/03/21 00:23:02 battousai Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.71 2009/03/27 22:24:25 battousai Exp $ + + 27 Mar 2009; Bryan Stine x11-drm-20090320.ebuild: + Removed nouveau.ko and nv VIDEO_CARDS flag. There are no supporting + packages in the portage tree for those yet. Fixed linux-mod config check + usage regression, bug #263259 (thanks kouyu). Added ewarn for the + disappearance of the intel driver, which happened upstream. It's in the + kernel now (thanks Andres Sandoval, comment in above bug). *x11-drm-20090320 (20 Mar 2009) diff --git a/x11-base/x11-drm/Manifest b/x11-base/x11-drm/Manifest index 199e725c6eda..703bd886a0bb 100644 --- a/x11-base/x11-drm/Manifest +++ b/x11-base/x11-drm/Manifest @@ -9,6 +9,6 @@ DIST x11-drm-20090320-gentoo-0.1.tar.bz2 2315 RMD160 af69ee43ed7fac23b81cdef3bbb EBUILD x11-drm-20070314.ebuild 8331 RMD160 b6c6b7d93f2e1d984b6e4a5eaccfcb364aec1486 SHA1 83d87ce1b90bd4a09354033270f64949bc57a439 SHA256 352222e6c1b975aa597035b7ba23a2eae8255ff1062efdf878d998078206dd25 EBUILD x11-drm-20071019.ebuild 8315 RMD160 7f029741d57e04d90d32974d2dfb27e32c8d791f SHA1 d745f4f4d61de8378fe5d3cae73c8904fc88c241 SHA256 741518f60968843d8eb9f79967b4e225fb29ee5a2f0e0015c35c817717431965 EBUILD x11-drm-20080710.ebuild 8323 RMD160 31f974ad00097ec60f0fc113d19ac7dcba8a4b54 SHA1 9cf8478d5c2199915ec49cb2cf6adf4b68859916 SHA256 b4ca6246c10bbcbb42744eabdb4a26f4364a1bf6b3e127557f88cbdeaf1df01e -EBUILD x11-drm-20090320.ebuild 7333 RMD160 a29080a349fd05e619f97ab78028a65328b5f288 SHA1 3512252a58ff4da9c55fb69f8a4455d444345aa3 SHA256 1d68e6a57112efe596e440101487e1f9ffdfbe5a80511d9861e20cb53fb10615 -MISC ChangeLog 27694 RMD160 e70a13292c8368ffb4acc7909c1d896f284b5054 SHA1 e8a9b0c01de4035c30cbc8da925d9454f91fb75c SHA256 b3a806ed4e69ad78e1f581cca034b7c192904f7d8888a9c64c349f651ea1ee2a +EBUILD x11-drm-20090320.ebuild 7364 RMD160 514091d89f03f6513ed7b642a038592277e206b6 SHA1 368516831fdc4f761b57b8441ada4b4bdaa63fa1 SHA256 e7a20e6863f00e66e957673550996dbf64e196329e50c445e99484c6669c7608 +MISC ChangeLog 28118 RMD160 27a899d26a42f7d1f4fd4bf52ddba171f0727ecf SHA1 1b3969b60c1e69026331797c59047348caea9c86 SHA256 eae42339d3a8b97a4d959ee81f76bd847c36aa05f68203c6f951de0cd179bcc2 MISC metadata.xml 368 RMD160 cbe279aeafeae0af3633fbd1ecaa59d2f54579b8 SHA1 5104adf2f1ebe1ddffe4ca95e7b5e5f06267f842 SHA256 e73a5c428f39881de8ae5acf40958e8ad37a5fe92c2bb8cc4060704c9be45ef1 diff --git a/x11-base/x11-drm/x11-drm-20090320.ebuild b/x11-base/x11-drm/x11-drm-20090320.ebuild index f7d61dd5e46d..a33e98e57af8 100644 --- a/x11-base/x11-drm/x11-drm-20090320.ebuild +++ b/x11-base/x11-drm/x11-drm-20090320.ebuild @@ -1,13 +1,12 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20090320.ebuild,v 1.1 2009/03/21 00:23:02 battousai Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20090320.ebuild,v 1.2 2009/03/27 22:24:25 battousai Exp $ inherit eutils x11 linux-mod autotools IUSE_VIDEO_CARDS=" video_cards_mach64 video_cards_mga - video_cards_nv video_cards_r128 video_cards_radeon video_cards_radeonhd @@ -46,6 +45,9 @@ DEPEND="kernel_linux? ( virtual/linux-sources ) RDEPEND="" pkg_setup() { + ewarn "The intel DRM module has been removed from x11-drm. Please use the in-kernel" + ewarn "DRM module. This package is no longer useful for intel video cards." + # Setup the kernel's stuff. kernel_setup @@ -131,8 +133,6 @@ kernel_setup() { K_RV=${CHOST/*-freebsd/} elif use kernel_linux then - linux-mod_pkg_setup - if kernel_is 2 4 then eerror "Upstream support for 2.4 kernels has been removed, so this package will no" @@ -140,11 +140,11 @@ kernel_setup() { die "Please use in-kernel DRM or switch to a 2.6 kernel." fi - linux_chkconfig_builtin "DRM" && \ - die "Please disable or modularize DRM in the kernel config. (CONFIG_DRM = n or m)" - - CONFIG_CHECK="AGP" + CONFIG_CHECK="!DRM AGP" + ERROR_DRM="Please disable DRM in the kernel config. (CONFIG_DRM = n)" ERROR_AGP="AGP support is not enabled in your kernel config (CONFIG_AGP)" + + linux-mod_pkg_setup fi } @@ -156,8 +156,6 @@ set_vidcards() { VIDCARDS="${VIDCARDS} mach64.${KV_OBJ}" use video_cards_mga && \ VIDCARDS="${VIDCARDS} mga.${KV_OBJ}" - use video_cards_nv && \ - VIDCARDS="${VIDCARDS} nouveau.${KV_OBJ}" use video_cards_r128 && \ VIDCARDS="${VIDCARDS} r128.${KV_OBJ}" use video_cards_radeon || use video_cards_radeonhd && \ -- cgit v1.2.3-65-gdbad