Remove obsolete files.

Package-Manager: portage-2.1.2.11

13 files changed, 11 insertions, 1919 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index c9dc60e3e4c0..2af7ec16ce91 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.87 2007/08/14 04:24:40 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.88 2007/08/14 08:41:02 je_fro Exp $
+
+  14 Aug 2007; Jeff Gardner <je_fro@gentoo.org>
+  -files/ati-drivers-8.28.8-linux-2.6.18.patch, -ati-drivers-8.28.8.ebuild,
+  -ati-drivers-8.28.8-r1.ebuild, -ati-drivers-8.29.6.ebuild,
+  -ati-drivers-8.30.3.ebuild, -ati-drivers-8.30.3-r1.ebuild:
+  Remove obsolete files.
 
 *ati-drivers-8.40.4 (14 Aug 2007)
 
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index db6fa12d3a9c..9f433c063017 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -22,10 +22,6 @@ AUX ati-drivers-2.6.20.patch 2386 RMD160 8b563155a63ba8d9639fa3b89719b8da49b2c8a
 MD5 5c4e56501fc8a698cdfce8a475eb51ae files/ati-drivers-2.6.20.patch 2386
 RMD160 8b563155a63ba8d9639fa3b89719b8da49b2c8a3 files/ati-drivers-2.6.20.patch 2386
 SHA256 12b56122216a2fdba9f52e9939bf33f7d0c262417923ea9596c70337d44dd9f8 files/ati-drivers-2.6.20.patch 2386
-AUX ati-drivers-8.28.8-linux-2.6.18.patch 720 RMD160 9daffb130acedeb1e926146bdf101bc68e35b0d5 SHA1 901f6a2076d2eeb76e039d5945e2c3216a63e1e6 SHA256 cd1ceac64e9abb0310972294ac61703b859873709c0b1a766d5bf115067122e3
-MD5 2494cd76022a981516d17367cbd3f9d1 files/ati-drivers-8.28.8-linux-2.6.18.patch 720
-RMD160 9daffb130acedeb1e926146bdf101bc68e35b0d5 files/ati-drivers-8.28.8-linux-2.6.18.patch 720
-SHA256 cd1ceac64e9abb0310972294ac61703b859873709c0b1a766d5bf115067122e3 files/ati-drivers-8.28.8-linux-2.6.18.patch 720
 AUX ati-drivers-8.35.5-2.6.19.patch 913 RMD160 511ef4e6eb7fcfa8db5419c05d160c6b538f9bc8 SHA1 adcd3860d1b0877779e85695053cda36511b4c71 SHA256 5c2b1ba7e291e118f37a87e3a653d0a654ee4e95a46c9e3d723ecef72aba1f01
 MD5 b71070a5208649bd6c4947666b09d415 files/ati-drivers-8.35.5-2.6.19.patch 913
 RMD160 511ef4e6eb7fcfa8db5419c05d160c6b538f9bc8 files/ati-drivers-8.35.5-2.6.19.patch 913
@@ -56,9 +52,6 @@ RMD160 b2eb11cd123cb0e789adb1e22dffdbfc03542f69 files/libGL.la.in 749
 SHA256 a7b4b58b1311f8e1caf83222cb020dfbc48e2881a8deef21eddefa23b3992f13 files/libGL.la.in 749
 DIST ati-driver-installer-8.27.10-x86.run 25136032 RMD160 5080d72e97101b97da661019c00a89e01cf2abd6 SHA1 dc386ae275e7623d383a83b50b8685b53fe97f03 SHA256 444c2d957308793b1164ed013c724090900aae20fcd63ebf9001b795066fc4f0
 DIST ati-driver-installer-8.27.10-x86_64.run 32487472 RMD160 04dc8598253791b52215ba3be847a9dc6eb54079 SHA1 9844ad5dc79a8d914d8707d2d17cf6be0de9e7d5 SHA256 1039d0b2218bab7076ef55626e510a779027ab658e62730c74dc2de439f4ab33
-DIST ati-driver-installer-8.28.8.run 53989404 RMD160 0ea23d37c0e203fc8acc5bd7e100bdf78c05745f SHA1 811b73481f82d178b26417fd3d4b227864bd4527 SHA256 5eaeab1b906a0b8a30f88ab733390ecbc3ebeaa0c04c0368b757b99c31919e77
-DIST ati-driver-installer-8.29.6.run 57776757 RMD160 b2440a153e4c95c8926d7333efbd864b2c1450bc SHA1 db53f411fa076bc927023f2636171b474aa360f0 SHA256 d1d341db0a4a6d723ce99b553dbc332f9e234e92ba22cb5cc4dbec40ece5ce6b
-DIST ati-driver-installer-8.30.3.run 58041208 RMD160 d4481bba9313cf9bcb71b7603034595677eb53f9 SHA1 37e73967e6921b0a362cb344929282be99e163ce SHA256 3d03b64ba8fd6fef3c50a2037a4e8d97955086fee3da274c2993d55aae058dcc
 DIST ati-driver-installer-8.32.5-x86.x86_64.run 58503169 RMD160 45bf6649227081f6ec10f65305661417c0314748 SHA1 a7411f8e43bb08a822e94d2db7630f868e23afe8 SHA256 d30b7302d4d7952e82ada8a28df0fb8ddd995d2e3f7aac53b67de450c7895475
 DIST ati-driver-installer-8.33.6-x86.x86_64.run 58620730 RMD160 141531330a77d2981d56fd5682d3220d757cc51d SHA1 d1c364698e524da3f4cd8d43bfbd2cd261ed0ae3 SHA256 7e758637c578fe00de00e2bcdf561d92036c73125ef98512be7f1a1405e8f2ae
 DIST ati-driver-installer-8.34.8-x86.x86_64.run 49705555 RMD160 c778c5070673f3b027f5e5cdd2cfbd86e4318ffc SHA1 d7bd2804ecf5aa067aa6b1f3b3adeb8767243e79 SHA256 936f74031151fc9cf09fd8da035bd0cab3b8e6f56ffd76e8feb1f431196e915b
@@ -71,26 +64,6 @@ EBUILD ati-drivers-8.27.10-r1.ebuild 10543 RMD160 a137a262e4e1bb9e4118d87a1c804a
 MD5 233ad0d0a2e7d383bc357293b876d9f2 ati-drivers-8.27.10-r1.ebuild 10543
 RMD160 a137a262e4e1bb9e4118d87a1c804a8a0641eb97 ati-drivers-8.27.10-r1.ebuild 10543
 SHA256 22855d255a6cee2204040913cfebef1bb3cfac2d115700b428d8ff6205e0c67a ati-drivers-8.27.10-r1.ebuild 10543
-EBUILD ati-drivers-8.28.8-r1.ebuild 10611 RMD160 8c1d985cd27e677689e743e5d7006231025a9a35 SHA1 b3c587ccc98e42164ab33eb17e40cb89bb3a6b32 SHA256 9738495a4b715288ebfb6ebee1cfd886f68eb6bcfbb416130843c4f0bd8795e3
-MD5 8a6348d06950964d0905c3b4f0e9a3ea ati-drivers-8.28.8-r1.ebuild 10611
-RMD160 8c1d985cd27e677689e743e5d7006231025a9a35 ati-drivers-8.28.8-r1.ebuild 10611
-SHA256 9738495a4b715288ebfb6ebee1cfd886f68eb6bcfbb416130843c4f0bd8795e3 ati-drivers-8.28.8-r1.ebuild 10611
-EBUILD ati-drivers-8.28.8.ebuild 10459 RMD160 77062aa1a89eae18d9ef5c23d47e3206c8b4f70c SHA1 057f9d6e3a5daa46e58dec5a0f2c969744aa6bf4 SHA256 5b19e5cf5c9c3456eecebdeaca62794eb9368fb8851931504d41eb7dc9836818
-MD5 d97bdb8817f64ca6c6065648ba4128f9 ati-drivers-8.28.8.ebuild 10459
-RMD160 77062aa1a89eae18d9ef5c23d47e3206c8b4f70c ati-drivers-8.28.8.ebuild 10459
-SHA256 5b19e5cf5c9c3456eecebdeaca62794eb9368fb8851931504d41eb7dc9836818 ati-drivers-8.28.8.ebuild 10459
-EBUILD ati-drivers-8.29.6.ebuild 10457 RMD160 dbc5c47db6b5121871caf20314409a298b3f22ec SHA1 4dc0e4b18934923d699bc5d46670ee8c89a4391e SHA256 c7f327e3e72efa2a4bf1ea0444fb03b50910e6eceef694d1952bc5e047f6fa9a
-MD5 22c87ed29e19fa1a19a272343eddb3f1 ati-drivers-8.29.6.ebuild 10457
-RMD160 dbc5c47db6b5121871caf20314409a298b3f22ec ati-drivers-8.29.6.ebuild 10457
-SHA256 c7f327e3e72efa2a4bf1ea0444fb03b50910e6eceef694d1952bc5e047f6fa9a ati-drivers-8.29.6.ebuild 10457
-EBUILD ati-drivers-8.30.3-r1.ebuild 9862 RMD160 e53a096ccf22c64c1be5e143d8c46126cc85197d SHA1 59095f8f68d44bbf5a61632aad4897c0aee8460f SHA256 2d756d34550f8b9ff5e498f39c05b46b1a9febdefdb9f59d7f149cff33fa4ab2
-MD5 45b9f6d5ba77916e349c5ef2330d9507 ati-drivers-8.30.3-r1.ebuild 9862
-RMD160 e53a096ccf22c64c1be5e143d8c46126cc85197d ati-drivers-8.30.3-r1.ebuild 9862
-SHA256 2d756d34550f8b9ff5e498f39c05b46b1a9febdefdb9f59d7f149cff33fa4ab2 ati-drivers-8.30.3-r1.ebuild 9862
-EBUILD ati-drivers-8.30.3.ebuild 10453 RMD160 851b9be77258cc40577cd50435f3e20cb76071df SHA1 d061f5fddc995b5bb82145cd18f69b4a1483b61a SHA256 f77ff6a087e244e2e232499f337648c7dc1bbaa02d03c2e13d0658cb5b1054c5
-MD5 383348664c857ac8058248ed58986613 ati-drivers-8.30.3.ebuild 10453
-RMD160 851b9be77258cc40577cd50435f3e20cb76071df ati-drivers-8.30.3.ebuild 10453
-SHA256 f77ff6a087e244e2e232499f337648c7dc1bbaa02d03c2e13d0658cb5b1054c5 ati-drivers-8.30.3.ebuild 10453
 EBUILD ati-drivers-8.32.5.ebuild 9895 RMD160 9a0794acebea3582ac88cc81b801d892e612f3a6 SHA1 252febb980d42a15023d3c185c64c2ed21ea6f13 SHA256 0dd6f92b58226a3d27c7a8ef52d80dd70f9fb31d2a762b63a3e573a934f74d43
 MD5 f482fb5fc8ecff29fff3854dc8ef9792 ati-drivers-8.32.5.ebuild 9895
 RMD160 9a0794acebea3582ac88cc81b801d892e612f3a6 ati-drivers-8.32.5.ebuild 9895
