Fix 2.6.17 and 2.4.x build issues. Bug #129302 (2.6.17) and bug #96952 (2.4.x) should be fixed.

(Portage version: 2.1_rc1-r3)

6 files changed, 77 insertions, 35 deletions

diff --git a/x11-base/x11-drm/ChangeLog b/x11-base/x11-drm/ChangeLog
index b31c661a323e..4f9ae3fb7b95 100644
--- a/x11-base/x11-drm/ChangeLog
+++ b/x11-base/x11-drm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/x11-drm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.33 2006/06/08 22:51:33 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.34 2006/06/16 07:09:43 battousai Exp $
+
+  16 Jun 2006; Bryan Stine <battousai@gentoo.org> x11-drm-20051028.ebuild,
+  x11-drm-20051223.ebuild, x11-drm-20060608.ebuild:
+  Added a patch to 20051223 to fix building with 2.6.17, solving bug #129302.
+  Implemented ebuild fixes for 2.4 module building, solving bug #96952.
 
 *x11-drm-20060608 (08 Jun 2006)
 
diff --git a/x11-base/x11-drm/files/digest-x11-drm-20051028 b/x11-base/x11-drm/files/digest-x11-drm-20051028
index 1b7e8708daa7..ac2fd5dfa0fd 100644
--- a/x11-base/x11-drm/files/digest-x11-drm-20051028
+++ b/x11-base/x11-drm/files/digest-x11-drm-20051028
@@ -1,2 +1,6 @@
 MD5 59ddf9d87c298b2627291aac7733ddc7 linux-drm-20051028-kernelsource.tar.bz2 565711
+RMD160 92b94671eed2f8750338f07dbf5321ca2229de49 linux-drm-20051028-kernelsource.tar.bz2 565711
+SHA256 82f4e49995c8cde5f33ae97f706b473795d883e0b80967cff5094bf1785f2670 linux-drm-20051028-kernelsource.tar.bz2 565711
 MD5 0831381f1bfccba6fc80e5c1551dafb8 x11-drm-20051028-gentoo-0.1.tar.bz2 2106
+RMD160 2eb369902c7071b9beb3c0fc0c111b697b6493ab x11-drm-20051028-gentoo-0.1.tar.bz2 2106
+SHA256 0e51f4331b41dd1ed912bea924631a1681b30617a87b500a12a589b93372d639 x11-drm-20051028-gentoo-0.1.tar.bz2 2106
diff --git a/x11-base/x11-drm/files/digest-x11-drm-20051223 b/x11-base/x11-drm/files/digest-x11-drm-20051223
index 6d48f511b5dc..23b5139db7dd 100644
--- a/x11-base/x11-drm/files/digest-x11-drm-20051223
+++ b/x11-base/x11-drm/files/digest-x11-drm-20051223
@@ -1,6 +1,6 @@
 MD5 e3586c43652beda09e68558528929d9e linux-drm-20051223-kernelsource.tar.bz2 560381
 RMD160 4f5707a9de908eb1bab44162588d6f29241a9df4 linux-drm-20051223-kernelsource.tar.bz2 560381
 SHA256 cdf54b79d06a92afb3d3f68550c5f4864544d03464b3fc1cc0d954eb18cac2ef linux-drm-20051223-kernelsource.tar.bz2 560381
