More cleanup

(Portage version: 2.1.6.11/cvs/Linux x86_64)

10 files changed, 10 insertions, 2808 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 769c31ab8c0d..ca54ab39cc1f 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,15 @@
 # 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.148 2009/04/12 23:24:51 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.149 2009/04/13 02:21:46 je_fro Exp $
+
+  13 Apr 2009; Jeff Gardner <je_fro@gentoo.org>
+  -files/8.542/ati-drivers-2.6.27.patch,
+  -files/8.443.1/ati-powermode-opt-path-2.patch,
+  -files/8.532/ati-powermode-opt-path-2.patch, -ati-drivers-8.476.ebuild,
+  -ati-drivers-8.493.ebuild, -ati-drivers-8.501.ebuild,
+  -ati-drivers-8.532.ebuild, -ati-drivers-8.542.ebuild,
+  -ati-drivers-8.561.ebuild:
+  More cleanup
 
   12 Apr 2009; Jeff Gardner <je_fro@gentoo.org>
   -files/8.433/ati-powermode-opt-path-1.patch,
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.476.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.476.ebuild
deleted file mode 100644
index 3bee8d11ca76..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.476.ebuild
+++ /dev/null
@@ -1,436 +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.476.ebuild,v 1.1 2008/04/26 10:50:46 lu_zero 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-4-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"
-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; then
-		die "${P} is not compatible with kernel 2.6.25 and greater"
-	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}"/${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.493.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.493.ebuild
deleted file mode 100644
index 22919fab4461..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.493.ebuild
+++ /dev/null
@@ -1,436 +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.493.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-5-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"
-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_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.501.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.501.ebuild
deleted file mode 100644
index dbe5a56f1fe3..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.501.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.501.ebuild,v 1.4 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-6-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.532.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.532.ebuild
deleted file mode 100644
index 6d3ce349e690..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.532.ebuild
+++ /dev/null
@@ -1,441 +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.532.ebuild,v 1.1 2008/09/29 23:24:49 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-9-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 ! 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.542.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.542.ebuild
deleted file mode 100644
index 271910006d93..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.542.ebuild
+++ /dev/null
@@ -1,449 +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.542.ebuild,v 1.8 2009/02/03 16:44:38 gengor 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-10-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"
-
-	if kernel_is ge 2 6 27; then
-		epatch "${FILESDIR}/${PV}/ati-drivers-2.6.27.patch"
-	fi
-
-	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_prerm() {
-	/usr/bin/eselect opengl set xorg-x11
-}
-
-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.561.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.561.ebuild
deleted file mode 100644
index 77dca90782df..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.561.ebuild
+++ /dev/null
@@ -1,429 +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.561.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-8-12-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"
-
-	# 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}"/8.552/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}"/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 "${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
-		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
-
-	# 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.443.1/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.443.1/ati-powermode-opt-path-2.patch
deleted file mode 100644
index 3819b23b5c66..000000000000
--- a/x11-drivers/ati-drivers/files/8.443.1/ati-powermode-opt-path-2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh-orig	2007-12-23 22:48:55.873089378 -0600
-+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2007-12-23 22:49:59.246421379 -0600
-@@ -4,6 +4,8 @@
- # Control script for ACPI lid state and AC adapter state
- #
- 
-+aticonfig='/opt/bin/aticonfig'
-+
- getXuser() {
-         user=`who| 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
diff --git a/x11-drivers/ati-drivers/files/8.532/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.532/ati-powermode-opt-path-2.patch
deleted file mode 100644
index f5a35a304ec4..000000000000
--- a/x11-drivers/ati-drivers/files/8.532/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
-
diff --git a/x11-drivers/ati-drivers/files/8.542/ati-drivers-2.6.27.patch b/x11-drivers/ati-drivers/files/8.542/ati-drivers-2.6.27.patch
deleted file mode 100644
index 2a2a4f2cb753..000000000000
--- a/x11-drivers/ati-drivers/files/8.542/ati-drivers-2.6.27.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- firegl_public.c	2008-09-19 10:57:09.000000000 +0200
-+++ firegl_public.c	2008-09-19 10:55:57.000000000 +0200
-@@ -199,6 +199,12 @@
- #define preempt_enable()
- #endif
- 
-+/* Since 2.6.27 smp_call_function doesn't have a nonatomic/retry argument */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-+#define SMP_CALL_FUNCTION(func, info, retry, wait) smp_call_function(func, info, wait)
-+#else
-+#define SMP_CALL_FUNCTION(func, info, retry, wait) smp_call_function(func, info, retry, wait)
-+#endif
- // ============================================================
- /* globals */
- 
-@@ -250,7 +256,7 @@
- const char BUILD_KERNEL_HAS_MODVERSIONS_CLEARED;
- #endif
- 
--#ifdef __SMP__
-+#ifdef CONFIG_SMP
- const unsigned long __ke_SMP_State = 1;
- const char BUILD_KERNEL_HAS_SMP_SET;
- #else
-@@ -2516,8 +2522,8 @@
- {
- /*Some kernel developer removed the export of symbol "flush_tlb_page" on 2.6.25 x86_64 SMP kernel.
-   Define a simple version here.*/
--#if defined(__x86_64__) && defined(__SMP__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) 
--    on_each_cpu(KCL_flush_tlb_one, &va, 1, 1);
-+#if defined(__x86_64__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) 
-+    on_each_cpu(KCL_flush_tlb_one, &va, 1);
- #else
-     flush_tlb_page(vma, va);
- #endif
-@@ -2902,7 +2908,7 @@
- 
- /*****************************************************************************/
- 
--#ifdef __SMP__
-+#ifdef CONFIG_SMP
- static atomic_t cpus_waiting;
- 
- static void deferred_flush(void* contextp)
-@@ -2918,13 +2924,13 @@
- 	while (atomic_read(&cpus_waiting) > 0)
- 		barrier();
- }
--#endif /* __SMP__ */
-+#endif /* CONFIG_SMP */
- 
- int ATI_API_CALL __ke_flush_cache(void)
- {
--#ifdef __SMP__
-+#ifdef CONFIG_SMP
-     /* write back invalidate all other CPUs (exported by kernel) */
--	if (smp_call_function(deferred_flush, NULL, 1, 0) != 0)
-+	if (SMP_CALL_FUNCTION(deferred_flush, NULL, 1, 0) != 0)
- 		panic("timed out waiting for the other CPUs!\n");
- 
-     /* invalidate this CPU */
-@@ -2938,7 +2944,7 @@
- 
- 	while (atomic_read(&cpus_waiting) > 0)
- 		barrier();
--#else /* !__SMP__ */
-+#else /* !CONFIG_SMP */
- #if defined(__i386__) || defined(__x86_64__)
- 	asm volatile ("wbinvd":::"memory");
- #elif defined(__alpha__) || defined(__sparc__)
-@@ -2946,7 +2952,7 @@
- #else
- #error "Please define flush_cache for your architecture."
- #endif
--#endif /* !__SMP__ */
-+#endif /* !CONFIG_SMP */
- 
-     //for kernel 2.6.25, tlb_flush has been included when calling set_pages_*.
-     #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
-@@ -4654,7 +4660,7 @@
-    }
- 
- #ifdef CONFIG_SMP
--   if (smp_call_function(KCL_setup_pat, NULL, 0, 1) != 0)
-+   if (SMP_CALL_FUNCTION(KCL_setup_pat, NULL, 0, 1) != 0)
-        return 0;
- #endif
-    KCL_setup_pat(NULL);
-@@ -4673,7 +4679,7 @@
-     }
- 
- #ifdef CONFIG_SMP
--    if (smp_call_function(KCL_restore_pat, NULL, 0, 1) != 0)
-+    if (SMP_CALL_FUNCTION(KCL_restore_pat, NULL, 0, 1) != 0)
-        return;
- #endif
-     KCL_restore_pat(NULL);