@@ -131,10 +104,10 @@ EBUILD ati-drivers-8.40.4.ebuild 14162 RMD160 1e0e3affd8944f103aa4be548d6c52f2bf
 MD5 da633d03e6bb7359f10b3fcecffed96b ati-drivers-8.40.4.ebuild 14162
 RMD160 1e0e3affd8944f103aa4be548d6c52f2bf113ee0 ati-drivers-8.40.4.ebuild 14162
 SHA256 1b77fbf5d2ee8bed1720a374a1dabbf045e5bfa62345211b494e16857f3838d1 ati-drivers-8.40.4.ebuild 14162
-MISC ChangeLog 40432 RMD160 d198b8f1928da72eea46e1c0bc365125928b0712 SHA1 61ef1423268b63e8393c254b4d1524529f9e0a69 SHA256 8378d54eb9d45321146b073299c57577329c94c4244e3a586b3abc48dd849f3c
-MD5 d523d66afd6172c68bb4c3f24079aafb ChangeLog 40432
-RMD160 d198b8f1928da72eea46e1c0bc365125928b0712 ChangeLog 40432
-SHA256 8378d54eb9d45321146b073299c57577329c94c4244e3a586b3abc48dd849f3c ChangeLog 40432
+MISC ChangeLog 40704 RMD160 924883c07ac18770298df311b7e5d9a36e8abce5 SHA1 12934be20a9493406d4c6eece0cd77e415a8b47c SHA256 d88abcc56e84c6b19fde21c0c71709094d7480e6136b53336fa2d9c167e43d3e
+MD5 a0aa6ed6fa2ed5fbf91e6c6de73f8d5e ChangeLog 40704
+RMD160 924883c07ac18770298df311b7e5d9a36e8abce5 ChangeLog 40704
+SHA256 d88abcc56e84c6b19fde21c0c71709094d7480e6136b53336fa2d9c167e43d3e ChangeLog 40704
 MISC metadata.xml 494 RMD160 6c0f807a9fcdcaee2e28906992a35dd87d24ff0a SHA1 3ba9ee03c89575c03788c087c2dea8c208b398e9 SHA256 457f40aec01e7f047adfab46ed13813853102027c1f4cd68efa45a2bd39aff08
 MD5 f462ad2ddb101d99fc4860e39a197a9f metadata.xml 494
 RMD160 6c0f807a9fcdcaee2e28906992a35dd87d24ff0a metadata.xml 494
@@ -142,21 +115,6 @@ SHA256 457f40aec01e7f047adfab46ed13813853102027c1f4cd68efa45a2bd39aff08 metadata
 MD5 918748360fc78a295d9b5495f3f6b762 files/digest-ati-drivers-8.27.10-r1 599
 RMD160 400d87e50df2105715fe51eb3181598b4d9d3756 files/digest-ati-drivers-8.27.10-r1 599
 SHA256 d4d707b283f07b61963445d17b9454993007acb26a60cf48ea82e01654f686d8 files/digest-ati-drivers-8.27.10-r1 599
