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

Package-Manager: portage-2.1_rc1-r3

diff --git a/x11-base/x11-drm/ChangeLog b/x11-base/x11-drm/ChangeLog
index b31c661a323e54dc66131e88c1a7e236d74de79b..4f9ae3fb7b9539a3f8c5af02fea72600059ee2fc 100644 (file)
--- 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/Manifest b/x11-base/x11-drm/Manifest
index b6cf73dab830dd9232dd7234bc8fc6dd3e038564..0cbb114559fc2777c0177c8ae9d400f5ea4fa4b8 100644 (file)
--- a/x11-base/x11-drm/Manifest
+++ b/x11-base/x11-drm/Manifest
@@ -4,7 +4,7 @@ RMD160 7bdcba81be1a55311e31ec4ef88dc9c1b7ec85c8 files/modules.d-x11-drm 40
 SHA256 97fb08b2c529d65b415dec23dc7130721be9850129100e4b7063baa1060641e2 files/modules.d-x11-drm 40
 DIST linux-drm-20050502-kernelsource.tar.bz2 518178 size 518178
 DIST linux-drm-20050807-kernelsource.tar.bz2 549703 size 549703
-DIST linux-drm-20051028-kernelsource.tar.bz2 565711 size 565711
+DIST linux-drm-20051028-kernelsource.tar.bz2 565711 RMD160 92b94671eed2f8750338f07dbf5321ca2229de49 SHA256 82f4e49995c8cde5f33ae97f706b473795d883e0b80967cff5094bf1785f2670 size 565711
 DIST linux-drm-20051223-kernelsource.tar.bz2 560381 RMD160 4f5707a9de908eb1bab44162588d6f29241a9df4 SHA256 cdf54b79d06a92afb3d3f68550c5f4864544d03464b3fc1cc0d954eb18cac2ef size 560381
 DIST linux-drm-20060608-kernelsource.tar.bz2 568004 RMD160 253608313539a651ad6724bcb67b5f4ab28eaf4f SHA256 5f2346f3eba114c4d5655325f3fd51e0b74f6f627bf0c4e435103c8972f52731 size 568004
 DIST linux-drm-4.3.0-kernelsource-20031202.tar.bz2 440304 size 440304
@@ -12,8 +12,8 @@ DIST linux-drm-gatos-4.3.0-kernelsource-20031202.tar.bz2 154684 size 154684
 DIST linux-drm-mach64-4.3.0-kernelsource-20031202.tar.bz2 429549 size 429549
 DIST x11-drm-20050502-gentoo-0.2.tar.bz2 3319 size 3319
 DIST x11-drm-20050807-gentoo-0.1.tar.bz2 2095 size 2095
-DIST x11-drm-20051028-gentoo-0.1.tar.bz2 2106 size 2106
-DIST x11-drm-20051223-gentoo-0.1.tar.bz2 2106 RMD160 2eb369902c7071b9beb3c0fc0c111b697b6493ab SHA256 0e51f4331b41dd1ed912bea924631a1681b30617a87b500a12a589b93372d639 size 2106
+DIST x11-drm-20051028-gentoo-0.1.tar.bz2 2106 RMD160 2eb369902c7071b9beb3c0fc0c111b697b6493ab SHA256 0e51f4331b41dd1ed912bea924631a1681b30617a87b500a12a589b93372d639 size 2106
+DIST x11-drm-20051223-gentoo-0.2.tar.bz2 2451 RMD160 f04dc1d07b81b384d53db68f3b1385693187c283 SHA256 1fcab4021db6135d2346a7547f89afda0042fc6cefaaf20ee0db5fed7bd9c4b2 size 2451
 DIST x11-drm-20060608-gentoo-0.1.tar.bz2 2106 RMD160 2eb369902c7071b9beb3c0fc0c111b697b6493ab SHA256 0e51f4331b41dd1ed912bea924631a1681b30617a87b500a12a589b93372d639 size 2106
 DIST xfree-drm-4.3.0-r7-gentoo-0.4.tar.bz2 8143 size 8143
 EBUILD x11-drm-20050502.ebuild 6047 RMD160 383cf58d5afdff4d09ba711f76cadd5b15d88b1a SHA1 fb035d79c94b722c2d6af377012bc2480bc90fc1 SHA256 48374431345cf6426863ebb860624183a359bca8d26cbcca9b65aa8ae1ed27b0 size 6047
