RIP x11-base/x11-drm (masked since 18 Sep 2009), see bug #284598 (no longer maintained)

8 files changed, 0 insertions, 2346 deletions

diff --git a/x11-base/x11-drm/ChangeLog b/x11-base/x11-drm/ChangeLog
deleted file mode 100644
index c58594187973..000000000000
--- a/x11-base/x11-drm/ChangeLog
+++ /dev/null
@@ -1,723 +0,0 @@
-# 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.82 2009/08/06 05:32:33 battousai Exp $
-
-*x11-drm-20090805 (05 Aug 2009)
-
-  05 Aug 2009; Bryan Stine <battousai@gentoo.org> +x11-drm-20090805.ebuild:
-  Version bump to 20090805.
-
-  28 Jul 2009; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
-  This package moves under x11 jurisdiction. x11-drivers are going to be
-  killed.
-
-  23 Jul 2009; Joseph Jezak <josejx@gentoo.org> x11-drm-20090320.ebuild:
-  Marked ppc stable for bug #270495.
-
-  01 Jul 2009; Markus Meier <maekke@gentoo.org> x11-drm-20090320.ebuild:
-  amd64 stable, bug #270495
-
-  27 Jun 2009; Tobias Klausmann <klausman@gentoo.org>
-  x11-drm-20090320.ebuild:
-  Stable on alpha, bug #270495
-
-  15 Jun 2009; Bryan Stine <battousai@gentoo.org> x11-drm-20090320.ebuild:
-  Update 20090320 to patchball 0.2. Adds kernel 2.6.30 compatibility and
-  fixes <2.6.26 compatibility problem introduced by that patch. Fixes bug
-  #274203.
-
-  13 Jun 2009; Raúl Porcel <armin76@gentoo.org> x11-drm-20090320.ebuild:
-  ia64 stable wrt #270495
-
-  25 May 2009; Christian Faulhammer <fauli@gentoo.org>
-  x11-drm-20090320.ebuild:
-  stable x86, bug 270495
-
-  18 Apr 2009; Bryan Stine <battousai@gentoo.org> x11-drm-20090320:
-  Remove patch_prepare() as its purpose is no longer relevant. Fixes bug
-  #266481.
-
-  31 Mar 2009; Bryan Stine <battousai@gentoo.org> x11-drm-20090320.ebuild:
-  Add DEPEND for >=x11-libs/libdrm-2.4.3. The external tools now build
-  against the system libdrm. Fixes bug #264297.
-
-  28 Mar 2009; Bryan Stine <battousai@gentoo.org> x11-drm-20090320.ebuild:
-  Remove unneeded AGP and (useless) extra DRM kernel config checks.
-
-  27 Mar 2009; Bryan Stine <battousai@gentoo.org> 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)
-
-  20 Mar 2009; Bryan Stine <battousai@gentoo.org> +x11-drm-20090320.ebuild:
-  Bump to 20090320 with improved version from x11 overlay. Includes various
-  minor ebuild fixes, radeonhd support, xgi support, and nouveau in favor of
-  defunct nv module. Fixes bug #260728, thanks to Tanktalus.
-
-  05 Feb 2009; Rémi Cardona <remi@gentoo.org> x11-drm-20080710.ebuild:
-  disable tests since they require user intervention (see bug #236845)
-
-  22 Jan 2009; Bryan D. Stine <battousai@gentoo.org>
-  -x11-drm-20060608.ebuild, -x11-drm-20060608-r1.ebuild,
-  x11-drm-20070314.ebuild, x11-drm-20071019.ebuild, x11-drm-20080710.ebuild:
-  Push 20080710 patchball 0.5, restoring compatibility with kernel 2.6.28.
-  Dropped old 20060608 snapshot. Rename I810_VIDCARDS to INTEL_VIDCARDS for
-  consistency. 20080710-0.5 fixes bug #255956.
-
-  02 Nov 2008; Markus Meier <maekke@gentoo.org> x11-drm-20070314.ebuild:
-  amd64/x86 stable, bug #237876
-
-  22 Oct 2008; Rémi Cardona <remi@gentoo.org> x11-drm-20060608.ebuild,
-  x11-drm-20060608-r1.ebuild, x11-drm-20070314.ebuild,
-  x11-drm-20071019.ebuild, x11-drm-20080710.ebuild:
-  pkgmove from xf86-video-i810 to xf86-video-intel
-
-  16 Oct 2008; Raúl Porcel <armin76@gentoo.org> x11-drm-20070314.ebuild:
-  alpha/ia64 stable wrt #237876
-
-  21 Sep 2008; nixnut <nixnut@gentoo.org> x11-drm-20070314.ebuild:
-  Stable on ppc wrt bug 237876
-
-  16 Sep 2008; Bryan D. Stine <battousai@gentoo.org>
-  x11-drm-20070314.ebuild, x11-drm-20071019.ebuild:
-  Push 20070314 patchball 0.6 and 20071019 patchball 0.3, restoring 2.6.26
-  compatibility and fixing bug #232120. Incidentally, I've also restored
-  2.6.27 compatibility in 20070314-0.6. Unfortunately, I wasn't able to get
-  it done with 20071019 yet, due to a nouveau fart.
-
-  15 Sep 2008; Bryan D. Stine <battousai@gentoo.org>
-  x11-drm-20080710.ebuild:
-  Push 20080710 patchball 0.4, fixing a function argument mismatch on older
-  kernels. Reported by a forums user. Fixes bug #237780.
-
-  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:
-  Bumped 20070314 to patchball 0.5, 20080710 to patchball 0.3. Both add the
-  __ucmpdi2 fix for PPC. Added information to 20080710 ebuild regarding the
-  issues that can be caused by having old in-kernel DRM modules installed.
-  The new patchballs fix bug #204985.
-
-  12 Sep 2008; Bryan D. Stine <battousai@gentoo.org>
-  x11-drm-20070314.ebuild, x11-drm-20080710.ebuild:
-  Bump 20070314 to patchball 0.4, with FreeBSD fix. Bump masked 20080710 to
-  patchball 0.2 with numerous fixes and an initial Changelog, removed
-  modprobe.d, and better linux-mod functionality.
-
-  11 Jul 2008; Bryan Stine <battousai@gentoo.org> x11-drm-20070314.ebuild:
-  20070314 patchball update for updated kernel compatibility.
-
-*x11-drm-20080710 (11 Jul 2008)
-
-  11 Jul 2008; Bryan Stine <battousai@gentoo.org> +x11-drm-20080710.ebuild:
-  Introduce 20080710 snapshot. Now includes modprobe.d entry, which needs
-  testing and/or comments, and an added XGI module. This is masked until I'm
-  happy with the modprobe.d config.
-
-  11 Jul 2008; Bryan Stine <battousai@gentoo.org> -x11-drm-20051223.ebuild,
-  x11-drm-20060608-r1.ebuild, x11-drm-20070314.ebuild,
-  x11-drm-20071019.ebuild:
-  Push patchball 0.2 for 20071019 to restore compatibility with 2.6.25.
-  Closes bug #218419, thanks to reporter Antti Mäkelä for providing the
-  patch. Additionally, clean up QA notices and expunge old version 20051223.
-
-*x11-drm-20071019 (20 Oct 2007)
-
-  20 Oct 2007; Bryan Stine <battousai@gentoo.org> +x11-drm-20071019.ebuild:
-  Bump to new snapshot. No more i830 module upstream.
-
-  09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
-  x11-drm-20051223.ebuild, x11-drm-20060608.ebuild,
-  x11-drm-20060608-r1.ebuild, x11-drm-20070314.ebuild:
-  Fix quoting issues caught by latest repoman.
-
-  02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
-  x11-drm-20051223.ebuild:
-  (QA) RESTRICT clean up.
-
-  14 Mar 2007; Bryan Stine <battousai@gentoo.org> x11-drm-20060608.ebuild,
-  x11-drm-20060608-r1.ebuild, x11-drm-20070314.ebuild:
-  Ebuild fixes across the board since 20060608 for proper linux-mod and
-  autotools usage, as well as KBUILD_OUTPUT support. Thanks jakub(bug #150957)
-  and Zhang Le(bug #170842).
-
-*x11-drm-20070314 (14 Mar 2007)
-
-  14 Mar 2007; Bryan Stine <battousai@gentoo.org> +x11-drm-20070314.ebuild:
-  New snapshot of upstream git. Mesa upstream drm has removed support for 2.4
-  kernels, so this ebuild will die if the user attempts to build against such
-  sources. Most likely, this means we'll have to keep 20060608 around. The
-  nouveau module is now installed alongside nv, so users can load the one they
-  want (probably nouveau). The updated snapshot should fix bug #165553.
-
-  04 Jan 2007; Bryan Stine <battousai@gentoo.org> x11-drm-20060608.ebuild,
-  x11-drm-20060608-r1.ebuild:
-  Patchset 0.3, added a patch to make the linux/config.h include conditional.
-  This file is no longer available with kernels 2.6.19 and newer. Fixes bug
-  #156784.
-
-  02 Jan 2007; Javier Villavicencio <the_paya@gentoo.org>
-  x11-drm-20060608-r1.ebuild:
-  Fixes i810 video cards selection for FreeBSD.
-
-  02 Jan 2007; Donnie Berkholz <dberkholz@gentoo.org>;
-  x11-drm-20060608-r1.ebuild:
-  We don't need to special-case for unset VIDEO_CARDS, since we now have
-  defaults in profiles.
-
-  20 Dec 2006; Donnie Berkholz <dberkholz@gentoo.org>;
-  x11-drm-20060608-r1.ebuild:
-  Trailing whitespace.
-
-  20 Dec 2006; Donnie Berkholz <dberkholz@gentoo.org>;
-  -x11-drm-4.3.0-r7.ebuild, -x11-drm-20050502.ebuild,
-  -x11-drm-20050807.ebuild, -x11-drm-20051028.ebuild:
-  Clean up.
-
-*x11-drm-20060608-r1 (20 Dec 2006)
-
-  20 Dec 2006; Donnie Berkholz <dberkholz@gentoo.org>;
-  +x11-drm-20060608-r1.ebuild:
-  (#148572) Add FreeBSD support. Significant refactoring to keep OS-specific
-  stuff out of the main ebuild functions. Initial work by Javier Villavicencio,
-  later refactoring by me.
-
-  25 Nov 2006; Bryan Østergaard <kloeri@gentoo.org>
-  x11-drm-20060608.ebuild:
-  Stable on Alpha.
-
-  24 Sep 2006; <blubb@gentoo.org> x11-drm-20060608.ebuild:
-  stable on amd64
-
-  18 Sep 2006; Tim Yamin <plasmaroo@gentoo.org> x11-drm-20060608.ebuild:
-  Stable on IA64; bug #112378.
-
-  18 Sep 2006; Joseph Jezak <josejx@gentoo.org> x11-drm-20060608.ebuild:
-  Marked ppc stable for bug #112378.
-
-  10 Sep 2006; <ticho@gentoo.org> x11-drm-20060608.ebuild:
-  Stable on x86, bug #112378.
-
-  07 Sep 2006; Bryan Stine <battousai@gentoo.org> x11-drm-20051028.ebuild,
-  x11-drm-20051223.ebuild, x11-drm-20060608.ebuild:
-  Snapshot ebuilds is_kernel -> kernel_is. Bump 20060608 patchball version to
-  0.2 with a new patch to define TRUE, FALSE if they don't already exist for
-  some reason. Thanks to Alon Bar-Lev (bug #137712).
-
-  01 Sep 2006; Bryan Stine <battousai@gentoo.org> x11-drm-20050807.ebuild,
-  x11-drm-20051028.ebuild, x11-drm-20051223.ebuild, x11-drm-20060608.ebuild:
-  Set valid WANT_AUTOCONF, bug #143429.
-
-  31 Aug 2006; Bryan Stine <battousai@gentoo.org> x11-drm-20050502.ebuild,
-  x11-drm-20050807.ebuild, x11-drm-20051028.ebuild, x11-drm-20051223.ebuild,
-  x11-drm-20060608.ebuild:
-  Fix linux-mod usage in pkg_postinst.
-
-  07 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog:
-  Update to my new email address.
-
-  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)
-
-  08 Jun 2006; Bryan Stine <battousai@gentoo.org> +x11-drm-20060608.ebuild:
-  Bump to new snapshot.
-
-  16 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>;
-  x11-drm-20051223.ebuild:
-  Split out ATI cards again, into mach64, r128 and radeon.
-
-  16 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>;
-  x11-drm-20051223.ebuild:
-  Alphabetize card ordering.
-
-  16 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>;
-  x11-drm-4.3.0-r7.ebuild, x11-drm-20050502.ebuild, x11-drm-20050807.ebuild,
-  x11-drm-20051028.ebuild:
-  Change VIDEO_CARDS rage128 to r128 for compatibility with other ebuilds.
-
-  17 Feb 2006; Luca Barbato <lu_zero@gentoo.org> x11-drm-20051223.ebuild:
-  Fix for bug #123094 thanks to Stefano <raistlin@s0ftpj.org>
-
-  03 Feb 2006; Donnie Berkholz <dberkholz@gentoo.org>;
-  x11-drm-20051223.ebuild:
-  Fix up VIDEO_CARDS naming and use to be consistent with xorg-x11.
-
-  28 Jan 2006; Donnie Berkholz <dberkholz@gentoo.org>;
-  x11-drm-20051223.ebuild:
-  Fix up VIDEO_CARDS use so that it shows up for emerge -vp.
-
-  28 Jan 2006; Donnie Berkholz <dberkholz@gentoo.org>;
-  x11-drm-20051223.ebuild:
-  Add VIDEO_CARDS=ati for compatibility with modular X. It enables modules for
-  all ATi cards: r128, radeon, mach64.
-
-  28 Jan 2006; Donnie Berkholz <dberkholz@gentoo.org>;
-  x11-drm-4.3.0-r7.ebuild, x11-drm-20050502.ebuild, x11-drm-20050807.ebuild,
-  x11-drm-20051028.ebuild, x11-drm-20051223.ebuild:
-  Change VIDEO_CARDS=matrox to mga for compatibility with xorg-x11. Also port
-  everything to modular X.
-
-*x11-drm-20051223 (24 Dec 2005)
-
-  24 Dec 2005; Bryan Stine <battousai@gentoo.org> +x11-drm-20051223.ebuild:
-  Snapshot bump to 20051223. Happy holidays.
-
-  14 Dec 2005; Donnie Berkholz <dberkholz@gentoo.org>;
-  x11-drm-20051028.ebuild:
-  Port to modular X. Doesn't actually require virtual/x11 to build.
-
-*x11-drm-20051028 (29 Oct 2005)
-
-  29 Oct 2005; Bryan Stine <battousai@gentoo.org> x11-drm-20050807.ebuild,
-  +x11-drm-20051028.ebuild:
-  Snapshot bump to introduce new skeletal nv driver, provided for speedy EXA
-  via DMA transfers.
-  
-  Applied the patch provided by Alon Bar-Lev to properly identify the kernel
-  source directory and kernel version. Incidentally, also stopped SLOTting
-  against the kernel version. The patch fixes bug #105233.
-  
-  No longer installs libdrm files, since the only parts of libdrm needed for
-  this package are the object files at compile time. Thanks to Alon Bar-Lev
-  for pointing out the conflict with modular x11-libs/libdrm. Fixes bug
-  #108504.
-
-*x11-drm-20050807 (08 Aug 2005)
-
-  08 Aug 2005; Bryan Stine <battousai@gentoo.org> -x11-drm-20040827.ebuild,
-  -x11-drm-20040827-r1.ebuild, x11-drm-20050502.ebuild,
-  +x11-drm-20050807.ebuild:
-  Drop old dated snapshot. Added minor i915 fixes to 20050502 0.2 patchball,
-  marking that snapshot stable. Bumped up to a 20050807 snapshot.
-
-  18 May 2005; Bryan Stine <battousai@gentoo.org> x11-drm-4.3.0-r7.ebuild,
-  x11-drm-20040827.ebuild, x11-drm-20040827-r1.ebuild,
-  x11-drm-20050502.ebuild:
-  Remove invalid PROVIDE. Thanks Mr_Bones_.
-
-  10 May 2005; Bryan Stine <battousai@gentoo.org> -x11-drm-20050104.ebuild:
-  Goodbye, 20050104. You piece of crap.
-
-*x11-drm-20050502 (03 May 2005)
-
-  03 May 2005; Bryan Stine <battousai@gentoo.org> +x11-drm-20050502.ebuild:
-  New snapshot. Builds linux-core now, and as such has checks for proper
-  kernel config. Also warns when AGP is not enabled.
-
-  25 Apr 2005; <brix@gentoo.org> :
-  Dependency update: sys-apps/pcmcia-cs -> app-laptop/pcmcia-cs.
-
-  25 Apr 2005; <brix@gentoo.org> :
-  Dependency update: sys-apps/pcmcia-cs -> app-laptop/pcmcia-cs.
-
-  25 Apr 2005; <brix@gentoo.org> :
-  Dependency update: sys-apps/pcmcia-cs -> app-laptop/pcmcia-cs.
-
-  25 Apr 2005; Donnie Berkholz <dberkholz@gentoo.org>; metadata.xml:
-  Update herd to x11-drivers.
-
-  24 Jan 2005; Bryan Stine <battousai@gentoo.org x11-drm-20050104.ebuild:
-  Forgot to remove IUSE="gatos".
-
-*x11-drm-20050104 (07 Jan 2005)
-
-  07 Jan 2005; Bryan D. Stine <battousai@gentoo.org> +x11-drm-20050104.ebuild:
-  New snapshot, 20050104. This needs testing and is hard-masked currently.
-
-*x11-drm-20040827-r1 (22 Dec 2004)
-
-  22 Dec 2004; Bryan D. Stine <battousai@gentoo.org>
-  +x11-drm-20040827-r1.ebuild, x11-drm-20040827.ebuild:
-  Gah, somehow forgot to bump the patchball revision. Also, ${PF} -> ${P} in
-  patchball SRC_URI.
-
-  15 Dec 2004; Bryan Stine <battousai@gentoo.org>; x11-drm-20040827.ebuild:
-  Add a patch to fix lockfile vulnerability (CAN-2004-1056: Insufficient
-  locking checks in DRM code). This bumps the patchball up to 0.2. Closes bug
-  #74464.
-
-  07 Dec 2004; Bryan Stine <battousai@gentoo.org>; x11-drm-20040827.ebuild:
-  Now with linux-mod eclass goodness, no more kernel-mod.
-
-  23 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>;
-  -x11-drm-4.3.0-r6.ebuild:
-  Remove old version, last one with USE flags rather than VIDEO_CARDS.
-
-  04 Nov 2004; Bryan Stine <battousai@gentoo.org> x11-drm-20040827.ebuild:
-  Updated 20040827 snapshot ebuild for the kmod deprecation. Thanks to Stefan
-  Schweizer <sschweizer@gmail.com> for the patch. This closes bug #68453.
-
-  31 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; :
-  Restore changelog entries from when it was xfree-drm.
-
-  28 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>;
-  x11-drm-20040827.ebuild, x11-drm-4.3.0-r6.ebuild, x11-drm-4.3.0-r7.ebuild:
-  Inherit x11, not xfree eclass.
-
-  04 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>; x11-drm-4.3.0-r7.ebuild:
-  moved to ppc stable
-  
-  01 Sep 2004; Bryan Stine <battousai@gentoo.org>; x11-drm-20040827.ebuild,
-  x11-drm-4.3.0-r7.ebuild:
-  Add sed to fix Makefile install location again. Closes 62188.
-
-  31 Aug 2004; Donnie Berkholz <dberkholz@gentoo.org>;
-  x11-drm-20040827.ebuild:
-  Fix use() invocation, thanks to Michael Sterrett <mr_bones_@gentoo.org>.
-
-*x11-drm-4.3.0-r6 (29 Aug 2004)
-
-  29 Aug 2004; Bryan Stine <battousai@gentoo.org>; +metadata.xml,
-  +files/modules.d-x11-drm, +x11-drm-20040827.ebuild,
-  +x11-drm-4.3.0-r6.ebuild, +x11-drm-4.3.0-r7.ebuild:
-  Moved xfree-drm ebuilds to x11-drm. No notable changes have been made to them.
-  Snapshot 20040827 has been added, which begins the new versioning, since this
-  is based on dri.sf.net drm snapshots. Improvements in the new snapshot include
-  2.6 support for 2.6.6+ kernels and koutput, along with many upstream changes.
-
-  26 Jul 2004; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r6.ebuild, xfree-drm-4.3.0-r7.ebuild,
-  xfree-drm-4.3.0-r8.ebuild:
-  /usr/src/linux needs ${ROOT}.
-
-  23 Jun 2004; Aron Griffis <agriffis@gentoo.org> xfree-drm-4.3.0-r6.ebuild,
-  xfree-drm-4.3.0-r7.ebuild, xfree-drm-4.3.0-r8.ebuild:
-  QA - move video card tests into pkg_setup, fix use invocation
-
-  11 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r6.ebuild, xfree-drm-4.3.0-r7.ebuild,
-  xfree-drm-4.3.0-r8.ebuild:
-  Change x11-base/xfree dependency to virtual/x11.
-
-  08 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r8.ebuild:
-  Change KEYWORDS to ~x86 only, at genone's request.
-
-  08 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r8.ebuild:
-  Drop kmod from inherit since it's not around yet.
-
-*xfree-drm-4.3.0-r8 (06 Apr 2004)
-
-  06 Apr 2004; Bryan Stine <bryan@gentoo.org> xfree-drm-4.3.0-r8.ebuild:
-  Added in-development version 4.3.0-r8. This is not ready for use yet. Changes
-  from previous include handling 2.6 kernels and the modules.d fix. I may have
-  forgotten something here and there may be more coming.
-
-  20 Mar 2004; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r2.ebuild:
-  Pull old version. It was the only stable on amd64, but amd64 doesn't support
-  2.4 kernels (#39175).
-
-  16 Mar 2004; Donnie Berkholz <dberkholz@gentoo.org>; :
-  Fixing root@gentoo.org changelog entry.
-
-  14 Mar 2004; Bryan Stine <battousai@gentoo.org> xfree-drm-4.3.0-r7.ebuild,
-  files/modules.d-xfree-drm:
-  Changed the location where modules get installed to /lib/modules/KV/xfree-drm.
-  Consequently, I added the modules.d template to files/.
-
-  09 Mar 2004; <agriffis@gentoo.org> xfree-drm-4.3.0-r7.ebuild:
-  stable on alpha and ia64
-
-  21 Feb 2004; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r7.ebuild:
-  Move einfo for patch exclusion from xfree eclass to ebuild.
-
-  21 Feb 2004; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r7.ebuild:
-  PATCH_VER 0.4. Add 210_ppc_mach64-drm-ioremap-agp.patch, made by David Holm
-  <dholm@gentoo.org> on bug #40314. Also contains a remade
-  010_ppc_drm-ioremap-agp.patch, again thanks to David. Change numbering of
-  patches also.
-
-  21 Feb 2004; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r7.ebuild:
-  Start using new patch_exclude() from xfree.eclass for patch exclusion.
-
-  21 Feb 2004; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r7.ebuild:
-  Cleanup, mostly comments and quotes.
-
-  15 Feb 2004; David Holm <dholm@gentoo.org> xfree-drm-4.3.0-r7.ebuild:
-  Fixed broken ioremap patch and added to ~ppc.
-
-  10 Feb 2004; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r7.ebuild:
-  Fixing for ppc mach64 -- ioremap patch is broken. Trying without it for now to
-  see whether things work. David Holm <dholm@gentoo.org> reports it works with
-  forced PCI mode.
-
-  09 Feb 2004; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r7.ebuild:
-  Adding warning about insecurity of mach64.
-
-  09 Feb 2004; Aron Griffis <agriffis@gentoo.org> xfree-drm-4.3.0-r7.ebuild:
-  Add ~alpha and ~ia64. matrox, i810 and i830 fail to build on alpha, but I'll
-  wait for that to be an issue for somebody before trying to fix it
-
-  08 Feb 2004; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r6.ebuild:
-  Use portage internal USE_EXPAND instead of xfree.eclass vcards(), add
-  IUSE_VIDEO_CARDS line.
-
-  23 Jan 2004; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r7.ebuild:
-  Marking stable on x86. It's been in testing for a month and a half without a
-  whisper. Keep in mind that the gatos USE flag only works in combination with
-  the gatos USE flag on 4.3.0-r4 (soon to be released) and the ati-gatos
-  package.
-
-  19 Jan 2004; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r2.ebuild, xfree-drm-4.3.0-r6.ebuild,
-  xfree-drm-4.3.0-r7.ebuild:
-  Changing homepage to dri.sf.net.
-
-  16 Dec 2003; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r7.ebuild:
-  PATCH_VER 0.3. Update to 004_all_radeon-rage128-pci-id-updates-v2.patch, which
-  adds IGP cards and fixes a small typo in the naming of another card.
-
-  14 Dec 2003; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r7.ebuild:
-  PATCH_VER 0.2. Added 004_all_radeon-rage128-pci-id-updates.patch to try to
-  help newer cards work better. For standard DRM only.
-
-*xfree-drm-4.3.0-r7 (08 Dec 2003)
-
-  08 Dec 2003; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r7.ebuild:
-  20031202 snapshot. Adds support for mach64. Also adds initial support for
-  gatos, accompanied by USE=gatos in xfree and a coming ati-gatos ebuild.
-  Obsoletes USE for video cards, moving to VIDEO_CARDS.
-
-  05 Dec 2003; <agriffis@gentoo.org> xfree-drm-4.3.0-r6.ebuild:
-  Stable on ia64
-
-  24 Nov 2003; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r6.ebuild:
-  Added warning for genkernel users to change processor type to something
-  greater than 386.
-
-  20 Oct 2003; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r6.ebuild:
-  Making warning for uncompiled kernel more verbose. Bug #31556.
-
-  16 Oct 2003; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r6.ebuild:
-  Making 2.6 kernel warning more verbose.
-
-  14 Oct 2003; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r6.ebuild:
-  Revert sis300 to sis, makes things easier.
-
-  14 Oct 2003; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r6.ebuild:
-  Moving VIDEO_CARDS=sis to sis300 to make it more clear that it doesn't work on
-  315 series. Preventing xfree-drm from emerging on 2.6 kernels, it doesn't work
-  yet so the kernel DRM must be used. Adding warning for SiS.
-
-  04 Oct 2003; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r3.ebuild, xfree-drm-4.3.0-r4.ebuild,
-  xfree-drm-4.3.0-r5.ebuild:
-  Pulling broken versions.
-
-  29 Sep 2003; Aron Griffis <agriffis@gentoo.org> xfree-drm-4.3.0-r6.ebuild:
-  Stable on alpha
-
-  12 Aug 2003; Donnie Berkholz <dberkholz@gentoo.org>
-  xfree-drm-4.3.0-r6.ebuild: Fixes for bug #25598 and bug #24415, general
-  cleanup.
-
-  28 Jul 2003; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r6.ebuild:
-  Bumped patchset to 0.3 to fix ppc problems with ioremap patch.
-
-  27 Jul 2003; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r6.ebuild:
-  Added drm-ioremap patch to fix PPC build.
-
-  22 Jul 2003; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r6.ebuild:
-  Moving to stable on x86. ppc still having issues.
-
-  16 Jul 2003; Donnie Berkholz <dberkholz@gentoo.org> xfree-drm-4.3.0-r6.ebuild:
-  Moved to ~arch for x86 and alpha. Still needs work for ppc.
-
-*xfree-drm-4.3.0-r6 (14 Jul 2003)
-
-  14 Jul 2003; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r6.ebuild:
-  Fixed Makefile so it actually uses /usr/src/linux, fixed sandbox issues,
-  updated drm to fix various bugs including i810 problems, fixed pte_offset
-  unresolved symbols issue.
-
-  13 Jul 2003; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r3.ebuild, xfree-drm-4.3.0-r5.ebuild:
-  Moving -r3 through -r5 to -ppc.
-
-  07 Jul 2003; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r5.ebuild:
-  Moving to ~arch after MTRR_TYPE_WRCOMB problems with -r4.
-
-*xfree-drm-4.3.0-r5 (01 Jul 2003)
-
-  01 Jul 2003; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r5.ebuild:
-  Updating to today's DRI, in hopes of solving a couple of problems with
-  MTRR_TYPE_WRCOMB. Masked for testing.
-
-  30 Jun 2003; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r4.ebuild:
-  Changed XFREE_CARDS to VIDEO_CARDS so non-xfree apps can use it. Also made the
-  USE + VIDEO_CARDS work better.
-
-  29 Jun 2003; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r4.ebuild:
-  Moved to -ppc until the patch works.
-
-  29 Jun 2003; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r4.ebuild:
-  Add xfree.eclass for better XFREE_CARDS functionality.
-
-  29 Jun 2003; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r4.ebuild:
-  Updated patch to fix sis not working.
-
-*xfree-drm-4.3.0-r4 (29 Jun 2003)
-
-  29 Jun 2003; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r4.ebuild:
-  Updated sources to June 18 CVS. Added XFREE_CARDS functionality and deprecated
-  USE for video cards, similar to ALSA_CARDS for ALSA.
-
-  27 Jun 2003; Donnie Berkholz <dberkholz@gentoo.org>;
-  xfree-drm-4.3.0-r3.ebuild:
-  Now dies with error instead of compiling all modules when none are specified.
-  Also doesn't compile modules twice anymore.
-
-  15 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xfree-drm-4.3.0-r3.ebuild:
-  reverting
-
-  14 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xfree-drm-4.3.0-r3.ebuild:
-  Magnade in #gentoo-dev fixed up the Makefile so that it installs all the
-  modules by default. Many thanks to him
-
-*xfree-drm-4.3.0-r3 (14 Jun 2003)
-
-  14 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xfree-drm-4.3.0-r1.ebuild,
-  xfree-drm-4.3.0-r2.ebuild, xfree-drm-4.3.0-r3.ebuild,
-  xfree-drm-4.3.0.ebuild, files/xfree-drm-4.3.0-gentoo-Makefile-fixup.patch,
-  files/xfree-drm-4.3.0-gentoo-ppc-Makefile-fixup.patch,
-  files/xfree-drm-4.3.0-r2-dristat.patch,
-  files/xfree-drm-4.3.0-r2-drm-ioremap.patch,
-  files/xfree-drm-4.3.0-r2-gentoo-Makefile-fixup.patch,
-  files/xfree-drm-4.3.0-r2-radeon-resume-v8.patch:
-  moved patches to mirrors. Also version bump to a more recent snapshot, with
-  daenzer's patches. This excellent work and the -r3 ebuild comes to you from
-  dberkholz, who is Donnie Berkholz <donnie.berkholz@richmond.edu>
-
-  24 Apr 2003; Michael Fitzpatrick <leahcim@gentoo.org>
-  xfree-drm-4.3.0-r2.ebuild, files/xfree-drm-4.3.0-r2-dristat.patch: Add
-  dristat (modified patch from Mathias Hasselmann) bug #18799. Fixed slot.
-
-  23 Apr 2003; Luca Barbato <lu_zero@gentoo.org>
-  xfree-drm-4.3.0-r2.ebuild, xfree-drm-4.3.0.ebuild:
-  Fix the KV issue.
-
-*xfree-drm-4.3.0-r2 (22 Apr 2003)
-
-  22 Apr 2003; Michael Fitzpatrick <leahcim@gentoo.org>
-  xfree-drm-4.3.0-r2.ebuild, files/digest-xfree-drm-4.3.0-r2,
-  files/xfree-drm-4.3.0-r2-gentoo-Makefile-fixup.patch,
-  files/xfree-drm-4.3.0-r2-radeon-resume-v8.patch : 
-  Combine x86 and ppc builds. Added "radeon resume/suspend" patch. 
-
-  24 Mar 2003; Martin Schlemmer <azarah@gentoo.org> xfree-drm-4.3.0.ebuild :
-  Update to rather use the "more official" DRM sources from
-  http://www.xfree86.org/~alanh/.  I did though rather create a date versioned
-  tarball on ibibilo, as they are only versioned on that site with the release
-  version of XFree86, and might change in future (bugfixes, etc).
-
-*xfree-drm-4.3.0-r1 (02 Mar 2003)
-
-  15 Mar 2003; Mark Guertin <gerk@gentoo.org> xfree-drm-4.3.0-r1.ebuild :
-  set ppc in keywords
-
-  02 Mar 2003; Mark Guertin <gerk@gentoo.org> xfree-drm-4.3.0-r1.ebuild files/digest-xfree-drm-4.3.0-r1 :
-  rev bump to match current xfree
-
-*xfree-drm-4.3.0 (28 Feb 2003)
-
-  21 Apr 2003; Seemant Kulleen <seemant@gentoo.org> Manifest,
-  xfree-drm-4.3.0.ebuild:
-  changed to stable x86. Awaiting leachim's -r2 which combines x86 and ppc (and
-  others?)
-
-  25 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xfree-drm-4.3.0.ebuild:
-  changed ibm USE to i8x0 USE which is more accurate. Thanks to: Marcin Wisnicki
-  <wisnia21@freeshell.org> in bug #18046
-
-  17 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xfree-drm-4.3.0.ebuild:
-  use KVERS which gets running kernel's version, instead of KV. Closes bug
-  #17545 by Sankara Krishnamoorthy <snkmoorthy@netscape.net>
-
-  05 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xfree-drm-4.3.0.ebuild:
-  using USE variables to determine which specific modules to install
-
-  28 Feb 2003; Seemant Kulleen <seemant@gentoo.org> xfree-drm-4.3.0.ebuild,
-  files/xfree-drm-4.3.0-gentoo-Makefile-fixup.patch:
-  version bump to match xfree's version
-
-*xfree-drm-4.2.99.902 (26 Feb 2003)
-
-  26 Feb 2003; Seemant Kulleen <seemant@gentoo.org> xfree-drm-4.2.99.902.ebuild files/digest-xfree-drm-4.2.99.902 files/xfree-drm-4.2.99.902-gentoo-Makefile-fixup.patch :
-  version bump to match newest X snapshot
-
-*xfree-drm-4.2.99.4-r1 (07 Feb 2003)
-
-  19 Feb 2003; Mark Guertin <gerk@gentoo.org> xfree-drm-4.2.99.4-r1.ebuild :
-  set -r1 to ~ppc only, had major issues with portage eating digests cause it couldn't deal with all the SRC_URI juggling with x86 vs. ppc.
-
-  08 Feb 2003; Seemant Kulleen <seemant@gentoo.org>
-  files/digest-xfree-drm-4.2.99.4-r1 :
-
-  Added digest
-
-  07 Feb 2003; Mark Guertin <gerk@gentoo.org> xfree-drm-4.2.99.4-r1.ebuild
-  files/xfree-drm-4.2.99.4-gentoo-ppc-Makefile-fixup.patch:
-  Major reworking of parts for ppc sections.  Using a drm tarball.
-  x86 not set at all as it's not tested yet (method stays same for 
-  x86). Set only as ~ppc
-
-*xfree-drm-4.2.99.4 (03 Feb 2003)
-
-  03 Feb 2003; Seemant Kulleen <seemant@gentoo.org>
-  xfree-drm-4.2.99.4.ebuild
-  files/xfree-drm-4.2.99.4-gentoo-Makefile-fixup.patch
-  files/digest-xfree-drm-4.2.99.4 :
-
-  version bump for newer snapshot
-
-*xfree-drm-4.2.99.3 (03 Feb 2003)
-
-  03 Feb 2003; Martin Schlemmer <azarah@gentoo.org> xfree-drm-4.2.99.3.ebuild
-  files/xfree-drm-4.2.99.3-gentoo-Makefile-fixup.patch
-  files/digest-xfree-drm-4.2.99.3 :
-
-  Initial version submitted by myself.
-
diff --git a/x11-base/x11-drm/Manifest b/x11-base/x11-drm/Manifest
deleted file mode 100644
index fe4c73511cd0..000000000000
--- a/x11-base/x11-drm/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-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 linux-drm-20090320-kernelsource.tar.bz2 676103 RMD160 8699a6efd28f75bfb6ced332d76cffe73bb70545 SHA1 dfe1f3229d18e7bdd62b8b924e823d603025fb19 SHA256 89ad10ba508e4c5fdd75dbadc336997a1f493e335ee5ba37f46a68daeddc7de1
-DIST linux-drm-20090805-kernelsource.tar.bz2 650990 RMD160 51d4abdf58584886aeef565b4bf877c98309adf2 SHA1 9e1f00c9c461802306c1d589c8ec4f4347903f8b SHA256 00b58a2c43cc2e3d17e7dbfcf19e1f36fcd1de0c2313a6de5e9fefb5ff1d8f1e
-DIST x11-drm-20070314-gentoo-0.6.tar.bz2 12021 RMD160 26b15ca372606e7ae0b0550bafe123612f2bf3e9 SHA1 ca62c04fc70b50e1132658ebd9b34de24f95c1e4 SHA256 b6cf5485bf38bad53f7f4262b2ed93fdbf81f2f2b486471e268bd349800a0b20
-DIST x11-drm-20071019-gentoo-0.3.tar.bz2 10793 RMD160 af71f2a223c87240d87b73d4da6fcfbac7d6d810 SHA1 7994d9be5e2fce1e22351aec26d93ab3a0842d00 SHA256 a2475ef16806d98206a66d0a5c2363f91feb960795915116bdd9f5ce888e02db
-DIST x11-drm-20080710-gentoo-0.5.tar.bz2 5953 RMD160 db8a315d8539659459d90e7c09fcc42992e2f393 SHA1 b8a998095dc2e9e5052e7cdd86e81ba96047a963 SHA256 95a2980cc501203387610270f186c2651725f53d82e0e1153ded9e88df91dc36
-DIST x11-drm-20090320-gentoo-0.2.tar.bz2 3685 RMD160 887b518e06fb980c785c2a550157668106f0608d SHA1 5bf1a54646cbd659ef2bb5cd867c009f04320a71 SHA256 5b55d26a5eed7d4cc0acaa1cca007bcead01c453af9f8df057600674b763e45f
-DIST x11-drm-20090805-gentoo-0.1.tar.bz2 2707 RMD160 89a745f9b8c98a1d4b742df6ac02f34acd11a124 SHA1 ee88d72f2a4d8c55995d8aae0963efcb3cf835dd SHA256 1904f771b73548117c5f06504374656a0b577410f5b05fa0a28b1fd3c0bec1e7
-EBUILD x11-drm-20070314.ebuild 8308 RMD160 9ef134a6792d0866e061e89a105aefeb1c4ca2a3 SHA1 cabc714a975871c00009844300c635941b81effb SHA256 3878c3952bdef8322a687fa6c565f07b7e42ab73e6145b1f97201d69c84ff714
-EBUILD x11-drm-20071019.ebuild 8292 RMD160 6ecb15c033d74517968a74f1b6b5de1a986380ec SHA1 5c7c0919e5cdfcdcabe5c968155492e85b0037a6 SHA256 98e6607f3a60525f18f6a4957b04e62f87880ea2ad568a58f2499c69f872f63f
-EBUILD x11-drm-20080710.ebuild 8305 RMD160 d4a6a416bae0f262098a1eb1d92d4e2bcff8b7bb SHA1 35522fcf5d02c321dac74e00f0212c4493baee93 SHA256 15293856acf546b00eb9abe1c00e58a642a3774631c92c84ae51e5298674b891
-EBUILD x11-drm-20090320.ebuild 6801 RMD160 3251f9f1e0f8ecd792b954b8a7f6e77a7b07b6d1 SHA1 7674f5d563332cb1efef8f18029b978363ca3d5e SHA256 93e7f3f712e25f06ad1608e6475246f79a4a7451ffce3c6f4de0a4d8f8075857
-EBUILD x11-drm-20090805.ebuild 6808 RMD160 f88dbb5b02cfedde8565eb574989458e96e6811a SHA1 60fb43f376de317416ead302694aa1af8653ad64 SHA256 8e97c9962b4262ae4e1f6f8fae7ec91d279f948b323f1fb2632f39ac136dc370
-MISC ChangeLog 29670 RMD160 3fcd9278687a6f0d63d4e5a2bcd4d2ab375e7d45 SHA1 ac8b251d11a40ff89c0473c138d441af430e5e24 SHA256 13f021540824c972166bc67b2b11b39ad4228fe264b354545ef36d4e8fdfa979
-MISC metadata.xml 360 RMD160 2e8f97e554bc7d45c85f812a55041694f6d39a94 SHA1 14c36d4b201abb169fc4cce3155eb77e7ec383c8 SHA256 136242c39e50e65bf845e14a2f1db3d7847dafb21f8d83d66f356ffcf4273cca
diff --git a/x11-base/x11-drm/metadata.xml b/x11-base/x11-drm/metadata.xml
deleted file mode 100644
index 4c843cbdc63e..000000000000
--- a/x11-base/x11-drm/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-<maintainer>
-  <email>battousai@gentoo.org</email>
-  <name>Bryan Stine</name>
-</maintainer>
-<longdescription>Kernel modules which provide the Direct Rendering Manager component for X11.</longdescription>
-</pkgmetadata>
diff --git a/x11-base/x11-drm/x11-drm-20070314.ebuild b/x11-base/x11-drm/x11-drm-20070314.ebuild
deleted file mode 100644
index a1dae235cc7b..000000000000
--- a/x11-base/x11-drm/x11-drm-20070314.ebuild
+++ /dev/null
@@ -1,337 +0,0 @@
-# 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-20070314.ebuild,v 1.15 2009/08/03 11:43:22 ssuominen Exp $
-
-WANT_AUTOMAKE="1.7"
-
-inherit eutils x11 linux-mod autotools
-
-IUSE_VIDEO_CARDS="
-	video_cards_intel
-	video_cards_mach64
-	video_cards_mga
-	video_cards_nv
-	video_cards_r128
-	video_cards_radeon
-	video_cards_savage
-	video_cards_sis
-	video_cards_sunffb
-	video_cards_tdfx
-	video_cards_via"
-IUSE="${IUSE_VIDEO_CARDS} kernel_FreeBSD kernel_linux"
-
-# 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="strip"
-
-S="${WORKDIR}/drm"
-PATCHVER="0.6"
-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="alpha amd64 ia64 ppc x86 ~x86-fbsd"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )
-	kernel_FreeBSD? ( sys-freebsd/freebsd-sources
-			sys-freebsd/freebsd-mk-defs )"
-RDEPEND=""
-
-pkg_setup() {
-	# Setup the kernel's stuff.
-	kernel_setup
-
-	# Set video cards to build for.
-	set_vidcards
-
-	# Determine which -core dir we build in.
-	get_drm_build_dir
-
-	return 0
-}
-
-src_unpack() {
-	unpack linux-drm-${PV}-kernelsource.tar.bz2
-	unpack ${P}-gentoo-${PATCHVER}.tar.bz2
-
-	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}"
-
-	src_unpack_os
-
-	cd "${S}"
-	eautoreconf -v --install
-}
-
-src_compile() {
-	# Building the programs. These are useful for developers and getting info from DRI and DRM.
-	#
-	# libdrm objects are needed for drmstat.
-	econf || die "libdrm configure failed."
-	emake || die "libdrm build failed."
-
-	einfo "Building DRM in ${SRC_BUILD}..."
-	src_compile_os
-	einfo "DRM build finished".
-}
-
-src_install() {
-	einfo "Installing DRM..."
-	cd "${SRC_BUILD}"
-
-	src_install_os
-
-	dodoc "${S}/linux-core/README.drm"
-
-	dobin dristat
-	dobin drmstat
-}
-
-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.freedesktop.org/wiki/ATIMach64."
-	fi
-
-	pkg_postinst_os
-}
-
-# Functions used above are defined below:
-
-kernel_setup() {
-	if use kernel_FreeBSD
-	then
-		K_RV=${CHOST/*-freebsd/}
-	elif use kernel_linux
-	then
-		if kernel_is 2 4
-		then
-			eerror "Upstream support for 2.4 kernels has been removed, so this package will no"
-			eerror "longer support them."
-			die "Please use in-kernel DRM or switch to a 2.6 kernel."
-		fi
-
-		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
-}
-
-set_vidcards() {
-	if use kernel_linux; then
-		set_kvobj
-		INTEL_VIDCARDS="i810.${KV_OBJ} i830.${KV_OBJ} i915.${KV_OBJ}"
-	elif use kernel_FreeBSD; then
-		KV_OBJ="ko"
-		# bsd does not have i810/i830, only i915:
-		INTEL_VIDCARDS="i915.${KV_OBJ}"
-	fi
-
-	VIDCARDS=""
-
-	if [[ -n "${VIDEO_CARDS}" ]]; then
-		use video_cards_intel && \
-			VIDCARDS="${VIDCARDS} ${INTEL_VIDCARDS}"
-		use video_cards_mach64 && \
-			VIDCARDS="${VIDCARDS} mach64.${KV_OBJ}"
-		use video_cards_mga && \
-			VIDCARDS="${VIDCARDS} mga.${KV_OBJ}"
-		use video_cards_nv && \
-			VIDCARDS="${VIDCARDS} nv.${KV_OBJ} nouveau.${KV_OBJ}"
-		use video_cards_r128 && \
-			VIDCARDS="${VIDCARDS} r128.${KV_OBJ}"
-		use video_cards_radeon && \
-			VIDCARDS="${VIDCARDS} radeon.${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_sunffb && \
-			VIDCARDS="${VIDCARDS} ffb.${KV_OBJ}"
-		use video_cards_tdfx && \
-			VIDCARDS="${VIDCARDS} tdfx.${KV_OBJ}"
-	fi
-}
-
-get_drm_build_dir() {
-	if use kernel_FreeBSD
-	then
-		SRC_BUILD="${S}/bsd-core"
-	elif kernel_is 2 6
-	then
-		SRC_BUILD="${S}/linux-core"
-	fi
-}
-
-patch_prepare() {
-	# Handle exclusions based on the following...
-	#     All trees (0**), Standard only (1**), Others (none right now)
-	#     2.4 vs. 2.6 kernels
-	if use kernel_linux
-	then
-	    kernel_is 2 6 && mv -f "${PATCHDIR}"/*kernel-2.4* "${EXCLUDED}"
-	fi
-
-	# There is only one tree being maintained now. No numeric exclusions need
-	# to be done based on DRM tree.
-}
-
-src_unpack_freebsd() {
-	# Do FreeBSD stuff.
-	if use kernel_FreeBSD
-	then
-		# Link in freebsd kernel.
-		ln -s "/usr/src/sys-${K_RV}" "${WORKDIR}/sys"
-		# SUBDIR variable gets to all Makefiles, we need it only in the main one.
-		SUBDIRS=${VIDCARDS//.ko}
-		sed -ie "s:SUBDIR\ =.*:SUBDIR\ =\ drm ${SUBDIRS}:" "${SRC_BUILD}"/Makefile
-	fi
-}
-
-src_unpack_os() {
-	if use kernel_FreeBSD
-	then
-		src_unpack_freebsd
-	fi
-}
-
-src_compile_os() {
-	if use kernel_linux
-	then
-		src_compile_linux
-	elif use kernel_FreeBSD
-	then
-		src_compile_freebsd
-	fi
-}
-
-src_install_os() {
-	if use kernel_linux
-	then
-		src_install_linux
-	elif use kernel_FreeBSD
-	then
-		src_install_freebsd
-	fi
-}
-
-src_compile_linux() {
-	# This now uses an M= build system. Makefile does most of the work.
-	cd "${SRC_BUILD}"
-	unset ARCH
-	emake M="${SRC_BUILD}" \
-		LINUXDIR="${KERNEL_DIR}" \
-		DRM_MODULES="${VIDCARDS}" \
-		modules || die_error
-
-	if linux_chkconfig_present DRM
-	then
-		echo "Please disable in-kernel DRM support to use this package."
-	fi
-
-	# LINUXDIR is needed to allow Makefiles to find kernel release.
-	cd "${SRC_BUILD}"
-	emake LINUXDIR="${KERNEL_DIR}" dristat || die "Building dristat failed."
-	emake LINUXDIR="${KERNEL_DIR}" drmstat || die "Building drmstat failed."
-}
-
-src_compile_freebsd() {
-	cd "${SRC_BUILD}"
-	# Environment CFLAGS overwrite kernel CFLAGS which is bad.
-	local svcflags=${CFLAGS}; local svldflags=${LDFLAGS}
-	unset CFLAGS; unset LDFLAGS
-	MAKE=make \
-		emake \
-		NO_WERROR= \
-		SYSDIR="${WORKDIR}/sys" \
-		KMODDIR="/boot/modules" \
-		|| die "pmake failed."
-	export CFLAGS=${svcflags}; export LDFLAGS=${svldflags}
-
-	cd "${S}/tests"
-	# -D_POSIX_SOURCE skips the definition of several stuff we need
-	# for these two to compile
-	sed -i -e "s/-D_POSIX_SOURCE//" Makefile
-	emake dristat || die "Building dristat failed."
-	emake drmstat || die "Building drmstat failed."
-	# Move these where the linux stuff expects them
-	mv dristat drmstat "${SRC_BUILD}"
-}
-
-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."
-	eerror "Only 2.6 kernels at least as new as 2.6.6 are supported."
-	die "Unable to build DRM modules."
-}
-
-src_install_linux() {
-	cd "${SRC_BUILD}"
-	unset ARCH
-	kernel_is 2 6 && DRM_KMOD="drm.${KV_OBJ}"
-	emake KV="${KV_FULL}" \
-		LINUXDIR="${KERNEL_DIR}" \
-		DESTDIR="${D}" \
-		RUNNING_REL="${KV_FULL}" \
-		MODULE_LIST="${VIDCARDS} ${DRM_KMOD}" \
-		O="${KBUILD_OUTPUT}" \
-		install || die "Install failed."
-
-	# Strip binaries, leaving /lib/modules untouched (bug #24415)
-	strip_bins \/lib\/modules
-}
-
-src_install_freebsd() {
-	cd "${SRC_BUILD}"
-	dodir "/boot/modules"
-	MAKE=make \
-		emake \
-		install \
-		NO_WERROR= \
-		DESTDIR="${D}" \
-		KMODDIR="/boot/modules" \
-		|| die "Install failed."
-}
-
-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
deleted file mode 100644
index b5758e670099..000000000000
--- a/x11-base/x11-drm/x11-drm-20071019.ebuild
+++ /dev/null
@@ -1,337 +0,0 @@
-# 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-20071019.ebuild,v 1.7 2009/08/03 11:43:22 ssuominen Exp $
-
-WANT_AUTOMAKE="1.7"
-
-inherit eutils x11 linux-mod autotools
-
-IUSE_VIDEO_CARDS="
-	video_cards_intel
-	video_cards_mach64
-	video_cards_mga
-	video_cards_nv
-	video_cards_r128
-	video_cards_radeon
-	video_cards_savage
-	video_cards_sis
-	video_cards_sunffb
-	video_cards_tdfx
-	video_cards_via"
-IUSE="${IUSE_VIDEO_CARDS} kernel_FreeBSD kernel_linux"
-
-# 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="strip"
-
-S="${WORKDIR}/drm"
-PATCHVER="0.3"
-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="~alpha ~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )
-	kernel_FreeBSD? ( sys-freebsd/freebsd-sources
-			sys-freebsd/freebsd-mk-defs )"
-RDEPEND=""
-
-pkg_setup() {
-	# Setup the kernel's stuff.
-	kernel_setup
-
-	# Set video cards to build for.
-	set_vidcards
-
-	# Determine which -core dir we build in.
-	get_drm_build_dir
-
-	return 0
-}
-
-src_unpack() {
-	unpack linux-drm-${PV}-kernelsource.tar.bz2
-	unpack ${P}-gentoo-${PATCHVER}.tar.bz2
-
-	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}"
-
-	src_unpack_os
-
-	cd "${S}"
-	eautoreconf -v --install
-}
-
-src_compile() {
-	# Building the programs. These are useful for developers and getting info from DRI and DRM.
-	#
-	# libdrm objects are needed for drmstat.
-	econf || die "libdrm configure failed."
-	emake || die "libdrm build failed."
-
-	einfo "Building DRM in ${SRC_BUILD}..."
-	src_compile_os
-	einfo "DRM build finished".
-}
-
-src_install() {
-	einfo "Installing DRM..."
-	cd "${SRC_BUILD}"
-
-	src_install_os
-
-	dodoc "${S}/linux-core/README.drm"
-
-	dobin dristat
-	dobin drmstat
-}
-
-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.freedesktop.org/wiki/ATIMach64."
-	fi
-
-	pkg_postinst_os
-}
-
-# Functions used above are defined below:
-
-kernel_setup() {
-	if use kernel_FreeBSD
-	then
-		K_RV=${CHOST/*-freebsd/}
-	elif use kernel_linux
-	then
-		if kernel_is 2 4
-		then
-			eerror "Upstream support for 2.4 kernels has been removed, so this package will no"
-			eerror "longer support them."
-			die "Please use in-kernel DRM or switch to a 2.6 kernel."
-		fi
-
-		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
-}
-
-set_vidcards() {
-	if use kernel_linux; then
-		set_kvobj
-		INTEL_VIDCARDS="i810.${KV_OBJ} i915.${KV_OBJ}"
-	elif use kernel_FreeBSD; then
-		KV_OBJ="ko"
-		# bsd does not have i810, only i915:
-		INTEL_VIDCARDS="i915.${KV_OBJ}"
-	fi
-
-	VIDCARDS=""
-
-	if [[ -n "${VIDEO_CARDS}" ]]; then
-		use video_cards_intel && \
-			VIDCARDS="${VIDCARDS} ${INTEL_VIDCARDS}"
-		use video_cards_mach64 && \
-			VIDCARDS="${VIDCARDS} mach64.${KV_OBJ}"
-		use video_cards_mga && \
-			VIDCARDS="${VIDCARDS} mga.${KV_OBJ}"
-		use video_cards_nv && \
-			VIDCARDS="${VIDCARDS} nv.${KV_OBJ} nouveau.${KV_OBJ}"
-		use video_cards_r128 && \
-			VIDCARDS="${VIDCARDS} r128.${KV_OBJ}"
-		use video_cards_radeon && \
-			VIDCARDS="${VIDCARDS} radeon.${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_sunffb && \
-			VIDCARDS="${VIDCARDS} ffb.${KV_OBJ}"
-		use video_cards_tdfx && \
-			VIDCARDS="${VIDCARDS} tdfx.${KV_OBJ}"
-	fi
-}
-
-get_drm_build_dir() {
-	if use kernel_FreeBSD
-	then
-		SRC_BUILD="${S}/bsd-core"
-	elif kernel_is 2 6
-	then
-		SRC_BUILD="${S}/linux-core"
-	fi
-}
-
-patch_prepare() {
-	# Handle exclusions based on the following...
-	#     All trees (0**), Standard only (1**), Others (none right now)
-	#     2.4 vs. 2.6 kernels
-	if use kernel_linux
-	then
-	    kernel_is 2 6 && mv -f "${PATCHDIR}"/*kernel-2.4* "${EXCLUDED}"
-	fi
-
-	# There is only one tree being maintained now. No numeric exclusions need
-	# to be done based on DRM tree.
-}
-
-src_unpack_freebsd() {
-	# Do FreeBSD stuff.
-	if use kernel_FreeBSD
-	then
-		# Link in freebsd kernel.
-		ln -s "/usr/src/sys-${K_RV}" "${WORKDIR}/sys"
-		# SUBDIR variable gets to all Makefiles, we need it only in the main one.
-		SUBDIRS=${VIDCARDS//.ko}
-		sed -ie "s:SUBDIR\ =.*:SUBDIR\ =\ drm ${SUBDIRS}:" "${SRC_BUILD}"/Makefile
-	fi
-}
-
-src_unpack_os() {
-	if use kernel_FreeBSD
-	then
-		src_unpack_freebsd
-	fi
-}
-
-src_compile_os() {
-	if use kernel_linux
-	then
-		src_compile_linux
-	elif use kernel_FreeBSD
-	then
-		src_compile_freebsd
-	fi
-}
-
-src_install_os() {
-	if use kernel_linux
-	then
-		src_install_linux
-	elif use kernel_FreeBSD
-	then
-		src_install_freebsd
-	fi
-}
-
-src_compile_linux() {
-	# This now uses an M= build system. Makefile does most of the work.
-	cd "${SRC_BUILD}"
-	unset ARCH
-	emake M="${SRC_BUILD}" \
-		LINUXDIR="${KERNEL_DIR}" \
-		DRM_MODULES="${VIDCARDS}" \
-		modules || die_error
-
-	if linux_chkconfig_present DRM
-	then
-		echo "Please disable in-kernel DRM support to use this package."
-	fi
-
-	# LINUXDIR is needed to allow Makefiles to find kernel release.
-	cd "${SRC_BUILD}"
-	emake LINUXDIR="${KERNEL_DIR}" dristat || die "Building dristat failed."
-	emake LINUXDIR="${KERNEL_DIR}" drmstat || die "Building drmstat failed."
-}
-
-src_compile_freebsd() {
-	cd "${SRC_BUILD}"
-	# Environment CFLAGS overwrite kernel CFLAGS which is bad.
-	local svcflags=${CFLAGS}; local svldflags=${LDFLAGS}
-	unset CFLAGS; unset LDFLAGS
-	MAKE=make \
-		emake \
-		NO_WERROR= \
-		SYSDIR="${WORKDIR}/sys" \
-		KMODDIR="/boot/modules" \
-		|| die "pmake failed."
-	export CFLAGS=${svcflags}; export LDFLAGS=${svldflags}
-
-	cd "${S}/tests"
-	# -D_POSIX_SOURCE skips the definition of several stuff we need
-	# for these two to compile
-	sed -i -e "s/-D_POSIX_SOURCE//" Makefile
-	emake dristat || die "Building dristat failed."
-	emake drmstat || die "Building drmstat failed."
-	# Move these where the linux stuff expects them
-	mv dristat drmstat "${SRC_BUILD}"
-}
-
-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."
-	eerror "Only 2.6 kernels at least as new as 2.6.6 are supported."
-	die "Unable to build DRM modules."
-}
-
-src_install_linux() {
-	cd "${SRC_BUILD}"
-	unset ARCH
-	kernel_is 2 6 && DRM_KMOD="drm.${KV_OBJ}"
-	emake KV="${KV_FULL}" \
-		LINUXDIR="${KERNEL_DIR}" \
-		DESTDIR="${D}" \
-		RUNNING_REL="${KV_FULL}" \
-		MODULE_LIST="${VIDCARDS} ${DRM_KMOD}" \
-		O="${KBUILD_OUTPUT}" \
-		install || die "Install failed."
-
-	# Strip binaries, leaving /lib/modules untouched (bug #24415)
-	strip_bins \/lib\/modules
-}
-
-src_install_freebsd() {
-	cd "${SRC_BUILD}"
-	dodir "/boot/modules"
-	MAKE=make \
-		emake \
-		install \
-		NO_WERROR= \
-		DESTDIR="${D}" \
-		KMODDIR="/boot/modules" \
-		|| die "Install failed."
-}
-
-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
deleted file mode 100644
index f705ebc9eae3..000000000000
--- a/x11-base/x11-drm/x11-drm-20080710.ebuild
+++ /dev/null
@@ -1,336 +0,0 @@
-# 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-20080710.ebuild,v 1.9 2009/08/03 11:43:22 ssuominen Exp $
-
-WANT_AUTOMAKE="1.7"
-
-inherit eutils x11 linux-mod autotools
-
-IUSE_VIDEO_CARDS="
-	video_cards_intel
-	video_cards_mach64
-	video_cards_mga
-	video_cards_nv
-	video_cards_r128
-	video_cards_radeon
-	video_cards_savage
-	video_cards_sis
-	video_cards_sunffb
-	video_cards_tdfx
-	video_cards_via
-	video_cards_xgi"
-IUSE="${IUSE_VIDEO_CARDS} kernel_FreeBSD kernel_linux"
-
-# 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 ...
-# Tests require user intervention (see bug #236845)
-RESTRICT="strip test"
-
-S="${WORKDIR}/drm"
-PATCHVER="0.5"
-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="~alpha ~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )
-	kernel_FreeBSD? ( sys-freebsd/freebsd-sources
-			sys-freebsd/freebsd-mk-defs )"
-RDEPEND=""
-
-pkg_setup() {
-	# Setup the kernel's stuff.
-	kernel_setup
-
-	# Determine which -core dir we build in.
-	get_drm_build_dir
-
-	# Set video cards to build for.
-	set_vidcards
-
-	return 0
-}
-
-src_unpack() {
-	unpack linux-drm-${PV}-kernelsource.tar.bz2
-	unpack ${P}-gentoo-${PATCHVER}.tar.bz2
-
-	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}"
-
-	src_unpack_os
-
-	cd "${S}"
-	eautoreconf -v --install
-}
-
-src_compile() {
-	# Building the programs. These are useful for developers and getting info from DRI and DRM.
-	#
-	# libdrm objects are needed for drmstat.
-	econf || die "libdrm configure failed."
-	emake || die "libdrm build failed."
-
-	einfo "Building DRM in ${SRC_BUILD}..."
-	src_compile_os
-	einfo "DRM build finished".
-}
-
-src_install() {
-	einfo "Installing DRM..."
-	cd "${SRC_BUILD}"
-
-	src_install_os
-
-	dodoc "${S}/linux-core/README.drm"
-
-	dobin dristat
-	dobin drmstat
-}
-
-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.freedesktop.org/wiki/ATIMach64."
-	fi
-
-	pkg_postinst_os
-}
-
-# Functions used above are defined below:
-
-kernel_setup() {
-	if use kernel_FreeBSD
-	then
-		K_RV=${CHOST/*-freebsd/}
-	elif use kernel_linux
-	then
-		if kernel_is 2 4
-		then
-			eerror "Upstream support for 2.4 kernels has been removed, so this package will no"
-			eerror "longer support them."
-			die "Please use in-kernel DRM or switch to a 2.6 kernel."
-		fi
-
-		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)."
-
-		linux-mod_pkg_setup
-	fi
-}
-
-set_vidcards() {
-	if use kernel_linux; then
-		set_kvobj
-		INTEL_VIDCARDS="i810.${KV_OBJ} i915.${KV_OBJ}"
-	elif use kernel_FreeBSD; then
-		KV_OBJ="ko"
-		# bsd does not have i810, only i915:
-		INTEL_VIDCARDS="i915.${KV_OBJ}"
-	fi
-
-	VIDCARDS=""
-
-	if [[ -n "${VIDEO_CARDS}" ]]; then
-		use video_cards_intel && \
-			VIDCARDS="${VIDCARDS} ${INTEL_VIDCARDS}"
-		use video_cards_mach64 && \
-			VIDCARDS="${VIDCARDS} mach64.${KV_OBJ}"
-		use video_cards_mga && \
-			VIDCARDS="${VIDCARDS} mga.${KV_OBJ}"
-		use video_cards_nv && \
-			VIDCARDS="${VIDCARDS} nv.${KV_OBJ} nouveau.${KV_OBJ}"
-		use video_cards_r128 && \
-			VIDCARDS="${VIDCARDS} r128.${KV_OBJ}"
-		use video_cards_radeon && \
-			VIDCARDS="${VIDCARDS} radeon.${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_sunffb && \
-			VIDCARDS="${VIDCARDS} ffb.${KV_OBJ}"
-		use video_cards_tdfx && \
-			VIDCARDS="${VIDCARDS} tdfx.${KV_OBJ}"
-		use video_cards_xgi && \
-			VIDCARDS="${VIDCARDS} xgi.${KV_OBJ}"
-	fi
-
-	MODULE_NAMES=""
-	if use kernel_linux
-	then
-		LIBDIR="x11-drm"
-		for VIDCARD in ${VIDCARDS}
-		do
-			MODULE_NAMES="${MODULE_NAMES} ${VIDCARD/\.${KV_OBJ}/(${LIBDIR}:${SRC_BUILD})}"
-		done
-		MODULE_NAMES="${MODULE_NAMES} drm(${LIBDIR}:${SRC_BUILD})"
-		BUILD_PARAMS="LINUXDIR=\"${KERNEL_DIR}\" DRM_MODULES=\"${VIDCARDS}\""
-		BUILD_TARGETS="modules"
-	fi
-}
-
-get_drm_build_dir() {
-	if use kernel_FreeBSD
-	then
-		SRC_BUILD="${S}/bsd-core"
-	elif kernel_is 2 6
-	then
-		SRC_BUILD="${S}/linux-core"
-	fi
-}
-
-patch_prepare() {
-	# Handle exclusions based on the following...
-	#     All trees (0**), Standard only (1**), Others (none right now)
-	#     2.4 vs. 2.6 kernels
-	if use kernel_linux
-	then
-	    kernel_is 2 6 && mv -f "${PATCHDIR}"/*kernel-2.4* "${EXCLUDED}"
-	fi
-
-	# There is only one tree being maintained now. No numeric exclusions need
-	# to be done based on DRM tree.
-}
-
-src_unpack_freebsd() {
-	# Do FreeBSD stuff.
-	if use kernel_FreeBSD
-	then
-		# Link in freebsd kernel.
-		ln -s "/usr/src/sys-${K_RV}" "${WORKDIR}/sys"
-		# SUBDIR variable gets to all Makefiles, we need it only in the main one.
-		SUBDIRS=${VIDCARDS//.ko}
-		sed -ie "s:SUBDIR\ =.*:SUBDIR\ =\ drm ${SUBDIRS}:" "${SRC_BUILD}"/Makefile
-	fi
-}
-
-src_unpack_os() {
-	if use kernel_FreeBSD
-	then
-		src_unpack_freebsd
-	fi
-}
-
-src_compile_os() {
-	if use kernel_linux
-	then
-		src_compile_linux
-	elif use kernel_FreeBSD
-	then
-		src_compile_freebsd
-	fi
-}
-
-src_install_os() {
-	if use kernel_linux
-	then
-		src_install_linux
-	elif use kernel_FreeBSD
-	then
-		src_install_freebsd
-	fi
-}
-
-src_compile_linux() {
-	# This now uses an M= build system. Makefile does most of the work.
-	linux-mod_src_compile
-
-	# LINUXDIR is needed to allow Makefiles to find kernel release.
-	cd "${SRC_BUILD}"
-	emake LINUXDIR="${KERNEL_DIR}" dristat || die "Building dristat failed."
-	emake LINUXDIR="${KERNEL_DIR}" drmstat || die "Building drmstat failed."
-}
-
-src_compile_freebsd() {
-	cd "${SRC_BUILD}"
-	# Environment CFLAGS overwrite kernel CFLAGS which is bad.
-	local svcflags=${CFLAGS}; local svldflags=${LDFLAGS}
-	unset CFLAGS; unset LDFLAGS
-	MAKE=make \
-		emake \
-		NO_WERROR= \
-		SYSDIR="${WORKDIR}/sys" \
-		KMODDIR="/boot/modules" \
-		|| die "pmake failed."
-	export CFLAGS=${svcflags}; export LDFLAGS=${svldflags}
-
-	cd "${S}/tests"
-	# -D_POSIX_SOURCE skips the definition of several stuff we need
-	# for these two to compile
-	sed -i -e "s/-D_POSIX_SOURCE//" Makefile
-	emake dristat || die "Building dristat failed."
-	emake drmstat || die "Building drmstat failed."
-	# Move these where the linux stuff expects them
-	mv dristat drmstat "${SRC_BUILD}"
-}
-
-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."
-	eerror "Only 2.6 kernels at least as new as 2.6.6 are supported."
-	die "Unable to build DRM modules."
-}
-
-src_install_linux() {
-	cd "${SRC_BUILD}"
-	linux-mod_src_install
-
-	# Strip binaries, leaving /lib/modules untouched (bug #24415)
-	strip_bins \/lib\/modules
-}
-
-src_install_freebsd() {
-	cd "${SRC_BUILD}"
-	dodir "/boot/modules"
-	MAKE=make \
-		emake \
-		install \
-		NO_WERROR= \
-		DESTDIR="${D}" \
-		KMODDIR="/boot/modules" \
-		|| die "Install failed."
-}
-
-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-20090320.ebuild b/x11-base/x11-drm/x11-drm-20090320.ebuild
deleted file mode 100644
index b4cada619930..000000000000
--- a/x11-base/x11-drm/x11-drm-20090320.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# 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.11 2009/07/23 17:28:21 josejx Exp $
-
-inherit eutils x11 linux-mod autotools
-
-IUSE_VIDEO_CARDS="
-	video_cards_mach64
-	video_cards_mga
-	video_cards_r128
-	video_cards_radeon
-	video_cards_radeonhd
-	video_cards_savage
-	video_cards_sis
-	video_cards_sunffb
-	video_cards_tdfx
-	video_cards_via
-	video_cards_xgi"
-IUSE="${IUSE_VIDEO_CARDS} kernel_FreeBSD kernel_linux"
-
-# 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 ...
-# Tests require user intervention (see bug #236845)
-RESTRICT="strip test"
-
-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/linux-drm-${PV}-kernelsource.tar.bz2"
-if [ -n "${PATCHVER}" ] ; then
-	SRC_URI="${SRC_URI} mirror://gentoo/${P}-gentoo-${PATCHVER}.tar.bz2"
-fi
-
-SLOT="0"
-LICENSE="X11"
-KEYWORDS="alpha amd64 ia64 ppc x86 ~x86-fbsd"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )
-	kernel_FreeBSD? ( sys-freebsd/freebsd-sources
-			sys-freebsd/freebsd-mk-defs )
-	>=x11-libs/libdrm-2.4.3"
-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
-
-	# Set video cards to build for.
-	set_vidcards
-
-	# Determine which -core dir we build in.
-	get_drm_build_dir
-
-	return 0
-}
-
-src_unpack() {
-	unpack linux-drm-${PV}-kernelsource.tar.bz2
-	cd "${WORKDIR}"
-
-	# Apply patches if there's a patchball version number provided.
-	if [ -n "${PATCHVER}"  ]
-	then
-		unpack ${P}-gentoo-${PATCHVER}.tar.bz2
-		cd "${S}"
-
-		# Apply patches
-		EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
-	fi
-	eautoreconf -v --install
-
-	src_unpack_os
-}
-
-src_compile() {
-	einfo "Building DRM in ${SRC_BUILD}..."
-	src_compile_os
-	einfo "DRM build finished".
-
-	cd "${S}"
-
-	# I need to work on my autoconf skills to make reliable user-selection
-	# of cairo support here.
-	econf --without-cairo || die "econf failed"
-
-	cd "${S}"/tests
-	emake || die "Failed to build programs."
-}
-
-src_install() {
-	einfo "Installing DRM..."
-	cd "${SRC_BUILD}"
-
-	src_install_os
-
-	cd "${S}"/tests
-	dobin dristat drmstat modeprint/modeprint modetest/modetest || die
-
-	dodoc "${S}/linux-core/README.drm"
-}
-
-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.freedesktop.org/wiki/ATIMach64."
-	fi
-
-	pkg_postinst_os
-}
-
-# Functions used above are defined below:
-
-kernel_setup() {
-	if use kernel_FreeBSD
-	then
-		K_RV=${CHOST/*-freebsd/}
-	elif use kernel_linux
-	then
-		if kernel_is 2 4
-		then
-			eerror "Upstream support for 2.4 kernels has been removed, so this package will no"
-			eerror "longer support them."
-			die "Please use in-kernel DRM or switch to a 2.6 kernel."
-		fi
-
-		CONFIG_CHECK="!DRM"
-		ERROR_DRM="Please disable DRM in the kernel config. (CONFIG_DRM = n)"
-
-		linux-mod_pkg_setup
-	fi
-}
-
-set_vidcards() {
-	VIDCARDS=""
-
-	if [[ -n "${VIDEO_CARDS}" ]]; then
-		use video_cards_mach64 && \
-			VIDCARDS="${VIDCARDS} mach64.${KV_OBJ}"
-		use video_cards_mga && \
-			VIDCARDS="${VIDCARDS} mga.${KV_OBJ}"
-		use video_cards_r128 && \
-			VIDCARDS="${VIDCARDS} r128.${KV_OBJ}"
-		use video_cards_radeon || use video_cards_radeonhd && \
-			VIDCARDS="${VIDCARDS} radeon.${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_sunffb && \
-			VIDCARDS="${VIDCARDS} ffb.${KV_OBJ}"
-		use video_cards_tdfx && \
-			VIDCARDS="${VIDCARDS} tdfx.${KV_OBJ}"
-		use video_cards_xgi && \
-			VIDCARDS="${VIDCARDS} xgi.${KV_OBJ}"
-	fi
-}
-
-get_drm_build_dir() {
-	if use kernel_FreeBSD
-	then
-		SRC_BUILD="${S}/bsd-core"
-	elif kernel_is 2 6
-	then
-		SRC_BUILD="${S}/linux-core"
-	fi
-}
-
-src_unpack_linux() {
-	convert_to_m "${SRC_BUILD}"/Makefile
-}
-
-src_unpack_freebsd() {
-	# Link in freebsd kernel.
-	ln -s "/usr/src/sys-${K_RV}" "${WORKDIR}/sys"
-	# SUBDIR variable gets to all Makefiles, we need it only in the main one.
-	SUBDIRS=${VIDCARDS//.ko}
-	sed -i -e "s:SUBDIR\ =.*:SUBDIR\ =\ drm ${SUBDIRS}:" "${SRC_BUILD}"/Makefile
-}
-
-src_unpack_os() {
-	if use kernel_linux; then
-		src_unpack_linux
-	elif use kernel_FreeBSD
-	then
-		src_unpack_freebsd
-	fi
-}
-
-src_compile_os() {
-	if use kernel_linux
-	then
-		src_compile_linux
-	elif use kernel_FreeBSD
-	then
-		src_compile_freebsd
-	fi
-}
-
-src_install_os() {
-	if use kernel_linux
-	then
-		src_install_linux
-	elif use kernel_FreeBSD
-	then
-		src_install_freebsd
-	fi
-}
-
-src_compile_linux() {
-	# remove leading and trailing space
-	VIDCARDS="${VIDCARDS% }"
-	VIDCARDS="${VIDCARDS# }"
-
-	check_modules_supported
-	MODULE_NAMES=""
-	for i in drm.${KV_OBJ} ${VIDCARDS}; do
-		MODULE_NAMES="${MODULE_NAMES} ${i/.${KV_OBJ}}(${PN}:${SRC_BUILD})"
-		i=$(echo ${i/.${KV_OBJ}} | tr '[:lower:]' '[:upper:]')
-		eval MODULESD_${i}_ENABLED="yes"
-	done
-
-	# This now uses an M= build system. Makefile does most of the work.
-	cd "${SRC_BUILD}"
-	unset ARCH
-	BUILD_TARGETS="modules"
-	BUILD_PARAMS="DRM_MODULES='${VIDCARDS}' LINUXDIR='${KERNEL_DIR}' M='${SRC_BUILD}'"
-	ECONF_PARAMS='' S="${SRC_BUILD}" linux-mod_src_compile
-}
-
-src_compile_freebsd() {
-	cd "${SRC_BUILD}"
-	# Environment CFLAGS overwrite kernel CFLAGS which is bad.
-	local svcflags=${CFLAGS}; local svldflags=${LDFLAGS}
-	unset CFLAGS; unset LDFLAGS
-	MAKE=make \
-		emake \
-		NO_WERROR= \
-		SYSDIR="${WORKDIR}/sys" \
-		KMODDIR="/boot/modules" \
-		|| die "pmake failed."
-	export CFLAGS=${svcflags}; export LDFLAGS=${svldflags}
-}
-
-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."
-	eerror "Only 2.6 kernels at least as new as 2.6.6 are supported."
-	die "Unable to build DRM modules."
-}
-
-src_install_linux() {
-	linux-mod_src_install
-
-	# Strip binaries, leaving /lib/modules untouched (bug #24415)
-	strip_bins \/lib\/modules
-}
-
-src_install_freebsd() {
-	cd "${SRC_BUILD}"
-	dodir "/boot/modules"
-	MAKE=make \
-		emake \
-		install \
-		NO_WERROR= \
-		DESTDIR="${D}" \
-		KMODDIR="/boot/modules" \
-		|| die "Install failed."
-}
-
-pkg_postinst_os() {
-	if use kernel_linux
-	then
-		linux-mod_pkg_postinst
-	fi
-}
diff --git a/x11-base/x11-drm/x11-drm-20090805.ebuild b/x11-base/x11-drm/x11-drm-20090805.ebuild
deleted file mode 100644
index 9a5e87071afc..000000000000
--- a/x11-base/x11-drm/x11-drm-20090805.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# 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-20090805.ebuild,v 1.1 2009/08/06 05:32:33 battousai Exp $
-
-inherit eutils x11 linux-mod autotools
-
-IUSE_VIDEO_CARDS="
-	video_cards_mach64
-	video_cards_mga
-	video_cards_r128
-	video_cards_radeon
-	video_cards_radeonhd
-	video_cards_savage
-	video_cards_sis
-	video_cards_sunffb
-	video_cards_tdfx
-	video_cards_via
-	video_cards_xgi"
-IUSE="${IUSE_VIDEO_CARDS} kernel_FreeBSD kernel_linux"
-
-# 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 ...
-# Tests require user intervention (see bug #236845)
-RESTRICT="strip test"
-
-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/linux-drm-${PV}-kernelsource.tar.bz2"
-if [ -n "${PATCHVER}" ] ; then
-	SRC_URI="${SRC_URI} mirror://gentoo/${P}-gentoo-${PATCHVER}.tar.bz2"
-fi
-
-SLOT="0"
-LICENSE="X11"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )
-	kernel_FreeBSD? ( sys-freebsd/freebsd-sources
-			sys-freebsd/freebsd-mk-defs )
-	>=x11-libs/libdrm-2.4.3"
-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
-
-	# Set video cards to build for.
-	set_vidcards
-
-	# Determine which -core dir we build in.
-	get_drm_build_dir
-
-	return 0
-}
-
-src_unpack() {
-	unpack linux-drm-${PV}-kernelsource.tar.bz2
-	cd "${WORKDIR}"
-
-	# Apply patches if there's a patchball version number provided.
-	if [ -n "${PATCHVER}"  ]
-	then
-		unpack ${P}-gentoo-${PATCHVER}.tar.bz2
-		cd "${S}"
-
-		# Apply patches
-		EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
-	fi
-	eautoreconf -v --install
-
-	src_unpack_os
-}
-
-src_compile() {
-	einfo "Building DRM in ${SRC_BUILD}..."
-	src_compile_os
-	einfo "DRM build finished".
-
-	cd "${S}"
-
-	# I need to work on my autoconf skills to make reliable user-selection
-	# of cairo support here.
-	econf --without-cairo || die "econf failed"
-
-	cd "${S}"/tests
-	emake || die "Failed to build programs."
-}
-
-src_install() {
-	einfo "Installing DRM..."
-	cd "${SRC_BUILD}"
-
-	src_install_os
-
-	cd "${S}"/tests
-	dobin dristat drmstat modeprint/modeprint modetest/modetest || die
-
-	dodoc "${S}/linux-core/README.drm"
-}
-
-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.freedesktop.org/wiki/ATIMach64."
-	fi
-
-	pkg_postinst_os
-}
-
-# Functions used above are defined below:
-
-kernel_setup() {
-	if use kernel_FreeBSD
-	then
-		K_RV=${CHOST/*-freebsd/}
-	elif use kernel_linux
-	then
-		if kernel_is 2 4
-		then
-			eerror "Upstream support for 2.4 kernels has been removed, so this package will no"
-			eerror "longer support them."
-			die "Please use in-kernel DRM or switch to a 2.6 kernel."
-		fi
-
-		CONFIG_CHECK="!DRM"
-		ERROR_DRM="Please disable DRM in the kernel config. (CONFIG_DRM = n)"
-
-		linux-mod_pkg_setup
-	fi
-}
-
-set_vidcards() {
-	VIDCARDS=""
-
-	if [[ -n "${VIDEO_CARDS}" ]]; then
-		use video_cards_mach64 && \
-			VIDCARDS="${VIDCARDS} mach64.${KV_OBJ}"
-		use video_cards_mga && \
-			VIDCARDS="${VIDCARDS} mga.${KV_OBJ}"
-		use video_cards_r128 && \
-			VIDCARDS="${VIDCARDS} r128.${KV_OBJ}"
-		use video_cards_radeon || use video_cards_radeonhd && \
-			VIDCARDS="${VIDCARDS} radeon.${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_sunffb && \
-			VIDCARDS="${VIDCARDS} ffb.${KV_OBJ}"
-		use video_cards_tdfx && \
-			VIDCARDS="${VIDCARDS} tdfx.${KV_OBJ}"
-		use video_cards_xgi && \
-			VIDCARDS="${VIDCARDS} xgi.${KV_OBJ}"
-	fi
-}
-
-get_drm_build_dir() {
-	if use kernel_FreeBSD
-	then
-		SRC_BUILD="${S}/bsd-core"
-	elif kernel_is 2 6
-	then
-		SRC_BUILD="${S}/linux-core"
-	fi
-}
-
-src_unpack_linux() {
-	convert_to_m "${SRC_BUILD}"/Makefile
-}
-
-src_unpack_freebsd() {
-	# Link in freebsd kernel.
-	ln -s "/usr/src/sys-${K_RV}" "${WORKDIR}/sys"
-	# SUBDIR variable gets to all Makefiles, we need it only in the main one.
-	SUBDIRS=${VIDCARDS//.ko}
-	sed -i -e "s:SUBDIR\ =.*:SUBDIR\ =\ drm ${SUBDIRS}:" "${SRC_BUILD}"/Makefile
-}
-
-src_unpack_os() {
-	if use kernel_linux; then
-		src_unpack_linux
-	elif use kernel_FreeBSD
-	then
-		src_unpack_freebsd
-	fi
-}
-
-src_compile_os() {
-	if use kernel_linux
-	then
-		src_compile_linux
-	elif use kernel_FreeBSD
-	then
-		src_compile_freebsd
-	fi
-}
-
-src_install_os() {
-	if use kernel_linux
-	then
-		src_install_linux
-	elif use kernel_FreeBSD
-	then
-		src_install_freebsd
-	fi
-}
-
-src_compile_linux() {
-	# remove leading and trailing space
-	VIDCARDS="${VIDCARDS% }"
-	VIDCARDS="${VIDCARDS# }"
-
-	check_modules_supported
-	MODULE_NAMES=""
-	for i in drm.${KV_OBJ} ${VIDCARDS}; do
-		MODULE_NAMES="${MODULE_NAMES} ${i/.${KV_OBJ}}(${PN}:${SRC_BUILD})"
-		i=$(echo ${i/.${KV_OBJ}} | tr '[:lower:]' '[:upper:]')
-		eval MODULESD_${i}_ENABLED="yes"
-	done
-
-	# This now uses an M= build system. Makefile does most of the work.
-	cd "${SRC_BUILD}"
-	unset ARCH
-	BUILD_TARGETS="modules"
-	BUILD_PARAMS="DRM_MODULES='${VIDCARDS}' LINUXDIR='${KERNEL_DIR}' M='${SRC_BUILD}'"
-	ECONF_PARAMS='' S="${SRC_BUILD}" linux-mod_src_compile
-}
-
-src_compile_freebsd() {
-	cd "${SRC_BUILD}"
-	# Environment CFLAGS overwrite kernel CFLAGS which is bad.
-	local svcflags=${CFLAGS}; local svldflags=${LDFLAGS}
-	unset CFLAGS; unset LDFLAGS
-	MAKE=make \
-		emake \
-		NO_WERROR= \
-		SYSDIR="${WORKDIR}/sys" \
-		KMODDIR="/boot/modules" \
-		|| die "pmake failed."
-	export CFLAGS=${svcflags}; export LDFLAGS=${svldflags}
-}
-
-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."
-	eerror "Only 2.6 kernels at least as new as 2.6.6 are supported."
-	die "Unable to build DRM modules."
-}
-
-src_install_linux() {
-	linux-mod_src_install
-
-	# Strip binaries, leaving /lib/modules untouched (bug #24415)
-	strip_bins \/lib\/modules
-}
-
-src_install_freebsd() {
-	cd "${SRC_BUILD}"
-	dodir "/boot/modules"
-	MAKE=make \
-		emake \
-		install \
-		NO_WERROR= \
-		DESTDIR="${D}" \
-		KMODDIR="/boot/modules" \
-		|| die "Install failed."
-}
-
-pkg_postinst_os() {
-	if use kernel_linux
-	then
-		linux-mod_pkg_postinst
-	fi
-}