Clean up.

(Portage version: 2.1.2_rc3-r4)
 (Unsigned Manifest commit)

9 files changed, 4 insertions, 1006 deletions

diff --git a/x11-base/x11-drm/Manifest b/x11-base/x11-drm/Manifest
index 414cfebf6eb3..30108401014a 100644
--- a/x11-base/x11-drm/Manifest
+++ b/x11-base/x11-drm/Manifest
@@ -2,32 +2,10 @@ AUX modules.d-x11-drm 40 RMD160 7bdcba81be1a55311e31ec4ef88dc9c1b7ec85c8 SHA1 1e
 MD5 88b8c90e440b3db246a7d06cf53640ae files/modules.d-x11-drm 40
 RMD160 7bdcba81be1a55311e31ec4ef88dc9c1b7ec85c8 files/modules.d-x11-drm 40
 SHA256 97fb08b2c529d65b415dec23dc7130721be9850129100e4b7063baa1060641e2 files/modules.d-x11-drm 40
-DIST linux-drm-20050502-kernelsource.tar.bz2 129062 RMD160 b2f1636bc67b215df5679a6c336b464864b58ea6 SHA1 9dd3babf7c5f16d776483601a562dbd1395f9369 SHA256 857196226c89fd511f3649ab965f15496c974c13f4a321e2fa1094a1fbc7e3d7
-DIST linux-drm-20050807-kernelsource.tar.bz2 549703 RMD160 68f714041e7fea70acac75348aaccfd80103ef05 SHA1 8c5556b06b6e7f7170dd809dba3e77949c32c3ec SHA256 9e6fdd8bc0f1db7d304ea9d202730a8eb33f3d4f181b7b0742257f01d873f494
-DIST linux-drm-20051028-kernelsource.tar.bz2 565711 RMD160 92b94671eed2f8750338f07dbf5321ca2229de49 SHA1 f529327e0cecd3460fb886589d956252909cb65f SHA256 82f4e49995c8cde5f33ae97f706b473795d883e0b80967cff5094bf1785f2670
 DIST linux-drm-20051223-kernelsource.tar.bz2 560381 RMD160 4f5707a9de908eb1bab44162588d6f29241a9df4 SHA256 cdf54b79d06a92afb3d3f68550c5f4864544d03464b3fc1cc0d954eb18cac2ef
 DIST linux-drm-20060608-kernelsource.tar.bz2 568004 RMD160 253608313539a651ad6724bcb67b5f4ab28eaf4f SHA1 466c1410c05f715286cf44437c1946cdaacf2cde SHA256 5f2346f3eba114c4d5655325f3fd51e0b74f6f627bf0c4e435103c8972f52731
-DIST linux-drm-4.3.0-kernelsource-20031202.tar.bz2 440304
-DIST linux-drm-gatos-4.3.0-kernelsource-20031202.tar.bz2 154684
-DIST linux-drm-mach64-4.3.0-kernelsource-20031202.tar.bz2 429549
-DIST x11-drm-20050502-gentoo-0.2.tar.bz2 3319 RMD160 05134e9e451493e076ba2ba96eb2b9c5a9d0b567 SHA1 924ded152781fe14afa9ddf34e7d3e7127cca5af SHA256 756c939dc4fb1fd7950f4c418202e0a129acfcb29e6ee8545308182f02bd6e4a
-DIST x11-drm-20050807-gentoo-0.1.tar.bz2 2095 RMD160 8e703daed283de0346369bf5d3b8cccb242ac595 SHA1 63574a4d77ee7d5546256e525573ca04445e151b SHA256 28af9478bfa1da0d05b99db571a8ad46ae4098e6a3c8b467008a9d9b589c2c22
-DIST x11-drm-20051028-gentoo-0.1.tar.bz2 2106 RMD160 2eb369902c7071b9beb3c0fc0c111b697b6493ab SHA1 134c1b35e55de049f4648ca555e11261e4bb403d SHA256 0e51f4331b41dd1ed912bea924631a1681b30617a87b500a12a589b93372d639
 DIST x11-drm-20051223-gentoo-0.2.tar.bz2 2451 RMD160 f04dc1d07b81b384d53db68f3b1385693187c283 SHA256 1fcab4021db6135d2346a7547f89afda0042fc6cefaaf20ee0db5fed7bd9c4b2
 DIST x11-drm-20060608-gentoo-0.2.tar.bz2 2355 RMD160 ac7f0ffa100de58c140da02a23a69040af1f67bb SHA1 a553bcd2e4e6a11e8b1e65b7a17e5e60217951f3 SHA256 4539c6a855b0f3db7b57196c4dbf67f22a5ebc0d2050a5dc2fa715f8d2945136
-DIST xfree-drm-4.3.0-r7-gentoo-0.4.tar.bz2 8143
-EBUILD x11-drm-20050502.ebuild 5995 RMD160 58a3b73d8bc28a4fd530de4b113c6719fbc25f5a SHA1 20e577de6a157af1ea19a468fe5188bd4a667ce2 SHA256 2732d86ae5a175f2c5ffe6bb1c4b6866a4812ad45553169c492992aefd1b6095
-MD5 26e6c8a761c5cf3bc4a556748c68b4af x11-drm-20050502.ebuild 5995
-RMD160 58a3b73d8bc28a4fd530de4b113c6719fbc25f5a x11-drm-20050502.ebuild 5995
-SHA256 2732d86ae5a175f2c5ffe6bb1c4b6866a4812ad45553169c492992aefd1b6095 x11-drm-20050502.ebuild 5995
-EBUILD x11-drm-20050807.ebuild 6189 RMD160 6e35ff646a0ac309dd1d421246211b1409e86a2f SHA1 786474fefb1f3970825f4ec496fa6569aa686d1a SHA256 c939638624899b066f2285c6688074d3674cb7e955b358e9a77f2703e78eded7
-MD5 28a56b217b1624adfb504f7f536abc7e x11-drm-20050807.ebuild 6189
-RMD160 6e35ff646a0ac309dd1d421246211b1409e86a2f x11-drm-20050807.ebuild 6189
-SHA256 c939638624899b066f2285c6688074d3674cb7e955b358e9a77f2703e78eded7 x11-drm-20050807.ebuild 6189
-EBUILD x11-drm-20051028.ebuild 6505 RMD160 27d9982aa4855d4faa80cb958b663abb3bc88abe SHA1 af5e98731ec9a7a7e9ee718474ca52614127c560 SHA256 a454cce021cc323c40bd2e815a3881393fcbbd898a23202a7754685116174b5a
-MD5 b4fb59a9551342a9e64a59bc1e497e1b x11-drm-20051028.ebuild 6505
-RMD160 27d9982aa4855d4faa80cb958b663abb3bc88abe x11-drm-20051028.ebuild 6505
-SHA256 a454cce021cc323c40bd2e815a3881393fcbbd898a23202a7754685116174b5a x11-drm-20051028.ebuild 6505
 EBUILD x11-drm-20051223.ebuild 6384 RMD160 e28ebee2ce1caf5c90dc2e944a04911ba2c02089 SHA1 eda5b06dfda1efd02c98760b1167247a3a627bcc SHA256 1b38d0282cab1bfbbeb36bade40ea03a3604e8d50121aef958611afcadc464ac
 MD5 95c3e96dee51eaca5684499b709a2b9b x11-drm-20051223.ebuild 6384
 RMD160 e28ebee2ce1caf5c90dc2e944a04911ba2c02089 x11-drm-20051223.ebuild 6384