-MD5 aafcc244946dfdff8fd6543d396d521a files/digest-ati-drivers-8.28.8 280
-RMD160 4c5be72a1a2c1908d1fae07d0437c6807192ac79 files/digest-ati-drivers-8.28.8 280
-SHA256 a172c7af9725583e45454906174254b91c5ee6fdea38d8a56f22f3c28abcb82b files/digest-ati-drivers-8.28.8 280
-MD5 aafcc244946dfdff8fd6543d396d521a files/digest-ati-drivers-8.28.8-r1 280
-RMD160 4c5be72a1a2c1908d1fae07d0437c6807192ac79 files/digest-ati-drivers-8.28.8-r1 280
-SHA256 a172c7af9725583e45454906174254b91c5ee6fdea38d8a56f22f3c28abcb82b files/digest-ati-drivers-8.28.8-r1 280
-MD5 def642418453b0cfdd7964633b0ffc8f files/digest-ati-drivers-8.29.6 280
-RMD160 24625bb4e4e00d67975e90f65f8c84ecf7a58177 files/digest-ati-drivers-8.29.6 280
-SHA256 1be5719dcefe0f04a6bae5aa005174cf1dbead722948f6328c6470bcf9a10c36 files/digest-ati-drivers-8.29.6 280
-MD5 74b92713cd7b0e4a8cb31b0cf50834ec files/digest-ati-drivers-8.30.3 280
-RMD160 91645bb5fe9039e684e70b913283b3c841f70b19 files/digest-ati-drivers-8.30.3 280
-SHA256 18779cfdde4edd8c60953531296ac2200483b8fbab9dc6001922bf0f5d4a9691 files/digest-ati-drivers-8.30.3 280
-MD5 74b92713cd7b0e4a8cb31b0cf50834ec files/digest-ati-drivers-8.30.3-r1 280
-RMD160 91645bb5fe9039e684e70b913283b3c841f70b19 files/digest-ati-drivers-8.30.3-r1 280
-SHA256 18779cfdde4edd8c60953531296ac2200483b8fbab9dc6001922bf0f5d4a9691 files/digest-ati-drivers-8.30.3-r1 280
 MD5 1963ca03d87d124fb7e1860ddb48abcb files/digest-ati-drivers-8.32.5 313
 RMD160 03a500dde0ac58356dc1ea7f447e8b88e284697c files/digest-ati-drivers-8.32.5 313
 SHA256 791d1512c572ce00dbaef63785b6cad94794d6b86181f3ed984df941cd49bd00 files/digest-ati-drivers-8.32.5 313
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.28.8-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.28.8-r1.ebuild
deleted file mode 100644
index 18e1014da573..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.28.8-r1.ebuild
+++ /dev/null
@@ -1,378 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.28.8-r1.ebuild,v 1.6 2007/07/22 02:31:53 dberkholz Exp $
-
-IUSE="acpi doc opengl"
-
-inherit eutils rpm multilib linux-mod linux-info toolchain-funcs
-
-DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
-HOMEPAGE="http://www.ati.com"
-ATI_URL="https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/"
-SRC_URI="${ATI_URL}/ati-driver-installer-${PV}.run"
-
-LICENSE="ATI"
-KEYWORDS="~amd64 x86"
-
-RDEPEND="x11-base/xorg-server
-	 app-admin/eselect-opengl
-	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )
-	 acpi? (
-	 	x11-apps/xauth
-	 	sys-power/acpid
-	 )"
-
-DEPEND=">=virtual/linux-sources-2.4
-	${RDEPEND}"
-
-PROVIDE="virtual/opengl"
-
-ATIBIN="${D}/opt/ati/bin"
-RESTRICT="strip"
-
-MODULE_NAMES="fglrx(video:${WORKDIR}/common/lib/modules/fglrx/build_mod)"
-
-QA_EXECSTACK_x86="usr/lib/xorg/modules/dri/fglrx_dri.so
-	usr/lib/opengl/ati/lib/libGL.so.1.2"
-QA_EXECSTACK_amd64="usr/lib64/xorg/modules/dri/fglrx_dri.so usr/lib32/xorg/modules/dri/fglrx_dri.so"
-QA_TEXTRELS_x86="usr/lib/xorg/modules/dri/fglrx_dri.so
-	usr/lib/opengl/ati/lib/libGL.so.1.2
-	usr/lib/xorg/modules/dri/atiogl_a_dri.so"
-QA_TEXTRELS_amd64="usr/lib64/xorg/modules/dri/fglrx_dri.so usr/lib32/opengl/ati/lib/libGL.so.1.2 usr/lib32/xorg/modules/dri/fglrx_dri.so usr/lib32/xorg/modules/dri/atiogl_a_dri.so"
-
-choose_driver_paths() {
-	ARCH_DIR="${WORKDIR}/arch"
-	COMMON_DIR="${WORKDIR}/common"
-
-	#new modular X paths, 0 is a workaround.
-	if has_version "x11-base/xorg-server"; then
-		if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 1 ] &&
-		   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" = 0 ] &&
-		   [ "$(get_version_component_range 3 ${X11_IMPLEM_V})" = 99 ] ||
-		   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" != 0 ]
-		then
-			BASE_DIR="${WORKDIR}/x710"
-		else
-			BASE_DIR="${WORKDIR}/x690"
-		fi
-			xlibdir="xorg"
-	else
-		BASE_DIR="${WORKDIR}/x$(get_version_component_range 1 ${X11_IMPLEM_V})"
-		xlibdir=""
-
-		# Determine if we are facing X.org 6.8.99 aka 6.9
-		if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 6 ] &&
-		   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" = 8 ] &&
-		   [ "$(get_version_component_range 3 ${X11_IMPLEM_V})" = 99 ]
-		then
-			BASE_DIR="${BASE_DIR}90"
-		else
-			BASE_DIR="${BASE_DIR}$(get_version_component_range 2 ${X11_IMPLEM_V})0"
-		fi
-	fi
-
-	if use amd64 ; then
-		BASE_DIR="${BASE_DIR}_64a"
-		ARCH_DIR="${ARCH_DIR}/x86_64"
-	else
-		ARCH_DIR="${ARCH_DIR}/x86"
-	fi
-}
-
-pkg_setup(){
-	#check kernel and sets up KV_OBJ
-	linux-mod_pkg_setup
-	local agp
-	ebegin "Checking for MTRR support enabled"
-	linux_chkconfig_present MTRR
-	eend $?
-	if [[ $? -ne 0 ]] ; then
-	ewarn "You don't have MTRR support enabled, the direct rendering"
-	ewarn "will not work."
-	fi
-
-	ebegin "Checking for AGP support enabled"
-	linux_chkconfig_present AGP
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-
-		ebegin "Checking for PCI Express support enabled"
-		linux_chkconfig_present PCIEPORTBUS
-		eend $?
-
-		if [[ $? -ne 0 ]] ; then
-			ewarn "If you don't have either AGP or PCI Express support enabled, direct rendering"
-			ewarn "could work only using the internal support."
-		fi
-
-	fi
-	ebegin "Checking for DRM support disabled"
-	! linux_chkconfig_builtin DRM
-	eend $?
-	if [[ $? -ne 0 ]] ; then
-	ewarn "You have DRM support enabled builtin, the direct rendering"
-	ewarn "will not work."
-	fi
-
-	# Set up X11 implementation
-	X11_IMPLEM=xorg-x11
-	X11_IMPLEM_V="$(best_version x11-base/xorg-server)"
-	X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}"
-	einfo "X11 implementation is ${X11_IMPLEM}."
-	choose_driver_paths
-}
-
-src_unpack() {
-	local OLDBIN="/usr/X11R6/bin"
-
-	ebegin "Unpacking Ati drivers"
-	sh ${DISTDIR}/${A} --extract ${WORKDIR} &> /dev/null
-	eend $? || die "unpack failed"
-
-	rm -rf ${ARCH_DIR}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel}
-
-	if use acpi
-	then
-		sed -i \
-		-e "s/\/var\/lib\/xdm\/authdir/\/etc\/X11\/xdm\/authdir/" \
-		-e "s/\/var\/lib\/gdm/\/var\/gdm/" \
-		-e "s/#ffff#/#ffff##:.*MIT-MAGIC-COOKIE/" \
-		"${WORKDIR}/common/etc/ati/authatieventsd.sh" \
-			|| die "sed failed."
-
-		cd ${WORKDIR}
-		epatch ${FILESDIR}/ati-powermode.sh.patch
-	fi
-
-	epatch "${FILESDIR}/${P}-linux-2.6.18.patch"
-	epatch "${FILESDIR}/ati-drivers-2.6.19.patch"
-}
-
-src_compile() {
-	einfo "Building the DRM module..."
-	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
-	ln -s \
-	${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
-	|| die "cannot find precompiled core"
-
-	if kernel_is 2 6
-	then
-		set_arch_to_kernel
-		addwrite "/usr/src/${FK}"
-		cp 2.6.x/Makefile .
-		export _POSIX2_VERSION="199209"
-		if use_m ;
-		then
-			make -C ${KV_DIR} M="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
-				modules || ewarn "DRM module not built"
-		else
-			make -C ${KV_DIR} SUBDIRS="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
-				modules || ewarn "DRM module not built"
-		fi
-		set_arch_to_portage
-	else
-		export _POSIX2_VERSION="199209"
-		# That is the dirty way to avoid the id -u check
-		sed -e 's:`id -u`:0:' \
-			-e "s:\`uname -r\`:${KV_FULL}:" \
-			-i make.sh
-		chmod +x make.sh
-		./make.sh || ewarn "DRM module not built"
-	fi
-}
-
-pkg_preinst() {
-	# Clean the dynamic libGL stuff's home to ensure
-	# we don't have stale libs floating around ...
-	if [ -d "${ROOT}/usr/lib/opengl/ati" ]
-	then
-		rm -rf ${ROOT}/usr/lib/opengl/ati/*
-	fi
-}
-
-src_install() {
-	local ATI_LIBGL_PATH=""
-	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
-	linux-mod_src_install
-
-	cd ${WORKDIR}
-
-	local native_dir
-	use x86 && native_dir="lib"
-	use amd64 && native_dir="lib64"
-
-	if has_multilib_profile; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	elif use amd64; then
-		src_install-libs lib $(get_multilibdir)
-		src_install-libs lib64 $(get_libdir)
-	else
-		src_install-libs
-	fi &> /dev/null
-
-	#apps, man pages, and conf files
-	exeinto /opt/ati/bin
-	doexe ${ARCH_DIR}/usr/X11R6/bin/*
-	if use acpi
-	then
-		exeinto /opt/ati/sbin
-		doexe ${ARCH_DIR}/usr/sbin/*
-		insinto /opt/ati/man/man8
-		doins common/usr/share/man/man8/*
-		newinitd ${FILESDIR}/atieventsd.rc6 atieventsd
-		dodir /etc/conf.d
-		echo 'ATIEVENTSDOPTS=""' > ${D}/etc/conf.d/atieventsd
-	fi
-	#ati custom stuff
-	insinto /usr
-	doins -r ${WORKDIR}/common/usr/include
-
-	#documentation
-	if use doc; then
-		dodir /usr/share/doc/fglrx
-		cp -pPR common/usr/share/doc/fglrx/* \
-			${D}/usr/share/doc/fglrx
-	fi
-
-	#env.d entry
-	cp ${FILESDIR}/09ati ${T}/
-
-	if use acpi
-	then
-		local ATIETC="${WORKDIR}/common/usr/share/doc/fglrx/examples/etc/acpi"
-		exeinto /etc/acpi
-		doexe ${ATIETC}/ati-powermode.sh
-		insinto /etc/acpi/events
-		doins ${ATIETC}/events/a-ac-aticonfig
-		doins ${ATIETC}/events/a-lid-aticonfig
-	fi
-
-	#Work around hardcoded path in 32bit libGL.so on amd64, bug 101539
-	if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then
-		ATI_LIBGL_PATH="/usr/lib/dri:/usr/$(get_libdir)/dri:/usr/lib32/${xlibdir}/modules/dri/:/usr/$(get_libdir)/${xlibdir}/modules/dri"
-	fi
-		cat >>${T}/09ati <<EOF
-
-LIBGL_DRIVERS_PATH="\$LIBGL_DRIVERS_PATH:$ATI_LIBGL_PATH"
-EOF
-
-	doenvd ${T}/09ati
-}
-
-src_install-libs() {
-	local pkglibdir=lib
-	local inslibdir="$(get_libdir)/${xlibdir}"
-	ATI_LIBGL_PATH="${ATI_LIBGL_PATH}:/usr/$(get_libdir)/${xlibdir}/modules/dri"
-	if [ ${#} -eq 2 ]; then
-		pkglibdir=${1}
-		inslibdir=${2}
-	elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then
-		pkglibdir=lib64
-	fi
-
-	einfo "${pkglibdir} -> ${inslibdir}"
-
-	local ATI_ROOT="/usr/$(get_libdir)/opengl/ati"
-
-	# The GLX libraries
-	exeinto ${ATI_ROOT}/lib
-	doexe ${ARCH_DIR}/usr/X11R6/${pkglibdir}/libGL.so.1.2
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so
-
-	# Don't do this... see bug #47598
-	#dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
-
-	# same as the xorg implementation
-	dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions
-	#Workaround
-	if use opengl ; then
-	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
-		/usr/$(get_libdir)/opengl/${X11_IMPLEM}/lib/libGL.la \
-		> $D/${ATI_ROOT}/lib/libGL.la
-	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
-	fi
-	# X and DRI driver
-	if has_version "<x11-base/xorg-x11-6.8.0-r4"
-	then
-		local X11_DIR="/usr/X11R6/"
-	else
-		local X11_DIR="/usr/"
-	fi
-
-	local X11_LIB_DIR="${X11_DIR}${inslibdir}"
-
-	exeinto ${X11_LIB_DIR}/modules/drivers
-	# In X.org 6.8.99 / 6.9 this is a .so
-	doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.*o
-
-	exeinto ${X11_LIB_DIR}/modules/dri
-	doexe ${ARCH_DIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-	doexe ${ARCH_DIR}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so
-
-	exeinto ${X11_LIB_DIR}/modules/linux
-	# In X.org 6.8.99 / 6.9 this is a .so
-	if has_version ">=x11-base/xorg-x11-6.8.99" || \
-		has_version "x11-base/xorg-server"
-	then
-		doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so
-	else
-		doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
-	fi
-
-	if has_version ">=x11-base/xorg-x11-6.8.99" || \
-		has_version "x11-base/xorg-server"
-	then
-		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig} \
-			${D}/usr/$(get_libdir)
-	else
-		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig.a} \
-			${D}/usr/$(get_libdir)
-	fi
-
-	#Not the best place
-	insinto ${X11_DIR}/include/X11/extensions
-	doins ${COMMON_DIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
-
-	# misc ati configuration files for /etc
-	dodir /etc
-	cp -pP ${COMMON_DIR}/etc/fglrxprofiles.csv ${D}/etc/
-	cp -pP ${COMMON_DIR}/etc/fglrxrc ${D}/etc/
-	dodir /etc/ati
-	cp -pP ${COMMON_DIR}/etc/ati/logo* ${D}/etc/ati/
-	if use acpi
-	then
-		cp -pP ${COMMON_DIR}/etc/ati/authatieventsd.sh ${D}/etc/ati/
-	fi
-}
-
-pkg_postinst() {
-	/usr/bin/eselect opengl set --use-old ati
-
-	echo
-	einfo "To switch to ATI OpenGL, run \"eselect opengl set ati\""
-	einfo "To change your xorg.conf you can use the bundled \"aticonfig\""
-	if use !opengl ; then
-	ewarn "You don't have the opengl useflag enabled, you won't be able to build"
-	ewarn "opengl applications nor use opengl driver features, if that isn't"
-	ewarn "the intended behaviour please add opengl to your useflag and issue"
-	ewarn "# emerge -Nu ati-drivers"
-	fi
-	echo
-	einfo "If you experience unexplained segmentation faults and kernel crashes"
-	einfo "with this driver and multi-threaded applications such as wine,"
-	einfo "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
-	# DRM module
-	linux-mod_pkg_postinst
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-	/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild
deleted file mode 100644
index eca7bf8eca69..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild
+++ /dev/null
@@ -1,373 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild,v 1.7 2007/07/22 02:31:53 dberkholz Exp $
-
-IUSE="acpi doc opengl"
-
-inherit eutils rpm multilib linux-mod linux-info toolchain-funcs
-
-DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
-HOMEPAGE="http://www.ati.com"
-ATI_URL="https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/"
-SRC_URI="${ATI_URL}/ati-driver-installer-${PV}.run"
-
-LICENSE="ATI"
-KEYWORDS="-* ~amd64 ~x86"
-
-RDEPEND="x11-base/xorg-server
-	 app-admin/eselect-opengl
-	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )
-	 acpi? (
-	 	x11-apps/xauth
-	 	sys-power/acpid
-	 )"
-
-DEPEND=">=virtual/linux-sources-2.4
-	${RDEPEND}"
-
-PROVIDE="virtual/opengl"
-
-ATIBIN="${D}/opt/ati/bin"
-RESTRICT="strip"
-EMULTILIB_PKG="true"
-
-MODULE_NAMES="fglrx(video:${WORKDIR}/common/lib/modules/fglrx/build_mod)"
-
-QA_EXECSTACK_x86="usr/lib/xorg/modules/dri/fglrx_dri.so"
-QA_EXECSTACK_amd64="usr/lib64/xorg/modules/dri/fglrx_dri.so usr/lib32/xorg/modules/dri/fglrx_dri.so"
-QA_TEXTRELS_x86="usr/lib/xorg/modules/dri/fglrx_dri.so usr/lib/opengl/ati/lib/libGL.so.1.2"
-QA_TEXTRELS_amd64="usr/lib64/xorg/modules/dri/fglrx_dri.so usr/lib32/opengl/ati/lib/libGL.so.1.2 usr/lib32/xorg/modules/dri/fglrx_dri.so usr/lib32/xorg/modules/dri/atiogl_a_dri.so"
-
-choose_driver_paths() {
-	ARCH_DIR="${WORKDIR}/arch"
-	COMMON_DIR="${WORKDIR}/common"
-
-	#new modular X paths, 0 is a workaround.
-	if has_version "x11-base/xorg-server"; then
-		if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 1 ] &&
-		   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" = 0 ] &&
-		   [ "$(get_version_component_range 3 ${X11_IMPLEM_V})" = 99 ] ||
-		   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" != 0 ]
-		then
-			BASE_DIR="${WORKDIR}/x710"
-		else
-			BASE_DIR="${WORKDIR}/x690"
-		fi
-			xlibdir="xorg"
-	else
-		BASE_DIR="${WORKDIR}/x$(get_version_component_range 1 ${X11_IMPLEM_V})"
-		xlibdir=""
-
-		# Determine if we are facing X.org 6.8.99 aka 6.9
-		if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 6 ] &&
-		   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" = 8 ] &&
-		   [ "$(get_version_component_range 3 ${X11_IMPLEM_V})" = 99 ]
-		then
-			BASE_DIR="${BASE_DIR}90"
-		else
-			BASE_DIR="${BASE_DIR}$(get_version_component_range 2 ${X11_IMPLEM_V})0"
-		fi
-	fi
-
-	if use amd64 ; then
-		BASE_DIR="${BASE_DIR}_64a"
-		ARCH_DIR="${ARCH_DIR}/x86_64"
-	else
-		ARCH_DIR="${ARCH_DIR}/x86"
-	fi
-}
-
-pkg_setup(){
-	#check kernel and sets up KV_OBJ
-	linux-mod_pkg_setup
-	local agp
-	ebegin "Checking for MTRR support enabled"
-	linux_chkconfig_present MTRR
-	eend $?
-	if [[ $? -ne 0 ]] ; then
-	ewarn "You don't have MTRR support enabled, the direct rendering"
-	ewarn "will not work."
-	fi
-
-	ebegin "Checking for AGP support enabled"
-	linux_chkconfig_present AGP
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-
-		ebegin "Checking for PCI Express support enabled"
-		linux_chkconfig_present PCIEPORTBUS
-		eend $?
-
-		if [[ $? -ne 0 ]] ; then
-			ewarn "If you don't have either AGP or PCI Express support enabled, direct rendering"
-			ewarn "could work only using the internal support."
-		fi
-
-	fi
-	ebegin "Checking for DRM support disabled"
-	! linux_chkconfig_builtin DRM
-	eend $?
-	if [[ $? -ne 0 ]] ; then
-	ewarn "You have DRM support enabled builtin, the direct rendering"
-	ewarn "will not work."
-	fi
-
-	# Set up X11 implementation
-	X11_IMPLEM=xorg-x11
-	X11_IMPLEM_V="$(best_version x11-base/xorg-server)"
-	X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}"
-	einfo "X11 implementation is ${X11_IMPLEM}."
-	choose_driver_paths
-}
-
-src_unpack() {
-	local OLDBIN="/usr/X11R6/bin"
-
-	ebegin "Unpacking Ati drivers"
-	sh ${DISTDIR}/${A} --extract ${WORKDIR} &> /dev/null
-	eend $? || die "unpack failed"
-
-	rm -rf ${ARCH_DIR}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel}
-
-	if use acpi
-	then
-		sed -i \
-		-e "s/\/var\/lib\/xdm\/authdir/\/etc\/X11\/xdm\/authdir/" \
-		-e "s/\/var\/lib\/gdm/\/var\/gdm/" \
-		-e "s/#ffff#/#ffff##:.*MIT-MAGIC-COOKIE/" \
-		"${WORKDIR}/common/etc/ati/authatieventsd.sh" \
-			|| die "sed failed."
-
-		cd ${WORKDIR}
-		epatch ${FILESDIR}/ati-powermode.sh.patch
-	fi
-}
-
-src_compile() {
-	einfo "Building the DRM module..."
-	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
-	ln -s \
-	${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
-	|| die "cannot find precompiled core"
-
-	if kernel_is 2 6
-	then
-		set_arch_to_kernel
-		addwrite "/usr/src/${FK}"
-		cp 2.6.x/Makefile .
-		export _POSIX2_VERSION="199209"
-		if use_m ;
-		then
-			make -C ${KV_DIR} M="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
-				modules || ewarn "DRM module not built"
-		else
-			make -C ${KV_DIR} SUBDIRS="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
-				modules || ewarn "DRM module not built"
-		fi
-		set_arch_to_portage
-	else
-		export _POSIX2_VERSION="199209"
-		# That is the dirty way to avoid the id -u check
-		sed -e 's:`id -u`:0:' \
-			-e "s:\`uname -r\`:${KV_FULL}:" \
-			-i make.sh
-		chmod +x make.sh
-		./make.sh || ewarn "DRM module not built"
-	fi
-}
-
-pkg_preinst() {
-	# Clean the dynamic libGL stuff's home to ensure
-	# we don't have stale libs floating around ...
-	if [ -d "${ROOT}/usr/lib/opengl/ati" ]
-	then
-		rm -rf ${ROOT}/usr/lib/opengl/ati/*
-	fi
-}
-
-src_install() {
-	local ATI_LIBGL_PATH=""
-	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
-	linux-mod_src_install
-
-	cd ${WORKDIR}
-
-	local native_dir
-	use x86 && native_dir="lib"
-	use amd64 && native_dir="lib64"
-
-	if has_multilib_profile; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	elif use amd64; then
-		src_install-libs lib $(get_multilibdir)
-		src_install-libs lib64 $(get_libdir)
-	else
-		src_install-libs
-	fi &> /dev/null
-
-	#apps, man pages, and conf files
-	exeinto /opt/ati/bin
-	doexe ${ARCH_DIR}/usr/X11R6/bin/*
-	if use acpi
-	then
-		exeinto /opt/ati/sbin
-		doexe ${ARCH_DIR}/usr/sbin/*
-		insinto /opt/ati/man/man8
-		doins common/usr/share/man/man8/*
-		newinitd ${FILESDIR}/atieventsd.rc6 atieventsd
-		dodir /etc/conf.d
-		echo 'ATIEVENTSDOPTS=""' > ${D}/etc/conf.d/atieventsd
-	fi
-	#ati custom stuff
-	insinto /usr
-	doins -r ${WORKDIR}/common/usr/include
-
-	#documentation
-	if use doc; then
-		dodir /usr/share/doc/fglrx
-		cp -pPR common/usr/share/doc/fglrx/* \
-			${D}/usr/share/doc/fglrx
-	fi
-
-	#env.d entry
-	cp ${FILESDIR}/09ati ${T}/
-
-	if use acpi
-	then
-		local ATIETC="${WORKDIR}/common/usr/share/doc/fglrx/examples/etc/acpi"
-		exeinto /etc/acpi
-		doexe ${ATIETC}/ati-powermode.sh
-		insinto /etc/acpi/events
-		doins ${ATIETC}/events/a-ac-aticonfig
-		doins ${ATIETC}/events/a-lid-aticonfig
-	fi
-
-	#Work around hardcoded path in 32bit libGL.so on amd64, bug 101539
-	if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then
-		ATI_LIBGL_PATH="/usr/lib/dri:/usr/$(get_libdir)/dri:/usr/lib32/${xlibdir}/modules/dri/:/usr/$(get_libdir)/${xlibdir}/modules/dri"
-	fi
-		cat >>${T}/09ati <<EOF
-
-LIBGL_DRIVERS_PATH="\$LIBGL_DRIVERS_PATH:$ATI_LIBGL_PATH"
-EOF
-
-	doenvd ${T}/09ati
-}
-
-src_install-libs() {
-	local pkglibdir=lib
-	local inslibdir="$(get_libdir)/${xlibdir}"
-	ATI_LIBGL_PATH="${ATI_LIBGL_PATH}:/usr/$(get_libdir)/${xlibdir}/modules/dri"
-	if [ ${#} -eq 2 ]; then
-		pkglibdir=${1}
-		inslibdir=${2}
-	elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then
-		pkglibdir=lib64
-	fi
-
-	einfo "${pkglibdir} -> ${inslibdir}"
-
-	local ATI_ROOT="/usr/$(get_libdir)/opengl/ati"
-
-	# The GLX libraries
-	exeinto ${ATI_ROOT}/lib
-	doexe ${ARCH_DIR}/usr/X11R6/${pkglibdir}/libGL.so.1.2
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so
-
-	# Don't do this... see bug #47598
-	#dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
-
-	# same as the xorg implementation
-	dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions
-	#Workaround
-	if use opengl ; then
-	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
-		/usr/$(get_libdir)/opengl/${X11_IMPLEM}/lib/libGL.la \
-		> $D/${ATI_ROOT}/lib/libGL.la
-	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
-	fi
-	# X and DRI driver
-	if has_version "<x11-base/xorg-x11-6.8.0-r4"
-	then
-		local X11_DIR="/usr/X11R6/"
-	else
-		local X11_DIR="/usr/"
-	fi
-
-	local X11_LIB_DIR="${X11_DIR}${inslibdir}"
-
-	exeinto ${X11_LIB_DIR}/modules/drivers
-	# In X.org 6.8.99 / 6.9 this is a .so
-	doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.*o
-
-	exeinto ${X11_LIB_DIR}/modules/dri
-	doexe ${ARCH_DIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-	doexe ${ARCH_DIR}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so
-
-	exeinto ${X11_LIB_DIR}/modules/linux
-	# In X.org 6.8.99 / 6.9 this is a .so
-	if has_version ">=x11-base/xorg-x11-6.8.99" || \
-		has_version "x11-base/xorg-server"
-	then
-		doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so
-	else
-		doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
-	fi
-
-	if has_version ">=x11-base/xorg-x11-6.8.99" || \
-		has_version "x11-base/xorg-server"
-	then
-		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig} \
-			${D}/usr/$(get_libdir)
-	else
-		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig.a} \
-			${D}/usr/$(get_libdir)
-	fi
-
-	#Not the best place
-	insinto ${X11_DIR}/include/X11/extensions
-	doins ${COMMON_DIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
-
-	# misc ati configuration files for /etc
-	dodir /etc
-	cp -pP ${COMMON_DIR}/etc/fglrxprofiles.csv ${D}/etc/
-	cp -pP ${COMMON_DIR}/etc/fglrxrc ${D}/etc/
-	dodir /etc/ati
-	cp -pP ${COMMON_DIR}/etc/ati/logo* ${D}/etc/ati/
-	if use acpi
-	then
-		cp -pP ${COMMON_DIR}/etc/ati/authatieventsd.sh ${D}/etc/ati/
-	fi
-}
-
-pkg_postinst() {
-	/usr/bin/eselect opengl set --use-old ati
-
-	echo
-	einfo "To switch to ATI OpenGL, run \"eselect opengl set ati\""
-	einfo "To change your xorg.conf you can use the bundled \"aticonfig\""
-	if use !opengl ; then
-	ewarn "You don't have the opengl useflag enabled, you won't be able to build"
-	ewarn "opengl applications nor use opengl driver features, if that isn't"
-	ewarn "the intended behaviour please add opengl to your useflag and issue"
-	ewarn "# emerge -Nu ati-drivers"
-	fi
-	echo
-	einfo "If you experience unexplained segmentation faults and kernel crashes"
-	einfo "with this driver and multi-threaded applications such as wine,"
-	einfo "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
-	# DRM module
-	linux-mod_pkg_postinst
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-	/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.29.6.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.29.6.ebuild
deleted file mode 100644
index 5586e09ea8c5..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.29.6.ebuild
+++ /dev/null
@@ -1,373 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.29.6.ebuild,v 1.7 2007/07/22 02:31:53 dberkholz Exp $
-
-IUSE="acpi doc opengl"
-
-inherit eutils rpm multilib linux-mod linux-info toolchain-funcs
-
-DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
-HOMEPAGE="http://www.ati.com"
-ATI_URL="https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/"
-SRC_URI="${ATI_URL}/ati-driver-installer-${PV}.run"
-
-LICENSE="ATI"
-KEYWORDS="-* ~amd64 ~x86"
-
-RDEPEND="x11-base/xorg-server
-	 app-admin/eselect-opengl
-	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )
-	 acpi? (
-		x11-apps/xauth
-		sys-power/acpid
-	 )"
-
-DEPEND=">=virtual/linux-sources-2.4
-	${RDEPEND}"
-
-PROVIDE="virtual/opengl"
-
-ATIBIN="${D}/opt/ati/bin"
-RESTRICT="strip"
-EMULTILIB_PKG="true"
-
-MODULE_NAMES="fglrx(video:${WORKDIR}/common/lib/modules/fglrx/build_mod)"
-
-QA_EXECSTACK_x86="usr/lib/xorg/modules/dri/fglrx_dri.so"
-QA_EXECSTACK_amd64="usr/lib64/xorg/modules/dri/fglrx_dri.so usr/lib32/xorg/modules/dri/fglrx_dri.so"
-QA_TEXTRELS_x86="usr/lib/xorg/modules/dri/fglrx_dri.so usr/lib/opengl/ati/lib/libGL.so.1.2"
-QA_TEXTRELS_amd64="usr/lib64/xorg/modules/dri/fglrx_dri.so usr/lib32/opengl/ati/lib/libGL.so.1.2 usr/lib32/xorg/modules/dri/fglrx_dri.so usr/lib32/xorg/modules/dri/atiogl_a_dri.so"
-
-choose_driver_paths() {
-	ARCH_DIR="${WORKDIR}/arch"
-	COMMON_DIR="${WORKDIR}/common"
-
-	#new modular X paths, 0 is a workaround.
-	if has_version "x11-base/xorg-server"; then
-		if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 1 ] &&
-		   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" = 0 ] &&
-		   [ "$(get_version_component_range 3 ${X11_IMPLEM_V})" = 99 ] ||
-		   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" != 0 ]
-		then
-			BASE_DIR="${WORKDIR}/x710"
-		else
-			BASE_DIR="${WORKDIR}/x690"
-		fi
-			xlibdir="xorg"
-	else
-		BASE_DIR="${WORKDIR}/x$(get_version_component_range 1 ${X11_IMPLEM_V})"
-		xlibdir=""
-
-		# Determine if we are facing X.org 6.8.99 aka 6.9
-		if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 6 ] &&
-		   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" = 8 ] &&
-		   [ "$(get_version_component_range 3 ${X11_IMPLEM_V})" = 99 ]
-		then
-			BASE_DIR="${BASE_DIR}90"
-		else
-			BASE_DIR="${BASE_DIR}$(get_version_component_range 2 ${X11_IMPLEM_V})0"
-		fi
-	fi
-
-	if use amd64 ; then
-		BASE_DIR="${BASE_DIR}_64a"
-		ARCH_DIR="${ARCH_DIR}/x86_64"
-	else
-		ARCH_DIR="${ARCH_DIR}/x86"
-	fi
-}
-
-pkg_setup(){
-	#check kernel and sets up KV_OBJ
-	linux-mod_pkg_setup
-	local agp
-	ebegin "Checking for MTRR support enabled"
-	linux_chkconfig_present MTRR
-	eend $?
-	if [[ $? -ne 0 ]] ; then
-	ewarn "You don't have MTRR support enabled, the direct rendering"
-	ewarn "will not work."
-	fi
-
-	ebegin "Checking for AGP support enabled"
-	linux_chkconfig_present AGP
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-
-		ebegin "Checking for PCI Express support enabled"
-		linux_chkconfig_present PCIEPORTBUS
-		eend $?
-
-		if [[ $? -ne 0 ]] ; then
-			ewarn "If you don't have either AGP or PCI Express support enabled, direct rendering"
-			ewarn "could work only using the internal support."
-		fi
-
-	fi
-	ebegin "Checking for DRM support disabled"
-	! linux_chkconfig_builtin DRM
-	eend $?
-	if [[ $? -ne 0 ]] ; then
-	ewarn "You have DRM support enabled builtin, the direct rendering"
-	ewarn "will not work."
-	fi
-
-	# Set up X11 implementation
-	X11_IMPLEM=xorg-x11
-	X11_IMPLEM_V="$(best_version x11-base/xorg-server)"
-	X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}"
-	einfo "X11 implementation is ${X11_IMPLEM}."
-	choose_driver_paths
-}
-
-src_unpack() {
-	local OLDBIN="/usr/X11R6/bin"
-
-	ebegin "Unpacking Ati drivers"
-	sh ${DISTDIR}/${A} --extract ${WORKDIR} &> /dev/null
-	eend $? || die "unpack failed"
-
-	rm -rf ${ARCH_DIR}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel}
-
-	if use acpi
-	then
-		sed -i \
-		-e "s/\/var\/lib\/xdm\/authdir/\/etc\/X11\/xdm\/authdir/" \
-		-e "s/\/var\/lib\/gdm/\/var\/gdm/" \
-		-e "s/#ffff#/#ffff##:.*MIT-MAGIC-COOKIE/" \
-		"${WORKDIR}/common/etc/ati/authatieventsd.sh" \
-			|| die "sed failed."
-
-		cd ${WORKDIR}
-		epatch ${FILESDIR}/ati-powermode.sh.patch
-	fi
-}
-
-src_compile() {
-	einfo "Building the DRM module..."
-	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
-	ln -s \
-	${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
-	|| die "cannot find precompiled core"
-
-	if kernel_is 2 6
-	then
-		set_arch_to_kernel
-		addwrite "/usr/src/${FK}"
-		cp 2.6.x/Makefile .
-		export _POSIX2_VERSION="199209"
-		if use_m ;
-		then
-			make -C ${KV_DIR} M="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
-				modules || ewarn "DRM module not built"
-		else
-			make -C ${KV_DIR} SUBDIRS="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
-				modules || ewarn "DRM module not built"
-		fi
-		set_arch_to_portage
-	else
-		export _POSIX2_VERSION="199209"
-		# That is the dirty way to avoid the id -u check
-		sed -e 's:`id -u`:0:' \
-			-e "s:\`uname -r\`:${KV_FULL}:" \
-			-i make.sh
-		chmod +x make.sh
-		./make.sh || ewarn "DRM module not built"
-	fi
-}
-
-pkg_preinst() {
-	# Clean the dynamic libGL stuff's home to ensure
-	# we don't have stale libs floating around ...
-	if [ -d "${ROOT}/usr/lib/opengl/ati" ]
-	then
-		rm -rf ${ROOT}/usr/lib/opengl/ati/*
-	fi
-}
-
-src_install() {
-	local ATI_LIBGL_PATH=""
-	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
-	linux-mod_src_install
-
-	cd ${WORKDIR}
-
-	local native_dir
-	use x86 && native_dir="lib"
-	use amd64 && native_dir="lib64"
-
-	if has_multilib_profile; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	elif use amd64; then
-		src_install-libs lib $(get_multilibdir)
-		src_install-libs lib64 $(get_libdir)
-	else
-		src_install-libs
-	fi &> /dev/null
-
-	#apps, man pages, and conf files
-	exeinto /opt/ati/bin
-	doexe ${ARCH_DIR}/usr/X11R6/bin/*
-	if use acpi
-	then
-		exeinto /opt/ati/sbin
-		doexe ${ARCH_DIR}/usr/sbin/*
-		insinto /opt/ati/man/man8
-		doins common/usr/share/man/man8/*
-		newinitd ${FILESDIR}/atieventsd.rc6 atieventsd
-		dodir /etc/conf.d
-		echo 'ATIEVENTSDOPTS=""' > ${D}/etc/conf.d/atieventsd
-	fi
-	#ati custom stuff
-	insinto /usr
-	doins -r ${WORKDIR}/common/usr/include
-
-	#documentation
-	if use doc; then
-		dodir /usr/share/doc/fglrx
-		cp -pPR common/usr/share/doc/fglrx/* \
-			${D}/usr/share/doc/fglrx
-	fi
-
-	#env.d entry
-	cp ${FILESDIR}/09ati ${T}/
-
-	if use acpi
-	then
-		local ATIETC="${WORKDIR}/common/usr/share/doc/fglrx/examples/etc/acpi"
-		exeinto /etc/acpi
-		doexe ${ATIETC}/ati-powermode.sh
-		insinto /etc/acpi/events
-		doins ${ATIETC}/events/a-ac-aticonfig
-		doins ${ATIETC}/events/a-lid-aticonfig
-	fi
-
-	#Work around hardcoded path in 32bit libGL.so on amd64, bug 101539
-	if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then
-		ATI_LIBGL_PATH="/usr/lib/dri:/usr/$(get_libdir)/dri:/usr/lib32/${xlibdir}/modules/dri/:/usr/$(get_libdir)/${xlibdir}/modules/dri"
-	fi
-		cat >>${T}/09ati <<EOF
-
-LIBGL_DRIVERS_PATH="\$LIBGL_DRIVERS_PATH:$ATI_LIBGL_PATH"
-EOF
-
-	doenvd ${T}/09ati
-}
-
-src_install-libs() {
-	local pkglibdir=lib
-	local inslibdir="$(get_libdir)/${xlibdir}"
-	ATI_LIBGL_PATH="${ATI_LIBGL_PATH}:/usr/$(get_libdir)/${xlibdir}/modules/dri"
-	if [ ${#} -eq 2 ]; then
-		pkglibdir=${1}
-		inslibdir=${2}
-	elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then
-		pkglibdir=lib64
-	fi
-
-	einfo "${pkglibdir} -> ${inslibdir}"
-
-	local ATI_ROOT="/usr/$(get_libdir)/opengl/ati"
-
-	# The GLX libraries
-	exeinto ${ATI_ROOT}/lib
-	doexe ${ARCH_DIR}/usr/X11R6/${pkglibdir}/libGL.so.1.2
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so
-
-	# Don't do this... see bug #47598
-	#dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
-
-	# same as the xorg implementation
-	dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions
-	#Workaround
-	if use opengl ; then
-	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
-		/usr/$(get_libdir)/opengl/${X11_IMPLEM}/lib/libGL.la \
-		> $D/${ATI_ROOT}/lib/libGL.la
-	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
-	fi
-	# X and DRI driver
-	if has_version "<x11-base/xorg-x11-6.8.0-r4"
-	then
-		local X11_DIR="/usr/X11R6/"
-	else
-		local X11_DIR="/usr/"
-	fi
-
-	local X11_LIB_DIR="${X11_DIR}${inslibdir}"
-
-	exeinto ${X11_LIB_DIR}/modules/drivers
-	# In X.org 6.8.99 / 6.9 this is a .so
-	doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.*o
-
-	exeinto ${X11_LIB_DIR}/modules/dri
-	doexe ${ARCH_DIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-	doexe ${ARCH_DIR}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so
-
-	exeinto ${X11_LIB_DIR}/modules/linux
-	# In X.org 6.8.99 / 6.9 this is a .so
-	if has_version ">=x11-base/xorg-x11-6.8.99" || \
-		has_version "x11-base/xorg-server"
-	then
-		doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so
-	else
-		doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
-	fi
-
-	if has_version ">=x11-base/xorg-x11-6.8.99" || \
-		has_version "x11-base/xorg-server"
-	then
-		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig} \
-			${D}/usr/$(get_libdir)
-	else
-		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig.a} \
-			${D}/usr/$(get_libdir)
-	fi
-
-	#Not the best place
-	insinto ${X11_DIR}/include/X11/extensions
-	doins ${COMMON_DIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
-
-	# misc ati configuration files for /etc
-	dodir /etc
-	cp -pP ${COMMON_DIR}/etc/fglrxprofiles.csv ${D}/etc/
-	cp -pP ${COMMON_DIR}/etc/fglrxrc ${D}/etc/
-	dodir /etc/ati
-	cp -pP ${COMMON_DIR}/etc/ati/logo* ${D}/etc/ati/
-	if use acpi
-	then
-		cp -pP ${COMMON_DIR}/etc/ati/authatieventsd.sh ${D}/etc/ati/
-	fi
-}
-
-pkg_postinst() {
-	/usr/bin/eselect opengl set --use-old ati
-
-	echo
-	einfo "To switch to ATI OpenGL, run \"eselect opengl set ati\""
-	einfo "To change your xorg.conf you can use the bundled \"aticonfig\""
-	if use !opengl ; then
-	ewarn "You don't have the opengl useflag enabled, you won't be able to build"
-	ewarn "opengl applications nor use opengl driver features, if that isn't"
-	ewarn "the intended behaviour please add opengl to your useflag and issue"
-	ewarn "# emerge -Nu ati-drivers"
-	fi
-	echo
-	einfo "If you experience unexplained segmentation faults and kernel crashes"
-	einfo "with this driver and multi-threaded applications such as wine,"
-	einfo "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
-	# DRM module
-	linux-mod_pkg_postinst
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-	/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.30.3-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.30.3-r1.ebuild
deleted file mode 100644
index 8943e07a6d22..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.30.3-r1.ebuild
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.30.3-r1.ebuild,v 1.8 2007/07/22 02:31:53 dberkholz Exp $
-
-IUSE="acpi doc opengl"
-
-inherit eutils rpm multilib linux-mod toolchain-funcs
-
-DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
-HOMEPAGE="http://www.ati.com"
-ATI_URL="https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/"
-SRC_URI="${ATI_URL}/ati-driver-installer-${PV}.run"
-
-LICENSE="ATI"
-KEYWORDS="-* ~amd64 ~x86"
-
-RDEPEND="x11-base/xorg-server
-	 app-admin/eselect-opengl
-	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )
-	 acpi? (
-		x11-apps/xauth
-		sys-power/acpid
-	 )"
-
-DEPEND=">=virtual/linux-sources-2.4
-	${RDEPEND}"
-
-PROVIDE="virtual/opengl"
-
-S="${WORKDIR}/common/lib/modules/fglrx/build_mod"
-
-ATIBIN="${D}/opt/ati/bin"
-RESTRICT="strip"
-EMULTILIB_PKG="true"
-
-QA_EXECSTACK_x86="usr/lib/xorg/modules/dri/fglrx_dri.so"
-QA_EXECSTACK_amd64="usr/lib64/xorg/modules/dri/fglrx_dri.so usr/lib32/xorg/modules/dri/fglrx_dri.so"
-QA_TEXTRELS_x86="usr/lib/xorg/modules/dri/fglrx_dri.so usr/lib/opengl/ati/lib/libGL.so.1.2"
-QA_TEXTRELS_amd64="usr/lib64/xorg/modules/dri/fglrx_dri.so usr/lib32/opengl/ati/lib/libGL.so.1.2 usr/lib32/xorg/modules/dri/fglrx_dri.so usr/lib32/xorg/modules/dri/atiogl_a_dri.so"
-
-choose_driver_paths() {
-	ARCH_DIR="${WORKDIR}/arch"
-	COMMON_DIR="${WORKDIR}/common"
-
-	#new modular X paths, 0 is a workaround.
-	if has_version "x11-base/xorg-server"; then
-		if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 1 ] &&
-		   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" = 0 ] &&
-		   [ "$(get_version_component_range 3 ${X11_IMPLEM_V})" = 99 ] ||
-		   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" != 0 ]
-		then
-			BASE_DIR="${WORKDIR}/x710"
-		else
-			BASE_DIR="${WORKDIR}/x690"
-		fi
-			xlibdir="xorg"
-	else
-		BASE_DIR="${WORKDIR}/x$(get_version_component_range 1 ${X11_IMPLEM_V})"
-		xlibdir=""
-
-		# Determine if we are facing X.org 6.8.99 aka 6.9
-		if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 6 ] &&
-		   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" = 8 ] &&
-		   [ "$(get_version_component_range 3 ${X11_IMPLEM_V})" = 99 ]
-		then
-			BASE_DIR="${BASE_DIR}90"
-		else
-			BASE_DIR="${BASE_DIR}$(get_version_component_range 2 ${X11_IMPLEM_V})0"
-		fi
-	fi
-
-	if use amd64 ; then
-		BASE_DIR="${BASE_DIR}_64a"
-		ARCH_DIR="${ARCH_DIR}/x86_64"
-	else
-		ARCH_DIR="${ARCH_DIR}/x86"
-	fi
-}
-
-pkg_setup(){
-	#check kernel and sets up KV_OBJ
-	MODULE_NAMES="fglrx(video)"
-	BUILD_TARGETS="kmod_build"
-	linux-mod_pkg_setup
-	BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}"
-
-	if ! linux_chkconfig_present MTRR; then
-		ewarn "You don't have MTRR support enabled, the direct rendering will not work."
-	fi
-
-	if linux_chkconfig_builtin DRM; then
-		ewarn "You have DRM support enabled builtin, the direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present AGP && ! linux_chkconfig_present PCIEPORTBUS ;then
-		ewarn "If you don't have either AGP or PCI Express support enabled, direct rendering"
-		ewarn "could work only using the internal support."
-	fi
-
-	# Set up X11 implementation
-	X11_IMPLEM=xorg-x11
-	X11_IMPLEM_V="$(best_version x11-base/xorg-server)"
-	X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}"
-	einfo "X11 implementation is ${X11_IMPLEM}."
-	choose_driver_paths
-}
-
-src_unpack() {
-	local OLDBIN="/usr/X11R6/bin"
-
-	ebegin "Unpacking Ati drivers"
-	sh ${DISTDIR}/${A} --extract ${WORKDIR} &> /dev/null
-	eend $? || die "unpack failed"
-
-	rm -rf ${ARCH_DIR}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel}
-
-	epatch ${FILESDIR}/${PN}-2.6.19.patch
-
-	if use acpi
-	then
-		sed -i \
-		-e "s/\/var\/lib\/xdm\/authdir/\/etc\/X11\/xdm\/authdir/" \
-		-e "s/\/var\/lib\/gdm/\/var\/gdm/" \
-		-e "s/#ffff#/#ffff##:.*MIT-MAGIC-COOKIE/" \
-		"${WORKDIR}/common/etc/ati/authatieventsd.sh" \
-			|| die "sed failed."
-
-		cd ${WORKDIR}
-		epatch ${FILESDIR}/ati-powermode.sh.patch
-	fi
-}
-
-src_compile() {
-	einfo "Building the DRM module..."
-	ln -s \
-	${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
-	|| die "cannot find precompiled core"
-
-	export _POSIX2_VERSION="199209"
-
-	if kernel_is 2 6; then
-		cp 2.6.x/Makefile .
-		convert_to_m Makefile
-		linux-mod_src_compile
-	else
-		# That is the dirty way to avoid the id -u check
-		sed -e 's:`id -u`:0:' \
-			-e "s:\`uname -r\`:${KV_FULL}:" \
-			-i make.sh
-		chmod +x make.sh
-		./make.sh || ewarn "DRM module not built"
-	fi
-}
-
-pkg_preinst() {
-	# Clean the dynamic libGL stuff's home to ensure
-	# we don't have stale libs floating around ...
-	if [ -d "${ROOT}/usr/lib/opengl/ati" ]
-	then
-		rm -rf ${ROOT}/usr/lib/opengl/ati/*
-	fi
-}
-
-src_install() {
-	local ATI_LIBGL_PATH=""
-	linux-mod_src_install
-
-	cd ${WORKDIR}
-
-	local native_dir
-	use x86 && native_dir="lib"
-	use amd64 && native_dir="lib64"
-
-	if has_multilib_profile; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	elif use amd64; then
-		src_install-libs lib $(get_multilibdir)
-		src_install-libs lib64 $(get_libdir)
-	else
-		src_install-libs
-	fi &> /dev/null
-
-	#apps, man pages, and conf files
-	exeinto /opt/ati/bin
-	doexe ${ARCH_DIR}/usr/X11R6/bin/*
-	if use acpi
-	then
-		exeinto /opt/ati/sbin
-		doexe ${ARCH_DIR}/usr/sbin/*
-		insinto /opt/ati/man/man8
-		doins common/usr/share/man/man8/*
-		newinitd ${FILESDIR}/atieventsd.rc6 atieventsd
-		dodir /etc/conf.d
-		echo 'ATIEVENTSDOPTS=""' > ${D}/etc/conf.d/atieventsd
-	fi
-	#ati custom stuff
-	insinto /usr
-	doins -r ${WORKDIR}/common/usr/include
-
-	#documentation
-	if use doc; then
-		dodir /usr/share/doc/fglrx
-		cp -pPR common/usr/share/doc/fglrx/* \
-			${D}/usr/share/doc/fglrx
-	fi
-
-	#env.d entry
-	cp ${FILESDIR}/09ati ${T}/
-
-	if use acpi
-	then
-		local ATIETC="${WORKDIR}/common/usr/share/doc/fglrx/examples/etc/acpi"
-		exeinto /etc/acpi
-		doexe ${ATIETC}/ati-powermode.sh
-		insinto /etc/acpi/events
-		doins ${ATIETC}/events/a-ac-aticonfig
-		doins ${ATIETC}/events/a-lid-aticonfig
-	fi
-
-	#Work around hardcoded path in 32bit libGL.so on amd64, bug 101539
-	if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then
-		ATI_LIBGL_PATH="/usr/lib/dri:/usr/$(get_libdir)/dri:/usr/lib32/${xlibdir}/modules/dri/:/usr/$(get_libdir)/${xlibdir}/modules/dri"
-	fi
-		cat >>${T}/09ati <<EOF
-
-LIBGL_DRIVERS_PATH="\$LIBGL_DRIVERS_PATH:$ATI_LIBGL_PATH"
-EOF
-
-	doenvd ${T}/09ati
-}
-
-src_install-libs() {
-	local pkglibdir=lib
-	local inslibdir="$(get_libdir)/${xlibdir}"
-	ATI_LIBGL_PATH="${ATI_LIBGL_PATH}:/usr/$(get_libdir)/${xlibdir}/modules/dri"
-	if [ ${#} -eq 2 ]; then
-		pkglibdir=${1}
-		inslibdir=${2}
-	elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then
-		pkglibdir=lib64
-	fi
-
-	einfo "${pkglibdir} -> ${inslibdir}"
-
-	local ATI_ROOT="/usr/$(get_libdir)/opengl/ati"
-
-	# The GLX libraries
-	exeinto ${ATI_ROOT}/lib
-	doexe ${ARCH_DIR}/usr/X11R6/${pkglibdir}/libGL.so.1.2
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so
-
-	# Don't do this... see bug #47598
-	#dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
-
-	# same as the xorg implementation
-	dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions
-	#Workaround
-	if use opengl ; then
-	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
-		/usr/$(get_libdir)/opengl/${X11_IMPLEM}/lib/libGL.la \
-		> $D/${ATI_ROOT}/lib/libGL.la
-	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
-	fi
-	# X and DRI driver
-	if has_version "<x11-base/xorg-x11-6.8.0-r4"
-	then
-		local X11_DIR="/usr/X11R6/"
-	else
-		local X11_DIR="/usr/"
-	fi
-
-	local X11_LIB_DIR="${X11_DIR}${inslibdir}"
-
-	exeinto ${X11_LIB_DIR}/modules/drivers
-	# In X.org 6.8.99 / 6.9 this is a .so
-	doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.*o
-
-	exeinto ${X11_LIB_DIR}/modules/dri
-	doexe ${ARCH_DIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-	doexe ${ARCH_DIR}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so
-
-	exeinto ${X11_LIB_DIR}/modules/linux
-	# In X.org 6.8.99 / 6.9 this is a .so
-	if has_version ">=x11-base/xorg-x11-6.8.99" || \
-		has_version "x11-base/xorg-server"
-	then
-		doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so
-	else
-		doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
-	fi
-
-	if has_version ">=x11-base/xorg-x11-6.8.99" || \
-		has_version "x11-base/xorg-server"
-	then
-		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig} \
-			${D}/usr/$(get_libdir)
-	else
-		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig.a} \
-			${D}/usr/$(get_libdir)
-	fi
-
-	#Not the best place
-	insinto ${X11_DIR}/include/X11/extensions
-	doins ${COMMON_DIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
-
-	# misc ati configuration files for /etc
-	dodir /etc/ati
-	cp -pP ${COMMON_DIR}/etc/ati/fglrxprofiles.csv ${D}/etc/ati/
-	cp -pP ${COMMON_DIR}/etc/ati/fglrxrc ${D}/etc/ati/
-	cp -pP ${COMMON_DIR}/etc/ati/logo* ${D}/etc/ati/
-	if use acpi
-	then
-		cp -pP ${COMMON_DIR}/etc/ati/authatieventsd.sh ${D}/etc/ati/
-	fi
-}
-
-pkg_postinst() {
-	/usr/bin/eselect opengl set --use-old ati
-
-	echo
-	einfo "To switch to ATI OpenGL, run \"eselect opengl set ati\""
-	einfo "To change your xorg.conf you can use the bundled \"aticonfig\""
-	if use !opengl ; then
-	ewarn "You don't have the opengl useflag enabled, you won't be able to build"
-	ewarn "opengl applications nor use opengl driver features, if that isn't"
-	ewarn "the intended behaviour please add opengl to your useflag and issue"
-	ewarn "# emerge -Nu ati-drivers"
-	fi
-	echo
-	einfo "If you experience unexplained segmentation faults and kernel crashes"
-	einfo "with this driver and multi-threaded applications such as wine,"
-	einfo "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
-	# DRM module
-	linux-mod_pkg_postinst
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-	/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.30.3.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.30.3.ebuild
deleted file mode 100644
index dbfbb5679146..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.30.3.ebuild
+++ /dev/null
@@ -1,372 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.30.3.ebuild,v 1.6 2007/07/22 02:31:53 dberkholz Exp $
-
-IUSE="acpi doc opengl"
-
-inherit eutils rpm multilib linux-mod linux-info toolchain-funcs
-
-DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
-HOMEPAGE="http://www.ati.com"
-ATI_URL="https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/"
-SRC_URI="${ATI_URL}/ati-driver-installer-${PV}.run"
-
-LICENSE="ATI"
-KEYWORDS="-* ~amd64 ~x86"
-
-RDEPEND="x11-base/xorg-server
-	 app-admin/eselect-opengl
-	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )
-	 acpi? (
-		x11-apps/xauth
-		sys-power/acpid
-	 )"
-
-DEPEND=">=virtual/linux-sources-2.4
-	${RDEPEND}"
-
-PROVIDE="virtual/opengl"
-
-ATIBIN="${D}/opt/ati/bin"
-RESTRICT="strip"
-EMULTILIB_PKG="true"
-
-MODULE_NAMES="fglrx(video:${WORKDIR}/common/lib/modules/fglrx/build_mod)"
-
-QA_EXECSTACK_x86="usr/lib/xorg/modules/dri/fglrx_dri.so"
-QA_EXECSTACK_amd64="usr/lib64/xorg/modules/dri/fglrx_dri.so usr/lib32/xorg/modules/dri/fglrx_dri.so"
-QA_TEXTRELS_x86="usr/lib/xorg/modules/dri/fglrx_dri.so usr/lib/opengl/ati/lib/libGL.so.1.2"
-QA_TEXTRELS_amd64="usr/lib64/xorg/modules/dri/fglrx_dri.so usr/lib32/opengl/ati/lib/libGL.so.1.2 usr/lib32/xorg/modules/dri/fglrx_dri.so usr/lib32/xorg/modules/dri/atiogl_a_dri.so"
-
-choose_driver_paths() {
-	ARCH_DIR="${WORKDIR}/arch"
-	COMMON_DIR="${WORKDIR}/common"
-
-	#new modular X paths, 0 is a workaround.
-	if has_version "x11-base/xorg-server"; then
-		if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 1 ] &&
-		   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" = 0 ] &&
-		   [ "$(get_version_component_range 3 ${X11_IMPLEM_V})" = 99 ] ||
-		   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" != 0 ]
-		then
-			BASE_DIR="${WORKDIR}/x710"
-		else
-			BASE_DIR="${WORKDIR}/x690"
-		fi
-			xlibdir="xorg"
-	else
-		BASE_DIR="${WORKDIR}/x$(get_version_component_range 1 ${X11_IMPLEM_V})"
-		xlibdir=""
-
-		# Determine if we are facing X.org 6.8.99 aka 6.9
-		if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 6 ] &&
-		   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" = 8 ] &&
-		   [ "$(get_version_component_range 3 ${X11_IMPLEM_V})" = 99 ]
-		then
-			BASE_DIR="${BASE_DIR}90"
-		else
-			BASE_DIR="${BASE_DIR}$(get_version_component_range 2 ${X11_IMPLEM_V})0"
-		fi
-	fi
-
-	if use amd64 ; then
-		BASE_DIR="${BASE_DIR}_64a"
-		ARCH_DIR="${ARCH_DIR}/x86_64"
-	else
-		ARCH_DIR="${ARCH_DIR}/x86"
-	fi
-}
-
-pkg_setup(){
-	#check kernel and sets up KV_OBJ
-	linux-mod_pkg_setup
-	local agp
-	ebegin "Checking for MTRR support enabled"
-	linux_chkconfig_present MTRR
-	eend $?
-	if [[ $? -ne 0 ]] ; then
-	ewarn "You don't have MTRR support enabled, the direct rendering"
-	ewarn "will not work."
-	fi
-
-	ebegin "Checking for AGP support enabled"
-	linux_chkconfig_present AGP
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-
-		ebegin "Checking for PCI Express support enabled"
-		linux_chkconfig_present PCIEPORTBUS
-		eend $?
-
-		if [[ $? -ne 0 ]] ; then
-			ewarn "If you don't have either AGP or PCI Express support enabled, direct rendering"
-			ewarn "could work only using the internal support."
-		fi
-
-	fi
-	ebegin "Checking for DRM support disabled"
-	! linux_chkconfig_builtin DRM
-	eend $?
-	if [[ $? -ne 0 ]] ; then
-	ewarn "You have DRM support enabled builtin, the direct rendering"
-	ewarn "will not work."
-	fi
-
-	# Set up X11 implementation
-	X11_IMPLEM=xorg-x11
-	X11_IMPLEM_V="$(best_version x11-base/xorg-server)"
-	X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}"
-	einfo "X11 implementation is ${X11_IMPLEM}."
-	choose_driver_paths
-}
-
-src_unpack() {
-	local OLDBIN="/usr/X11R6/bin"
-
-	ebegin "Unpacking Ati drivers"
-	sh ${DISTDIR}/${A} --extract ${WORKDIR} &> /dev/null
-	eend $? || die "unpack failed"
-
-	rm -rf ${ARCH_DIR}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel}
-
-	if use acpi
-	then
-		sed -i \
-		-e "s/\/var\/lib\/xdm\/authdir/\/etc\/X11\/xdm\/authdir/" \
-		-e "s/\/var\/lib\/gdm/\/var\/gdm/" \
-		-e "s/#ffff#/#ffff##:.*MIT-MAGIC-COOKIE/" \
-		"${WORKDIR}/common/etc/ati/authatieventsd.sh" \
-			|| die "sed failed."
-
-		cd ${WORKDIR}
-		epatch ${FILESDIR}/ati-powermode.sh.patch
-	fi
-}
-
-src_compile() {
-	einfo "Building the DRM module..."
-	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
-	ln -s \
-	${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
-	|| die "cannot find precompiled core"
-
-	if kernel_is 2 6
-	then
-		set_arch_to_kernel
-		addwrite "/usr/src/${FK}"
-		cp 2.6.x/Makefile .
-		export _POSIX2_VERSION="199209"
-		if use_m ;
-		then
-			make -C ${KV_DIR} M="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
-				modules || ewarn "DRM module not built"
-		else
-			make -C ${KV_DIR} SUBDIRS="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
-				modules || ewarn "DRM module not built"
-		fi
-		set_arch_to_portage
-	else
-		export _POSIX2_VERSION="199209"
-		# That is the dirty way to avoid the id -u check
-		sed -e 's:`id -u`:0:' \
-			-e "s:\`uname -r\`:${KV_FULL}:" \
-			-i make.sh
-		chmod +x make.sh
-		./make.sh || ewarn "DRM module not built"
-	fi
-}
-
-pkg_preinst() {
-	# Clean the dynamic libGL stuff's home to ensure
-	# we don't have stale libs floating around ...
-	if [ -d "${ROOT}/usr/lib/opengl/ati" ]
-	then
-		rm -rf ${ROOT}/usr/lib/opengl/ati/*
-	fi
-}
-
-src_install() {
-	local ATI_LIBGL_PATH=""
-	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
-	linux-mod_src_install
-
-	cd ${WORKDIR}
-
-	local native_dir
-	use x86 && native_dir="lib"
-	use amd64 && native_dir="lib64"
-
-	if has_multilib_profile; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	elif use amd64; then
-		src_install-libs lib $(get_multilibdir)
-		src_install-libs lib64 $(get_libdir)
-	else
-		src_install-libs
-	fi &> /dev/null
-
-	#apps, man pages, and conf files
-	exeinto /opt/ati/bin
-	doexe ${ARCH_DIR}/usr/X11R6/bin/*
-	if use acpi
-	then
-		exeinto /opt/ati/sbin
-		doexe ${ARCH_DIR}/usr/sbin/*
-		insinto /opt/ati/man/man8
-		doins common/usr/share/man/man8/*
-		newinitd ${FILESDIR}/atieventsd.rc6 atieventsd
-		dodir /etc/conf.d
-		echo 'ATIEVENTSDOPTS=""' > ${D}/etc/conf.d/atieventsd
-	fi
-	#ati custom stuff
-	insinto /usr
-	doins -r ${WORKDIR}/common/usr/include
-
-	#documentation
-	if use doc; then
-		dodir /usr/share/doc/fglrx
-		cp -pPR common/usr/share/doc/fglrx/* \
-			${D}/usr/share/doc/fglrx
-	fi
-
-	#env.d entry
-	cp ${FILESDIR}/09ati ${T}/
-
-	if use acpi
-	then
-		local ATIETC="${WORKDIR}/common/usr/share/doc/fglrx/examples/etc/acpi"
-		exeinto /etc/acpi
-		doexe ${ATIETC}/ati-powermode.sh
-		insinto /etc/acpi/events
-		doins ${ATIETC}/events/a-ac-aticonfig
-		doins ${ATIETC}/events/a-lid-aticonfig
-	fi
-
-	#Work around hardcoded path in 32bit libGL.so on amd64, bug 101539
-	if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then
-		ATI_LIBGL_PATH="/usr/lib/dri:/usr/$(get_libdir)/dri:/usr/lib32/${xlibdir}/modules/dri/:/usr/$(get_libdir)/${xlibdir}/modules/dri"
-	fi
-		cat >>${T}/09ati <<EOF
-
-LIBGL_DRIVERS_PATH="\$LIBGL_DRIVERS_PATH:$ATI_LIBGL_PATH"
-EOF
-
-	doenvd ${T}/09ati
-}
-
-src_install-libs() {
-	local pkglibdir=lib
-	local inslibdir="$(get_libdir)/${xlibdir}"
-	ATI_LIBGL_PATH="${ATI_LIBGL_PATH}:/usr/$(get_libdir)/${xlibdir}/modules/dri"
-	if [ ${#} -eq 2 ]; then
-		pkglibdir=${1}
-		inslibdir=${2}
-	elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then
-		pkglibdir=lib64
-	fi
-
-	einfo "${pkglibdir} -> ${inslibdir}"
-
-	local ATI_ROOT="/usr/$(get_libdir)/opengl/ati"
-
-	# The GLX libraries
-	exeinto ${ATI_ROOT}/lib
-	doexe ${ARCH_DIR}/usr/X11R6/${pkglibdir}/libGL.so.1.2
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so
-
-	# Don't do this... see bug #47598
-	#dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
-
-	# same as the xorg implementation
-	dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions
-	#Workaround
-	if use opengl ; then
-	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
-		/usr/$(get_libdir)/opengl/${X11_IMPLEM}/lib/libGL.la \
-		> $D/${ATI_ROOT}/lib/libGL.la
-	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
-	fi
-	# X and DRI driver
-	if has_version "<x11-base/xorg-x11-6.8.0-r4"
-	then
-		local X11_DIR="/usr/X11R6/"
-	else
-		local X11_DIR="/usr/"
-	fi
-
-	local X11_LIB_DIR="${X11_DIR}${inslibdir}"
-
-	exeinto ${X11_LIB_DIR}/modules/drivers
-	# In X.org 6.8.99 / 6.9 this is a .so
-	doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.*o
-
-	exeinto ${X11_LIB_DIR}/modules/dri
-	doexe ${ARCH_DIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-	doexe ${ARCH_DIR}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so
-
-	exeinto ${X11_LIB_DIR}/modules/linux
-	# In X.org 6.8.99 / 6.9 this is a .so
-	if has_version ">=x11-base/xorg-x11-6.8.99" || \
-		has_version "x11-base/xorg-server"
-	then
-		doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so
-	else
-		doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
-	fi
-
-	if has_version ">=x11-base/xorg-x11-6.8.99" || \
-		has_version "x11-base/xorg-server"
-	then
-		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig} \
-			${D}/usr/$(get_libdir)
-	else
-		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig.a} \
-			${D}/usr/$(get_libdir)
-	fi
-
-	#Not the best place
-	insinto ${X11_DIR}/include/X11/extensions
-	doins ${COMMON_DIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
-
-	# misc ati configuration files for /etc
-	dodir /etc/ati
-	cp -pP ${COMMON_DIR}/etc/fglrxprofiles.csv ${D}/etc/ati/
-	cp -pP ${COMMON_DIR}/etc/fglrxrc ${D}/etc/ati/
-	cp -pP ${COMMON_DIR}/etc/ati/logo* ${D}/etc/ati/
-	if use acpi
-	then
-		cp -pP ${COMMON_DIR}/etc/ati/authatieventsd.sh ${D}/etc/ati/
-	fi
-}
-
-pkg_postinst() {
-	/usr/bin/eselect opengl set --use-old ati
-
-	echo
-	einfo "To switch to ATI OpenGL, run \"eselect opengl set ati\""
-	einfo "To change your xorg.conf you can use the bundled \"aticonfig\""
-	if use !opengl ; then
-	ewarn "You don't have the opengl useflag enabled, you won't be able to build"
-	ewarn "opengl applications nor use opengl driver features, if that isn't"
-	ewarn "the intended behaviour please add opengl to your useflag and issue"
-	ewarn "# emerge -Nu ati-drivers"
-	fi
-	echo
-	einfo "If you experience unexplained segmentation faults and kernel crashes"
-	einfo "with this driver and multi-threaded applications such as wine,"
-	einfo "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
-	# DRM module
-	linux-mod_pkg_postinst
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-	/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-8.28.8-linux-2.6.18.patch b/x11-drivers/ati-drivers/files/ati-drivers-8.28.8-linux-2.6.18.patch
deleted file mode 100644
index d9dc58eb4370..000000000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-8.28.8-linux-2.6.18.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urNp ati-driver-8.28.8.old/common/lib/modules/fglrx/build_mod/firegl_public.c ati-driver-8.28.8/common/lib/modules/fglrx/build_mod/firegl_public.c
---- ati-driver-8.28.8.old/common/lib/modules/fglrx/build_mod/firegl_public.c	2006-08-17 19:10:13.000000000 +0300
-+++ ati-driver-8.28.8/common/lib/modules/fglrx/build_mod/firegl_public.c	2006-09-21 10:47:02.000000000 +0300
-@@ -23,6 +23,11 @@
- 
- // ============================================================
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+/* No longer valid */
-+#define VM_SHM 0
-+#include <linux/utsrelease.h>
-+#endif
- #ifdef MODVERSIONS
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,71)
- #include <linux/modversions.h>
diff --git a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.28.8 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.28.8
deleted file mode 100644
index efb57e52df1a..000000000000
--- a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.28.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 58189d7cc3625e399b1a434df893100f ati-driver-installer-8.28.8.run 53989404
-RMD160 0ea23d37c0e203fc8acc5bd7e100bdf78c05745f ati-driver-installer-8.28.8.run 53989404
-SHA256 5eaeab1b906a0b8a30f88ab733390ecbc3ebeaa0c04c0368b757b99c31919e77 ati-driver-installer-8.28.8.run 53989404
diff --git a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.28.8-r1 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.28.8-r1
deleted file mode 100644
index efb57e52df1a..000000000000
--- a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.28.8-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 58189d7cc3625e399b1a434df893100f ati-driver-installer-8.28.8.run 53989404
-RMD160 0ea23d37c0e203fc8acc5bd7e100bdf78c05745f ati-driver-installer-8.28.8.run 53989404
-SHA256 5eaeab1b906a0b8a30f88ab733390ecbc3ebeaa0c04c0368b757b99c31919e77 ati-driver-installer-8.28.8.run 53989404
diff --git a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.29.6 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.29.6
deleted file mode 100644
index 978a18d9400f..000000000000
--- a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.29.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a895a4c4e9a2c1fbfcc11dd733267bcd ati-driver-installer-8.29.6.run 57776757
-RMD160 b2440a153e4c95c8926d7333efbd864b2c1450bc ati-driver-installer-8.29.6.run 57776757
-SHA256 d1d341db0a4a6d723ce99b553dbc332f9e234e92ba22cb5cc4dbec40ece5ce6b ati-driver-installer-8.29.6.run 57776757
diff --git a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.30.3 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.30.3
deleted file mode 100644
index d25b8221125e..000000000000
--- a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.30.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 058990a8e7cb57c670d423adfd7bfc00 ati-driver-installer-8.30.3.run 58041208
-RMD160 d4481bba9313cf9bcb71b7603034595677eb53f9 ati-driver-installer-8.30.3.run 58041208
-SHA256 3d03b64ba8fd6fef3c50a2037a4e8d97955086fee3da274c2993d55aae058dcc ati-driver-installer-8.30.3.run 58041208
diff --git a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.30.3-r1 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.30.3-r1
deleted file mode 100644
index d25b8221125e..000000000000
--- a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.30.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 058990a8e7cb57c670d423adfd7bfc00 ati-driver-installer-8.30.3.run 58041208
-RMD160 d4481bba9313cf9bcb71b7603034595677eb53f9 ati-driver-installer-8.30.3.run 58041208
-SHA256 3d03b64ba8fd6fef3c50a2037a4e8d97955086fee3da274c2993d55aae058dcc ati-driver-installer-8.30.3.run 58041208