@@ -24,26 +24,26 @@ EBUILD x11-drm-20050807.ebuild 6242 RMD160 3d027803ae280bff6576679708fc40647dbfe
 MD5 fa05fd5ef45015c697d3741d5cc5a1e4 x11-drm-20050807.ebuild 6242
 RMD160 3d027803ae280bff6576679708fc40647dbfe702 x11-drm-20050807.ebuild 6242
 SHA256 d393a13f3e7a6b32fe91bc500b7277536b8b24b49320eca5c868a7fd7ca29119 x11-drm-20050807.ebuild 6242
-EBUILD x11-drm-20051028.ebuild 6308 RMD160 ea291c0ca0befb7a7c1c503c6c350e7bfb7e0f5b SHA1 3a34486a97ffb3dc6f4a2c2cbd7ee04586a628e6 SHA256 49cfd034dfeadb6aa40fff52f0f21863115d2c74af60234a778f9f70186405c1 size 6308
-MD5 db585c7498f5b59d6cad1424d35af376 x11-drm-20051028.ebuild 6308
-RMD160 ea291c0ca0befb7a7c1c503c6c350e7bfb7e0f5b x11-drm-20051028.ebuild 6308
-SHA256 49cfd034dfeadb6aa40fff52f0f21863115d2c74af60234a778f9f70186405c1 x11-drm-20051028.ebuild 6308
-EBUILD x11-drm-20051223.ebuild 6186 RMD160 848aa80942886eaf20bfb03d7dbe4046f5e19bc6 SHA1 bbd231dc6746877351d505cd66d9389ced101d24 SHA256 46bc90153e6bede9135d0537e3ee1e418842d30df5ccf8d7c1f314fb662c84a3 size 6186
-MD5 89bf59dd27f8df6bdab75d87418c1c9b x11-drm-20051223.ebuild 6186
-RMD160 848aa80942886eaf20bfb03d7dbe4046f5e19bc6 x11-drm-20051223.ebuild 6186
-SHA256 46bc90153e6bede9135d0537e3ee1e418842d30df5ccf8d7c1f314fb662c84a3 x11-drm-20051223.ebuild 6186
-EBUILD x11-drm-20060608.ebuild 6186 RMD160 4e8f498ded12f7a639beb254cc09254a44dbfd88 SHA1 d29ca3374b75b30231a0cb2d87d008a34967a1e8 SHA256 fdd3ebdefb7eaa70408223dd1e0cfc4f7ee81b70b6cb8d8f7c52b4194785ab2a size 6186
-MD5 a54085247865b20136bec1460b12f19e x11-drm-20060608.ebuild 6186
-RMD160 4e8f498ded12f7a639beb254cc09254a44dbfd88 x11-drm-20060608.ebuild 6186
-SHA256 fdd3ebdefb7eaa70408223dd1e0cfc4f7ee81b70b6cb8d8f7c52b4194785ab2a x11-drm-20060608.ebuild 6186
+EBUILD x11-drm-20051028.ebuild 6558 RMD160 d8844bb1540ac6089b7b0b38632486dbd75c7fd3 SHA1 c55e2fb9b35c0e0fed0c6d970d60cd56dd4b7bab SHA256 31b33cfd98802526e93ce93791b3d9dd5982cf0df001b1dc46b19ce92cdfb602 size 6558
+MD5 c4c67df082a4e7c93ddd146d170c20b8 x11-drm-20051028.ebuild 6558
+RMD160 d8844bb1540ac6089b7b0b38632486dbd75c7fd3 x11-drm-20051028.ebuild 6558
+SHA256 31b33cfd98802526e93ce93791b3d9dd5982cf0df001b1dc46b19ce92cdfb602 x11-drm-20051028.ebuild 6558
+EBUILD x11-drm-20051223.ebuild 6436 RMD160 ac4410adb49446adf67ac3c5a7abae8a7c50ede3 SHA1 c712914308cccc4c3407bfc6d140b11e740dd4ae SHA256 a50c1ec19f48b9125be0ee76398db5104744e752187790a4c1c4094e8c0c447f size 6436
+MD5 3d6a60a69246e91eeb5d22aced2a12e6 x11-drm-20051223.ebuild 6436
+RMD160 ac4410adb49446adf67ac3c5a7abae8a7c50ede3 x11-drm-20051223.ebuild 6436
+SHA256 a50c1ec19f48b9125be0ee76398db5104744e752187790a4c1c4094e8c0c447f x11-drm-20051223.ebuild 6436
+EBUILD x11-drm-20060608.ebuild 6436 RMD160 2c8f063a8e9160d8af32fa1c92d850fa6c1ea3b9 SHA1 8a215fcaa24412159d8912eb6268a9d2e9f0c453 SHA256 40a1d9fadc23d22cc04767889bd3e251de19c3bea9881ce72c0e4ef51f8878ec size 6436
+MD5 98ec94c87bbca17f72e65bb2c37a6e25 x11-drm-20060608.ebuild 6436
+RMD160 2c8f063a8e9160d8af32fa1c92d850fa6c1ea3b9 x11-drm-20060608.ebuild 6436
+SHA256 40a1d9fadc23d22cc04767889bd3e251de19c3bea9881ce72c0e4ef51f8878ec x11-drm-20060608.ebuild 6436
 EBUILD x11-drm-4.3.0-r7.ebuild 6983 RMD160 34eabe5596ed5609ef978dadc850431b61b3c6c8 SHA1 a17c1d315a881c18a95d0f2962b3fb54b49634ba SHA256 049580786153610b31973b4e041656da1189ebedbdee5cd2ae3f728b32be0fac size 6983
 MD5 7a519793ef2ad0ff85a9f90d59bb2ab9 x11-drm-4.3.0-r7.ebuild 6983
 RMD160 34eabe5596ed5609ef978dadc850431b61b3c6c8 x11-drm-4.3.0-r7.ebuild 6983
 SHA256 049580786153610b31973b4e041656da1189ebedbdee5cd2ae3f728b32be0fac x11-drm-4.3.0-r7.ebuild 6983
