20060608(-r1) patchball 0.4. Remove modules.d for all ebuilds. Fixes: #165553, #204985, #214035, #218419.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc6 x86_64

8 files changed, 84 insertions, 66 deletions

diff --git a/x11-base/x11-drm/ChangeLog b/x11-base/x11-drm/ChangeLog
index 271ecb0e02bd..d5ce7183b619 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.60 2008/09/12 21:30:21 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.61 2008/09/13 01:12:14 battousai Exp $
+
+  13 Sep 2008; Bryan D. Stine <battousai@gentoo.org>
+  -files/modules.d-x11-drm, x11-drm-20060608.ebuild,
+  x11-drm-20060608-r1.ebuild, x11-drm-20070314.ebuild,
+  x11-drm-20071019.ebuild, x11-drm-20080710.ebuild:
+  Bump 20060608 and -r1 to 0.4 patchball, fixing bugs #165553, #218419. Pull
+  modules.d file from all ebuilds, fixing bug #214035.
 
   12 Sep 2008; Bryan D. Stine <battousai@gentoo.org>
   x11-drm-20070314.ebuild, x11-drm-20080710.ebuild:
diff --git a/x11-base/x11-drm/Manifest b/x11-base/x11-drm/Manifest
index 8d32eccab5b2..2bd7db80155f 100644
--- a/x11-base/x11-drm/Manifest
+++ b/x11-base/x11-drm/Manifest
@@ -1,16 +1,15 @@
-AUX modules.d-x11-drm 40 RMD160 7bdcba81be1a55311e31ec4ef88dc9c1b7ec85c8 SHA1 1e3f21939861925967dfba152e2309fb3fa65f26 SHA256 97fb08b2c529d65b415dec23dc7130721be9850129100e4b7063baa1060641e2
 DIST linux-drm-20060608-kernelsource.tar.bz2 568004 RMD160 253608313539a651ad6724bcb67b5f4ab28eaf4f SHA1 466c1410c05f715286cf44437c1946cdaacf2cde SHA256 5f2346f3eba114c4d5655325f3fd51e0b74f6f627bf0c4e435103c8972f52731
 DIST linux-drm-20070314-kernelsource.tar.bz2 424009 RMD160 649e007221b1a92e6604695f9467e065bc90e6b8 SHA1 b8d8c12affaa85d8e9eb025bc3a5516afaf53719 SHA256 ff9b834426fdbcee24991c42acef823c8beab6c15baec0c39e66a5acb790fd69
 DIST linux-drm-20071019-kernelsource.tar.bz2 487002 RMD160 501cba11044cda6cd88e6183ec68b2669ea1d558 SHA1 4afbac5b18be2671e3d422e5996f8fcf5516c072 SHA256 28c8fb25351cc05733c5aed5128e034009d2094681f9b4df6387c0c29a2803a9
 DIST linux-drm-20080710-kernelsource.tar.bz2 566434 RMD160 6c84c435da347c30fbffdbaa1daed580ac9b160d SHA1 66c0375ece91cd557fb1309eccaee7ef195f0b91 SHA256 65f0378c35b6cbf83c463f203f544ff0643690f17d6e537646eab52f3ec03f58
-DIST x11-drm-20060608-gentoo-0.3.tar.bz2 3684 RMD160 ce8b7816048143bf7bf79f755a0380dadb47e1b4 SHA1 33e8bf92569dcf8a61661f9d324211b2746b1c02 SHA256 e39fc9e7dbffdb125afd2d94e5d329ab7d723ad883a23cbd3fa02122622a26dd
+DIST x11-drm-20060608-gentoo-0.4.tar.bz2 5130 RMD160 aaa6632d238a258e4c28dc8ea10e4676024192bd SHA1 c982a51b596ff1ec1d6253ca32b08fb00081089b SHA256 9a942821a4706bc14fc312c5e0c7f81415a5aa4700187b18f8970e06f7317fde
 DIST x11-drm-20070314-gentoo-0.5.tar.bz2 2791 RMD160 62fd3e23bf8b32465d552084fb4107eb6b78b047 SHA1 abf9645c6f45886a9750ed30bfebc99eeb501388 SHA256 9abf4f5228c7428fbb728aa53b98b43bf2940febd7ca91cf74aad8231b724279
 DIST x11-drm-20071019-gentoo-0.2.tar.bz2 1680 RMD160 8f2c615500cfeeb4ae71147207d62a1b2de6a76b SHA1 97b1b27daff91e8c7849f831024494c6d73a4482 SHA256 da2c20faa9c9d8dd9583737d8526052c0cefce8bfe97d80a2d43ba245ddfabb3
 DIST x11-drm-20080710-gentoo-0.3.tar.bz2 5160 RMD160 3bff0f1dadd806ab9ec2039d6eb49fce9ec8b0da SHA1 7d74451411ccea7b72088bb0ef5e87fa4d454ca5 SHA256 2743b9dd8d9b94a8abccbfab9278d34ffd068e59c8fde9a46f955b1598e53152