@@ -40,27 +18,14 @@ EBUILD x11-drm-20060608.ebuild 6376 RMD160 344926ccafbeb9dcc255104cab6569c6703f6
 MD5 f7f8ce4209fcee05755190b5df140954 x11-drm-20060608.ebuild 6376
 RMD160 344926ccafbeb9dcc255104cab6569c6703f6f96 x11-drm-20060608.ebuild 6376
 SHA256 4cdc79e123eb0c04c892e289470236f98e15823cd5729767c0c776ef7f6d1d71 x11-drm-20060608.ebuild 6376
-EBUILD x11-drm-4.3.0-r7.ebuild 6983 RMD160 34eabe5596ed5609ef978dadc850431b61b3c6c8 SHA1 a17c1d315a881c18a95d0f2962b3fb54b49634ba SHA256 049580786153610b31973b4e041656da1189ebedbdee5cd2ae3f728b32be0fac
-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 21705 RMD160 77f95baff14c2def0b79b0388385cb53bf981c88 SHA1 9d33c98a8ae047a1f48674d50facf812ac4c0875 SHA256 7fa8b5c686395bfa210181e593c3d71db1d4a9add35b34a014bbe0a00d13e14c
-MD5 6fd4b8a16725b455f66fea4bf0666fc7 ChangeLog 21705
-RMD160 77f95baff14c2def0b79b0388385cb53bf981c88 ChangeLog 21705
-SHA256 7fa8b5c686395bfa210181e593c3d71db1d4a9add35b34a014bbe0a00d13e14c ChangeLog 21705
+MISC ChangeLog 21881 RMD160 d17444d89c6846724038ad52a43e4c68dd41e2e3 SHA1 8ffc5e1adb2ce82a84729825ab479bcc2df9359a SHA256 2c30e69fd5fcf8f5f5fa24346340a5848d5ccf92b30c00b4f6e289676429c508
+MD5 10a9a9bd1300a7e0d7515201bc1553e0 ChangeLog 21881
+RMD160 d17444d89c6846724038ad52a43e4c68dd41e2e3 ChangeLog 21881
+SHA256 2c30e69fd5fcf8f5f5fa24346340a5848d5ccf92b30c00b4f6e289676429c508 ChangeLog 21881
 MISC metadata.xml 368 RMD160 cbe279aeafeae0af3633fbd1ecaa59d2f54579b8 SHA1 5104adf2f1ebe1ddffe4ca95e7b5e5f06267f842 SHA256 e73a5c428f39881de8ae5acf40958e8ad37a5fe92c2bb8cc4060704c9be45ef1
 MD5 782be9470cf76716a15aa5a70f4b8af7 metadata.xml 368
 RMD160 cbe279aeafeae0af3633fbd1ecaa59d2f54579b8 metadata.xml 368
 SHA256 e73a5c428f39881de8ae5acf40958e8ad37a5fe92c2bb8cc4060704c9be45ef1 metadata.xml 368
-MD5 682cda2b590158d06d00b40e08fc1b03 files/digest-x11-drm-20050502 578
-RMD160 dad6f9d1504d9a91ea94be4f01f28452ff6c3ef7 files/digest-x11-drm-20050502 578
-SHA256 82710957b11636042c3e134e83ee99cb5fe94c4ca2ebdd2c4890bcb3aa83aba2 files/digest-x11-drm-20050502 578
-MD5 c86f441cbb08f2ee461da495a6f680b7 files/digest-x11-drm-20050807 578
-RMD160 467eac6cbea1c785d074e2eca32effc6d8983721 files/digest-x11-drm-20050807 578
-SHA256 b8963125c23c628ed94a16fd0bd7e33ddaea9961c5b283b2530a2adc70cddf03 files/digest-x11-drm-20050807 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
@@ -70,6 +35,3 @@ SHA256 b0e147eed5017b8305847803abc08a8a82c25531edf27f4ef0005b32989fa121 files/di
 MD5 25e0af623be815585fdd845044e4e48e files/digest-x11-drm-20060608-r1 578
 RMD160 8d8f952ce15390917b686efec62fbf4deba18712 files/digest-x11-drm-20060608-r1 578
 SHA256 b0e147eed5017b8305847803abc08a8a82c25531edf27f4ef0005b32989fa121 files/digest-x11-drm-20060608-r1 578