-MISC ChangeLog 19787 RMD160 791d86ed2b3b14b3a8dadb3b6be0a4c518383e21 SHA1 b99877587744a78cfa7316d2b093f82b9c243ea6 SHA256 80a1278d707f496cb4648418c9be10ebe016eecfd9ef5f540d502d67f7c33d74 size 19787
-MD5 0dd9b95d7fcdbc6455eb7b028435fc84 ChangeLog 19787
-RMD160 791d86ed2b3b14b3a8dadb3b6be0a4c518383e21 ChangeLog 19787
-SHA256 80a1278d707f496cb4648418c9be10ebe016eecfd9ef5f540d502d67f7c33d74 ChangeLog 19787
+MISC ChangeLog 20065 RMD160 ff6465cec1e1c7863800a08f98e7c8df9cb8d452 SHA1 8728db3a1bdec91d6938432778bf30799545a199 SHA256 d06d240ff92d7935371c2c75d2345d1bb52713fa97e24942be06dbb356e6f479 size 20065
+MD5 84395d10a68845bca1fd36ba0d36d7af ChangeLog 20065
+RMD160 ff6465cec1e1c7863800a08f98e7c8df9cb8d452 ChangeLog 20065
+SHA256 d06d240ff92d7935371c2c75d2345d1bb52713fa97e24942be06dbb356e6f479 ChangeLog 20065
 MISC metadata.xml 368 RMD160 cbe279aeafeae0af3633fbd1ecaa59d2f54579b8 SHA1 5104adf2f1ebe1ddffe4ca95e7b5e5f06267f842 SHA256 e73a5c428f39881de8ae5acf40958e8ad37a5fe92c2bb8cc4060704c9be45ef1 size 368
 MD5 782be9470cf76716a15aa5a70f4b8af7 metadata.xml 368
 RMD160 cbe279aeafeae0af3633fbd1ecaa59d2f54579b8 metadata.xml 368