-EBUILD x11-drm-20060608-r1.ebuild 8281 RMD160 fa7894bfcb294d3e549ce959c4c50a4ea4bec0e0 SHA1 94c43dcb0d8daf5d327c3a3a2630daddecab0f88 SHA256 d51be111dfc27161d2b96256816c546f527eb90c5bce44b8ebe0c4f64c707f58
-EBUILD x11-drm-20060608.ebuild 6170 RMD160 38b75375805fe021b262d32e2a58f715185346d2 SHA1 2f7f5a521361fea5cf7f45e0f7428675ff260aea SHA256 56c5badbb9fc41b82fb36886ea9da14c40c475509cf607e9eda6dd5ad060c0f7
-EBUILD x11-drm-20070314.ebuild 8073 RMD160 05bb328399837439eeb463b3490868c55586dc2a SHA1 01ea74a8921941f59dc74a0ad40e37d6a98362e7 SHA256 b812763cc47f41f2d4661ac35913c09cb115135a8349043c22430ca37cb8e956
-EBUILD x11-drm-20071019.ebuild 8053 RMD160 d92e9b127aa857942da6f92c63a22d1107cf0cc0 SHA1 ebdffea34f43d3b7297f7a2f44965c48cc0345e9 SHA256 5ba21236646e0ffe14e721ef7f90ede73b48d811f50fb31a27aeb45ebb641e7e
-EBUILD x11-drm-20080710.ebuild 8324 RMD160 1080889f23f6c8f3370ac4fda0c56c8d0cb64c73 SHA1 bfc32b12ddec4449e0d6b4ff60d877b5ab458f17 SHA256 3e7bc9eb7ebe014366741b36231f406a31a4ceda2d622149fc738f86ace60dbf
-MISC ChangeLog 25355 RMD160 87090bdf8498a5c0186577d41782504a12731a1d SHA1 3e76eb203aca4ae3176e8bf618ebaee363da7da4 SHA256 417b2e8884607a332c039313baedb7e692fbdfca85b96331faaf1ebc23658d62
+EBUILD x11-drm-20060608-r1.ebuild 8779 RMD160 992847066f10ced635c74edf3618dfd5eab9c657 SHA1 5241b709bbbf5c605a45a909be5d965a0d2f0897 SHA256 3d136053364f9a1b0d86019cc60b4c343570638a9b5f67ced7f5f86a24cc2d5d
+EBUILD x11-drm-20060608.ebuild 6658 RMD160 15833e3a262c96334e06bc83add4c986b99ecf6c SHA1 70f59943e38c735d25ecf2e29a44dd1d7f3d0de4 SHA256 295a8b05843403f5104a53217c5b80f63ad078a2db97c2fdbb9304abb12fa668
+EBUILD x11-drm-20070314.ebuild 8330 RMD160 6a8da1f743e426e6d62ff0164ae077ae75129809 SHA1 cd16a0096306b4c2890f2c8667ef920dc19a2d0e SHA256 5fefd758f5927a6486f56c284810ffc77376f177d227f39288de8793bad4610e
+EBUILD x11-drm-20071019.ebuild 8310 RMD160 7b9753be991f3d3a8d12ab4ab5f2f5d1da9f88c7 SHA1 4b0d49ac7317e13ea78a98194eebd18288bd9523 SHA256 57e2658344847a6b92ddd6280423d6c9adcc554ea3510b1986f53cc93731f9fa
+EBUILD x11-drm-20080710.ebuild 8266 RMD160 a76c3199c8eee0c0a35736683971486b8f8afcff SHA1 aeef85cc14b094e6f654846654a3c4bc03ecf360 SHA256 f76dceb37ffa9aa6f67217325e08e2c66b7b652a00704ddf3abc3c53aa74b387
+MISC ChangeLog 25701 RMD160 948c57fc9d4648a500d36edcd22055955e82d2d5 SHA1 3c26f8fe2d2f15905432ce3f8ea74686d065a39e SHA256 81ae36f2772b1db9ae9860e1fda55fb75678d07d455c88d8f7c49c9f813a7c5a
 MISC metadata.xml 368 RMD160 cbe279aeafeae0af3633fbd1ecaa59d2f54579b8 SHA1 5104adf2f1ebe1ddffe4ca95e7b5e5f06267f842 SHA256 e73a5c428f39881de8ae5acf40958e8ad37a5fe92c2bb8cc4060704c9be45ef1