-MD5 0831381f1bfccba6fc80e5c1551dafb8 x11-drm-20051223-gentoo-0.1.tar.bz2 2106
-RMD160 2eb369902c7071b9beb3c0fc0c111b697b6493ab x11-drm-20051223-gentoo-0.1.tar.bz2 2106
-SHA256 0e51f4331b41dd1ed912bea924631a1681b30617a87b500a12a589b93372d639 x11-drm-20051223-gentoo-0.1.tar.bz2 2106
+MD5 754d81e0ad0a116d649405a3471c2a1e x11-drm-20051223-gentoo-0.2.tar.bz2 2451
+RMD160 f04dc1d07b81b384d53db68f3b1385693187c283 x11-drm-20051223-gentoo-0.2.tar.bz2 2451
+SHA256 1fcab4021db6135d2346a7547f89afda0042fc6cefaaf20ee0db5fed7bd9c4b2 x11-drm-20051223-gentoo-0.2.tar.bz2 2451
diff --git a/x11-base/x11-drm/x11-drm-20051028.ebuild b/x11-base/x11-drm/x11-drm-20051028.ebuild
index 7e896aa6ad33..0f50ae7ae91a 100644
--- a/x11-base/x11-drm/x11-drm-20051028.ebuild
+++ b/x11-base/x11-drm/x11-drm-20051028.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20051028.ebuild,v 1.4 2006/04/16 20:16:03 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20051028.ebuild,v 1.5 2006/06/16 07:09:43 battousai Exp $
 
 inherit eutils x11 linux-mod
 