-MD5 db87006ec48bc9579dcdc989c5ed86d6 files/digest-x11-drm-4.3.0-r7 363
-RMD160 fb090eee55f87cb2a83cded1fdcd42c82d7f040d files/digest-x11-drm-4.3.0-r7 363
-SHA256 e25f7f22669877ab1a0b524b42acf09b30a2f4bdb61ca152d6c0e3736c190bbb files/digest-x11-drm-4.3.0-r7 363
diff --git a/x11-base/x11-drm/files/digest-x11-drm-20050502 b/x11-base/x11-drm/files/digest-x11-drm-20050502
deleted file mode 100644
index 0a0235293429..000000000000
--- a/x11-base/x11-drm/files/digest-x11-drm-20050502
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 bd8ac63197de120e52665234bca5b228 linux-drm-20050502-kernelsource.tar.bz2 129062
-RMD160 b2f1636bc67b215df5679a6c336b464864b58ea6 linux-drm-20050502-kernelsource.tar.bz2 129062
-SHA256 857196226c89fd511f3649ab965f15496c974c13f4a321e2fa1094a1fbc7e3d7 linux-drm-20050502-kernelsource.tar.bz2 129062
-MD5 6646cb90fb5febbfa61308d3f2250efe x11-drm-20050502-gentoo-0.2.tar.bz2 3319
-RMD160 05134e9e451493e076ba2ba96eb2b9c5a9d0b567 x11-drm-20050502-gentoo-0.2.tar.bz2 3319
-SHA256 756c939dc4fb1fd7950f4c418202e0a129acfcb29e6ee8545308182f02bd6e4a x11-drm-20050502-gentoo-0.2.tar.bz2 3319
diff --git a/x11-base/x11-drm/files/digest-x11-drm-20050807 b/x11-base/x11-drm/files/digest-x11-drm-20050807
deleted file mode 100644
index 6b3c4349c54b..000000000000
--- a/x11-base/x11-drm/files/digest-x11-drm-20050807
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 8c31c018105289c24a6d37dc545b3f50 linux-drm-20050807-kernelsource.tar.bz2 549703
-RMD160 68f714041e7fea70acac75348aaccfd80103ef05 linux-drm-20050807-kernelsource.tar.bz2 549703
-SHA256 9e6fdd8bc0f1db7d304ea9d202730a8eb33f3d4f181b7b0742257f01d873f494 linux-drm-20050807-kernelsource.tar.bz2 549703
-MD5 d4552c64415082ddba1515e24c2aef0e x11-drm-20050807-gentoo-0.1.tar.bz2 2095
-RMD160 8e703daed283de0346369bf5d3b8cccb242ac595 x11-drm-20050807-gentoo-0.1.tar.bz2 2095
-SHA256 28af9478bfa1da0d05b99db571a8ad46ae4098e6a3c8b467008a9d9b589c2c22 x11-drm-20050807-gentoo-0.1.tar.bz2 2095
diff --git a/x11-base/x11-drm/files/digest-x11-drm-20051028 b/x11-base/x11-drm/files/digest-x11-drm-20051028
deleted file mode 100644
index ac2fd5dfa0fd..000000000000
--- a/x11-base/x11-drm/files/digest-x11-drm-20051028
+++ /dev/null
@@ -1,6 +0,0 @@
-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-4.3.0-r7 b/x11-base/x11-drm/files/digest-x11-drm-4.3.0-r7
deleted file mode 100644
index ed4848460aca..000000000000
--- a/x11-base/x11-drm/files/digest-x11-drm-4.3.0-r7
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 eb8793b69f526cabc87e99537b28753d xfree-drm-4.3.0-r7-gentoo-0.4.tar.bz2 8143
-MD5 b1cc5fb755df16855915eb38747982eb linux-drm-4.3.0-kernelsource-20031202.tar.bz2 440304
-MD5 698a248d4192967eb41d9577bed8d75a linux-drm-gatos-4.3.0-kernelsource-20031202.tar.bz2 154684
-MD5 ccd16a915cd22f707ac3aac743b1398d linux-drm-mach64-4.3.0-kernelsource-20031202.tar.bz2 429549
diff --git a/x11-base/x11-drm/x11-drm-20050502.ebuild b/x11-base/x11-drm/x11-drm-20050502.ebuild
deleted file mode 100644
index 1c46b3f56c30..000000000000
--- a/x11-base/x11-drm/x11-drm-20050502.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# 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-20050502.ebuild,v 1.6 2006/08/31 19:11:11 battousai Exp $
-
-inherit eutils x11 linux-mod
-
-IUSE=""
-IUSE_VIDEO_CARDS="3dfx ffb i810 i830 i915 mach64 mga r128 radeon savage sis via"
-
-# Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
-# that only we only strip stuff that are safe to strip ...
-RESTRICT="nostrip"
-
-S="${WORKDIR}/drm"
-PATCHVER="0.2"
-PATCHDIR="${WORKDIR}/patch"
-EXCLUDED="${WORKDIR}/excluded"
-
-DESCRIPTION="DRM Kernel Modules for X11"
-HOMEPAGE="http://dri.sf.net"
-SRC_URI="mirror://gentoo/${P}-gentoo-${PATCHVER}.tar.bz2
-	 mirror://gentoo/linux-drm-${PV}-kernelsource.tar.bz2"
-
-SLOT="${KV}"
-LICENSE="X11"
-KEYWORDS="x86 ~alpha ~ia64 ~ppc ~amd64"
-
-DEPEND="virtual/linux-sources
-	>=sys-apps/portage-2.0.49-r13"
-
-pkg_setup() {
-	get_version
-
-	# Require at least one video card
-	if [ -z "${VIDEO_CARDS}" ]
-	then
-		die "Please set at least one video card in VIDEO_CARDS in make.conf or the environment. Possible VIDEO_CARDS values are: ${IUSE_VIDEO_CARDS}."
-	fi
-
-	if [ "${ARCH}" != "sparc" ] && use video_cards_ffb
-	then
-		die "The ffb driver is for sparc-specific hardware. Please remove it from your VIDEO_CARDS."
-	fi
-
-	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
-
-	# Set video cards to build for.
-	set_vidcards
-
-	# DRM CVS is undergoing changes which require splitting source to support both 2.4
-	# and 2.6 kernels. This determines which to use.
-	get_drm_build_dir
-
-	return 0
-}
-
-src_unpack() {
-	unpack linux-drm-${PV}-kernelsource.tar.bz2
-	unpack ${P}-gentoo-${PATCHVER}.tar.bz2
-
-	cd ${S}
-
-	patch_prepare
-
-	# Apply patches
-	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
-
-	# Substitute new directory under /lib/modules/${KV}
-	cd ${SRC_BUILD}
-	sed -ie "s:/kernel/drivers/char/drm:/${PN}:g" Makefile
-
-	cp ${S}/tests/*.c ${SRC_BUILD}
-}
-
-src_compile() {
-	einfo "Building DRM in ${SRC_BUILD}..."
-	cd ${SRC_BUILD}
-
-	# This now uses an M= build system. Makefile does most of the work.
-	unset ARCH
-	make M="${SRC_BUILD}" \
-		LINUXDIR="${ROOT}/usr/src/linux" \
-		DRM_MODULES="${VIDCARDS}" \
-		modules || die_error
-
-	# Building the programs. These are useful for developers and getting info from DRI and DRM.
-	#
-	# libdrm objects are needed for drmstat.
-	cd ${S}/libdrm
-	make || die "Could not build libdrm"
-
-	if linux_chkconfig_present DRM
-	then
-		echo "Please disable in-kernel DRM support to use this package."
-	fi
-
-	cd ${SRC_BUILD}
-	# LINUXDIR is needed to allow Makefiles to find kernel release.
-	make LINUXDIR="${ROOT}/usr/src/linux" dristat || die "Building dristat failed."
-	make LINUXDIR="${ROOT}/usr/src/linux" drmstat || die "Building drmstat failed."
-}
-
-src_install() {
-	einfo "Installing DRM..."
-	cd ${SRC_BUILD}
-
-	unset ARCH
-	make KV="${KV}" \
-		LINUXDIR="${ROOT}/usr/src/linux" \
-		DESTDIR="${D}" \
-		RUNNING_REL="${KV}" \
-		MODULE_LIST="${VIDCARDS} drm.${KV_OBJ}" \
-		install || die "Install failed."
-
-	dodoc README.drm
-
-	dobin dristat
-	dobin drmstat
-
-	# 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}':g' ${D}/etc/modules.d/${PN}
-}
-
-pkg_postinst() {
-	if use video_cards_sis
-	then
-		einfo "SiS direct rendering only works on 300 series chipsets."
-		einfo "SiS framebuffer also needs to be enabled in the kernel."
-	fi
-
-	if use video_cards_mach64
-	then
-		einfo "The Mach64 DRI driver is insecure."
-		einfo "Malicious clients can write to system memory."
-		einfo "For more information, see:"
-		einfo "http://dri.sourceforge.net/cgi-bin/moin.cgi/ATIMach64?value=CategoryHardwareChipset."
-	fi
-
-	linux-mod_pkg_postinst
-}
-
-# Functions used above are defined below:
-
-set_vidcards() {
-	set_kvobj
-
-	VIDCARDS=""
-
-	use video_cards_mga && \
-		VIDCARDS="${VIDCARDS} mga.${KV_OBJ}"
-	use video_cards_3dfx && \
-		VIDCARDS="${VIDCARDS} tdfx.${KV_OBJ}"
-	use video_cards_r128 && \
-		VIDCARDS="${VIDCARDS} r128.${KV_OBJ}"
-	use video_cards_radeon && \
-		VIDCARDS="${VIDCARDS} radeon.${KV_OBJ}"
-	use video_cards_i810 && \
-		VIDCARDS="${VIDCARDS} i810.${KV_OBJ}"
-	use video_cards_i830 && \
-		VIDCARDS="${VIDCARDS} i830.${KV_OBJ}"
-	use video_cards_i915 && \
-		VIDCARDS="${VIDCARDS} i915.${KV_OBJ}"
-#	use video_cards_gamma && \
-#		VIDCARDS="${VIDCARDS} gamma.${KV_OBJ}"
-	use video_cards_mach64 && \
-		VIDCARDS="${VIDCARDS} mach64.${KV_OBJ}"
-	use video_cards_savage && \
-		VIDCARDS="${VIDCARDS} savage.${KV_OBJ}"
-	use video_cards_sis && \
-		VIDCARDS="${VIDCARDS} sis.${KV_OBJ}"
-	use video_cards_via && \
-		VIDCARDS="${VIDCARDS} via.${KV_OBJ}"
-	use video_cards_ffb && \
-		VIDCARDS="${VIDCARDS} ffb.${KV_OBJ}"
-}
-
-patch_prepare() {
-	# Handle exclusions based on the following...
-	#     All trees (0**), Standard only (1**), Others (none right now)
-	#     2.4 vs. 2.6 kernels
-
-	kernel_is 2 4 && mv -f ${PATCHDIR}/*kernel-2.6* ${EXCLUDED}
-	kernel_is 2 6 && mv -f ${PATCHDIR}/*kernel-2.4* ${EXCLUDED}
-
-	# There is only one tree being maintained now. No numeric exclusions need
-	# to be done based on DRM tree.
-}
-
-die_error() {
-	eerror "Portage could not build the DRM modules. If you see an ACCESS DENIED error,"
-	eerror "this could mean that you were using an unsupported kernel build system. All"
-	eerror "2.4 kernels are supported, but only 2.6 kernels at least as new as 2.6.6"
-	eerror "are supported."
-	die "Unable to build DRM modules."
-}
-
-get_drm_build_dir() {
-	if kernel_is 2 4
-	then
-		SRC_BUILD="${S}/linux"
-	elif kernel_is 2 6
-	then
-		SRC_BUILD="${S}/linux-core"
-	fi
-}
diff --git a/x11-base/x11-drm/x11-drm-20050807.ebuild b/x11-base/x11-drm/x11-drm-20050807.ebuild
deleted file mode 100644
index 56adaa19897d..000000000000
--- a/x11-base/x11-drm/x11-drm-20050807.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# 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-20050807.ebuild,v 1.6 2006/09/01 02:29:10 battousai Exp $
-
-inherit eutils x11 linux-mod
-
-IUSE=""
-IUSE_VIDEO_CARDS="3dfx ffb i810 i830 i915 mach64 mga r128 radeon savage sis via"
-
-# Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
-# that only we only strip stuff that are safe to strip ...
-RESTRICT="nostrip"
-
-S="${WORKDIR}/drm"
-PATCHVER="0.1"
-PATCHDIR="${WORKDIR}/patch"
-EXCLUDED="${WORKDIR}/excluded"
-
-DESCRIPTION="DRM Kernel Modules for X11"
-HOMEPAGE="http://dri.sf.net"
-SRC_URI="mirror://gentoo/${P}-gentoo-${PATCHVER}.tar.bz2
-	 mirror://gentoo/linux-drm-${PV}-kernelsource.tar.bz2"
-
-SLOT="0"
-LICENSE="X11"
-KEYWORDS="~x86 ~alpha ~ia64 ~ppc ~amd64"
-
-DEPEND=">=sys-devel/automake-1.7
-	>=sys-devel/autoconf-2.59
-	>=sys-devel/libtool-1.5.14
-	>=sys-devel/m4-1.4
-	virtual/linux-sources
-	>=sys-apps/portage-2.0.49-r13"
-
-pkg_setup() {
-	get_version
-
-	# Require at least one video card
-	if [ -z "${VIDEO_CARDS}" ]
-	then
-		die "Please set at least one video card in VIDEO_CARDS in make.conf or the environment. Possible VIDEO_CARDS values are: ${IUSE_VIDEO_CARDS}."
-	fi
-
-	if [ "${ARCH}" != "sparc" ] && use video_cards_ffb
-	then
-		die "The ffb driver is for sparc-specific hardware. Please remove it from your VIDEO_CARDS."
-	fi
-
-	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
-
-	# Set video cards to build for.
-	set_vidcards
-
-	# DRM CVS is undergoing changes which require splitting source to support both 2.4
-	# and 2.6 kernels. This determines which to use.
-	get_drm_build_dir
-
-	return 0
-}
-
-src_unpack() {
-	unpack linux-drm-${PV}-kernelsource.tar.bz2
-	unpack ${P}-gentoo-${PATCHVER}.tar.bz2
-
-	cd ${S}
-
-	patch_prepare
-
-	# Apply patches
-	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
-
-	# Substitute new directory under /lib/modules/${KV_FULL}
-	cd ${SRC_BUILD}
-	sed -ie "s:/kernel/drivers/char/drm:/${PN}:g" Makefile
-
-	cp ${S}/tests/*.c ${SRC_BUILD}
-
-	cd ${S}
-	WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.7" autoreconf -v --install
-}
-
-src_compile() {
-	einfo "Building DRM in ${SRC_BUILD}..."
-	cd ${SRC_BUILD}
-
-	# This now uses an M= build system. Makefile does most of the work.
-	unset ARCH
-	make M="${SRC_BUILD}" \
-		LINUXDIR="${KERNEL_DIR}" \
-		DRM_MODULES="${VIDCARDS}" \
-		modules || die_error
-
-	# Building the programs. These are useful for developers and getting info from DRI and DRM.
-	#
-	# libdrm objects are needed for drmstat.
-	cd ${S}
-	econf || die "libdrm configure failed."
-	emake || die "libdrm build failed."
-
-	if linux_chkconfig_present DRM
-	then
-		echo "Please disable in-kernel DRM support to use this package."
-	fi
-
-	cd ${SRC_BUILD}
-	# LINUXDIR is needed to allow Makefiles to find kernel release.
-	make LINUXDIR="${KERNEL_DIR}" dristat || die "Building dristat failed."
-	make LINUXDIR="${KERNEL_DIR}" drmstat || die "Building drmstat failed."
-}
-
-src_install() {
-	einfo "Installing DRM..."
-	cd ${SRC_BUILD}
-
-	unset ARCH
-	make KV="${KV_FULL}" \
-		LINUXDIR="${KERNEL_DIR}" \
-		DESTDIR="${D}" \
-		RUNNING_REL="${KV_FULL}" \
-		MODULE_LIST="${VIDCARDS} drm.${KV_OBJ}" \
-		install || die "Install failed."
-
-	dodoc README.drm
-
-	dobin dristat
-	dobin drmstat
-
-	# 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() {
-	if use video_cards_sis
-	then
-		einfo "SiS direct rendering only works on 300 series chipsets."
-		einfo "SiS framebuffer also needs to be enabled in the kernel."
-	fi
-
-	if use video_cards_mach64
-	then
-		einfo "The Mach64 DRI driver is insecure."
-		einfo "Malicious clients can write to system memory."
-		einfo "For more information, see:"
-		einfo "http://dri.sourceforge.net/cgi-bin/moin.cgi/ATIMach64?value=CategoryHardwareChipset."
-	fi
-
-	linux-mod_pkg_postinst
-}
-
-# Functions used above are defined below:
-
-set_vidcards() {
-	set_kvobj
-
-	VIDCARDS=""
-
-	use video_cards_mga && \
-		VIDCARDS="${VIDCARDS} mga.${KV_OBJ}"
-	use video_cards_3dfx && \
-		VIDCARDS="${VIDCARDS} tdfx.${KV_OBJ}"
-	use video_cards_r128 && \
-		VIDCARDS="${VIDCARDS} r128.${KV_OBJ}"
-	use video_cards_radeon && \
-		VIDCARDS="${VIDCARDS} radeon.${KV_OBJ}"
-	use video_cards_i810 && \
-		VIDCARDS="${VIDCARDS} i810.${KV_OBJ}"
-	use video_cards_i830 && \
-		VIDCARDS="${VIDCARDS} i830.${KV_OBJ}"
-	use video_cards_i915 && \
-		VIDCARDS="${VIDCARDS} i915.${KV_OBJ}"
-#	use video_cards_gamma && \
-#		VIDCARDS="${VIDCARDS} gamma.${KV_OBJ}"
-	use video_cards_mach64 && \
-		VIDCARDS="${VIDCARDS} mach64.${KV_OBJ}"
-	use video_cards_savage && \
-		VIDCARDS="${VIDCARDS} savage.${KV_OBJ}"
-	use video_cards_sis && \
-		VIDCARDS="${VIDCARDS} sis.${KV_OBJ}"
-	use video_cards_via && \
-		VIDCARDS="${VIDCARDS} via.${KV_OBJ}"
-	use video_cards_ffb && \
-		VIDCARDS="${VIDCARDS} ffb.${KV_OBJ}"
-}
-
-patch_prepare() {
-	# Handle exclusions based on the following...
-	#     All trees (0**), Standard only (1**), Others (none right now)
-	#     2.4 vs. 2.6 kernels
-
-	kernel_is 2 4 && mv -f ${PATCHDIR}/*kernel-2.6* ${EXCLUDED}
-	kernel_is 2 6 && mv -f ${PATCHDIR}/*kernel-2.4* ${EXCLUDED}
-
-	# There is only one tree being maintained now. No numeric exclusions need
-	# to be done based on DRM tree.
-}
-
-die_error() {
-	eerror "Portage could not build the DRM modules. If you see an ACCESS DENIED error,"
-	eerror "this could mean that you were using an unsupported kernel build system. All"
-	eerror "2.4 kernels are supported, but only 2.6 kernels at least as new as 2.6.6"
-	eerror "are supported."
-	die "Unable to build DRM modules."
-}
-
-get_drm_build_dir() {
-	if kernel_is 2 4
-	then
-		SRC_BUILD="${S}/linux"
-	elif kernel_is 2 6
-	then
-		SRC_BUILD="${S}/linux-core"
-	fi
-}
diff --git a/x11-base/x11-drm/x11-drm-20051028.ebuild b/x11-base/x11-drm/x11-drm-20051028.ebuild
deleted file mode 100644
index abce8f5416be..000000000000
--- a/x11-base/x11-drm/x11-drm-20051028.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# 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.8 2006/09/07 04:47:34 battousai Exp $
-
-inherit eutils x11 linux-mod
-
-IUSE=""
-IUSE_VIDEO_CARDS="3dfx ffb i810 i830 i915 mach64 mga nv r128 radeon savage sis via"
-
-# Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
-# that only we only strip stuff that are safe to strip ...
-RESTRICT="nostrip"
-
-S="${WORKDIR}/drm"
-PATCHVER="0.1"
-PATCHDIR="${WORKDIR}/patch"
-EXCLUDED="${WORKDIR}/excluded"
-
-DESCRIPTION="DRM Kernel Modules for X11"
-HOMEPAGE="http://dri.sf.net"
-SRC_URI="mirror://gentoo/${P}-gentoo-${PATCHVER}.tar.bz2
-	 mirror://gentoo/linux-drm-${PV}-kernelsource.tar.bz2"
-
-SLOT="0"
-LICENSE="X11"
-KEYWORDS="~x86 ~alpha ~ia64 ~ppc ~amd64"
-
-DEPEND=">=sys-devel/automake-1.7
-	>=sys-devel/autoconf-2.59
-	>=sys-devel/libtool-1.5.14
-	>=sys-devel/m4-1.4
-	virtual/linux-sources
-	>=sys-apps/portage-2.0.49-r13"
-
-pkg_setup() {
-	get_version
-
-	# Require at least one video card
-	if [ -z "${VIDEO_CARDS}" ]
-	then
-		die "Please set at least one video card in VIDEO_CARDS in make.conf or the environment. Possible VIDEO_CARDS values are: ${IUSE_VIDEO_CARDS}."
-	fi
-
-	if [ "${ARCH}" != "sparc" ] && use video_cards_ffb
-	then
-		die "The ffb driver is for sparc-specific hardware. Please remove it from your VIDEO_CARDS."
-	fi
-
-	if kernel_is 2 6
-	then
-		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 kernel_is 2 4
-	then
-		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.
-	set_vidcards
-
-	# DRM CVS is undergoing changes which require splitting source to support both 2.4
-	# and 2.6 kernels. This determines which to use.
-	get_drm_build_dir
-
-	return 0
-}
-
-src_unpack() {
-	unpack linux-drm-${PV}-kernelsource.tar.bz2
-	unpack ${P}-gentoo-${PATCHVER}.tar.bz2
-
-	cd ${S}
-
-	patch_prepare
-
-	# Apply patches
-	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
-
-	# Substitute new directory under /lib/modules/${KV_FULL}
-	cd ${SRC_BUILD}
-	sed -ie "s:/kernel/drivers/char/drm:/${PN}:g" Makefile
-
-	cp ${S}/tests/*.c ${SRC_BUILD}
-
-	cd ${S}
-	WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.7" autoreconf -v --install
-}
-
-src_compile() {
-	einfo "Building DRM in ${SRC_BUILD}..."
-	cd ${SRC_BUILD}
-
-	# This now uses an M= build system. Makefile does most of the work.
-	unset ARCH
-	make M="${SRC_BUILD}" \
-		LINUXDIR="${KERNEL_DIR}" \
-		DRM_MODULES="${VIDCARDS}" \
-		modules || die_error
-
-	# Building the programs. These are useful for developers and getting info from DRI and DRM.
-	#
-	# libdrm objects are needed for drmstat.
-	cd ${S}
-	econf || die "libdrm configure failed."
-	emake || die "libdrm build failed."
-
-	if linux_chkconfig_present DRM
-	then
-		echo "Please disable in-kernel DRM support to use this package."
-	fi
-
-	cd ${SRC_BUILD}
-	# LINUXDIR is needed to allow Makefiles to find kernel release.
-	make LINUXDIR="${KERNEL_DIR}" dristat || die "Building dristat failed."
-	make LINUXDIR="${KERNEL_DIR}" drmstat || die "Building drmstat failed."
-}
-
-src_install() {
-	einfo "Installing DRM..."
-	cd ${SRC_BUILD}
-
-	unset ARCH
-	kernel_is 2 6 && DRM_KMOD="drm.${KV_OBJ}"
-	make KV="${KV_FULL}" \
-		LINUXDIR="${KERNEL_DIR}" \
-		DESTDIR="${D}" \
-		RUNNING_REL="${KV_FULL}" \
-		MODULE_LIST="${VIDCARDS} ${DRM_KMOD}" \
-		install || die "Install failed."
-
-	dodoc README.drm
-
-	dobin dristat
-	dobin drmstat
-
-	# 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() {
-	if use video_cards_sis
-	then
-		einfo "SiS direct rendering only works on 300 series chipsets."
-		einfo "SiS framebuffer also needs to be enabled in the kernel."
-	fi
-
-	if use video_cards_mach64
-	then
-		einfo "The Mach64 DRI driver is insecure."
-		einfo "Malicious clients can write to system memory."
-		einfo "For more information, see:"
-		einfo "http://dri.sourceforge.net/cgi-bin/moin.cgi/ATIMach64?value=CategoryHardwareChipset."
-	fi
-
-	linux-mod_pkg_postinst
-}
-
-# Functions used above are defined below:
-
-set_vidcards() {
-	set_kvobj
-
-	VIDCARDS=""
-
-	use video_cards_mga && \
-		VIDCARDS="${VIDCARDS} mga.${KV_OBJ}"
-	use video_cards_3dfx && \
-		VIDCARDS="${VIDCARDS} tdfx.${KV_OBJ}"
-	use video_cards_r128 && \
-		VIDCARDS="${VIDCARDS} r128.${KV_OBJ}"
-	use video_cards_radeon && \
-		VIDCARDS="${VIDCARDS} radeon.${KV_OBJ}"
-	use video_cards_i810 && \
-		VIDCARDS="${VIDCARDS} i810.${KV_OBJ}"
-	use video_cards_i830 && \
-		VIDCARDS="${VIDCARDS} i830.${KV_OBJ}"
-	use video_cards_i915 && \
-		VIDCARDS="${VIDCARDS} i915.${KV_OBJ}"
-#	use video_cards_gamma && \
-#		VIDCARDS="${VIDCARDS} gamma.${KV_OBJ}"
-	use video_cards_mach64 && \
-		VIDCARDS="${VIDCARDS} mach64.${KV_OBJ}"
-	use video_cards_nv && \
-		VIDCARDS="${VIDCARDS} nv.${KV_OBJ}"
-	use video_cards_savage && \
-		VIDCARDS="${VIDCARDS} savage.${KV_OBJ}"
-	use video_cards_sis && \
-		VIDCARDS="${VIDCARDS} sis.${KV_OBJ}"
-	use video_cards_via && \
-		VIDCARDS="${VIDCARDS} via.${KV_OBJ}"
-	use video_cards_ffb && \
-		VIDCARDS="${VIDCARDS} ffb.${KV_OBJ}"
-}
-
-patch_prepare() {
-	# Handle exclusions based on the following...
-	#     All trees (0**), Standard only (1**), Others (none right now)
-	#     2.4 vs. 2.6 kernels
-
-	kernel_is 2 4 && mv -f ${PATCHDIR}/*kernel-2.6* ${EXCLUDED}
-	kernel_is 2 6 && mv -f ${PATCHDIR}/*kernel-2.4* ${EXCLUDED}
-
-	# There is only one tree being maintained now. No numeric exclusions need
-	# to be done based on DRM tree.
-}
-
-die_error() {
-	eerror "Portage could not build the DRM modules. If you see an ACCESS DENIED error,"
-	eerror "this could mean that you were using an unsupported kernel build system. All"
-	eerror "2.4 kernels are supported, but only 2.6 kernels at least as new as 2.6.6"
-	eerror "are supported."
-	die "Unable to build DRM modules."
-}
-
-get_drm_build_dir() {
-	if kernel_is 2 4
-	then
-		SRC_BUILD="${S}/linux"
-	elif kernel_is 2 6
-	then
-		SRC_BUILD="${S}/linux-core"
-	fi
-}
diff --git a/x11-base/x11-drm/x11-drm-4.3.0-r7.ebuild b/x11-base/x11-drm/x11-drm-4.3.0-r7.ebuild
deleted file mode 100644
index 7859decdd22d..000000000000
--- a/x11-base/x11-drm/x11-drm-4.3.0-r7.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# 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-4.3.0-r7.ebuild,v 1.8 2006/04/16 20:16:03 spyderous Exp $
-
-IUSE="gatos"
-IUSE_VIDEO_CARDS="3dfx gamma i810 i830 mga r128 radeon sis mach64"
-
-inherit eutils x11
-
-# Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
-# that only we only strip stuff that are safe to strip ...
-RESTRICT="nostrip"
-
-MY_PF=${PF/x11/xfree}
-SNAPSHOT="20031202"
-# Should probably renumber 010 to 100 and 040 to 140 for next patchset
-PATCHVER="0.4"
-PATCHDIR="${WORKDIR}/patch"
-EXCLUDED="${PATCHDIR}/excluded"
-S="${WORKDIR}/drm"
-DESCRIPTION="XFree86 Kernel DRM modules"
-HOMEPAGE="http://dri.sf.net"
-# Use the same patchset for all of them; exclude patches as necessary
-SRC_URI="mirror://gentoo/${MY_PF}-gentoo-${PATCHVER}.tar.bz2
-	mirror://gentoo/linux-drm-${PV}-kernelsource-${SNAPSHOT}.tar.bz2
-	gatos? ( mirror://gentoo/linux-drm-gatos-${PV}-kernelsource-${SNAPSHOT}.tar.bz2 )
-	video_cards_mach64? ( mirror://gentoo/linux-drm-mach64-${PV}-kernelsource-${SNAPSHOT}.tar.bz2 )"
-
-# These sources come from one of these places:
-#
-#   http://www.xfree86.org/~alanh/ -- Makefile.linux from DRM snapshots
-#   http://people.debian.org/~daenzer/ -- drm-ioremap patch
-#   http://dri.sourceforge.net CVS -- xc/xc/programs/Xserver/hw/os-support
-#		-- the CVS is at freedesktop.org now, but webpage is still sourceforge
-#
-# We throw all necessary files into one folder and turn that into our tarball.
-# find os-support/ -name *.[ch] -exec cp {} drm/ \;
-# find os-support/linux/drm/kernel/ -maxdepth 1 -type f -exec cp {} drm/ \;
-
-SLOT="${KV}"
-LICENSE="X11"
-KEYWORDS="x86 alpha ia64 ppc"
-
-# Need new portage for USE_EXPAND
-DEPEND="virtual/linux-sources
-	>=sys-apps/portage-2.0.49-r13"
-
-pkg_setup() {
-	# mach64 is exclusive of other modules
-	check_exclusive mach64
-
-	# Require at least one video card
-	if [ -z "${VIDEO_CARDS}" ]
-	then
-		die "Please set at least one video card in VIDEO_CARDS in make.conf or the environment. Possible VIDEO_CARDS values are: ${IUSE_VIDEO_CARDS}."
-	fi
-
-	# gatos doesn't build on anything but radeon
-	if use gatos
-	then
-		if ! use video_cards_radeon && ! use video_cards_r128
-		then
-			die "Remove gatos from your USE flags. It does not build for cards other than radeon and r128."
-		fi
-	fi
-
-	# 2.6 kernels are broken for now
-	is_kernel 2 6 && \
-		die "Please link ${ROOT}/usr/src/linux to 2.4 kernel sources. x11-drm does not yet work with 2.6 kernels, use the DRM in the kernel."
-
-	# Force at least make dep (this checks for bzImage, actually) (bug #22853)
-	if [ ! -f ${ROOT}/usr/src/linux/include/config/MARKER ]
-	then
-		die "Please compile kernel sources with \"make bzImage\"."
-	fi
-
-	# Set video cards to build for
-	set_vidcards
-
-	return 0
-}
-
-src_unpack() {
-	if use gatos
-	then
-		unpack linux-drm-gatos-${PV}-kernelsource-${SNAPSHOT}.tar.bz2
-	elif use video_cards_mach64
-	then
-		unpack linux-drm-mach64-${PV}-kernelsource-${SNAPSHOT}.tar.bz2
-	else # standard case
-		unpack linux-drm-${PV}-kernelsource-${SNAPSHOT}.tar.bz2
-	fi
-
-	unpack ${MY_PF}-gentoo-${PATCHVER}.tar.bz2
-
-	cd ${S}
-
-	# Move AGP checker and alanh's Makefile over
-	cp ${PATCHDIR}/picker.c ${S}
-	cp ${PATCHDIR}/Makefile.linux ${S}
-
-	patch_prepare
-
-	# Apply patches
-	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
-
-	# Change the install location for the modules.d stuff
-	sed -ie "s:/kernel/drivers/char/drm:/${PN}:g" Makefile.linux
-	sed -ie "s:xfree-drm:${PN}:g" Makefile
-}
-
-src_compile() {
-	ln -sf Makefile.linux Makefile
-	einfo "Building DRM..."
-	make ${VIDCARDS} \
-		TREE="${ROOT}/usr/src/linux/include" KV="${KV}"
-	# Build dristat utility (bug #18799)
-	# But, don't do it if the GATOS drivers are being built, since it won't work
-	if ! use gatos
-	then
-		make dristat || die
-	fi
-}
-
-src_install() {
-	einfo "installing DRM..."
-	make \
-		TREE="${ROOT}/usr/src/linux/include" \
-		KV="${KV}" \
-		DESTDIR="${D}" \
-		MODS="${VIDCARDS}" \
-		install || die
-	dodoc README*
-	if ! use gatos
-	then
-		exeinto /usr/X11R6/bin
-		doexe dristat
-
-		# Strip binaries, leaving /lib/modules untouched (bug #24415)
-		strip_bins \/lib\/modules
-	fi
-
-	# Shamelessly stolen from the sys-apps/thinkpad ebuild. Thanks!
-	keepdir /etc/modules.d
-	sed 's:%PN%:'${PN}':g' ${FILESDIR}/modules.d-${PN} > ${D}/etc/modules.d/${PN}
-	sed -i 's:%KV%:'${KV}':g' ${D}/etc/modules.d/${PN}
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]
-	then
-		/sbin/modules-update
-	fi
-
-	if use video_cards_sis
-	then
-		einfo "SiS direct rendering only works on 300 series chipsets."
-		einfo "SiS framebuffer also needs to be enabled in the kernel."
-	fi
-
-	if use video_cards_mach64
-	then
-		ewarn "The Mach64 DRI driver is insecure."
-		ewarn "Malicious clients can write to system memory."
-		ewarn "For more information, see:"
-		ewarn "http://dri.sourceforge.net/cgi-bin/moin.cgi/ATIMach64?value=CategoryHardwareChipset."
-	fi
-}
-
-
-# Functions used earlier are defined below.
-
-check_exclusive() {
-	# If a certain module is being built, don't allow any others.
-	# Most useful for mach64, since it must be built exclusively
-	# since the two directories are both named drm to make ${S} easier
-
-	local x
-	local c="0"
-	if use video_cards_${1}
-	then
-		for x in ${IUSE_VIDEO_CARDS}
-		do
-			if use video_cards_${x}
-			then
-				c="`expr ${c} + 1`"
-				if [ "${c}" -ge "2" ]
-				then
-					die "You cannot build for ${1} and any other card at the same time."
-				fi
-			fi
-		done
-	fi
-}
-
-set_vidcards() {
-	VIDCARDS=""
-
-	use video_cards_mga && \
-		VIDCARDS="${VIDCARDS} mga.o"
-	use video_cards_3dfx && \
-		VIDCARDS="${VIDCARDS} tdfx.o"
-	use video_cards_r128 && \
-		VIDCARDS="${VIDCARDS} r128.o"
-	use video_cards_radeon && \
-		VIDCARDS="${VIDCARDS} radeon.o"
-	use video_cards_sis && \
-		VIDCARDS="${VIDCARDS} sis.o"
-	use video_cards_i810 && \
-		VIDCARDS="${VIDCARDS} i810.o"
-	use video_cards_i830 && \
-		VIDCARDS="${VIDCARDS} i830.o"
-	use video_cards_gamma && \
-		VIDCARDS="${VIDCARDS} gamma.o"
-	use video_cards_mach64 && \
-		VIDCARDS="${VIDCARDS}  mach64.o"
-}
-
-patch_prepare() {
-	# Do patch excluding based on standard, mach64 or gatos here.
-	# 001-099: Patches used in multiple sources
-	# 100-199: Standard-only patches
-	# 200-299: Mach64 patches
-	# 300-399: Gatos patches
-	# Convention for excluding is to use the full patch number, or * for groups
-
-	# if [ ! "`is_kernel 2 6`" ]
-	# then
-	# 	mv -f ${PATCHDIR}/*2.6* ${EXCLUDED}
-	# fi
-
-	if use video_cards_mach64
-	then
-		einfo "Updating for mach64 build..."
-		# Exclude all non-mach64 patches
-		einfo "Excluding patches..."
-			patch_exclude 040 1* 3*
-		einfo "Done excluding patches"
-	elif use gatos
-	then
-		einfo "Updating for gatos build..."
-		# Exclude all non-gatos patches
-		einfo "Excluding patches..."
-			patch_exclude 010 040 1* 2*
-		einfo "Done excluding patches"
-	else # standard case
-		einfo "Updating for standard build..."
-		# Exclude all gatos or mach64 patches
-		einfo "Excluding patches..."
-			patch_exclude 2* 3*
-		einfo "Done excluding patches"
-	fi
-}