diff --git a/x11-base/x11-drm/files/modules.d-x11-drm b/x11-base/x11-drm/files/modules.d-x11-drm
deleted file mode 100644
index aa6e850dded4..000000000000
--- a/x11-base/x11-drm/files/modules.d-x11-drm
+++ /dev/null
@@ -1,3 +0,0 @@
-keep
-path[%PN%]=/lib/modules/%KV%/%PN%
-
diff --git a/x11-base/x11-drm/x11-drm-20060608-r1.ebuild b/x11-base/x11-drm/x11-drm-20060608-r1.ebuild
index 2cb33d96683e..58e8dd92bc44 100644
--- a/x11-base/x11-drm/x11-drm-20060608-r1.ebuild
+++ b/x11-base/x11-drm/x11-drm-20060608-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20060608-r1.ebuild,v 1.8 2008/07/11 02:51:08 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20060608-r1.ebuild,v 1.9 2008/09/13 01:12:14 battousai Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.7"
@@ -26,7 +26,7 @@ IUSE="${IUSE_VIDEO_CARDS} kernel_FreeBSD kernel_linux"
 RESTRICT="strip"
 
 S="${WORKDIR}/drm"
-PATCHVER="0.3"
+PATCHVER="0.4"
 PATCHDIR="${WORKDIR}/patch"
 EXCLUDED="${WORKDIR}/excluded"
 