@@ -46,16 +46,26 @@ pkg_setup() {
 		die "The ffb driver is for sparc-specific hardware. Please remove it from your VIDEO_CARDS."
 	fi
 
-	if linux_chkconfig_builtin "DRM"
+	if is_kernel 2 6
 	then
-		die "Please disable or modularize DRM in the kernel config. (CONFIG_DRM = n or m)"
-	fi
-
-	if ! linux_chkconfig_present "AGP"
+		if linux_chkconfig_builtin "DRM"
+		then
+			die "Please disable or modularize DRM in the kernel config. (CONFIG_DRM = n or m)"
+		fi
+
+		if ! linux_chkconfig_present "AGP"
+		then
+			einfo "AGP support is not enabled in your kernel config. This may be needed for DRM to"
+			einfo "work, so you might want to double-check that setting. (CONFIG_AGP)"
+			echo
+		fi
+	elif is_kernel 2 4
 	then
-		einfo "AGP support is not enabled in your kernel config. This may be needed for DRM to"
-		einfo "work, so you might want to double-check that setting. (CONFIG_AGP)"
-		echo
+		if ! linux_chkconfig_present "DRM"
+		then
+			die "Please enable DRM support in your kernel configuration. (CONFIG_DRM = y or m)."
+			echo
+		fi
 	fi
 
 	# Set video cards to build for.
@@ -123,11 +133,12 @@ src_install() {
 	cd ${SRC_BUILD}
 
 	unset ARCH
+	is_kernel 2 6 && DRM_KMOD="drm.${KV_OBJ}"
 	make KV="${KV_FULL}" \
 		LINUXDIR="${KERNEL_DIR}" \
 		DESTDIR="${D}" \
 		RUNNING_REL="${KV_FULL}" \
-		MODULE_LIST="${VIDCARDS} drm.${KV_OBJ}" \
+		MODULE_LIST="${VIDCARDS} ${DRM_KMOD}" \
 		install || die "Install failed."
 
 	dodoc README.drm
diff --git a/x11-base/x11-drm/x11-drm-20051223.ebuild b/x11-base/x11-drm/x11-drm-20051223.ebuild
index 28b92a32fa2d..b6de67a9c67b 100644
--- a/x11-base/x11-drm/x11-drm-20051223.ebuild
+++ b/x11-base/x11-drm/x11-drm-20051223.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20051223.ebuild,v 1.8 2006/04/16 20:21:34 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20051223.ebuild,v 1.9 2006/06/16 07:09:43 battousai Exp $
 
 inherit eutils x11 linux-mod
 
@@ -23,7 +23,7 @@ IUSE="${IUSE_VIDEO_CARDS}"
 RESTRICT="nostrip"
 
 S="${WORKDIR}/drm"
-PATCHVER="0.1"
+PATCHVER="0.2"
 PATCHDIR="${WORKDIR}/patch"
 EXCLUDED="${WORKDIR}/excluded"
 
@@ -46,16 +46,26 @@ DEPEND=">=sys-devel/automake-1.7
 pkg_setup() {
 	get_version
 
-	if linux_chkconfig_builtin "DRM"
+	if is_kernel 2 6
 	then
-		die "Please disable or modularize DRM in the kernel config. (CONFIG_DRM = n or m)"
-	fi
-
-	if ! linux_chkconfig_present "AGP"
+		if linux_chkconfig_builtin "DRM"
+		then
+			die "Please disable or modularize DRM in the kernel config. (CONFIG_DRM = n or m)"
+		fi
+
+		if ! linux_chkconfig_present "AGP"
+		then
+			einfo "AGP support is not enabled in your kernel config. This may be needed for DRM to"
+			einfo "work, so you might want to double-check that setting. (CONFIG_AGP)"
+			echo
+		fi
+	elif is_kernel 2 4
 	then
-		einfo "AGP support is not enabled in your kernel config. This may be needed for DRM to"
-		einfo "work, so you might want to double-check that setting. (CONFIG_AGP)"
-		echo
+		if ! linux_chkconfig_present "DRM"
+		then
+			die "Please enable DRM support in your kernel configuration. (CONFIG_DRM = y or m)."
+			echo
+		fi
 	fi
 
 	# Set video cards to build for.
@@ -123,11 +133,12 @@ src_install() {
 	cd ${SRC_BUILD}
 
 	unset ARCH
+	is_kernel 2 6 && DRM_KMOD="drm.${KV_OBJ}"
 	make KV="${KV_FULL}" \
 		LINUXDIR="${KERNEL_DIR}" \
 		DESTDIR="${D}" \
 		RUNNING_REL="${KV_FULL}" \
-		MODULE_LIST="${VIDCARDS} drm.${KV_OBJ}" \
+		MODULE_LIST="${VIDCARDS} ${DRM_KMOD}" \
 		install || die "Install failed."
 
 	dodoc README.drm
diff --git a/x11-base/x11-drm/x11-drm-20060608.ebuild b/x11-base/x11-drm/x11-drm-20060608.ebuild
index a0b6482c78b5..726ee937f571 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-2006 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.1 2006/06/08 22:51:33 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20060608.ebuild,v 1.2 2006/06/16 07:09:43 battousai Exp $
 
 inherit eutils x11 linux-mod
 
@@ -46,16 +46,26 @@ DEPEND=">=sys-devel/automake-1.7
 pkg_setup() {
 	get_version
 
-	if linux_chkconfig_builtin "DRM"
+	if is_kernel 2 6
 	then
-		die "Please disable or modularize DRM in the kernel config. (CONFIG_DRM = n or m)"
-	fi
-
-	if ! linux_chkconfig_present "AGP"
+		if linux_chkconfig_builtin "DRM"
+		then
+			die "Please disable or modularize DRM in the kernel config. (CONFIG_DRM = n or m)"
+		fi
+
+		if ! linux_chkconfig_present "AGP"
+		then
+			einfo "AGP support is not enabled in your kernel config. This may be needed for DRM to"
+			einfo "work, so you might want to double-check that setting. (CONFIG_AGP)"
+			echo
+		fi
+	elif is_kernel 2 4
 	then
-		einfo "AGP support is not enabled in your kernel config. This may be needed for DRM to"
-		einfo "work, so you might want to double-check that setting. (CONFIG_AGP)"
-		echo
+		if ! linux_chkconfig_present "DRM"
+		then
+			die "Please enable DRM support in your kernel configuration. (CONFIG_DRM = y or m)."
+			echo
+		fi
 	fi
 
 	# Set video cards to build for.
@@ -123,11 +133,12 @@ src_install() {
 	cd ${SRC_BUILD}
 
 	unset ARCH
+	is_kernel 2 6 && DRM_KMOD="drm.${KV_OBJ}"
 	make KV="${KV_FULL}" \
 		LINUXDIR="${KERNEL_DIR}" \
 		DESTDIR="${D}" \
 		RUNNING_REL="${KV_FULL}" \
-		MODULE_LIST="${VIDCARDS} drm.${KV_OBJ}" \
+		MODULE_LIST="${VIDCARDS} ${DRM_KMOD}" \
 		install || die "Install failed."
 
 	dodoc README.drm