Spring cleaning: removing old versions.

(Portage version: 2.1.6.11/cvs/Linux x86_64)

19 files changed, 14 insertions, 6361 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index e917ece9aa07..769c31ab8c0d 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.147 2009/04/05 22:26:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.148 2009/04/12 23:24:51 je_fro Exp $
+
+  12 Apr 2009; Jeff Gardner <je_fro@gentoo.org>
+  -files/8.433/ati-powermode-opt-path-1.patch,
+  -files/8.37.6/fix-ioctl-for-2.6.22.patch,
+  -files/8.455.2/ati-powermode-opt-path-2.patch, -ati-drivers-8.28.8.ebuild,
+  -ati-drivers-8.33.6.ebuild, -ati-drivers-8.33.6-r1.ebuild,
+  -ati-drivers-8.34.8.ebuild, -ati-drivers-8.37.6.ebuild,
+  -ati-drivers-8.37.6-r1.ebuild, -ati-drivers-8.433.ebuild,
+  -ati-drivers-8.443.1-r1.ebuild, -ati-drivers-8.455.2.ebuild,
+  -ati-drivers-8.455.2-r1.ebuild, -ati-drivers-8.512.ebuild,
+  -ati-drivers-8.522.ebuild, -ati-drivers-8.552.ebuild,
+  -ati-drivers-8.552-r1.ebuild, -ati-drivers-8.573.ebuild:
+  Cleaning out old versions.
 
   05 Apr 2009; Markus Meier <maekke@gentoo.org> ati-drivers-8.552-r2.ebuild:
   x86 stable, bug #251832
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 a721c2ae764f..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2008 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.12 2008/06/20 05:38:34 je_fro 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}"
-
-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.33.6-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.33.6-r1.ebuild
deleted file mode 100644
index 70cb5b31f78a..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.33.6-r1.ebuild
+++ /dev/null
@@ -1,352 +0,0 @@
-# Copyright 1999-2008 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.33.6-r1.ebuild,v 1.7 2008/06/20 05:38:34 je_fro 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}-x86.x86_64.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}"
-
-S="${WORKDIR}/common/lib/modules/fglrx/build_mod"
-
-ATIBIN="${D}/opt/ati/bin"
-RESTRICT="strip test"
-EMULTILIB_PKG="true"
-
-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/xorg/modules/dri/atiogl_a_dri.so
-	usr/lib/xorg/modules/drivers/fglrx_drv.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.20.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.33.6.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.33.6.ebuild
deleted file mode 100644
index 6fc2c14cd6b2..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.33.6.ebuild
+++ /dev/null
@@ -1,351 +0,0 @@
-# Copyright 1999-2008 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.33.6.ebuild,v 1.6 2008/06/20 05:38:34 je_fro 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}-x86.x86_64.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}"
-
-S="${WORKDIR}/common/lib/modules/fglrx/build_mod"
-
-ATIBIN="${D}/opt/ati/bin"
-RESTRICT="strip test"
-
-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/xorg/modules/dri/atiogl_a_dri.so
-	usr/lib/xorg/modules/drivers/fglrx_drv.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.20.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.34.8.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild
deleted file mode 100644
index 53be23ebecdb..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild
+++ /dev/null
@@ -1,397 +0,0 @@
-# Copyright 1999-2008 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.34.8.ebuild,v 1.6 2008/02/29 20:46:46 carlo Exp $
-
-IUSE="acpi qt3"
-
-inherit eutils multilib linux-mod toolchain-funcs
-
-DESCRIPTION="Ati precompiled drivers for recent 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}-x86.x86_64.run"
-
-LICENSE="ATI GPL-2 QPL-1.0"
-KEYWORDS="~amd64 ~x86"
-
-# The portage dep is for COLON_SEPARATED support in env-update.
-RDEPEND="x11-base/xorg-server
-	!x11-apps/ati-drivers-extra
-	app-admin/eselect-opengl
-	=virtual/libstdc++-3.3*
-	acpi? (
-		x11-apps/xauth
-		sys-power/acpid
-	)
-	qt3? ( =x11-libs/qt-3* )
-	>=sys-apps/portage-2.1.1-r1"
-
-DEPEND="${RDEPEND}
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto"
-
-EMULTILIB_PKG="true"
-
-QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so
-	usr/lib/opengl/ati/lib/libGL.so.1.2"
-QA_EXECSTACK_amd64="usr/lib64/dri/fglrx_dri.so
-	usr/lib32/dri/fglrx_dri.so
-	usr/lib64/opengl/ati/lib/libGL.so.1.2
-	usr/lib32/opengl/ati/lib/libGL.so.1.2"
-QA_TEXTRELS_x86="usr/lib/dri/fglrx_dri.so
-	usr/lib/xorg/modules/drivers/fglrx_drv.so
-	usr/lib/opengl/ati/lib/libGL.so.1.2"
-QA_TEXTRELS_amd64="
-	usr/lib64/opengl/ati/lib/libGL.so.1.2
-	usr/lib32/opengl/ati/lib/libGL.so.1.2
-	usr/lib64/dri/fglrx_dri.so
-	usr/lib32/dri/fglrx_dri.so"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	#check kernel and sets up KV_OBJ
-	MODULE_NAMES="fglrx(video:${S}/common/lib/modules/fglrx/build_mod/2.6.x)"
-	BUILD_TARGETS="kmod_build"
-	linux-mod_pkg_setup
-	BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}"
-
-	if ! kernel_is 2 6; then
-		eerror "Need a 2.6 kernel to compile against!"
-		die "Need a 2.6 kernel to compile against!"
-	fi
-
-	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 "You need AGP and/or PCI Express support for direct rendering to work."
-	fi
-
-	# xorg-server 1.1 and its prereleases correspond to xorg 7.1.
-	if has_version ">=x11-base/xorg-server-1.0.99"; then
-		BASE_DIR="${S}/x710"
-	else
-		BASE_DIR="${S}/x690"
-	fi
-
-	if use amd64 ; then
-		BASE_DIR="${BASE_DIR}_64a"
-		# This is used like $(get_libdir) for paths in ati's package.
-		PKG_LIBDIR=lib64
-		ARCH_DIR="${S}/arch/x86_64"
-	else
-		PKG_LIBDIR=lib
-		ARCH_DIR="${S}/arch/x86"
-	fi
-}
-
-src_unpack() {
-	local src="${DISTDIR}/${A}"
-	# This is apparently a nonstandard makeself archive, so extract
-	# the offset by hand.
-	local offset=$(grep -am1 SKIP "${src}" | sed -e 's/SKIP="\([0-9]\+\)"/\1/')
-	# It is off by one because of an (unused) checksum field.
-	unpack_makeself "${src}" $(( offset + 1 )) tail || die "unpack failed"
-
-	gunzip common/usr/share/man/man8/atieventsd.8 || die "manpage unzip failed"
-	# These are the userspace utilities that we also have source for.
-	# We rebuild those in ati-drivers-extra.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/{fgl_glxgears,fglrx_xgamma} \
-		"${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \
-		|| die "bin rm failed"
-
-	# This patch is conditional because it contains an api change.
-	if kernel_is ge 2 6 20; then
-		epatch packages/Fedora/ati-drivers-2.6.20.patch
-	fi
-
-	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/" \
-			"${S}/common/etc/ati/authatieventsd.sh" \
-			|| die "sed failed."
-
-		# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/
-		epatch "${FILESDIR}"/ati-powermode-opt-path.patch
-	fi
-
-	pushd common/lib/modules/fglrx/build_mod >/dev/null
-	ln -s "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
-		|| die "symlinking precompiled core failed"
-
-	convert_to_m 2.6.x/Makefile || die "convert_to_m failed"
-
-	# When built with ati's make.sh it defines a bunch of macros if
-	# certain .config values are set, falling back to less reliable
-	# detection methods if linux/autoconf.h is not available. We
-	# simply use the linux/autoconf.h settings directly, bypassing the
-	# detection script.
-	sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
-	sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
-		|| die "MODVERSIONS sed failed"
-	popd >/dev/null
-
-	mkdir panel extra || die "mkdirs failed"
-	# The ./ in these unpacks is required (or unpack looks in ${DISTDIR})
-	if use qt3; then
-		cd panel
-		unpack ./../common/usr/src/ati/fglrx_panel_sources.tgz
-		cd ..
-	fi
-	cd extra
-	unpack ./../common/usr/src/ati/fglrx_sample_source.tgz
-	sed -i -e 's:include/extensions/extutil.h:X11/extensions/extutil.h:' \
-		lib/fglrx_gamma/fglrx_gamma.c || die "include fixup failed"
-	# Add a category.
-	mv programs/fglrx_gamma/fglrx_xgamma.{man,1} || die "man mv failed"
-	cd ..
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	einfo "Building fgl_glxgears"
-	cd "${S}"/extra/fgl_glxgears
-	# These extra libs/utils either have an Imakefile that does not
-	# work very well without tweaking or a Makefile ignoring CFLAGS
-	# and the like. We bypass those.
-
-	# The -DUSE_GLU is needed to compile using nvidia headers
-	# according to a comment in ati-drivers-extra-8.33.6.ebuild.
-	"$(tc-getCC)" -o fgl_fglxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
-		-I"${S}"/common/usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-
-	einfo "Building fglrx_gamma lib"
-	cd "${S}"/extra/lib/fglrx_gamma
-	"$(tc-getCC)" -shared -fpic -o libfglrx_gamma.so.1.0 ${CFLAGS} ${LDFLAGS} \
-		-DXF86MISC -Wl,-soname,libfglrx_gamma.so.1.0 fglrx_gamma.c \
-		-lXext || die "fglrx_gamma lib build failed"
-	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so || die "ln failed"
-	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so.1 || die "ln failed"
-
-	einfo "Building fglrx_gamma util"
-	cd "${S}"/extra/programs/fglrx_gamma
-	"$(tc-getCC)" -o fglrx_xgamma ${CFLAGS} ${LDFLAGS} \
-		-I../../../common/usr/X11R6/include -L../../lib/fglrx_gamma \
-		fglrx_xgamma.c -lm -lfglrx_gamma -lX11 \
-		|| die "fglrx_gamma util build failed"
-
-	if use qt3; then
-		einfo "Building the QT panel"
-		cd "${S}"/panel
-		emake CDEBFLAGS="${CFLAGS}" CCDEBFLAGS="${CXXFLAGS}" STRIP=true \
-			|| die "panel build failed"
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# We can do two things here, and neither of them is very nice.
-
-	# For direct rendering libGL has to be able to load one or more
-	# dri modules (files ending in _dri.so, like fglrx_dri.so).
-	# Gentoo's mesa looks for these files in the location specified by
-	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
-	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
-	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
-	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
-	# 64bit. So we can either put the .so files in that (unusual,
-	# compared to "normal" mesa libGL) location or set
-	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
-	# 101539.
-
-	# The problem with this approach is that LIBGL_DRIVERS_PATH
-	# *overrides* the default hardcoded location, it does not extend
-	# it. So if ati-drivers is merged but a non-ati libGL is selected
-	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
-	# (because it changed in a newer mesa or because it was compiled
-	# for a different set of multilib abis than we are) stuff breaks.
-
-	# We create one file per ABI to work with "native" multilib, see
-	# below.
-
-	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
-	doenvd "${T}/03ati-colon-sep"
-
-	# All libraries that we have a 32 bit and 64 bit version of on
-	# amd64 are installed in src_install-libs. Everything else
-	# (including libraries only available in native 64bit on amd64)
-	# goes in here.
-
-	# There used to be some code here that tried to detect running
-	# under a "native multilib" portage ((precursor of)
-	# http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it
-	# should just work (only doing some duplicate work). --marienz
-	if has_multilib_profile; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	# This is sorted by the order the files occur in the source tree.
-
-	# X modules.
-	exeinto /usr/$(get_libdir)/xorg/modules/drivers
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
-	exeinto /usr/$(get_libdir)/xorg/modules/linux
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	if use acpi; then
-		dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	fi
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -name '*.so*' -not -name 'libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins common/etc/ati/{fglrxprofiles.csv,fglrxrc,logo*}
-	if use acpi; then
-		doins common/etc/ati/authatieventsd.sh
-	fi
-
-	# include.
-	insinto /usr
-	doins -r common/usr/include
-	insinto /usr/include/X11/extensions
-	doins common/usr/X11R6/include/X11/extensions/fglrx_gamma.h
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin common/usr/sbin/*
-
-	# doc.
-	dohtml -r common/usr/share/doc/fglrx
-
-	if use acpi; then
-		doman common/usr/share/man/man8/atieventsd.8
-
-		pushd common/usr/share/doc/fglrx/examples/etc/acpi >/dev/null
-
-		exeinto /etc/acpi
-		doexe ati-powermode.sh
-		insinto /etc/acpi/events
-		doins events/*
-
-		popd >/dev/null
-	fi
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_fglxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	dolib extra/lib/fglrx_gamma/*so*
-	newdoc extra/lib/fglrx_gamma/README README.libfglrx_gamma
-
-	dobin extra/programs/fglrx_gamma/fglrx_xgamma
-	doman extra/programs/fglrx_gamma/fglrx_xgamma.1
-	newdoc extra/programs/fglrx_gamma/README README.fglrx_gamma
-
-	if use qt3; then
-		dobin panel/fireglcontrol
-		make_desktop_entry fireglcontrol 'ATI Control' ati System
-		insinto /usr/share/pixmaps
-		doins common/usr/share/icons/ati.xpm
-	fi
-
-	# Gentoo-specific stuff:
-
-	if use acpi; then
-		newinitd "${FILESDIR}"/atieventsd.init atieventsd
-		echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-		newconfd "${T}"/atieventsd.conf atieventsd
-	fi
-}
-
-src_install-libs() {
-	if [[ "${ABI}" == "amd64" ]]; then
-		local pkglibdir=lib64
-	else
-		local pkglibdir=lib
-	fi
-	einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
-
-	local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
-
-	# The GLX libraries
-	# (yes, this really is "lib" even on amd64/multilib --marienz)
-	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
-
-	# Same as the xorg implementation (eselect opengl does not fall
-	# back to xorg-x11 if we omit this symlink, meaning no glx).
-	dosym ../xorg-x11/extensions ${ATI_ROOT}/extensions
-
-	# Is this necessary? Is this sane? --marienz
-	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
-		/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la \
-		> "${D}"/${ATI_ROOT}/lib/libGL.la
-
-	# Commented out until determined it is necessary --marienz
-	# dosym ../xorg-x11/include ${ATI_ROOT}/include
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	local envname="${T}"/04ati-dri-path
-	if [[ -n ${ABI} ]]; then
-		envname="${envname}-${ABI}"
-	fi
-	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
-	doenvd "${envname}"
-}
-
-pkg_postinst() {
-	/usr/bin/eselect opengl set --use-old ati
-
-	elog "To switch to ATI OpenGL, run \"eselect opengl set ati\""
-	elog "To change your xorg.conf you can use the bundled \"aticonfig\""
-	elog
-	elog "If you experience unexplained segmentation faults and kernel crashes"
-	elog "with this driver and multi-threaded applications such as wine,"
-	elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
-	elog
-	# (to get the LIBGL_DRIVERS_PATH)
-	elog "You will have to source /etc/profile (or logout and back in) for dri"
-	elog "to work, unless you previously had ati-drivers installed."
-	# 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.37.6-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.37.6-r1.ebuild
deleted file mode 100644
index a7f19a936694..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.37.6-r1.ebuild
+++ /dev/null
@@ -1,438 +0,0 @@
-# Copyright 1999-2008 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.37.6-r1.ebuild,v 1.7 2008/02/29 20:46:46 carlo Exp $
-
-IUSE="acpi qt3 multilib"
-
-inherit eutils multilib linux-mod toolchain-funcs versionator
-
-DESCRIPTION="Ati precompiled drivers for recent 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}-x86.x86_64.run"
-
-LICENSE="ATI GPL-2 QPL-1.0"
-KEYWORDS="~amd64 ~x86"
-
-# The portage dep is for COLON_SEPARATED support in env-update.
-# The eselect dep (>=1.0.9) is for COLON_SEPARATED in eselect env update.
-RDEPEND="x11-base/xorg-server
-	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-1.0.9
-	app-admin/eselect-opengl
-	=virtual/libstdc++-3.3*
-	amd64? ( multilib? ( app-emulation/emul-linux-x86-compat ) )
-	acpi? (
-		x11-apps/xauth
-		sys-power/acpid
-	)
-	qt3? ( =x11-libs/qt-3* )
-	>=sys-apps/portage-2.1.1-r1"
-
-DEPEND="${RDEPEND}
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto"
-
-EMULTILIB_PKG="true"
-
-QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so
-	usr/lib/opengl/ati/lib/libGL.so.1.2
-	opt/bin/amdcccle"
-QA_EXECSTACK_amd64="usr/lib64/dri/fglrx_dri.so
-	usr/lib32/dri/fglrx_dri.so
-	usr/lib64/opengl/ati/lib/libGL.so.1.2
-	usr/lib32/opengl/ati/lib/libGL.so.1.2
-	opt/bin/amdcccle"
-QA_TEXTRELS_x86="usr/lib/dri/fglrx_dri.so
-	usr/lib/xorg/modules/drivers/fglrx_drv.so
-	usr/lib/opengl/ati/lib/libGL.so.1.2"
-QA_TEXTRELS_amd64="
-	usr/lib64/opengl/ati/lib/libGL.so.1.2
-	usr/lib32/opengl/ati/lib/libGL.so.1.2
-	usr/lib64/dri/fglrx_dri.so
-	usr/lib32/dri/fglrx_dri.so"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	#check kernel and sets up KV_OBJ
-	MODULE_NAMES="fglrx(video:${S}/common/lib/modules/fglrx/build_mod/2.6.x)"
-	BUILD_TARGETS="kmod_build"
-	linux-mod_pkg_setup
-	BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}"
-
-	if ! kernel_is 2 6; then
-		eerror "Need a 2.6 kernel to compile against!"
-		die "Need a 2.6 kernel to compile against!"
-	fi
-
-	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 "You need AGP and/or PCI Express support for direct rendering to work."
-	fi
-
-	if linux_chkconfig_present PARAVIRT; then
-		eerror "The current ati-drivers don't compile when having"
-		eerror "paravirtualization active due to GPL symbol export"
-		eerror "restrictions."
-		eerror "Please disable it:"
-		eerror "	CONFIG_PARAVIRT=n"
-		eerror "in /usr/src/linux/.config or"
-		eerror "	Processor type and features -->"
-		eerror "		[ ] Paravirtualization support (EXPERIMENTAL)"
-		eerror "in 'menuconfig'"
-		die "CONFIG_PARAVIRT enabled"
-	fi
-
-	# xorg-server 1.1 and its prereleases correspond to xorg 7.1.
-	if has_version ">=x11-base/xorg-server-1.0.99"; then
-		BASE_DIR="${S}/x710"
-	else
-		BASE_DIR="${S}/x690"
-	fi
-
-	if use amd64 ; then
-		BASE_DIR="${BASE_DIR}_64a"
-		# This is used like $(get_libdir) for paths in ati's package.
-		PKG_LIBDIR=lib64
-		ARCH_DIR="${S}/arch/x86_64"
-	else
-		PKG_LIBDIR=lib
-		ARCH_DIR="${S}/arch/x86"
-	fi
-}
-
-src_unpack() {
-	local src="${DISTDIR}/${A}"
-	# This is apparently a nonstandard makeself archive, so extract
-	# the offset by hand.
-	local offset=$(grep -am1 SKIP "${src}" | sed -e 's/SKIP="\([0-9]\+\)"/\1/')
-	# It is off by one because of an (unused) checksum field.
-	unpack_makeself "${src}" $(( offset + 1 )) tail || die "unpack failed"
-
-	gunzip common/usr/share/man/man8/atieventsd.8 || die "manpage unzip failed"
-	# These are the userspace utilities that we also have source for.
-	# We rebuild those in ati-drivers-extra.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/{fgl_glxgears,fglrx_xgamma} \
-		"${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \
-		|| die "bin rm failed"
-
-	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/" \
-			"${S}/common/etc/ati/authatieventsd.sh" \
-			|| die "sed failed."
-
-		# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/
-		epatch "${FILESDIR}"/ati-powermode-opt-path.patch
-	fi
-
-	pushd common/lib/modules/fglrx/build_mod >/dev/null
-	ln -s "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
-		|| die "symlinking precompiled core failed"
-
-	convert_to_m 2.6.x/Makefile || die "convert_to_m failed"
-
-	# When built with ati's make.sh it defines a bunch of macros if
-	# certain .config values are set, falling back to less reliable
-	# detection methods if linux/autoconf.h is not available. We
-	# simply use the linux/autoconf.h settings directly, bypassing the
-	# detection script.
-	sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
-	sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
-		|| die "MODVERSIONS sed failed"
-	popd >/dev/null
-
-	mkdir panel extra || die "mkdirs failed"
-	# The ./ in these unpacks is required (or unpack looks in ${DISTDIR})
-	if use qt3; then
-		cd panel
-		unpack ./../common/usr/src/ati/fglrx_panel_sources.tgz
-		cd ..
-	fi
-	cd extra
-	unpack ./../common/usr/src/ati/fglrx_sample_source.tgz
-	sed -i -e 's:include/extensions/extutil.h:X11/extensions/extutil.h:' \
-		lib/fglrx_gamma/fglrx_gamma.c || die "include fixup failed"
-	# Add a category.
-	mv programs/fglrx_gamma/fglrx_xgamma.{man,1} || die "man mv failed"
-	cd ..
-
-Add the following to fix bug #182597
-	if kernel_is 2 6 22; then
-		cd "${S}"
-		epatch "${FILESDIR}"/${PV}/fix-ioctl-for-2.6.22.patch || die "Failed to patch for 2.6.22 kernel."
-	fi
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	einfo "Building fgl_glxgears"
-	cd "${S}"/extra/fgl_glxgears
-	# These extra libs/utils either have an Imakefile that does not
-	# work very well without tweaking or a Makefile ignoring CFLAGS
-	# and the like. We bypass those.
-
-	# The -DUSE_GLU is needed to compile using nvidia headers
-	# according to a comment in ati-drivers-extra-8.33.6.ebuild.
-	"$(tc-getCC)" -o fgl_fglxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
-		-I"${S}"/common/usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-
-	einfo "Building fglrx_gamma lib"
-	cd "${S}"/extra/lib/fglrx_gamma
-	"$(tc-getCC)" -shared -fpic -o libfglrx_gamma.so.1.0 ${CFLAGS} ${LDFLAGS} \
-		-DXF86MISC -Wl,-soname,libfglrx_gamma.so.1.0 fglrx_gamma.c \
-		-lXext || die "fglrx_gamma lib build failed"
-	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so || die "ln failed"
-	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so.1 || die "ln failed"
-
-	einfo "Building fglrx_gamma util"
-	cd "${S}"/extra/programs/fglrx_gamma
-	"$(tc-getCC)" -o fglrx_xgamma ${CFLAGS} ${LDFLAGS} \
-		-I../../../common/usr/X11R6/include -L../../lib/fglrx_gamma \
-		fglrx_xgamma.c -lm -lfglrx_gamma -lX11 \
-		|| die "fglrx_gamma util build failed"
-
-	if use qt3; then
-		einfo "Building the QT panel"
-		cd "${S}"/panel
-		emake CDEBFLAGS="${CFLAGS}" CCDEBFLAGS="${CXXFLAGS}" STRIP=true \
-			|| die "panel build failed"
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# We can do two things here, and neither of them is very nice.
-
-	# For direct rendering libGL has to be able to load one or more
-	# dri modules (files ending in _dri.so, like fglrx_dri.so).
-	# Gentoo's mesa looks for these files in the location specified by
-	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
-	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
-	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
-	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
-	# 64bit. So we can either put the .so files in that (unusual,
-	# compared to "normal" mesa libGL) location or set
-	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
-	# 101539.
-
-	# The problem with this approach is that LIBGL_DRIVERS_PATH
-	# *overrides* the default hardcoded location, it does not extend
-	# it. So if ati-drivers is merged but a non-ati libGL is selected
-	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
-	# (because it changed in a newer mesa or because it was compiled
-	# for a different set of multilib abis than we are) stuff breaks.
-
-	# We create one file per ABI to work with "native" multilib, see
-	# below.
-
-	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
-	doenvd "${T}/03ati-colon-sep"
-
-	# All libraries that we have a 32 bit and 64 bit version of on
-	# amd64 are installed in src_install-libs. Everything else
-	# (including libraries only available in native 64bit on amd64)
-	# goes in here.
-
-	# There used to be some code here that tried to detect running
-	# under a "native multilib" portage ((precursor of)
-	# http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it
-	# should just work (only doing some duplicate work). --marienz
-	if has_multilib_profile; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	# This is sorted by the order the files occur in the source tree.
-
-	# X modules.
-	exeinto /usr/$(get_libdir)/xorg/modules/drivers
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
-	exeinto /usr/$(get_libdir)/xorg/modules/linux
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
-	exeinto /usr/$(get_libdir)/xorg/modules
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{esut.a,glesx.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	if use acpi; then
-		dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	fi
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -name '*.so*' -not -name 'libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins common/etc/ati/{fglrxprofiles.csv,fglrxrc,logo*}
-	if use acpi; then
-		doins common/etc/ati/authatieventsd.sh
-	fi
-
-	# include.
-	insinto /usr
-	doins -r common/usr/include
-	insinto /usr/include/X11/extensions
-	doins common/usr/X11R6/include/X11/extensions/fglrx_gamma.h
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin common/usr/sbin/*
-
-	# data files for the control panel.
-	insinto /usr/share
-	doins -r common/usr/share/ati
-	insinto /usr/share/pixmaps
-	doins common/usr/share/icons/ccc_{large,small}.xpm
-	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
-		ccc_large System
-
-	# doc.
-	dohtml -r common/usr/share/doc/fglrx
-
-	if use acpi; then
-		doman common/usr/share/man/man8/atieventsd.8
-
-		pushd common/usr/share/doc/fglrx/examples/etc/acpi >/dev/null
-
-		exeinto /etc/acpi
-		doexe ati-powermode.sh
-		insinto /etc/acpi/events
-		doins events/*
-
-		popd >/dev/null
-	fi
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_fglxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	dolib extra/lib/fglrx_gamma/*so*
-	newdoc extra/lib/fglrx_gamma/README README.libfglrx_gamma
-
-	dobin extra/programs/fglrx_gamma/fglrx_xgamma
-	doman extra/programs/fglrx_gamma/fglrx_xgamma.1
-	newdoc extra/programs/fglrx_gamma/README README.fglrx_gamma
-
-	if use qt3; then
-		dobin panel/fireglcontrol
-		make_desktop_entry fireglcontrol 'ATI Control' ati System
-		insinto /usr/share/pixmaps
-		doins common/usr/share/icons/ati.xpm
-	fi
-
-	# Gentoo-specific stuff:
-
-	if use acpi; then
-		newinitd "${FILESDIR}"/atieventsd.init atieventsd
-		echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-		newconfd "${T}"/atieventsd.conf atieventsd
-	fi
-}
-
-src_install-libs() {
-	if [[ "${ABI}" == "amd64" ]]; then
-		local pkglibdir=lib64
-	else
-		local pkglibdir=lib
-	fi
-	einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
-
-	local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
-	# To make sure we do not miss a spot when these change.
-	local libmajor=1 libminor=2
-	local libver=${libmajor}.${libminor}
-
-	# The GLX libraries
-	# (yes, this really is "lib" even on amd64/multilib --marienz)
-	exeinto ${ATI_ROOT}/lib
-	doexe "${ARCH_DIR}"/usr/X11R6/${pkglibdir}/libGL.so.${libver}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
-
-	# Same as the xorg implementation (eselect opengl does not fall
-	# back to xorg-x11 if we omit this symlink, meaning no glx).
-	dosym ../xorg-x11/extensions ${ATI_ROOT}/extensions
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# Make up a libGL.la. Ati does not provide one, but mesa does. If
-	# a (libtool-based) libfoo is built with libGL.la present a
-	# reference to it is put into libfoo.la, and compiling
-	# (libtool-based) things that link too libfoo.la will complain if
-	# libGL.la disappears. So if we do not make up a libGL.la
-	# switching between mesa and ati becomes painful.
-	#
-	# According to the libtool manual the "revision" should be updated
-	# whenever the code changes. We construct this from the version
-	# (8.37.6 becomes 83706).
-	local revision=$(printf '%d%02d%02d' $(get_version_components))
-	sed -e "s:\${libmajor}:${libmajor}:g" \
-		-e "s:\${libminor}:${libminor}:g" \
-		-e "s:\${libdir}:$(get_libdir):g" \
-		-e "s:\${revision}:${revision}:g" \
-		"${FILESDIR}"/libGL.la.in > "${D}"/${ATI_ROOT}/lib/libGL.la
-
-	local envname="${T}"/04ati-dri-path
-	if [[ -n ${ABI} ]]; then
-		envname="${envname}-${ABI}"
-	fi
-	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
-	doenvd "${envname}"
-}
-
-pkg_postinst() {
-	/usr/bin/eselect opengl set --use-old ati
-
-	elog "To switch to ATI OpenGL, run \"eselect opengl set ati\""
-	elog "To change your xorg.conf you can use the bundled \"aticonfig\""
-	elog
-	elog "If you experience unexplained segmentation faults and kernel crashes"
-	elog "with this driver and multi-threaded applications such as wine,"
-	elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
-	elog
-	# (to get the LIBGL_DRIVERS_PATH)
-	elog "You will have to source /etc/profile (or logout and back in) for dri"
-	elog "to work, unless you previously had ati-drivers installed."
-	# 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.37.6.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.37.6.ebuild
deleted file mode 100644
index f2d8a257bf64..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.37.6.ebuild
+++ /dev/null
@@ -1,398 +0,0 @@
-# Copyright 1999-2008 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.37.6.ebuild,v 1.3 2008/02/29 20:46:46 carlo Exp $
-
-IUSE="acpi qt3"
-
-inherit eutils multilib linux-mod toolchain-funcs
-
-DESCRIPTION="Ati precompiled drivers for recent 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}-x86.x86_64.run"
-
-LICENSE="ATI GPL-2 QPL-1.0"
-KEYWORDS="~amd64 ~x86"
-
-# The portage dep is for COLON_SEPARATED support in env-update.
-# The eselect dep (>=1.0.9) is for COLON_SEPARATED in eselect env update.
-RDEPEND="x11-base/xorg-server
-	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-1.0.9
-	app-admin/eselect-opengl
-	=virtual/libstdc++-3.3*
-	acpi? (
-		x11-apps/xauth
-		sys-power/acpid
-	)
-	qt3? ( =x11-libs/qt-3* )
-	>=sys-apps/portage-2.1.1-r1"
-
-DEPEND="${RDEPEND}
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto"
-
-EMULTILIB_PKG="true"
-
-QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so
-	usr/lib/opengl/ati/lib/libGL.so.1.2
-	opt/bin/amdcccle"
-QA_EXECSTACK_amd64="usr/lib64/dri/fglrx_dri.so
-	usr/lib32/dri/fglrx_dri.so
-	usr/lib64/opengl/ati/lib/libGL.so.1.2
-	usr/lib32/opengl/ati/lib/libGL.so.1.2
-	opt/bin/amdcccle"
-QA_TEXTRELS_x86="usr/lib/dri/fglrx_dri.so
-	usr/lib/xorg/modules/drivers/fglrx_drv.so
-	usr/lib/opengl/ati/lib/libGL.so.1.2"
-QA_TEXTRELS_amd64="
-	usr/lib64/opengl/ati/lib/libGL.so.1.2
-	usr/lib32/opengl/ati/lib/libGL.so.1.2
-	usr/lib64/dri/fglrx_dri.so
-	usr/lib32/dri/fglrx_dri.so"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	#check kernel and sets up KV_OBJ
-	MODULE_NAMES="fglrx(video:${S}/common/lib/modules/fglrx/build_mod/2.6.x)"
-	BUILD_TARGETS="kmod_build"
-	linux-mod_pkg_setup
-	BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}"
-
-	if ! kernel_is 2 6; then
-		eerror "Need a 2.6 kernel to compile against!"
-		die "Need a 2.6 kernel to compile against!"
-	fi
-
-	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 "You need AGP and/or PCI Express support for direct rendering to work."
-	fi
-
-	# xorg-server 1.1 and its prereleases correspond to xorg 7.1.
-	if has_version ">=x11-base/xorg-server-1.0.99"; then
-		BASE_DIR="${S}/x710"
-	else
-		BASE_DIR="${S}/x690"
-	fi
-
-	if use amd64 ; then
-		BASE_DIR="${BASE_DIR}_64a"
-		# This is used like $(get_libdir) for paths in ati's package.
-		PKG_LIBDIR=lib64
-		ARCH_DIR="${S}/arch/x86_64"
-	else
-		PKG_LIBDIR=lib
-		ARCH_DIR="${S}/arch/x86"
-	fi
-}
-
-src_unpack() {
-	local src="${DISTDIR}/${A}"
-	# This is apparently a nonstandard makeself archive, so extract
-	# the offset by hand.
-	local offset=$(grep -am1 SKIP "${src}" | sed -e 's/SKIP="\([0-9]\+\)"/\1/')
-	# It is off by one because of an (unused) checksum field.
-	unpack_makeself "${src}" $(( offset + 1 )) tail || die "unpack failed"
-
-	gunzip common/usr/share/man/man8/atieventsd.8 || die "manpage unzip failed"
-	# These are the userspace utilities that we also have source for.
-	# We rebuild those in ati-drivers-extra.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/{fgl_glxgears,fglrx_xgamma} \
-		"${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \
-		|| die "bin rm failed"
-
-	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/" \
-			"${S}/common/etc/ati/authatieventsd.sh" \
-			|| die "sed failed."
-
-		# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/
-		epatch "${FILESDIR}"/ati-powermode-opt-path.patch
-	fi
-
-	pushd common/lib/modules/fglrx/build_mod >/dev/null
-	ln -s "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
-		|| die "symlinking precompiled core failed"
-
-	convert_to_m 2.6.x/Makefile || die "convert_to_m failed"
-
-	# When built with ati's make.sh it defines a bunch of macros if
-	# certain .config values are set, falling back to less reliable
-	# detection methods if linux/autoconf.h is not available. We
-	# simply use the linux/autoconf.h settings directly, bypassing the
-	# detection script.
-	sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
-	sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
-		|| die "MODVERSIONS sed failed"
-	popd >/dev/null
-
-	mkdir panel extra || die "mkdirs failed"
-	# The ./ in these unpacks is required (or unpack looks in ${DISTDIR})
-	if use qt3; then
-		cd panel
-		unpack ./../common/usr/src/ati/fglrx_panel_sources.tgz
-		cd ..
-	fi
-	cd extra
-	unpack ./../common/usr/src/ati/fglrx_sample_source.tgz
-	sed -i -e 's:include/extensions/extutil.h:X11/extensions/extutil.h:' \
-		lib/fglrx_gamma/fglrx_gamma.c || die "include fixup failed"
-	# Add a category.
-	mv programs/fglrx_gamma/fglrx_xgamma.{man,1} || die "man mv failed"
-	cd ..
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	einfo "Building fgl_glxgears"
-	cd "${S}"/extra/fgl_glxgears
-	# These extra libs/utils either have an Imakefile that does not
-	# work very well without tweaking or a Makefile ignoring CFLAGS
-	# and the like. We bypass those.
-
-	# The -DUSE_GLU is needed to compile using nvidia headers
-	# according to a comment in ati-drivers-extra-8.33.6.ebuild.
-	"$(tc-getCC)" -o fgl_fglxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
-		-I"${S}"/common/usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-
-	einfo "Building fglrx_gamma lib"
-	cd "${S}"/extra/lib/fglrx_gamma
-	"$(tc-getCC)" -shared -fpic -o libfglrx_gamma.so.1.0 ${CFLAGS} ${LDFLAGS} \
-		-DXF86MISC -Wl,-soname,libfglrx_gamma.so.1.0 fglrx_gamma.c \
-		-lXext || die "fglrx_gamma lib build failed"
-	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so || die "ln failed"
-	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so.1 || die "ln failed"
-
-	einfo "Building fglrx_gamma util"
-	cd "${S}"/extra/programs/fglrx_gamma
-	"$(tc-getCC)" -o fglrx_xgamma ${CFLAGS} ${LDFLAGS} \
-		-I../../../common/usr/X11R6/include -L../../lib/fglrx_gamma \
-		fglrx_xgamma.c -lm -lfglrx_gamma -lX11 \
-		|| die "fglrx_gamma util build failed"
-
-	if use qt3; then
-		einfo "Building the QT panel"
-		cd "${S}"/panel
-		emake CDEBFLAGS="${CFLAGS}" CCDEBFLAGS="${CXXFLAGS}" STRIP=true \
-			|| die "panel build failed"
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# We can do two things here, and neither of them is very nice.
-
-	# For direct rendering libGL has to be able to load one or more
-	# dri modules (files ending in _dri.so, like fglrx_dri.so).
-	# Gentoo's mesa looks for these files in the location specified by
-	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
-	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
-	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
-	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
-	# 64bit. So we can either put the .so files in that (unusual,
-	# compared to "normal" mesa libGL) location or set
-	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
-	# 101539.
-
-	# The problem with this approach is that LIBGL_DRIVERS_PATH
-	# *overrides* the default hardcoded location, it does not extend
-	# it. So if ati-drivers is merged but a non-ati libGL is selected
-	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
-	# (because it changed in a newer mesa or because it was compiled
-	# for a different set of multilib abis than we are) stuff breaks.
-
-	# We create one file per ABI to work with "native" multilib, see
-	# below.
-
-	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
-	doenvd "${T}/03ati-colon-sep"
-
-	# All libraries that we have a 32 bit and 64 bit version of on
-	# amd64 are installed in src_install-libs. Everything else
-	# (including libraries only available in native 64bit on amd64)
-	# goes in here.
-
-	# There used to be some code here that tried to detect running
-	# under a "native multilib" portage ((precursor of)
-	# http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it
-	# should just work (only doing some duplicate work). --marienz
-	if has_multilib_profile; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	# This is sorted by the order the files occur in the source tree.
-
-	# X modules.
-	exeinto /usr/$(get_libdir)/xorg/modules/drivers
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
-	exeinto /usr/$(get_libdir)/xorg/modules/linux
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
-	exeinto /usr/$(get_libdir)/xorg/modules
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{esut.a,glesx.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	if use acpi; then
-		dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	fi
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -name '*.so*' -not -name 'libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins common/etc/ati/{fglrxprofiles.csv,fglrxrc,logo*}
-	if use acpi; then
-		doins common/etc/ati/authatieventsd.sh
-	fi
-
-	# include.
-	insinto /usr
-	doins -r common/usr/include
-	insinto /usr/include/X11/extensions
-	doins common/usr/X11R6/include/X11/extensions/fglrx_gamma.h
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin common/usr/sbin/*
-
-	# data files for the control panel.
-	insinto /usr/share
-	doins -r common/usr/share/ati
-	insinto /usr/share/pixmaps
-	doins common/usr/share/icons/ccc_{large,small}.xpm
-	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
-		ccc_large System
-
-	# doc.
-	dohtml -r common/usr/share/doc/fglrx
-
-	if use acpi; then
-		doman common/usr/share/man/man8/atieventsd.8
-
-		pushd common/usr/share/doc/fglrx/examples/etc/acpi >/dev/null
-
-		exeinto /etc/acpi
-		doexe ati-powermode.sh
-		insinto /etc/acpi/events
-		doins events/*
-
-		popd >/dev/null
-	fi
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_fglxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	dolib extra/lib/fglrx_gamma/*so*
-	newdoc extra/lib/fglrx_gamma/README README.libfglrx_gamma
-
-	dobin extra/programs/fglrx_gamma/fglrx_xgamma
-	doman extra/programs/fglrx_gamma/fglrx_xgamma.1
-	newdoc extra/programs/fglrx_gamma/README README.fglrx_gamma
-
-	if use qt3; then
-		dobin panel/fireglcontrol
-		make_desktop_entry fireglcontrol 'ATI Control' ati System
-		insinto /usr/share/pixmaps
-		doins common/usr/share/icons/ati.xpm
-	fi
-
-	# Gentoo-specific stuff:
-
-	if use acpi; then
-		newinitd "${FILESDIR}"/atieventsd.init atieventsd
-		echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-		newconfd "${T}"/atieventsd.conf atieventsd
-	fi
-}
-
-src_install-libs() {
-	if [[ "${ABI}" == "amd64" ]]; then
-		local pkglibdir=lib64
-	else
-		local pkglibdir=lib
-	fi
-	einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
-
-	local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
-
-	# The GLX libraries
-	# (yes, this really is "lib" even on amd64/multilib --marienz)
-	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
-
-	# Same as the xorg implementation (eselect opengl does not fall
-	# back to xorg-x11 if we omit this symlink, meaning no glx).
-	dosym ../xorg-x11/extensions ${ATI_ROOT}/extensions
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	local envname="${T}"/04ati-dri-path
-	if [[ -n ${ABI} ]]; then
-		envname="${envname}-${ABI}"
-	fi
-	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
-	doenvd "${envname}"
-}
-
-pkg_postinst() {
-	/usr/bin/eselect opengl set --use-old ati
-
-	elog "To switch to ATI OpenGL, run \"eselect opengl set ati\""
-	elog "To change your xorg.conf you can use the bundled \"aticonfig\""
-	elog
-	elog "If you experience unexplained segmentation faults and kernel crashes"
-	elog "with this driver and multi-threaded applications such as wine,"
-	elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
-	elog
-	# (to get the LIBGL_DRIVERS_PATH)
-	elog "You will have to source /etc/profile (or logout and back in) for dri"
-	elog "to work, unless you previously had ati-drivers installed."
-	# 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.433.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.433.ebuild
deleted file mode 100644
index 09eb224a9d44..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.433.ebuild
+++ /dev/null
@@ -1,449 +0,0 @@
-# Copyright 1999-2008 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.433.ebuild,v 1.4 2008/02/29 20:46:46 carlo Exp $
-
-IUSE="acpi debug"
-
-inherit eutils multilib linux-mod toolchain-funcs versionator
-
-DESCRIPTION="Ati precompiled drivers for recent 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-7-11-x86.x86_64.run"
-
-LICENSE="AMD GPL-2 QPL-1.0 as-is"
-KEYWORDS="~amd64 ~x86"
-
-# The portage dep is for COLON_SEPARATED support in env-update.
-# The eselect dep (>=1.0.9) is for COLON_SEPARATED in eselect env update.
-RDEPEND="x11-base/xorg-server
-	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-1.0.9
-	app-admin/eselect-opengl
-	=virtual/libstdc++-3.3*
-	amd64? ( app-emulation/emul-linux-x86-xlibs )
-	acpi? (
-		x11-apps/xauth
-		sys-power/acpid
-	)
-	x11-libs/libXrandr
-	>=sys-apps/portage-2.1.1-r1"
-
-DEPEND="${RDEPEND}
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto"
-
-EMULTILIB_PKG="true"
-
-QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so
-	usr/lib/opengl/ati/lib/libGL.so.1.2
-	opt/bin/amdcccle"
-QA_EXECSTACK_amd64="usr/lib64/dri/fglrx_dri.so
-	usr/lib32/dri/fglrx_dri.so
-	usr/lib64/opengl/ati/lib/libGL.so.1.2
-	usr/lib32/opengl/ati/lib/libGL.so.1.2
-	opt/bin/amdcccle"
-QA_TEXTRELS_x86="usr/lib/dri/fglrx_dri.so
-	usr/lib/xorg/modules/drivers/fglrx_drv.so
-	usr/lib/opengl/ati/lib/libGL.so.1.2
-	usr/lib/xorg/modules/glesx.so"
-QA_TEXTRELS_amd64="
-	usr/lib64/opengl/ati/lib/libGL.so.1.2
-	usr/lib32/opengl/ati/lib/libGL.so.1.2
-	usr/lib64/dri/fglrx_dri.so
-	usr/lib32/dri/fglrx_dri.so
-	usr/lib32/xorg/modules/glesx.so
-	usr/lib64/xorg/modules/glesx.so"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-
-	# Define module dir.
-	MODULE_DIR="${S}/common/lib/modules/fglrx/build_mod"
-
-	#check kernel and sets up KV_OBJ
-	MODULE_NAMES="fglrx(video:${S}/common/lib/modules/fglrx/build_mod/2.6.x)"
-	BUILD_TARGETS="kmod_build"
-	linux-mod_pkg_setup
-	BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}"
-
-	if ! kernel_is 2 6; then
-		eerror "Need a 2.6 kernel to compile against!"
-		die "Need a 2.6 kernel to compile against!"
-	fi
-
-	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 "You need AGP and/or PCI Express support for direct rendering to work."
-	fi
-
-	if linux_chkconfig_present PARAVIRT; then
-		eerror "The current ati-drivers don't compile when having"
-		eerror "paravirtualization active due to GPL symbol export"
-		eerror "restrictions."
-		eerror "Please disable it:"
-		eerror "	CONFIG_PARAVIRT=n"
-		eerror "in /usr/src/linux/.config or"
-		eerror "	Processor type and features -->"
-		eerror "		[ ] Paravirtualization support (EXPERIMENTAL)"
-		eerror "in 'menuconfig'"
-		die "CONFIG_PARAVIRT enabled"
-	fi
-
-	# xorg-server 1.1 and its prereleases correspond to xorg 7.1.
-	if has_version ">=x11-base/xorg-server-1.0.99"; then
-		BASE_DIR="${S}/x710"
-	else
-		BASE_DIR="${S}/x690"
-	fi
-
-	if use amd64 ; then
-		BASE_DIR="${BASE_DIR}_64a"
-		# This is used like $(get_libdir) for paths in ati's package.
-		PKG_LIBDIR=lib64
-		ARCH_DIR="${S}/arch/x86_64"
-	else
-		PKG_LIBDIR=lib
-		ARCH_DIR="${S}/arch/x86"
-	fi
-}
-
-src_unpack() {
-	#Switching to a standard way to extract the files since otherwise no signature file
-	#would be created
-	local src="${DISTDIR}/${A}"
-	sh "${src}" --extract "${S}"  2&>1 /dev/null
-
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/{fgl_glxgears,fglrx_xgamma} \
-		"${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \
-		|| die "bin rm failed"
-
-	if use debug; then
-		# Enable debug mode in the Source Code.
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	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/" \
-			"${S}/common/etc/ati/authatieventsd.sh" \
-			|| die "sed failed."
-
-		# Since "who" is in coreutils, we're using that one instead of "finger".
-		sed -i -e 's:finger:who:' \
-			"${S}/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-			|| die "Replacing 'finger' with 'who' failed."
-		# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-		# add funktion to detect default state.
-		epatch "${FILESDIR}"/${PV}/ati-powermode-opt-path-1.patch
-	fi
-
-	pushd ${MODULE_DIR} >/dev/null
-	ln -s "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
-		|| die "symlinking precompiled core failed"
-
-	convert_to_m 2.6.x/Makefile || die "convert_to_m failed"
-
-	# When built with ati's make.sh it defines a bunch of macros if
-	# certain .config values are set, falling back to less reliable
-	# detection methods if linux/autoconf.h is not available. We
-	# simply use the linux/autoconf.h settings directly, bypassing the
-	# detection script.
-	sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
-	sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
-		|| die "MODVERSIONS sed failed"
-	popd >/dev/null
-
-	# Fix Suspend on 2.6.23 kernel.
-	if kernel_is ge 2 6 23; then
-		sed -i 's:CONFIG_SUSPEND_SMP:CONFIG_PM_SLEEP_SMP:' \
-			"${MODULE_DIR}/firegl_public.h" \
-			|| die "Fixing suspend for kernel 2.6.23 failed."
-	fi
-
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../common/usr/src/ati/fglrx_sample_source.tgz
-	sed -i -e 's:include/extensions/extutil.h:X11/extensions/extutil.h:' \
-		lib/fglrx_gamma/fglrx_gamma.c || die "include fixup failed"
-	# Add a category.
-	mv programs/fglrx_gamma/fglrx_xgamma.{man,1} || die "man mv failed"
-	cd ..
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	einfo "Building fgl_glxgears"
-	cd "${S}"/extra/fgl_glxgears
-	# These extra libs/utils either have an Imakefile that does not
-	# work very well without tweaking or a Makefile ignoring CFLAGS
-	# and the like. We bypass those.
-
-	# The -DUSE_GLU is needed to compile using nvidia headers
-	# according to a comment in ati-drivers-extra-8.33.6.ebuild.
-	"$(tc-getCC)" -o fgl_fglxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
-		-I"${S}"/common/usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-
-	einfo "Building fglrx_gamma lib"
-	cd "${S}"/extra/lib/fglrx_gamma
-	"$(tc-getCC)" -shared -fpic -o libfglrx_gamma.so.1.0 ${CFLAGS} ${LDFLAGS} \
-		-DXF86MISC -Wl,-soname,libfglrx_gamma.so.1.0 fglrx_gamma.c \
-		-lXext || die "fglrx_gamma lib build failed"
-	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so || die "ln failed"
-	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so.1 || die "ln failed"
-
-	einfo "Building fglrx_gamma util"
-	cd "${S}"/extra/programs/fglrx_gamma
-	"$(tc-getCC)" -o fglrx_xgamma ${CFLAGS} ${LDFLAGS} \
-		-I../../../common/usr/X11R6/include -L../../lib/fglrx_gamma \
-		fglrx_xgamma.c -lm -lfglrx_gamma -lX11 \
-		|| die "fglrx_gamma util build failed"
-
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# We can do two things here, and neither of them is very nice.
-
-	# For direct rendering libGL has to be able to load one or more
-	# dri modules (files ending in _dri.so, like fglrx_dri.so).
-	# Gentoo's mesa looks for these files in the location specified by
-	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
-	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
-	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
-	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
-	# 64bit. So we can either put the .so files in that (unusual,
-	# compared to "normal" mesa libGL) location or set
-	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
-	# 101539.
-
-	# The problem with this approach is that LIBGL_DRIVERS_PATH
-	# *overrides* the default hardcoded location, it does not extend
-	# it. So if ati-drivers is merged but a non-ati libGL is selected
-	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
-	# (because it changed in a newer mesa or because it was compiled
-	# for a different set of multilib abis than we are) stuff breaks.
-
-	# We create one file per ABI to work with "native" multilib, see
-	# below.
-
-	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
-	doenvd "${T}/03ati-colon-sep"
-
-	# All libraries that we have a 32 bit and 64 bit version of on
-	# amd64 are installed in src_install-libs. Everything else
-	# (including libraries only available in native 64bit on amd64)
-	# goes in here.
-
-	# There used to be some code here that tried to detect running
-	# under a "native multilib" portage ((precursor of)
-	# http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it
-	# should just work (only doing some duplicate work). --marienz
-	if has_multilib_profile; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	# This is sorted by the order the files occur in the source tree.
-
-	# X modules.
-	exeinto /usr/$(get_libdir)/xorg/modules/drivers
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
-	exeinto /usr/$(get_libdir)/xorg/modules/linux
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
-	exeinto /usr/$(get_libdir)/xorg/modules
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{esut.a,glesx.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	if use acpi; then
-		dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	fi
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -name '*.so*' -not -name 'libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins common/etc/ati/{logo*,control,atiogl.xml,signature}
-	if use acpi; then
-		doins common/etc/ati/authatieventsd.sh
-	fi
-
-	# include.
-	insinto /usr
-	doins -r common/usr/include
-	insinto /usr/include/X11/extensions
-	doins common/usr/X11R6/include/X11/extensions/fglrx_gamma.h
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin common/usr/sbin/*
-
-	# data files for the control panel.
-	insinto /usr/share
-	doins -r common/usr/share/ati
-	insinto /usr/share/pixmaps
-	doins common/usr/share/icons/ccc_{large,small}.xpm
-	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
-		ccc_large System
-
-	# doc.
-	dohtml -r common/usr/share/doc/fglrx
-
-	if use acpi; then
-		doman common/usr/share/man/man8/atieventsd.8
-
-		pushd common/usr/share/doc/fglrx/examples/etc/acpi >/dev/null
-
-		exeinto /etc/acpi
-		doexe ati-powermode.sh
-		insinto /etc/acpi/events
-		doins events/*
-
-		popd >/dev/null
-	fi
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_fglxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	dolib extra/lib/fglrx_gamma/*so*
-	newdoc extra/lib/fglrx_gamma/README README.libfglrx_gamma
-
-	dobin extra/programs/fglrx_gamma/fglrx_xgamma
-	doman extra/programs/fglrx_gamma/fglrx_xgamma.1
-	newdoc extra/programs/fglrx_gamma/README README.fglrx_gamma
-
-	# Gentoo-specific stuff:
-	if use acpi; then
-		newinitd "${FILESDIR}"/atieventsd.init atieventsd \
-			|| die "Failed to install atieventsd.init.d"
-		echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-		newconfd "${T}"/atieventsd.conf atieventsd
-	fi
-}
-
-src_install-libs() {
-	if [[ "${ABI}" == "amd64" ]]; then
-		local pkglibdir=lib64
-		local MY_ARCH_DIR="${S}/arch/x86_64"
-	else
-		local pkglibdir=lib
-		local MY_ARCH_DIR="${S}/arch/x86"
-	fi
-	einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
-
-	local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
-	# To make sure we do not miss a spot when these change.
-	local libmajor=1 libminor=2
-	local libver=${libmajor}.${libminor}
-
-	# The GLX libraries
-	# (yes, this really is "lib" even on amd64/multilib --marienz)
-	exeinto ${ATI_ROOT}/lib
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/libGL.so.${libver}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
-
-	# Same as the xorg implementation (eselect opengl does not fall
-	# back to xorg-x11 if we omit this symlink, meaning no glx).
-	dosym ../xorg-x11/extensions ${ATI_ROOT}/extensions
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# Make up a libGL.la. Ati does not provide one, but mesa does. If
-	# a (libtool-based) libfoo is built with libGL.la present a
-	# reference to it is put into libfoo.la, and compiling
-	# (libtool-based) things that link too libfoo.la will complain if
-	# libGL.la disappears. So if we do not make up a libGL.la
-	# switching between mesa and ati becomes painful.
-	local revision=$(printf '%d%02d%02d' $(get_version_components))
-	sed -e "s:\${libmajor}:${libmajor}:g" \
-		-e "s:\${libminor}:${libminor}:g" \
-		-e "s:\${libdir}:$(get_libdir):g" \
-		-e "s:\${revision}:${revision}:g" \
-		"${FILESDIR}"/libGL.la.in > "${D}"/${ATI_ROOT}/lib/libGL.la \
-		|| die "sed failed to make libGL.la"
-
-	local envname="${T}"/04ati-dri-path
-	if [[ -n ${ABI} ]]; then
-		envname="${envname}-${ABI}"
-	fi
-	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
-	doenvd "${envname}"
-}
-
-pkg_postinst() {
-	/usr/bin/eselect opengl set --use-old ati
-
-	elog "To switch to ATI OpenGL, run \"eselect opengl set ati\""
-	elog "To change your xorg.conf you can use the bundled \"aticonfig\""
-	elog
-	elog "If you experience unexplained segmentation faults and kernel crashes"
-	elog "with this driver and multi-threaded applications such as wine,"
-	elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
-	elog
-	elog "You will have to source /etc/profile (or logout and back in) for dri"
-	elog "to work, unless you previously had ati-drivers installed."
-
-	# Workaroud screen corruption
-	ewarn "If you experience screen corruption with this driver, try putting"
-	ewarn '         Option "XAANoOffscreenPixmaps" "true"'
-	ewarn "in the Device Section of /etc/X11/xorg.conf."
-
-	# Warning per bug #199720
-	elog "***** Warning *****"
-	elog "ATI has stated this is not a complete release version and should"
-	elog "not be distributed. Although it is the version presented on their"
-	elog "website for certain chipsets/cards. Due to this version being"
-	elog "incomplete, some users will experience \"(EE) No devices detected.\""
-	elog "errors. This is known and please mask this version locally if you"
-	elog "experience that. For further information please see the following"
-	elog "http://www2.ati.com/drivers/linux/catalyst_711_linux.html"
-
-	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.443.1-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.443.1-r1.ebuild
deleted file mode 100644
index 22a4c6c6c5f1..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.443.1-r1.ebuild
+++ /dev/null
@@ -1,450 +0,0 @@
-# Copyright 1999-2008 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.443.1-r1.ebuild,v 1.3 2008/02/29 20:46:46 carlo Exp $
-
-IUSE="acpi debug"
-
-inherit eutils multilib linux-mod toolchain-funcs versionator
-
-DESCRIPTION="Ati precompiled drivers for recent 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}-x86.x86_64.run"
-
-LICENSE="AMD GPL-2 QPL-1.0 as-is"
-KEYWORDS="~amd64 ~x86"
-
-# The portage dep is for COLON_SEPARATED support in env-update.
-# The eselect dep (>=1.0.9) is for COLON_SEPARATED in eselect env update.
-RDEPEND="x11-base/xorg-server
-	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-1.0.9
-	app-admin/eselect-opengl
-	=virtual/libstdc++-3.3*
-	amd64? ( app-emulation/emul-linux-x86-xlibs )
-	acpi? (
-		x11-apps/xauth
-		sys-power/acpid
-	)
-	x11-libs/libXrandr
-	>=sys-apps/portage-2.1.1-r1"
-
-DEPEND="${RDEPEND}
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto"
-
-EMULTILIB_PKG="true"
-
-QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so
-	usr/lib/opengl/ati/lib/libGL.so.1.2
-	opt/bin/amdcccle"
-QA_EXECSTACK_amd64="usr/lib64/dri/fglrx_dri.so
-	usr/lib32/dri/fglrx_dri.so
-	usr/lib64/opengl/ati/lib/libGL.so.1.2
-	usr/lib32/opengl/ati/lib/libGL.so.1.2
-	opt/bin/amdcccle"
-QA_TEXTRELS_x86="usr/lib/dri/fglrx_dri.so
-	usr/lib/xorg/modules/drivers/fglrx_drv.so
-	usr/lib/opengl/ati/lib/libGL.so.1.2
-	usr/lib/xorg/modules/glesx.so"
-QA_TEXTRELS_amd64="
-	usr/lib64/opengl/ati/lib/libGL.so.1.2
-	usr/lib32/opengl/ati/lib/libGL.so.1.2
-	usr/lib64/dri/fglrx_dri.so
-	usr/lib32/dri/fglrx_dri.so
-	usr/lib32/xorg/modules/glesx.so
-	usr/lib64/xorg/modules/glesx.so"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-
-	# Define module dir.
-	MODULE_DIR="${S}/common/lib/modules/fglrx/build_mod"
-
-	#check kernel and sets up KV_OBJ
-	MODULE_NAMES="fglrx(video:${S}/common/lib/modules/fglrx/build_mod/2.6.x)"
-	BUILD_TARGETS="kmod_build"
-	linux-mod_pkg_setup
-	BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}"
-
-	if ! kernel_is 2 6; then
-		eerror "Need a 2.6 kernel to compile against!"
-		die "Need a 2.6 kernel to compile against!"
-	fi
-
-	if kernel_is ge 2 6 24; then
-		CONFIG_CHECK="PCI_LEGACY"
-		ERROR_PCI_LEGACY="${P} requires support for pci_find_slot (CONFIG_PCI_LEGACY)."
-	fi
-
-	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 "You need AGP and/or PCI Express support for direct rendering to work."
-	fi
-
-	if linux_chkconfig_present PARAVIRT; then
-		eerror "The current ati-drivers don't compile when having"
-		eerror "paravirtualization active due to GPL symbol export"
-		eerror "restrictions."
-		eerror "Please disable it:"
-		eerror "	CONFIG_PARAVIRT=n"
-		eerror "in /usr/src/linux/.config or"
-		eerror "	Processor type and features -->"
-		eerror "		[ ] Paravirtualization support (EXPERIMENTAL)"
-		eerror "in 'menuconfig'"
-		die "CONFIG_PARAVIRT enabled"
-	fi
-
-	# Only support xorg-server >=1.1
-	BASE_DIR="${S}/x710"
-
-	# This is used like $(get_libdir) for paths in ati's package.
-	if use amd64 ; then
-		BASE_DIR="${BASE_DIR}_64a"
-		PKG_LIBDIR=lib64
-		ARCH_DIR="${S}/arch/x86_64"
-	else
-		PKG_LIBDIR=lib
-		ARCH_DIR="${S}/arch/x86"
-	fi
-}
-
-src_unpack() {
-	#Switching to a standard way to extract the files since otherwise no signature file
-	#would be created
-	local src="${DISTDIR}/${A}"
-	sh "${src}" --extract "${S}"  2&>1 /dev/null
-
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/{fgl_glxgears,fglrx_xgamma} \
-		"${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \
-		|| die "bin rm failed"
-
-	if use debug; then
-		# Enable debug mode in the Source Code.
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	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/" \
-			"${S}/common/etc/ati/authatieventsd.sh" \
-			|| die "sed failed."
-
-		# Since "who" is in coreutils, we're using that one instead of "finger".
-		sed -i -e 's:finger:who:' \
-			"${S}/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-			|| die "Replacing 'finger' with 'who' failed."
-		# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-		# add function to detect default state.
-#		epatch "${FILESDIR}"/${PV}/ati-powermode-opt-path-2.patch
-	fi
-
-	pushd ${MODULE_DIR} >/dev/null
-	ln -s "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
-		|| die "symlinking precompiled core failed"
-
-	convert_to_m 2.6.x/Makefile || die "convert_to_m failed"
-
-	# When built with ati's make.sh it defines a bunch of macros if
-	# certain .config values are set, falling back to less reliable
-	# detection methods if linux/autoconf.h is not available. We
-	# simply use the linux/autoconf.h settings directly, bypassing the
-	# detection script.
-	sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
-	sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
-		|| die "MODVERSIONS sed failed"
-	popd >/dev/null
-
-	# Fix Suspend on 2.6.23 kernel.
-	if kernel_is ge 2 6 23; then
-		sed -i 's:CONFIG_SUSPEND_SMP:CONFIG_PM_SLEEP_SMP:' \
-			"${MODULE_DIR}/firegl_public.h" \
-			|| die "Fixing suspend for kernel 2.6.23 failed."
-	fi
-
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../common/usr/src/ati/fglrx_sample_source.tgz
-	sed -i -e 's:include/extensions/extutil.h:X11/extensions/extutil.h:' \
-		lib/fglrx_gamma/fglrx_gamma.c || die "include fixup failed"
-	# Add a category.
-	mv programs/fglrx_gamma/fglrx_xgamma.{man,1} || die "man mv failed"
-	cd ..
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	einfo "Building fgl_glxgears"
-	cd "${S}"/extra/fgl_glxgears
-	# These extra libs/utils either have an Imakefile that does not
-	# work very well without tweaking or a Makefile ignoring CFLAGS
-	# and the like. We bypass those.
-
-	# The -DUSE_GLU is needed to compile using nvidia headers
-	# according to a comment in ati-drivers-extra-8.33.6.ebuild.
-	"$(tc-getCC)" -o fgl_fglxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
-		-I"${S}"/common/usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-
-	einfo "Building fglrx_gamma lib"
-	cd "${S}"/extra/lib/fglrx_gamma
-	"$(tc-getCC)" -shared -fpic -o libfglrx_gamma.so.1.0 ${CFLAGS} ${LDFLAGS} \
-		-DXF86MISC -Wl,-soname,libfglrx_gamma.so.1.0 fglrx_gamma.c \
-		-lXext || die "fglrx_gamma lib build failed"
-	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so || die "ln failed"
-	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so.1 || die "ln failed"
-
-	einfo "Building fglrx_gamma util"
-	cd "${S}"/extra/programs/fglrx_gamma
-	"$(tc-getCC)" -o fglrx_xgamma ${CFLAGS} ${LDFLAGS} \
-		-I../../../common/usr/X11R6/include -L../../lib/fglrx_gamma \
-		fglrx_xgamma.c -lm -lfglrx_gamma -lX11 \
-		|| die "fglrx_gamma util build failed"
-
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# We can do two things here, and neither of them is very nice.
-
-	# For direct rendering libGL has to be able to load one or more
-	# dri modules (files ending in _dri.so, like fglrx_dri.so).
-	# Gentoo's mesa looks for these files in the location specified by
-	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
-	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
-	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
-	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
-	# 64bit. So we can either put the .so files in that (unusual,
-	# compared to "normal" mesa libGL) location or set
-	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
-	# 101539.
-
-	# The problem with this approach is that LIBGL_DRIVERS_PATH
-	# *overrides* the default hardcoded location, it does not extend
-	# it. So if ati-drivers is merged but a non-ati libGL is selected
-	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
-	# (because it changed in a newer mesa or because it was compiled
-	# for a different set of multilib abis than we are) stuff breaks.
-
-	# We create one file per ABI to work with "native" multilib, see
-	# below.
-
-	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
-	doenvd "${T}/03ati-colon-sep"
-
-	# All libraries that we have a 32 bit and 64 bit version of on
-	# amd64 are installed in src_install-libs. Everything else
-	# (including libraries only available in native 64bit on amd64)
-	# goes in here.
-
-	# There used to be some code here that tried to detect running
-	# under a "native multilib" portage ((precursor of)
-	# http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it
-	# should just work (only doing some duplicate work). --marienz
-	if has_multilib_profile; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	# This is sorted by the order the files occur in the source tree.
-
-	# X modules.
-	exeinto /usr/$(get_libdir)/xorg/modules/drivers
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
-	exeinto /usr/$(get_libdir)/xorg/modules/linux
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
-	exeinto /usr/$(get_libdir)/xorg/modules
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{esut.a,glesx.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	if use acpi; then
-		dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	fi
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -name '*.so*' -not -name 'libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins common/etc/ati/{logo*,control,atiogl.xml,signature}
-	if use acpi; then
-		doins common/etc/ati/authatieventsd.sh
-	fi
-
-	# include.
-	insinto /usr
-	doins -r common/usr/include
-	insinto /usr/include/X11/extensions
-	doins common/usr/X11R6/include/X11/extensions/fglrx_gamma.h
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin common/usr/sbin/*
-
-	# data files for the control panel.
-	insinto /usr/share
-	doins -r common/usr/share/ati
-	insinto /usr/share/pixmaps
-	doins common/usr/share/icons/ccc_{large,small}.xpm
-	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
-		ccc_large System
-
-	# doc.
-	dohtml -r common/usr/share/doc/fglrx
-
-	if use acpi; then
-		doman common/usr/share/man/man8/atieventsd.8
-
-		pushd common/usr/share/doc/fglrx/examples/etc/acpi >/dev/null
-
-		exeinto /etc/acpi
-		doexe ati-powermode.sh
-		insinto /etc/acpi/events
-		doins events/*
-
-		popd >/dev/null
-	fi
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_fglxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	dolib extra/lib/fglrx_gamma/*so*
-	newdoc extra/lib/fglrx_gamma/README README.libfglrx_gamma
-
-	dobin extra/programs/fglrx_gamma/fglrx_xgamma
-	doman extra/programs/fglrx_gamma/fglrx_xgamma.1
-	newdoc extra/programs/fglrx_gamma/README README.fglrx_gamma
-
-	# Gentoo-specific stuff:
-	if use acpi; then
-		newinitd "${FILESDIR}"/atieventsd.init atieventsd \
-			|| die "Failed to install atieventsd.init.d"
-		echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-		newconfd "${T}"/atieventsd.conf atieventsd
-	fi
-}
-
-src_install-libs() {
-	if [[ "${ABI}" == "amd64" ]]; then
-		local pkglibdir=lib64
-		local MY_ARCH_DIR="${S}/arch/x86_64"
-	else
-		local pkglibdir=lib
-		local MY_ARCH_DIR="${S}/arch/x86"
-	fi
-	einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
-
-	local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
-	# To make sure we do not miss a spot when these change.
-	local libmajor=1 libminor=2
-	local libver=${libmajor}.${libminor}
-
-	# The GLX libraries
-	# (yes, this really is "lib" even on amd64/multilib --marienz)
-	exeinto ${ATI_ROOT}/lib
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/libGL.so.${libver}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
-
-	# Same as the xorg implementation (eselect opengl does not fall
-	# back to xorg-x11 if we omit this symlink, meaning no glx).
-	dosym ../xorg-x11/extensions ${ATI_ROOT}/extensions
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# Make up a libGL.la. Ati does not provide one, but mesa does. If
-	# a (libtool-based) libfoo is built with libGL.la present a
-	# reference to it is put into libfoo.la, and compiling
-	# (libtool-based) things that link too libfoo.la will complain if
-	# libGL.la disappears. So if we do not make up a libGL.la
-	# switching between mesa and ati becomes painful.
-	local revision=$(printf '%d%02d%02d' $(get_version_components))
-	sed -e "s:\${libmajor}:${libmajor}:g" \
-		-e "s:\${libminor}:${libminor}:g" \
-		-e "s:\${libdir}:$(get_libdir):g" \
-		-e "s:\${revision}:${revision}:g" \
-		"${FILESDIR}"/libGL.la.in > "${D}"/${ATI_ROOT}/lib/libGL.la \
-		|| die "sed failed to make libGL.la"
-
-	local envname="${T}"/04ati-dri-path
-	if [[ -n ${ABI} ]]; then
-		envname="${envname}-${ABI}"
-	fi
-	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
-	doenvd "${envname}"
-}
-
-pkg_postinst() {
-	/usr/bin/eselect opengl set --use-old ati
-
-	elog "To switch to ATI OpenGL, run \"eselect opengl set ati\""
-	elog "To change your xorg.conf you can use the bundled \"aticonfig\""
-	elog
-	elog "If you experience unexplained segmentation faults and kernel crashes"
-	elog "with this driver and multi-threaded applications such as wine,"
-	elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
-	elog
-	elog "You will have to source /etc/profile (or logout and back in) for dri"
-	elog "to work, unless you previously had ati-drivers installed."
-
-	# Workaroud screen corruption
-	ewarn "If you experience screen corruption with this driver, try putting"
-	ewarn '         Option "XAANoOffscreenPixmaps" "true"'
-	ewarn "in the Device Section of /etc/X11/xorg.conf."
-
-	# Warning per bug #199720
-	elog "***** Warning *****"
-	elog "ATI has stated this is not a complete release version and should"
-	elog "not be distributed. Although it is the version presented on their"
-	elog "website for certain chipsets/cards. Due to this version being"
-	elog "incomplete, some users will experience \"(EE) No devices detected.\""
-	elog "errors. This is known and please mask this version locally if you"
-	elog "experience that. For further information please see the following"
-	elog "http://www2.ati.com/drivers/linux/catalyst_711_linux.html"
-
-	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.455.2-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.455.2-r1.ebuild
deleted file mode 100644
index 41a99a2e02d4..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.455.2-r1.ebuild
+++ /dev/null
@@ -1,434 +0,0 @@
-# Copyright 1999-2008 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.455.2-r1.ebuild,v 1.3 2008/03/03 20:53:35 je_fro Exp $
-
-IUSE="acpi debug"
-
-inherit eutils multilib linux-mod toolchain-funcs versionator
-
-DESCRIPTION="Ati precompiled drivers for recent 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-8-02-x86.x86_64.run"
-
-LICENSE="AMD GPL-2 QPL-1.0 as-is"
-KEYWORDS="~amd64 ~x86"
-
-# The portage dep is for COLON_SEPARATED support in env-update.
-# The eselect dep (>=1.0.9) is for COLON_SEPARATED in eselect env update.
-RDEPEND="x11-base/xorg-server
-	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-1.0.9
-	app-admin/eselect-opengl
-	=virtual/libstdc++-3.3*
-	amd64? ( app-emulation/emul-linux-x86-xlibs )
-	acpi? (
-		x11-apps/xauth
-		sys-power/acpid
-	)
-	x11-libs/libXrandr
-	>=sys-apps/portage-2.1.1-r1"
-
-DEPEND="${RDEPEND}
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/inputproto"
-
-EMULTILIB_PKG="true"
-
-QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so
-	usr/lib/opengl/ati/lib/libGL.so.1.2
-	opt/bin/amdcccle"
-QA_EXECSTACK_amd64="usr/lib64/dri/fglrx_dri.so
-	usr/lib32/dri/fglrx_dri.so
-	usr/lib64/opengl/ati/lib/libGL.so.1.2
-	usr/lib32/opengl/ati/lib/libGL.so.1.2
-	opt/bin/amdcccle"
-QA_TEXTRELS_x86="usr/lib/dri/fglrx_dri.so
-	usr/lib/xorg/modules/drivers/fglrx_drv.so
-	usr/lib/opengl/ati/lib/libGL.so.1.2
-	usr/lib/xorg/modules/glesx.so"
-QA_TEXTRELS_amd64="
-	usr/lib64/opengl/ati/lib/libGL.so.1.2
-	usr/lib32/opengl/ati/lib/libGL.so.1.2
-	usr/lib64/dri/fglrx_dri.so
-	usr/lib32/dri/fglrx_dri.so
-	usr/lib32/xorg/modules/glesx.so
-	usr/lib64/xorg/modules/glesx.so"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-
-	# Define module dir.
-	MODULE_DIR="${S}/common/lib/modules/fglrx/build_mod"
-
-	#check kernel and sets up KV_OBJ
-	MODULE_NAMES="fglrx(video:${S}/common/lib/modules/fglrx/build_mod/2.6.x)"
-	BUILD_TARGETS="kmod_build"
-	linux-mod_pkg_setup
-	BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}"
-
-	if ! kernel_is 2 6; then
-		eerror "Need a 2.6 kernel to compile against!"
-		die "Need a 2.6 kernel to compile against!"
-	fi
-
-	if kernel_is ge 2 6 24 && ! linux_chkconfig_present PCI_LEGACY; then
-		eerror "${P} requires support for pci_find_slot."
-		die "${P} requires support for pci_find_slot."
-	fi
-
-	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 "You need AGP and/or PCI Express support for direct rendering to work."
-	fi
-
-	if linux_chkconfig_present PARAVIRT; then
-		eerror "The current ati-drivers don't compile when having"
-		eerror "paravirtualization active due to GPL symbol export"
-		eerror "restrictions."
-		eerror "Please disable it:"
-		eerror "	CONFIG_PARAVIRT=n"
-		eerror "in /usr/src/linux/.config or"
-		eerror "	Processor type and features -->"
-		eerror "		[ ] Paravirtualization support (EXPERIMENTAL)"
-		eerror "in 'menuconfig'"
-		die "CONFIG_PARAVIRT enabled"
-	fi
-
-	# Only support xorg-server >=1.1
-	BASE_DIR="${S}/x710"
-
-	# This is used like $(get_libdir) for paths in ati's package.
-	if use amd64 ; then
-		BASE_DIR="${BASE_DIR}_64a"
-		PKG_LIBDIR=lib64
-		ARCH_DIR="${S}/arch/x86_64"
-	else
-		PKG_LIBDIR=lib
-		ARCH_DIR="${S}/arch/x86"
-	fi
-}
-
-src_unpack() {
-	#Switching to a standard way to extract the files since otherwise no signature file
-	#would be created
-	local src="${DISTDIR}/${A}"
-	sh "${src}" --extract "${S}"  2&>1 /dev/null
-
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/{fgl_glxgears,fglrx_xgamma} \
-		"${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \
-		|| die "bin rm failed"
-
-	if use debug; then
-		# Enable debug mode in the Source Code.
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	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/" \
-			"${S}/common/etc/ati/authatieventsd.sh" \
-			|| die "sed failed."
-
-		# Since "who" is in coreutils, we're using that one instead of "finger".
-		sed -i -e 's:finger:who:' \
-			"${S}/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-			|| die "Replacing 'finger' with 'who' failed."
-		# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-		# add funktion to detect default state.
-		epatch "${FILESDIR}"/${PV}/ati-powermode-opt-path-2.patch
-	fi
-
-	pushd ${MODULE_DIR} >/dev/null
-	ln -s "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
-		|| die "symlinking precompiled core failed"
-
-	convert_to_m 2.6.x/Makefile || die "convert_to_m failed"
-
-	# When built with ati's make.sh it defines a bunch of macros if
-	# certain .config values are set, falling back to less reliable
-	# detection methods if linux/autoconf.h is not available. We
-	# simply use the linux/autoconf.h settings directly, bypassing the
-	# detection script.
-	sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
-	sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
-		|| die "MODVERSIONS sed failed"
-	popd >/dev/null
-
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../common/usr/src/ati/fglrx_sample_source.tgz
-	sed -i -e 's:include/extensions/extutil.h:X11/extensions/extutil.h:' \
-		lib/fglrx_gamma/fglrx_gamma.c || die "include fixup failed"
-	# Add a category.
-	mv programs/fglrx_gamma/fglrx_xgamma.{man,1} || die "man mv failed"
-	cd ..
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	einfo "Building fgl_glxgears"
-	cd "${S}"/extra/fgl_glxgears
-	# These extra libs/utils either have an Imakefile that does not
-	# work very well without tweaking or a Makefile ignoring CFLAGS
-	# and the like. We bypass those.
-
-	# The -DUSE_GLU is needed to compile using nvidia headers
-	# according to a comment in ati-drivers-extra-8.33.6.ebuild.
-	"$(tc-getCC)" -o fgl_fglxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
-		-I"${S}"/common/usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-
-	einfo "Building fglrx_gamma lib"
-	cd "${S}"/extra/lib/fglrx_gamma
-	"$(tc-getCC)" -shared -fpic -o libfglrx_gamma.so.1.0 ${CFLAGS} ${LDFLAGS} \
-		-DXF86MISC -Wl,-soname,libfglrx_gamma.so.1.0 fglrx_gamma.c \
-		-lXext || die "fglrx_gamma lib build failed"
-	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so || die "ln failed"
-	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so.1 || die "ln failed"
-
-	einfo "Building fglrx_gamma util"
-	cd "${S}"/extra/programs/fglrx_gamma
-	"$(tc-getCC)" -o fglrx_xgamma ${CFLAGS} ${LDFLAGS} \
-		-I../../../common/usr/X11R6/include -L../../lib/fglrx_gamma \
-		fglrx_xgamma.c -lm -lfglrx_gamma -lX11 \
-		|| die "fglrx_gamma util build failed"
-
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# We can do two things here, and neither of them is very nice.
-
-	# For direct rendering libGL has to be able to load one or more
-	# dri modules (files ending in _dri.so, like fglrx_dri.so).
-	# Gentoo's mesa looks for these files in the location specified by
-	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
-	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
-	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
-	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
-	# 64bit. So we can either put the .so files in that (unusual,
-	# compared to "normal" mesa libGL) location or set
-	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
-	# 101539.
-
-	# The problem with this approach is that LIBGL_DRIVERS_PATH
-	# *overrides* the default hardcoded location, it does not extend
-	# it. So if ati-drivers is merged but a non-ati libGL is selected
-	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
-	# (because it changed in a newer mesa or because it was compiled
-	# for a different set of multilib abis than we are) stuff breaks.
-
-	# We create one file per ABI to work with "native" multilib, see
-	# below.
-
-	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
-	doenvd "${T}/03ati-colon-sep"
-
-	# All libraries that we have a 32 bit and 64 bit version of on
-	# amd64 are installed in src_install-libs. Everything else
-	# (including libraries only available in native 64bit on amd64)
-	# goes in here.
-
-	# There used to be some code here that tried to detect running
-	# under a "native multilib" portage ((precursor of)
-	# http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it
-	# should just work (only doing some duplicate work). --marienz
-	if has_multilib_profile; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	# This is sorted by the order the files occur in the source tree.
-
-	# X modules.
-	exeinto /usr/$(get_libdir)/xorg/modules/drivers
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
-	exeinto /usr/$(get_libdir)/xorg/modules/linux
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
-	exeinto /usr/$(get_libdir)/xorg/modules
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{esut.a,glesx.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	if use acpi; then
-		dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	fi
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -name '*.so*' -not -name 'libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins common/etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	if use acpi; then
-		doins common/etc/ati/authatieventsd.sh
-	fi
-
-	# include.
-	insinto /usr
-	doins -r common/usr/include
-	insinto /usr/include/X11/extensions
-	doins common/usr/X11R6/include/X11/extensions/fglrx_gamma.h
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin common/usr/sbin/*
-
-	# data files for the control panel.
-	insinto /usr/share
-	doins -r common/usr/share/ati
-	insinto /usr/share/pixmaps
-	doins common/usr/share/icons/ccc_{large,small}.xpm
-	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
-		ccc_large System
-
-	# doc.
-	dohtml -r common/usr/share/doc/fglrx
-
-	if use acpi; then
-		doman common/usr/share/man/man8/atieventsd.8
-
-		pushd common/usr/share/doc/fglrx/examples/etc/acpi >/dev/null
-
-		exeinto /etc/acpi
-		doexe ati-powermode.sh
-		insinto /etc/acpi/events
-		doins events/*
-
-		popd >/dev/null
-	fi
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_fglxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	dolib extra/lib/fglrx_gamma/*so*
-	newdoc extra/lib/fglrx_gamma/README README.libfglrx_gamma
-
-	dobin extra/programs/fglrx_gamma/fglrx_xgamma
-	doman extra/programs/fglrx_gamma/fglrx_xgamma.1
-	newdoc extra/programs/fglrx_gamma/README README.fglrx_gamma
-
-	# Gentoo-specific stuff:
-	if use acpi; then
-		newinitd "${FILESDIR}"/atieventsd.init atieventsd \
-			|| die "Failed to install atieventsd.init.d"
-		echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-		newconfd "${T}"/atieventsd.conf atieventsd
-	fi
-}
-
-src_install-libs() {
-	if [[ "${ABI}" == "amd64" ]]; then
-		local pkglibdir=lib64
-		local MY_ARCH_DIR="${S}/arch/x86_64"
-	else
-		local pkglibdir=lib
-		local MY_ARCH_DIR="${S}/arch/x86"
-	fi
-	einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
-
-	local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
-	# To make sure we do not miss a spot when these change.
-	local libmajor=1 libminor=2
-	local libver=${libmajor}.${libminor}
-
-	# The GLX libraries
-	# (yes, this really is "lib" even on amd64/multilib --marienz)
-	exeinto ${ATI_ROOT}/lib
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/libGL.so.${libver}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
-
-	# Same as the xorg implementation (eselect opengl does not fall
-	# back to xorg-x11 if we omit this symlink, meaning no glx).
-	dosym ../xorg-x11/extensions ${ATI_ROOT}/extensions
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# Make up a libGL.la. Ati does not provide one, but mesa does. If
-	# a (libtool-based) libfoo is built with libGL.la present a
-	# reference to it is put into libfoo.la, and compiling
-	# (libtool-based) things that link too libfoo.la will complain if
-	# libGL.la disappears. So if we do not make up a libGL.la
-	# switching between mesa and ati becomes painful.
-	local revision=$(printf '%d%02d%02d' $(get_version_components))
-	sed -e "s:\${libmajor}:${libmajor}:g" \
-		-e "s:\${libminor}:${libminor}:g" \
-		-e "s:\${libdir}:$(get_libdir):g" \
-		-e "s:\${revision}:${revision}:g" \
-		"${FILESDIR}"/libGL.la.in > "${D}"/${ATI_ROOT}/lib/libGL.la \
-		|| die "sed failed to make libGL.la"
-
-	local envname="${T}"/04ati-dri-path
-	if [[ -n ${ABI} ]]; then
-		envname="${envname}-${ABI}"
-	fi
-	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
-	doenvd "${envname}"
-}
-
-pkg_postinst() {
-	/usr/bin/eselect opengl set --use-old ati
-
-	elog "To switch to ATI OpenGL, run \"eselect opengl set ati\""
-	elog "To change your xorg.conf you can use the bundled \"aticonfig\""
-	elog
-	elog "If you experience unexplained segmentation faults and kernel crashes"
-	elog "with this driver and multi-threaded applications such as wine,"
-	elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
-	elog
-	elog "You will have to source /etc/profile (or logout and back in) for dri"
-	elog "to work, unless you previously had ati-drivers installed."
-
-	# Workaroud screen corruption
-	ewarn "If you experience screen corruption with this driver, try putting"
-	ewarn '         Option "XAANoOffscreenPixmaps" "true"'
-	ewarn "in the Device Section of /etc/X11/xorg.conf."
-
-	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.455.2.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.455.2.ebuild
deleted file mode 100644
index ce1f97f942df..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.455.2.ebuild
+++ /dev/null
@@ -1,433 +0,0 @@
-# Copyright 1999-2008 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.455.2.ebuild,v 1.2 2008/02/29 20:46:46 carlo Exp $
-
-IUSE="acpi debug"
-
-inherit eutils multilib linux-mod toolchain-funcs versionator
-
-DESCRIPTION="Ati precompiled drivers for recent 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-8-01-x86.x86_64.run"
-
-LICENSE="AMD GPL-2 QPL-1.0 as-is"
-KEYWORDS="~amd64 ~x86"
-
-# The portage dep is for COLON_SEPARATED support in env-update.
-# The eselect dep (>=1.0.9) is for COLON_SEPARATED in eselect env update.
-RDEPEND="x11-base/xorg-server
-	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-1.0.9
-	app-admin/eselect-opengl
-	=virtual/libstdc++-3.3*
-	amd64? ( app-emulation/emul-linux-x86-xlibs )
-	acpi? (
-		x11-apps/xauth
-		sys-power/acpid
-	)
-	x11-libs/libXrandr
-	>=sys-apps/portage-2.1.1-r1"
-
-DEPEND="${RDEPEND}
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto"
-
-EMULTILIB_PKG="true"
-
-QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so
-	usr/lib/opengl/ati/lib/libGL.so.1.2
-	opt/bin/amdcccle"
-QA_EXECSTACK_amd64="usr/lib64/dri/fglrx_dri.so
-	usr/lib32/dri/fglrx_dri.so
-	usr/lib64/opengl/ati/lib/libGL.so.1.2
-	usr/lib32/opengl/ati/lib/libGL.so.1.2
-	opt/bin/amdcccle"
-QA_TEXTRELS_x86="usr/lib/dri/fglrx_dri.so
-	usr/lib/xorg/modules/drivers/fglrx_drv.so
-	usr/lib/opengl/ati/lib/libGL.so.1.2
-	usr/lib/xorg/modules/glesx.so"
-QA_TEXTRELS_amd64="
-	usr/lib64/opengl/ati/lib/libGL.so.1.2
-	usr/lib32/opengl/ati/lib/libGL.so.1.2
-	usr/lib64/dri/fglrx_dri.so
-	usr/lib32/dri/fglrx_dri.so
-	usr/lib32/xorg/modules/glesx.so
-	usr/lib64/xorg/modules/glesx.so"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-
-	# Define module dir.
-	MODULE_DIR="${S}/common/lib/modules/fglrx/build_mod"
-
-	#check kernel and sets up KV_OBJ
-	MODULE_NAMES="fglrx(video:${S}/common/lib/modules/fglrx/build_mod/2.6.x)"
-	BUILD_TARGETS="kmod_build"
-	linux-mod_pkg_setup
-	BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}"
-
-	if ! kernel_is 2 6; then
-		eerror "Need a 2.6 kernel to compile against!"
-		die "Need a 2.6 kernel to compile against!"
-	fi
-
-	if kernel_is ge 2 6 24 && ! linux_chkconfig_present PCI_LEGACY; then
-		eerror "${P} requires support for pci_find_slot."
-		die "${P} requires support for pci_find_slot."
-	fi
-
-	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 "You need AGP and/or PCI Express support for direct rendering to work."
-	fi
-
-	if linux_chkconfig_present PARAVIRT; then
-		eerror "The current ati-drivers don't compile when having"
-		eerror "paravirtualization active due to GPL symbol export"
-		eerror "restrictions."
-		eerror "Please disable it:"
-		eerror "	CONFIG_PARAVIRT=n"
-		eerror "in /usr/src/linux/.config or"
-		eerror "	Processor type and features -->"
-		eerror "		[ ] Paravirtualization support (EXPERIMENTAL)"
-		eerror "in 'menuconfig'"
-		die "CONFIG_PARAVIRT enabled"
-	fi
-
-	# Only support xorg-server >=1.1
-	BASE_DIR="${S}/x710"
-
-	# This is used like $(get_libdir) for paths in ati's package.
-	if use amd64 ; then
-		BASE_DIR="${BASE_DIR}_64a"
-		PKG_LIBDIR=lib64
-		ARCH_DIR="${S}/arch/x86_64"
-	else
-		PKG_LIBDIR=lib
-		ARCH_DIR="${S}/arch/x86"
-	fi
-}
-
-src_unpack() {
-	#Switching to a standard way to extract the files since otherwise no signature file
-	#would be created
-	local src="${DISTDIR}/${A}"
-	sh "${src}" --extract "${S}"  2&>1 /dev/null
-
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/{fgl_glxgears,fglrx_xgamma} \
-		"${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \
-		|| die "bin rm failed"
-
-	if use debug; then
-		# Enable debug mode in the Source Code.
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	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/" \
-			"${S}/common/etc/ati/authatieventsd.sh" \
-			|| die "sed failed."
-
-		# Since "who" is in coreutils, we're using that one instead of "finger".
-		sed -i -e 's:finger:who:' \
-			"${S}/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-			|| die "Replacing 'finger' with 'who' failed."
-		# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-		# add funktion to detect default state.
-		epatch "${FILESDIR}"/${PV}/ati-powermode-opt-path-2.patch
-	fi
-
-	pushd ${MODULE_DIR} >/dev/null
-	ln -s "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
-		|| die "symlinking precompiled core failed"
-
-	convert_to_m 2.6.x/Makefile || die "convert_to_m failed"
-
-	# When built with ati's make.sh it defines a bunch of macros if
-	# certain .config values are set, falling back to less reliable
-	# detection methods if linux/autoconf.h is not available. We
-	# simply use the linux/autoconf.h settings directly, bypassing the
-	# detection script.
-	sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
-	sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
-		|| die "MODVERSIONS sed failed"
-	popd >/dev/null
-
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../common/usr/src/ati/fglrx_sample_source.tgz
-	sed -i -e 's:include/extensions/extutil.h:X11/extensions/extutil.h:' \
-		lib/fglrx_gamma/fglrx_gamma.c || die "include fixup failed"
-	# Add a category.
-	mv programs/fglrx_gamma/fglrx_xgamma.{man,1} || die "man mv failed"
-	cd ..
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	einfo "Building fgl_glxgears"
-	cd "${S}"/extra/fgl_glxgears
-	# These extra libs/utils either have an Imakefile that does not
-	# work very well without tweaking or a Makefile ignoring CFLAGS
-	# and the like. We bypass those.
-
-	# The -DUSE_GLU is needed to compile using nvidia headers
-	# according to a comment in ati-drivers-extra-8.33.6.ebuild.
-	"$(tc-getCC)" -o fgl_fglxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
-		-I"${S}"/common/usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-
-	einfo "Building fglrx_gamma lib"
-	cd "${S}"/extra/lib/fglrx_gamma
-	"$(tc-getCC)" -shared -fpic -o libfglrx_gamma.so.1.0 ${CFLAGS} ${LDFLAGS} \
-		-DXF86MISC -Wl,-soname,libfglrx_gamma.so.1.0 fglrx_gamma.c \
-		-lXext || die "fglrx_gamma lib build failed"
-	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so || die "ln failed"
-	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so.1 || die "ln failed"
-
-	einfo "Building fglrx_gamma util"
-	cd "${S}"/extra/programs/fglrx_gamma
-	"$(tc-getCC)" -o fglrx_xgamma ${CFLAGS} ${LDFLAGS} \
-		-I../../../common/usr/X11R6/include -L../../lib/fglrx_gamma \
-		fglrx_xgamma.c -lm -lfglrx_gamma -lX11 \
-		|| die "fglrx_gamma util build failed"
-
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# We can do two things here, and neither of them is very nice.
-
-	# For direct rendering libGL has to be able to load one or more
-	# dri modules (files ending in _dri.so, like fglrx_dri.so).
-	# Gentoo's mesa looks for these files in the location specified by
-	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
-	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
-	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
-	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
-	# 64bit. So we can either put the .so files in that (unusual,
-	# compared to "normal" mesa libGL) location or set
-	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
-	# 101539.
-
-	# The problem with this approach is that LIBGL_DRIVERS_PATH
-	# *overrides* the default hardcoded location, it does not extend
-	# it. So if ati-drivers is merged but a non-ati libGL is selected
-	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
-	# (because it changed in a newer mesa or because it was compiled
-	# for a different set of multilib abis than we are) stuff breaks.
-
-	# We create one file per ABI to work with "native" multilib, see
-	# below.
-
-	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
-	doenvd "${T}/03ati-colon-sep"
-
-	# All libraries that we have a 32 bit and 64 bit version of on
-	# amd64 are installed in src_install-libs. Everything else
-	# (including libraries only available in native 64bit on amd64)
-	# goes in here.
-
-	# There used to be some code here that tried to detect running
-	# under a "native multilib" portage ((precursor of)
-	# http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it
-	# should just work (only doing some duplicate work). --marienz
-	if has_multilib_profile; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	# This is sorted by the order the files occur in the source tree.
-
-	# X modules.
-	exeinto /usr/$(get_libdir)/xorg/modules/drivers
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
-	exeinto /usr/$(get_libdir)/xorg/modules/linux
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
-	exeinto /usr/$(get_libdir)/xorg/modules
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{esut.a,glesx.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	if use acpi; then
-		dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	fi
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -name '*.so*' -not -name 'libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins common/etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	if use acpi; then
-		doins common/etc/ati/authatieventsd.sh
-	fi
-
-	# include.
-	insinto /usr
-	doins -r common/usr/include
-	insinto /usr/include/X11/extensions
-	doins common/usr/X11R6/include/X11/extensions/fglrx_gamma.h
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin common/usr/sbin/*
-
-	# data files for the control panel.
-	insinto /usr/share
-	doins -r common/usr/share/ati
-	insinto /usr/share/pixmaps
-	doins common/usr/share/icons/ccc_{large,small}.xpm
-	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
-		ccc_large System
-
-	# doc.
-	dohtml -r common/usr/share/doc/fglrx
-
-	if use acpi; then
-		doman common/usr/share/man/man8/atieventsd.8
-
-		pushd common/usr/share/doc/fglrx/examples/etc/acpi >/dev/null
-
-		exeinto /etc/acpi
-		doexe ati-powermode.sh
-		insinto /etc/acpi/events
-		doins events/*
-
-		popd >/dev/null
-	fi
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_fglxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	dolib extra/lib/fglrx_gamma/*so*
-	newdoc extra/lib/fglrx_gamma/README README.libfglrx_gamma
-
-	dobin extra/programs/fglrx_gamma/fglrx_xgamma
-	doman extra/programs/fglrx_gamma/fglrx_xgamma.1
-	newdoc extra/programs/fglrx_gamma/README README.fglrx_gamma
-
-	# Gentoo-specific stuff:
-	if use acpi; then
-		newinitd "${FILESDIR}"/atieventsd.init atieventsd \
-			|| die "Failed to install atieventsd.init.d"
-		echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-		newconfd "${T}"/atieventsd.conf atieventsd
-	fi
-}
-
-src_install-libs() {
-	if [[ "${ABI}" == "amd64" ]]; then
-		local pkglibdir=lib64
-		local MY_ARCH_DIR="${S}/arch/x86_64"
-	else
-		local pkglibdir=lib
-		local MY_ARCH_DIR="${S}/arch/x86"
-	fi
-	einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
-
-	local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
-	# To make sure we do not miss a spot when these change.
-	local libmajor=1 libminor=2
-	local libver=${libmajor}.${libminor}
-
-	# The GLX libraries
-	# (yes, this really is "lib" even on amd64/multilib --marienz)
-	exeinto ${ATI_ROOT}/lib
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/libGL.so.${libver}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
-
-	# Same as the xorg implementation (eselect opengl does not fall
-	# back to xorg-x11 if we omit this symlink, meaning no glx).
-	dosym ../xorg-x11/extensions ${ATI_ROOT}/extensions
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# Make up a libGL.la. Ati does not provide one, but mesa does. If
-	# a (libtool-based) libfoo is built with libGL.la present a
-	# reference to it is put into libfoo.la, and compiling
-	# (libtool-based) things that link too libfoo.la will complain if
-	# libGL.la disappears. So if we do not make up a libGL.la
-	# switching between mesa and ati becomes painful.
-	local revision=$(printf '%d%02d%02d' $(get_version_components))
-	sed -e "s:\${libmajor}:${libmajor}:g" \
-		-e "s:\${libminor}:${libminor}:g" \
-		-e "s:\${libdir}:$(get_libdir):g" \
-		-e "s:\${revision}:${revision}:g" \
-		"${FILESDIR}"/libGL.la.in > "${D}"/${ATI_ROOT}/lib/libGL.la \
-		|| die "sed failed to make libGL.la"
-
-	local envname="${T}"/04ati-dri-path
-	if [[ -n ${ABI} ]]; then
-		envname="${envname}-${ABI}"
-	fi
-	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
-	doenvd "${envname}"
-}
-
-pkg_postinst() {
-	/usr/bin/eselect opengl set --use-old ati
-
-	elog "To switch to ATI OpenGL, run \"eselect opengl set ati\""
-	elog "To change your xorg.conf you can use the bundled \"aticonfig\""
-	elog
-	elog "If you experience unexplained segmentation faults and kernel crashes"
-	elog "with this driver and multi-threaded applications such as wine,"
-	elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
-	elog
-	elog "You will have to source /etc/profile (or logout and back in) for dri"
-	elog "to work, unless you previously had ati-drivers installed."
-
-	# Workaroud screen corruption
-	ewarn "If you experience screen corruption with this driver, try putting"
-	ewarn '         Option "XAANoOffscreenPixmaps" "true"'
-	ewarn "in the Device Section of /etc/X11/xorg.conf."
-
-	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.512.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.512.ebuild
deleted file mode 100644
index 8ca478feaf9c..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.512.ebuild
+++ /dev/null
@@ -1,437 +0,0 @@
-# Copyright 1999-2008 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.512.ebuild,v 1.2 2008/09/09 10:14:45 b33fc0d3 Exp $
-
-IUSE="acpi debug"
-
-inherit eutils multilib linux-mod toolchain-funcs versionator
-
-DESCRIPTION="Ati precompiled drivers for recent 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-8-7-x86.x86_64.run"
-
-LICENSE="AMD GPL-2 QPL-1.0 as-is"
-KEYWORDS="~amd64 ~x86"
-
-# The portage dep is for COLON_SEPARATED support in env-update.
-# The eselect dep (>=1.0.9) is for COLON_SEPARATED in eselect env update.
-RDEPEND="x11-base/xorg-server
-	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-1.0.9
-	app-admin/eselect-opengl
-	amd64? ( app-emulation/emul-linux-x86-xlibs )
-	acpi? (
-		x11-apps/xauth
-		sys-power/acpid
-	)
-	x11-libs/libXrandr
-	>=sys-apps/portage-2.1.1-r1"
-
-DEPEND="${RDEPEND}
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/inputproto"
-
-EMULTILIB_PKG="true"
-
-QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so
-	usr/lib/opengl/ati/lib/libGL.so.1.2
-	opt/bin/amdcccle"
-QA_EXECSTACK_amd64="usr/lib64/dri/fglrx_dri.so
-	usr/lib32/dri/fglrx_dri.so
-	usr/lib64/opengl/ati/lib/libGL.so.1.2
-	usr/lib32/opengl/ati/lib/libGL.so.1.2
-	opt/bin/amdcccle"
-QA_TEXTRELS_x86="usr/lib/dri/fglrx_dri.so
-	usr/lib/xorg/modules/drivers/fglrx_drv.so
-	usr/lib/opengl/ati/lib/libGL.so.1.2
-	usr/lib/xorg/modules/glesx.so
-	usr/lib/xorg/modules/amdxmm.so"
-QA_TEXTRELS_amd64="
-	usr/lib64/opengl/ati/lib/libGL.so.1.2
-	usr/lib32/opengl/ati/lib/libGL.so.1.2
-	usr/lib64/dri/fglrx_dri.so
-	usr/lib32/dri/fglrx_dri.so
-	usr/lib32/xorg/modules/glesx.so
-	usr/lib64/xorg/modules/glesx.so"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-
-	# Define module dir.
-	MODULE_DIR="${S}/common/lib/modules/fglrx/build_mod"
-
-	#check kernel and sets up KV_OBJ
-	MODULE_NAMES="fglrx(video:${S}/common/lib/modules/fglrx/build_mod/2.6.x)"
-	BUILD_TARGETS="kmod_build"
-	linux-mod_pkg_setup
-	BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}"
-
-	if ! kernel_is 2 6; then
-		eerror "Need a 2.6 kernel to compile against!"
-		die "Need a 2.6 kernel to compile against!"
-	fi
-
-	if kernel_is ge 2 6 25 && linux_chkconfig_present PREEMPT_RCU; then
-		die "${P} is not compatible with RCU Preemption (bug #223281), please disable it"
-	fi
-
-	if kernel_is ge 2 6 24 && ! linux_chkconfig_present PCI_LEGACY; then
-		eerror "${P} requires support for pci_find_slot."
-		die "${P} requires support for pci_find_slot."
-	fi
-
-	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 "You need AGP and/or PCI Express support for direct rendering to work."
-	fi
-
-	if linux_chkconfig_present PARAVIRT; then
-		eerror "The current ati-drivers don't compile when having"
-		eerror "paravirtualization active due to GPL symbol export"
-		eerror "restrictions."
-		eerror "Please disable it:"
-		eerror "	CONFIG_PARAVIRT=n"
-		eerror "in /usr/src/linux/.config or"
-		eerror "	Processor type and features -->"
-		eerror "		[ ] Paravirtualization support (EXPERIMENTAL)"
-		eerror "in 'menuconfig'"
-		die "CONFIG_PARAVIRT enabled"
-	fi
-
-	# Only support xorg-server >=1.1
-	BASE_DIR="${S}/x710"
-
-	# This is used like $(get_libdir) for paths in ati's package.
-	if use amd64 ; then
-		BASE_DIR="${BASE_DIR}_64a"
-		PKG_LIBDIR=lib64
-		ARCH_DIR="${S}/arch/x86_64"
-	else
-		PKG_LIBDIR=lib
-		ARCH_DIR="${S}/arch/x86"
-	fi
-}
-
-src_unpack() {
-	#Switching to a standard way to extract the files since otherwise no signature file
-	#would be created
-	local src="${DISTDIR}/${A}"
-	sh "${src}" --extract "${S}"  2&>1 /dev/null
-
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/{fgl_glxgears,fglrx_xgamma} \
-		"${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \
-		|| die "bin rm failed"
-
-	if use debug; then
-		# Enable debug mode in the Source Code.
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	if use acpi; then
-		sed -i \
-			-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-			-e "s:/var/lib/gdm/:/var/gdm/:" \
-			"${S}/common/etc/ati/authatieventsd.sh" \
-			|| die "sed failed."
-
-		# Since "who" is in coreutils, we're using that one instead of "finger".
-		sed -i -e 's:finger:who:' \
-			"${S}/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-			|| die "Replacing 'finger' with 'who' failed."
-		# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-		# add funktion to detect default state.
-		epatch "${FILESDIR}"/8.476/ati-powermode-opt-path-2.patch
-	fi
-
-	pushd ${MODULE_DIR} >/dev/null
-	ln -s "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
-		|| die "symlinking precompiled core failed"
-
-	convert_to_m 2.6.x/Makefile || die "convert_to_m failed"
-
-	# When built with ati's make.sh it defines a bunch of macros if
-	# certain .config values are set, falling back to less reliable
-	# detection methods if linux/autoconf.h is not available. We
-	# simply use the linux/autoconf.h settings directly, bypassing the
-	# detection script.
-	sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
-	sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
-		|| die "MODVERSIONS sed failed"
-	popd >/dev/null
-
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../common/usr/src/ati/fglrx_sample_source.tgz
-	sed -i -e 's:include/extensions/extutil.h:X11/extensions/extutil.h:' \
-		lib/fglrx_gamma/fglrx_gamma.c || die "include fixup failed"
-	# Add a category.
-	mv programs/fglrx_gamma/fglrx_xgamma.{man,1} || die "man mv failed"
-	cd ..
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	einfo "Building fgl_glxgears"
-	cd "${S}"/extra/fgl_glxgears
-	# These extra libs/utils either have an Imakefile that does not
-	# work very well without tweaking or a Makefile ignoring CFLAGS
-	# and the like. We bypass those.
-
-	# The -DUSE_GLU is needed to compile using nvidia headers
-	# according to a comment in ati-drivers-extra-8.33.6.ebuild.
-	"$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
-		-I"${S}"/common/usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-
-	einfo "Building fglrx_gamma lib"
-	cd "${S}"/extra/lib/fglrx_gamma
-	"$(tc-getCC)" -shared -fpic -o libfglrx_gamma.so.1.0 ${CFLAGS} ${LDFLAGS} \
-		-DXF86MISC -Wl,-soname,libfglrx_gamma.so.1.0 fglrx_gamma.c \
-		-lXext || die "fglrx_gamma lib build failed"
-	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so || die "ln failed"
-	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so.1 || die "ln failed"
-
-	einfo "Building fglrx_gamma util"
-	cd "${S}"/extra/programs/fglrx_gamma
-	"$(tc-getCC)" -o fglrx_xgamma ${CFLAGS} ${LDFLAGS} \
-		-I../../../common/usr/X11R6/include -L../../lib/fglrx_gamma \
-		fglrx_xgamma.c -lm -lfglrx_gamma -lX11 \
-		|| die "fglrx_gamma util build failed"
-
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# We can do two things here, and neither of them is very nice.
-
-	# For direct rendering libGL has to be able to load one or more
-	# dri modules (files ending in _dri.so, like fglrx_dri.so).
-	# Gentoo's mesa looks for these files in the location specified by
-	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
-	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
-	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
-	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
-	# 64bit. So we can either put the .so files in that (unusual,
-	# compared to "normal" mesa libGL) location or set
-	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
-	# 101539.
-
-	# The problem with this approach is that LIBGL_DRIVERS_PATH
-	# *overrides* the default hardcoded location, it does not extend
-	# it. So if ati-drivers is merged but a non-ati libGL is selected
-	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
-	# (because it changed in a newer mesa or because it was compiled
-	# for a different set of multilib abis than we are) stuff breaks.
-
-	# We create one file per ABI to work with "native" multilib, see
-	# below.
-
-	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
-	doenvd "${T}/03ati-colon-sep"
-
-	# All libraries that we have a 32 bit and 64 bit version of on
-	# amd64 are installed in src_install-libs. Everything else
-	# (including libraries only available in native 64bit on amd64)
-	# goes in here.
-
-	# There used to be some code here that tried to detect running
-	# under a "native multilib" portage ((precursor of)
-	# http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it
-	# should just work (only doing some duplicate work). --marienz
-	if has_multilib_profile; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	# This is sorted by the order the files occur in the source tree.
-
-	# X modules.
-	exeinto /usr/$(get_libdir)/xorg/modules/drivers
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
-	exeinto /usr/$(get_libdir)/xorg/modules/linux
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
-	exeinto /usr/$(get_libdir)/xorg/modules
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{esut.a,glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	if use acpi; then
-		dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	fi
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -name '*.so*' -not -name 'libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins common/etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	if use acpi; then
-		doins common/etc/ati/authatieventsd.sh
-	fi
-
-	# include.
-	insinto /usr
-	doins -r common/usr/include
-	insinto /usr/include/X11/extensions
-	doins common/usr/X11R6/include/X11/extensions/fglrx_gamma.h
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin common/usr/sbin/*
-
-	# data files for the control panel.
-	insinto /usr/share
-	doins -r common/usr/share/ati
-	insinto /usr/share/pixmaps
-	doins common/usr/share/icons/ccc_{large,small}.xpm
-	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
-		ccc_large System
-
-	# doc.
-	dohtml -r common/usr/share/doc/fglrx
-
-	if use acpi; then
-		doman common/usr/share/man/man8/atieventsd.8
-
-		pushd common/usr/share/doc/fglrx/examples/etc/acpi >/dev/null
-
-		exeinto /etc/acpi
-		doexe ati-powermode.sh
-		insinto /etc/acpi/events
-		doins events/*
-
-		popd >/dev/null
-	fi
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	dolib extra/lib/fglrx_gamma/*so*
-	newdoc extra/lib/fglrx_gamma/README README.libfglrx_gamma
-
-	dobin extra/programs/fglrx_gamma/fglrx_xgamma
-	doman extra/programs/fglrx_gamma/fglrx_xgamma.1
-	newdoc extra/programs/fglrx_gamma/README README.fglrx_gamma
-
-	# Gentoo-specific stuff:
-	if use acpi; then
-		newinitd "${FILESDIR}"/atieventsd.init atieventsd \
-			|| die "Failed to install atieventsd.init.d"
-		echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-		newconfd "${T}"/atieventsd.conf atieventsd
-	fi
-}
-
-src_install-libs() {
-	if [[ "${ABI}" == "amd64" ]]; then
-		local pkglibdir=lib64
-		local MY_ARCH_DIR="${S}/arch/x86_64"
-	else
-		local pkglibdir=lib
-		local MY_ARCH_DIR="${S}/arch/x86"
-	fi
-	einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
-
-	local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
-	# To make sure we do not miss a spot when these change.
-	local libmajor=1 libminor=2
-	local libver=${libmajor}.${libminor}
-
-	# The GLX libraries
-	# (yes, this really is "lib" even on amd64/multilib --marienz)
-	exeinto ${ATI_ROOT}/lib
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/libGL.so.${libver}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
-
-	# Same as the xorg implementation (eselect opengl does not fall
-	# back to xorg-x11 if we omit this symlink, meaning no glx).
-	dosym ../xorg-x11/extensions ${ATI_ROOT}/extensions
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# Make up a libGL.la. Ati does not provide one, but mesa does. If
-	# a (libtool-based) libfoo is built with libGL.la present a
-	# reference to it is put into libfoo.la, and compiling
-	# (libtool-based) things that link too libfoo.la will complain if
-	# libGL.la disappears. So if we do not make up a libGL.la
-	# switching between mesa and ati becomes painful.
-	local revision=$(printf '%d%02d%02d' $(get_version_components))
-	sed -e "s:\${libmajor}:${libmajor}:g" \
-		-e "s:\${libminor}:${libminor}:g" \
-		-e "s:\${libdir}:$(get_libdir):g" \
-		-e "s:\${revision}:${revision}:g" \
-		"${FILESDIR}"/libGL.la.in > "${D}"/${ATI_ROOT}/lib/libGL.la \
-		|| die "sed failed to make libGL.la"
-
-	local envname="${T}"/04ati-dri-path
-	if [[ -n ${ABI} ]]; then
-		envname="${envname}-${ABI}"
-	fi
-	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
-	doenvd "${envname}"
-}
-
-pkg_postinst() {
-	/usr/bin/eselect opengl set --use-old ati
-
-	elog "To switch to ATI OpenGL, run \"eselect opengl set ati\""
-	elog "To change your xorg.conf you can use the bundled \"aticonfig\""
-	elog
-	elog "If you experience unexplained segmentation faults and kernel crashes"
-	elog "with this driver and multi-threaded applications such as wine,"
-	elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
-	elog
-	elog "You will have to source /etc/profile (or logout and back in) for dri"
-	elog "to work, unless you previously had ati-drivers installed."
-
-	# Workaroud screen corruption
-	ewarn "If you experience screen corruption with this driver, try putting"
-	ewarn '         Option "XAANoOffscreenPixmaps" "true"'
-	ewarn "in the Device Section of /etc/X11/xorg.conf."
-
-	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.522.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.522.ebuild
deleted file mode 100644
index bdc6cf8ebb89..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.522.ebuild
+++ /dev/null
@@ -1,437 +0,0 @@
-# Copyright 1999-2008 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.522.ebuild,v 1.2 2008/09/09 10:14:45 b33fc0d3 Exp $
-
-IUSE="acpi debug"
-
-inherit eutils multilib linux-mod toolchain-funcs versionator
-
-DESCRIPTION="Ati precompiled drivers for recent 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-8-8-x86.x86_64.run"
-
-LICENSE="AMD GPL-2 QPL-1.0 as-is"
-KEYWORDS="~amd64 ~x86"
-
-# The portage dep is for COLON_SEPARATED support in env-update.
-# The eselect dep (>=1.0.9) is for COLON_SEPARATED in eselect env update.
-RDEPEND="x11-base/xorg-server
-	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-1.0.9
-	app-admin/eselect-opengl
-	amd64? ( app-emulation/emul-linux-x86-xlibs )
-	acpi? (
-		x11-apps/xauth
-		sys-power/acpid
-	)
-	x11-libs/libXrandr
-	>=sys-apps/portage-2.1.1-r1"
-
-DEPEND="${RDEPEND}
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/inputproto"
-
-EMULTILIB_PKG="true"
-
-QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so
-	usr/lib/opengl/ati/lib/libGL.so.1.2
-	opt/bin/amdcccle"
-QA_EXECSTACK_amd64="usr/lib64/dri/fglrx_dri.so
-	usr/lib32/dri/fglrx_dri.so
-	usr/lib64/opengl/ati/lib/libGL.so.1.2
-	usr/lib32/opengl/ati/lib/libGL.so.1.2
-	opt/bin/amdcccle"
-QA_TEXTRELS_x86="usr/lib/dri/fglrx_dri.so
-	usr/lib/xorg/modules/drivers/fglrx_drv.so
-	usr/lib/opengl/ati/lib/libGL.so.1.2
-	usr/lib/xorg/modules/glesx.so
-	usr/lib/xorg/modules/amdxmm.so"
-QA_TEXTRELS_amd64="
-	usr/lib64/opengl/ati/lib/libGL.so.1.2
-	usr/lib32/opengl/ati/lib/libGL.so.1.2
-	usr/lib64/dri/fglrx_dri.so
-	usr/lib32/dri/fglrx_dri.so
-	usr/lib32/xorg/modules/glesx.so
-	usr/lib64/xorg/modules/glesx.so"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-
-	# Define module dir.
-	MODULE_DIR="${S}/common/lib/modules/fglrx/build_mod"
-
-	#check kernel and sets up KV_OBJ
-	MODULE_NAMES="fglrx(video:${S}/common/lib/modules/fglrx/build_mod/2.6.x)"
-	BUILD_TARGETS="kmod_build"
-	linux-mod_pkg_setup
-	BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}"
-
-	if ! kernel_is 2 6; then
-		eerror "Need a 2.6 kernel to compile against!"
-		die "Need a 2.6 kernel to compile against!"
-	fi
-
-	if kernel_is ge 2 6 25 && linux_chkconfig_present PREEMPT_RCU; then
-		die "${P} is not compatible with RCU Preemption (bug #223281), please disable it"
-	fi
-
-	if kernel_is ge 2 6 24 && ! linux_chkconfig_present PCI_LEGACY; then
-		eerror "${P} requires support for pci_find_slot."
-		die "${P} requires support for pci_find_slot."
-	fi
-
-	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 "You need AGP and/or PCI Express support for direct rendering to work."
-	fi
-
-	if linux_chkconfig_present PARAVIRT; then
-		eerror "The current ati-drivers don't compile when having"
-		eerror "paravirtualization active due to GPL symbol export"
-		eerror "restrictions."
-		eerror "Please disable it:"
-		eerror "	CONFIG_PARAVIRT=n"
-		eerror "in /usr/src/linux/.config or"
-		eerror "	Processor type and features -->"
-		eerror "		[ ] Paravirtualization support (EXPERIMENTAL)"
-		eerror "in 'menuconfig'"
-		die "CONFIG_PARAVIRT enabled"
-	fi
-
-	# Only support xorg-server >=1.1
-	BASE_DIR="${S}/x710"
-
-	# This is used like $(get_libdir) for paths in ati's package.
-	if use amd64 ; then
-		BASE_DIR="${BASE_DIR}_64a"
-		PKG_LIBDIR=lib64
-		ARCH_DIR="${S}/arch/x86_64"
-	else
-		PKG_LIBDIR=lib
-		ARCH_DIR="${S}/arch/x86"
-	fi
-}
-
-src_unpack() {
-	#Switching to a standard way to extract the files since otherwise no signature file
-	#would be created
-	local src="${DISTDIR}/${A}"
-	sh "${src}" --extract "${S}"  2&>1 /dev/null
-
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/{fgl_glxgears,fglrx_xgamma} \
-		"${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \
-		|| die "bin rm failed"
-
-	if use debug; then
-		# Enable debug mode in the Source Code.
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	if use acpi; then
-		sed -i \
-			-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-			-e "s:/var/lib/gdm/:/var/gdm/:" \
-			"${S}/common/etc/ati/authatieventsd.sh" \
-			|| die "sed failed."
-
-		# Since "who" is in coreutils, we're using that one instead of "finger".
-		sed -i -e 's:finger:who:' \
-			"${S}/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-			|| die "Replacing 'finger' with 'who' failed."
-		# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-		# add funktion to detect default state.
-		epatch "${FILESDIR}"/8.476/ati-powermode-opt-path-2.patch
-	fi
-
-	pushd ${MODULE_DIR} >/dev/null
-	ln -s "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
-		|| die "symlinking precompiled core failed"
-
-	convert_to_m 2.6.x/Makefile || die "convert_to_m failed"
-
-	# When built with ati's make.sh it defines a bunch of macros if
-	# certain .config values are set, falling back to less reliable
-	# detection methods if linux/autoconf.h is not available. We
-	# simply use the linux/autoconf.h settings directly, bypassing the
-	# detection script.
-	sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
-	sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
-		|| die "MODVERSIONS sed failed"
-	popd >/dev/null
-
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../common/usr/src/ati/fglrx_sample_source.tgz
-	sed -i -e 's:include/extensions/extutil.h:X11/extensions/extutil.h:' \
-		lib/fglrx_gamma/fglrx_gamma.c || die "include fixup failed"
-	# Add a category.
-	mv programs/fglrx_gamma/fglrx_xgamma.{man,1} || die "man mv failed"
-	cd ..
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	einfo "Building fgl_glxgears"
-	cd "${S}"/extra/fgl_glxgears
-	# These extra libs/utils either have an Imakefile that does not
-	# work very well without tweaking or a Makefile ignoring CFLAGS
-	# and the like. We bypass those.
-
-	# The -DUSE_GLU is needed to compile using nvidia headers
-	# according to a comment in ati-drivers-extra-8.33.6.ebuild.
-	"$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
-		-I"${S}"/common/usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-
-	einfo "Building fglrx_gamma lib"
-	cd "${S}"/extra/lib/fglrx_gamma
-	"$(tc-getCC)" -shared -fpic -o libfglrx_gamma.so.1.0 ${CFLAGS} ${LDFLAGS} \
-		-DXF86MISC -Wl,-soname,libfglrx_gamma.so.1.0 fglrx_gamma.c \
-		-lXext || die "fglrx_gamma lib build failed"
-	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so || die "ln failed"
-	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so.1 || die "ln failed"
-
-	einfo "Building fglrx_gamma util"
-	cd "${S}"/extra/programs/fglrx_gamma
-	"$(tc-getCC)" -o fglrx_xgamma ${CFLAGS} ${LDFLAGS} \
-		-I../../../common/usr/X11R6/include -L../../lib/fglrx_gamma \
-		fglrx_xgamma.c -lm -lfglrx_gamma -lX11 \
-		|| die "fglrx_gamma util build failed"
-
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# We can do two things here, and neither of them is very nice.
-
-	# For direct rendering libGL has to be able to load one or more
-	# dri modules (files ending in _dri.so, like fglrx_dri.so).
-	# Gentoo's mesa looks for these files in the location specified by
-	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
-	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
-	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
-	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
-	# 64bit. So we can either put the .so files in that (unusual,
-	# compared to "normal" mesa libGL) location or set
-	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
-	# 101539.
-
-	# The problem with this approach is that LIBGL_DRIVERS_PATH
-	# *overrides* the default hardcoded location, it does not extend
-	# it. So if ati-drivers is merged but a non-ati libGL is selected
-	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
-	# (because it changed in a newer mesa or because it was compiled
-	# for a different set of multilib abis than we are) stuff breaks.
-
-	# We create one file per ABI to work with "native" multilib, see
-	# below.
-
-	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
-	doenvd "${T}/03ati-colon-sep"
-
-	# All libraries that we have a 32 bit and 64 bit version of on
-	# amd64 are installed in src_install-libs. Everything else
-	# (including libraries only available in native 64bit on amd64)
-	# goes in here.
-
-	# There used to be some code here that tried to detect running
-	# under a "native multilib" portage ((precursor of)
-	# http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it
-	# should just work (only doing some duplicate work). --marienz
-	if has_multilib_profile; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	# This is sorted by the order the files occur in the source tree.
-
-	# X modules.
-	exeinto /usr/$(get_libdir)/xorg/modules/drivers
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
-	exeinto /usr/$(get_libdir)/xorg/modules/linux
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
-	exeinto /usr/$(get_libdir)/xorg/modules
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{esut.a,glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	if use acpi; then
-		dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	fi
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -name '*.so*' -not -name 'libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins common/etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	if use acpi; then
-		doins common/etc/ati/authatieventsd.sh
-	fi
-
-	# include.
-	insinto /usr
-	doins -r common/usr/include
-	insinto /usr/include/X11/extensions
-	doins common/usr/X11R6/include/X11/extensions/fglrx_gamma.h
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin common/usr/sbin/*
-
-	# data files for the control panel.
-	insinto /usr/share
-	doins -r common/usr/share/ati
-	insinto /usr/share/pixmaps
-	doins common/usr/share/icons/ccc_{large,small}.xpm
-	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
-		ccc_large System
-
-	# doc.
-	dohtml -r common/usr/share/doc/fglrx
-
-	if use acpi; then
-		doman common/usr/share/man/man8/atieventsd.8
-
-		pushd common/usr/share/doc/fglrx/examples/etc/acpi >/dev/null
-
-		exeinto /etc/acpi
-		doexe ati-powermode.sh
-		insinto /etc/acpi/events
-		doins events/*
-
-		popd >/dev/null
-	fi
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	dolib extra/lib/fglrx_gamma/*so*
-	newdoc extra/lib/fglrx_gamma/README README.libfglrx_gamma
-
-	dobin extra/programs/fglrx_gamma/fglrx_xgamma
-	doman extra/programs/fglrx_gamma/fglrx_xgamma.1
-	newdoc extra/programs/fglrx_gamma/README README.fglrx_gamma
-
-	# Gentoo-specific stuff:
-	if use acpi; then
-		newinitd "${FILESDIR}"/atieventsd.init atieventsd \
-			|| die "Failed to install atieventsd.init.d"
-		echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-		newconfd "${T}"/atieventsd.conf atieventsd
-	fi
-}
-
-src_install-libs() {
-	if [[ "${ABI}" == "amd64" ]]; then
-		local pkglibdir=lib64
-		local MY_ARCH_DIR="${S}/arch/x86_64"
-	else
-		local pkglibdir=lib
-		local MY_ARCH_DIR="${S}/arch/x86"
-	fi
-	einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
-
-	local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
-	# To make sure we do not miss a spot when these change.
-	local libmajor=1 libminor=2
-	local libver=${libmajor}.${libminor}
-
-	# The GLX libraries
-	# (yes, this really is "lib" even on amd64/multilib --marienz)
-	exeinto ${ATI_ROOT}/lib
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/libGL.so.${libver}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
-
-	# Same as the xorg implementation (eselect opengl does not fall
-	# back to xorg-x11 if we omit this symlink, meaning no glx).
-	dosym ../xorg-x11/extensions ${ATI_ROOT}/extensions
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# Make up a libGL.la. Ati does not provide one, but mesa does. If
-	# a (libtool-based) libfoo is built with libGL.la present a
-	# reference to it is put into libfoo.la, and compiling
-	# (libtool-based) things that link too libfoo.la will complain if
-	# libGL.la disappears. So if we do not make up a libGL.la
-	# switching between mesa and ati becomes painful.
-	local revision=$(printf '%d%02d%02d' $(get_version_components))
-	sed -e "s:\${libmajor}:${libmajor}:g" \
-		-e "s:\${libminor}:${libminor}:g" \
-		-e "s:\${libdir}:$(get_libdir):g" \
-		-e "s:\${revision}:${revision}:g" \
-		"${FILESDIR}"/libGL.la.in > "${D}"/${ATI_ROOT}/lib/libGL.la \
-		|| die "sed failed to make libGL.la"
-
-	local envname="${T}"/04ati-dri-path
-	if [[ -n ${ABI} ]]; then
-		envname="${envname}-${ABI}"
-	fi
-	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
-	doenvd "${envname}"
-}
-
-pkg_postinst() {
-	/usr/bin/eselect opengl set --use-old ati
-
-	elog "To switch to ATI OpenGL, run \"eselect opengl set ati\""
-	elog "To change your xorg.conf you can use the bundled \"aticonfig\""
-	elog
-	elog "If you experience unexplained segmentation faults and kernel crashes"
-	elog "with this driver and multi-threaded applications such as wine,"
-	elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
-	elog
-	elog "You will have to source /etc/profile (or logout and back in) for dri"
-	elog "to work, unless you previously had ati-drivers installed."
-
-	# Workaroud screen corruption
-	ewarn "If you experience screen corruption with this driver, try putting"
-	ewarn '         Option "XAANoOffscreenPixmaps" "true"'
-	ewarn "in the Device Section of /etc/X11/xorg.conf."
-
-	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.552-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.552-r1.ebuild
deleted file mode 100644
index 460ef65791cf..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.552-r1.ebuild
+++ /dev/null
@@ -1,441 +0,0 @@
-# Copyright 1999-2009 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.552-r1.ebuild,v 1.3 2009/02/03 06:25:30 je_fro Exp $
-
-IUSE="acpi debug"
-
-inherit eutils multilib linux-mod toolchain-funcs versionator
-
-DESCRIPTION="Ati precompiled drivers for recent 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-8-11-x86.x86_64.run"
-
-LICENSE="AMD GPL-2 QPL-1.0 as-is"
-KEYWORDS="~amd64 ~x86"
-
-# The portage dep is for COLON_SEPARATED support in env-update.
-# The eselect dep (>=1.0.9) is for COLON_SEPARATED in eselect env update.
-RDEPEND="x11-base/xorg-server
-	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-1.0.9
-	app-admin/eselect-opengl
-	amd64? ( app-emulation/emul-linux-x86-xlibs )
-	acpi? (
-		x11-apps/xauth
-		sys-power/acpid
-	)
-	x11-libs/libXrandr
-	>=sys-apps/portage-2.1.1-r1"
-
-DEPEND="${RDEPEND}
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/inputproto"
-
-EMULTILIB_PKG="true"
-
-QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so
-	usr/lib/opengl/ati/lib/libGL.so.1.2
-	opt/bin/amdcccle"
-QA_EXECSTACK_amd64="usr/lib64/dri/fglrx_dri.so
-	usr/lib32/dri/fglrx_dri.so
-	usr/lib64/opengl/ati/lib/libGL.so.1.2
-	usr/lib32/opengl/ati/lib/libGL.so.1.2
-	opt/bin/amdcccle"
-QA_TEXTRELS_x86="usr/lib/dri/fglrx_dri.so
-	usr/lib/xorg/modules/drivers/fglrx_drv.so
-	usr/lib/opengl/ati/lib/libGL.so.1.2
-	usr/lib/xorg/modules/glesx.so
-	usr/lib/xorg/modules/amdxmm.so"
-QA_TEXTRELS_amd64="
-	usr/lib64/opengl/ati/lib/libGL.so.1.2
-	usr/lib32/opengl/ati/lib/libGL.so.1.2
-	usr/lib64/dri/fglrx_dri.so
-	usr/lib32/dri/fglrx_dri.so
-	usr/lib32/xorg/modules/glesx.so
-	usr/lib64/xorg/modules/glesx.so"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-
-	# Define module dir.
-	MODULE_DIR="${S}/common/lib/modules/fglrx/build_mod"
-
-	#check kernel and sets up KV_OBJ
-	MODULE_NAMES="fglrx(video:${S}/common/lib/modules/fglrx/build_mod/2.6.x)"
-	BUILD_TARGETS="kmod_build"
-	linux-mod_pkg_setup
-	BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}"
-
-	if ! kernel_is 2 6; then
-		eerror "Need a 2.6 kernel to compile against!"
-		die "Need a 2.6 kernel to compile against!"
-	fi
-
-	if kernel_is ge 2 6 25 && linux_chkconfig_present PREEMPT_RCU; then
-		die "${P} is not compatible with RCU Preemption (bug #223281), please disable it"
-	fi
-
-	if kernel_is ge 2 6 26 && ! linux_chkconfig_present UNUSED_SYMBOLS; then
-			ewarn "You have to Enable unused/obsolete exported symbols in Kernel hacking section of kernel config for fglrx to load"
-	fi
-
-	if kernel_is ge 2 6 24 && ! linux_chkconfig_present PCI_LEGACY; then
-		eerror "${P} requires support for pci_find_slot."
-		die "${P} requires support for pci_find_slot."
-	fi
-
-	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 "You need AGP and/or PCI Express support for direct rendering to work."
-	fi
-
-	if linux_chkconfig_present PARAVIRT; then
-		eerror "The current ati-drivers don't compile when having"
-		eerror "paravirtualization active due to GPL symbol export"
-		eerror "restrictions."
-		eerror "Please disable it:"
-		eerror "	CONFIG_PARAVIRT=n"
-		eerror "in /usr/src/linux/.config or"
-		eerror "	Processor type and features -->"
-		eerror "		[ ] Paravirtualization support (EXPERIMENTAL)"
-		eerror "in 'menuconfig'"
-		die "CONFIG_PARAVIRT enabled"
-	fi
-
-	# Only support xorg-server >=1.1
-	BASE_DIR="${S}/x740"
-
-	# This is used like $(get_libdir) for paths in ati's package.
-	if use amd64 ; then
-		BASE_DIR="${BASE_DIR}_64a"
-		PKG_LIBDIR=lib64
-		ARCH_DIR="${S}/arch/x86_64"
-	else
-		PKG_LIBDIR=lib
-		ARCH_DIR="${S}/arch/x86"
-	fi
-}
-
-src_unpack() {
-	#Switching to a standard way to extract the files since otherwise no signature file
-	#would be created
-	local src="${DISTDIR}/${A}"
-	sh "${src}" --extract "${S}"  2&>1 /dev/null
-
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/{fgl_glxgears,fglrx_xgamma} \
-		"${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \
-		|| die "bin rm failed"
-
-	if use debug; then
-		# Enable debug mode in the Source Code.
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	if use acpi; then
-		sed -i \
-			-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-			-e "s:/var/lib/gdm/:/var/gdm/:" \
-			"${S}/common/etc/ati/authatieventsd.sh" \
-			|| die "sed failed."
-
-		# Since "who" is in coreutils, we're using that one instead of "finger".
-		sed -i -e 's:finger:who:' \
-			"${S}/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-			|| die "Replacing 'finger' with 'who' failed."
-		# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-		# add funktion to detect default state.
-		epatch "${FILESDIR}"/8.532/ati-powermode-opt-path-2.patch
-	fi
-
-	pushd ${MODULE_DIR} >/dev/null
-	ln -s "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
-		|| die "symlinking precompiled core failed"
-
-	convert_to_m 2.6.x/Makefile || die "convert_to_m failed"
-
-	# When built with ati's make.sh it defines a bunch of macros if
-	# certain .config values are set, falling back to less reliable
-	# detection methods if linux/autoconf.h is not available. We
-	# simply use the linux/autoconf.h settings directly, bypassing the
-	# detection script.
-	sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
-	sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
-		|| die "MODVERSIONS sed failed"
-	popd >/dev/null
-
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../common/usr/src/ati/fglrx_sample_source.tgz
-	sed -i -e 's:include/extensions/extutil.h:X11/extensions/extutil.h:' \
-		lib/fglrx_gamma/fglrx_gamma.c || die "include fixup failed"
-	# Add a category.
-	mv programs/fglrx_gamma/fglrx_xgamma.{man,1} || die "man mv failed"
-	cd ..
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	einfo "Building fgl_glxgears"
-	cd "${S}"/extra/fgl_glxgears
-	# These extra libs/utils either have an Imakefile that does not
-	# work very well without tweaking or a Makefile ignoring CFLAGS
-	# and the like. We bypass those.
-
-	# The -DUSE_GLU is needed to compile using nvidia headers
-	# according to a comment in ati-drivers-extra-8.33.6.ebuild.
-	"$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
-		-I"${S}"/common/usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-
-	einfo "Building fglrx_gamma lib"
-	cd "${S}"/extra/lib/fglrx_gamma
-	"$(tc-getCC)" -shared -fpic -o libfglrx_gamma.so.1.0 ${CFLAGS} ${LDFLAGS} \
-		-DXF86MISC -Wl,-soname,libfglrx_gamma.so.1.0 fglrx_gamma.c \
-		-lXext || die "fglrx_gamma lib build failed"
-	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so || die "ln failed"
-	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so.1 || die "ln failed"
-
-	einfo "Building fglrx_gamma util"
-	cd "${S}"/extra/programs/fglrx_gamma
-	"$(tc-getCC)" -o fglrx_xgamma ${CFLAGS} ${LDFLAGS} \
-		-I../../../common/usr/X11R6/include -L../../lib/fglrx_gamma \
-		fglrx_xgamma.c -lm -lfglrx_gamma -lX11 \
-		|| die "fglrx_gamma util build failed"
-
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# We can do two things here, and neither of them is very nice.
-
-	# For direct rendering libGL has to be able to load one or more
-	# dri modules (files ending in _dri.so, like fglrx_dri.so).
-	# Gentoo's mesa looks for these files in the location specified by
-	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
-	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
-	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
-	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
-	# 64bit. So we can either put the .so files in that (unusual,
-	# compared to "normal" mesa libGL) location or set
-	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
-	# 101539.
-
-	# The problem with this approach is that LIBGL_DRIVERS_PATH
-	# *overrides* the default hardcoded location, it does not extend
-	# it. So if ati-drivers is merged but a non-ati libGL is selected
-	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
-	# (because it changed in a newer mesa or because it was compiled
-	# for a different set of multilib abis than we are) stuff breaks.
-
-	# We create one file per ABI to work with "native" multilib, see
-	# below.
-
-	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
-	doenvd "${T}/03ati-colon-sep"
-
-	# All libraries that we have a 32 bit and 64 bit version of on
-	# amd64 are installed in src_install-libs. Everything else
-	# (including libraries only available in native 64bit on amd64)
-	# goes in here.
-
-	# There used to be some code here that tried to detect running
-	# under a "native multilib" portage ((precursor of)
-	# http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it
-	# should just work (only doing some duplicate work). --marienz
-	if has_multilib_profile; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	# This is sorted by the order the files occur in the source tree.
-
-	# X modules.
-	exeinto /usr/$(get_libdir)/xorg/modules/drivers
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
-	exeinto /usr/$(get_libdir)/xorg/modules/linux
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
-	exeinto /usr/$(get_libdir)/xorg/modules
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{esut.a,glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	if use acpi; then
-		dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	fi
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -name '*.so*' -not -name 'libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins common/etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	if use acpi; then
-		doins common/etc/ati/authatieventsd.sh
-	fi
-
-	# include.
-	insinto /usr
-	doins -r common/usr/include
-	insinto /usr/include/X11/extensions
-	doins common/usr/X11R6/include/X11/extensions/fglrx_gamma.h
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin common/usr/sbin/*
-
-	# data files for the control panel.
-	insinto /usr/share
-	doins -r common/usr/share/ati
-	insinto /usr/share/pixmaps
-	doins common/usr/share/icons/ccc_{large,small}.xpm
-	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
-		ccc_large System
-
-	# doc.
-	dohtml -r common/usr/share/doc/fglrx
-
-	if use acpi; then
-		doman common/usr/share/man/man8/atieventsd.8
-
-		pushd common/usr/share/doc/fglrx/examples/etc/acpi >/dev/null
-
-		exeinto /etc/acpi
-		doexe ati-powermode.sh
-		insinto /etc/acpi/events
-		doins events/*
-
-		popd >/dev/null
-	fi
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	dolib extra/lib/fglrx_gamma/*so*
-	newdoc extra/lib/fglrx_gamma/README README.libfglrx_gamma
-
-	dobin extra/programs/fglrx_gamma/fglrx_xgamma
-	doman extra/programs/fglrx_gamma/fglrx_xgamma.1
-	newdoc extra/programs/fglrx_gamma/README README.fglrx_gamma
-
-	# Gentoo-specific stuff:
-	if use acpi; then
-		newinitd "${FILESDIR}"/atieventsd.init atieventsd \
-			|| die "Failed to install atieventsd.init.d"
-		echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-		newconfd "${T}"/atieventsd.conf atieventsd
-	fi
-}
-
-src_install-libs() {
-	if [[ "${ABI}" == "amd64" ]]; then
-		local pkglibdir=lib64
-		local MY_ARCH_DIR="${S}/arch/x86_64"
-	else
-		local pkglibdir=lib
-		local MY_ARCH_DIR="${S}/arch/x86"
-	fi
-	einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
-
-	local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
-	# To make sure we do not miss a spot when these change.
-	local libmajor=1 libminor=2
-	local libver=${libmajor}.${libminor}
-
-	# The GLX libraries
-	# (yes, this really is "lib" even on amd64/multilib --marienz)
-	exeinto ${ATI_ROOT}/lib
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/libGL.so.${libver}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
-
-	# Same as the xorg implementation (eselect opengl does not fall
-	# back to xorg-x11 if we omit this symlink, meaning no glx).
-	dosym ../xorg-x11/extensions ${ATI_ROOT}/extensions
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# Make up a libGL.la. Ati does not provide one, but mesa does. If
-	# a (libtool-based) libfoo is built with libGL.la present a
-	# reference to it is put into libfoo.la, and compiling
-	# (libtool-based) things that link too libfoo.la will complain if
-	# libGL.la disappears. So if we do not make up a libGL.la
-	# switching between mesa and ati becomes painful.
-	local revision=$(printf '%d%02d%02d' $(get_version_components))
-	sed -e "s:\${libmajor}:${libmajor}:g" \
-		-e "s:\${libminor}:${libminor}:g" \
-		-e "s:\${libdir}:$(get_libdir):g" \
-		-e "s:\${revision}:${revision}:g" \
-		"${FILESDIR}"/libGL.la.in > "${D}"/${ATI_ROOT}/lib/libGL.la \
-		|| die "sed failed to make libGL.la"
-
-	local envname="${T}"/04ati-dri-path
-	if [[ -n ${ABI} ]]; then
-		envname="${envname}-${ABI}"
-	fi
-	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
-	doenvd "${envname}"
-}
-
-pkg_postinst() {
-	/usr/bin/eselect opengl set --use-old ati
-
-	elog "To switch to ATI OpenGL, run \"eselect opengl set ati\""
-	elog "To change your xorg.conf you can use the bundled \"aticonfig\""
-	elog
-	elog "If you experience unexplained segmentation faults and kernel crashes"
-	elog "with this driver and multi-threaded applications such as wine,"
-	elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
-	elog
-	elog "You will have to source /etc/profile (or logout and back in) for dri"
-	elog "to work, unless you previously had ati-drivers installed."
-
-	# Workaroud screen corruption
-	ewarn "If you experience screen corruption with this driver, try putting"
-	ewarn '         Option "XAANoOffscreenPixmaps" "true"'
-	ewarn "in the Device Section of /etc/X11/xorg.conf."
-
-	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.552.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.552.ebuild
deleted file mode 100644
index e06f28c97a6b..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.552.ebuild
+++ /dev/null
@@ -1,441 +0,0 @@
-# Copyright 1999-2009 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.552.ebuild,v 1.4 2009/02/03 06:25:30 je_fro Exp $
-
-IUSE="acpi debug"
-
-inherit eutils multilib linux-mod toolchain-funcs versionator
-
-DESCRIPTION="Ati precompiled drivers for recent 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-8-11-x86.x86_64.run"
-
-LICENSE="AMD GPL-2 QPL-1.0 as-is"
-KEYWORDS="~amd64 ~x86"
-
-# The portage dep is for COLON_SEPARATED support in env-update.
-# The eselect dep (>=1.0.9) is for COLON_SEPARATED in eselect env update.
-RDEPEND="x11-base/xorg-server
-	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-1.0.9
-	app-admin/eselect-opengl
-	amd64? ( app-emulation/emul-linux-x86-xlibs )
-	acpi? (
-		x11-apps/xauth
-		sys-power/acpid
-	)
-	x11-libs/libXrandr
-	>=sys-apps/portage-2.1.1-r1"
-
-DEPEND="${RDEPEND}
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/inputproto"
-
-EMULTILIB_PKG="true"
-
-QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so
-	usr/lib/opengl/ati/lib/libGL.so.1.2
-	opt/bin/amdcccle"
-QA_EXECSTACK_amd64="usr/lib64/dri/fglrx_dri.so
-	usr/lib32/dri/fglrx_dri.so
-	usr/lib64/opengl/ati/lib/libGL.so.1.2
-	usr/lib32/opengl/ati/lib/libGL.so.1.2
-	opt/bin/amdcccle"
-QA_TEXTRELS_x86="usr/lib/dri/fglrx_dri.so
-	usr/lib/xorg/modules/drivers/fglrx_drv.so
-	usr/lib/opengl/ati/lib/libGL.so.1.2
-	usr/lib/xorg/modules/glesx.so
-	usr/lib/xorg/modules/amdxmm.so"
-QA_TEXTRELS_amd64="
-	usr/lib64/opengl/ati/lib/libGL.so.1.2
-	usr/lib32/opengl/ati/lib/libGL.so.1.2
-	usr/lib64/dri/fglrx_dri.so
-	usr/lib32/dri/fglrx_dri.so
-	usr/lib32/xorg/modules/glesx.so
-	usr/lib64/xorg/modules/glesx.so"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-
-	# Define module dir.
-	MODULE_DIR="${S}/common/lib/modules/fglrx/build_mod"
-
-	#check kernel and sets up KV_OBJ
-	MODULE_NAMES="fglrx(video:${S}/common/lib/modules/fglrx/build_mod/2.6.x)"
-	BUILD_TARGETS="kmod_build"
-	linux-mod_pkg_setup
-	BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}"
-
-	if ! kernel_is 2 6; then
-		eerror "Need a 2.6 kernel to compile against!"
-		die "Need a 2.6 kernel to compile against!"
-	fi
-
-	if kernel_is ge 2 6 25 && linux_chkconfig_present PREEMPT_RCU; then
-		die "${P} is not compatible with RCU Preemption (bug #223281), please disable it"
-	fi
-
-	if kernel_is ge 2 6 26 && ! linux_chkconfig_present UNUSED_SYMBOLS; then
-			ewarn "You have to Enable unused/obsolete exported symbols in Kernel hacking section of kernel config for fglrx to load"
-	fi
-
-	if kernel_is ge 2 6 24 && ! linux_chkconfig_present PCI_LEGACY; then
-		eerror "${P} requires support for pci_find_slot."
-		die "${P} requires support for pci_find_slot."
-	fi
-
-	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 "You need AGP and/or PCI Express support for direct rendering to work."
-	fi
-
-	if linux_chkconfig_present PARAVIRT; then
-		eerror "The current ati-drivers don't compile when having"
-		eerror "paravirtualization active due to GPL symbol export"
-		eerror "restrictions."
-		eerror "Please disable it:"
-		eerror "	CONFIG_PARAVIRT=n"
-		eerror "in /usr/src/linux/.config or"
-		eerror "	Processor type and features -->"
-		eerror "		[ ] Paravirtualization support (EXPERIMENTAL)"
-		eerror "in 'menuconfig'"
-		die "CONFIG_PARAVIRT enabled"
-	fi
-
-	# Only support xorg-server >=1.1
-	BASE_DIR="${S}/x710"
-
-	# This is used like $(get_libdir) for paths in ati's package.
-	if use amd64 ; then
-		BASE_DIR="${BASE_DIR}_64a"
-		PKG_LIBDIR=lib64
-		ARCH_DIR="${S}/arch/x86_64"
-	else
-		PKG_LIBDIR=lib
-		ARCH_DIR="${S}/arch/x86"
-	fi
-}
-
-src_unpack() {
-	#Switching to a standard way to extract the files since otherwise no signature file
-	#would be created
-	local src="${DISTDIR}/${A}"
-	sh "${src}" --extract "${S}"  2&>1 /dev/null
-
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/{fgl_glxgears,fglrx_xgamma} \
-		"${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \
-		|| die "bin rm failed"
-
-	if use debug; then
-		# Enable debug mode in the Source Code.
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	if use acpi; then
-		sed -i \
-			-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-			-e "s:/var/lib/gdm/:/var/gdm/:" \
-			"${S}/common/etc/ati/authatieventsd.sh" \
-			|| die "sed failed."
-
-		# Since "who" is in coreutils, we're using that one instead of "finger".
-		sed -i -e 's:finger:who:' \
-			"${S}/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-			|| die "Replacing 'finger' with 'who' failed."
-		# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-		# add funktion to detect default state.
-		epatch "${FILESDIR}"/8.532/ati-powermode-opt-path-2.patch
-	fi
-
-	pushd ${MODULE_DIR} >/dev/null
-	ln -s "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
-		|| die "symlinking precompiled core failed"
-
-	convert_to_m 2.6.x/Makefile || die "convert_to_m failed"
-
-	# When built with ati's make.sh it defines a bunch of macros if
-	# certain .config values are set, falling back to less reliable
-	# detection methods if linux/autoconf.h is not available. We
-	# simply use the linux/autoconf.h settings directly, bypassing the
-	# detection script.
-	sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
-	sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
-		|| die "MODVERSIONS sed failed"
-	popd >/dev/null
-
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../common/usr/src/ati/fglrx_sample_source.tgz
-	sed -i -e 's:include/extensions/extutil.h:X11/extensions/extutil.h:' \
-		lib/fglrx_gamma/fglrx_gamma.c || die "include fixup failed"
-	# Add a category.
-	mv programs/fglrx_gamma/fglrx_xgamma.{man,1} || die "man mv failed"
-	cd ..
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	einfo "Building fgl_glxgears"
-	cd "${S}"/extra/fgl_glxgears
-	# These extra libs/utils either have an Imakefile that does not
-	# work very well without tweaking or a Makefile ignoring CFLAGS
-	# and the like. We bypass those.
-
-	# The -DUSE_GLU is needed to compile using nvidia headers
-	# according to a comment in ati-drivers-extra-8.33.6.ebuild.
-	"$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
-		-I"${S}"/common/usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-
-	einfo "Building fglrx_gamma lib"
-	cd "${S}"/extra/lib/fglrx_gamma
-	"$(tc-getCC)" -shared -fpic -o libfglrx_gamma.so.1.0 ${CFLAGS} ${LDFLAGS} \
-		-DXF86MISC -Wl,-soname,libfglrx_gamma.so.1.0 fglrx_gamma.c \
-		-lXext || die "fglrx_gamma lib build failed"
-	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so || die "ln failed"
-	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so.1 || die "ln failed"
-
-	einfo "Building fglrx_gamma util"
-	cd "${S}"/extra/programs/fglrx_gamma
-	"$(tc-getCC)" -o fglrx_xgamma ${CFLAGS} ${LDFLAGS} \
-		-I../../../common/usr/X11R6/include -L../../lib/fglrx_gamma \
-		fglrx_xgamma.c -lm -lfglrx_gamma -lX11 \
-		|| die "fglrx_gamma util build failed"
-
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# We can do two things here, and neither of them is very nice.
-
-	# For direct rendering libGL has to be able to load one or more
-	# dri modules (files ending in _dri.so, like fglrx_dri.so).
-	# Gentoo's mesa looks for these files in the location specified by
-	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
-	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
-	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
-	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
-	# 64bit. So we can either put the .so files in that (unusual,
-	# compared to "normal" mesa libGL) location or set
-	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
-	# 101539.
-
-	# The problem with this approach is that LIBGL_DRIVERS_PATH
-	# *overrides* the default hardcoded location, it does not extend
-	# it. So if ati-drivers is merged but a non-ati libGL is selected
-	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
-	# (because it changed in a newer mesa or because it was compiled
-	# for a different set of multilib abis than we are) stuff breaks.
-
-	# We create one file per ABI to work with "native" multilib, see
-	# below.
-
-	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
-	doenvd "${T}/03ati-colon-sep"
-
-	# All libraries that we have a 32 bit and 64 bit version of on
-	# amd64 are installed in src_install-libs. Everything else
-	# (including libraries only available in native 64bit on amd64)
-	# goes in here.
-
-	# There used to be some code here that tried to detect running
-	# under a "native multilib" portage ((precursor of)
-	# http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it
-	# should just work (only doing some duplicate work). --marienz
-	if has_multilib_profile; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	# This is sorted by the order the files occur in the source tree.
-
-	# X modules.
-	exeinto /usr/$(get_libdir)/xorg/modules/drivers
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
-	exeinto /usr/$(get_libdir)/xorg/modules/linux
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
-	exeinto /usr/$(get_libdir)/xorg/modules
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{esut.a,glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	if use acpi; then
-		dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	fi
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -name '*.so*' -not -name 'libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins common/etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	if use acpi; then
-		doins common/etc/ati/authatieventsd.sh
-	fi
-
-	# include.
-	insinto /usr
-	doins -r common/usr/include
-	insinto /usr/include/X11/extensions
-	doins common/usr/X11R6/include/X11/extensions/fglrx_gamma.h
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin common/usr/sbin/*
-
-	# data files for the control panel.
-	insinto /usr/share
-	doins -r common/usr/share/ati
-	insinto /usr/share/pixmaps
-	doins common/usr/share/icons/ccc_{large,small}.xpm
-	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
-		ccc_large System
-
-	# doc.
-	dohtml -r common/usr/share/doc/fglrx
-
-	if use acpi; then
-		doman common/usr/share/man/man8/atieventsd.8
-
-		pushd common/usr/share/doc/fglrx/examples/etc/acpi >/dev/null
-
-		exeinto /etc/acpi
-		doexe ati-powermode.sh
-		insinto /etc/acpi/events
-		doins events/*
-
-		popd >/dev/null
-	fi
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	dolib extra/lib/fglrx_gamma/*so*
-	newdoc extra/lib/fglrx_gamma/README README.libfglrx_gamma
-
-	dobin extra/programs/fglrx_gamma/fglrx_xgamma
-	doman extra/programs/fglrx_gamma/fglrx_xgamma.1
-	newdoc extra/programs/fglrx_gamma/README README.fglrx_gamma
-
-	# Gentoo-specific stuff:
-	if use acpi; then
-		newinitd "${FILESDIR}"/atieventsd.init atieventsd \
-			|| die "Failed to install atieventsd.init.d"
-		echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-		newconfd "${T}"/atieventsd.conf atieventsd
-	fi
-}
-
-src_install-libs() {
-	if [[ "${ABI}" == "amd64" ]]; then
-		local pkglibdir=lib64
-		local MY_ARCH_DIR="${S}/arch/x86_64"
-	else
-		local pkglibdir=lib
-		local MY_ARCH_DIR="${S}/arch/x86"
-	fi
-	einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
-
-	local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
-	# To make sure we do not miss a spot when these change.
-	local libmajor=1 libminor=2
-	local libver=${libmajor}.${libminor}
-
-	# The GLX libraries
-	# (yes, this really is "lib" even on amd64/multilib --marienz)
-	exeinto ${ATI_ROOT}/lib
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/libGL.so.${libver}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
-
-	# Same as the xorg implementation (eselect opengl does not fall
-	# back to xorg-x11 if we omit this symlink, meaning no glx).
-	dosym ../xorg-x11/extensions ${ATI_ROOT}/extensions
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# Make up a libGL.la. Ati does not provide one, but mesa does. If
-	# a (libtool-based) libfoo is built with libGL.la present a
-	# reference to it is put into libfoo.la, and compiling
-	# (libtool-based) things that link too libfoo.la will complain if
-	# libGL.la disappears. So if we do not make up a libGL.la
-	# switching between mesa and ati becomes painful.
-	local revision=$(printf '%d%02d%02d' $(get_version_components))
-	sed -e "s:\${libmajor}:${libmajor}:g" \
-		-e "s:\${libminor}:${libminor}:g" \
-		-e "s:\${libdir}:$(get_libdir):g" \
-		-e "s:\${revision}:${revision}:g" \
-		"${FILESDIR}"/libGL.la.in > "${D}"/${ATI_ROOT}/lib/libGL.la \
-		|| die "sed failed to make libGL.la"
-
-	local envname="${T}"/04ati-dri-path
-	if [[ -n ${ABI} ]]; then
-		envname="${envname}-${ABI}"
-	fi
-	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
-	doenvd "${envname}"
-}
-
-pkg_postinst() {
-	/usr/bin/eselect opengl set --use-old ati
-
-	elog "To switch to ATI OpenGL, run \"eselect opengl set ati\""
-	elog "To change your xorg.conf you can use the bundled \"aticonfig\""
-	elog
-	elog "If you experience unexplained segmentation faults and kernel crashes"
-	elog "with this driver and multi-threaded applications such as wine,"
-	elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
-	elog
-	elog "You will have to source /etc/profile (or logout and back in) for dri"
-	elog "to work, unless you previously had ati-drivers installed."
-
-	# Workaroud screen corruption
-	ewarn "If you experience screen corruption with this driver, try putting"
-	ewarn '         Option "XAANoOffscreenPixmaps" "true"'
-	ewarn "in the Device Section of /etc/X11/xorg.conf."
-
-	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.573.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.573.ebuild
deleted file mode 100644
index ab0e962093d1..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.573.ebuild
+++ /dev/null
@@ -1,439 +0,0 @@
-# Copyright 1999-2009 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.573.ebuild,v 1.5 2009/03/14 23:28:20 mr_bones_ Exp $
-
-IUSE="acpi debug"
-
-inherit eutils multilib linux-mod toolchain-funcs versionator
-
-DESCRIPTION="Ati precompiled drivers for recent 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-9-1-x86.x86_64.run"
-
-LICENSE="AMD GPL-2 QPL-1.0 as-is"
-KEYWORDS="~amd64 ~x86"
-
-# The portage dep is for COLON_SEPARATED support in env-update.
-# The eselect dep (>=1.0.9) is for COLON_SEPARATED in eselect env update.
-RDEPEND=">=x11-base/xorg-server-1.5
-	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-1.0.9
-	app-admin/eselect-opengl
-	amd64? ( app-emulation/emul-linux-x86-xlibs )
-	acpi? (
-		x11-apps/xauth
-		sys-power/acpid
-	)
-	x11-libs/libXrandr
-	>=sys-apps/portage-2.1.1-r1"
-
-DEPEND="${RDEPEND}
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/inputproto
-	!<x11-drivers/ati-drivers-8.552-r1"
-
-EMULTILIB_PKG="true"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-
-	# Define module dir.
-	MODULE_DIR="${S}/common/lib/modules/fglrx/build_mod"
-
-	#check kernel and sets up KV_OBJ
-	MODULE_NAMES="fglrx(video:${S}/common/lib/modules/fglrx/build_mod/2.6.x)"
-	BUILD_TARGETS="kmod_build"
-	linux-mod_pkg_setup
-	BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}"
-
-	if ! kernel_is 2 6; then
-		eerror "Need a 2.6 kernel to compile against!"
-		die "Need a 2.6 kernel to compile against!"
-	fi
-
-	if kernel_is ge 2 6 25 && linux_chkconfig_present PREEMPT_RCU; then
-		die "${P} is not compatible with RCU Preemption (bug #223281), please disable it"
-	fi
-
-	if kernel_is ge 2 6 26 && ! linux_chkconfig_present UNUSED_SYMBOLS; then
-			ewarn "You have to Enable unused/obsolete exported symbols in Kernel hacking section of kernel config for fglrx to load"
-	fi
-
-	if kernel_is ge 2 6 24 && ! linux_chkconfig_present PCI_LEGACY; then
-		eerror "${P} requires support for pci_find_slot."
-		die "${P} requires support for pci_find_slot."
-	fi
-
-	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 "You need AGP and/or PCI Express support for direct rendering to work."
-	fi
-
-	if linux_chkconfig_present PARAVIRT; then
-		eerror "The current ati-drivers don't compile when having"
-		eerror "paravirtualization active due to GPL symbol export"
-		eerror "restrictions."
-		eerror "Please disable it:"
-		eerror "	CONFIG_PARAVIRT=n"
-		eerror "in /usr/src/linux/.config or"
-		eerror "	Processor type and features -->"
-		eerror "		[ ] Paravirtualization support (EXPERIMENTAL)"
-		eerror "in 'menuconfig'"
-		die "CONFIG_PARAVIRT enabled"
-	fi
-
-	if ! linux_chkconfig_present MAGIC_SYSRQ; then
-		eerror "You need MAGIC_SYSRQ enabled in order to build ati-drivers"
-		die "CONFIG_MAGIC_SYSRQ disabled"
-	fi
-
-	# Only support xorg-server >=1.5
-	BASE_DIR="${S}/x740"
-
-	if ! linux_chkconfig_present PCI_MSI; then
-		eerror "You need PCI_MSI enabled in order to build ati-drivers"
-		die "CONFIG_PCI_MSI disabled"
-	fi
-
-	# This is used like $(get_libdir) for paths in ati's package.
-	if use amd64 ; then
-		MY_BASE_DIR="${BASE_DIR}_64a"
-		PKG_LIBDIR=lib64
-		ARCH_DIR="${S}/arch/x86_64"
-	else
-		MY_BASE_DIR="${BASE_DIR}"
-		PKG_LIBDIR=lib
-		ARCH_DIR="${S}/arch/x86"
-	fi
-}
-
-src_unpack() {
-	#Switching to a standard way to extract the files since otherwise no signature file
-	#would be created
-	local src="${DISTDIR}/${A}"
-	sh "${src}" --extract "${S}"  2&>1 /dev/null
-	cd "${S}"
-	epatch "${FILESDIR}"/${PV}/ati-drivers-xen-8.552.patch || die "epatch failed"
-
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/{fgl_glxgears,fglrx_xgamma} \
-		"${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \
-		|| die "bin rm failed"
-
-	if use debug; then
-		# Enable debug mode in the Source Code.
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	if use acpi; then
-		sed -i \
-			-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-			-e "s:/var/lib/gdm/:/var/gdm/:" \
-			"${S}/common/etc/ati/authatieventsd.sh" \
-			|| die "sed failed."
-
-		# Since "who" is in coreutils, we're using that one instead of "finger".
-		sed -i -e 's:finger:who:' \
-			"${S}/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-			|| die "Replacing 'finger' with 'who' failed."
-		# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-		# add funktion to detect default state.
-		epatch "${FILESDIR}"/${PV}/ati-powermode-opt-path-2.patch
-	fi
-
-	pushd ${MODULE_DIR} >/dev/null
-	ln -s "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
-		|| die "symlinking precompiled core failed"
-
-	convert_to_m 2.6.x/Makefile || die "convert_to_m failed"
-
-	# When built with ati's make.sh it defines a bunch of macros if
-	# certain .config values are set, falling back to less reliable
-	# detection methods if linux/autoconf.h is not available. We
-	# simply use the linux/autoconf.h settings directly, bypassing the
-	# detection script.
-	sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
-	sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
-		|| die "MODVERSIONS sed failed"
-	popd >/dev/null
-
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../common/usr/src/ati/fglrx_sample_source.tgz
-	sed -i -e 's:include/extensions/extutil.h:X11/extensions/extutil.h:' \
-		lib/fglrx_gamma/fglrx_gamma.c || die "include fixup failed"
-	# Add a category.
-	mv programs/fglrx_gamma/fglrx_xgamma.{man,1} || die "man mv failed"
-	cd ..
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	einfo "Building fgl_glxgears"
-	cd "${S}"/extra/fgl_glxgears
-	# These extra libs/utils either have an Imakefile that does not
-	# work very well without tweaking or a Makefile ignoring CFLAGS
-	# and the like. We bypass those.
-
-	# The -DUSE_GLU is needed to compile using nvidia headers
-	# according to a comment in ati-drivers-extra-8.33.6.ebuild.
-	"$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
-		-I"${S}"/common/usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-
-	einfo "Building fglrx_gamma lib"
-	cd "${S}"/extra/lib/fglrx_gamma
-	"$(tc-getCC)" -shared -fpic -o libfglrx_gamma.so.1.0 ${CFLAGS} ${LDFLAGS} \
-		-DXF86MISC -Wl,-soname,libfglrx_gamma.so.1.0 fglrx_gamma.c \
-		-lXext || die "fglrx_gamma lib build failed"
-	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so || die "ln failed"
-	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so.1 || die "ln failed"
-
-	einfo "Building fglrx_gamma util"
-	cd "${S}"/extra/programs/fglrx_gamma
-	"$(tc-getCC)" -o fglrx_xgamma ${CFLAGS} ${LDFLAGS} \
-		-I../../../common/usr/X11R6/include -L../../lib/fglrx_gamma \
-		fglrx_xgamma.c -lm -lfglrx_gamma -lX11 \
-		|| die "fglrx_gamma util build failed"
-
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# We can do two things here, and neither of them is very nice.
-
-	# For direct rendering libGL has to be able to load one or more
-	# dri modules (files ending in _dri.so, like fglrx_dri.so).
-	# Gentoo's mesa looks for these files in the location specified by
-	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
-	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
-	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
-	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
-	# 64bit. So we can either put the .so files in that (unusual,
-	# compared to "normal" mesa libGL) location or set
-	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
-	# 101539.
-
-	# The problem with this approach is that LIBGL_DRIVERS_PATH
-	# *overrides* the default hardcoded location, it does not extend
-	# it. So if ati-drivers is merged but a non-ati libGL is selected
-	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
-	# (because it changed in a newer mesa or because it was compiled
-	# for a different set of multilib abis than we are) stuff breaks.
-
-	# We create one file per ABI to work with "native" multilib, see
-	# below.
-
-	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
-	doenvd "${T}/03ati-colon-sep"
-
-	# All libraries that we have a 32 bit and 64 bit version of on
-	# amd64 are installed in src_install-libs. Everything else
-	# (including libraries only available in native 64bit on amd64)
-	# goes in here.
-
-	# There used to be some code here that tried to detect running
-	# under a "native multilib" portage ((precursor of)
-	# http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it
-	# should just work (only doing some duplicate work). --marienz
-	if has_multilib_profile; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	# This is sorted by the order the files occur in the source tree.
-
-	# X modules.
-	exeinto /usr/$(get_libdir)/xorg/modules/drivers
-	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
-	exeinto /usr/$(get_libdir)/xorg/modules/linux
-	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
-	exeinto /usr/$(get_libdir)/xorg/modules
-	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{esut.a,glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	if use acpi; then
-		dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	fi
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -name '*.so*' -not -name 'libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins common/etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	if use acpi; then
-		insopts -m0755
-		doins common/etc/ati/authatieventsd.sh
-	fi
-
-	# include.
-	insinto /usr
-	doins -r common/usr/include
-	insinto /usr/include/X11/extensions
-	doins common/usr/X11R6/include/X11/extensions/fglrx_gamma.h
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin common/usr/sbin/*
-
-	# data files for the control panel.
-	insinto /usr/share
-	doins -r common/usr/share/ati
-	insinto /usr/share/pixmaps
-	doins common/usr/share/icons/ccc_{large,small}.xpm
-	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
-		ccc_large System
-
-	# doc.
-	dohtml -r common/usr/share/doc/fglrx
-
-	if use acpi; then
-		doman common/usr/share/man/man8/atieventsd.8
-
-		pushd common/usr/share/doc/fglrx/examples/etc/acpi >/dev/null
-
-		exeinto /etc/acpi
-		doexe ati-powermode.sh
-		insinto /etc/acpi/events
-		doins events/*
-
-		popd >/dev/null
-	fi
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	dolib extra/lib/fglrx_gamma/*so*
-	newdoc extra/lib/fglrx_gamma/README README.libfglrx_gamma
-
-	dobin extra/programs/fglrx_gamma/fglrx_xgamma
-	doman extra/programs/fglrx_gamma/fglrx_xgamma.1
-	newdoc extra/programs/fglrx_gamma/README README.fglrx_gamma
-
-	# Gentoo-specific stuff:
-	if use acpi; then
-		newinitd "${FILESDIR}"/atieventsd.init atieventsd \
-			|| die "Failed to install atieventsd.init.d"
-		echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-		newconfd "${T}"/atieventsd.conf atieventsd
-	fi
-}
-
-src_install-libs() {
-	if [[ "${ABI}" == "amd64" ]]; then
-		local EX_BASE_DIR="${BASE_DIR}_64a"
-		local pkglibdir=lib64
-		local MY_ARCH_DIR="${S}/arch/x86_64"
-	else
-		local EX_BASE_DIR="${BASE_DIR}"
-		local pkglibdir=lib
-		local MY_ARCH_DIR="${S}/arch/x86"
-	fi
-	einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
-
-	local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
-	# To make sure we do not miss a spot when these change.
-	local libmajor=1 libminor=2
-	local libver=${libmajor}.${libminor}
-
-	# The GLX libraries
-	# (yes, this really is "lib" even on amd64/multilib --marienz)
-	exeinto ${ATI_ROOT}/lib
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/libGL.so.${libver}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
-
-	exeinto ${ATI_ROOT}/extensions
-	doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/*
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# AMD Cal libraries
-	exeinto /usr/$(get_libdir)
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/*.so
-
-	# Make up a libGL.la. Ati does not provide one, but mesa does. If
-	# a (libtool-based) libfoo is built with libGL.la present a
-	# reference to it is put into libfoo.la, and compiling
-	# (libtool-based) things that link too libfoo.la will complain if
-	# libGL.la disappears. So if we do not make up a libGL.la
-	# switching between mesa and ati becomes painful.
-	local revision=$(printf '%d%02d%02d' $(get_version_components))
-	sed -e "s:\${libmajor}:${libmajor}:g" \
-		-e "s:\${libminor}:${libminor}:g" \
-		-e "s:\${libdir}:$(get_libdir):g" \
-		-e "s:\${revision}:${revision}:g" \
-		"${FILESDIR}"/libGL.la.in > "${D}"/${ATI_ROOT}/lib/libGL.la \
-		|| die "sed failed to make libGL.la"
-
-	local envname="${T}"/04ati-dri-path
-	if [[ -n ${ABI} ]]; then
-		envname="${envname}-${ABI}"
-	fi
-	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
-	doenvd "${envname}"
-}
-
-pkg_postinst() {
-	/usr/bin/eselect opengl set --use-old ati
-
-	elog "To switch to ATI OpenGL, run \"eselect opengl set ati\""
-	elog "To change your xorg.conf you can use the bundled \"aticonfig\""
-	elog
-	elog "If you experience unexplained segmentation faults and kernel crashes"
-	elog "with this driver and multi-threaded applications such as wine,"
-	elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
-	elog
-	elog "You will have to source /etc/profile (or logout and back in) for dri"
-	elog "to work, unless you previously had ati-drivers installed."
-
-	# Workaroud screen corruption
-	ewarn "If you experience screen corruption with this driver, try putting"
-	ewarn '         Option "XAANoOffscreenPixmaps" "true"'
-	ewarn "in the Device Section of /etc/X11/xorg.conf."
-
-	linux-mod_pkg_postinst
-}
-
-pkg_prerm() {
-	/usr/bin/eselect opengl set xorg-x11
-}
diff --git a/x11-drivers/ati-drivers/files/8.37.6/fix-ioctl-for-2.6.22.patch b/x11-drivers/ati-drivers/files/8.37.6/fix-ioctl-for-2.6.22.patch
deleted file mode 100644
index 25d5883a6668..000000000000
--- a/x11-drivers/ati-drivers/files/8.37.6/fix-ioctl-for-2.6.22.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- common-orig/lib/modules/fglrx/build_mod/firegl_public.c	2007-08-01 16:58:40.000000000 -0500
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c	2007-08-01 16:57:11.000000000 -0500
-@@ -144,12 +144,14 @@
- #define EXPORT_NO_SYMBOLS
- #endif
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
- #ifdef __x86_64__
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
- #include "linux/ioctl32.h"
- #else
- #include "asm/ioctl32.h"
- #endif
-+#endif
- 
- #ifdef __x86_64__
- #include "asm/compat.h"
diff --git a/x11-drivers/ati-drivers/files/8.433/ati-powermode-opt-path-1.patch b/x11-drivers/ati-drivers/files/8.433/ati-powermode-opt-path-1.patch
deleted file mode 100644
index 88b89a859653..000000000000
--- a/x11-drivers/ati-drivers/files/8.433/ati-powermode-opt-path-1.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh
---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-07-28 04:22:36.000000000 +0100
-+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-08-04 12:19:42.000000000 +0100
-@@ -17,6 +17,10 @@
-         fi
- }
- 
-+aticonfig='/opt/bin/aticonfig'
-+
-+# default high power state
-+default_state=`$aticonfig --lsp | grep 'default state' | cut -c 3`
- 
- grep -q closed /proc/acpi/button/lid/*/state
- if [ $? = 0 ]; then
-@@ -46,7 +50,7 @@
- 	getXuser;
- 	if [ x"$XAUTHORITY" != x"" ]; then
- 	    export DISPLAY=":$displaynum"	    
--	    su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=1 --effective=now"
-+	    su $user -c "$aticonfig --set-powerstate=1 --effective=now"
- 	fi
-     done
- else
-@@ -56,7 +60,7 @@
- 	getXuser;
- 	if [ x"$XAUTHORITY" != x"" ]; then
- 	    export DISPLAY=":$displaynum"
--	    su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=3 --effective=now"
-+	    su $user -c "$aticonfig --set-powerstate=$default_state --effective=now"
- 	fi
-     done
- fi
-
diff --git a/x11-drivers/ati-drivers/files/8.455.2/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.455.2/ati-powermode-opt-path-2.patch
deleted file mode 100644
index f5a35a304ec4..000000000000
--- a/x11-drivers/ati-drivers/files/8.455.2/ati-powermode-opt-path-2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh
---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-07-28 04:22:36.000000000 +0100
-+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-08-04 12:19:42.000000000 +0100
-@@ -4,6 +4,8 @@
- # Control script for ACPI lid state and AC adapter state
- #
- 
-+aticonfig='/opt/bin/aticonfig'
-+
- getXuser() {
-         user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'`
-         if [ x"$user" = x"" ]; then
-@@ -47,7 +49,7 @@
- done
- 
- #If PPLIB is enabled
--su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB
-+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB
- if [ $? = 0 ]; then
-    echo "Has PPLIB"
-    has_pplib=1
-@@ -61,15 +63,15 @@
- if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then
-     echo "Low power"
-     if [ ${has_pplib} -eq 1 ]; then
--        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"'
-+        su $user -c '$aticonfig --pplib-cmd="notify psrc dc"'
-     else
--        su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now"
-+        su $user -c "$aticonfig --set-powerstate=1"
-     fi
- else
-     echo "high power"
-     if [ ${has_pplib} -eq 1 ]; then
--        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"'
-+        su $user -c '$aticonfig --pplib-cmd="notify psrc ac"'
-     else
--        su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now"
-+	su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)"
-     fi
- fi
-