@@ -129,20 +129,22 @@ kernel_setup() {
 		K_RV=${CHOST/*-freebsd/}
 	elif use kernel_linux
 	then
-		linux-mod_pkg_setup
-
 		if kernel_is 2 6
 		then
-			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 the Direct Rendering Manager in the kernel config. (CONFIG_DRM)"
 			ERROR_AGP="AGP support is not enabled in your kernel config (CONFIG_AGP)"
+
+			kernel_is ge 2 6 25 && \
+				CONFIG_CHECK="${CONFIG_CHECK} ~UNUSED_SYMBOLS" \
+				ERROR_UNUSED_SYMBOLS="Please enable unused/obsolete exported symbols in your kernel config (CONFIG_UNUSED_SYMBOLS). These modules will not load otherwise."
 		elif kernel_is 2 4
 		then
 			CONFIG_CHECK="DRM"
 			ERROR_DRM="Please enable DRM support in your kernel configuration. (CONFIG_DRM = y or m)."
 		fi
+
+		linux-mod_pkg_setup
 	fi
 }
 
@@ -315,11 +317,6 @@ src_install_linux() {
 
 	# Strip binaries, leaving /lib/modules untouched (bug #24415)
 	strip_bins \/lib\/modules
-
-	# Yoinked from the sys-apps/touchpad ebuild. Thanks to whoever made this.
-	keepdir /etc/modules.d
-	sed 's:%PN%:'${PN}':g' "${FILESDIR}"/modules.d-${PN} > "${D}"/etc/modules.d/${PN}
-	sed -i 's:%KV%:'${KV_FULL}':g' "${D}"/etc/modules.d/${PN}
 }
 
 src_install_freebsd() {
@@ -338,5 +335,14 @@ pkg_postinst_os() {
 	if use kernel_linux
 	then
 		linux-mod_pkg_postinst
+
+		elog "Having in-kernel DRM modules installed can prevent x11-drm modules from being"
+		elog "loaded. It can also lead to unknown symbols in x11-drm modules, which would"
+		elog "be seen during the installation. If you experience any of those problems,"
+		elog "please ensure that the in-kernel DRM modules are not installed."
+		elog "This can be done with the following:"
+		elog "    cd ${KERNEL_DIR}"
+		elog "    make modules modules_install"
+		elog "This should allow the x11-drm modules to load and function normally."
 	fi
 }
diff --git a/x11-base/x11-drm/x11-drm-20060608.ebuild b/x11-base/x11-drm/x11-drm-20060608.ebuild
index 315609b07087..a911b697bdbd 100644
--- a/x11-base/x11-drm/x11-drm-20060608.ebuild
+++ b/x11-base/x11-drm/x11-drm-20060608.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20060608.ebuild,v 1.13 2007/10/09 07:36:00 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20060608.ebuild,v 1.14 2008/09/13 01:12:14 battousai Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.7"
@@ -26,7 +26,7 @@ IUSE="${IUSE_VIDEO_CARDS}"
 RESTRICT="strip"
 
 S="${WORKDIR}/drm"
-PATCHVER="0.3"
+PATCHVER="0.4"
 PATCHDIR="${WORKDIR}/patch"
 EXCLUDED="${WORKDIR}/excluded"
 
@@ -43,19 +43,21 @@ DEPEND="virtual/linux-sources"
 RDEPEND=""
 
 pkg_setup() {
-	linux-mod_pkg_setup
-
 	if kernel_is 2 6 ; then
-		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 the Direct Rendering Manager in the kernel config. (CONFIG_DRM)"
 		ERROR_AGP="AGP support is not enabled in your kernel config (CONFIG_AGP)"
 
+		kernel_is ge 2 6 25 && \
+			CONFIG_CHECK="${CONFIG_CHECK} ~UNUSED_SYMBOLS" \
+			ERROR_UNUSED_SYMBOLS="Please enable unused/obsolete exported symbols in your kernel config (CONFIG_UNUSED_SYMBOLS). These modules will not load otherwise."
 	elif kernel_is 2 4 ; then
 		CONFIG_CHECK="DRM"
 		ERROR_DRM="Please enable DRM support in your kernel configuration. (CONFIG_DRM = y or m)."
 	fi
 
+	linux-mod_pkg_setup
+
 	# Set video cards to build for.
 	set_vidcards
 
@@ -137,11 +139,6 @@ src_install() {
 
 	# Strip binaries, leaving /lib/modules untouched (bug #24415)
 	strip_bins \/lib\/modules
-
-	# Yoinked from the sys-apps/touchpad ebuild. Thanks to whoever made this.
-	keepdir /etc/modules.d
-	sed 's:%PN%:'${PN}':g' "${FILESDIR}"/modules.d-${PN} > "${D}"/etc/modules.d/${PN}
-	sed -i 's:%KV%:'${KV_FULL}':g' "${D}"/etc/modules.d/${PN}
 }
 
 pkg_postinst() {
@@ -160,6 +157,15 @@ pkg_postinst() {
 	fi
 
 	linux-mod_pkg_postinst
+
+	elog "Having in-kernel DRM modules installed can prevent x11-drm modules from being"
+	elog "loaded. It can also lead to unknown symbols in x11-drm modules, which would"
+	elog "be seen during the installation. If you experience any of those problems,"
+	elog "please ensure that the in-kernel DRM modules are not installed."
+	elog "This can be done with the following:"
+	elog "    cd ${KERNEL_DIR}"
+	elog "    make modules modules_install"
+	elog "This should allow the x11-drm modules to load and function normally."
 }
 
 # Functions used above are defined below:
diff --git a/x11-base/x11-drm/x11-drm-20070314.ebuild b/x11-base/x11-drm/x11-drm-20070314.ebuild
index 28b7e122c2a6..87bca0d0dc6b 100644
--- a/x11-base/x11-drm/x11-drm-20070314.ebuild
+++ b/x11-base/x11-drm/x11-drm-20070314.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20070314.ebuild,v 1.7 2008/09/12 21:30:21 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20070314.ebuild,v 1.8 2008/09/13 01:12:14 battousai Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.7"
@@ -128,8 +128,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"
@@ -137,11 +135,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 the Direct Rendering Manager in the kernel config. (CONFIG_DRM)"
 		ERROR_AGP="AGP support is not enabled in your kernel config (CONFIG_AGP)"
+
+		linux-mod_pkg_setup
 	fi
 }
 
@@ -309,11 +307,6 @@ src_install_linux() {
 
 	# Strip binaries, leaving /lib/modules untouched (bug #24415)
 	strip_bins \/lib\/modules
-
-	# Yoinked from the sys-apps/touchpad ebuild. Thanks to whoever made this.
-	keepdir /etc/modules.d
-	sed 's:%PN%:'${PN}':g' "${FILESDIR}"/modules.d-${PN} > "${D}"/etc/modules.d/${PN}
-	sed -i 's:%KV%:'${KV_FULL}':g' "${D}"/etc/modules.d/${PN}
 }
 
 src_install_freebsd() {
@@ -332,5 +325,14 @@ pkg_postinst_os() {
 	if use kernel_linux
 	then
 		linux-mod_pkg_postinst
+
+		elog "Having in-kernel DRM modules installed can prevent x11-drm modules from being"
+		elog "loaded. It can also lead to unknown symbols in x11-drm modules, which would"
+		elog "be seen during the installation. If you experience any of those problems,"
+		elog "please ensure that the in-kernel DRM modules are not installed."
+		elog "This can be done with the following:"
+		elog "    cd ${KERNEL_DIR}"
+		elog "    make modules modules_install"
+		elog "This should allow the x11-drm modules to load and function normally."
 	fi
 }
diff --git a/x11-base/x11-drm/x11-drm-20071019.ebuild b/x11-base/x11-drm/x11-drm-20071019.ebuild
index c455b734a511..88a51024ee41 100644
--- a/x11-base/x11-drm/x11-drm-20071019.ebuild
+++ b/x11-base/x11-drm/x11-drm-20071019.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20071019.ebuild,v 1.2 2008/07/11 02:51:08 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20071019.ebuild,v 1.3 2008/09/13 01:12:14 battousai Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.7"
@@ -128,8 +128,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"
@@ -137,11 +135,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 the Direct Rendering Manager in the kernel config. (CONFIG_DRM)"
 		ERROR_AGP="AGP support is not enabled in your kernel config (CONFIG_AGP)"
+
+		linux-mod_pkg_setup
 	fi
 }
 
@@ -309,11 +307,6 @@ src_install_linux() {
 
 	# Strip binaries, leaving /lib/modules untouched (bug #24415)
 	strip_bins \/lib\/modules
-
-	# Yoinked from the sys-apps/touchpad ebuild. Thanks to whoever made this.
-	keepdir /etc/modules.d
-	sed 's:%PN%:'${PN}':g' "${FILESDIR}"/modules.d-${PN} > "${D}"/etc/modules.d/${PN}
-	sed -i 's:%KV%:'${KV_FULL}':g' "${D}"/etc/modules.d/${PN}
 }
 
 src_install_freebsd() {
@@ -332,5 +325,14 @@ pkg_postinst_os() {
 	if use kernel_linux
 	then
 		linux-mod_pkg_postinst
+
+		elog "Having in-kernel DRM modules installed can prevent x11-drm modules from being"
+		elog "loaded. It can also lead to unknown symbols in x11-drm modules, which would"
+		elog "be seen during the installation. If you experience any of those problems,"
+		elog "please ensure that the in-kernel DRM modules are not installed."
+		elog "This can be done with the following:"
+		elog "    cd ${KERNEL_DIR}"
+		elog "    make modules modules_install"
+		elog "This should allow the x11-drm modules to load and function normally."
 	fi
 }
diff --git a/x11-base/x11-drm/x11-drm-20080710.ebuild b/x11-base/x11-drm/x11-drm-20080710.ebuild
index c81950cd9aee..869c7362d50e 100644
--- a/x11-base/x11-drm/x11-drm-20080710.ebuild
+++ b/x11-base/x11-drm/x11-drm-20080710.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20080710.ebuild,v 1.3 2008/09/12 21:30:21 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20080710.ebuild,v 1.4 2008/09/13 01:12:14 battousai Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.7"
@@ -136,10 +136,9 @@ kernel_setup() {
 			die "Please use in-kernel DRM or switch to a 2.6 kernel."
 		fi
 
-		CONFIG_CHECK="!DRM ~AGP"
+		CONFIG_CHECK="!DRM AGP"
 		ERROR_DRM="Please disable DRM in the kernel config. (CONFIG_DRM = n)"
-		ERROR_AGP="AGPGART support is not enabled in your kernel config (CONFIG_AGP).
-			This will probably be essential for direct rendering."
+		ERROR_AGP="AGPGART support is not enabled in your kernel config (CONFIG_AGP)."
 
 		linux-mod_pkg_setup
 	fi