@@ -54,12 +54,12 @@ SHA256 71387b8d2686d28f16826fa31b3f4dfa7b4092c39b494231e9faac9006835c7b files/di
 MD5 05c0def6e3725175239b158187f61774 files/digest-x11-drm-20050807 162
 RMD160 7549496fcff6cc13d47867b7b657c749d5a8d358 files/digest-x11-drm-20050807 162
 SHA256 76f352c1f771f85202ad233579691d94d041de9b4e6d600a9d67811952298094 files/digest-x11-drm-20050807 162
-MD5 79ba7dd6f31beecd88dbf0836d41070e files/digest-x11-drm-20051028 162
-RMD160 10f518a7f1c033f19479e337036d279292910a83 files/digest-x11-drm-20051028 162
-SHA256 fd898eb260ad50cade3f7cf9f81c8748680e14f7dd111475fcbf0805734b3c22 files/digest-x11-drm-20051028 162
-MD5 f186c4e05a1d317d5d9f296498685d3e files/digest-x11-drm-20051223 578
-RMD160 0b1942534bbaca3a6b336ddba27fa07252bf0f2b files/digest-x11-drm-20051223 578
-SHA256 6e415afaf2811d1483ba7384e55de32ef669a9c9e2ebe6be185ef074e95afbcc files/digest-x11-drm-20051223 578
+MD5 05e606acb52bafe6bd5105e0ec5b9976 files/digest-x11-drm-20051028 578
+RMD160 fa0d0bb449a3ca83ad291dc409726b33ae777d23 files/digest-x11-drm-20051028 578
+SHA256 c10ee716d3ddb617b46f106fd3a3600b07079fe4c3695cc151575bd1843c6fcd files/digest-x11-drm-20051028 578
+MD5 b05ad66fcf6e2c5be503ba699600e01a files/digest-x11-drm-20051223 578
+RMD160 e34723c94d71200ae4fabde55d24aa1a92774884 files/digest-x11-drm-20051223 578
+SHA256 484c497bc5fe0de82872d1159be883711a93d74dcb29ad26a8d1d103c8eb35c2 files/digest-x11-drm-20051223 578
 MD5 7b64d777176450a72c719800307f6274 files/digest-x11-drm-20060608 578
 RMD160 4da41cad762f404895183cd9d8d2207260cd1748 files/digest-x11-drm-20060608 578
 SHA256 efa37f00325b071099870fa8d0d6d443c65b26330d350ec47fb9d7dbf1fb54f6 files/digest-x11-drm-20060608 578

diff --git a/x11-base/x11-drm/files/digest-x11-drm-20051028 b/x11-base/x11-drm/files/digest-x11-drm-20051028
index 1b7e8708daa7f347b184d1b0916788610e13e5ab..ac2fd5dfa0fd9801aaa759ca70882cb473bc9f93 100644 (file)
--- 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 6d48f511b5dc78f26676e949840d83f57fbb64e7..23b5139db7dda21ede30b7a9084eab29f09c8713 100644 (file)
--- 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 7e896aa6ad333de1fcdfc199b721fbf79354dd16..0f50ae7ae91a533fac836675cbc628bc6db4c6e9 100644 (file)
--- 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 28b92a32fa2db9e1ee071428a6d8e7e5121431d0..b6de67a9c67bf0a6fb4509b785bec73d944e8e23 100644 (file)
--- 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 a0b6482c78b590e733ad15708b25a8e43f35d677..726ee937f5717a86d13d1637318b39e62607a11b 100644 (file)
--- 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