drop splitted x11 drivers, we go gentoo way

207 files changed, 0 insertions, 28103 deletions

diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
deleted file mode 100644
index 515df79a..00000000
--- a/x11-drivers/ati-drivers/Manifest
+++ /dev/null
@@ -1,22 +0,0 @@
-DIST amd-catalyst-13.12-linux-x86.x86_64.zip 160571830 SHA256 024033f4847d1c2a182fc44e0b3df29b2d133e24aeaba390f4504a8f3361a0ca SHA512 bf02aea47dc0588e8fe6590ff5665b25b34b3e10499348e2eb786ba89b32703897753852e6ee8ed52c3d0f8eef46f2026d130329d7af75191e605975379d0109 WHIRLPOOL bcdac0f9641cfdc6d89cd5544fe22dda91f64ae8d34dcd25b55930702108b1bee1db0cdc85d8a68a78fddc34f7f30ab88c9813d3a6ba38b3abf37a24d6210707
-DIST amd-catalyst-13.4-linux-x86.x86_64.zip 122588023 SHA256 ebec78c7f78db3601d1c97116a6823076a7765318e16d88b619ebc80d4c6d1d5 SHA512 ce012f46527ee0073f658e97dd793954930b934b96be9e1c6cd1d344e7734ef81949b484701d5e7e1ebb221f46b5a617f4efb4445e42c06ac0a8b4eca76463fc WHIRLPOOL cb0f7af6d0474c3d521c5785bab49d76da7e09e1ddd02dc0e72b70b5afdb2bd1e07d4a4115a755f213718e7c32c816697d993b73706d58be68fa043aef1ad551
-DIST amd-catalyst-13.9-linux-x86.x86_64.zip 120482826 SHA256 ebade5062713c69d2b703b0a3f62defc409d58e98ceab3bfac7a71643c0c4cd3 SHA512 887c1146920ba7e5b31efd63b1a1b7d9cab586e8c6d705706e0b176b3527e542f452d919cd015c3a04d6f42c884f27d983b2a9229b70716129a94674dd7f62b4 WHIRLPOOL d8b6c7ed772898914c256674ae08a8b3d3054eb5bdfc2f00dc4c796a36b4654c3101410786adb54eaae44ff35386db2aa8d8db12d70805f8732d0709412bdbcc
-DIST amd-catalyst-14-4-linux-x86-x86-64.zip 122867159 SHA256 03cc022a49f47888b04f12343ace82bc1eff3aac524e6b4433848c20dc77fec0 SHA512 b359e6c9c349e7a3bee2bd95d3e39f0c596b9a9066893ade3eefcc89ee792094d26a04b2f6bdc31431b368a90ae5870ef07f848a4cbcca723ca1c7c3fcf79d98 WHIRLPOOL bd81574e1fc3be3f82ff51392a3044694e2834ce57395f9d4fe1a89dfa4bebd4b9fe24bc739a45173305bd267d1752226f0648145d5982c9dbe2a0ed23cf37f6
-DIST amd-catalyst-omega-14.12-linux-run-installers.zip 155616187 SHA256 68669836f20ad4351e08b13c5766c6b2ffc6b8cd2a37e9baf55779da32d3a249 SHA512 f87be6a56c03ca4aae3782668af8700d83c85872387753cf002ba4a0e0816fae9af29841a4390db972bfe2f7fb853571b32f8434c2008983461b80699347ac21 WHIRLPOOL 2675a387abd372b34c51f4e8ebfd6547300a8c3ffcc0562633838bc0cdaec3675ca3f4cfa2ab7481c8fa1238a46059f5f848611780638ef6d2301a527d900326
-DIST amd-driver-installer-12-1-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST amd-driver-installer-12-2-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST amd-driver-installer-12-3-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST amd-driver-installer-12-4-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST amd-driver-installer-12-6-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST amd-driver-installer-12-8-x86.x86_64.zip 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST amd-driver-installer-12.6-legacy-x86.x86_64.zip 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST amd-driver-installer-15.20.1046-x86.x86_64.zip 51988 SHA256 7a967062bfed30c50f757e649f01d558393d0e2cd9e5fc71e93ece97ff7f877a SHA512 97fdceba59d5914b464fcb1c33242307c3d939552f7de93882d0b4701673609974d790380e0a33890f736393d6d2999bbd1d8118ec3e87145eb6d091b1e7b0c1 WHIRLPOOL 1cbb3f7934f5f9dabdddbfff2241f3bf1d39c33bcb3bc80d0a99dcf030d376c996aeb559f7ec5a84dd782b389c0c70f0a74f2f08fa2e6906f0515a74168730d9
-DIST amd-driver-installer-catalyst-12.10-x86.x86_64.zip 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST amd-driver-installer-catalyst-13.1-linux-x86.x86_64.zip 114850263 SHA256 67898a922b6b58f25a276a144f16b19014f79c39e4d44d8d2883a467d31e34ad SHA512 30763ab7f47ac22c5b5055495e2d8ae6cc2c8e5ce711fa389f1145a48da2799020c2b8cbf082759d93628017860c39d69337f42ce21b78e1d60c9eda32096df9 WHIRLPOOL ee5dc85a89bc56858ef1c2bcdc6cbfde7e2f9e5675d209c1f6db877e0104cc536f1e18139f0b991a064b14b231a982770eef47368ea281067d62647b4c5365a5
-DIST ati-driver-installer-11-10-x86.x86_64.run 50201 SHA256 a8136110a0117cdfb29f1ce7f4a9ffe42fb2132ef2388baffe0d9922f4d50bfb SHA512 0cdde584ed578d5da11335c1d2e4189b1f3f54f8e8ac4b49e07e66014b79a06c146686519dc6615a83bdccff627d9a940a5d55eb73afff2c5ca710267d8f52aa WHIRLPOOL 088d5d4a8a1851e4da879d8d39188271ef7f302d2cd0615b4c54def147f5e8ec1bd026beb8f36abd0941a57e7d57fb9865bae93d09ebd987825df11ce66fda9a
-DIST ati-driver-installer-11-11-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST ati-driver-installer-11-12-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST ati-driver-installer-11-6-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST ati-driver-installer-11-8-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST ati-driver-installer-11-9-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST xvba-sdk-0.74-404001.tar.gz 583847 SHA256 731a2c489f2fb5d7318c1976061b26c1057a696f46d09dcf55fbada97fed17eb SHA512 aa1dd52b59eeeabd026d8b76e3b75eaf02587ef286438ba28884afeef5a5efaf50283b5ee4f5b81b12cf79cb4ec77c9a235a886b29fb7cdf850c9779f4b07b35 WHIRLPOOL 69917b746d353a884512e97b9d9a9b89e6f51add3119e69ddd119d51c0c3f2820b93a449fe42bd76d671dc505f92bf25b7f2c5868b33768fc68a19596e460951
diff --git a/x11-drivers/ati-drivers/ati-drivers-11.10.ebuild b/x11-drivers/ati-drivers/ati-drivers-11.10.ebuild
deleted file mode 100644
index d009c8c1..00000000
--- a/x11-drivers/ati-drivers/ati-drivers-11.10.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils multilib linux-info linux-mod toolchain-funcs versionator
-
-DESCRIPTION="AMD kernel drivers for r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://ati.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE="debug multilib"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="multilib? ( ~x11-drivers/ati-userspace-${PV}[multilib] )
-	~x11-drivers/ati-userspace-${PV}
-	sys-power/acpid"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-_check_kernel_config() {
-	local failed=0
-	local error=""
-	if ! kernel_is ge 2 6; then
-		eerror "You need a 2.6 linux kernel to compile against!"
-		die "No 2.6 Kernel found"
-	fi
-
-	if ! linux_chkconfig_present MTRR; then
-		ewarn "You don't have MTRR support enabled in the kernel."
-		ewarn "Direct rendering will not work."
-	fi
-
-	if linux_chkconfig_builtin DRM; then
-		ewarn "You have DRM support built in to the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present AGP && \
-		! linux_chkconfig_present PCIEPORTBUS; then
-		ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present ACPI; then
-		eerror "${P} requires the ACPI support in the kernel"
-		eerror "Please enable it:"
-		eerror "    CONFIG_ACPI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Power management and ACPI options --->"
-		eerror "        [*] Power Management support"
-		eerror "in the 'menuconfig'"
-		error+=" CONFIG_ACPI disabled;"
-		failed=1
-	fi
-
-	if ! linux_chkconfig_present PCI_MSI; then
-		eerror "${P} requires MSI in the kernel."
-		eerror "Please enable it:"
-		eerror "    CONFIG_PCI_MSI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Bus options (PCI etc.)  --->"
-		eerror "        [*] Message Signaled Interrupts (MSI and MSI-X)"
-		eerror "in the kernel config."
-		error+=" CONFIG_PCI_MSI disabled;"
-		failed=1
-	fi
-
-	if linux_chkconfig_present LOCKDEP; then
-		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
-		eerror "Unfortunately, this option exports the symbol lock_acquire as GPL-only."
-		eerror "This prevents ${P} from compiling with an error like this:"
-		eerror "FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
-		eerror "Please make sure the following options have been unset:"
-		eerror "    Kernel hacking  --->"
-		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
-		eerror "        [ ] Lock debugging: prove locking correctness"
-		eerror "        [ ] Lock usage statistics"
-		eerror "in 'menuconfig'"
-		error+=" LOCKDEP enabled;"
-		failed=1
-	fi
-
-	use amd64 && if ! linux_chkconfig_present COMPAT; then
-		eerror "${P} requires COMPAT."
-		eerror "Please enable the 32 bit emulation:"
-		eerror "Executable file formats / Emulations  --->"
-		eerror "    [*] IA32 Emulation"
-		eerror "in the kernel config."
-		eerror "if this doesn't enable CONFIG_COMPAT add"
-		eerror "    CONFIG_COMPAT=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" COMPAT disabled;"
-		failed=1
-	fi
-
-	kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then
-		eerror "${P} requires BKL."
-		eerror "Please enable the Big Kernel Lock:"
-		eerror "Kernel hacking  --->"
-		eerror "    [*] Big Kernel Lock"
-		eerror "in the kernel config."
-		eerror "or add"
-		eerror "    CONFIG_BKL=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" BKL disabled;"
-		failed=1
-	fi
-
-	[[ ${failed} -ne 0 ]] && die "${error}"
-}
-
-pkg_pretend() {
-	# workaround until bug 365543 is solved
-	linux-info_pkg_setup
-	require_configured_kernel
-	_check_kernel_config
-}
-
-pkg_setup() {
-	MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/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}"
-	BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
-	if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
-	else
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
-	fi
-
-	# amd64/x86
-	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
-
-	# Define module dir.
-	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
-
-	elog
-	elog "Please note that this driver supports only graphic cards based on"
-	elog "r600 chipset and newer."
-	elog "This represent the ATI Radeon HD series at this moment."
-	elog
-	elog "If your card is older then usage of ${CATEGORY}/xf86-video-ati"
-	elog "as replacement is highly recommended. Rather than staying with"
-	elog "old versions of this driver."
-	elog "For migration informations please reffer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# 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
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# version patches
-	# epatch "${FILESDIR}"/kernel/${PV}-*.patch
-	if use debug; then
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	cd "${MODULE_DIR}"
-	# bugged fglrx build system, this file should be copied by hand
-	cp "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
-
-	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"
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	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."
-	linux-mod_pkg_postinst
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-11.11.ebuild b/x11-drivers/ati-drivers/ati-drivers-11.11.ebuild
deleted file mode 100644
index d009c8c1..00000000
--- a/x11-drivers/ati-drivers/ati-drivers-11.11.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils multilib linux-info linux-mod toolchain-funcs versionator
-
-DESCRIPTION="AMD kernel drivers for r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://ati.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE="debug multilib"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="multilib? ( ~x11-drivers/ati-userspace-${PV}[multilib] )
-	~x11-drivers/ati-userspace-${PV}
-	sys-power/acpid"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-_check_kernel_config() {
-	local failed=0
-	local error=""
-	if ! kernel_is ge 2 6; then
-		eerror "You need a 2.6 linux kernel to compile against!"
-		die "No 2.6 Kernel found"
-	fi
-
-	if ! linux_chkconfig_present MTRR; then
-		ewarn "You don't have MTRR support enabled in the kernel."
-		ewarn "Direct rendering will not work."
-	fi
-
-	if linux_chkconfig_builtin DRM; then
-		ewarn "You have DRM support built in to the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present AGP && \
-		! linux_chkconfig_present PCIEPORTBUS; then
-		ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present ACPI; then
-		eerror "${P} requires the ACPI support in the kernel"
-		eerror "Please enable it:"
-		eerror "    CONFIG_ACPI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Power management and ACPI options --->"
-		eerror "        [*] Power Management support"
-		eerror "in the 'menuconfig'"
-		error+=" CONFIG_ACPI disabled;"
-		failed=1
-	fi
-
-	if ! linux_chkconfig_present PCI_MSI; then
-		eerror "${P} requires MSI in the kernel."
-		eerror "Please enable it:"
-		eerror "    CONFIG_PCI_MSI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Bus options (PCI etc.)  --->"
-		eerror "        [*] Message Signaled Interrupts (MSI and MSI-X)"
-		eerror "in the kernel config."
-		error+=" CONFIG_PCI_MSI disabled;"
-		failed=1
-	fi
-
-	if linux_chkconfig_present LOCKDEP; then
-		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
-		eerror "Unfortunately, this option exports the symbol lock_acquire as GPL-only."
-		eerror "This prevents ${P} from compiling with an error like this:"
-		eerror "FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
-		eerror "Please make sure the following options have been unset:"
-		eerror "    Kernel hacking  --->"
-		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
-		eerror "        [ ] Lock debugging: prove locking correctness"
-		eerror "        [ ] Lock usage statistics"
-		eerror "in 'menuconfig'"
-		error+=" LOCKDEP enabled;"
-		failed=1
-	fi
-
-	use amd64 && if ! linux_chkconfig_present COMPAT; then
-		eerror "${P} requires COMPAT."
-		eerror "Please enable the 32 bit emulation:"
-		eerror "Executable file formats / Emulations  --->"
-		eerror "    [*] IA32 Emulation"
-		eerror "in the kernel config."
-		eerror "if this doesn't enable CONFIG_COMPAT add"
-		eerror "    CONFIG_COMPAT=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" COMPAT disabled;"
-		failed=1
-	fi
-
-	kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then
-		eerror "${P} requires BKL."
-		eerror "Please enable the Big Kernel Lock:"
-		eerror "Kernel hacking  --->"
-		eerror "    [*] Big Kernel Lock"
-		eerror "in the kernel config."
-		eerror "or add"
-		eerror "    CONFIG_BKL=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" BKL disabled;"
-		failed=1
-	fi
-
-	[[ ${failed} -ne 0 ]] && die "${error}"
-}
-
-pkg_pretend() {
-	# workaround until bug 365543 is solved
-	linux-info_pkg_setup
-	require_configured_kernel
-	_check_kernel_config
-}
-
-pkg_setup() {
-	MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/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}"
-	BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
-	if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
-	else
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
-	fi
-
-	# amd64/x86
-	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
-
-	# Define module dir.
-	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
-
-	elog
-	elog "Please note that this driver supports only graphic cards based on"
-	elog "r600 chipset and newer."
-	elog "This represent the ATI Radeon HD series at this moment."
-	elog
-	elog "If your card is older then usage of ${CATEGORY}/xf86-video-ati"
-	elog "as replacement is highly recommended. Rather than staying with"
-	elog "old versions of this driver."
-	elog "For migration informations please reffer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# 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
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# version patches
-	# epatch "${FILESDIR}"/kernel/${PV}-*.patch
-	if use debug; then
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	cd "${MODULE_DIR}"
-	# bugged fglrx build system, this file should be copied by hand
-	cp "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
-
-	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"
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	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."
-	linux-mod_pkg_postinst
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-11.12.ebuild b/x11-drivers/ati-drivers/ati-drivers-11.12.ebuild
deleted file mode 100644
index d009c8c1..00000000
--- a/x11-drivers/ati-drivers/ati-drivers-11.12.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils multilib linux-info linux-mod toolchain-funcs versionator
-
-DESCRIPTION="AMD kernel drivers for r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://ati.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE="debug multilib"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="multilib? ( ~x11-drivers/ati-userspace-${PV}[multilib] )
-	~x11-drivers/ati-userspace-${PV}
-	sys-power/acpid"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-_check_kernel_config() {
-	local failed=0
-	local error=""
-	if ! kernel_is ge 2 6; then
-		eerror "You need a 2.6 linux kernel to compile against!"
-		die "No 2.6 Kernel found"
-	fi
-
-	if ! linux_chkconfig_present MTRR; then
-		ewarn "You don't have MTRR support enabled in the kernel."
-		ewarn "Direct rendering will not work."
-	fi
-
-	if linux_chkconfig_builtin DRM; then
-		ewarn "You have DRM support built in to the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present AGP && \
-		! linux_chkconfig_present PCIEPORTBUS; then
-		ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present ACPI; then
-		eerror "${P} requires the ACPI support in the kernel"
-		eerror "Please enable it:"
-		eerror "    CONFIG_ACPI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Power management and ACPI options --->"
-		eerror "        [*] Power Management support"
-		eerror "in the 'menuconfig'"
-		error+=" CONFIG_ACPI disabled;"
-		failed=1
-	fi
-
-	if ! linux_chkconfig_present PCI_MSI; then
-		eerror "${P} requires MSI in the kernel."
-		eerror "Please enable it:"
-		eerror "    CONFIG_PCI_MSI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Bus options (PCI etc.)  --->"
-		eerror "        [*] Message Signaled Interrupts (MSI and MSI-X)"
-		eerror "in the kernel config."
-		error+=" CONFIG_PCI_MSI disabled;"
-		failed=1
-	fi
-
-	if linux_chkconfig_present LOCKDEP; then
-		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
-		eerror "Unfortunately, this option exports the symbol lock_acquire as GPL-only."
-		eerror "This prevents ${P} from compiling with an error like this:"
-		eerror "FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
-		eerror "Please make sure the following options have been unset:"
-		eerror "    Kernel hacking  --->"
-		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
-		eerror "        [ ] Lock debugging: prove locking correctness"
-		eerror "        [ ] Lock usage statistics"
-		eerror "in 'menuconfig'"
-		error+=" LOCKDEP enabled;"
-		failed=1
-	fi
-
-	use amd64 && if ! linux_chkconfig_present COMPAT; then
-		eerror "${P} requires COMPAT."
-		eerror "Please enable the 32 bit emulation:"
-		eerror "Executable file formats / Emulations  --->"
-		eerror "    [*] IA32 Emulation"
-		eerror "in the kernel config."
-		eerror "if this doesn't enable CONFIG_COMPAT add"
-		eerror "    CONFIG_COMPAT=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" COMPAT disabled;"
-		failed=1
-	fi
-
-	kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then
-		eerror "${P} requires BKL."
-		eerror "Please enable the Big Kernel Lock:"
-		eerror "Kernel hacking  --->"
-		eerror "    [*] Big Kernel Lock"
-		eerror "in the kernel config."
-		eerror "or add"
-		eerror "    CONFIG_BKL=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" BKL disabled;"
-		failed=1
-	fi
-
-	[[ ${failed} -ne 0 ]] && die "${error}"
-}
-
-pkg_pretend() {
-	# workaround until bug 365543 is solved
-	linux-info_pkg_setup
-	require_configured_kernel
-	_check_kernel_config
-}
-
-pkg_setup() {
-	MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/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}"
-	BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
-	if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
-	else
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
-	fi
-
-	# amd64/x86
-	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
-
-	# Define module dir.
-	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
-
-	elog
-	elog "Please note that this driver supports only graphic cards based on"
-	elog "r600 chipset and newer."
-	elog "This represent the ATI Radeon HD series at this moment."
-	elog
-	elog "If your card is older then usage of ${CATEGORY}/xf86-video-ati"
-	elog "as replacement is highly recommended. Rather than staying with"
-	elog "old versions of this driver."
-	elog "For migration informations please reffer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# 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
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# version patches
-	# epatch "${FILESDIR}"/kernel/${PV}-*.patch
-	if use debug; then
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	cd "${MODULE_DIR}"
-	# bugged fglrx build system, this file should be copied by hand
-	cp "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
-
-	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"
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	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."
-	linux-mod_pkg_postinst
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-11.6.ebuild b/x11-drivers/ati-drivers/ati-drivers-11.6.ebuild
deleted file mode 100644
index 5ff0deb1..00000000
--- a/x11-drivers/ati-drivers/ati-drivers-11.6.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils multilib linux-info linux-mod toolchain-funcs versionator
-
-DESCRIPTION="AMD kernel drivers for r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://ati.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE="debug multilib"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="multilib? ( ~x11-drivers/ati-userspace-${PV}[multilib] )
-	~x11-drivers/ati-userspace-${PV}"
-DEPEND="${RDEPEND}
-	sys-power/acpid"
-
-S="${WORKDIR}"
-
-_check_kernel_config() {
-	local failed=0
-	local error=""
-	if ! kernel_is ge 2 6; then
-		eerror "You need a 2.6 linux kernel to compile against!"
-		die "No 2.6 Kernel found"
-	fi
-
-	if ! linux_chkconfig_present MTRR; then
-		ewarn "You don't have MTRR support enabled in the kernel."
-		ewarn "Direct rendering will not work."
-	fi
-
-	if linux_chkconfig_builtin DRM; then
-		ewarn "You have DRM support built in to the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present AGP && \
-		! linux_chkconfig_present PCIEPORTBUS; then
-		ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present ACPI; then
-		eerror "${P} requires the ACPI support in the kernel"
-		eerror "Please enable it:"
-		eerror "    CONFIG_ACPI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Power management and ACPI options --->"
-		eerror "        [*] Power Management support"
-		eerror "in the 'menuconfig'"
-		error+=" CONFIG_ACPI disabled;"
-		failed=1
-	fi
-
-	if ! linux_chkconfig_present PCI_MSI; then
-		eerror "${P} requires MSI in the kernel."
-		eerror "Please enable it:"
-		eerror "    CONFIG_PCI_MSI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Bus options (PCI etc.)  --->"
-		eerror "        [*] Message Signaled Interrupts (MSI and MSI-X)"
-		eerror "in the kernel config."
-		error+=" CONFIG_PCI_MSI disabled"
-		failed=1
-	fi
-
-	if linux_chkconfig_present LOCKDEP; then
-		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
-		eerror "Unfortunately, this option exports the symbol lock_acquire as GPL-only."
-		eerror "This prevents ${P} from compiling with an error like this:"
-		eerror "FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
-		eerror "Please make sure the following options have been unset:"
-		eerror "    Kernel hacking  --->"
-		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
-		eerror "        [ ] Lock debugging: prove locking correctness"
-		eerror "        [ ] Lock usage statistics"
-		eerror "in 'menuconfig'"
-		error+=" LOCKDEP enabled"
-		failed=1
-	fi
-
-	use amd64 && if ! linux_chkconfig_present COMPAT; then
-		eerror "${P} requires COMPAT."
-		eerror "Please enable the 32 bit emulation:"
-		eerror "Executable file formats / Emulations  --->"
-		eerror "    [*] IA32 Emulation"
-		eerror "in the kernel config."
-		eerror "if this doesn't enable CONFIG_COMPAT add"
-		eerror "    CONFIG_COMPAT=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" COMPAT disabled"
-		failed=1
-	fi
-
-	kernel_is le 2 6 38 && kernel_is ge 2 6 37 && if ! linux_chkconfig_present BKL ; then
-		eerror "${P} requires BKL."
-		eerror "Please enable the Big Kernel Lock:"
-		eerror "Kernel hacking  --->"
-		eerror "    [*] Big Kernel Lock"
-		eerror "in the kernel config."
-		eerror "or add"
-		eerror "    CONFIG_BKL=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" BKL disabled"
-		failed=1
-	fi
-
-	[ ${failed} -ne 0 ] && die "${error}"
-}
-
-pkg_pretend() {
-	# workaround until bug 365543 is solved
-	linux-info_pkg_setup
-	require_configured_kernel
-	_check_kernel_config
-}
-
-pkg_setup() {
-	MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/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}"
-	BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
-	if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
-	else
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
-	fi
-
-	# amd64/x86
-	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
-
-	# Define module dir.
-	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
-
-	elog
-	elog "Please note that this driver supports only graphic cards based on"
-	elog "r600 chipset and newer."
-	elog "This represent the ATI Radeon HD series at this moment."
-	elog
-	elog "If your card is older then usage of ${CATEGORY}/xf86-video-ati"
-	elog "as replacement is highly recommended. Rather than staying with"
-	elog "old versions of this driver."
-	elog "For migration informations please reffer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# 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
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# version patches
-	# epatch "${FILESDIR}"/kernel/${PV}-*.patch
-	if use debug; then
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	cd "${MODULE_DIR}"
-	# bugged fglrx build system, this file should be copied by hand
-	cp "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
-
-	# Add 2.6.39 support
-	epatch "${FILESDIR}"/ati-drivers-2.6.39.patch
-
-	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"
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	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."
-	linux-mod_pkg_postinst
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-11.8.ebuild b/x11-drivers/ati-drivers/ati-drivers-11.8.ebuild
deleted file mode 100644
index d009c8c1..00000000
--- a/x11-drivers/ati-drivers/ati-drivers-11.8.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils multilib linux-info linux-mod toolchain-funcs versionator
-
-DESCRIPTION="AMD kernel drivers for r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://ati.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE="debug multilib"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="multilib? ( ~x11-drivers/ati-userspace-${PV}[multilib] )
-	~x11-drivers/ati-userspace-${PV}
-	sys-power/acpid"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-_check_kernel_config() {
-	local failed=0
-	local error=""
-	if ! kernel_is ge 2 6; then
-		eerror "You need a 2.6 linux kernel to compile against!"
-		die "No 2.6 Kernel found"
-	fi
-
-	if ! linux_chkconfig_present MTRR; then
-		ewarn "You don't have MTRR support enabled in the kernel."
-		ewarn "Direct rendering will not work."
-	fi
-
-	if linux_chkconfig_builtin DRM; then
-		ewarn "You have DRM support built in to the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present AGP && \
-		! linux_chkconfig_present PCIEPORTBUS; then
-		ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present ACPI; then
-		eerror "${P} requires the ACPI support in the kernel"
-		eerror "Please enable it:"
-		eerror "    CONFIG_ACPI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Power management and ACPI options --->"
-		eerror "        [*] Power Management support"
-		eerror "in the 'menuconfig'"
-		error+=" CONFIG_ACPI disabled;"
-		failed=1
-	fi
-
-	if ! linux_chkconfig_present PCI_MSI; then
-		eerror "${P} requires MSI in the kernel."
-		eerror "Please enable it:"
-		eerror "    CONFIG_PCI_MSI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Bus options (PCI etc.)  --->"
-		eerror "        [*] Message Signaled Interrupts (MSI and MSI-X)"
-		eerror "in the kernel config."
-		error+=" CONFIG_PCI_MSI disabled;"
-		failed=1
-	fi
-
-	if linux_chkconfig_present LOCKDEP; then
-		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
-		eerror "Unfortunately, this option exports the symbol lock_acquire as GPL-only."
-		eerror "This prevents ${P} from compiling with an error like this:"
-		eerror "FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
-		eerror "Please make sure the following options have been unset:"
-		eerror "    Kernel hacking  --->"
-		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
-		eerror "        [ ] Lock debugging: prove locking correctness"
-		eerror "        [ ] Lock usage statistics"
-		eerror "in 'menuconfig'"
-		error+=" LOCKDEP enabled;"
-		failed=1
-	fi
-
-	use amd64 && if ! linux_chkconfig_present COMPAT; then
-		eerror "${P} requires COMPAT."
-		eerror "Please enable the 32 bit emulation:"
-		eerror "Executable file formats / Emulations  --->"
-		eerror "    [*] IA32 Emulation"
-		eerror "in the kernel config."
-		eerror "if this doesn't enable CONFIG_COMPAT add"
-		eerror "    CONFIG_COMPAT=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" COMPAT disabled;"
-		failed=1
-	fi
-
-	kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then
-		eerror "${P} requires BKL."
-		eerror "Please enable the Big Kernel Lock:"
-		eerror "Kernel hacking  --->"
-		eerror "    [*] Big Kernel Lock"
-		eerror "in the kernel config."
-		eerror "or add"
-		eerror "    CONFIG_BKL=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" BKL disabled;"
-		failed=1
-	fi
-
-	[[ ${failed} -ne 0 ]] && die "${error}"
-}
-
-pkg_pretend() {
-	# workaround until bug 365543 is solved
-	linux-info_pkg_setup
-	require_configured_kernel
-	_check_kernel_config
-}
-
-pkg_setup() {
-	MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/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}"
-	BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
-	if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
-	else
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
-	fi
-
-	# amd64/x86
-	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
-
-	# Define module dir.
-	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
-
-	elog
-	elog "Please note that this driver supports only graphic cards based on"
-	elog "r600 chipset and newer."
-	elog "This represent the ATI Radeon HD series at this moment."
-	elog
-	elog "If your card is older then usage of ${CATEGORY}/xf86-video-ati"
-	elog "as replacement is highly recommended. Rather than staying with"
-	elog "old versions of this driver."
-	elog "For migration informations please reffer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# 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
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# version patches
-	# epatch "${FILESDIR}"/kernel/${PV}-*.patch
-	if use debug; then
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	cd "${MODULE_DIR}"
-	# bugged fglrx build system, this file should be copied by hand
-	cp "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
-
-	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"
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	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."
-	linux-mod_pkg_postinst
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-11.9.ebuild b/x11-drivers/ati-drivers/ati-drivers-11.9.ebuild
deleted file mode 100644
index d009c8c1..00000000
--- a/x11-drivers/ati-drivers/ati-drivers-11.9.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils multilib linux-info linux-mod toolchain-funcs versionator
-
-DESCRIPTION="AMD kernel drivers for r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://ati.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE="debug multilib"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="multilib? ( ~x11-drivers/ati-userspace-${PV}[multilib] )
-	~x11-drivers/ati-userspace-${PV}
-	sys-power/acpid"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-_check_kernel_config() {
-	local failed=0
-	local error=""
-	if ! kernel_is ge 2 6; then
-		eerror "You need a 2.6 linux kernel to compile against!"
-		die "No 2.6 Kernel found"
-	fi
-
-	if ! linux_chkconfig_present MTRR; then
-		ewarn "You don't have MTRR support enabled in the kernel."
-		ewarn "Direct rendering will not work."
-	fi
-
-	if linux_chkconfig_builtin DRM; then
-		ewarn "You have DRM support built in to the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present AGP && \
-		! linux_chkconfig_present PCIEPORTBUS; then
-		ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present ACPI; then
-		eerror "${P} requires the ACPI support in the kernel"
-		eerror "Please enable it:"
-		eerror "    CONFIG_ACPI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Power management and ACPI options --->"
-		eerror "        [*] Power Management support"
-		eerror "in the 'menuconfig'"
-		error+=" CONFIG_ACPI disabled;"
-		failed=1
-	fi
-
-	if ! linux_chkconfig_present PCI_MSI; then
-		eerror "${P} requires MSI in the kernel."
-		eerror "Please enable it:"
-		eerror "    CONFIG_PCI_MSI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Bus options (PCI etc.)  --->"
-		eerror "        [*] Message Signaled Interrupts (MSI and MSI-X)"
-		eerror "in the kernel config."
-		error+=" CONFIG_PCI_MSI disabled;"
-		failed=1
-	fi
-
-	if linux_chkconfig_present LOCKDEP; then
-		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
-		eerror "Unfortunately, this option exports the symbol lock_acquire as GPL-only."
-		eerror "This prevents ${P} from compiling with an error like this:"
-		eerror "FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
-		eerror "Please make sure the following options have been unset:"
-		eerror "    Kernel hacking  --->"
-		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
-		eerror "        [ ] Lock debugging: prove locking correctness"
-		eerror "        [ ] Lock usage statistics"
-		eerror "in 'menuconfig'"
-		error+=" LOCKDEP enabled;"
-		failed=1
-	fi
-
-	use amd64 && if ! linux_chkconfig_present COMPAT; then
-		eerror "${P} requires COMPAT."
-		eerror "Please enable the 32 bit emulation:"
-		eerror "Executable file formats / Emulations  --->"
-		eerror "    [*] IA32 Emulation"
-		eerror "in the kernel config."
-		eerror "if this doesn't enable CONFIG_COMPAT add"
-		eerror "    CONFIG_COMPAT=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" COMPAT disabled;"
-		failed=1
-	fi
-
-	kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then
-		eerror "${P} requires BKL."
-		eerror "Please enable the Big Kernel Lock:"
-		eerror "Kernel hacking  --->"
-		eerror "    [*] Big Kernel Lock"
-		eerror "in the kernel config."
-		eerror "or add"
-		eerror "    CONFIG_BKL=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" BKL disabled;"
-		failed=1
-	fi
-
-	[[ ${failed} -ne 0 ]] && die "${error}"
-}
-
-pkg_pretend() {
-	# workaround until bug 365543 is solved
-	linux-info_pkg_setup
-	require_configured_kernel
-	_check_kernel_config
-}
-
-pkg_setup() {
-	MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/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}"
-	BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
-	if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
-	else
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
-	fi
-
-	# amd64/x86
-	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
-
-	# Define module dir.
-	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
-
-	elog
-	elog "Please note that this driver supports only graphic cards based on"
-	elog "r600 chipset and newer."
-	elog "This represent the ATI Radeon HD series at this moment."
-	elog
-	elog "If your card is older then usage of ${CATEGORY}/xf86-video-ati"
-	elog "as replacement is highly recommended. Rather than staying with"
-	elog "old versions of this driver."
-	elog "For migration informations please reffer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# 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
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# version patches
-	# epatch "${FILESDIR}"/kernel/${PV}-*.patch
-	if use debug; then
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	cd "${MODULE_DIR}"
-	# bugged fglrx build system, this file should be copied by hand
-	cp "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
-
-	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"
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	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."
-	linux-mod_pkg_postinst
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-12.1-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.1-r1.ebuild
deleted file mode 100644
index 747e5e1d..00000000
--- a/x11-drivers/ati-drivers/ati-drivers-12.1-r1.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils multilib linux-info linux-mod toolchain-funcs versionator
-
-DESCRIPTION="AMD kernel drivers for radeon r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/amd-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE="debug multilib pax_kernel"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="multilib? ( ~x11-drivers/ati-userspace-${PV}[multilib] )
-	~x11-drivers/ati-userspace-${PV}
-	sys-power/acpid"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-_check_kernel_config() {
-	local failed=0
-	local error=""
-	if ! kernel_is ge 2 6; then
-		eerror "You need a 2.6 linux kernel to compile against!"
-		die "No 2.6 Kernel found"
-	fi
-
-	if ! linux_chkconfig_present MTRR; then
-		ewarn "You don't have MTRR support enabled in the kernel."
-		ewarn "Direct rendering will not work."
-	fi
-
-	if linux_chkconfig_builtin DRM; then
-		ewarn "You have DRM support built in to the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present AGP && \
-		! linux_chkconfig_present PCIEPORTBUS; then
-		ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present ACPI; then
-		eerror "${P} requires the ACPI support in the kernel"
-		eerror "Please enable it:"
-		eerror "    CONFIG_ACPI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Power management and ACPI options --->"
-		eerror "        [*] Power Management support"
-		eerror "in the 'menuconfig'"
-		error+=" CONFIG_ACPI disabled;"
-		failed=1
-	fi
-
-	if ! linux_chkconfig_present PCI_MSI; then
-		eerror "${P} requires MSI in the kernel."
-		eerror "Please enable it:"
-		eerror "    CONFIG_PCI_MSI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Bus options (PCI etc.)  --->"
-		eerror "        [*] Message Signaled Interrupts (MSI and MSI-X)"
-		eerror "in the kernel config."
-		error+=" CONFIG_PCI_MSI disabled;"
-		failed=1
-	fi
-
-	if linux_chkconfig_present LOCKDEP; then
-		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
-		eerror "Unfortunately, this option exports the symbol lock_acquire as GPL-only."
-		eerror "This prevents ${P} from compiling with an error like this:"
-		eerror "FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
-		eerror "Please make sure the following options have been unset:"
-		eerror "    Kernel hacking  --->"
-		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
-		eerror "        [ ] Lock debugging: prove locking correctness"
-		eerror "        [ ] Lock usage statistics"
-		eerror "in 'menuconfig'"
-		error+=" LOCKDEP enabled;"
-		failed=1
-	fi
-
-	use amd64 && if ! linux_chkconfig_present COMPAT; then
-		eerror "${P} requires COMPAT."
-		eerror "Please enable the 32 bit emulation:"
-		eerror "Executable file formats / Emulations  --->"
-		eerror "    [*] IA32 Emulation"
-		eerror "in the kernel config."
-		eerror "if this doesn't enable CONFIG_COMPAT add"
-		eerror "    CONFIG_COMPAT=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" COMPAT disabled;"
-		failed=1
-	fi
-
-	kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then
-		eerror "${P} requires BKL."
-		eerror "Please enable the Big Kernel Lock:"
-		eerror "Kernel hacking  --->"
-		eerror "    [*] Big Kernel Lock"
-		eerror "in the kernel config."
-		eerror "or add"
-		eerror "    CONFIG_BKL=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" BKL disabled;"
-		failed=1
-	fi
-
-	[[ ${failed} -ne 0 ]] && die "${error}"
-}
-
-pkg_pretend() {
-	# workaround until bug 365543 is solved
-	linux-info_pkg_setup
-	require_configured_kernel
-	_check_kernel_config
-}
-
-pkg_setup() {
-	MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/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}"
-	BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
-	if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
-	else
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
-	fi
-
-	# amd64/x86
-	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
-
-	# Define module dir.
-	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
-
-	elog
-	elog "Please note that this driver supports only graphic cards based on"
-	elog "r600 chipset and newer."
-	elog "This represent the AMD Radeon HD series at this moment."
-	elog
-	elog "If your card is older then usage of ${CATEGORY}/xf86-video-ati"
-	elog "as replacement is highly recommended. Rather than staying with"
-	elog "old versions of this driver."
-	elog "For migration informations please reffer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# 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
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# version patches
-	# epatch "${FILESDIR}"/kernel/${PV}-*.patch
-	if use debug; then
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	# fix needed for at least hardened-sources, see bug #392753
-	use pax_kernel && epatch "${FILESDIR}"/ati-drivers-redefine-WARN.patch
-
-	cd "${MODULE_DIR}"
-	# bugged fglrx build system, this file should be copied by hand
-	cp "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
-
-	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"
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	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."
-	linux-mod_pkg_postinst
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-12.10.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.10.ebuild
deleted file mode 100644
index 842b2f58..00000000
--- a/x11-drivers/ati-drivers/ati-drivers-12.10.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils multilib linux-info linux-mod toolchain-funcs versionator
-
-DESCRIPTION="AMD kernel drivers for radeon r600 (HD5000 Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-MY_V=( $(get_version_components) )
-#RUN="${WORKDIR}/amd-driver-installer-9.00-x86.x86_64.run"
-SRC_URI="http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-${PV}-x86.x86_64.zip"
-FOLDER_PREFIX="common/"
-IUSE="debug multilib x-multilib pax_kernel"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="x-multilib? ( ~x11-drivers/ati-userspace-${PV}[x-multilib] )
-	multilib? ( ~x11-drivers/ati-userspace-${PV}[multilib] )
-	~x11-drivers/ati-userspace-${PV}
-	sys-power/acpid"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-_check_kernel_config() {
-	local failed=0
-	local error=""
-	if ! kernel_is ge 2 6; then
-		eerror "You need a 2.6 linux kernel to compile against!"
-		die "No 2.6 Kernel found"
-	fi
-
-	if ! linux_chkconfig_present MTRR; then
-		ewarn "You don't have MTRR support enabled in the kernel."
-		ewarn "Direct rendering will not work."
-	fi
-
-	if linux_chkconfig_builtin DRM; then
-		ewarn "You have DRM support built in to the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present AGP && \
-		! linux_chkconfig_present PCIEPORTBUS; then
-		ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present ACPI; then
-		eerror "${P} requires the ACPI support in the kernel"
-		eerror "Please enable it:"
-		eerror "    CONFIG_ACPI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Power management and ACPI options --->"
-		eerror "        [*] Power Management support"
-		eerror "in the 'menuconfig'"
-		error+=" CONFIG_ACPI disabled;"
-		failed=1
-	fi
-
-	if ! linux_chkconfig_present PCI_MSI; then
-		eerror "${P} requires MSI in the kernel."
-		eerror "Please enable it:"
-		eerror "    CONFIG_PCI_MSI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Bus options (PCI etc.)  --->"
-		eerror "        [*] Message Signaled Interrupts (MSI and MSI-X)"
-		eerror "in the kernel config."
-		error+=" CONFIG_PCI_MSI disabled;"
-		failed=1
-	fi
-
-	if linux_chkconfig_present LOCKDEP; then
-		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
-		eerror "Unfortunately, this option exports the symbol lock_acquire as GPL-only."
-		eerror "This prevents ${P} from compiling with an error like this:"
-		eerror "FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
-		eerror "Please make sure the following options have been unset:"
-		eerror "    Kernel hacking  --->"
-		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
-		eerror "        [ ] Lock debugging: prove locking correctness"
-		eerror "        [ ] Lock usage statistics"
-		eerror "in 'menuconfig'"
-		error+=" LOCKDEP enabled;"
-		failed=1
-	fi
-
-	use amd64 && if ! linux_chkconfig_present COMPAT; then
-		eerror "${P} requires COMPAT."
-		eerror "Please enable the 32 bit emulation:"
-		eerror "Executable file formats / Emulations  --->"
-		eerror "    [*] IA32 Emulation"
-		eerror "in the kernel config."
-		eerror "if this doesn't enable CONFIG_COMPAT add"
-		eerror "    CONFIG_COMPAT=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" COMPAT disabled;"
-		failed=1
-	fi
-
-	kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then
-		eerror "${P} requires BKL."
-		eerror "Please enable the Big Kernel Lock:"
-		eerror "Kernel hacking  --->"
-		eerror "    [*] Big Kernel Lock"
-		eerror "in the kernel config."
-		eerror "or add"
-		eerror "    CONFIG_BKL=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" BKL disabled;"
-		failed=1
-	fi
-
-	[[ ${failed} -ne 0 ]] && die "${error}"
-}
-
-pkg_pretend() {
-	# workaround until bug 365543 is solved
-	linux-info_pkg_setup
-	require_configured_kernel
-	_check_kernel_config
-}
-
-pkg_setup() {
-	MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/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}"
-	BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
-	if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
-	else
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
-	fi
-
-	# amd64/x86
-	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
-
-	# Define module dir.
-	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
-
-	elog
-	elog "Please note that this driver supports only graphic cards based on"
-	elog "Evergreen chipset and newer."
-	elog "This represent the AMD Radeon HD 5400+ series at this moment."
-	elog
-	elog "If your card is older then use ${CATEGORY}/xf86-video-ati"
-	elog "For migration informations please reffer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	if [[ ${A} =~ .*\.tar\.gz ]]; then
-		unpack ${A}
-	else
-		#please note, RUN may be insanely assigned at top near SRC_URI
-		if [[ ${A} =~ .*\.zip ]]; then
-			unpack ${A}
-			[[ -z "$RUN" ]] && RUN="${S}/${A/%.zip/.run}"
-		else
-			RUN="${DISTDIR}/${A}"
-		fi
-		sh ${RUN} --extract "${S}" 2>&1 > /dev/null || die
-	fi
-}
-
-src_prepare() {
-	# version patches
-	# epatch "${FILESDIR}"/kernel/${PV}-*.patch
-	if use debug; then
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	# see http://ati.cchtml.com/show_bug.cgi?id=495
-	#epatch "${FILESDIR}"/ati-drivers-old_rsp.patch
-	# first hunk applied upstream second (x32 related) was not
-	epatch "${FILESDIR}"/ati-drivers-x32_something_something.patch
-
-	# compile fix for linux-3.7
-	# https://bugs.gentoo.org/show_bug.cgi?id=438516
-	epatch "${FILESDIR}/ati-drivers-vm-reserverd.patch"
-
-	cd "${MODULE_DIR}"
-	# bugged fglrx build system, this file should be copied by hand
-	cp "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
-
-	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"
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	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."
-	linux-mod_pkg_postinst
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-12.2.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.2.ebuild
deleted file mode 100644
index 4a971613..00000000
--- a/x11-drivers/ati-drivers/ati-drivers-12.2.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils multilib linux-info linux-mod toolchain-funcs versionator
-
-DESCRIPTION="AMD kernel drivers for radeon r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/amd-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE="debug multilib pax_kernel"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="multilib? ( ~x11-drivers/ati-userspace-${PV}[multilib] )
-	~x11-drivers/ati-userspace-${PV}
-	sys-power/acpid"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-_check_kernel_config() {
-	local failed=0
-	local error=""
-	if ! kernel_is ge 2 6; then
-		eerror "You need a 2.6 linux kernel to compile against!"
-		die "No 2.6 Kernel found"
-	fi
-
-	if ! linux_chkconfig_present MTRR; then
-		ewarn "You don't have MTRR support enabled in the kernel."
-		ewarn "Direct rendering will not work."
-	fi
-
-	if linux_chkconfig_builtin DRM; then
-		ewarn "You have DRM support built in to the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present AGP && \
-		! linux_chkconfig_present PCIEPORTBUS; then
-		ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present ACPI; then
-		eerror "${P} requires the ACPI support in the kernel"
-		eerror "Please enable it:"
-		eerror "    CONFIG_ACPI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Power management and ACPI options --->"
-		eerror "        [*] Power Management support"
-		eerror "in the 'menuconfig'"
-		error+=" CONFIG_ACPI disabled;"
-		failed=1
-	fi
-
-	if ! linux_chkconfig_present PCI_MSI; then
-		eerror "${P} requires MSI in the kernel."
-		eerror "Please enable it:"
-		eerror "    CONFIG_PCI_MSI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Bus options (PCI etc.)  --->"
-		eerror "        [*] Message Signaled Interrupts (MSI and MSI-X)"
-		eerror "in the kernel config."
-		error+=" CONFIG_PCI_MSI disabled;"
-		failed=1
-	fi
-
-	if linux_chkconfig_present LOCKDEP; then
-		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
-		eerror "Unfortunately, this option exports the symbol lock_acquire as GPL-only."
-		eerror "This prevents ${P} from compiling with an error like this:"
-		eerror "FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
-		eerror "Please make sure the following options have been unset:"
-		eerror "    Kernel hacking  --->"
-		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
-		eerror "        [ ] Lock debugging: prove locking correctness"
-		eerror "        [ ] Lock usage statistics"
-		eerror "in 'menuconfig'"
-		error+=" LOCKDEP enabled;"
-		failed=1
-	fi
-
-	use amd64 && if ! linux_chkconfig_present COMPAT; then
-		eerror "${P} requires COMPAT."
-		eerror "Please enable the 32 bit emulation:"
-		eerror "Executable file formats / Emulations  --->"
-		eerror "    [*] IA32 Emulation"
-		eerror "in the kernel config."
-		eerror "if this doesn't enable CONFIG_COMPAT add"
-		eerror "    CONFIG_COMPAT=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" COMPAT disabled;"
-		failed=1
-	fi
-
-	kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then
-		eerror "${P} requires BKL."
-		eerror "Please enable the Big Kernel Lock:"
-		eerror "Kernel hacking  --->"
-		eerror "    [*] Big Kernel Lock"
-		eerror "in the kernel config."
-		eerror "or add"
-		eerror "    CONFIG_BKL=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" BKL disabled;"
-		failed=1
-	fi
-
-	[[ ${failed} -ne 0 ]] && die "${error}"
-}
-
-pkg_pretend() {
-	# workaround until bug 365543 is solved
-	linux-info_pkg_setup
-	require_configured_kernel
-	_check_kernel_config
-}
-
-pkg_setup() {
-	MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/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}"
-	BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
-	if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
-	else
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
-	fi
-
-	# amd64/x86
-	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
-
-	# Define module dir.
-	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
-
-	elog
-	elog "Please note that this driver supports only graphic cards based on"
-	elog "r600 chipset and newer."
-	elog "This represent the AMD Radeon HD series at this moment."
-	elog
-	elog "If your card is older then usage of ${CATEGORY}/xf86-video-ati"
-	elog "as replacement is highly recommended. Rather than staying with"
-	elog "old versions of this driver."
-	elog "For migration informations please reffer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# 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
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# version patches
-	# epatch "${FILESDIR}"/kernel/${PV}-*.patch
-	if use debug; then
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	# fix needed for at least hardened-sources, see bug #392753
-	use pax_kernel && epatch "${FILESDIR}"/ati-drivers-12.2-redefine-WARN.patch
-
-	# Fix compilation with 3.2.8 and 3.3 kernels
-	epatch "${FILESDIR}/ati-drivers-3.2.8+.patch"
-
-	cd "${MODULE_DIR}"
-	# bugged fglrx build system, this file should be copied by hand
-	cp "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
-
-	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"
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	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."
-	linux-mod_pkg_postinst
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-12.3.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.3.ebuild
deleted file mode 100644
index 4a971613..00000000
--- a/x11-drivers/ati-drivers/ati-drivers-12.3.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils multilib linux-info linux-mod toolchain-funcs versionator
-
-DESCRIPTION="AMD kernel drivers for radeon r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/amd-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE="debug multilib pax_kernel"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="multilib? ( ~x11-drivers/ati-userspace-${PV}[multilib] )
-	~x11-drivers/ati-userspace-${PV}
-	sys-power/acpid"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-_check_kernel_config() {
-	local failed=0
-	local error=""
-	if ! kernel_is ge 2 6; then
-		eerror "You need a 2.6 linux kernel to compile against!"
-		die "No 2.6 Kernel found"
-	fi
-
-	if ! linux_chkconfig_present MTRR; then
-		ewarn "You don't have MTRR support enabled in the kernel."
-		ewarn "Direct rendering will not work."
-	fi
-
-	if linux_chkconfig_builtin DRM; then
-		ewarn "You have DRM support built in to the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present AGP && \
-		! linux_chkconfig_present PCIEPORTBUS; then
-		ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present ACPI; then
-		eerror "${P} requires the ACPI support in the kernel"
-		eerror "Please enable it:"
-		eerror "    CONFIG_ACPI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Power management and ACPI options --->"
-		eerror "        [*] Power Management support"
-		eerror "in the 'menuconfig'"
-		error+=" CONFIG_ACPI disabled;"
-		failed=1
-	fi
-
-	if ! linux_chkconfig_present PCI_MSI; then
-		eerror "${P} requires MSI in the kernel."
-		eerror "Please enable it:"
-		eerror "    CONFIG_PCI_MSI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Bus options (PCI etc.)  --->"
-		eerror "        [*] Message Signaled Interrupts (MSI and MSI-X)"
-		eerror "in the kernel config."
-		error+=" CONFIG_PCI_MSI disabled;"
-		failed=1
-	fi
-
-	if linux_chkconfig_present LOCKDEP; then
-		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
-		eerror "Unfortunately, this option exports the symbol lock_acquire as GPL-only."
-		eerror "This prevents ${P} from compiling with an error like this:"
-		eerror "FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
-		eerror "Please make sure the following options have been unset:"
-		eerror "    Kernel hacking  --->"
-		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
-		eerror "        [ ] Lock debugging: prove locking correctness"
-		eerror "        [ ] Lock usage statistics"
-		eerror "in 'menuconfig'"
-		error+=" LOCKDEP enabled;"
-		failed=1
-	fi
-
-	use amd64 && if ! linux_chkconfig_present COMPAT; then
-		eerror "${P} requires COMPAT."
-		eerror "Please enable the 32 bit emulation:"
-		eerror "Executable file formats / Emulations  --->"
-		eerror "    [*] IA32 Emulation"
-		eerror "in the kernel config."
-		eerror "if this doesn't enable CONFIG_COMPAT add"
-		eerror "    CONFIG_COMPAT=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" COMPAT disabled;"
-		failed=1
-	fi
-
-	kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then
-		eerror "${P} requires BKL."
-		eerror "Please enable the Big Kernel Lock:"
-		eerror "Kernel hacking  --->"
-		eerror "    [*] Big Kernel Lock"
-		eerror "in the kernel config."
-		eerror "or add"
-		eerror "    CONFIG_BKL=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" BKL disabled;"
-		failed=1
-	fi
-
-	[[ ${failed} -ne 0 ]] && die "${error}"
-}
-
-pkg_pretend() {
-	# workaround until bug 365543 is solved
-	linux-info_pkg_setup
-	require_configured_kernel
-	_check_kernel_config
-}
-
-pkg_setup() {
-	MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/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}"
-	BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
-	if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
-	else
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
-	fi
-
-	# amd64/x86
-	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
-
-	# Define module dir.
-	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
-
-	elog
-	elog "Please note that this driver supports only graphic cards based on"
-	elog "r600 chipset and newer."
-	elog "This represent the AMD Radeon HD series at this moment."
-	elog
-	elog "If your card is older then usage of ${CATEGORY}/xf86-video-ati"
-	elog "as replacement is highly recommended. Rather than staying with"
-	elog "old versions of this driver."
-	elog "For migration informations please reffer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# 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
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# version patches
-	# epatch "${FILESDIR}"/kernel/${PV}-*.patch
-	if use debug; then
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	# fix needed for at least hardened-sources, see bug #392753
-	use pax_kernel && epatch "${FILESDIR}"/ati-drivers-12.2-redefine-WARN.patch
-
-	# Fix compilation with 3.2.8 and 3.3 kernels
-	epatch "${FILESDIR}/ati-drivers-3.2.8+.patch"
-
-	cd "${MODULE_DIR}"
-	# bugged fglrx build system, this file should be copied by hand
-	cp "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
-
-	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"
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	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."
-	linux-mod_pkg_postinst
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild
deleted file mode 100644
index f72a2c59..00000000
--- a/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils multilib linux-info linux-mod toolchain-funcs versionator
-
-DESCRIPTION="AMD kernel drivers for radeon r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/amd-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE="debug multilib pax_kernel"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="multilib? ( ~x11-drivers/ati-userspace-${PV}[multilib] )
-	~x11-drivers/ati-userspace-${PV}
-	sys-power/acpid"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-_check_kernel_config() {
-	local failed=0
-	local error=""
-	if ! kernel_is ge 2 6; then
-		eerror "You need a 2.6 linux kernel to compile against!"
-		die "No 2.6 Kernel found"
-	fi
-
-	if ! linux_chkconfig_present MTRR; then
-		ewarn "You don't have MTRR support enabled in the kernel."
-		ewarn "Direct rendering will not work."
-	fi
-
-	if linux_chkconfig_builtin DRM; then
-		ewarn "You have DRM support built in to the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present AGP && \
-		! linux_chkconfig_present PCIEPORTBUS; then
-		ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present ACPI; then
-		eerror "${P} requires the ACPI support in the kernel"
-		eerror "Please enable it:"
-		eerror "    CONFIG_ACPI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Power management and ACPI options --->"
-		eerror "        [*] Power Management support"
-		eerror "in the 'menuconfig'"
-		error+=" CONFIG_ACPI disabled;"
-		failed=1
-	fi
-
-	if ! linux_chkconfig_present PCI_MSI; then
-		eerror "${P} requires MSI in the kernel."
-		eerror "Please enable it:"
-		eerror "    CONFIG_PCI_MSI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Bus options (PCI etc.)  --->"
-		eerror "        [*] Message Signaled Interrupts (MSI and MSI-X)"
-		eerror "in the kernel config."
-		error+=" CONFIG_PCI_MSI disabled;"
-		failed=1
-	fi
-
-	if linux_chkconfig_present LOCKDEP; then
-		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
-		eerror "Unfortunately, this option exports the symbol lock_acquire as GPL-only."
-		eerror "This prevents ${P} from compiling with an error like this:"
-		eerror "FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
-		eerror "Please make sure the following options have been unset:"
-		eerror "    Kernel hacking  --->"
-		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
-		eerror "        [ ] Lock debugging: prove locking correctness"
-		eerror "        [ ] Lock usage statistics"
-		eerror "in 'menuconfig'"
-		error+=" LOCKDEP enabled;"
-		failed=1
-	fi
-
-	use amd64 && if ! linux_chkconfig_present COMPAT; then
-		eerror "${P} requires COMPAT."
-		eerror "Please enable the 32 bit emulation:"
-		eerror "Executable file formats / Emulations  --->"
-		eerror "    [*] IA32 Emulation"
-		eerror "in the kernel config."
-		eerror "if this doesn't enable CONFIG_COMPAT add"
-		eerror "    CONFIG_COMPAT=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" COMPAT disabled;"
-		failed=1
-	fi
-
-	kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then
-		eerror "${P} requires BKL."
-		eerror "Please enable the Big Kernel Lock:"
-		eerror "Kernel hacking  --->"
-		eerror "    [*] Big Kernel Lock"
-		eerror "in the kernel config."
-		eerror "or add"
-		eerror "    CONFIG_BKL=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" BKL disabled;"
-		failed=1
-	fi
-
-	[[ ${failed} -ne 0 ]] && die "${error}"
-}
-
-pkg_pretend() {
-	# workaround until bug 365543 is solved
-	linux-info_pkg_setup
-	require_configured_kernel
-	_check_kernel_config
-}
-
-pkg_setup() {
-	MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/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}"
-	BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
-	if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
-	else
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
-	fi
-
-	# amd64/x86
-	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
-
-	# Define module dir.
-	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
-
-	elog
-	elog "Please note that this driver supports only graphic cards based on"
-	elog "r600 chipset and newer."
-	elog "This represent the AMD Radeon HD series at this moment."
-	elog
-	elog "If your card is older then usage of ${CATEGORY}/xf86-video-ati"
-	elog "as replacement is highly recommended. Rather than staying with"
-	elog "old versions of this driver."
-	elog "For migration informations please reffer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# 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
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# version patches
-	# epatch "${FILESDIR}"/kernel/${PV}-*.patch
-	if use debug; then
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	# fix needed for at least hardened-sources, see bug #392753
-	use pax_kernel && epatch "${FILESDIR}"/ati-drivers-12.2-redefine-WARN.patch
-
-	# Fix compilation with 3.2.8 and 3.3 kernels
-	epatch "${FILESDIR}/ati-drivers-3.2.8+.patch"
-
-	# see http://ati.cchtml.com/show_bug.cgi?id=495
-	kernel_is ge 3 4 0 && epatch "${FILESDIR}/ati-drivers-old_rsp.patch"
-
-	cd "${MODULE_DIR}"
-	# bugged fglrx build system, this file should be copied by hand
-	cp "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
-
-	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"
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	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."
-	linux-mod_pkg_postinst
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-12.6.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.6.ebuild
deleted file mode 100644
index fdd262e8..00000000
--- a/x11-drivers/ati-drivers/ati-drivers-12.6.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils multilib linux-info linux-mod toolchain-funcs versionator
-
-DESCRIPTION="AMD kernel drivers for radeon r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-MY_V=( $(get_version_components) )
-if [[ ${MY_V[2]} != beta ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/amd-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE="debug multilib pax_kernel"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="multilib? ( ~x11-drivers/ati-userspace-${PV}[multilib] )
-	~x11-drivers/ati-userspace-${PV}
-	sys-power/acpid"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-_check_kernel_config() {
-	local failed=0
-	local error=""
-	if ! kernel_is ge 2 6; then
-		eerror "You need a 2.6 linux kernel to compile against!"
-		die "No 2.6 Kernel found"
-	fi
-
-	if ! linux_chkconfig_present MTRR; then
-		ewarn "You don't have MTRR support enabled in the kernel."
-		ewarn "Direct rendering will not work."
-	fi
-
-	if linux_chkconfig_builtin DRM; then
-		ewarn "You have DRM support built in to the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present AGP && \
-		! linux_chkconfig_present PCIEPORTBUS; then
-		ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present ACPI; then
-		eerror "${P} requires the ACPI support in the kernel"
-		eerror "Please enable it:"
-		eerror "    CONFIG_ACPI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Power management and ACPI options --->"
-		eerror "        [*] Power Management support"
-		eerror "in the 'menuconfig'"
-		error+=" CONFIG_ACPI disabled;"
-		failed=1
-	fi
-
-	if ! linux_chkconfig_present PCI_MSI; then
-		eerror "${P} requires MSI in the kernel."
-		eerror "Please enable it:"
-		eerror "    CONFIG_PCI_MSI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Bus options (PCI etc.)  --->"
-		eerror "        [*] Message Signaled Interrupts (MSI and MSI-X)"
-		eerror "in the kernel config."
-		error+=" CONFIG_PCI_MSI disabled;"
-		failed=1
-	fi
-
-	if linux_chkconfig_present LOCKDEP; then
-		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
-		eerror "Unfortunately, this option exports the symbol lock_acquire as GPL-only."
-		eerror "This prevents ${P} from compiling with an error like this:"
-		eerror "FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
-		eerror "Please make sure the following options have been unset:"
-		eerror "    Kernel hacking  --->"
-		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
-		eerror "        [ ] Lock debugging: prove locking correctness"
-		eerror "        [ ] Lock usage statistics"
-		eerror "in 'menuconfig'"
-		error+=" LOCKDEP enabled;"
-		failed=1
-	fi
-
-	use amd64 && if ! linux_chkconfig_present COMPAT; then
-		eerror "${P} requires COMPAT."
-		eerror "Please enable the 32 bit emulation:"
-		eerror "Executable file formats / Emulations  --->"
-		eerror "    [*] IA32 Emulation"
-		eerror "in the kernel config."
-		eerror "if this doesn't enable CONFIG_COMPAT add"
-		eerror "    CONFIG_COMPAT=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" COMPAT disabled;"
-		failed=1
-	fi
-
-	kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then
-		eerror "${P} requires BKL."
-		eerror "Please enable the Big Kernel Lock:"
-		eerror "Kernel hacking  --->"
-		eerror "    [*] Big Kernel Lock"
-		eerror "in the kernel config."
-		eerror "or add"
-		eerror "    CONFIG_BKL=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" BKL disabled;"
-		failed=1
-	fi
-
-	if linux_chkconfig_present X86_X32; then
-		eerror "You've enabled x32 in the kernel."
-		eerror "Unfortunately, this option is not supported yet and prevents the fglrx"
-		eerror "kernel module from loading."
-		error+=" X86_32 enabled;"
-		failed=1
-	fi
-
-	[[ ${failed} -ne 0 ]] && die "${error}"
-}
-
-pkg_pretend() {
-	# workaround until bug 365543 is solved
-	linux-info_pkg_setup
-	require_configured_kernel
-	_check_kernel_config
-}
-
-pkg_setup() {
-	MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/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}"
-	BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
-	if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
-	else
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
-	fi
-
-	# amd64/x86
-	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
-
-	# Define module dir.
-	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
-
-	elog
-	elog "Please note that this driver supports only graphic cards based on"
-	elog "Evergreen chipset and newer."
-	elog "This represent the AMD Radeon HD series at this moment."
-	elog
-	elog "If your card is older then usage of ${CATEGORY}/xf86-video-ati"
-	elog "as replacement is highly recommended. Rather than staying with"
-	elog "old versions of this driver."
-	elog "For migration informations please reffer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	if [[ ${MY_V[2]} == beta ]]; then
-		unpack ${A}
-		RUN="${S}/${A/%.zip/.run}"
-	else
-		RUN="${DISTDIR}/${A}"
-	fi
-	sh ${RUN} --extract "${S}" # 2>&1 > /dev/null || die
-}
-
-src_prepare() {
-	# version patches
-	# epatch "${FILESDIR}"/kernel/${PV}-*.patch
-	if use debug; then
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	# fix needed for at least hardened-sources, see bug #392753
-	use pax_kernel && epatch "${FILESDIR}"/ati-drivers-12.2-redefine-WARN.patch
-
-	# Fix compilation with 3.2.8 and 3.3 kernels
-	epatch "${FILESDIR}/ati-drivers-3.2.8+-2.patch"
-
-	# see http://ati.cchtml.com/show_bug.cgi?id=495
-	kernel_is ge 3 4 0 && epatch "${FILESDIR}/ati-drivers-old_rsp.patch"
-
-	#fixes bug #420751
-	epatch "${FILESDIR}"/ati-drivers-do_mmap.patch
-
-	cd "${MODULE_DIR}"
-	# bugged fglrx build system, this file should be copied by hand
-	cp "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
-
-	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"
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	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."
-	linux-mod_pkg_postinst
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild
deleted file mode 100644
index 0d39566f..00000000
--- a/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils multilib linux-info linux-mod toolchain-funcs versionator
-
-DESCRIPTION="AMD kernel drivers for radeon r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-MY_V=( $(get_version_components) )
-if [[ ${MY_V[2]} != beta ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/amd-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	#SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	SRC_URI="http://www2.ati.com/drivers/legacy/amd-driver-installer-12.6-legacy-x86.x86_64.zip"
-	FOLDER_PREFIX="common/"
-fi
-IUSE="debug multilib pax_kernel"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="multilib? ( ~x11-drivers/ati-userspace-${PV}[multilib] )
-	~x11-drivers/ati-userspace-${PV}
-	sys-power/acpid"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-_check_kernel_config() {
-	local failed=0
-	local error=""
-	if ! kernel_is ge 2 6; then
-		eerror "You need a 2.6 linux kernel to compile against!"
-		die "No 2.6 Kernel found"
-	fi
-
-	if ! linux_chkconfig_present MTRR; then
-		ewarn "You don't have MTRR support enabled in the kernel."
-		ewarn "Direct rendering will not work."
-	fi
-
-	if linux_chkconfig_builtin DRM; then
-		ewarn "You have DRM support built in to the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present AGP && \
-		! linux_chkconfig_present PCIEPORTBUS; then
-		ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present ACPI; then
-		eerror "${P} requires the ACPI support in the kernel"
-		eerror "Please enable it:"
-		eerror "    CONFIG_ACPI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Power management and ACPI options --->"
-		eerror "        [*] Power Management support"
-		eerror "in the 'menuconfig'"
-		error+=" CONFIG_ACPI disabled;"
-		failed=1
-	fi
-
-	if ! linux_chkconfig_present PCI_MSI; then
-		eerror "${P} requires MSI in the kernel."
-		eerror "Please enable it:"
-		eerror "    CONFIG_PCI_MSI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Bus options (PCI etc.)  --->"
-		eerror "        [*] Message Signaled Interrupts (MSI and MSI-X)"
-		eerror "in the kernel config."
-		error+=" CONFIG_PCI_MSI disabled;"
-		failed=1
-	fi
-
-	if linux_chkconfig_present LOCKDEP; then
-		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
-		eerror "Unfortunately, this option exports the symbol lock_acquire as GPL-only."
-		eerror "This prevents ${P} from compiling with an error like this:"
-		eerror "FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
-		eerror "Please make sure the following options have been unset:"
-		eerror "    Kernel hacking  --->"
-		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
-		eerror "        [ ] Lock debugging: prove locking correctness"
-		eerror "        [ ] Lock usage statistics"
-		eerror "in 'menuconfig'"
-		error+=" LOCKDEP enabled;"
-		failed=1
-	fi
-
-	use amd64 && if ! linux_chkconfig_present COMPAT; then
-		eerror "${P} requires COMPAT."
-		eerror "Please enable the 32 bit emulation:"
-		eerror "Executable file formats / Emulations  --->"
-		eerror "    [*] IA32 Emulation"
-		eerror "in the kernel config."
-		eerror "if this doesn't enable CONFIG_COMPAT add"
-		eerror "    CONFIG_COMPAT=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" COMPAT disabled;"
-		failed=1
-	fi
-
-	kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then
-		eerror "${P} requires BKL."
-		eerror "Please enable the Big Kernel Lock:"
-		eerror "Kernel hacking  --->"
-		eerror "    [*] Big Kernel Lock"
-		eerror "in the kernel config."
-		eerror "or add"
-		eerror "    CONFIG_BKL=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" BKL disabled;"
-		failed=1
-	fi
-
-	[[ ${failed} -ne 0 ]] && die "${error}"
-}
-
-pkg_pretend() {
-	# workaround until bug 365543 is solved
-	linux-info_pkg_setup
-	require_configured_kernel
-	_check_kernel_config
-}
-
-pkg_setup() {
-	MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/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}"
-	BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
-	if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
-	else
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
-	fi
-
-	# amd64/x86
-	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
-
-	# Define module dir.
-	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
-
-	elog
-	elog "Please note that this driver supports only graphic cards based on"
-	elog "Evergreen chipset and newer."
-	elog "This represent the AMD Radeon HD series at this moment."
-	elog
-	elog "If your card is older then usage of ${CATEGORY}/xf86-video-ati"
-	elog "as replacement is highly recommended. Rather than staying with"
-	elog "old versions of this driver."
-	elog "For migration informations please reffer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	if [[ ${MY_V[2]} == beta ]]; then
-		unpack ${A}
-		RUN=${A/%.zip/.run}
-	else
-		RUN=${A}
-	fi
-	sh ${RUN} --extract "${S}" # 2>&1 > /dev/null || die
-}
-
-src_prepare() {
-	# version patches
-	# epatch "${FILESDIR}"/kernel/${PV}-*.patch
-	if use debug; then
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	# fix needed for at least hardened-sources, see bug #392753
-	use pax_kernel && epatch "${FILESDIR}"/ati-drivers-12.2-redefine-WARN.patch
-
-	#fixes bug #420751
-	epatch "${FILESDIR}"/ati-drivers-do_mmap.patch
-
-	cd "${MODULE_DIR}"
-	# bugged fglrx build system, this file should be copied by hand
-	cp "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
-
-	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"
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	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."
-	linux-mod_pkg_postinst
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-12.8.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.8.ebuild
deleted file mode 100644
index 260fcc6c..00000000
--- a/x11-drivers/ati-drivers/ati-drivers-12.8.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils multilib linux-info linux-mod toolchain-funcs versionator
-
-DESCRIPTION="AMD kernel drivers for radeon r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-MY_V=( $(get_version_components) )
-if [[ ${MY_V[2]} != beta ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/amd-driver-installer-${PV/./-}-x86.x86_64.zip"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE="debug multilib x-multilib pax_kernel"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="x-multilib? ( ~x11-drivers/ati-userspace-${PV}[x-multilib] )
-	multilib? ( ~x11-drivers/ati-userspace-${PV}[multilib] )
-	~x11-drivers/ati-userspace-${PV}
-	sys-power/acpid"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-_check_kernel_config() {
-	local failed=0
-	local error=""
-	if ! kernel_is ge 2 6; then
-		eerror "You need a 2.6 linux kernel to compile against!"
-		die "No 2.6 Kernel found"
-	fi
-
-	if ! linux_chkconfig_present MTRR; then
-		ewarn "You don't have MTRR support enabled in the kernel."
-		ewarn "Direct rendering will not work."
-	fi
-
-	if linux_chkconfig_builtin DRM; then
-		ewarn "You have DRM support built in to the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present AGP && \
-		! linux_chkconfig_present PCIEPORTBUS; then
-		ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present ACPI; then
-		eerror "${P} requires the ACPI support in the kernel"
-		eerror "Please enable it:"
-		eerror "    CONFIG_ACPI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Power management and ACPI options --->"
-		eerror "        [*] Power Management support"
-		eerror "in the 'menuconfig'"
-		error+=" CONFIG_ACPI disabled;"
-		failed=1
-	fi
-
-	if ! linux_chkconfig_present PCI_MSI; then
-		eerror "${P} requires MSI in the kernel."
-		eerror "Please enable it:"
-		eerror "    CONFIG_PCI_MSI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Bus options (PCI etc.)  --->"
-		eerror "        [*] Message Signaled Interrupts (MSI and MSI-X)"
-		eerror "in the kernel config."
-		error+=" CONFIG_PCI_MSI disabled;"
-		failed=1
-	fi
-
-	if linux_chkconfig_present LOCKDEP; then
-		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
-		eerror "Unfortunately, this option exports the symbol lock_acquire as GPL-only."
-		eerror "This prevents ${P} from compiling with an error like this:"
-		eerror "FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
-		eerror "Please make sure the following options have been unset:"
-		eerror "    Kernel hacking  --->"
-		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
-		eerror "        [ ] Lock debugging: prove locking correctness"
-		eerror "        [ ] Lock usage statistics"
-		eerror "in 'menuconfig'"
-		error+=" LOCKDEP enabled;"
-		failed=1
-	fi
-
-	use amd64 && if ! linux_chkconfig_present COMPAT; then
-		eerror "${P} requires COMPAT."
-		eerror "Please enable the 32 bit emulation:"
-		eerror "Executable file formats / Emulations  --->"
-		eerror "    [*] IA32 Emulation"
-		eerror "in the kernel config."
-		eerror "if this doesn't enable CONFIG_COMPAT add"
-		eerror "    CONFIG_COMPAT=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" COMPAT disabled;"
-		failed=1
-	fi
-
-	kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then
-		eerror "${P} requires BKL."
-		eerror "Please enable the Big Kernel Lock:"
-		eerror "Kernel hacking  --->"
-		eerror "    [*] Big Kernel Lock"
-		eerror "in the kernel config."
-		eerror "or add"
-		eerror "    CONFIG_BKL=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" BKL disabled;"
-		failed=1
-	fi
-
-	[[ ${failed} -ne 0 ]] && die "${error}"
-}
-
-pkg_pretend() {
-	# workaround until bug 365543 is solved
-	linux-info_pkg_setup
-	require_configured_kernel
-	_check_kernel_config
-}
-
-pkg_setup() {
-	MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/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}"
-	BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
-	if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
-	else
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
-	fi
-
-	# amd64/x86
-	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
-
-	# Define module dir.
-	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
-
-	elog
-	elog "Please note that this driver supports only graphic cards based on"
-	elog "Evergreen chipset and newer."
-	elog "This represent the AMD Radeon HD series at this moment."
-	elog
-	elog "If your card is older then usage of ${CATEGORY}/xf86-video-ati"
-	elog "as replacement is highly recommended. Rather than staying with"
-	elog "old versions of this driver."
-	elog "For migration informations please reffer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	unpack ${A}
-	RUN="${S}/"*.run
-	sh ${RUN} --extract "${S}" # 2>&1 > /dev/null || die
-}
-
-src_prepare() {
-	# version patches
-	# epatch "${FILESDIR}"/kernel/${PV}-*.patch
-	if use debug; then
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	# fix needed for at least hardened-sources, see bug #392753
-	use pax_kernel && epatch "${FILESDIR}"/ati-drivers-12.2-redefine-WARN.patch
-
-	#fixes bug #420751
-	epatch "${FILESDIR}"/ati-drivers-do_mmap.patch
-
-	cd "${MODULE_DIR}"
-	# bugged fglrx build system, this file should be copied by hand
-	cp "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
-
-	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"
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	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."
-	linux-mod_pkg_postinst
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-13.1.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.1.ebuild
deleted file mode 100644
index 89efdf51..00000000
--- a/x11-drivers/ati-drivers/ati-drivers-13.1.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils multilib linux-info linux-mod toolchain-funcs versionator
-
-DESCRIPTION="AMD kernel drivers for radeon r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-MY_V=( $(get_version_components) )
-#RUN="${WORKDIR}/amd-driver-installer-9.00-x86.x86_64.run"
-DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-${PV}-linux-x86.x86_64.zip"
-XVBA_SDK_URI="http://developer.amd.com.php53-23.ord1-1.websitetestlink.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"
-SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
-FOLDER_PREFIX="common/"
-IUSE="debug multilib x-multilib pax_kernel disable-watermark"
-
-LICENSE="AMD GPL-2 QPL-1.0"
-KEYWORDS="-* ~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="x-multilib? ( ~x11-drivers/ati-userspace-${PV}[x-multilib] )
-	multilib? ( ~x11-drivers/ati-userspace-${PV}[multilib] )
-	~x11-drivers/ati-userspace-${PV}
-	sys-power/acpid"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-_check_kernel_config() {
-	local failed=0
-	local error=""
-	if ! kernel_is ge 2 6; then
-		eerror "You need a 2.6 linux kernel to compile against!"
-		die "No 2.6 Kernel found"
-	fi
-
-	if ! linux_chkconfig_present MTRR; then
-		ewarn "You don't have MTRR support enabled in the kernel."
-		ewarn "Direct rendering will not work."
-	fi
-
-	if linux_chkconfig_builtin DRM; then
-		ewarn "You have DRM support built in to the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present AGP && \
-		! linux_chkconfig_present PCIEPORTBUS; then
-		ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present ACPI; then
-		eerror "${P} requires the ACPI support in the kernel"
-		eerror "Please enable it:"
-		eerror "    CONFIG_ACPI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Power management and ACPI options --->"
-		eerror "        [*] Power Management support"
-		eerror "in the 'menuconfig'"
-		error+=" CONFIG_ACPI disabled;"
-		failed=1
-	fi
-
-	if ! linux_chkconfig_present PCI_MSI; then
-		eerror "${P} requires MSI in the kernel."
-		eerror "Please enable it:"
-		eerror "    CONFIG_PCI_MSI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Bus options (PCI etc.)  --->"
-		eerror "        [*] Message Signaled Interrupts (MSI and MSI-X)"
-		eerror "in the kernel config."
-		error+=" CONFIG_PCI_MSI disabled;"
-		failed=1
-	fi
-
-	if linux_chkconfig_present LOCKDEP; then
-		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
-		eerror "Unfortunately, this option exports the symbol lock_acquire as GPL-only."
-		eerror "This prevents ${P} from compiling with an error like this:"
-		eerror "FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
-		eerror "Please make sure the following options have been unset:"
-		eerror "    Kernel hacking  --->"
-		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
-		eerror "        [ ] Lock debugging: prove locking correctness"
-		eerror "        [ ] Lock usage statistics"
-		eerror "in 'menuconfig'"
-		error+=" LOCKDEP enabled;"
-		failed=1
-	fi
-
-	use amd64 && if ! linux_chkconfig_present COMPAT; then
-		eerror "${P} requires COMPAT."
-		eerror "Please enable the 32 bit emulation:"
-		eerror "Executable file formats / Emulations  --->"
-		eerror "    [*] IA32 Emulation"
-		eerror "in the kernel config."
-		eerror "if this doesn't enable CONFIG_COMPAT add"
-		eerror "    CONFIG_COMPAT=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" COMPAT disabled;"
-		failed=1
-	fi
-
-	kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then
-		eerror "${P} requires BKL."
-		eerror "Please enable the Big Kernel Lock:"
-		eerror "Kernel hacking  --->"
-		eerror "    [*] Big Kernel Lock"
-		eerror "in the kernel config."
-		eerror "or add"
-		eerror "    CONFIG_BKL=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" BKL disabled;"
-		failed=1
-	fi
-
-	[[ ${failed} -ne 0 ]] && die "${error}"
-}
-
-pkg_pretend() {
-	# workaround until bug 365543 is solved
-	linux-info_pkg_setup
-	require_configured_kernel
-	_check_kernel_config
-}
-
-pkg_setup() {
-	MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/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}"
-	BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
-	if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
-	else
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
-	fi
-	# Define module dir.
-	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	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
-
-	elog
-	elog "Please note that this driver supports only graphic cards based on"
-	elog "Evergreen chipset and newer."
-	elog "This represent the AMD Radeon HD 5400+ series at this moment."
-	elog
-	elog "If your card is older then use ${CATEGORY}/xf86-video-ati"
-	elog "For migration informations please reffer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	local DRIVERS_DISTFILE XVBA_SDK_DISTFILE
-	DRIVERS_DISTFILE=${DRIVERS_URI/*\//}
-	XVBA_SDK_DISTFILE=${XVBA_SDK_URI/*\//}
-
-	if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then
-		unpack ${DRIVERS_DISTFILE}
-	else
-		#please note, RUN may be insanely assigned at top near SRC_URI
-		if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then
-			unpack ${DRIVERS_DISTFILE}
-			[[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}"
-		else
-			RUN="${DISTDIR}/${DRIVERS_DISTFILE}"
-		fi
-		sh ${RUN} --extract "${S}" 2>&1 > /dev/null || die
-	fi
-
-	mkdir xvba_sdk
-	cd xvba_sdk
-	unpack ${XVBA_SDK_DISTFILE}
-}
-
-src_prepare() {
-	# version patches
-	# epatch "${FILESDIR}"/kernel/${PV}-*.patch
-	if use debug; then
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	# see http://ati.cchtml.com/show_bug.cgi?id=495
-	#epatch "${FILESDIR}"/ati-drivers-old_rsp.patch
-	# first hunk applied upstream second (x32 related) was not
-	epatch "${FILESDIR}"/ati-drivers-x32_something_something.patch
-
-	# compile fix for linux-3.7
-	# https://bugs.gentoo.org/show_bug.cgi?id=438516
-	epatch "${FILESDIR}/ati-drivers-vm-reserverd.patch"
-
-	# compile fix for AGP-less kernel, bug #435322
-	epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch
-
-	# Use ACPI_DEVICE_HANDLE wrapper to make driver build on linux-3.8
-	# see https://bugs.gentoo.org/show_bug.cgi?id=448216
-	epatch "${FILESDIR}/ati-drivers-kernel-3.8-acpihandle.patch"
-
-	cd "${MODULE_DIR}"
-	# bugged fglrx build system, this file should be copied by hand
-	cp "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
-
-	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"
-	cd "${S}"
-
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	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."
-	linux-mod_pkg_postinst
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-13.12.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.12.ebuild
deleted file mode 100644
index b6e549f9..00000000
--- a/x11-drivers/ati-drivers/ati-drivers-13.12.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils multilib linux-info linux-mod toolchain-funcs versionator pax-utils
-
-DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-#RUN="${WORKDIR}/amd-catalyst-13.11-beta1-linux-x86.x86_64.run"
-SLOT="1"
-# Uses javascript for download YESSSS
-#DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip"
-DRIVERS_URI="http://dev.gentooexperimental.org/~scarabeus/amd-catalyst-13.12-linux-x86.x86_64.zip"
-XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"
-SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
-FOLDER_PREFIX="common/"
-IUSE="debug multilib x-multilib disable-watermark pax_kernel"
-
-LICENSE="AMD GPL-2 QPL-1.0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="bindist test"
-
-RDEPEND="x-multilib? ( ~x11-drivers/ati-userspace-${PV}[x-multilib] )
-	multilib? ( ~x11-drivers/ati-userspace-${PV}[multilib] )
-	~x11-drivers/ati-userspace-${PV}
-	sys-power/acpid"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR"
-	use amd64 && CONFIG_CHECK+=" COMPAT"
-
-	local ERROR_MTRR="CONFIG_MTRR required for direct rendering."
-	local ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module and not loaded for direct
-		rendering to work."
-	local ERROR_LOCKDEP="CONFIG_LOCKDEP (lock tracking) exports the symbol lock_acquire
-		as GPL-only. This prevents ${P} from compiling with an error like this:
-		FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
-	local ERROR_PAX_KERNEXEC_PLUGIN_METHOD_OR="This config option will cause
-		kernel to reject loading the fglrx module with
-		\"ERROR: could not insert 'fglrx': Exec format error.\"
-		You may want to try CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS instead."
-	local ERROR_BKL="CONFIG_BKL must be enabled for kernels 2.6.37-2.6.38."
-
-	# workaround until bug 365543 is solved
-	linux-info_pkg_setup
-	require_configured_kernel
-
-	kernel_is ge 2 6 37 && kernel_is le 2 6 38 && CONFIG_CHECK+=" BKL"
-	check_extra_config
-	if ! linux_chkconfig_present AGP && \
-		! linux_chkconfig_present PCIEPORTBUS; then
-		ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! has XT ${PAX_MARKINGS} && use pax_kernel; then
-		ewarn "You have disabled xattr pax markings for portage."
-		ewarn "This will likely cause programs using ati-drivers provided"
-		ewarn "libraries to be killed kernel."
-	fi
-}
-
-pkg_setup() {
-	MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/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}"
-	BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
-	if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
-	else
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
-	fi
-	# Define module dir.
-	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	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
-
-	elog
-	elog "Please note that this driver only supports graphic cards based on"
-	elog "Evergreen chipset and newer."
-	elog "This includes the AMD Radeon HD 5400+ series at this moment."
-	elog
-	elog "If your card is older then use ${CATEGORY}/xf86-video-ati"
-	elog "For migration information please refer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	local DRIVERS_DISTFILE XVBA_SDK_DISTFILE
-	DRIVERS_DISTFILE=${DRIVERS_URI##*/}
-	XVBA_SDK_DISTFILE=${XVBA_SDK_URI##*/}
-
-	if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then
-		unpack ${DRIVERS_DISTFILE}
-	else
-		#please note, RUN may be insanely assigned at top near SRC_URI
-		if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then
-			unpack ${DRIVERS_DISTFILE}
-			[[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}"
-		else
-			RUN="${DISTDIR}/${DRIVERS_DISTFILE}"
-		fi
-		sh "${RUN}" --extract "${S}" 2>&1 > /dev/null || die
-	fi
-
-	mkdir xvba_sdk
-	cd xvba_sdk
-	unpack ${XVBA_SDK_DISTFILE}
-}
-
-src_prepare() {
-	# version patches
-	# epatch "${FILESDIR}"/kernel/${PV}-*.patch
-	if use debug; then
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	# see http://ati.cchtml.com/show_bug.cgi?id=495
-	#epatch "${FILESDIR}"/ati-drivers-old_rsp.patch
-	# first hunk applied upstream second (x32 related) was not
-	epatch "${FILESDIR}"/ati-drivers-x32_something_something.patch
-
-	# compile fix for AGP-less kernel, bug #435322
-	epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch
-
-	# Compile fix for kernel typesafe uid types #469160
-	epatch "${FILESDIR}/typesafe-kuid.diff"
-
-	epatch "${FILESDIR}/ati-drivers-13.8-beta-include-seq_file.patch"
-
-	epatch "${FILESDIR}/check-for-iommu-only-if-iommu-is-supported.patch"
-
-	# Fix build on new kernels
-	epatch "${FILESDIR}/ati-drivers-13.12-acpi.patch"
-
-	# Linux 3.13 support
-	epatch "${FILESDIR}/buildfix_kernel_3.13.patch"
-
-        # Linux 4.0 support
-        if kernel_is ge 4 0; then
-                epatch "${FILESDIR}/${PN}-linux-4.0.patch"
-        fi
-
-	# Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870
-	use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch"
-
-	cd "${MODULE_DIR}"
-	# bugged fglrx build system, this file should be copied by hand
-	cp ${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
-
-	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"
-	cd "${S}"
-
-	mkdir extra || die "mkdir extra failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	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."
-	linux-mod_pkg_postinst
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-13.4.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.4.ebuild
deleted file mode 100644
index b80fdf13..00000000
--- a/x11-drivers/ati-drivers/ati-drivers-13.4.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils multilib linux-info linux-mod toolchain-funcs versionator
-
-DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-MY_V=( $(get_version_components) )
-#RUN="${WORKDIR}/amd-driver-installer-9.00-x86.x86_64.run"
-SLOT="1"
-[[ "${MY_V[2]}" =~  beta.* ]] && BETADIR="beta/" || BETADIR="linux/"
-if [[ legacy != ${SLOT} ]]; then
-	DRIVERS_URI="http://www2.ati.com/drivers/${BETADIR}amd-catalyst-${PV/_beta/-beta}-linux-x86.x86_64.zip"
-else
-	DRIVERS_URI="http://www2.ati.com/drivers/legacy/amd-driver-installer-catalyst-$(get_version_component_range 1-2)-$(get_version_component_range 3)-legacy-linux-x86.x86_64.zip"
-fi
-XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"
-SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
-FOLDER_PREFIX="common/"
-IUSE="debug multilib x-multilib pax_kernel disable-watermark"
-
-LICENSE="AMD GPL-2 QPL-1.0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="bindist test"
-
-RDEPEND="x-multilib? ( ~x11-drivers/ati-userspace-${PV}[x-multilib] )
-	multilib? ( ~x11-drivers/ati-userspace-${PV}[multilib] )
-	~x11-drivers/ati-userspace-${PV}
-	sys-power/acpid"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR"
-use amd64 && CONFIG_CHECK="${CONFIG_CHECK} COMPAT"
-ERROR_MTRR="CONFIG_MTRR required for direct rendering."
-ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module and not loaded for direct
-	rendering to work."
-ERROR_LOCKDEP="CONFIG_LOCKDEP (lock tracking) exports the symbol lock_acquire
-	as GPL-only. This prevents ${P} from compiling with an error like this:
-	FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
-ERROR_PAX_KERNEXEC_PLUGIN_METHOD_OR="This config option will cause
-	kernel to reject loading the fglrx module with
-	\"ERROR: could not insert 'fglrx': Exec format error.\"
-	You may want to try CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS instead."
-
-_check_kernel_config() {
-	if ! linux_chkconfig_present AGP && \
-		! linux_chkconfig_present PCIEPORTBUS; then
-		ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then
-		die "CONFIG_BKL must be enabled for kernels 2.6.37-2.6.38."
-	fi
-}
-
-pkg_pretend() {
-	# workaround until bug 365543 is solved
-	linux-info_pkg_setup
-	require_configured_kernel
-	_check_kernel_config
-}
-
-pkg_setup() {
-	MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/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}"
-	BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
-	if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
-	else
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
-	fi
-	# Define module dir.
-	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	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
-
-	elog
-	elog "Please note that this driver only supports graphic cards based on"
-	elog "Evergreen chipset and newer."
-	elog "This includes the AMD Radeon HD 5400+ series at this moment."
-	elog
-	elog "If your card is older then use ${CATEGORY}/xf86-video-ati"
-	elog "For migration information please refer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	local DRIVERS_DISTFILE XVBA_SDK_DISTFILE
-	DRIVERS_DISTFILE=${DRIVERS_URI##*/}
-	XVBA_SDK_DISTFILE=${XVBA_SDK_URI##*/}
-
-	if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then
-		unpack ${DRIVERS_DISTFILE}
-	else
-		#please note, RUN may be insanely assigned at top near SRC_URI
-		if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then
-			unpack ${DRIVERS_DISTFILE}
-			[[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}"
-		else
-			RUN="${DISTDIR}/${DRIVERS_DISTFILE}"
-		fi
-		sh ${RUN} --extract "${S}" 2>&1 > /dev/null || die
-	fi
-
-	mkdir xvba_sdk
-	cd xvba_sdk
-	unpack ${XVBA_SDK_DISTFILE}
-}
-
-src_prepare() {
-	# version patches
-	# epatch "${FILESDIR}"/kernel/${PV}-*.patch
-	if use debug; then
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	# see http://ati.cchtml.com/show_bug.cgi?id=495
-	#epatch "${FILESDIR}"/ati-drivers-old_rsp.patch
-	# first hunk applied upstream second (x32 related) was not
-	epatch "${FILESDIR}"/ati-drivers-x32_something_something.patch
-
-	# compile fix for AGP-less kernel, bug #435322
-	epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch
-
-	# Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870
-	use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch"
-
-	cd "${MODULE_DIR}"
-	# bugged fglrx build system, this file should be copied by hand
-	cp ${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
-
-	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"
-	cd "${S}"
-
-	mkdir extra || die "mkdir extra failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	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."
-	linux-mod_pkg_postinst
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-13.9.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.9.ebuild
deleted file mode 100644
index 1105fa62..00000000
--- a/x11-drivers/ati-drivers/ati-drivers-13.9.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils multilib linux-info linux-mod toolchain-funcs versionator pax-utils
-
-DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-#RUN="${WORKDIR}/amd-driver-installer-9.00-x86.x86_64.run"
-SLOT="1"
-DRIVERS_URI="https://www2.ati.com/drivers/linux/amd-catalyst-13.9-linux-x86.x86_64.zip"
-XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"
-SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
-FOLDER_PREFIX="common/"
-IUSE="debug multilib x-multilib disable-watermark pax_kernel"
-
-LICENSE="AMD GPL-2 QPL-1.0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="bindist test"
-
-RDEPEND="x-multilib? ( ~x11-drivers/ati-userspace-${PV}[x-multilib] )
-	multilib? ( ~x11-drivers/ati-userspace-${PV}[multilib] )
-	~x11-drivers/ati-userspace-${PV}
-	sys-power/acpid"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR"
-ERROR_MTRR="CONFIG_MTRR required for direct rendering."
-ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module and not loaded for direct
-	rendering to work."
-ERROR_LOCKDEP="CONFIG_LOCKDEP (lock tracking) exports the symbol lock_acquire
-	as GPL-only. This prevents ${P} from compiling with an error like this:
-	FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
-ERROR_PAX_KERNEXEC_PLUGIN_METHOD_OR="This config option will cause
-	kernel to reject loading the fglrx module with
-	\"ERROR: could not insert 'fglrx': Exec format error.\"
-	You may want to try CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS instead."
-
-_check_kernel_config() {
-	if ! linux_chkconfig_present AGP && \
-		! linux_chkconfig_present PCIEPORTBUS; then
-		ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then
-		die "CONFIG_BKL must be enabled for kernels 2.6.37-2.6.38."
-	fi
-
-	if use amd64 && ! linux_chkconfig_present COMPAT; then
-		die "CONFIG_COMPAT must be enabled for amd64 kernels."
-	fi
-}
-
-pkg_pretend() {
-	# workaround until bug 365543 is solved
-	linux-info_pkg_setup
-	require_configured_kernel
-	_check_kernel_config
-
-	if ! has XT ${PAX_MARKINGS} && use pax_kernel; then
-		ewarn "You have disabled xattr pax markings for portage."
-		ewarn "This will likely cause programs using ati-drivers provided"
-		ewarn "libraries to be killed kernel."
-	fi
-}
-
-pkg_setup() {
-	MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/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}"
-	BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
-	if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
-	else
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
-	fi
-	# Define module dir.
-	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	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
-
-	elog
-	elog "Please note that this driver only supports graphic cards based on"
-	elog "Evergreen chipset and newer."
-	elog "This includes the AMD Radeon HD 5400+ series at this moment."
-	elog
-	elog "If your card is older then use ${CATEGORY}/xf86-video-ati"
-	elog "For migration information please refer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	local DRIVERS_DISTFILE XVBA_SDK_DISTFILE
-	DRIVERS_DISTFILE=${DRIVERS_URI##*/}
-	XVBA_SDK_DISTFILE=${XVBA_SDK_URI##*/}
-
-	if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then
-		unpack ${DRIVERS_DISTFILE}
-	else
-		#please note, RUN may be insanely assigned at top near SRC_URI
-		if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then
-			unpack ${DRIVERS_DISTFILE}
-			[[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}"
-		else
-			RUN="${DISTDIR}/${DRIVERS_DISTFILE}"
-		fi
-		sh ${RUN} --extract "${S}" 2>&1 > /dev/null || die
-	fi
-
-	mkdir xvba_sdk
-	cd xvba_sdk
-	unpack ${XVBA_SDK_DISTFILE}
-}
-
-src_prepare() {
-	# version patches
-	# epatch "${FILESDIR}"/kernel/${PV}-*.patch
-	if use debug; then
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	# see http://ati.cchtml.com/show_bug.cgi?id=495
-	#epatch "${FILESDIR}"/ati-drivers-old_rsp.patch
-	# first hunk applied upstream second (x32 related) was not
-	epatch "${FILESDIR}"/ati-drivers-x32_something_something.patch
-
-	# compile fix for AGP-less kernel, bug #435322
-	epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch
-
-	# Compile fix for kernel typesafe uid types #469160
-	epatch "${FILESDIR}/typesafe-kuid.diff"
-
-	epatch "${FILESDIR}/ati-drivers-13.6-linux-3.10-proc.diff"
-
-	# Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870
-	use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch"
-
-	cd "${MODULE_DIR}"
-	# bugged fglrx build system, this file should be copied by hand
-	cp ${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
-
-	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"
-	cd "${S}"
-
-	mkdir extra || die "mkdir extra failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	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."
-	linux-mod_pkg_postinst
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild
deleted file mode 100644
index b351099a..00000000
--- a/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit eutils multilib-build linux-info linux-mod toolchain-funcs versionator pax-utils
-
-DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-RUN="${WORKDIR}/fglrx-14.501.1003/amd-driver-installer-14.501.1003-x86.x86_64.run"
-SLOT="1"
-# Uses javascript for download YESSSS
-#DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip"
-DRIVERS_URI="mirror://gentoo/amd-catalyst-omega-14.12-linux-run-installers.zip"
-XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"
-SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
-FOLDER_PREFIX="common/"
-IUSE="debug pax_kernel"
-
-LICENSE="AMD GPL-2 QPL-1.0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="bindist test"
-
-RDEPEND="~x11-drivers/ati-userspace-${PV}
-	sys-power/acpid"
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	app-misc/pax-utils
-	app-arch/unzip
-"
-
-S="${WORKDIR}"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR"
-	use amd64 && CONFIG_CHECK+=" COMPAT"
-
-	local ERROR_MTRR="CONFIG_MTRR required for direct rendering."
-	local ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module and not loaded for direct
-		rendering to work."
-	local ERROR_LOCKDEP="CONFIG_LOCKDEP (lock tracking) exports the symbol lock_acquire
-		as GPL-only. This prevents ${P} from compiling with an error like this:
-		FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
-	local ERROR_PAX_KERNEXEC_PLUGIN_METHOD_OR="This config option will cause
-		kernel to reject loading the fglrx module with
-		\"ERROR: could not insert 'fglrx': Exec format error.\"
-		You may want to try CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS instead."
-	local ERROR_BKL="CONFIG_BKL must be enabled for kernels 2.6.37-2.6.38."
-
-	# workaround until bug 365543 is solved
-	linux-info_pkg_setup
-	require_configured_kernel
-
-	kernel_is ge 2 6 37 && kernel_is le 2 6 38 && CONFIG_CHECK+=" BKL"
-	check_extra_config
-	if ! linux_chkconfig_present AGP && \
-		! linux_chkconfig_present PCIEPORTBUS; then
-		ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! has XT ${PAX_MARKINGS} && use pax_kernel; then
-		ewarn "You have disabled xattr pax markings for portage."
-		ewarn "This will likely cause programs using ati-drivers provided"
-		ewarn "libraries to be killed kernel."
-	fi
-}
-
-pkg_setup() {
-	MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/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}"
-	BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
-	if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
-	else
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
-	fi
-	# Define module dir.
-	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	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
-
-	elog
-	elog "Please note that this driver only supports graphic cards based on"
-	elog "Evergreen chipset and newer."
-	elog "This includes the AMD Radeon HD 5400+ series at this moment."
-	elog
-	elog "If your card is older then use ${CATEGORY}/xf86-video-ati"
-	elog "For migration information please refer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	local DRIVERS_DISTFILE XVBA_SDK_DISTFILE
-	DRIVERS_DISTFILE=${DRIVERS_URI##*/}
-	XVBA_SDK_DISTFILE=${XVBA_SDK_URI##*/}
-
-	if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then
-		unpack ${DRIVERS_DISTFILE}
-	else
-		#please note, RUN may be insanely assigned at top near SRC_URI
-		if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then
-			unpack ${DRIVERS_DISTFILE}
-			[[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}"
-		else
-			RUN="${DISTDIR}/${DRIVERS_DISTFILE}"
-		fi
-		sh "${RUN}" --extract "${S}" 2>&1 > /dev/null || die
-	fi
-
-	mkdir xvba_sdk
-	cd xvba_sdk
-	unpack ${XVBA_SDK_DISTFILE}
-
-	mkdir -p "${WORKDIR}/extra" || die "mkdir extra failed"
-	cd "${WORKDIR}/extra"
-	tar -xf "../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz"
-}
-
-src_prepare() {
-	# version patches
-	# epatch "${FILESDIR}"/kernel/${PV}-*.patch
-	if use debug; then
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	# see http://ati.cchtml.com/show_bug.cgi?id=495
-	#epatch "${FILESDIR}"/ati-drivers-old_rsp.patch
-	# first hunk applied upstream second (x32 related) was not
-	epatch "${FILESDIR}"/ati-drivers-x32_something_something.patch
-
-	# compile fix for AGP-less kernel, bug #435322
-	epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch
-
-	epatch "${FILESDIR}/ati-drivers-13.8-beta-include-seq_file.patch"
-
-	# Fix #483400
-	epatch "${FILESDIR}/fgl_glxgears-do-not-include-glATI.patch"
-
-	# Fix #524658
-	epatch "${FILESDIR}/fix-the-linux-3.17-no_hotplug-error.patch"
-
-	# Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870
-	use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch"
-
-	# Compile fix, #526602
-	epatch "${FILESDIR}/use-kernel_fpu_begin.patch"
-
-	# Linux 3.19 support
-	epatch "${FILESDIR}/${P}-linux-3.19.patch"
-
-	# Linux 4.0 support
-	if kernel_is ge 4 0; then
-		epatch "${FILESDIR}/${PN}-linux-4.0.patch"
-	fi
-
-	cd "${MODULE_DIR}"
-	# bugged fglrx build system, this file should be copied by hand
-	cp ${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
-
-	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"
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	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."
-	linux-mod_pkg_postinst
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-14.4.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.4.ebuild
deleted file mode 100644
index afc92344..00000000
--- a/x11-drivers/ati-drivers/ati-drivers-14.4.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils multilib linux-info linux-mod toolchain-funcs versionator pax-utils
-
-DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-RUN="${WORKDIR}/fglrx-14.10.1006/amd-driver-installer-14.10.1006-x86.x86_64.run"
-SLOT="1"
-DRIVERS_URI="mirror://kogaion/${CATEGORY}/amd-catalyst-14-4-linux-x86-x86-64.zip"
-XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"
-SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
-FOLDER_PREFIX="common/"
-IUSE="debug multilib x-multilib disable-watermark pax_kernel"
-
-LICENSE="AMD GPL-2 QPL-1.0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="bindist test"
-
-RDEPEND="x-multilib? ( ~x11-drivers/ati-userspace-${PV}[x-multilib] )
-	multilib? ( ~x11-drivers/ati-userspace-${PV}[multilib] )
-	~x11-drivers/ati-userspace-${PV}
-	sys-power/acpid"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR"
-	use amd64 && CONFIG_CHECK+=" COMPAT"
-
-	local ERROR_MTRR="CONFIG_MTRR required for direct rendering."
-	local ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module and not loaded for direct
-		rendering to work."
-	local ERROR_LOCKDEP="CONFIG_LOCKDEP (lock tracking) exports the symbol lock_acquire
-		as GPL-only. This prevents ${P} from compiling with an error like this:
-		FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
-	local ERROR_PAX_KERNEXEC_PLUGIN_METHOD_OR="This config option will cause
-		kernel to reject loading the fglrx module with
-		\"ERROR: could not insert 'fglrx': Exec format error.\"
-		You may want to try CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS instead."
-	local ERROR_BKL="CONFIG_BKL must be enabled for kernels 2.6.37-2.6.38."
-
-	# workaround until bug 365543 is solved
-	linux-info_pkg_setup
-	require_configured_kernel
-
-	kernel_is ge 2 6 37 && kernel_is le 2 6 38 && CONFIG_CHECK+=" BKL"
-	check_extra_config
-	if ! linux_chkconfig_present AGP && \
-		! linux_chkconfig_present PCIEPORTBUS; then
-		ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! has XT ${PAX_MARKINGS} && use pax_kernel; then
-		ewarn "You have disabled xattr pax markings for portage."
-		ewarn "This will likely cause programs using ati-drivers provided"
-		ewarn "libraries to be killed kernel."
-	fi
-}
-
-pkg_setup() {
-	MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/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}"
-	BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
-	if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
-	else
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
-	fi
-	# Define module dir.
-	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	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
-
-	elog
-	elog "Please note that this driver only supports graphic cards based on"
-	elog "Evergreen chipset and newer."
-	elog "This includes the AMD Radeon HD 5400+ series at this moment."
-	elog
-	elog "If your card is older then use ${CATEGORY}/xf86-video-ati"
-	elog "For migration information please refer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	local DRIVERS_DISTFILE XVBA_SDK_DISTFILE
-	DRIVERS_DISTFILE=${DRIVERS_URI##*/}
-	XVBA_SDK_DISTFILE=${XVBA_SDK_URI##*/}
-
-	if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then
-		unpack ${DRIVERS_DISTFILE}
-	else
-		#please note, RUN may be insanely assigned at top near SRC_URI
-		if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then
-			unpack ${DRIVERS_DISTFILE}
-			[[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}"
-		else
-			RUN="${DISTDIR}/${DRIVERS_DISTFILE}"
-		fi
-		sh "${RUN}" --extract "${S}" 2>&1 > /dev/null || die
-	fi
-
-	mkdir xvba_sdk
-	cd xvba_sdk
-	unpack ${XVBA_SDK_DISTFILE}
-
-	cd "${S}"
-	mkdir extra || die "mkdir extra failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_prepare() {
-	# version patches
-	# epatch "${FILESDIR}"/kernel/${PV}-*.patch
-	if use debug; then
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	# see http://ati.cchtml.com/show_bug.cgi?id=495
-	#epatch "${FILESDIR}"/ati-drivers-old_rsp.patch
-	# first hunk applied upstream second (x32 related) was not
-	epatch "${FILESDIR}"/ati-drivers-x32_something_something.patch
-
-	# compile fix for AGP-less kernel, bug #435322
-	epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch
-
-	# Compile fix for kernel typesafe uid types #469160
-	epatch "${FILESDIR}/typesafe-kuid.diff"
-
-	epatch "${FILESDIR}/ati-drivers-13.8-beta-include-seq_file.patch"
-
-	# Fix #483400
-	epatch "${FILESDIR}/fgl_glxgears-do-not-include-glATI.patch"
-
-	# Kogaion 3.9 kernels are versioned 3.9.0
-	epatch "${FILESDIR}/ati-drivers-14.4-acpi.patch"
-
-	# Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870
-	use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch"
-
-        # Linux 4.0 support
-        if kernel_is ge 4 0; then
-                epatch "${FILESDIR}/${PN}-linux-4.0.patch"
-        fi
-
-	cd "${MODULE_DIR}"
-	# bugged fglrx build system, this file should be copied by hand
-	cp ${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
-
-	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"
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	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."
-	linux-mod_pkg_postinst
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-15.7.ebuild b/x11-drivers/ati-drivers/ati-drivers-15.7.ebuild
deleted file mode 100644
index b77bf26c..00000000
--- a/x11-drivers/ati-drivers/ati-drivers-15.7.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit eutils multilib-build linux-info linux-mod toolchain-funcs versionator pax-utils
-
-DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-#RUN="${WORKDIR}/fglrx-14.501.1003/amd-driver-installer-14.501.1003-x86.x86_64.run"
-SLOT="1"
-# Uses javascript for download YESSSS
-#DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip"
-DRIVERS_URI="mirror://gentoo/amd-driver-installer-15.20.1046-x86.x86_64.zip http://www2.ati.com/drivers/linux/amd-driver-installer-15.20.1046-x86.x86_64.zip"
-XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"
-SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
-FOLDER_PREFIX="common/"
-IUSE="debug static-libs pax_kernel"
-
-LICENSE="AMD GPL-2 QPL-1.0"
-KEYWORDS="-* ~amd64 ~x86"
-
-RESTRICT="bindist test"
-
-RDEPEND="
-	~x11-drivers/ati-userspace-${PV}
-"
-if [[ legacy != ${SLOT} ]]; then
-	RDEPEND="${RDEPEND}
-		!x11-drivers/ati-drivers:legacy"
-else
-	RDEPEND="${RDEPEND}
-		!x11-drivers/ati-drivers:1"
-fi
-
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto
-	x11-libs/libXtst
-	sys-apps/findutils
-	app-misc/pax-utils
-	app-arch/unzip
-"
-
-EMULTILIB_PKG="true"
-
-S="${WORKDIR}"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR"
-	use amd64 && CONFIG_CHECK+=" COMPAT"
-
-	local ERROR_MTRR="CONFIG_MTRR required for direct rendering."
-	local ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module and not loaded for direct
-		rendering to work."
-	local ERROR_LOCKDEP="CONFIG_LOCKDEP (lock tracking) exports the symbol lock_acquire
-		as GPL-only. This prevents ${P} from compiling with an error like this:
-		FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
-	local ERROR_PAX_KERNEXEC_PLUGIN_METHOD_OR="This config option will cause
-		kernel to reject loading the fglrx module with
-		\"ERROR: could not insert 'fglrx': Exec format error.\"
-		You may want to try CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS instead."
-	local ERROR_BKL="CONFIG_BKL must be enabled for kernels 2.6.37-2.6.38."
-
-	if ! has XT ${PAX_MARKINGS} && use pax_kernel; then
-		ewarn "You have disabled xattr pax markings for portage."
-		ewarn "This will likely cause programs using ati-drivers provided"
-		ewarn "libraries to be killed kernel."
-	fi
-}
-
-pkg_setup() {
-	MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/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_OUT_DIR}"
-	BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
-	if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
-	else
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
-	fi
-
-	# Define module dir.
-	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	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
-
-	elog
-	elog "Please note that this driver only supports graphic cards based on"
-	elog "Evergreen chipset and newer."
-	elog "This includes the AMD Radeon HD 5400+ series at this moment."
-	elog
-	elog "If your card is older then use ${CATEGORY}/xf86-video-ati"
-	elog "For migration informations please refer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	local DRIVERS_DISTFILE XVBA_SDK_DISTFILE
-	DRIVERS_DISTFILE=${DRIVERS_URI##*/}
-	XVBA_SDK_DISTFILE=${XVBA_SDK_URI##*/}
-
-	if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then
-		unpack ${DRIVERS_DISTFILE}
-		mkdir -p common
-		mv etc lib usr common || die "Assumed to find etc lib and usr for common"
-	else
-		#please note, RUN may be insanely assigned at top near SRC_URI
-		if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then
-			unpack ${DRIVERS_DISTFILE}
-			[[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}"
-		else
-			RUN="${DISTDIR}/${DRIVERS_DISTFILE}"
-		fi
-		sh "${RUN}" --extract "${S}" 2>&1 > /dev/null || die
-	fi
-
-	mkdir xvba_sdk
-	cd xvba_sdk
-	unpack ${XVBA_SDK_DISTFILE}
-
-	mkdir -p "${WORKDIR}/extra" || die "mkdir extra failed"
-	cd "${WORKDIR}/extra"
-	tar -xf "../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz"
-}
-
-src_prepare() {
-	if use debug; then
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
-		|| die "bin rm failed"
-
-
-	# ACPI fixups
-	sed -i \
-		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-		-e "s:/var/lib/gdm/:/var/gdm/:" \
-		"${S}/${FOLDER_PREFIX}etc/ati/authatieventsd.sh" \
-		|| die "ACPI fixups failed."
-
-	# Since "who" is in coreutils, we're using that one instead of "finger".
-	sed -i -e 's:finger:who:' \
-		"${S}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-		|| die "Replacing 'finger' with 'who' failed."
-	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-	# add function to detect default state.
-	epatch "${FILESDIR}"/ati-powermode-opt-path-3.patch
-
-	# see http://ati.cchtml.com/show_bug.cgi?id=495
-	#epatch "${FILESDIR}"/ati-drivers-old_rsp.patch
-	# first hunk applied upstream second (x32 related) was not
-	epatch "${FILESDIR}"/ati-drivers-x32_something_something.patch
-
-	# compile fix for AGP-less kernel, bug #435322
-	epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch
-
-	epatch "${FILESDIR}/ati-drivers-13.8-beta-include-seq_file.patch"
-
-	# Fix #483400
-	epatch "${FILESDIR}/fgl_glxgears-do-not-include-glATI.patch"
-
-	# Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870
-	use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch"
-
-	# Compile fix, #526602
-	epatch "${FILESDIR}/use-kernel_fpu_begin.patch"
-
-
-	# Linux < 4.0 support
-	epatch "${FILESDIR}/${PN}-linux-4.0.patch"
-
-	# Linux 4.0, 4.1 support
-	if kernel_is ge 3 18; then
-		epatch "${FILESDIR}/${P}-linux-3.19-4.0.patch"
-	fi
-
-	if kernel_is ge 4 1; then
-		epatch "${FILESDIR}/${P}-linux-4.1.patch"
-	fi
-
-	epatch_user
-
-	cd "${MODULE_DIR}"
-
-	# bugged fglrx build system, this file should be copied by hand
-	cp ${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
-
-	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"
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	elog "To switch to AMD 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 "Fully rebooting the system after an ${PN} update is recommended"
-	elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
-	elog "might not work"
-	elog
-	elog "Some cards need acpid running to handle events"
-	elog "Please add it to boot runlevel with rc-update add acpid boot"
-	elog
-	linux-mod_pkg_postinst
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/ati-drivers/files/amd-drivers-3.2.7.1.patch b/x11-drivers/ati-drivers/files/amd-drivers-3.2.7.1.patch
deleted file mode 100644
index 104c8788..00000000
--- a/x11-drivers/ati-drivers/files/amd-drivers-3.2.7.1.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -5797,10 +5797,16 @@ void ATI_API_CALL KCL_fpu_begin(void)
- #ifdef CONFIG_X86_64
-     kernel_fpu_begin();
- #else
-+#ifndef TS_USEDFPU
-+    preempt_disable();
-+    if (__thread_has_fpu(current))
-+        __save_init_fpu(current);
-+#else
-     struct thread_info *cur_task = current_thread_info();
-     preempt_disable();
-     if (cur_task->status & TS_USEDFPU)
-         __save_init_fpu(cur_task->task);
-+#endif
-     else
-         clts();
- #endif
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-12.2-redefine-WARN.patch b/x11-drivers/ati-drivers/files/ati-drivers-12.2-redefine-WARN.patch
deleted file mode 100644
index f4fab432..00000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-12.2-redefine-WARN.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- common/lib/modules/fglrx/build_mod/kcl_debug.h.orig	2012-03-08 19:30:38.195025328 +0100
-+++ common/lib/modules/fglrx/build_mod/kcl_debug.h	2012-03-08 19:31:24.976024507 +0100
-@@ -85,8 +85,8 @@
- #ifdef ERROR
- #undef ERROR
- #endif
--#ifdef WARN
--#undef WARN
-+#ifdef AMD_WARN
-+#undef AMD_WARN
- #endif
- #ifdef INFO
- #undef INFO
-@@ -122,7 +122,7 @@
- {
-     SPECIAL = 0,
-     ERROR  ,
--    WARN  ,
-+    AMD_WARN  ,
-     INFO ,
-     INFOEX,
-     TRACE,
-@@ -160,7 +160,7 @@
- }log_map;
- 
- 
--#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(ERROR) |___BIT(WARN) | ___BIT(TRACE)| ___BIT(SPECIAL)  ))
-+#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(ERROR) |___BIT(AMD_WARN) | ___BIT(TRACE)| ___BIT(SPECIAL)  ))
- #define INFO_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX)))
- extern const log_map module_log_map[];
- extern const module_map module_type_map[];
---- common/lib/modules/fglrx/build_mod/kcl_debug.c.orig	2012-03-08 19:36:18.244019310 +0100
-+++ common/lib/modules/fglrx/build_mod/kcl_debug.c	2012-03-08 19:36:36.197018973 +0100
-@@ -69,7 +69,7 @@
- {
-     {SPECIAL        ,   'S'},
-     {ERROR          ,   'E'},
--    {WARN           ,   'W'},
-+    {AMD_WARN           ,   'W'},
-     {INFO           ,   'I'},
-     {INFOEX         ,   'X'},
-     {TRACE          ,   'T'},
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch b/x11-drivers/ati-drivers/files/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch
deleted file mode 100644
index 0ea461b8..00000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Vasiliy Yeremeyev <vayerx@gmail.com>
-Date: Sun, 4 Nov 2012 23:59:36 +0400
-Subject: [PATCH] KCL_AGP_FindCapsRegisters stub for AGP-less systems
-
----
- common/lib/modules/fglrx/build_mod/kcl_agp.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/common/lib/modules/fglrx/build_mod/kcl_agp.c b/common/lib/modules/fglrx/build_mod/kcl_agp.c
-index b9c0655..cb1902b 100644
---- a/common/lib/modules/fglrx/build_mod/kcl_agp.c
-+++ b/common/lib/modules/fglrx/build_mod/kcl_agp.c
-@@ -479,6 +479,11 @@ int ATI_API_CALL KCL_AGP_Enable(unsigned long mode)
-     return -EINVAL;
- }
- 
-+int ATI_API_CALL KCL_AGP_FindCapsRegisters(KCL_PCI_DevHandle dev)
-+{
-+    return -EINVAL;
-+}
-+
- int ATI_API_CALL KCL_AGP_ReadCapsRegisters(KCL_PCI_DevHandle dev, unsigned int *caps)
- {
-     return -EINVAL;
--- 
-1.7.12
-
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-13.12-acpi.patch b/x11-drivers/ati-drivers/files/ati-drivers-13.12-acpi.patch
deleted file mode 100644
index 3c568742..00000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-13.12-acpi.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -urN common.old/lib/modules/fglrx/build_mod/kcl_acpi.c common/lib/modules/fglrx/build_mod/kcl_acpi.c
---- common.old/lib/modules/fglrx/build_mod/kcl_acpi.c	2013-12-27 13:32:34.734832283 +0100
-+++ common/lib/modules/fglrx/build_mod/kcl_acpi.c	2013-12-27 13:33:31.849831765 +0100
-@@ -1002,7 +1002,11 @@
- #endif
-     {
-         return KCL_ACPI_ERROR;
--    }    
-+    }
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)
-+    ((acpi_tbl_table_handler)handler)(hdr);
-+#else
-     ((acpi_table_handler)handler)(hdr);
-+#endif
-     return KCL_ACPI_OK;
- }
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-13.6-linux-3.10-proc.diff b/x11-drivers/ati-drivers/files/ati-drivers-13.6-linux-3.10-proc.diff
deleted file mode 100644
index bdb22eae..00000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-13.6-linux-3.10-proc.diff
+++ /dev/null
@@ -1,356 +0,0 @@
-diff --git a/common/lib/modules/fglrx/build_mod/drmP.h b/common/lib/modules/fglrx/build_mod/drmP.h
-index 81546b2..4e74526 100755
---- a/common/lib/modules/fglrx/build_mod/drmP.h
-+++ b/common/lib/modules/fglrx/build_mod/drmP.h
-@@ -901,10 +901,6 @@ int                   DRM(stub_register)(const char *name,
- int                   DRM(stub_unregister)(int minor);
- 
- 				/* Proc support (drm_proc.h) */
--extern struct proc_dir_entry *DRM(proc_init)(drm_device_t *dev,
--					     int minor,
--					     struct proc_dir_entry *root,
--					     struct proc_dir_entry **dev_root);
- extern int            DRM(proc_cleanup)(int minor,
- 					struct proc_dir_entry *root,
- 					struct proc_dir_entry *dev_root);
-diff --git a/common/lib/modules/fglrx/build_mod/drm_proc.h b/common/lib/modules/fglrx/build_mod/drm_proc.h
-index 1e3ab4a..c52ad7e 100755
---- a/common/lib/modules/fglrx/build_mod/drm_proc.h
-+++ b/common/lib/modules/fglrx/build_mod/drm_proc.h
-@@ -75,61 +75,6 @@ struct drm_proc_list {
- #define DRM_PROC_ENTRIES (sizeof(DRM(proc_list))/sizeof(DRM(proc_list)[0]))
- 
- /**
-- * Initialize the DRI proc filesystem for a device.
-- *
-- * \param dev DRM device.
-- * \param minor device minor number.
-- * \param root DRI proc dir entry.
-- * \param dev_root resulting DRI device proc dir entry.
-- * \return root entry pointer on success, or NULL on failure.
-- * 
-- * Create the DRI proc root entry "/proc/ati", the device proc root entry
-- * "/proc/ati/%minor%/", and each entry in proc_list as
-- * "/proc/ati/%minor%/%name%".
-- */
--struct proc_dir_entry *DRM(proc_init)(drm_device_t *dev, int minor,
--				      struct proc_dir_entry *root,
--				      struct proc_dir_entry **dev_root)
--{
--	struct proc_dir_entry *ent;
--	int		      i, j;
--	char                  name[64];
--
--	if (!minor) root = create_proc_entry("dri", S_IFDIR, NULL);
--	if (!root) {
--		DRM_ERROR("Cannot create /proc/ati\n");
--		return NULL;
--	}
--
--	sprintf(name, "%d", minor);
--	*dev_root = create_proc_entry(name, S_IFDIR, root);
--	if (!*dev_root) {
--		DRM_ERROR("Cannot create /proc/ati/%s\n", name);
--		return NULL;
--	}
--
--	for (i = 0; i < DRM_PROC_ENTRIES; i++) {
--		ent = create_proc_entry(DRM(proc_list)[i].name,
--					S_IFREG|S_IRUGO, *dev_root);
--		if (!ent) {
--			DRM_ERROR("Cannot create /proc/ati/%s/%s\n",
--				  name, DRM(proc_list)[i].name);
--			for (j = 0; j < i; j++)
--				remove_proc_entry(DRM(proc_list)[i].name,
--						  *dev_root);
--			remove_proc_entry(name, root);
--			if (!minor) remove_proc_entry("dri", NULL);
--			return NULL;
--		}
--		ent->read_proc = DRM(proc_list)[i].f;
--		ent->data      = dev;
--	}
--
--	return root;
--}
--
--
--/**
-  * Cleanup the proc filesystem resources.
-  *
-  * \param minor device minor number.
-diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
-index d3ad3ce..890a0aa 100755
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -583,6 +583,202 @@ kcl_proc_list_t KCL_PROC_FileList[] =
-     { "NULL",           NULL,                       NULL} // Terminate List!!!
- };
- 
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
-+typedef int (read_proc_t)(char *page, char **start, off_t off, int count, int *eof, void *data);
-+typedef int (write_proc_t)(struct file *file, const char __user *buffer, unsigned long count, void *data);
-+#else
-+#define PDE_DATA(inode) (PDE((inode))->data)
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
-+typedef struct {
-+	read_proc_t *read_func;
-+	write_proc_t *write_func;
-+	void *data;
-+} gentoo_proc_wrapper_t;
-+
-+#define GENTOO_PROC_WRAPPER_OVERFLOW_MAGIC 939750305
-+
-+static ssize_t gentoo_proc_wrapper_read (struct file *myfile, char __user *buffer, size_t count, loff_t *offset) {
-+	int is_eof=0, retval;
-+	char *start, *usebuffer=NULL;
-+	gentoo_proc_wrapper_t* wrapper_data=(gentoo_proc_wrapper_t*)(myfile->private_data);
-+	if (PAGE_SIZE<*offset) {
-+		printk(KERN_ERR "Trying to read beyond 4k on proc\n");
-+		return -EIO;
-+	}
-+	//printk(KERN_NOTICE " call with: dev %p, func %p\n", wrapper_data->data, wrapper_data->read_func);
-+
-+	usebuffer=kmalloc(2*PAGE_SIZE, GFP_KERNEL);
-+	if (!usebuffer)
-+		return -ENOMEM;
-+	((u32*)usebuffer)[1024]=GENTOO_PROC_WRAPPER_OVERFLOW_MAGIC;
-+
-+	retval=wrapper_data->read_func(usebuffer, &start, *offset, count, &is_eof, wrapper_data->data);
-+
-+	BUG_ON(GENTOO_PROC_WRAPPER_OVERFLOW_MAGIC != ((u32*)usebuffer)[1024]);
-+
-+	if (0 > retval)
-+	{
-+		printk(KERN_ERR "Proc read failed with %d", retval);
-+		goto out;
-+	}
-+
-+	if (copy_to_user(buffer, start, retval)) {
-+		printk(KERN_NOTICE "copy to user failed in amd drivers proc code\n");
-+		retval=-EFAULT;
-+		goto out;
-+	}
-+	*offset+=retval;
-+
-+out:
-+	if (usebuffer)
-+		kfree(usebuffer);
-+	return retval;
-+}
-+static ssize_t gentoo_proc_wrapper_write (struct file *myfile, const char __user *buffer, size_t count, loff_t *offset) {
-+	gentoo_proc_wrapper_t* wrapper_data=(gentoo_proc_wrapper_t*)(myfile->private_data);
-+	int retval=0;
-+	void *usebuffer=NULL;
-+
-+	BUG_ON(*offset);
-+	if (!wrapper_data->write_func)
-+		return -EPERM;
-+
-+	usebuffer=kmalloc(count, GFP_KERNEL);
-+	if (!usebuffer)
-+		return -ENOMEM;
-+	if (copy_from_user(usebuffer, buffer, count)) {
-+		printk(KERN_NOTICE "copy from user failed in amd drivers proc code\n");
-+		retval=-EFAULT;
-+		goto out;
-+	}
-+
-+	retval=wrapper_data->write_func(myfile, buffer, count, wrapper_data->data);
-+	*offset+=retval;
-+out:
-+	if (usebuffer)
-+		kfree(usebuffer);
-+	return retval;
-+}
-+static int gentoo_proc_wrapper_open(struct inode *myinode, struct file *myfile) {
-+	myfile->private_data=PDE_DATA(myinode);
-+	return generic_file_open(myinode, myfile);
-+}
-+struct file_operations gentoo_proc_fops = {
-+	.read=gentoo_proc_wrapper_read,
-+	.write=gentoo_proc_wrapper_write,
-+	.open=gentoo_proc_wrapper_open,
-+};
-+
-+static void *gentoo_proc_wrapper_data(read_proc_t *reader, write_proc_t *writer, void *mydata) {
-+	gentoo_proc_wrapper_t *retval=kmalloc(sizeof(gentoo_proc_wrapper_t), GFP_KERNEL);
-+	if (!retval)
-+		return retval;
-+	retval->read_func=reader;
-+	retval->write_func=writer;
-+	retval->data=mydata;
-+	return retval;
-+}
-+
-+static struct proc_dir_entry *firegl_proc_init( device_t *dev,
-+                                                int minor,
-+                                                struct proc_dir_entry *root,
-+                                                struct proc_dir_entry **dev_root,
-+                                                kcl_proc_list_t *proc_list ) // proc_list must be terminated!
-+{
-+    struct proc_dir_entry *ent;
-+    char    name[64];
-+    kcl_proc_list_t *list = proc_list;
-+	void *tempdata;
-+    KCL_DEBUG1(FN_FIREGL_PROC, "minor %d, proc_list 0x%08lx\n", minor, (unsigned long)proc_list);
-+    if (!minor)
-+    {
-+        root = proc_mkdir("ati", NULL);
-+    }
-+
-+    if (!root)
-+    {
-+        KCL_DEBUG_ERROR("Cannot create /proc/ati\n");
-+        return NULL;
-+    }
-+
-+    if (minor == 0)
-+    {
-+        // Global major debice number entry
-+		tempdata=gentoo_proc_wrapper_data((read_proc_t*)firegl_major_proc_read, NULL, NULL);
-+		if (!tempdata)
-+			return NULL;
-+        ent = proc_create_data("major", S_IFREG|S_IRUGO, root, &gentoo_proc_fops, tempdata);
-+        if (!ent)
-+        {
-+            remove_proc_entry("ati", NULL);
-+            KCL_DEBUG_ERROR("Cannot create /proc/ati/major\n");
-+            return NULL;
-+        }
-+    }
-+
-+    sprintf(name, "%d", minor);
-+    *dev_root = proc_mkdir(name, root);
-+    if (!*dev_root) {
-+        remove_proc_entry("major", root);
-+        remove_proc_entry("ati", NULL);
-+        KCL_DEBUG_ERROR("Cannot create /proc/ati/%s\n", name);
-+        return NULL;
-+    }
-+
-+    while (list->f || list->fops)
-+    {
-+		struct file_operations *my_fops = &gentoo_proc_fops;
-+        if (list->fops)
-+        {
-+            my_fops = (struct file_operations*)list->fops;
-+			tempdata=(dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev);
-+        }
-+		else {
-+			BUG_ON(!list->f);
-+			tempdata=gentoo_proc_wrapper_data((read_proc_t*)list->f, NULL, (dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev) );
-+			if (!tempdata)
-+				return NULL;
-+		}
-+		//printk(KERN_NOTICE "name %s, dev %p, func %p, data %p\n", list->name, (dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev), list->f, tempdata);
-+        ent = proc_create_data(list->name, S_IFREG|S_IRUGO, *dev_root, my_fops, tempdata);
-+
-+        if (!ent)
-+        {
-+            KCL_DEBUG_ERROR("Cannot create /proc/ati/%s/%s\n", name, list->name);
-+            while (proc_list != list)
-+            {
-+                remove_proc_entry(proc_list->name, *dev_root);
-+                proc_list++;
-+            }
-+            remove_proc_entry(name, root);
-+            if (!minor)
-+            {
-+                remove_proc_entry("major", root);
-+                remove_proc_entry("ati", NULL);
-+            }
-+            return NULL;
-+        }
-+
-+        list++;
-+    }
-+
-+    if (minor == 0)
-+    {
-+        // Global debug entry, only create it once
-+		tempdata=gentoo_proc_wrapper_data((read_proc_t*)firegl_debug_proc_read_wrap, (write_proc_t*)firegl_debug_proc_write_wrap, dev);
-+		if (!tempdata)
-+			return NULL;
-+        ent=proc_create_data("debug", S_IFREG|S_IRUGO, root, &gentoo_proc_fops, tempdata);
-+		if (!ent)
-+			return NULL;
-+    }
-+
-+    return root;
-+}
-+#else
- static struct proc_dir_entry *firegl_proc_init( device_t *dev,
-                                                 int minor,
-                                                 struct proc_dir_entry *root,
-@@ -677,6 +873,7 @@ static struct proc_dir_entry *firegl_proc_init( device_t *dev,
- 
-     return root;
- }
-+#endif
- 
- static int firegl_proc_cleanup( int minor,
-                                 struct proc_dir_entry *root,
-@@ -6135,59 +6332,4 @@ void ATI_API_CALL KCL_fpu_end(void)
-     kernel_fpu_end();
- }
- 
--/** Create new directory entry under "/proc/ati/...."
-- * Where
-- * root_dir - Root directory. If NULL then we should use "/proc/ati" root.
-- * name    - Pointer to the name of directory
-- * access  - Access attribute. We could use it to disable access to the directory for everybody accept owner.
-- *                By default owner is root.
-- * Return NULL if failure. Pointer to proc_dir_entry otherwise
-- */
--void * KCL_create_proc_dir(void *root_dir, const char *name, unsigned int access)
--{
--    struct proc_dir_entry *dir = NULL;
--
--    if (root_dir == NULL)
--         dir = create_proc_entry(name, S_IFDIR | access, firegl_stub_root);
--    else
--         dir = create_proc_entry(name, S_IFDIR | access, (struct proc_dir_entry *)root_dir);
--
--    return dir;
--}
--
--/* Remove proc directory entry
-- * root   - Pointer to directory proc entry or NULL if for "/proc/ati"
-- * name - Name to delete
-- */
--void KCL_remove_proc_dir_entry(void *root, const char *name)
--{
--    if (root == NULL)
--        remove_proc_entry(name, firegl_stub_root);
--    else
--        remove_proc_entry(name, (struct proc_dir_entry *)root);
--}
--
--
--/* Create proc_entry under "root_dir"
-- * read_fn - Function which will be called on read request
-- * write_fn - Function which will be called on write request
-- * private_data - Pointer to private data which will be passed
-- */
--void KCL_create_proc_entry(void *root_dir, const char *name, unsigned int access_mode, void *read_fn, void *write_fn, void *private_data)
--{
--    struct proc_dir_entry *ent = NULL;
--
--    if (root_dir == NULL || name == NULL)
--        return;
--
--    ent = create_proc_entry(name, access_mode, (struct proc_dir_entry *)root_dir);
--
--    if (ent)
--    {
--        ent->read_proc = (read_proc_t *)read_fn;    
--        ent->write_proc = (write_proc_t *)write_fn; 
--        ent->data = private_data;
--    }
--}
--
- #endif /* __KERNEL__ */
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-13.8-beta-include-seq_file.patch b/x11-drivers/ati-drivers/files/ati-drivers-13.8-beta-include-seq_file.patch
deleted file mode 100644
index fb1ba17e..00000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-13.8-beta-include-seq_file.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
-index 22561c5..fdfe65e 100755
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -520,6 +520,8 @@ static int func##_wrap(char *buf, char **start, kcl_off_t offset,       \
- }
- 
- #else
-+#include <linux/seq_file.h>
-+
- #define READ_PROC_WRAP(func)                                            \
- static int func##_wrap(struct seq_file *m, void* data)                  \
- {                                                                       \
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-14.12-linux-3.19.patch b/x11-drivers/ati-drivers/files/ati-drivers-14.12-linux-3.19.patch
deleted file mode 100644
index 9594972d..00000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-14.12-linux-3.19.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -4823,8 +4823,13 @@
- {
-     unsigned long orig_level;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
-+    orig_level = __this_cpu_read(kasExecutionLevel);
-+    __this_cpu_write(kasExecutionLevel,level);
-+#else
-     orig_level = __get_cpu_var(kasExecutionLevel);
-     __get_cpu_var(kasExecutionLevel) = level;
-+#endif
- 
-     return orig_level;
- }
-@@ -4836,7 +4841,11 @@
-  */
- static unsigned long kas_GetExecutionLevel(void)
- {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
-+    return __this_cpu_read(kasExecutionLevel);
-+#else
-     return __get_cpu_var(kasExecutionLevel);
-+#endif
- }
- 
- /** \brief Type definition for kas_spin_lock() parameter */
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-14.4-acpi.patch b/x11-drivers/ati-drivers/files/ati-drivers-14.4-acpi.patch
deleted file mode 100644
index 0295307d..00000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-14.4-acpi.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- work.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c
-+++ work/common/lib/modules/fglrx/build_mod/kcl_acpi.c
-@@ -981,7 +981,7 @@ int ATI_API_CALL KCL_ACPI_ParseTable(cha
-     {
-         return KCL_ACPI_ERROR;
-     }
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,1)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)
-     ((acpi_tbl_table_handler)handler)(hdr);
- #else
-     ((acpi_table_handler)handler)(hdr);
-
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.33.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.33.patch
deleted file mode 100644
index 85f9aff7..00000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-2.6.33.patch
+++ /dev/null
@@ -1,140 +0,0 @@
---- work.orig/common/lib/modules/fglrx/build_mod/drmP.h
-+++ work/common/lib/modules/fglrx/build_mod/drmP.h
-@@ -42,7 +42,11 @@
-  * can build the DRM (part of PI DRI). 4/21/2000 S + B */
- #include <asm/current.h>
- #endif /* __alpha__ */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/miscdevice.h>
---- work.orig/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ work/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -28,7 +28,11 @@
- #error Kernel versions older than 2.6.0 are no longer supported by this module.
- #endif 
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- 
- #if !defined(CONFIG_X86) 
- #if !defined(CONFIG_X86_PC) 
-@@ -163,8 +167,12 @@
- 
- //  For 2.6.18 or higher, the UTS_RELEASE is defined in the linux/utsrelease.h. 
- #ifndef UTS_RELEASE 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/utsrelease.h>
-+#else
- #include <linux/utsrelease.h>
- #endif
-+#endif
- 
- #if defined(__i386__)
- #ifndef do_div
---- work.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c
-+++ work/common/lib/modules/fglrx/build_mod/kcl_acpi.c
-@@ -15,7 +15,11 @@
-  ****************************************************************************/
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/acpi.h>
- 
- #include "kcl_config.h"
---- work.orig/common/lib/modules/fglrx/build_mod/kcl_agp.c
-+++ work/common/lib/modules/fglrx/build_mod/kcl_agp.c
-@@ -31,7 +31,11 @@
-  */
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/pci.h>
- #include <linux/agp_backend.h>
- #include <linux/string.h>
---- work.orig/common/lib/modules/fglrx/build_mod/kcl_io.c
-+++ work/common/lib/modules/fglrx/build_mod/kcl_io.c
-@@ -37,7 +37,11 @@
-  */
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/poll.h>
- #include <linux/signal.h>
- #include <asm/io.h>
---- work.orig/common/lib/modules/fglrx/build_mod/kcl_osconfig.h
-+++ work/common/lib/modules/fglrx/build_mod/kcl_osconfig.h
-@@ -20,7 +20,11 @@
- #define KCL_OSCONFIG_H
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- 
- // Choose modern way to call 32-on-64 IOCTLs if configured in the kernel
- #if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
---- work.orig/common/lib/modules/fglrx/build_mod/kcl_pci.c
-+++ work/common/lib/modules/fglrx/build_mod/kcl_pci.c
-@@ -31,7 +31,11 @@
-  */
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/pci.h>
- 
- #include "kcl_config.h"
---- work.orig/common/lib/modules/fglrx/build_mod/kcl_str.c
-+++ work/common/lib/modules/fglrx/build_mod/kcl_str.c
-@@ -30,7 +30,12 @@
-  *
-  */
- 
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/string.h>
- #include <linux/module.h>
- 
---- work.orig/common/lib/modules/fglrx/build_mod/kcl_wait.c
-+++ work/common/lib/modules/fglrx/build_mod/kcl_wait.c
-@@ -31,7 +31,11 @@
-  */
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/wait.h>
- #include <linux/highmem.h>
- #include <linux/sched.h>
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.34.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.34.patch
deleted file mode 100644
index 1993d134..00000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-2.6.34.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- work.orig/common/lib/modules/fglrx/build_mod/kcl_wait.c	2010-04-13 20:02:46.494496561 +0200
-+++ work/common/lib/modules/fglrx/build_mod/kcl_wait.c	2010-04-13 19:52:00.054563389 +0200
-@@ -39,6 +39,7 @@
- #include <linux/wait.h>
- #include <linux/highmem.h>
- #include <linux/sched.h>
-+#include <linux/slab.h>
-
- #include "kcl_config.h"
- #include "kcl_wait.h"
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.35-and-newer.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.35-and-newer.patch
deleted file mode 100644
index e1703f34..00000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-2.6.35-and-newer.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- work.orig/common/lib/modules/fglrx/build_mod/kcl_ioctl.c	2010-09-19 11:45:04.922760268 +0200
-+++ work/common/lib/modules/fglrx/build_mod/kcl_ioctl.c	2010-09-19 12:04:29.092812959 +0200
-@@ -193,7 +193,7 @@ void ATI_API_CALL KCL_IOCTL_UnregisterCo
-  */
- void* ATI_API_CALL KCL_IOCTL_AllocUserSpace32(long size)
- {
--    return compat_alloc_user_space(size);
-+    return arch_compat_alloc_user_space(size);
- }
- 
- #endif // __x86_64__
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.36.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.36.patch
deleted file mode 100644
index 5f8f5845..00000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-2.6.36.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- work.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-08-20 21:51:48.000000000 +0200
-+++ work/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-08-20 23:46:37.000000000 +0200
-@@ -320,7 +320,11 @@
-     return firegl_release((KCL_IO_FILE_Handle)filp);
- }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
-+int ip_firegl_ioctl(struct file* filp, unsigned int cmd, unsigned long arg)
-+#else
- int ip_firegl_ioctl(struct inode* inode, struct file* filp, unsigned int cmd, unsigned long arg)
-+#endif
- {
-     return firegl_ioctl((KCL_IO_FILE_Handle)filp, cmd, arg);
- }
-@@ -407,7 +411,11 @@
- #endif
-     open:    ip_firegl_open,
-     release: ip_firegl_release,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
-+    unlocked_ioctl:   ip_firegl_ioctl,
-+#else
-     ioctl:   ip_firegl_ioctl,
-+#endif
-     mmap:    ip_firegl_mmap,
- 
-     write:   ip_firegl_write,
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.37.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.37.patch
deleted file mode 100644
index e3feb837..00000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-2.6.37.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ati.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-11-18 18:08:34.831997690 +0100
-+++ ati/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-11-18 18:10:28.711997706 +0100
-@@ -5094,7 +5094,11 @@
- unsigned int ATI_API_CALL KAS_Mutex_Initialize(void* hMutex)
- {
-     kasMutex_t* mutex_obj = (kasMutex_t*)hMutex;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)
-+    sema_init(&(mutex_obj->mutex),1);
-+#else
-     init_MUTEX(&(mutex_obj->mutex));
-+#endif
-     return 1;
- }
- 
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.38.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.38.patch
deleted file mode 100644
index 0c3970e0..00000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-2.6.38.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- cat11.1/common/lib/modules/fglrx/build_mod/firegl_public.c	2011-01-17 15:59:26.000000000 +0100
-+++ cat11.1/common/lib/modules/fglrx/build_mod/firegl_public.c	2011-02-01 18:39:08.902218444 +0100
-@@ -848,7 +848,12 @@
-      * happen much less frequent then without this workaround.
-      */
-     if (state == PM_EVENT_SUSPEND)
--        acquire_console_sem();
-+      
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
-+        console_lock();
-+#else
-+	acquire_console_sem();
-+#endif
- 
-     if (firegl_cail_powerdown(privdev, state))
-         ret = -EIO;
-@@ -870,8 +875,13 @@
-     }
- 
-     if (state == PM_EVENT_SUSPEND)
--        release_console_sem();
--
-+      
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
-+        console_unlock();
-+#else
-+	release_console_sem();
-+#endif
-+	
-     KCL_DEBUG_TRACEOUT(FN_FIREGL_ACPI, ret, NULL);  
-     
-     return ret;
-@@ -894,7 +904,12 @@
-     if (PMSG_EVENT(pdev->dev.power.power_state) == 0) return 0;
- 
-     if (PMSG_EVENT(pdev->dev.power.power_state) == PM_EVENT_SUSPEND)
--        acquire_console_sem();
-+      
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
-+        console_lock();
-+#else
-+	acquire_console_sem();
-+#endif
- 
- #ifdef FIREGL_USWC_SUPPORT
-     // Restore the PAT after resuming from S3 or S4.
-@@ -919,7 +934,12 @@
-     firegl_cail_powerup(privdev);
- 
-     if (PMSG_EVENT(pdev->dev.power.power_state) == PM_EVENT_SUSPEND)
--        release_console_sem();
-+      
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
-+        console_unlock();
-+#else
-+	release_console_sem();
-+#endif
- 
-     PMSG_EVENT(pdev->dev.power.power_state) = 0;
-     KCL_DEBUG_TRACEOUT(FN_FIREGL_ACPI, 0, NULL);  
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.39.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.39.patch
deleted file mode 100644
index ffd2e459..00000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-2.6.39.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- firegl_public.c.orig	2011-05-10 22:19:26.395914392 +0200
-+++ firegl_public.c	2011-05-11 01:40:36.967379590 +0200
-@@ -114,7 +114,9 @@
- #include <linux/pci.h>
- #include <linux/wait.h>
- #include <linux/miscdevice.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)
- #include <linux/smp_lock.h>
-+#endif
- // newer SuSE kernels need this
- #include <linux/highmem.h>
- 
-@@ -1049,7 +1051,11 @@ static int __init firegl_init_module(voi
-     dev->pubdev.signature = FGL_DEVICE_SIGNATURE;
- 
-     for (i = 0; i < __KE_MAX_SPINLOCKS; i++)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)
-         dev->spinlock[i] = SPIN_LOCK_UNLOCKED;
-+#else
-+        dev->spinlock[i] = __SPIN_LOCK_UNLOCKED(old_style_spin_init);
-+#endif
- 
-     for (i=0; i < __KE_MAX_SEMAPHORES; i++)
-         sema_init(&dev->struct_sem[i], 1);
-@@ -1900,13 +1906,17 @@ void ATI_API_CALL KCL_spin_unlock(void *
- /** \brief Grab global kernel lock */
- void ATI_API_CALL KCL_GlobalKernelLock(void)
- {
-+#ifdef CONFIG_KERNEL_LOCK
-     lock_kernel();
-+#endif
- }
- 
- /** \brief Release global kernel lock */
- void ATI_API_CALL KCL_GlobalKernelUnlock(void)
- {
-+#ifdef CONFIG_KERNEL_LOCK
-     unlock_kernel();
-+#endif
- }
- 
- /*****************************************************************************/
---- drmP.h.orig	2011-05-10 22:17:00.000000000 +0200
-+++ drmP.h	2011-05-11 01:32:09.399610802 +0200
-@@ -57,7 +57,9 @@
- #include <linux/pci.h>
- #include <linux/version.h>
- #include <linux/sched.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)
- #include <linux/smp_lock.h>	/* For (un)lock_kernel */
-+#endif
- #include <linux/mm.h>
- #include <linux/pagemap.h>
- #if defined(__alpha__) || defined(__powerpc__)
- #if defined(__alpha__) || defined(__powerpc__)
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-3.2.8+-2.patch b/x11-drivers/ati-drivers/files/ati-drivers-3.2.8+-2.patch
deleted file mode 100644
index 9bf9058f..00000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-3.2.8+-2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -187,6 +187,9 @@
- #include <linux/gfp.h>
- #include <linux/swap.h>
- #include "asm/i387.h"
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)
-+#include <asm/fpu-internal.h>
-+#endif
- 
- #include "firegl_public.h"
- #include "kcl_osconfig.h"
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-3.2.8+.patch b/x11-drivers/ati-drivers/files/ati-drivers-3.2.8+.patch
deleted file mode 100644
index 01291160..00000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-3.2.8+.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -187,6 +187,9 @@
- #include <linux/gfp.h>
- #include <linux/swap.h>
- #include "asm/i387.h"
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)
-+#include <asm/fpu-internal.h>
-+#endif
- 
- #include "firegl_public.h"
- #include "kcl_osconfig.h"
-@@ -5807,10 +5810,16 @@ void ATI_API_CALL KCL_fpu_begin(void)
- #ifdef CONFIG_X86_64
-     kernel_fpu_begin();
- #else
-+#ifndef TS_USEDFPU
-+    preempt_disable();
-+    if (__thread_has_fpu(current))
-+        __save_init_fpu(current);
-+#else
-     struct thread_info *cur_task = current_thread_info();
-     preempt_disable();
-     if (cur_task->status & TS_USEDFPU)
-         __save_init_fpu(cur_task->task);
-+#endif
-     else
-         clts();
- #endif
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-CVE-2010-3081-fix.patch b/x11-drivers/ati-drivers/files/ati-drivers-CVE-2010-3081-fix.patch
deleted file mode 100644
index 5a71da10..00000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-CVE-2010-3081-fix.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
- *                                                                          *
- * Copyright 1999-2005 ATI Technologies Inc., Markham, Ontario, CANADA.     *
- * All Rights Reserved.                                                     *
- *                                                                          *
- * Your use and or redistribution of this software in source and \ or       *
- * binary form, with or without modification, is subject to: (i) your       *
- * ongoing acceptance of and compliance with the terms and conditions of    *
- * the ATI Technologies Inc. software End User License Agreement; and (ii)  *
- * your inclusion of this notice in any version of this software that you   *
- * use or redistribute.  A copy of the ATI Technologies Inc. software End   *
- * User License Agreement is included with this software and is also        *
- * available by contacting ATI Technologies Inc. at http://www.ati.com      *
- *                                                                          *
- ****************************************************************************/
-
---- common/lib/modules/fglrx/build_mod/kcl_ioctl.c.orig	2010-09-01 16:05:31.000000000 +0200
-+++ common/lib/modules/fglrx/build_mod/kcl_ioctl.c	2010-09-23 01:41:46.711844303 +0200
-@@ -35,6 +35,9 @@
- 
- #ifdef __x86_64__
- #   include "asm/compat.h"
-+#   if ARCH_COMPAT_ALLOC_USER_SPACE
-+#      include "linux/compat.h"
-+#   endif
- #   if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
- #       if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
- #           include "linux/ioctl32.h"
-@@ -193,7 +196,20 @@
-  */
- void* ATI_API_CALL KCL_IOCTL_AllocUserSpace32(long size)
- {
--    return compat_alloc_user_space(size);
-+    void __user *ptr;
-+
-+    /* If size would occupy more than half of the entire compat space... */
-+    if (unlikely(size > (((compat_uptr_t)~0) >> 1)))
-+        return NULL;
-+#if ARCH_COMPAT_ALLOC_USER_SPACE
-+    ptr = arch_compat_alloc_user_space(size);
-+#else
-+    ptr = compat_alloc_user_space(size);
-+#endif
-+    if (unlikely(!access_ok(VERIFY_WRITE, ptr, size)))
-+        return NULL;
-+
-+    return ptr;
- }
- 
- #endif // __x86_64__
---- common/lib/modules/fglrx/build_mod/2.6.x/Makefile.orig	2010-09-01 16:05:31.000000000 +0200
-+++ common/lib/modules/fglrx/build_mod/2.6.x/Makefile	2010-09-23 01:47:46.533415019 +0200
-@@ -66,6 +66,7 @@
-                 -DFGL_GART_RESERVED_SLOT \
-                 -DFGL_LINUX253P1_VMA_API \
-                 -DPAGE_ATTR_FIX=$(PAGE_ATTR_FIX) \
-+                -DARCH_COMPAT_ALLOC_USER_SPACE=$(ARCH_COMPAT_ALLOC_USER_SPACE) \
- 
- ifeq ($(KERNELRELEASE),)
- # on first call from remote location we get into this path
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-do_mmap.patch b/x11-drivers/ati-drivers/files/ati-drivers-do_mmap.patch
deleted file mode 100644
index 04248eb7..00000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-do_mmap.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-06-15 18:30:13.483762070 +0200
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-06-17 17:47:36.543041869 +0200
-@@ -2106,6 +2106,12 @@
-     }
- }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
-+# define NO_DO_MMAP
-+# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, f)
-+# define do_munmap(a,b,c) vm_munmap(b, c)
-+#endif
-+
- unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval(
-                                         KCL_IO_FILE_Handle file,
-                                         unsigned long addr,
-@@ -2117,10 +2123,13 @@
- 
-     flags = MAP_SHARED;
-     prot  = PROT_READ|PROT_WRITE;
--
-+#ifdef NO_DO_MMAP
-+    vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff);
-+#else
-     down_write(&current->mm->mmap_sem);
-     vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff);
-     up_write(&current->mm->mmap_sem);
-+#endif
-     if (IS_ERR(vaddr))
-        return 0;
-     else
-@@ -2131,7 +2140,9 @@
- {
-     int retcode = 0;
- 
-+#ifndef NO_DO_MMAP
-     down_write(&current->mm->mmap_sem);
-+#endif
- #ifdef FGL_LINUX_RHEL_MUNMAP_API
-     retcode = do_munmap(current->mm,
-                         addr,
-@@ -2142,7 +2153,9 @@
-                         addr,
-                         len);
- #endif                        
-+#ifndef NO_DO_MMAP
-     up_write(&current->mm->mmap_sem);
-+#endif
-     return retcode;
- }
- 
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-fix_compilation-bug-297322.patch b/x11-drivers/ati-drivers/files/ati-drivers-fix_compilation-bug-297322.patch
deleted file mode 100644
index e2af915a..00000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-fix_compilation-bug-297322.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -1441,7 +1441,9 @@
- todo !!!
- #endif
- 
--unsigned long ATI_API_CALL __ke__cmpxchg(volatile void *ptr, unsigned long old,
-+void __cmpxchg_wrong_size(void) {}
-+
-+unsigned long ATI_API_CALL __ke__cmpxchg(volatile unsigned long *ptr, unsigned long old,
-          unsigned long new, int size)
- {
- #ifndef __HAVE_ARCH_CMPXCHG
---- common/lib/modules/fglrx/build_mod/firegl_public.h
-+++ common/lib/modules/fglrx/build_mod/firegl_public.h
-@@ -441,7 +441,8 @@
- extern void ATI_API_CALL KCL_SIGNAL_BlockAll(int (*notifier)(void *priv), void *pPriv, __ke_sigset_t *pSigMask);
- extern void ATI_API_CALL KCL_SIGNAL_UnblockAll(void);
- 
--extern unsigned long ATI_API_CALL __ke__cmpxchg(volatile void *ptr, unsigned long old,                      
-+extern void __cmpxchg_wrong_size(void);
-+extern unsigned long ATI_API_CALL __ke__cmpxchg(volatile unsigned long *ptr, unsigned long old,                      
-                       unsigned long new, int size);
- 
- #define __ke_cmpxchg(ptr,o,n)                        \
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-kernel-3.8-acpihandle.patch b/x11-drivers/ati-drivers/files/ati-drivers-kernel-3.8-acpihandle.patch
deleted file mode 100644
index bdff4fb7..00000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-kernel-3.8-acpihandle.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- common/lib/modules/fglrx/build_mod/kcl_acpi.c	2012-07-04 21:43:47.000000000 +0200
-+++ common/lib/modules/fglrx/build_mod/kcl_acpi.c.new	2012-12-23 11:25:38.000000000 +0100
-@@ -775,11 +775,7 @@
- unsigned int ATI_API_CALL KCL_ACPI_GetHandles(kcl_match_info_t *pInfo)
- {
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
--    #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19)
--        pInfo->video_handle = pInfo->pcidev->dev.archdata.acpi_handle;
--    #else 
--        pInfo->video_handle = pInfo->pcidev->dev.firmware_data;
--    #endif    
-+    pInfo->video_handle = DEVICE_ACPI_HANDLE(&pInfo->pcidev->dev);
-     if ( pInfo->video_handle &&
-         (KCL_ACPI_videoDevice(pInfo->video_handle) != KCL_ACPI_OK) )
-     {
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-linux-4.0.patch b/x11-drivers/ati-drivers/files/ati-drivers-linux-4.0.patch
deleted file mode 100644
index 9b321955..00000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-linux-4.0.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
-index 0f7399d..eb23e06 100644
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -4240,8 +4240,13 @@ static void kcl_mem_pat_setup (void *info)
- 
-     if (cpu_has_pge)
-     {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,20,0)
-         cr4 = read_cr4();
-         write_cr4(cr4 & ~X86_CR4_PGE);
-+#else
-+        cr4 = __read_cr4();
-+        __write_cr4(cr4 & ~X86_CR4_PGE);
-+#endif
-     }
-      __flush_tlb();
- 
-@@ -4254,7 +4259,11 @@ static void kcl_mem_pat_setup (void *info)
-     write_cr0(cr0 & 0xbfffffff);
-     if (cpu_has_pge)
-     {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,20,0)
-         write_cr4(cr4);
-+#else
-+        __write_cr4(cr4);
-+#endif
-     }
-     local_irq_restore(flags);
- 
-@@ -4281,8 +4290,13 @@ static void kcl_mem_pat_restore (void *info)
- 
-     if (cpu_has_pge)
-     {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,20,0)
-         cr4 = read_cr4();
-         write_cr4(cr4 & ~X86_CR4_PGE);
-+#else
-+        cr4 = __read_cr4();
-+        __write_cr4(cr4 & ~X86_CR4_PGE);
-+#endif
-     }
-      __flush_tlb();
-   
-@@ -4294,7 +4308,11 @@ static void kcl_mem_pat_restore (void *info)
-     write_cr0(cr0 & 0xbfffffff);
-     if (cpu_has_pge)
-     {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,20,0)
-         write_cr4(cr4);
-+#else
-+        __write_cr4(cr4);
-+#endif
-     }
-     local_irq_restore(flags);
- 
-diff --git a/common/lib/modules/fglrx/build_mod/kcl_str.c b/common/lib/modules/fglrx/build_mod/kcl_str.c
-index 2d89eb0..6df117c 100644
---- a/common/lib/modules/fglrx/build_mod/kcl_str.c
-+++ b/common/lib/modules/fglrx/build_mod/kcl_str.c
-@@ -169,7 +169,11 @@ int ATI_API_CALL KCL_STR_Strnicmp(const char* s1,
-                                   const char* s2,
-                                   KCL_TYPE_SizeSigned count)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,20,0)
-     return strnicmp(s1, s2, count);
-+#else
-+    return strncasecmp(s1, s2, count);
-+#endif
- }
- 
- /** \brief Locate character in string
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-old_rsp.patch b/x11-drivers/ati-drivers/files/ati-drivers-old_rsp.patch
deleted file mode 100644
index 0456bd6b..00000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-old_rsp.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-05-26 18:33:25.044695179 +0200

-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-05-26 18:28:39.692699095 +0200

-@@ -4154,7 +4154,7 @@

- {

-     unsigned int p;

-     KCL_DEBUG5(FN_FIREGL_KAS, "%d\n", level_init);

--    for_each_cpu_mask(p, cpu_possible_map)

-+    for_each_possible_cpu(p)

-     {

-         KCL_DEBUG1(FN_FIREGL_KAS,"Setting initial execution level for CPU # %d\n", p);

-         preempt_disable();

---- a/common/lib/modules/fglrx/build_mod/kcl_ioctl.c	2012-05-26 19:11:03.402987821 +0200

-+++ b/common/lib/modules/fglrx/build_mod/kcl_ioctl.c	2012-05-26 19:13:00.273986422 +0200

-@@ -217,6 +217,10 @@

-  *  \param size [in] Number of bytes to allocate

-  *  \return Pointer to allocated memory

-  */

-+#ifndef CONFIG_X86_X32

-+DEFINE_PER_CPU(unsigned long, old_rsp);

-+#endif

-+

- void* ATI_API_CALL KCL_IOCTL_AllocUserSpace32(long size)

- {

-     void __user *ret = COMPAT_ALLOC_USER_SPACE(size);
\ No newline at end of file
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-redefine-WARN.patch b/x11-drivers/ati-drivers/files/ati-drivers-redefine-WARN.patch
deleted file mode 100644
index fe5ed2f8..00000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-redefine-WARN.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- common/lib/modules/fglrx/build_mod/kcl_debug.h.orig	2011-12-30 14:32:00.271391437 +0100
-+++ common/lib/modules/fglrx/build_mod/kcl_debug.h	2011-12-30 15:48:21.647473696 +0100
-@@ -85,8 +85,8 @@
- #ifdef ERROR
- #undef ERROR
- #endif
--#ifdef WARN
--#undef WARN
-+#ifdef AMD_WARN
-+#undef AMD_WARN
- #endif
- #ifdef INFO
- #undef INFO
-@@ -122,7 +122,7 @@
- {
-     SPECIAL = 0,
-     ERROR  ,
--    WARN  ,
-+    AMD_WARN  ,
-     INFO ,
-     INFOEX,
-     TRACE,
-@@ -163,14 +163,14 @@
- {
-     {SPECIAL        ,   'S'},
-     {ERROR          ,   'E'},
--    {WARN           ,   'W'},
-+    {AMD_WARN       ,   'W'},
-     {INFO           ,   'I'},
-     {INFOEX         ,   'X'},
-     {TRACE          ,   'T'},
-     {PERFORMANCE    ,   'P'},
-     {DUMP           ,   'D'},
- };
--#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(ERROR) |___BIT(WARN) | ___BIT(TRACE)| ___BIT(SPECIAL)  ))
-+#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(ERROR) |___BIT(AMD_WARN) | ___BIT(TRACE)| ___BIT(SPECIAL)  ))
- #define INFO_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX)))
- static module_map module_type_map[LOG_M_MAX] =
- {
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-vm-reserverd.patch b/x11-drivers/ati-drivers/files/ati-drivers-vm-reserverd.patch
deleted file mode 100644
index 08045a65..00000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-vm-reserverd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- common/lib/modules/fglrx/build_mod/firegl_public.c	2012-10-18 00:29:21.778369464 +0200
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c.new	2012-10-18 00:30:39.647416026 +0200
-@@ -222,6 +222,10 @@
- #define preempt_enable()
- #endif
- 
-+#ifndef VM_RESERVED
-+#define  VM_RESERVED   (VM_DONTEXPAND | VM_DONTDUMP)
-+#endif
-+
- // ============================================================
- /* globals */
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-x32_something_something.patch b/x11-drivers/ati-drivers/files/ati-drivers-x32_something_something.patch
deleted file mode 100644
index d37c1191..00000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-x32_something_something.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/common/lib/modules/fglrx/build_mod/kcl_ioctl.c	2012-05-26 19:11:03.402987821 +0200
-+++ b/common/lib/modules/fglrx/build_mod/kcl_ioctl.c	2012-05-26 19:13:00.273986422 +0200
-@@ -217,6 +217,10 @@
-  *  \param size [in] Number of bytes to allocate
-  *  \return Pointer to allocated memory
-  */
-+#ifndef CONFIG_X86_X32
-+DEFINE_PER_CPU(unsigned long, old_rsp);
-+#endif
-+
- void* ATI_API_CALL KCL_IOCTL_AllocUserSpace32(long size)
- {
-     void __user *ret = COMPAT_ALLOC_USER_SPACE(size);
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-xen.patch b/x11-drivers/ati-drivers/files/ati-drivers-xen.patch
deleted file mode 100644
index a1b88df7..00000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-xen.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- common/lib/modules/fglrx/build_mod/firegl_public.c	2008-12-09 15:17:27.000000000 +0000
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c	2008-12-09 15:12:34.000000000 +0000
-@@ -31,6 +31,9 @@
- #include <linux/autoconf.h>
- 
- #if !defined(CONFIG_X86_PC) 
-+#if !defined(CONFIG_X86_PC_XEN)
-+#if !defined(CONFIG_X86_XEN)
-+#if !defined(CONFIG_X86_64_XEN)
- #if !defined(CONFIG_X86_64)
- #if !defined(CONFIG_X86_VOYAGER)
- #if !defined(CONFIG_X86_NUMAQ)
-@@ -47,6 +50,9 @@
- #endif
- #endif
- #endif
-+#endif
-+#endif
-+#endif
- 
- /* The dirty-page-tracking patch included in NLD 9 SMP kernels defines
-  * a static inline function that uses a GPL-only symbol in a header
---- common/lib/modules/fglrx/build_mod/firegl_public.h	2008-12-09 15:17:27.000000000 +0000
-+++ common/lib/modules/fglrx/build_mod/firegl_public.h	2008-12-09 15:15:45.000000000 +0000
-@@ -30,9 +30,13 @@
- #endif
- 
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
--
-+#ifdef CONFIG_XEN
-+#define REMAP_PAGE_RANGE_FN io_remap_pfn_range
-+#define REMAP_PAGE_RANGE_STR "io_remap_pfn_range"
-+#else
- #define REMAP_PAGE_RANGE_FN remap_pfn_range
- #define REMAP_PAGE_RANGE_STR "remap_pfn_range"
-+#endif
- #define REMAP_PAGE_RANGE_OFF(offset) ((offset) >> PAGE_SHIFT)
- 
- #else /* LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,9) */
-@@ -43,13 +47,21 @@
- 
- #endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) */
- 
-+#ifdef CONFIG_XEN
-+#define REMAP_PAGE_RANGE(vma,offset) \
-+    REMAP_PAGE_RANGE_FN((vma), \
-+                        (vma)->vm_start,       \
-+                        REMAP_PAGE_RANGE_OFF(offset), \
-+                        (vma)->vm_end - (vma)->vm_start, \
-+                        (vma)->vm_page_prot)
-+#else
- #define REMAP_PAGE_RANGE(vma,offset) \
-     REMAP_PAGE_RANGE_FN(FGL_VMA_API_PASS \
-                         (vma)->vm_start,	\
-                         REMAP_PAGE_RANGE_OFF(offset), \
-                         (vma)->vm_end - (vma)->vm_start, \
-                         (vma)->vm_page_prot)
--
-+#endif
- 
- /* Page table macros */
- 
diff --git a/x11-drivers/ati-drivers/files/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/ati-powermode-opt-path-2.patch
deleted file mode 100644
index f5a35a30..00000000
--- a/x11-drivers/ati-drivers/files/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/ati-powermode-opt-path-3.patch b/x11-drivers/ati-drivers/files/ati-powermode-opt-path-3.patch
deleted file mode 100644
index 106e67ee..00000000
--- a/x11-drivers/ati-drivers/files/ati-powermode-opt-path-3.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2012-08-17 22:39:05.077984979 +0800
-+++ b/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2012-08-17 22:41:15.919976149 +0800
-@@ -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 --effective=now"
-     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=3 --effective=now"
-     fi
- fi
diff --git a/x11-drivers/ati-drivers/files/atieventsd.init b/x11-drivers/ati-drivers/files/atieventsd.init
deleted file mode 100644
index 73139ce3..00000000
--- a/x11-drivers/ati-drivers/files/atieventsd.init
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/files/atieventsd.init,v 1.3 2007/05/18 23:58:01 marienz Exp $
-
-depend() {
-    need acpid
-}
-
-start() {
-    ebegin "Starting ${SVCNAME}"
-    start-stop-daemon --start --exec /opt/sbin/atieventsd -- ${ATIEVENTSDOPTS}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping ${SVCNAME}"
-    start-stop-daemon --stop --quiet --exec /opt/sbin/atieventsd
-    eend $?
-}
\ No newline at end of file
diff --git a/x11-drivers/ati-drivers/files/buildfix_kernel_3.13.patch b/x11-drivers/ati-drivers/files/buildfix_kernel_3.13.patch
deleted file mode 100644
index 432e6666..00000000
--- a/x11-drivers/ati-drivers/files/buildfix_kernel_3.13.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 6ea087272c0774fc86693a6fc379a2226e10b323 Mon Sep 17 00:00:00 2001
-From: Alberto Milone <alberto.milone@canonical.com>
-Date: Wed, 8 Jan 2014 16:09:58 +0100
-Subject: [PATCH 1/1] Add support for Linux 3.13
-
-Do not use the ACPI handle which was removed from struct acpi_dev_node
-in Linux 3.13. Use the ACPI companion device instead.
----
- kcl_acpi.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/kcl_acpi.c b/kcl_acpi.c
-index 5eb9fb1..96b6113 100755
---- a/common/lib/modules/fglrx/build_mod/kcl_acpi.c
-+++ b/common/lib/modules/fglrx/build_mod/kcl_acpi.c
-@@ -793,7 +793,11 @@ unsigned int ATI_API_CALL KCL_ACPI_GetHandles(kcl_match_info_t *pInfo)
- {
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
-     #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
-+        #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)
-+        pInfo->video_handle = pInfo->pcidev->dev.acpi_node.companion;
-+        #else
-         pInfo->video_handle = pInfo->pcidev->dev.acpi_node.handle;
-+        #endif
-     #elif LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19)
-         pInfo->video_handle = pInfo->pcidev->dev.archdata.acpi_handle;
-     #else 
--- 
-1.7.9.5
-
diff --git a/x11-drivers/ati-drivers/files/check-for-iommu-only-if-iommu-is-supported.patch b/x11-drivers/ati-drivers/files/check-for-iommu-only-if-iommu-is-supported.patch
deleted file mode 100644
index 79324873..00000000
--- a/x11-drivers/ati-drivers/files/check-for-iommu-only-if-iommu-is-supported.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1633d55aa0fb9c2ceb0ae1eab15bdec5066d35ae Mon Sep 17 00:00:00 2001
-From: Emil Karlson <jekarlson@gmail.com>
-Date: Fri, 2 Aug 2013 01:18:41 +0300
-Subject: [PATCH 1/3] Check for iommu only, if iommu is supported.
-
----
- common/lib/modules/fglrx/build_mod/kcl_iommu.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/common/lib/modules/fglrx/build_mod/kcl_iommu.c b/common/lib/modules/fglrx/build_mod/kcl_iommu.c
-index c6602dd..803455c 100755
---- a/common/lib/modules/fglrx/build_mod/kcl_iommu.c
-+++ b/common/lib/modules/fglrx/build_mod/kcl_iommu.c
-@@ -183,11 +183,13 @@ void ATI_API_CALL KCL_IOMMU_UnbindPasid( KCL_PCI_DevHandle pcidev,int pasid)
-  */
- int ATI_API_CALL KCL_IOMMU_CheckInfo( KCL_PCI_DevHandle pcidev)
- {
-+#if defined(CONFIG_INTEL_IOMMU) || defined(CONFIG_AMD_IOMMU)
-     struct pci_dev* pdev = (struct pci_dev*)pcidev;
--    if ( pdev->dev.archdata.iommu )
-+	if ( pdev->dev.archdata.iommu )
-     {
-         return 1;
-     }
-+#endif
-     return 0;
- }
- 
--- 
-1.8.1.5
-
diff --git a/x11-drivers/ati-drivers/files/const-notifier-block.patch b/x11-drivers/ati-drivers/files/const-notifier-block.patch
deleted file mode 100644
index ba1fdb2b..00000000
--- a/x11-drivers/ati-drivers/files/const-notifier-block.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Nur common/lib/modules/fglrx/build_mod/kcl_acpi.c common-r1/lib/modules/fglrx/build_mod/kcl_acpi.c
---- common/lib/modules/fglrx/build_mod/kcl_acpi.c	2013-01-29 17:03:51.000000000 +0200
-+++ common-r1/lib/modules/fglrx/build_mod/kcl_acpi.c	2013-02-15 20:33:10.611838616 +0200
-@@ -15,6 +15,9 @@
-  ****************************************************************************/
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
-+#include <linux/notifier.h>
-+#endif
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
- #include <generated/autoconf.h>
- #else
-@@ -145,7 +148,11 @@
-     return NOTIFY_OK;
- }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
-+static notifier_block_no_const firegl_acpi_lid_notifier = {
-+#else
- static struct notifier_block firegl_acpi_lid_notifier = {
-+#endif
-         .notifier_call = firegl_acpi_lid_event,
- };
- #endif
diff --git a/x11-drivers/ati-drivers/files/fgl_glxgears-do-not-include-glATI.patch b/x11-drivers/ati-drivers/files/fgl_glxgears-do-not-include-glATI.patch
deleted file mode 100644
index d46e027c..00000000
--- a/x11-drivers/ati-drivers/files/fgl_glxgears-do-not-include-glATI.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur extra/fgl_glxgears/fgl_glxgears.c extra-r1/fgl_glxgears/fgl_glxgears.c
---- extra/fgl_glxgears/fgl_glxgears.c	2012-08-29 09:59:03.000000000 +0300
-+++ extra-r1/fgl_glxgears/fgl_glxgears.c	2013-09-07 09:26:11.034723135 +0300
-@@ -78,7 +78,6 @@
- #endif // _WIN32
- 
- #define INT_PTR ptrdiff_t
--#include <GL/glATI.h>
- 
- #ifdef _WIN32
- #include <GL/wglATI.h>
diff --git a/x11-drivers/ati-drivers/files/fix-the-linux-3.17-no_hotplug-error.patch b/x11-drivers/ati-drivers/files/fix-the-linux-3.17-no_hotplug-error.patch
deleted file mode 100644
index a8b54625..00000000
--- a/x11-drivers/ati-drivers/files/fix-the-linux-3.17-no_hotplug-error.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- common/lib/modules/fglrx/build_mod/kcl_acpi.c.orig	2014-07-11 11:46:19.000000000 +0200
-+++ common/lib/modules/fglrx/build_mod/kcl_acpi.c	2014-10-08 15:12:55.535638391 +0200
-@@ -829,6 +829,7 @@
- 
- static acpi_status KCL_ACPI_Slot_No_Hotplug(KCL_ACPI_DevHandle handle, u32 lvl, void *data, void **rv)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,7)
-    struct acpi_device *tdev;
-    struct pci_dev *pdev = (struct pci_dev *)data;
-@@ -844,6 +845,7 @@
-       }
-    }
- #endif
-+#endif
-    return 0;
- }
- 
diff --git a/x11-drivers/ati-drivers/files/kernel/2.6.31-fglrx_find_task_by_vpid.patch b/x11-drivers/ati-drivers/files/kernel/2.6.31-fglrx_find_task_by_vpid.patch
deleted file mode 100644
index 1d4e030b..00000000
--- a/x11-drivers/ati-drivers/files/kernel/2.6.31-fglrx_find_task_by_vpid.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- common/lib/modules/fglrx/build_mod/firegl_public.c.orig	2009-09-10 20:14:10.302938534 +0200
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c	2009-09-10 20:16:21.828943780 +0200
-@@ -183,6 +183,7 @@
- #include <linux/string.h>
- #include <linux/gfp.h>
- #include <linux/swap.h>
-+#include <linux/pid.h>
- 
- #include "firegl_public.h"
- #include "kcl_osconfig.h"
-@@ -1315,7 +1316,7 @@
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)  
-    p = find_task_by_pid( pid );
- #else   
--   p = find_task_by_vpid( pid );
-+   p = pid_task( pid, PIDTYPE_PID );
- #endif   
-    if (p) 
-    {
diff --git a/x11-drivers/ati-drivers/files/kernel/2.6.32-9.11-fix_compilation.patch b/x11-drivers/ati-drivers/files/kernel/2.6.32-9.11-fix_compilation.patch
deleted file mode 100644
index 38519d76..00000000
--- a/x11-drivers/ati-drivers/files/kernel/2.6.32-9.11-fix_compilation.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- work/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ work.new/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -1441,7 +1441,9 @@
- todo !!!
- #endif
- 
--unsigned long ATI_API_CALL __ke__cmpxchg(volatile void *ptr, unsigned long old,
-+void __cmpxchg_wrong_size(void) {}
-+
-+unsigned long ATI_API_CALL __ke__cmpxchg(volatile unsigned long *ptr, unsigned long old,
-          unsigned long new, int size)
- {
- #ifndef __HAVE_ARCH_CMPXCHG
---- work/common/lib/modules/fglrx/build_mod/firegl_public.h
-+++ work.new/common/lib/modules/fglrx/build_mod/firegl_public.h
-@@ -441,7 +441,8 @@
- extern void ATI_API_CALL KCL_SIGNAL_BlockAll(int (*notifier)(void *priv), void *pPriv, __ke_sigset_t *pSigMask);
- extern void ATI_API_CALL KCL_SIGNAL_UnblockAll(void);
- 
--extern unsigned long ATI_API_CALL __ke__cmpxchg(volatile void *ptr, unsigned long old,                      
-+extern void __cmpxchg_wrong_size(void);
-+extern unsigned long ATI_API_CALL __ke__cmpxchg(volatile unsigned long *ptr, unsigned long old,                      
-                       unsigned long new, int size);
- 
- #define __ke_cmpxchg(ptr,o,n)                        \
---- work/common/lib/modules/fglrx/build_mod/kcl_io.c
-+++ work.new/common/lib/modules/fglrx/build_mod/kcl_io.c
-@@ -37,8 +37,9 @@
-  */
- 
- #include <linux/version.h>
- #include <linux/autoconf.h>
- #include <linux/poll.h>
-+#include <linux/signal.h>
- #include <asm/io.h>
- 
- #include "kcl_config.h"
diff --git a/x11-drivers/ati-drivers/files/linux-3.10-proc.diff b/x11-drivers/ati-drivers/files/linux-3.10-proc.diff
deleted file mode 100644
index ce4871c0..00000000
--- a/x11-drivers/ati-drivers/files/linux-3.10-proc.diff
+++ /dev/null
@@ -1,293 +0,0 @@
-diff -Nur common/lib/modules/fglrx/build_mod/drmP.h common-r1/lib/modules/fglrx/build_mod/drmP.h
---- common/lib/modules/fglrx/build_mod/drmP.h	2013-05-15 09:26:23.555752577 +0300
-+++ common-r1/lib/modules/fglrx/build_mod/drmP.h	2013-05-16 10:39:17.496212055 +0300
-@@ -901,10 +901,6 @@
- int                   DRM(stub_unregister)(int minor);
- 
- 				/* Proc support (drm_proc.h) */
--extern struct proc_dir_entry *DRM(proc_init)(drm_device_t *dev,
--					     int minor,
--					     struct proc_dir_entry *root,
--					     struct proc_dir_entry **dev_root);
- extern int            DRM(proc_cleanup)(int minor,
- 					struct proc_dir_entry *root,
- 					struct proc_dir_entry *dev_root);
-diff -Nur common/lib/modules/fglrx/build_mod/drm_proc.h common-r1/lib/modules/fglrx/build_mod/drm_proc.h
---- common/lib/modules/fglrx/build_mod/drm_proc.h	2013-05-15 09:26:23.555752577 +0300
-+++ common-r1/lib/modules/fglrx/build_mod/drm_proc.h	2013-05-19 02:16:16.584406160 +0300
-@@ -75,61 +75,6 @@
- #define DRM_PROC_ENTRIES (sizeof(DRM(proc_list))/sizeof(DRM(proc_list)[0]))
- 
- /**
-- * Initialize the DRI proc filesystem for a device.
-- *
-- * \param dev DRM device.
-- * \param minor device minor number.
-- * \param root DRI proc dir entry.
-- * \param dev_root resulting DRI device proc dir entry.
-- * \return root entry pointer on success, or NULL on failure.
-- * 
-- * Create the DRI proc root entry "/proc/ati", the device proc root entry
-- * "/proc/ati/%minor%/", and each entry in proc_list as
-- * "/proc/ati/%minor%/%name%".
-- */
--struct proc_dir_entry *DRM(proc_init)(drm_device_t *dev, int minor,
--				      struct proc_dir_entry *root,
--				      struct proc_dir_entry **dev_root)
--{
--	struct proc_dir_entry *ent;
--	int		      i, j;
--	char                  name[64];
--
--	if (!minor) root = create_proc_entry("dri", S_IFDIR, NULL);
--	if (!root) {
--		DRM_ERROR("Cannot create /proc/ati\n");
--		return NULL;
--	}
--
--	sprintf(name, "%d", minor);
--	*dev_root = create_proc_entry(name, S_IFDIR, root);
--	if (!*dev_root) {
--		DRM_ERROR("Cannot create /proc/ati/%s\n", name);
--		return NULL;
--	}
--
--	for (i = 0; i < DRM_PROC_ENTRIES; i++) {
--		ent = create_proc_entry(DRM(proc_list)[i].name,
--					S_IFREG|S_IRUGO, *dev_root);
--		if (!ent) {
--			DRM_ERROR("Cannot create /proc/ati/%s/%s\n",
--				  name, DRM(proc_list)[i].name);
--			for (j = 0; j < i; j++)
--				remove_proc_entry(DRM(proc_list)[i].name,
--						  *dev_root);
--			remove_proc_entry(name, root);
--			if (!minor) remove_proc_entry("dri", NULL);
--			return NULL;
--		}
--		ent->read_proc = DRM(proc_list)[i].f;
--		ent->data      = dev;
--	}
--
--	return root;
--}
--
--
--/**
-  * Cleanup the proc filesystem resources.
-  *
-  * \param minor device minor number.
-diff -Nur common/lib/modules/fglrx/build_mod/firegl_public.c common-r1/lib/modules/fglrx/build_mod/firegl_public.c
---- common/lib/modules/fglrx/build_mod/firegl_public.c	2013-05-15 09:26:23.545752925 +0300
-+++ common-r1/lib/modules/fglrx/build_mod/firegl_public.c	2013-05-19 03:07:10.236552522 +0300
-@@ -583,6 +583,202 @@
-     { "NULL",           NULL,                       NULL} // Terminate List!!!
- };
- 
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
-+typedef int (read_proc_t)(char *page, char **start, off_t off, int count, int *eof, void *data);
-+typedef int (write_proc_t)(struct file *file, const char __user *buffer, unsigned long count, void *data);
-+#else
-+#define PDE_DATA(inode) (PDE((inode))->data)
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
-+typedef struct {
-+	read_proc_t *read_func;
-+	write_proc_t *write_func;
-+	void *data;
-+} gentoo_proc_wrapper_t;
-+
-+#define GENTOO_PROC_WRAPPER_OVERFLOW_MAGIC 939750305
-+
-+static ssize_t gentoo_proc_wrapper_read (struct file *myfile, char __user *buffer, size_t count, loff_t *offset) {
-+	int is_eof=0, retval;
-+	char *start, *usebuffer=NULL;
-+	gentoo_proc_wrapper_t* wrapper_data=(gentoo_proc_wrapper_t*)(myfile->private_data);
-+	if (PAGE_SIZE<*offset) {
-+		printk(KERN_ERR "Trying to read beyond 4k on proc\n");
-+		return -EIO;
-+	}
-+	//printk(KERN_NOTICE " call with: dev %p, func %p\n", wrapper_data->data, wrapper_data->read_func);
-+	
-+	usebuffer=kmalloc(2*PAGE_SIZE, GFP_KERNEL);
-+	if (!usebuffer)
-+		return -ENOMEM;
-+	((u32*)usebuffer)[1024]=GENTOO_PROC_WRAPPER_OVERFLOW_MAGIC;
-+
-+	retval=wrapper_data->read_func(usebuffer, &start, *offset, count, &is_eof, wrapper_data->data);
-+
-+	BUG_ON(GENTOO_PROC_WRAPPER_OVERFLOW_MAGIC != ((u32*)usebuffer)[1024]);
-+
-+	if (0 > retval)
-+	{
-+		printk(KERN_ERR "Proc read failed with %d", retval);
-+		goto out;
-+	}
-+
-+	if (copy_to_user(buffer, start, retval)) {
-+		printk(KERN_NOTICE "copy to user failed in amd drivers proc code\n");
-+		retval=-EFAULT;
-+		goto out;
-+	}
-+	*offset+=retval;
-+	
-+out:
-+	if (usebuffer)
-+		kfree(usebuffer);
-+	return retval;
-+}
-+static ssize_t gentoo_proc_wrapper_write (struct file *myfile, const char __user *buffer, size_t count, loff_t *offset) {
-+	gentoo_proc_wrapper_t* wrapper_data=(gentoo_proc_wrapper_t*)(myfile->private_data);
-+	int retval=0;
-+	void *usebuffer=NULL;
-+
-+	BUG_ON(*offset);
-+	if (!wrapper_data->write_func)
-+		return -EPERM;
-+	
-+	usebuffer=kmalloc(count, GFP_KERNEL);
-+	if (!usebuffer)
-+		return -ENOMEM;
-+	if (copy_from_user(usebuffer, buffer, count)) {
-+		printk(KERN_NOTICE "copy from user failed in amd drivers proc code\n");
-+		retval=-EFAULT;
-+		goto out;
-+	}
-+	
-+	retval=wrapper_data->write_func(myfile, buffer, count, wrapper_data->data);
-+	*offset+=retval;
-+out:
-+	if (usebuffer)
-+		kfree(usebuffer);
-+	return retval;
-+}
-+static int gentoo_proc_wrapper_open(struct inode *myinode, struct file *myfile) {
-+	myfile->private_data=PDE_DATA(myinode);
-+	return generic_file_open(myinode, myfile);
-+}
-+struct file_operations gentoo_proc_fops = {
-+	.read=gentoo_proc_wrapper_read,
-+	.write=gentoo_proc_wrapper_write,
-+	.open=gentoo_proc_wrapper_open,
-+};
-+	
-+static void *gentoo_proc_wrapper_data(read_proc_t *reader, write_proc_t *writer, void *mydata) {
-+	gentoo_proc_wrapper_t *retval=kmalloc(sizeof(gentoo_proc_wrapper_t), GFP_KERNEL);
-+	if (!retval)
-+		return retval;
-+	retval->read_func=reader;
-+	retval->write_func=writer;
-+	retval->data=mydata;
-+	return retval;
-+}
-+
-+static struct proc_dir_entry *firegl_proc_init( device_t *dev,
-+                                                int minor,
-+                                                struct proc_dir_entry *root,
-+                                                struct proc_dir_entry **dev_root,
-+                                                kcl_proc_list_t *proc_list ) // proc_list must be terminated!
-+{
-+    struct proc_dir_entry *ent;
-+    char    name[64];
-+    kcl_proc_list_t *list = proc_list;
-+	void *tempdata;
-+    KCL_DEBUG1(FN_FIREGL_PROC, "minor %d, proc_list 0x%08lx\n", minor, (unsigned long)proc_list);
-+    if (!minor)
-+    {
-+        root = proc_mkdir("ati", NULL);
-+    }
-+
-+    if (!root)
-+    {
-+        KCL_DEBUG_ERROR("Cannot create /proc/ati\n");
-+        return NULL;
-+    }
-+
-+    if (minor == 0)
-+    {
-+        // Global major debice number entry
-+		tempdata=gentoo_proc_wrapper_data((read_proc_t*)firegl_major_proc_read, NULL, NULL);
-+		if (!tempdata)
-+			return NULL;
-+        ent = proc_create_data("major", S_IFREG|S_IRUGO, root, &gentoo_proc_fops, tempdata);
-+        if (!ent)
-+        {
-+            remove_proc_entry("ati", NULL);
-+            KCL_DEBUG_ERROR("Cannot create /proc/ati/major\n");
-+            return NULL;
-+        }
-+    }
-+
-+    sprintf(name, "%d", minor);
-+    *dev_root = proc_mkdir(name, root);
-+    if (!*dev_root) {
-+        remove_proc_entry("major", root);
-+        remove_proc_entry("ati", NULL);
-+        KCL_DEBUG_ERROR("Cannot create /proc/ati/%s\n", name);
-+        return NULL;
-+    }
-+
-+    while (list->f || list->fops)
-+    {
-+		struct file_operations *my_fops = &gentoo_proc_fops;
-+        if (list->fops)
-+        {
-+            my_fops = (struct file_operations*)list->fops;
-+			tempdata=(dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev);
-+        }
-+		else {
-+			BUG_ON(!list->f);
-+			tempdata=gentoo_proc_wrapper_data((read_proc_t*)list->f, NULL, (dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev) );
-+			if (!tempdata)
-+				return NULL;
-+		}
-+		//printk(KERN_NOTICE "name %s, dev %p, func %p, data %p\n", list->name, (dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev), list->f, tempdata);
-+        ent = proc_create_data(list->name, S_IFREG|S_IRUGO, *dev_root, my_fops, tempdata);
-+
-+        if (!ent)
-+        {
-+            KCL_DEBUG_ERROR("Cannot create /proc/ati/%s/%s\n", name, list->name);
-+            while (proc_list != list)
-+            {
-+                remove_proc_entry(proc_list->name, *dev_root);
-+                proc_list++;
-+            }
-+            remove_proc_entry(name, root);
-+            if (!minor)
-+            {
-+                remove_proc_entry("major", root);
-+                remove_proc_entry("ati", NULL);
-+            }
-+            return NULL;
-+        }
-+
-+        list++;
-+    }
-+
-+    if (minor == 0)
-+    {
-+        // Global debug entry, only create it once
-+		tempdata=gentoo_proc_wrapper_data((read_proc_t*)firegl_debug_proc_read_wrap, (write_proc_t*)firegl_debug_proc_write_wrap, dev);
-+		if (!tempdata)
-+			return NULL;
-+        ent=proc_create_data("debug", S_IFREG|S_IRUGO, root, &gentoo_proc_fops, tempdata);
-+		if (!ent)
-+			return NULL;
-+    }
-+
-+    return root;
-+}
-+#else
- static struct proc_dir_entry *firegl_proc_init( device_t *dev,
-                                                 int minor,
-                                                 struct proc_dir_entry *root,
-@@ -677,6 +873,7 @@
- 
-     return root;
- }
-+#endif
- 
- static int firegl_proc_cleanup( int minor,
-                                 struct proc_dir_entry *root,
diff --git a/x11-drivers/ati-drivers/files/switchlibGL b/x11-drivers/ati-drivers/files/switchlibGL
deleted file mode 100644
index a6aa4fce..00000000
--- a/x11-drivers/ati-drivers/files/switchlibGL
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-#  switchlibGL
-#
-#  Copyright (c) 2011 Advanced Micro Devices, Inc.
-#
-#  Purpose:
-#    For switch between AMD and Intel graphic driver library.
-#
-#  Usage:
-#  switchlibGL   amd|intel|query
-#    amd:   switches to the AMD version of libGL.
-#    intel: switches to the open-source version of libGL .
-#    query: checks, which version is currently active and prints either "amd"
-#    or "intel" or "unknown" on the standard output.
-#    must be root to execute this script
-
-ARCH=`uname -m`
-E_ERR=1
-
-# Check if root
-if [ "`whoami`" != "root" ]; then
-  echo "Must be root to run this script." 1>&2
-  exit $E_ERR
-fi
-
-# One parameter
-if [ $# -ne 1 ]; then
-  echo "Usage: `basename $0` amd|intel|query " 1>&2
-  echo "Please choose one parameter " 1>&2
-  exit $E_ERR
-fi
-
-current=$(eselect opengl show)
-# Switch to right mode
-case "$1" in
-	"amd" )
-		if [ $current != ati ] ; then
-			eselect opengl set ati || return 1
-		fi
-	;;
-	"intel" )
-		if [ $current != xorg-x11 ] ; then
-			eselect opengl set xorg-x11 || return 1
-		fi
-	;;
-	"query" )
-		case "$current" in
-			"ati" )
-				echo "amd"
-			;;
-			"xorg-x11" )
-				echo "intel"
-			;;
-		esac
-	;;
-	* ) echo "Usage: `basename $0` amd|intel|query" 1>&2; exit $E_ERR;;
-	# other than amd|intel|query parameter report an error
-esac
-
-#  A zero return value from the script upon exit indicates success.
-exit 0
diff --git a/x11-drivers/ati-drivers/files/typesafe-kuid.diff b/x11-drivers/ati-drivers/files/typesafe-kuid.diff
deleted file mode 100644
index c226ea3d..00000000
--- a/x11-drivers/ati-drivers/files/typesafe-kuid.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
-index d3ad3ce..9362b58 100755
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -34,6 +34,11 @@
- #include <linux/autoconf.h>
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
-+#include <linux/uidgid.h>
-+#endif
-+
-+
- #if !defined(CONFIG_X86) 
- #if !defined(CONFIG_X86_PC) 
- #if !defined(CONFIG_X86_XEN) 
-@@ -1543,9 +1548,17 @@ KCL_TYPE_Pid ATI_API_CALL KCL_GetTgid(void)
- KCL_TYPE_Uid ATI_API_CALL KCL_GetEffectiveUid(void)
- {
- #ifdef current_euid
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
-+    return __kuid_val(current_euid());
-+# else
-     return current_euid();
-+# endif
- #else
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
-+    return __kuid_val(current->euid);
-+# else
-     return current->euid;
-+# endif
- #endif
- }
- 
diff --git a/x11-drivers/ati-drivers/files/use-kernel_fpu_begin.patch b/x11-drivers/ati-drivers/files/use-kernel_fpu_begin.patch
deleted file mode 100644
index f0ba2785..00000000
--- a/x11-drivers/ati-drivers/files/use-kernel_fpu_begin.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c	2014-10-27 23:30:58.630304842 +0200
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c	2014-10-27 23:32:57.300306011 +0200
-@@ -6389,7 +6389,7 @@
-  */
- void ATI_API_CALL KCL_fpu_begin(void)
- {
--#ifdef CONFIG_X86_64
-+#if defined(CONFIG_X86_64) || LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
-     kernel_fpu_begin();
- #else
- #ifdef TS_USEDFPU
diff --git a/x11-drivers/ati-userspace/Manifest b/x11-drivers/ati-userspace/Manifest
deleted file mode 100644
index 515df79a..00000000
--- a/x11-drivers/ati-userspace/Manifest
+++ /dev/null
@@ -1,22 +0,0 @@
-DIST amd-catalyst-13.12-linux-x86.x86_64.zip 160571830 SHA256 024033f4847d1c2a182fc44e0b3df29b2d133e24aeaba390f4504a8f3361a0ca SHA512 bf02aea47dc0588e8fe6590ff5665b25b34b3e10499348e2eb786ba89b32703897753852e6ee8ed52c3d0f8eef46f2026d130329d7af75191e605975379d0109 WHIRLPOOL bcdac0f9641cfdc6d89cd5544fe22dda91f64ae8d34dcd25b55930702108b1bee1db0cdc85d8a68a78fddc34f7f30ab88c9813d3a6ba38b3abf37a24d6210707
-DIST amd-catalyst-13.4-linux-x86.x86_64.zip 122588023 SHA256 ebec78c7f78db3601d1c97116a6823076a7765318e16d88b619ebc80d4c6d1d5 SHA512 ce012f46527ee0073f658e97dd793954930b934b96be9e1c6cd1d344e7734ef81949b484701d5e7e1ebb221f46b5a617f4efb4445e42c06ac0a8b4eca76463fc WHIRLPOOL cb0f7af6d0474c3d521c5785bab49d76da7e09e1ddd02dc0e72b70b5afdb2bd1e07d4a4115a755f213718e7c32c816697d993b73706d58be68fa043aef1ad551
-DIST amd-catalyst-13.9-linux-x86.x86_64.zip 120482826 SHA256 ebade5062713c69d2b703b0a3f62defc409d58e98ceab3bfac7a71643c0c4cd3 SHA512 887c1146920ba7e5b31efd63b1a1b7d9cab586e8c6d705706e0b176b3527e542f452d919cd015c3a04d6f42c884f27d983b2a9229b70716129a94674dd7f62b4 WHIRLPOOL d8b6c7ed772898914c256674ae08a8b3d3054eb5bdfc2f00dc4c796a36b4654c3101410786adb54eaae44ff35386db2aa8d8db12d70805f8732d0709412bdbcc
-DIST amd-catalyst-14-4-linux-x86-x86-64.zip 122867159 SHA256 03cc022a49f47888b04f12343ace82bc1eff3aac524e6b4433848c20dc77fec0 SHA512 b359e6c9c349e7a3bee2bd95d3e39f0c596b9a9066893ade3eefcc89ee792094d26a04b2f6bdc31431b368a90ae5870ef07f848a4cbcca723ca1c7c3fcf79d98 WHIRLPOOL bd81574e1fc3be3f82ff51392a3044694e2834ce57395f9d4fe1a89dfa4bebd4b9fe24bc739a45173305bd267d1752226f0648145d5982c9dbe2a0ed23cf37f6
-DIST amd-catalyst-omega-14.12-linux-run-installers.zip 155616187 SHA256 68669836f20ad4351e08b13c5766c6b2ffc6b8cd2a37e9baf55779da32d3a249 SHA512 f87be6a56c03ca4aae3782668af8700d83c85872387753cf002ba4a0e0816fae9af29841a4390db972bfe2f7fb853571b32f8434c2008983461b80699347ac21 WHIRLPOOL 2675a387abd372b34c51f4e8ebfd6547300a8c3ffcc0562633838bc0cdaec3675ca3f4cfa2ab7481c8fa1238a46059f5f848611780638ef6d2301a527d900326
-DIST amd-driver-installer-12-1-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST amd-driver-installer-12-2-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST amd-driver-installer-12-3-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST amd-driver-installer-12-4-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST amd-driver-installer-12-6-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST amd-driver-installer-12-8-x86.x86_64.zip 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST amd-driver-installer-12.6-legacy-x86.x86_64.zip 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST amd-driver-installer-15.20.1046-x86.x86_64.zip 51988 SHA256 7a967062bfed30c50f757e649f01d558393d0e2cd9e5fc71e93ece97ff7f877a SHA512 97fdceba59d5914b464fcb1c33242307c3d939552f7de93882d0b4701673609974d790380e0a33890f736393d6d2999bbd1d8118ec3e87145eb6d091b1e7b0c1 WHIRLPOOL 1cbb3f7934f5f9dabdddbfff2241f3bf1d39c33bcb3bc80d0a99dcf030d376c996aeb559f7ec5a84dd782b389c0c70f0a74f2f08fa2e6906f0515a74168730d9
-DIST amd-driver-installer-catalyst-12.10-x86.x86_64.zip 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST amd-driver-installer-catalyst-13.1-linux-x86.x86_64.zip 114850263 SHA256 67898a922b6b58f25a276a144f16b19014f79c39e4d44d8d2883a467d31e34ad SHA512 30763ab7f47ac22c5b5055495e2d8ae6cc2c8e5ce711fa389f1145a48da2799020c2b8cbf082759d93628017860c39d69337f42ce21b78e1d60c9eda32096df9 WHIRLPOOL ee5dc85a89bc56858ef1c2bcdc6cbfde7e2f9e5675d209c1f6db877e0104cc536f1e18139f0b991a064b14b231a982770eef47368ea281067d62647b4c5365a5
-DIST ati-driver-installer-11-10-x86.x86_64.run 50201 SHA256 a8136110a0117cdfb29f1ce7f4a9ffe42fb2132ef2388baffe0d9922f4d50bfb SHA512 0cdde584ed578d5da11335c1d2e4189b1f3f54f8e8ac4b49e07e66014b79a06c146686519dc6615a83bdccff627d9a940a5d55eb73afff2c5ca710267d8f52aa WHIRLPOOL 088d5d4a8a1851e4da879d8d39188271ef7f302d2cd0615b4c54def147f5e8ec1bd026beb8f36abd0941a57e7d57fb9865bae93d09ebd987825df11ce66fda9a
-DIST ati-driver-installer-11-11-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST ati-driver-installer-11-12-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST ati-driver-installer-11-6-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST ati-driver-installer-11-8-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST ati-driver-installer-11-9-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST xvba-sdk-0.74-404001.tar.gz 583847 SHA256 731a2c489f2fb5d7318c1976061b26c1057a696f46d09dcf55fbada97fed17eb SHA512 aa1dd52b59eeeabd026d8b76e3b75eaf02587ef286438ba28884afeef5a5efaf50283b5ee4f5b81b12cf79cb4ec77c9a235a886b29fb7cdf850c9779f4b07b35 WHIRLPOOL 69917b746d353a884512e97b9d9a9b89e6f51add3119e69ddd119d51c0c3f2820b93a449fe42bd76d671dc505f92bf25b7f2c5868b33768fc68a19596e460951
diff --git a/x11-drivers/ati-userspace/ati-userspace-11.10.ebuild b/x11-drivers/ati-userspace/ati-userspace-11.10.ebuild
deleted file mode 100644
index dec54b19..00000000
--- a/x11-drivers/ati-userspace/ati-userspace-11.10.ebuild
+++ /dev/null
@@ -1,384 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs versionator
-
-DESCRIPTION="AMD X11 drivers for r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://ati.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE="debug multilib"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="<=x11-base/xorg-server-1.10.99
-	!x11-drivers/ati-drivers:0
-	!x11-apps/ati-drivers-extra
-	>=app-eselect/eselect-opengl-1.0.7
-	x11-apps/xauth
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	multilib? ( app-emulation/emul-linux-x86-opengl )
-	!<x11-drivers/ati-userspace-${PV}
-	!>x11-drivers/ati-userspace-${PV}"
-
-DEPEND="${RDEPEND}
-	app-misc/pax-utils
-	app-portage/portage-utils
-	sys-apps/findutils
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto
-	x11-libs/libXtst"
-
-EMULTILIB_PKG="true"
-
-S="${WORKDIR}"
-
-# QA Silencing
-QA_TEXTRELS="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/libatiadlxx.so
-	usr/lib*/xorg/modules/glesx.so
-	usr/lib*/libaticaldd.so
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_EXECSTACK="
-	opt/bin/atiode
-	opt/bin/amdcccle
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_WX_LOAD="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_PRESTRIPPED="
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-"
-
-QA_SONAME="
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-"
-
-QA_DT_HASH="
-	opt/bin/amdcccle
-	opt/bin/aticonfig
-	opt/bin/atiodcli
-	opt/bin/atiode
-	opt/bin/fglrxinfo
-	opt/sbin/atieventsd
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libatiuki.so.1.0
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
-	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-"
-
-pkg_setup() {
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	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() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# 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
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
-		|| die "bin rm failed"
-
-        # amdcccle is shipped separately
-        rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle || die "cannot rm amdcccle"
-
-	# ACPI fixups
-	sed -i \
-		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-		-e "s:/var/lib/gdm/:/var/gdm/:" \
-		"${S}/${FOLDER_PREFIX}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}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-		|| die "Replacing 'finger' with 'who' failed."
-	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-	# add function to detect default state.
-	epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch || die "Failed to epatch powermode-opt-path-2.patch"
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	ebegin "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}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-	eend $?
-}
-
-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" || die
-
-	# 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/{glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	exeinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
-
-	# include.
-	insinto /usr
-	doins -r ${FOLDER_PREFIX}usr/include
-	insinto /usr/include/X11/extensions
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin ${FOLDER_PREFIX}usr/sbin/*
-
-	# doc.
-	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
-
-	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
-
-	pushd ${FOLDER_PREFIX}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
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	# Gentoo-specific stuff:
-	newinitd "${FILESDIR}"/atieventsd.init atieventsd
-	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-	newconfd "${T}"/atieventsd.conf atieventsd
-
-	# PowerXpress stuff
-	exeinto /usr/$(get_libdir)/fglrx
-	doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
-	cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
-	doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
-}
-
-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
-	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
-		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/fglrx/fglrx-libglx.so
-	# PowerXpress stuff
-	mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# AMD Cal libraries
-	exeinto /usr/$(get_libdir)
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
-
-	local envname="${T}"/04ati-dri-path
-	if [[ -n ${ABI} ]]; then
-		envname="${envname}-${ABI}"
-	fi
-	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
-	doenvd "${envname}"
-
-	# Silence the QA notice by creating missing soname symlinks
-	for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
-	do
-		local soname=${so##*/}
-		## let's keep also this alternative way ;)
-		#dosym ${soname} /usr/$(get_libdir)/${soname%.[0-9]}
-		dosym ${soname} /usr/$(get_libdir)/$(scanelf -qF "#f%S" ${so})
-	done
-
-}
-
-pkg_postinst() {
-	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 "You will have to source /etc/profile (or logout and back in) for dri"
-	elog "to work, unless you previously had ati-drivers installed."
-
-	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-userspace/ati-userspace-11.11.ebuild b/x11-drivers/ati-userspace/ati-userspace-11.11.ebuild
deleted file mode 100644
index 97d6c35e..00000000
--- a/x11-drivers/ati-userspace/ati-userspace-11.11.ebuild
+++ /dev/null
@@ -1,412 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs versionator
-
-DESCRIPTION="AMD X11 drivers for r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://ati.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE="debug multilib opencl"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="<=x11-base/xorg-server-1.11.49
-	!x11-drivers/ati-drivers:0
-	!x11-apps/ati-drivers-extra
-	>=app-eselect/eselect-opengl-1.0.7
-	x11-apps/xauth
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	multilib? (
-			app-emulation/emul-linux-x86-opengl
-			app-emulation/emul-linux-x86-xlibs
-	)
-	!<x11-drivers/ati-userspace-${PV}
-	!>x11-drivers/ati-userspace-${PV}"
-
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto
-	x11-libs/libXtst"
-
-EMULTILIB_PKG="true"
-
-S="${WORKDIR}"
-
-# QA Silencing
-QA_TEXTRELS="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/libatiadlxx.so
-	usr/lib*/xorg/modules/glesx.so
-	usr/lib*/libaticaldd.so
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_EXECSTACK="
-	opt/bin/atiode
-	opt/bin/amdcccle
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_WX_LOAD="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_PRESTRIPPED="
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-"
-
-QA_SONAME="
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
-"
-
-QA_DT_HASH="
-	opt/bin/amdcccle
-	opt/bin/aticonfig
-	opt/bin/atiodcli
-	opt/bin/atiode
-	opt/bin/clinfo
-	opt/bin/fglrxinfo
-	opt/sbin/atieventsd
-	opt/sbin/amdnotifyui
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libatiuki.so.1.0
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
-	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
-	usr/lib\(32\|64\)\?/libOpenCL.so.1
-"
-
-pkg_setup() {
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	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() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# 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
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
-		|| die "bin rm failed"
-
-        # amdcccle is shipped separately
-        rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle || die "cannot rm amdcccle"
-
-	# ACPI fixups
-	sed -i \
-		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-		-e "s:/var/lib/gdm/:/var/gdm/:" \
-		"${S}/${FOLDER_PREFIX}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}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-		|| die "Replacing 'finger' with 'who' failed."
-	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-	# add function to detect default state.
-	epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch || die "Failed to epatch powermode-opt-path-2.patch"
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	ebegin "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}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-	eend $?
-}
-
-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" || die
-
-	# 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/{glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	use opencl && dobin "${ARCH_DIR}"/usr/bin/clinfo
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	exeinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
-	# OpenCL
-	if use opencl ; then
-		insinto /etc/OpenCL/vendors/
-		if [[ "${ABI}" == "amd64" ]] ; then
-			doins "${ARCH_DIR}"/etc/OpenCL/vendors/amdocl64.icd || die "doins failed"
-		else
-			doins "${ARCH_DIR}"/etc/OpenCL/vendors/amdocl32.icd || die "doins failed"
-		fi
-	fi
-
-	# include.
-	insinto /usr
-	doins -r ${FOLDER_PREFIX}usr/include
-	insinto /usr/include/X11/extensions
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin ${FOLDER_PREFIX}usr/sbin/*
-
-	# doc.
-	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
-
-	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
-
-	pushd ${FOLDER_PREFIX}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
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	# Gentoo-specific stuff:
-	newinitd "${FILESDIR}"/atieventsd.init atieventsd
-	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-	newconfd "${T}"/atieventsd.conf atieventsd
-
-	# PowerXpress stuff
-	exeinto /usr/$(get_libdir)/fglrx
-	doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
-	cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
-	doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
-}
-
-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
-	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
-		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/fglrx/fglrx-libglx.so
-	# PowerXpress stuff
-	mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# AMD Cal and OpenCL libraries
-	exeinto /usr/$(get_libdir)
-	if use opencl ; then
-		doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/lib*.so*
-	else
-		doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
-	fi
-
-	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}"
-
-	# Silence the QA notice by creating missing soname symlinks
-	for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
-	do
-		local soname=${so##*/}
-		## let's keep also this alternative way ;)
-		#dosym ${soname} /usr/$(get_libdir)/${soname%.[0-9]}
-		dosym ${soname} /usr/$(get_libdir)/$(scanelf -qF "#f%S" ${so})
-	done
-
-}
-
-pkg_postinst() {
-	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 "Fully rebooting the system after an ${PN} update is recommended"
-	elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
-	elog "might not work"
-	elog
-	elog "Some cards need acpid running to handle events"
-	elog "Please add it to boot runlevel with rc-update add acpid boot"
-
-	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-userspace/ati-userspace-11.12.ebuild b/x11-drivers/ati-userspace/ati-userspace-11.12.ebuild
deleted file mode 100644
index 97d6c35e..00000000
--- a/x11-drivers/ati-userspace/ati-userspace-11.12.ebuild
+++ /dev/null
@@ -1,412 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs versionator
-
-DESCRIPTION="AMD X11 drivers for r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://ati.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE="debug multilib opencl"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="<=x11-base/xorg-server-1.11.49
-	!x11-drivers/ati-drivers:0
-	!x11-apps/ati-drivers-extra
-	>=app-eselect/eselect-opengl-1.0.7
-	x11-apps/xauth
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	multilib? (
-			app-emulation/emul-linux-x86-opengl
-			app-emulation/emul-linux-x86-xlibs
-	)
-	!<x11-drivers/ati-userspace-${PV}
-	!>x11-drivers/ati-userspace-${PV}"
-
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto
-	x11-libs/libXtst"
-
-EMULTILIB_PKG="true"
-
-S="${WORKDIR}"
-
-# QA Silencing
-QA_TEXTRELS="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/libatiadlxx.so
-	usr/lib*/xorg/modules/glesx.so
-	usr/lib*/libaticaldd.so
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_EXECSTACK="
-	opt/bin/atiode
-	opt/bin/amdcccle
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_WX_LOAD="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_PRESTRIPPED="
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-"
-
-QA_SONAME="
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
-"
-
-QA_DT_HASH="
-	opt/bin/amdcccle
-	opt/bin/aticonfig
-	opt/bin/atiodcli
-	opt/bin/atiode
-	opt/bin/clinfo
-	opt/bin/fglrxinfo
-	opt/sbin/atieventsd
-	opt/sbin/amdnotifyui
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libatiuki.so.1.0
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
-	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
-	usr/lib\(32\|64\)\?/libOpenCL.so.1
-"
-
-pkg_setup() {
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	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() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# 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
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
-		|| die "bin rm failed"
-
-        # amdcccle is shipped separately
-        rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle || die "cannot rm amdcccle"
-
-	# ACPI fixups
-	sed -i \
-		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-		-e "s:/var/lib/gdm/:/var/gdm/:" \
-		"${S}/${FOLDER_PREFIX}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}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-		|| die "Replacing 'finger' with 'who' failed."
-	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-	# add function to detect default state.
-	epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch || die "Failed to epatch powermode-opt-path-2.patch"
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	ebegin "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}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-	eend $?
-}
-
-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" || die
-
-	# 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/{glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	use opencl && dobin "${ARCH_DIR}"/usr/bin/clinfo
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	exeinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
-	# OpenCL
-	if use opencl ; then
-		insinto /etc/OpenCL/vendors/
-		if [[ "${ABI}" == "amd64" ]] ; then
-			doins "${ARCH_DIR}"/etc/OpenCL/vendors/amdocl64.icd || die "doins failed"
-		else
-			doins "${ARCH_DIR}"/etc/OpenCL/vendors/amdocl32.icd || die "doins failed"
-		fi
-	fi
-
-	# include.
-	insinto /usr
-	doins -r ${FOLDER_PREFIX}usr/include
-	insinto /usr/include/X11/extensions
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin ${FOLDER_PREFIX}usr/sbin/*
-
-	# doc.
-	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
-
-	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
-
-	pushd ${FOLDER_PREFIX}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
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	# Gentoo-specific stuff:
-	newinitd "${FILESDIR}"/atieventsd.init atieventsd
-	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-	newconfd "${T}"/atieventsd.conf atieventsd
-
-	# PowerXpress stuff
-	exeinto /usr/$(get_libdir)/fglrx
-	doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
-	cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
-	doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
-}
-
-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
-	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
-		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/fglrx/fglrx-libglx.so
-	# PowerXpress stuff
-	mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# AMD Cal and OpenCL libraries
-	exeinto /usr/$(get_libdir)
-	if use opencl ; then
-		doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/lib*.so*
-	else
-		doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
-	fi
-
-	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}"
-
-	# Silence the QA notice by creating missing soname symlinks
-	for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
-	do
-		local soname=${so##*/}
-		## let's keep also this alternative way ;)
-		#dosym ${soname} /usr/$(get_libdir)/${soname%.[0-9]}
-		dosym ${soname} /usr/$(get_libdir)/$(scanelf -qF "#f%S" ${so})
-	done
-
-}
-
-pkg_postinst() {
-	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 "Fully rebooting the system after an ${PN} update is recommended"
-	elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
-	elog "might not work"
-	elog
-	elog "Some cards need acpid running to handle events"
-	elog "Please add it to boot runlevel with rc-update add acpid boot"
-
-	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-userspace/ati-userspace-11.6.ebuild b/x11-drivers/ati-userspace/ati-userspace-11.6.ebuild
deleted file mode 100644
index 7060761f..00000000
--- a/x11-drivers/ati-userspace/ati-userspace-11.6.ebuild
+++ /dev/null
@@ -1,386 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs versionator
-
-DESCRIPTION="AMD X11 drivers for r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://ati.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE="debug multilib"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="<=x11-base/xorg-server-1.10.99
-	!x11-drivers/ati-drivers:0
-	!x11-apps/ati-drivers-extra
-	>=app-eselect/eselect-opengl-1.0.7
-	x11-apps/xauth
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	multilib? ( app-emulation/emul-linux-x86-opengl )
-	!<x11-drivers/ati-userspace-${PV}
-	!>x11-drivers/ati-userspace-${PV}"
-
-DEPEND="${RDEPEND}
-	app-portage/portage-utils
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto
-	x11-libs/libXtst"
-
-EMULTILIB_PKG="true"
-
-S="${WORKDIR}"
-
-# QA Silencing
-QA_TEXTRELS="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/libatiadlxx.so
-	usr/lib*/xorg/modules/glesx.so
-	usr/lib*/libaticaldd.so
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_EXECSTACK="
-	opt/bin/atiode
-	opt/bin/amdcccle
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_WX_LOAD="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_PRESTRIPPED="
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-"
-
-QA_SONAME="
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-"
-
-QA_DT_HASH="
-	opt/bin/amdcccle
-	opt/bin/aticonfig
-	opt/bin/atiodcli
-	opt/bin/atiode
-	opt/bin/fglrxinfo
-	opt/sbin/atieventsd
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libatiuki.so.1.0
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
-	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-"
-
-pkg_setup() {
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	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() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# 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
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
-		|| die "bin rm failed"
-
-        # amdcccle is shipped separately
-        rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle || die "cannot rm amdcccle"
-
-	# ACPI fixups
-	sed -i \
-		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-		-e "s:/var/lib/gdm/:/var/gdm/:" \
-		"${S}/${FOLDER_PREFIX}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}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-		|| die "Replacing 'finger' with 'who' failed."
-	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-	# add function to detect default state.
-	epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch || die "Failed to epatch powermode-opt-path-2.patch"
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	ebegin "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}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-	eend $?
-}
-
-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" || die
-
-	# 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/{glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	exeinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
-
-	# include.
-	insinto /usr
-	doins -r ${FOLDER_PREFIX}usr/include
-	insinto /usr/include/X11/extensions
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin ${FOLDER_PREFIX}usr/sbin/*
-
-	# doc.
-	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
-
-	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
-
-	pushd ${FOLDER_PREFIX}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
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	# Gentoo-specific stuff:
-	newinitd "${FILESDIR}"/atieventsd.init atieventsd
-	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-	newconfd "${T}"/atieventsd.conf atieventsd
-
-	# PowerXpress stuff
-	local alllibdir="$(get_libdir)"
-	use multilib && alllibdir="lib64 lib32"
-	for libdir in ${alllibdir}
-	do
-		dosym /usr/${libdir}/opengl/xorg-x11/lib/libGL.so.1.2 \
-			/usr/${libdir}/fglrx/libGL.so.1.2
-		dosym ./libGL.so.1.2 /usr/${libdir}/fglrx/fglrx-libGL.so.1.2
-
-		# Fixup xvba-video compilation
-		dosym libXvBAW.so.1.0 /usr/${libdir}/libXvBAW.so
-	done
-
-}
-
-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
-	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
-		libGL.so.${libver}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
-	# PowerXpress stuff
-	dosym /usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.so.1.2 \
-		${ATI_ROOT}/lib/FGL.renamed.libGL.so.1.2
-	dosym ./libGL.so.1.2 ${ATI_ROOT}/lib/fglrx-libGL.so.1.2
-
-	exeinto ${ATI_ROOT}/extensions
-	doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/fglrx/fglrx-libglx.so
-	# PowerXpress stuff
-	dosym /usr/$(get_libdir)/opengl/xorg-x11/extensions/libglx.so \
-		${ATI_ROOT}/extensions/FGL.renamed.libglx.so
-	dosym fglrx-libglx.so ${ATI_ROOT}/extensions/libglx.so
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# AMD Cal libraries
-	exeinto /usr/$(get_libdir)
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
-
-	local envname="${T}"/04ati-dri-path
-	if [[ -n ${ABI} ]]; then
-		envname="${envname}-${ABI}"
-	fi
-	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
-	doenvd "${envname}"
-}
-
-pkg_postinst() {
-	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 "You will have to source /etc/profile (or logout and back in) for dri"
-	elog "to work, unless you previously had ati-drivers installed."
-
-	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-userspace/ati-userspace-11.8.ebuild b/x11-drivers/ati-userspace/ati-userspace-11.8.ebuild
deleted file mode 100644
index 70be70a2..00000000
--- a/x11-drivers/ati-userspace/ati-userspace-11.8.ebuild
+++ /dev/null
@@ -1,398 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs versionator
-
-DESCRIPTION="AMD X11 drivers for r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://ati.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE="debug multilib"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="<=x11-base/xorg-server-1.10.99
-	!x11-drivers/ati-drivers:0
-	!x11-apps/ati-drivers-extra
-	>=app-eselect/eselect-opengl-1.0.7
-	x11-apps/xauth
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	multilib? ( app-emulation/emul-linux-x86-opengl )
-	!<x11-drivers/ati-userspace-${PV}
-	!>x11-drivers/ati-userspace-${PV}"
-
-DEPEND="${RDEPEND}
-	app-misc/pax-utils
-	app-portage/portage-utils
-	sys-apps/findutils
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto
-	x11-libs/libXtst"
-
-EMULTILIB_PKG="true"
-
-S="${WORKDIR}"
-
-# QA Silencing
-QA_TEXTRELS="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/libatiadlxx.so
-	usr/lib*/xorg/modules/glesx.so
-	usr/lib*/libaticaldd.so
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_EXECSTACK="
-	opt/bin/atiode
-	opt/bin/amdcccle
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_WX_LOAD="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_PRESTRIPPED="
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-"
-
-QA_SONAME="
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-"
-
-QA_DT_HASH="
-	opt/bin/amdcccle
-	opt/bin/aticonfig
-	opt/bin/atiodcli
-	opt/bin/atiode
-	opt/bin/fglrxinfo
-	opt/sbin/atieventsd
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libatiuki.so.1.0
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
-	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-"
-
-pkg_setup() {
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	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() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# 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
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
-		|| die "bin rm failed"
-
-        # amdcccle is shipped separately
-        rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle || die "cannot rm amdcccle"
-
-	# ACPI fixups
-	sed -i \
-		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-		-e "s:/var/lib/gdm/:/var/gdm/:" \
-		"${S}/${FOLDER_PREFIX}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}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-		|| die "Replacing 'finger' with 'who' failed."
-	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-	# add function to detect default state.
-	epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch || die "Failed to epatch powermode-opt-path-2.patch"
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	ebegin "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}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-	eend $?
-}
-
-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" || die
-
-	# 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/{glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	exeinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
-
-	# include.
-	insinto /usr
-	doins -r ${FOLDER_PREFIX}usr/include
-	insinto /usr/include/X11/extensions
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin ${FOLDER_PREFIX}usr/sbin/*
-
-	# doc.
-	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
-
-	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
-
-	pushd ${FOLDER_PREFIX}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
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	# Gentoo-specific stuff:
-	newinitd "${FILESDIR}"/atieventsd.init atieventsd
-	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-	newconfd "${T}"/atieventsd.conf atieventsd
-
-	# PowerXpress stuff
-	local alllibdir="$(get_libdir)"
-	use multilib && alllibdir="lib64 lib32"
-	for libdir in ${alllibdir}
-	do
-		dosym /usr/${libdir}/opengl/xorg-x11/lib/libGL.so.1.2 \
-			/usr/${libdir}/fglrx/libGL.so.1.2
-		dosym ./libGL.so.1.2 /usr/${libdir}/fglrx/fglrx-libGL.so.1.2
-
-		# Fixup xvba-video compilation
-		dosym libXvBAW.so.1.0 /usr/${libdir}/libXvBAW.so
-	done
-
-}
-
-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
-	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
-		libGL.so.${libver}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
-	# PowerXpress stuff
-	dosym /usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.so.1.2 \
-		${ATI_ROOT}/lib/FGL.renamed.libGL.so.1.2
-	dosym ./libGL.so.1.2 ${ATI_ROOT}/lib/fglrx-libGL.so.1.2
-
-	exeinto ${ATI_ROOT}/extensions
-	doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/fglrx/fglrx-libglx.so
-	# PowerXpress stuff
-	dosym /usr/$(get_libdir)/opengl/xorg-x11/extensions/libglx.so \
-		${ATI_ROOT}/extensions/FGL.renamed.libglx.so
-	dosym fglrx-libglx.so ${ATI_ROOT}/extensions/libglx.so
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# AMD Cal libraries
-	exeinto /usr/$(get_libdir)
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
-
-	local envname="${T}"/04ati-dri-path
-	if [[ -n ${ABI} ]]; then
-		envname="${envname}-${ABI}"
-	fi
-	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
-	doenvd "${envname}"
-
-	# Silence the QA notice by creating missing soname symlinks
-	for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
-	do
-		local soname=${so##*/}
-		## let's keep also this alternative way ;)
-		#dosym ${soname} /usr/$(get_libdir)/${soname%.[0-9]}
-		dosym ${soname} /usr/$(get_libdir)/$(scanelf -qF "#f%S" ${so})
-	done
-
-}
-
-pkg_postinst() {
-	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 "You will have to source /etc/profile (or logout and back in) for dri"
-	elog "to work, unless you previously had ati-drivers installed."
-
-	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-userspace/ati-userspace-11.9.ebuild b/x11-drivers/ati-userspace/ati-userspace-11.9.ebuild
deleted file mode 100644
index 70be70a2..00000000
--- a/x11-drivers/ati-userspace/ati-userspace-11.9.ebuild
+++ /dev/null
@@ -1,398 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs versionator
-
-DESCRIPTION="AMD X11 drivers for r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://ati.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE="debug multilib"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="<=x11-base/xorg-server-1.10.99
-	!x11-drivers/ati-drivers:0
-	!x11-apps/ati-drivers-extra
-	>=app-eselect/eselect-opengl-1.0.7
-	x11-apps/xauth
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	multilib? ( app-emulation/emul-linux-x86-opengl )
-	!<x11-drivers/ati-userspace-${PV}
-	!>x11-drivers/ati-userspace-${PV}"
-
-DEPEND="${RDEPEND}
-	app-misc/pax-utils
-	app-portage/portage-utils
-	sys-apps/findutils
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto
-	x11-libs/libXtst"
-
-EMULTILIB_PKG="true"
-
-S="${WORKDIR}"
-
-# QA Silencing
-QA_TEXTRELS="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/libatiadlxx.so
-	usr/lib*/xorg/modules/glesx.so
-	usr/lib*/libaticaldd.so
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_EXECSTACK="
-	opt/bin/atiode
-	opt/bin/amdcccle
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_WX_LOAD="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_PRESTRIPPED="
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-"
-
-QA_SONAME="
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-"
-
-QA_DT_HASH="
-	opt/bin/amdcccle
-	opt/bin/aticonfig
-	opt/bin/atiodcli
-	opt/bin/atiode
-	opt/bin/fglrxinfo
-	opt/sbin/atieventsd
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libatiuki.so.1.0
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
-	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-"
-
-pkg_setup() {
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	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() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# 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
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
-		|| die "bin rm failed"
-
-        # amdcccle is shipped separately
-        rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle || die "cannot rm amdcccle"
-
-	# ACPI fixups
-	sed -i \
-		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-		-e "s:/var/lib/gdm/:/var/gdm/:" \
-		"${S}/${FOLDER_PREFIX}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}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-		|| die "Replacing 'finger' with 'who' failed."
-	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-	# add function to detect default state.
-	epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch || die "Failed to epatch powermode-opt-path-2.patch"
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	ebegin "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}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-	eend $?
-}
-
-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" || die
-
-	# 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/{glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	exeinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
-
-	# include.
-	insinto /usr
-	doins -r ${FOLDER_PREFIX}usr/include
-	insinto /usr/include/X11/extensions
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin ${FOLDER_PREFIX}usr/sbin/*
-
-	# doc.
-	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
-
-	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
-
-	pushd ${FOLDER_PREFIX}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
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	# Gentoo-specific stuff:
-	newinitd "${FILESDIR}"/atieventsd.init atieventsd
-	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-	newconfd "${T}"/atieventsd.conf atieventsd
-
-	# PowerXpress stuff
-	local alllibdir="$(get_libdir)"
-	use multilib && alllibdir="lib64 lib32"
-	for libdir in ${alllibdir}
-	do
-		dosym /usr/${libdir}/opengl/xorg-x11/lib/libGL.so.1.2 \
-			/usr/${libdir}/fglrx/libGL.so.1.2
-		dosym ./libGL.so.1.2 /usr/${libdir}/fglrx/fglrx-libGL.so.1.2
-
-		# Fixup xvba-video compilation
-		dosym libXvBAW.so.1.0 /usr/${libdir}/libXvBAW.so
-	done
-
-}
-
-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
-	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
-		libGL.so.${libver}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
-	# PowerXpress stuff
-	dosym /usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.so.1.2 \
-		${ATI_ROOT}/lib/FGL.renamed.libGL.so.1.2
-	dosym ./libGL.so.1.2 ${ATI_ROOT}/lib/fglrx-libGL.so.1.2
-
-	exeinto ${ATI_ROOT}/extensions
-	doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/fglrx/fglrx-libglx.so
-	# PowerXpress stuff
-	dosym /usr/$(get_libdir)/opengl/xorg-x11/extensions/libglx.so \
-		${ATI_ROOT}/extensions/FGL.renamed.libglx.so
-	dosym fglrx-libglx.so ${ATI_ROOT}/extensions/libglx.so
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# AMD Cal libraries
-	exeinto /usr/$(get_libdir)
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
-
-	local envname="${T}"/04ati-dri-path
-	if [[ -n ${ABI} ]]; then
-		envname="${envname}-${ABI}"
-	fi
-	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
-	doenvd "${envname}"
-
-	# Silence the QA notice by creating missing soname symlinks
-	for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
-	do
-		local soname=${so##*/}
-		## let's keep also this alternative way ;)
-		#dosym ${soname} /usr/$(get_libdir)/${soname%.[0-9]}
-		dosym ${soname} /usr/$(get_libdir)/$(scanelf -qF "#f%S" ${so})
-	done
-
-}
-
-pkg_postinst() {
-	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 "You will have to source /etc/profile (or logout and back in) for dri"
-	elog "to work, unless you previously had ati-drivers installed."
-
-	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-userspace/ati-userspace-12.1-r1.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.1-r1.ebuild
deleted file mode 100644
index 4f079e54..00000000
--- a/x11-drivers/ati-userspace/ati-userspace-12.1-r1.ebuild
+++ /dev/null
@@ -1,414 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs versionator
-
-DESCRIPTION="AMD X11 drivers for radeon r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/amd-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE="debug multilib"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="<=x11-base/xorg-server-1.11.49
-	!x11-drivers/ati-drivers:0
-	!x11-apps/ati-drivers-extra
-	>=app-eselect/eselect-opengl-1.0.7
-	app-eselect/eselect-opencl
-	x11-apps/xauth
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	multilib? (
-			app-emulation/emul-linux-x86-opengl
-			app-emulation/emul-linux-x86-xlibs
-	)
-	!<x11-drivers/ati-userspace-${PV}
-	!>x11-drivers/ati-userspace-${PV}"
-
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto
-	x11-libs/libXtst"
-
-EMULTILIB_PKG="true"
-
-S="${WORKDIR}"
-
-# QA Silencing
-QA_TEXTRELS="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/libatiadlxx.so
-	usr/lib*/xorg/modules/glesx.so
-	usr/lib*/libaticaldd.so
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_EXECSTACK="
-	opt/bin/atiode
-	opt/bin/amdcccle
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_WX_LOAD="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_PRESTRIPPED="
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-"
-
-QA_SONAME="
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
-"
-
-QA_DT_HASH="
-	opt/bin/amdcccle
-	opt/bin/aticonfig
-	opt/bin/atiodcli
-	opt/bin/atiode
-	opt/bin/clinfo
-	opt/bin/fglrxinfo
-	opt/sbin/atieventsd
-	opt/sbin/amdnotifyui
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libatiuki.so.1.0
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
-	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
-"
-
-pkg_setup() {
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	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() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# 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
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
-		|| die "bin rm failed"
-
-        # amdcccle is shipped separately
-        rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle || die "cannot rm amdcccle"
-
-	# ACPI fixups
-	sed -i \
-		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-		-e "s:/var/lib/gdm/:/var/gdm/:" \
-		"${S}/${FOLDER_PREFIX}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}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-		|| die "Replacing 'finger' with 'who' failed."
-	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-	# add function to detect default state.
-	epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	ebegin "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}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-	eend $?
-}
-
-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" || die
-
-	# 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/{glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	dobin "${ARCH_DIR}"/usr/bin/clinfo
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	exeinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
-
-	# include.
-	insinto /usr
-	doins -r ${FOLDER_PREFIX}usr/include
-	insinto /usr/include/X11/extensions
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin ${FOLDER_PREFIX}usr/sbin/*
-
-	# doc.
-	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
-
-	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
-
-	pushd ${FOLDER_PREFIX}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
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	# Gentoo-specific stuff:
-	newinitd "${FILESDIR}"/atieventsd.init atieventsd
-	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-	newconfd "${T}"/atieventsd.conf atieventsd
-
-	# PowerXpress stuff
-	exeinto /usr/$(get_libdir)/fglrx
-	doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
-	cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
-	doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
-}
-
-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"
-		local oclsuffix=64
-	else
-		local EX_BASE_DIR="${BASE_DIR}"
-		local pkglibdir=lib
-		local MY_ARCH_DIR="${S}/arch/x86"
-		local oclsuffix=32
-	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
-	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
-		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/fglrx/fglrx-libglx.so
-	# PowerXpress stuff
-	mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# AMD Cal and OpenCL libraries
-	exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
-	dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
-	exeinto /usr/$(get_libdir)
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
-
-	# OpenCL vendor files
-	insinto /etc/OpenCL/vendors/
-	cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
-		/usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so
-	EOF
-	doins "${T}"/amdocl${oclsuffix}.icd
-
-	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}"
-
-	# Silence the QA notice by creating missing soname symlinks
-	for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
-	do
-		local soname=${so##*/}
-		## let's keep also this alternative way ;)
-		#dosym ${soname} /usr/$(get_libdir)/${soname%.[0-9]}
-		dosym ${soname} /usr/$(get_libdir)/$(scanelf -qF "#f%S" ${so})
-	done
-
-}
-
-pkg_postinst() {
-	elog "To switch to AMD 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 "Fully rebooting the system after an ${PN} update is recommended"
-	elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
-	elog "might not work"
-	elog
-	elog "Some cards need acpid running to handle events"
-	elog "Please add it to boot runlevel with rc-update add acpid boot"
-
-	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
-	"${ROOT}"/usr/bin/eselect opencl set --use-old amd
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-userspace/ati-userspace-12.10.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.10.ebuild
deleted file mode 100644
index 08601cf6..00000000
--- a/x11-drivers/ati-userspace/ati-userspace-12.10.ebuild
+++ /dev/null
@@ -1,433 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs versionator
-
-DESCRIPTION="AMD X11 drivers for radeon r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-MY_V=( $(get_version_components) )
-#RUN="${WORKDIR}/amd-driver-installer-9.00-x86.x86_64.run"
-SRC_URI="http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-${PV}-x86.x86_64.zip"
-FOLDER_PREFIX="common/"
-IUSE="debug multilib x-multilib static-libs"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-RESTRICT="bindist"
-
-RDEPEND="<=x11-base/xorg-server-1.12.49[-minimal]
-	!x11-drivers/ati-drivers:0
-	!x11-apps/ati-drivers-extra
-	>=app-eselect/eselect-opengl-1.0.7
-	app-eselect/eselect-opencl
-	sys-power/acpid
-	x11-apps/xauth
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x-multilib? (
-			app-emulation/emul-linux-x86-opengl
-			app-emulation/emul-linux-x86-xlibs
-	)
-	!<x11-drivers/ati-userspace-${PV}
-	!>x11-drivers/ati-userspace-${PV}"
-
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto
-	x11-libs/libXtst
-	sys-apps/findutils
-	app-misc/pax-utils"
-
-
-EMULTILIB_PKG="true"
-
-S="${WORKDIR}"
-
-# QA Silencing
-QA_TEXTRELS="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/libatiadlxx.so
-	usr/lib*/xorg/modules/glesx.so
-	usr/lib*/libaticaldd.so
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_EXECSTACK="
-	opt/bin/atiode
-	opt/bin/amdcccle
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_WX_LOAD="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_PRESTRIPPED="
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-"
-
-QA_SONAME="
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
-"
-
-QA_DT_HASH="
-	opt/bin/amdcccle
-	opt/bin/aticonfig
-	opt/bin/atiodcli
-	opt/bin/atiode
-	opt/bin/clinfo
-	opt/bin/fglrxinfo
-	opt/sbin/atieventsd
-	opt/sbin/amdnotifyui
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libatiuki.so.1.0
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
-	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
-"
-
-pkg_setup() {
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	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() {
-	if [[ ${A} =~ .*\.tar\.gz ]]; then
-		unpack ${A}
-	else
-		#please note, RUN may be insanely assigned at top near SRC_URI
-		if [[ ${A} =~ .*\.zip ]]; then
-			unpack ${A}
-			[[ -z "$RUN" ]] && RUN="${S}/${A/%.zip/.run}"
-		else
-			RUN="${DISTDIR}/${A}"
-		fi
-		sh ${RUN} --extract "${S}" 2>&1 > /dev/null || die
-	fi
-}
-
-src_prepare() {
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
-		|| die "bin rm failed"
-
-        # amdcccle is shipped separately
-        rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle || die "cannot rm amdcccle"
-
-	# ACPI fixups
-	sed -i \
-		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-		-e "s:/var/lib/gdm/:/var/gdm/:" \
-		"${S}/${FOLDER_PREFIX}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}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-		|| die "Replacing 'finger' with 'who' failed."
-	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-	# add function to detect default state.
-	epatch "${FILESDIR}"/ati-powermode-opt-path-3.patch
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-
-	# Get rid of watermark. Oldest known reference:
-	# http://phoronix.com/forums/showthread.php?19875-Unsupported-Hardware-watermark
-	ebegin "Disabling watermark"
-	driver="${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
-	for x in $(objdump -d ${driver}|awk '/call/&&/EnableLogo/{print "\\x"$2"\\x"$3"\\x"$4"\\x"$5"\\x"$6}'); do
-		sed -i "s/${x}/\x90\x90\x90\x90\x90/g" ${driver} || break 1
-	done
-	eend $? || die "Disabling watermark failed"
-}
-
-src_compile() {
-	ebegin "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}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-	eend $?
-}
-
-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" || die
-
-	# 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 && use multilib; 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/{glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	dobin "${ARCH_DIR}"/usr/bin/clinfo
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	exeinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
-
-	# include.
-	insinto /usr
-	doins -r ${FOLDER_PREFIX}usr/include
-	insinto /usr/include/X11/extensions
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin ${FOLDER_PREFIX}usr/sbin/*
-
-	# doc.
-	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
-
-	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
-
-	pushd ${FOLDER_PREFIX}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
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	# Gentoo-specific stuff:
-	newinitd "${FILESDIR}"/atieventsd.init atieventsd
-	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-	newconfd "${T}"/atieventsd.conf atieventsd
-
-	# PowerXpress stuff
-	exeinto /usr/$(get_libdir)/fglrx
-	doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
-	cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
-	doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
-
-	# Required by upstream AMD
-	touch "${D}/etc/ati/atiapfuser.blb" || die
-	insinto /etc/ati
-	doins "${FOLDER_PREFIX}etc/ati/atiapfxx.blb"
-}
-
-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"
-		local oclsuffix=64
-	else
-		local EX_BASE_DIR="${BASE_DIR}"
-		local pkglibdir=lib
-		local MY_ARCH_DIR="${S}/arch/x86"
-		local oclsuffix=32
-	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
-	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
-		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/fglrx/fglrx-libglx.so
-	# PowerXpress stuff
-	mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# AMD Cal and OpenCL libraries
-	exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
-	dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
-	exeinto /usr/$(get_libdir)
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
-
-	# OpenCL vendor files
-	insinto /etc/OpenCL/vendors/
-	cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
-		/usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so
-	EOF
-	doins "${T}"/amdocl${oclsuffix}.icd
-
-	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}"
-
-	# Silence the QA notice by creating missing soname symlinks
-	for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
-	do
-		local soname=${so##*/}
-		## let's keep also this alternative way ;)
-		#dosym ${soname} /usr/$(get_libdir)/${soname%.[0-9]}
-		dosym ${soname} /usr/$(get_libdir)/$(scanelf -qF "#f%S" ${so})
-	done
-
-	#remove static libs if not wanted
-	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a
-}
-
-pkg_postinst() {
-	elog "To switch to AMD 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 "Fully rebooting the system after an ${PN} update is recommended"
-	elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
-	elog "might not work"
-	elog
-	elog "Some cards need acpid running to handle events"
-	elog "Please add it to boot runlevel with rc-update add acpid boot"
-
-	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
-	"${ROOT}"/usr/bin/eselect opencl set --use-old amd
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-userspace/ati-userspace-12.2.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.2.ebuild
deleted file mode 100644
index 8e7a6b65..00000000
--- a/x11-drivers/ati-userspace/ati-userspace-12.2.ebuild
+++ /dev/null
@@ -1,414 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs versionator
-
-DESCRIPTION="AMD X11 drivers for radeon r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/amd-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE="debug multilib"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="<=x11-base/xorg-server-1.11.49[-minimal]
-	!x11-drivers/ati-drivers:0
-	!x11-apps/ati-drivers-extra
-	>=app-eselect/eselect-opengl-1.0.7
-	app-eselect/eselect-opencl
-	x11-apps/xauth
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	multilib? (
-			app-emulation/emul-linux-x86-opengl
-			app-emulation/emul-linux-x86-xlibs
-	)
-	!<x11-drivers/ati-userspace-${PV}
-	!>x11-drivers/ati-userspace-${PV}"
-
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto
-	x11-libs/libXtst"
-
-EMULTILIB_PKG="true"
-
-S="${WORKDIR}"
-
-# QA Silencing
-QA_TEXTRELS="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/libatiadlxx.so
-	usr/lib*/xorg/modules/glesx.so
-	usr/lib*/libaticaldd.so
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_EXECSTACK="
-	opt/bin/atiode
-	opt/bin/amdcccle
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_WX_LOAD="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_PRESTRIPPED="
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-"
-
-QA_SONAME="
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
-"
-
-QA_DT_HASH="
-	opt/bin/amdcccle
-	opt/bin/aticonfig
-	opt/bin/atiodcli
-	opt/bin/atiode
-	opt/bin/clinfo
-	opt/bin/fglrxinfo
-	opt/sbin/atieventsd
-	opt/sbin/amdnotifyui
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libatiuki.so.1.0
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
-	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
-"
-
-pkg_setup() {
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	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() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# 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
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
-		|| die "bin rm failed"
-
-        # amdcccle is shipped separately
-        rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle || die "cannot rm amdcccle"
-
-	# ACPI fixups
-	sed -i \
-		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-		-e "s:/var/lib/gdm/:/var/gdm/:" \
-		"${S}/${FOLDER_PREFIX}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}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-		|| die "Replacing 'finger' with 'who' failed."
-	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-	# add function to detect default state.
-	epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	ebegin "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}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-	eend $?
-}
-
-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" || die
-
-	# 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/{glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	dobin "${ARCH_DIR}"/usr/bin/clinfo
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	exeinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
-
-	# include.
-	insinto /usr
-	doins -r ${FOLDER_PREFIX}usr/include
-	insinto /usr/include/X11/extensions
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin ${FOLDER_PREFIX}usr/sbin/*
-
-	# doc.
-	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
-
-	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
-
-	pushd ${FOLDER_PREFIX}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
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	# Gentoo-specific stuff:
-	newinitd "${FILESDIR}"/atieventsd.init atieventsd
-	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-	newconfd "${T}"/atieventsd.conf atieventsd
-
-	# PowerXpress stuff
-	exeinto /usr/$(get_libdir)/fglrx
-	doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
-	cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
-	doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
-}
-
-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"
-		local oclsuffix=64
-	else
-		local EX_BASE_DIR="${BASE_DIR}"
-		local pkglibdir=lib
-		local MY_ARCH_DIR="${S}/arch/x86"
-		local oclsuffix=32
-	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
-	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
-		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/fglrx/fglrx-libglx.so
-	# PowerXpress stuff
-	mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# AMD Cal and OpenCL libraries
-	exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
-	dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
-	exeinto /usr/$(get_libdir)
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
-
-	# OpenCL vendor files
-	insinto /etc/OpenCL/vendors/
-	cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
-		/usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so
-	EOF
-	doins "${T}"/amdocl${oclsuffix}.icd
-
-	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}"
-
-	# Silence the QA notice by creating missing soname symlinks
-	for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
-	do
-		local soname=${so##*/}
-		## let's keep also this alternative way ;)
-		#dosym ${soname} /usr/$(get_libdir)/${soname%.[0-9]}
-		dosym ${soname} /usr/$(get_libdir)/$(scanelf -qF "#f%S" ${so})
-	done
-
-}
-
-pkg_postinst() {
-	elog "To switch to AMD 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 "Fully rebooting the system after an ${PN} update is recommended"
-	elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
-	elog "might not work"
-	elog
-	elog "Some cards need acpid running to handle events"
-	elog "Please add it to boot runlevel with rc-update add acpid boot"
-
-	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
-	"${ROOT}"/usr/bin/eselect opencl set --use-old amd
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-userspace/ati-userspace-12.3.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.3.ebuild
deleted file mode 100644
index 9c8bcd71..00000000
--- a/x11-drivers/ati-userspace/ati-userspace-12.3.ebuild
+++ /dev/null
@@ -1,416 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs versionator
-
-DESCRIPTION="AMD X11 drivers for radeon r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/amd-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE="debug multilib static-libs"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="<=x11-base/xorg-server-1.11.49[-minimal]
-	!x11-drivers/ati-drivers:0
-	!x11-apps/ati-drivers-extra
-	>=app-eselect/eselect-opengl-1.0.7
-	app-eselect/eselect-opencl
-	x11-apps/xauth
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	multilib? (
-			app-emulation/emul-linux-x86-opengl
-			app-emulation/emul-linux-x86-xlibs
-	)
-	!<x11-drivers/ati-userspace-${PV}
-	!>x11-drivers/ati-userspace-${PV}"
-
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto
-	x11-libs/libXtst"
-
-EMULTILIB_PKG="true"
-
-S="${WORKDIR}"
-
-# QA Silencing
-QA_TEXTRELS="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/libatiadlxx.so
-	usr/lib*/xorg/modules/glesx.so
-	usr/lib*/libaticaldd.so
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_EXECSTACK="
-	opt/bin/atiode
-	opt/bin/amdcccle
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_WX_LOAD="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_PRESTRIPPED="
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-"
-
-QA_SONAME="
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
-"
-
-QA_DT_HASH="
-	opt/bin/amdcccle
-	opt/bin/aticonfig
-	opt/bin/atiodcli
-	opt/bin/atiode
-	opt/bin/clinfo
-	opt/bin/fglrxinfo
-	opt/sbin/atieventsd
-	opt/sbin/amdnotifyui
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libatiuki.so.1.0
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
-	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
-"
-
-pkg_setup() {
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	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() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# 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
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
-		|| die "bin rm failed"
-
-        # amdcccle is shipped separately
-        rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle || die "cannot rm amdcccle"
-
-	# ACPI fixups
-	sed -i \
-		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-		-e "s:/var/lib/gdm/:/var/gdm/:" \
-		"${S}/${FOLDER_PREFIX}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}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-		|| die "Replacing 'finger' with 'who' failed."
-	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-	# add function to detect default state.
-	epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	ebegin "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}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-	eend $?
-}
-
-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" || die
-
-	# 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/{glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	dobin "${ARCH_DIR}"/usr/bin/clinfo
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	exeinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
-
-	# include.
-	insinto /usr
-	doins -r ${FOLDER_PREFIX}usr/include
-	insinto /usr/include/X11/extensions
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin ${FOLDER_PREFIX}usr/sbin/*
-
-	# doc.
-	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
-
-	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
-
-	pushd ${FOLDER_PREFIX}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
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	# Gentoo-specific stuff:
-	newinitd "${FILESDIR}"/atieventsd.init atieventsd
-	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-	newconfd "${T}"/atieventsd.conf atieventsd
-
-	# PowerXpress stuff
-	exeinto /usr/$(get_libdir)/fglrx
-	doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
-	cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
-	doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
-}
-
-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"
-		local oclsuffix=64
-	else
-		local EX_BASE_DIR="${BASE_DIR}"
-		local pkglibdir=lib
-		local MY_ARCH_DIR="${S}/arch/x86"
-		local oclsuffix=32
-	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
-	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
-		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/fglrx/fglrx-libglx.so
-	# PowerXpress stuff
-	mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# AMD Cal and OpenCL libraries
-	exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
-	dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
-	exeinto /usr/$(get_libdir)
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
-
-	# OpenCL vendor files
-	insinto /etc/OpenCL/vendors/
-	cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
-		/usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so
-	EOF
-	doins "${T}"/amdocl${oclsuffix}.icd
-
-	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}"
-
-	# Silence the QA notice by creating missing soname symlinks
-	for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
-	do
-		local soname=${so##*/}
-		## let's keep also this alternative way ;)
-		#dosym ${soname} /usr/$(get_libdir)/${soname%.[0-9]}
-		dosym ${soname} /usr/$(get_libdir)/$(scanelf -qF "#f%S" ${so})
-	done
-
-	#remove static libs if not wanted
-	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a
-}
-
-pkg_postinst() {
-	elog "To switch to AMD 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 "Fully rebooting the system after an ${PN} update is recommended"
-	elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
-	elog "might not work"
-	elog
-	elog "Some cards need acpid running to handle events"
-	elog "Please add it to boot runlevel with rc-update add acpid boot"
-
-	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
-	"${ROOT}"/usr/bin/eselect opencl set --use-old amd
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-userspace/ati-userspace-12.4.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.4.ebuild
deleted file mode 100644
index 9c8bcd71..00000000
--- a/x11-drivers/ati-userspace/ati-userspace-12.4.ebuild
+++ /dev/null
@@ -1,416 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs versionator
-
-DESCRIPTION="AMD X11 drivers for radeon r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/amd-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE="debug multilib static-libs"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="<=x11-base/xorg-server-1.11.49[-minimal]
-	!x11-drivers/ati-drivers:0
-	!x11-apps/ati-drivers-extra
-	>=app-eselect/eselect-opengl-1.0.7
-	app-eselect/eselect-opencl
-	x11-apps/xauth
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	multilib? (
-			app-emulation/emul-linux-x86-opengl
-			app-emulation/emul-linux-x86-xlibs
-	)
-	!<x11-drivers/ati-userspace-${PV}
-	!>x11-drivers/ati-userspace-${PV}"
-
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto
-	x11-libs/libXtst"
-
-EMULTILIB_PKG="true"
-
-S="${WORKDIR}"
-
-# QA Silencing
-QA_TEXTRELS="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/libatiadlxx.so
-	usr/lib*/xorg/modules/glesx.so
-	usr/lib*/libaticaldd.so
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_EXECSTACK="
-	opt/bin/atiode
-	opt/bin/amdcccle
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_WX_LOAD="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_PRESTRIPPED="
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-"
-
-QA_SONAME="
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
-"
-
-QA_DT_HASH="
-	opt/bin/amdcccle
-	opt/bin/aticonfig
-	opt/bin/atiodcli
-	opt/bin/atiode
-	opt/bin/clinfo
-	opt/bin/fglrxinfo
-	opt/sbin/atieventsd
-	opt/sbin/amdnotifyui
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libatiuki.so.1.0
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
-	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
-"
-
-pkg_setup() {
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	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() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# 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
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
-		|| die "bin rm failed"
-
-        # amdcccle is shipped separately
-        rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle || die "cannot rm amdcccle"
-
-	# ACPI fixups
-	sed -i \
-		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-		-e "s:/var/lib/gdm/:/var/gdm/:" \
-		"${S}/${FOLDER_PREFIX}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}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-		|| die "Replacing 'finger' with 'who' failed."
-	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-	# add function to detect default state.
-	epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	ebegin "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}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-	eend $?
-}
-
-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" || die
-
-	# 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/{glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	dobin "${ARCH_DIR}"/usr/bin/clinfo
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	exeinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
-
-	# include.
-	insinto /usr
-	doins -r ${FOLDER_PREFIX}usr/include
-	insinto /usr/include/X11/extensions
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin ${FOLDER_PREFIX}usr/sbin/*
-
-	# doc.
-	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
-
-	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
-
-	pushd ${FOLDER_PREFIX}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
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	# Gentoo-specific stuff:
-	newinitd "${FILESDIR}"/atieventsd.init atieventsd
-	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-	newconfd "${T}"/atieventsd.conf atieventsd
-
-	# PowerXpress stuff
-	exeinto /usr/$(get_libdir)/fglrx
-	doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
-	cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
-	doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
-}
-
-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"
-		local oclsuffix=64
-	else
-		local EX_BASE_DIR="${BASE_DIR}"
-		local pkglibdir=lib
-		local MY_ARCH_DIR="${S}/arch/x86"
-		local oclsuffix=32
-	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
-	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
-		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/fglrx/fglrx-libglx.so
-	# PowerXpress stuff
-	mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# AMD Cal and OpenCL libraries
-	exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
-	dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
-	exeinto /usr/$(get_libdir)
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
-
-	# OpenCL vendor files
-	insinto /etc/OpenCL/vendors/
-	cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
-		/usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so
-	EOF
-	doins "${T}"/amdocl${oclsuffix}.icd
-
-	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}"
-
-	# Silence the QA notice by creating missing soname symlinks
-	for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
-	do
-		local soname=${so##*/}
-		## let's keep also this alternative way ;)
-		#dosym ${soname} /usr/$(get_libdir)/${soname%.[0-9]}
-		dosym ${soname} /usr/$(get_libdir)/$(scanelf -qF "#f%S" ${so})
-	done
-
-	#remove static libs if not wanted
-	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a
-}
-
-pkg_postinst() {
-	elog "To switch to AMD 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 "Fully rebooting the system after an ${PN} update is recommended"
-	elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
-	elog "might not work"
-	elog
-	elog "Some cards need acpid running to handle events"
-	elog "Please add it to boot runlevel with rc-update add acpid boot"
-
-	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
-	"${ROOT}"/usr/bin/eselect opencl set --use-old amd
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-userspace/ati-userspace-12.6.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.6.ebuild
deleted file mode 100644
index 6296ae5f..00000000
--- a/x11-drivers/ati-userspace/ati-userspace-12.6.ebuild
+++ /dev/null
@@ -1,430 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs versionator
-
-DESCRIPTION="AMD X11 drivers for radeon r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-MY_V=( $(get_version_components) )
-if [[ ${MY_V[2]} != beta ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/amd-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE="debug multilib static-libs"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-RESTRICT="bindist"
-
-RDEPEND="<=x11-base/xorg-server-1.12.49[-minimal]
-	!x11-drivers/ati-drivers:0
-	!x11-apps/ati-drivers-extra
-	>=app-eselect/eselect-opengl-1.0.7
-	app-eselect/eselect-opencl
-	x11-apps/xauth
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	multilib? (
-			app-emulation/emul-linux-x86-opengl
-			app-emulation/emul-linux-x86-xlibs
-	)
-	!<x11-drivers/ati-userspace-${PV}
-	!>x11-drivers/ati-userspace-${PV}"
-
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto
-	x11-libs/libXtst"
-
-EMULTILIB_PKG="true"
-
-S="${WORKDIR}"
-
-# QA Silencing
-QA_TEXTRELS="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/libatiadlxx.so
-	usr/lib*/xorg/modules/glesx.so
-	usr/lib*/libaticaldd.so
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_EXECSTACK="
-	opt/bin/atiode
-	opt/bin/amdcccle
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_WX_LOAD="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_PRESTRIPPED="
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-"
-
-QA_SONAME="
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
-"
-
-QA_DT_HASH="
-	opt/bin/amdcccle
-	opt/bin/aticonfig
-	opt/bin/atiodcli
-	opt/bin/atiode
-	opt/bin/clinfo
-	opt/bin/fglrxinfo
-	opt/sbin/atieventsd
-	opt/sbin/amdnotifyui
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libatiuki.so.1.0
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
-	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
-"
-
-pkg_setup() {
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	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() {
-	if [[ ${MY_V[2]} == beta ]]; then
-		unpack ${A}
-		RUN="${S}/${A/%.zip/.run}"
-	else
-		RUN="${DISTDIR}/${A}"
-	fi
-	sh ${RUN} --extract "${S}" # 2>&1 > /dev/null || die
-}
-
-src_prepare() {
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
-		|| die "bin rm failed"
-
-        # amdcccle is shipped separately
-        rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle || die "cannot rm amdcccle"
-
-	# ACPI fixups
-	sed -i \
-		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-		-e "s:/var/lib/gdm/:/var/gdm/:" \
-		"${S}/${FOLDER_PREFIX}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}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-		|| die "Replacing 'finger' with 'who' failed."
-	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-	# add function to detect default state.
-	epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-
-	# Get rid of watermark. Oldest known reference:
-	# http://phoronix.com/forums/showthread.php?19875-Unsupported-Hardware-watermark
-	ebegin "Disabling watermark"
-	driver="${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
-	for x in $(objdump -d ${driver}|awk '/call/&&/EnableLogo/{print "\\x"$2"\\x"$3"\\x"$4"\\x"$5"\\x"$6}'); do
-		sed -i "s/${x}/\x90\x90\x90\x90\x90/g" ${driver} || break 1
-	done
-	eend $? || die "Disabling watermark failed"
-}
-
-src_compile() {
-	ebegin "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}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-	eend $?
-}
-
-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" || die
-
-	# 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/{glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	dobin "${ARCH_DIR}"/usr/bin/clinfo
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	exeinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
-
-	# include.
-	insinto /usr
-	doins -r ${FOLDER_PREFIX}usr/include
-	insinto /usr/include/X11/extensions
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin ${FOLDER_PREFIX}usr/sbin/*
-
-	# doc.
-	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
-
-	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
-
-	pushd ${FOLDER_PREFIX}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
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	# Gentoo-specific stuff:
-	newinitd "${FILESDIR}"/atieventsd.init atieventsd
-	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-	newconfd "${T}"/atieventsd.conf atieventsd
-
-	# PowerXpress stuff
-	exeinto /usr/$(get_libdir)/fglrx
-	doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
-	cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
-	doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
-
-	# Required by upstream AMD
-	touch "${D}/etc/ati/atiapfuser.blb" || die
-	insinto /etc/ati
-	doins "${FOLDER_PREFIX}etc/ati/atiapfxx.blb"
-}
-
-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"
-		local oclsuffix=64
-	else
-		local EX_BASE_DIR="${BASE_DIR}"
-		local pkglibdir=lib
-		local MY_ARCH_DIR="${S}/arch/x86"
-		local oclsuffix=32
-	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
-	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
-		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/fglrx/fglrx-libglx.so
-	# PowerXpress stuff
-	mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# AMD Cal and OpenCL libraries
-	exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
-	dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
-	exeinto /usr/$(get_libdir)
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
-
-	# OpenCL vendor files
-	insinto /etc/OpenCL/vendors/
-	cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
-		/usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so
-	EOF
-	doins "${T}"/amdocl${oclsuffix}.icd
-
-	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}"
-
-	# Silence the QA notice by creating missing soname symlinks
-	for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
-	do
-		local soname=${so##*/}
-		## let's keep also this alternative way ;)
-		#dosym ${soname} /usr/$(get_libdir)/${soname%.[0-9]}
-		dosym ${soname} /usr/$(get_libdir)/$(scanelf -qF "#f%S" ${so})
-	done
-
-	#remove static libs if not wanted
-	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a
-}
-
-pkg_postinst() {
-	elog "To switch to AMD 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 "Fully rebooting the system after an ${PN} update is recommended"
-	elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
-	elog "might not work"
-	elog
-	elog "Some cards need acpid running to handle events"
-	elog "Please add it to boot runlevel with rc-update add acpid boot"
-
-	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
-	"${ROOT}"/usr/bin/eselect opencl set --use-old amd
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-userspace/ati-userspace-12.6_beta_pre897.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.6_beta_pre897.ebuild
deleted file mode 100644
index 7500a882..00000000
--- a/x11-drivers/ati-userspace/ati-userspace-12.6_beta_pre897.ebuild
+++ /dev/null
@@ -1,430 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs versionator
-
-DESCRIPTION="AMD X11 drivers for radeon r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-MY_V=( $(get_version_components) )
-if [[ ${MY_V[2]} != beta ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/amd-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	#SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	SRC_URI="http://www2.ati.com/drivers/legacy/amd-driver-installer-12.6-legacy-x86.x86_64.zip"
-	FOLDER_PREFIX="common/"
-fi
-IUSE="debug multilib static-libs"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-RESTRICT="bindist"
-
-RDEPEND="<=x11-base/xorg-server-1.12.49[-minimal]
-	!x11-drivers/ati-drivers:0
-	!x11-apps/ati-drivers-extra
-	>=app-eselect/eselect-opengl-1.0.7
-	app-eselect/eselect-opencl
-	x11-apps/xauth
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	multilib? (
-			app-emulation/emul-linux-x86-opengl
-			app-emulation/emul-linux-x86-xlibs
-	)
-	!<x11-drivers/ati-userspace-${PV}
-	!>x11-drivers/ati-userspace-${PV}"
-
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto
-	x11-libs/libXtst"
-
-EMULTILIB_PKG="true"
-
-S="${WORKDIR}"
-
-# QA Silencing
-QA_TEXTRELS="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/libatiadlxx.so
-	usr/lib*/xorg/modules/glesx.so
-	usr/lib*/libaticaldd.so
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_EXECSTACK="
-	opt/bin/atiode
-	opt/bin/amdcccle
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_WX_LOAD="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_PRESTRIPPED="
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-"
-
-QA_SONAME="
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
-"
-
-QA_DT_HASH="
-	opt/bin/amdcccle
-	opt/bin/aticonfig
-	opt/bin/atiodcli
-	opt/bin/atiode
-	opt/bin/clinfo
-	opt/bin/fglrxinfo
-	opt/sbin/atieventsd
-	opt/sbin/amdnotifyui
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libatiuki.so.1.0
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
-	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
-"
-
-pkg_setup() {
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	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() {
-	if [[ ${MY_V[2]} == beta ]]; then
-		unpack ${A}
-		RUN=${A/%.zip/.run}
-	else
-		RUN=${A}
-	fi
-	sh "${S}"/${RUN} --extract "${S}"  2>&1 > /dev/null || die \
-	'unpack failed'
-}
-
-src_prepare() {
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
-		|| die "bin rm failed"
-
-        # amdcccle is shipped separately
-        rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle || die "cannot rm amdcccle"
-
-	# ACPI fixups
-	sed -i \
-		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-		-e "s:/var/lib/gdm/:/var/gdm/:" \
-		"${S}/${FOLDER_PREFIX}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}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-		|| die "Replacing 'finger' with 'who' failed."
-	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-	# add function to detect default state.
-	epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-
-	# Get rid of watermark. Oldest known reference:
-	# http://phoronix.com/forums/showthread.php?19875-Unsupported-Hardware-watermark
-	ebegin "Disabling watermark"
-	driver="${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
-	for x in $(objdump -d ${driver}|awk '/call/&&/EnableLogo/{print "\\x"$2"\\x"$3"\\x"$4"\\x"$5"\\x"$6}'); do
-		sed -i "s/${x}/\x90\x90\x90\x90\x90/g" ${driver} || break 1
-	done
-	eend $? || die "Disabling watermark failed"
-}
-
-src_compile() {
-	ebegin "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}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-	eend $?
-}
-
-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" || die
-
-	# 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/{glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	dobin "${ARCH_DIR}"/usr/bin/clinfo
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	exeinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
-
-	# include.
-	insinto /usr
-	doins -r ${FOLDER_PREFIX}usr/include
-	insinto /usr/include/X11/extensions
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin ${FOLDER_PREFIX}usr/sbin/*
-
-	# doc.
-	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
-
-	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
-
-	pushd ${FOLDER_PREFIX}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
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	# Gentoo-specific stuff:
-	newinitd "${FILESDIR}"/atieventsd.init atieventsd
-	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-	newconfd "${T}"/atieventsd.conf atieventsd
-
-	# PowerXpress stuff
-	exeinto /usr/$(get_libdir)/fglrx
-	doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
-	cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
-	doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
-
-	# Required by upstream AMD
-	touch "${D}/etc/ati/atiapfuser.blb" || die
-}
-
-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"
-		local oclsuffix=64
-	else
-		local EX_BASE_DIR="${BASE_DIR}"
-		local pkglibdir=lib
-		local MY_ARCH_DIR="${S}/arch/x86"
-		local oclsuffix=32
-	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
-	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
-		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/fglrx/fglrx-libglx.so
-	# PowerXpress stuff
-	mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# AMD Cal and OpenCL libraries
-	exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
-	dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
-	exeinto /usr/$(get_libdir)
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
-
-	# OpenCL vendor files
-	insinto /etc/OpenCL/vendors/
-	cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
-		/usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so
-	EOF
-	doins "${T}"/amdocl${oclsuffix}.icd
-
-	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}"
-
-	# Silence the QA notice by creating missing soname symlinks
-	for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
-	do
-		local soname=${so##*/}
-		## let's keep also this alternative way ;)
-		#dosym ${soname} /usr/$(get_libdir)/${soname%.[0-9]}
-		dosym ${soname} /usr/$(get_libdir)/$(scanelf -qF "#f%S" ${so})
-	done
-
-	#remove static libs if not wanted
-	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a
-}
-
-pkg_postinst() {
-	elog "To switch to AMD 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 "Fully rebooting the system after an ${PN} update is recommended"
-	elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
-	elog "might not work"
-	elog
-	elog "Some cards need acpid running to handle events"
-	elog "Please add it to boot runlevel with rc-update add acpid boot"
-
-	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
-	"${ROOT}"/usr/bin/eselect opencl set --use-old amd
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-userspace/ati-userspace-12.8.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.8.ebuild
deleted file mode 100644
index c3a78943..00000000
--- a/x11-drivers/ati-userspace/ati-userspace-12.8.ebuild
+++ /dev/null
@@ -1,426 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs versionator
-
-DESCRIPTION="AMD X11 drivers for radeon r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-MY_V=( $(get_version_components) )
-if [[ ${MY_V[2]} != beta ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/amd-driver-installer-${PV/./-}-x86.x86_64.zip"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE="debug multilib x-multilib static-libs"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-RESTRICT="bindist"
-
-RDEPEND="<=x11-base/xorg-server-1.12.49[-minimal]
-	!x11-drivers/ati-drivers:0
-	!x11-apps/ati-drivers-extra
-	>=app-eselect/eselect-opengl-1.0.7
-	app-eselect/eselect-opencl
-	x11-apps/xauth
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x-multilib? (
-			app-emulation/emul-linux-x86-opengl
-			app-emulation/emul-linux-x86-xlibs
-	)
-	!<x11-drivers/ati-userspace-${PV}
-	!>x11-drivers/ati-userspace-${PV}"
-
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto
-	x11-libs/libXtst"
-
-EMULTILIB_PKG="true"
-
-S="${WORKDIR}"
-
-# QA Silencing
-QA_TEXTRELS="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/libatiadlxx.so
-	usr/lib*/xorg/modules/glesx.so
-	usr/lib*/libaticaldd.so
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_EXECSTACK="
-	opt/bin/atiode
-	opt/bin/amdcccle
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_WX_LOAD="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_PRESTRIPPED="
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-"
-
-QA_SONAME="
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
-"
-
-QA_DT_HASH="
-	opt/bin/amdcccle
-	opt/bin/aticonfig
-	opt/bin/atiodcli
-	opt/bin/atiode
-	opt/bin/clinfo
-	opt/bin/fglrxinfo
-	opt/sbin/atieventsd
-	opt/sbin/amdnotifyui
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libatiuki.so.1.0
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
-	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
-"
-
-pkg_setup() {
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	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() {
-	unpack ${A}
-	RUN="${S}/"*.run
-	sh ${RUN} --extract "${S}" # 2>&1 > /dev/null || die
-}
-
-src_prepare() {
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
-		|| die "bin rm failed"
-
-        # amdcccle is shipped separately
-        rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle || die "cannot rm amdcccle"
-
-	# ACPI fixups
-	sed -i \
-		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-		-e "s:/var/lib/gdm/:/var/gdm/:" \
-		"${S}/${FOLDER_PREFIX}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}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-		|| die "Replacing 'finger' with 'who' failed."
-	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-	# add function to detect default state.
-	epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-
-	# Get rid of watermark. Oldest known reference:
-	# http://phoronix.com/forums/showthread.php?19875-Unsupported-Hardware-watermark
-	ebegin "Disabling watermark"
-	driver="${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
-	for x in $(objdump -d ${driver}|awk '/call/&&/EnableLogo/{print "\\x"$2"\\x"$3"\\x"$4"\\x"$5"\\x"$6}'); do
-		sed -i "s/${x}/\x90\x90\x90\x90\x90/g" ${driver} || break 1
-	done
-	eend $? || die "Disabling watermark failed"
-}
-
-src_compile() {
-	ebegin "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}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-	eend $?
-}
-
-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" || die
-
-	# 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 && use multilib; 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/{glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	dobin "${ARCH_DIR}"/usr/bin/clinfo
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	exeinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
-
-	# include.
-	insinto /usr
-	doins -r ${FOLDER_PREFIX}usr/include
-	insinto /usr/include/X11/extensions
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin ${FOLDER_PREFIX}usr/sbin/*
-
-	# doc.
-	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
-
-	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
-
-	pushd ${FOLDER_PREFIX}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
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	# Gentoo-specific stuff:
-	newinitd "${FILESDIR}"/atieventsd.init atieventsd
-	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-	newconfd "${T}"/atieventsd.conf atieventsd
-
-	# PowerXpress stuff
-	exeinto /usr/$(get_libdir)/fglrx
-	doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
-	cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
-	doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
-
-	# Required by upstream AMD
-	touch "${D}/etc/ati/atiapfuser.blb" || die
-	insinto /etc/ati
-	doins "${FOLDER_PREFIX}etc/ati/atiapfxx.blb"
-}
-
-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"
-		local oclsuffix=64
-	else
-		local EX_BASE_DIR="${BASE_DIR}"
-		local pkglibdir=lib
-		local MY_ARCH_DIR="${S}/arch/x86"
-		local oclsuffix=32
-	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
-	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
-		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/fglrx/fglrx-libglx.so
-	# PowerXpress stuff
-	mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# AMD Cal and OpenCL libraries
-	exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
-	dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
-	exeinto /usr/$(get_libdir)
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
-
-	# OpenCL vendor files
-	insinto /etc/OpenCL/vendors/
-	cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
-		/usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so
-	EOF
-	doins "${T}"/amdocl${oclsuffix}.icd
-
-	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}"
-
-	# Silence the QA notice by creating missing soname symlinks
-	for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
-	do
-		local soname=${so##*/}
-		## let's keep also this alternative way ;)
-		#dosym ${soname} /usr/$(get_libdir)/${soname%.[0-9]}
-		dosym ${soname} /usr/$(get_libdir)/$(scanelf -qF "#f%S" ${so})
-	done
-
-	#remove static libs if not wanted
-	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a
-}
-
-pkg_postinst() {
-	elog "To switch to AMD 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 "Fully rebooting the system after an ${PN} update is recommended"
-	elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
-	elog "might not work"
-	elog
-	elog "Some cards need acpid running to handle events"
-	elog "Please add it to boot runlevel with rc-update add acpid boot"
-
-	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
-	"${ROOT}"/usr/bin/eselect opencl set --use-old amd
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-userspace/ati-userspace-13.1.ebuild b/x11-drivers/ati-userspace/ati-userspace-13.1.ebuild
deleted file mode 100644
index d11ed452..00000000
--- a/x11-drivers/ati-userspace/ati-userspace-13.1.ebuild
+++ /dev/null
@@ -1,481 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs versionator
-
-DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-MY_V=( $(get_version_components) )
-#RUN="${WORKDIR}/amd-driver-installer-9.00-x86.x86_64.run"
-DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-${PV}-linux-x86.x86_64.zip"
-XVBA_SDK_URI="http://developer.amd.com.php53-23.ord1-1.websitetestlink.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"
-SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
-FOLDER_PREFIX="common/"
-IUSE="debug multilib x-multilib static-libs disable-watermark"
-
-LICENSE="AMD GPL-2 QPL-1.0"
-KEYWORDS="-* ~amd64 ~x86"
-SLOT="1"
-RESTRICT="bindist"
-
-RDEPEND="<=x11-base/xorg-server-1.13.49[-minimal]
-	!x11-drivers/ati-drivers:0
-	!x11-apps/ati-drivers-extra
-	>=app-eselect/eselect-opengl-1.0.7
-	app-eselect/eselect-opencl
-	sys-power/acpid
-	x11-apps/xauth
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x-multilib? (
-			app-emulation/emul-linux-x86-opengl
-			app-emulation/emul-linux-x86-xlibs
-	)
-	!<x11-drivers/ati-userspace-${PV}
-	!>x11-drivers/ati-userspace-${PV}"
-
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto
-	x11-libs/libXtst
-	sys-apps/findutils
-	app-misc/pax-utils
-	app-arch/unzip
-"
-
-EMULTILIB_PKG="true"
-
-S="${WORKDIR}"
-
-# QA Silencing
-QA_TEXTRELS="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/libatiadlxx.so
-	usr/lib*/xorg/modules/glesx.so
-	usr/lib*/libaticaldd.so
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_EXECSTACK="
-	opt/bin/atiode
-	opt/bin/amdcccle
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_WX_LOAD="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_PRESTRIPPED="
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-"
-
-QA_SONAME="
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
-"
-
-QA_DT_HASH="
-	opt/bin/amdcccle
-	opt/bin/aticonfig
-	opt/bin/atiodcli
-	opt/bin/atiode
-	opt/bin/clinfo
-	opt/bin/fglrxinfo
-	opt/sbin/atieventsd
-	opt/sbin/amdnotifyui
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libatiuki.so.1.0
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
-	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
-"
-
-pkg_setup() {
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	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
-
-	elog
-	elog "Please note that this driver supports only graphic cards based on"
-	elog "Evergreen chipset and newer."
-	elog "This represent the AMD Radeon HD 5400+ series at this moment."
-	elog
-	elog "If your card is older then use ${CATEGORY}/xf86-video-ati"
-	elog "For migration informations please reffer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	local DRIVERS_DISTFILE XVBA_SDK_DISTFILE
-	DRIVERS_DISTFILE=${DRIVERS_URI/*\//}
-	XVBA_SDK_DISTFILE=${XVBA_SDK_URI/*\//}
-
-	if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then
-		unpack ${DRIVERS_DISTFILE}
-	else
-		#please note, RUN may be insanely assigned at top near SRC_URI
-		if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then
-			unpack ${DRIVERS_DISTFILE}
-			[[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}"
-		else
-			RUN="${DISTDIR}/${DRIVERS_DISTFILE}"
-		fi
-		sh ${RUN} --extract "${S}" 2>&1 > /dev/null || die
-	fi
-
-	mkdir xvba_sdk
-	cd xvba_sdk
-	unpack ${XVBA_SDK_DISTFILE}
-}
-
-src_prepare() {
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
-		|| die "bin rm failed"
-
-        # amdcccle is shipped separately
-        rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle || die "cannot rm amdcccle"
-
-	# ACPI fixups
-	sed -i \
-		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-		-e "s:/var/lib/gdm/:/var/gdm/:" \
-		"${S}/${FOLDER_PREFIX}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}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-		|| die "Replacing 'finger' with 'who' failed."
-	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-	# add function to detect default state.
-	epatch "${FILESDIR}"/ati-powermode-opt-path-3.patch
-
-	# see http://ati.cchtml.com/show_bug.cgi?id=495
-	#epatch "${FILESDIR}"/ati-drivers-old_rsp.patch
-	# first hunk applied upstream second (x32 related) was not
-	epatch "${FILESDIR}"/ati-drivers-x32_something_something.patch
-
-	# compile fix for linux-3.7
-	# https://bugs.gentoo.org/show_bug.cgi?id=438516
-	epatch "${FILESDIR}/ati-drivers-vm-reserverd.patch"
-
-	# compile fix for AGP-less kernel, bug #435322
-	epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch
-
-	# Use ACPI_DEVICE_HANDLE wrapper to make driver build on linux-3.8
-	# see https://bugs.gentoo.org/show_bug.cgi?id=448216
-	epatch "${FILESDIR}/ati-drivers-kernel-3.8-acpihandle.patch"
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-
-	if use disable-watermark; then
-		ebegin "Disabling watermark"
-		driver="${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
-		for x in $(objdump -d ${driver}|awk '/call/&&/EnableLogo/{print "\\x"$2"\\x"$3"\\x"$4"\\x"$5"\\x"$6}'); do
-		sed -i "s/${x/x5b/\x5b}/\x90\x90\x90\x90\x90/g" ${driver} || break 1
-		done
-		eend $? || die "Disabling watermark failed"
-	fi
-}
-
-src_compile() {
-	ebegin "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}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-	eend $?
-}
-
-src_test() { :; } # no tests present
-
-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" || die
-
-	# 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 && use multilib; 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/{glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	dobin "${ARCH_DIR}"/usr/bin/clinfo
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	exeinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
-
-	# include.
-	insinto /usr
-	doins -r ${FOLDER_PREFIX}usr/include
-	insinto /usr/include/X11/extensions
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin ${FOLDER_PREFIX}usr/sbin/*
-
-	# doc.
-	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
-
-	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
-
-	pushd ${FOLDER_PREFIX}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
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	# Gentoo-specific stuff:
-	newinitd "${FILESDIR}"/atieventsd.init atieventsd
-	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-	newconfd "${T}"/atieventsd.conf atieventsd
-
-	# PowerXpress stuff
-	exeinto /usr/$(get_libdir)/fglrx
-	doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
-	cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
-	doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
-}
-
-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"
-		local oclsuffix=64
-	else
-		local EX_BASE_DIR="${BASE_DIR}"
-		local pkglibdir=lib
-		local MY_ARCH_DIR="${S}/arch/x86"
-		local oclsuffix=32
-	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
-	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
-		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/fglrx/fglrx-libglx.so
-	mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
-
-	# other libs
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed some row above
-	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# AMD Cal and OpenCL libraries
-	exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
-	dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
-	exeinto /usr/$(get_libdir)
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
-
-	# OpenCL vendor files
-	insinto /etc/OpenCL/vendors/
-	cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
-		/usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so
-	EOF
-	doins "${T}"/amdocl${oclsuffix}.icd
-
-	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}"
-
-	# Silence the QA notice by creating missing soname symlinks
-	for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
-	do
-		local soname=${so##*/}
-		local soname_one=${soname%.[0-9]}
-		local soname_zero=${soname_one%.[0-9]}
-		dosym ${soname} /usr/$(get_libdir)/${soname_one}
-		dosym ${soname_one} /usr/$(get_libdir)/${soname_zero}
-	done
-
-	# See https://bugs.gentoo.org/show_bug.cgi?id=443466
-	dodir /etc/revdep-rebuild/
-	echo "SEARCH_DIRS_MASK=\"/opt/bin/clinfo\"" > "${ED}/etc/revdep-rebuild/62-ati-drivers"
-
-	#remove static libs if not wanted
-	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a
-
-	#install xvba sdk headers
-	doheader xvba_sdk/include/amdxvba.h
-}
-
-pkg_postinst() {
-	elog "To switch to AMD 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 "Fully rebooting the system after an ${PN} update is recommended"
-	elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
-	elog "might not work"
-	elog
-	elog "Some cards need acpid running to handle events"
-	elog "Please add it to boot runlevel with rc-update add acpid boot"
-	elog
-
-	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
-	"${ROOT}"/usr/bin/eselect opencl set --use-old amd
-
-	if has_version ">=x11-drivers/xf86-video-intel-2.20.3"; then
-		ewarn "It is reported that xf86-video-intel-2.20.3 and later cause the X server"
-		ewarn "to crash on systems that use hybrid AMD/Intel graphics. If you experience"
-		ewarn "this crash, downgrade to xf86-video-intel-2.20.2 or earlier."
-		ewarn "For details, see https://bugs.gentoo.org/show_bug.cgi?id=430000"
-	fi
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-userspace/ati-userspace-13.12.ebuild b/x11-drivers/ati-userspace/ati-userspace-13.12.ebuild
deleted file mode 100644
index a0014f9b..00000000
--- a/x11-drivers/ati-userspace/ati-userspace-13.12.ebuild
+++ /dev/null
@@ -1,501 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs versionator pax-utils
-
-DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-#RUN="${WORKDIR}/amd-catalyst-13.11-beta1-linux-x86.x86_64.run"
-SLOT="1"
-# Uses javascript for download YESSSS
-#DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip"
-DRIVERS_URI="http://dev.gentooexperimental.org/~scarabeus/amd-catalyst-13.12-linux-x86.x86_64.zip"
-XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"
-SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
-FOLDER_PREFIX="common/"
-IUSE="debug multilib x-multilib static-libs +disable-watermark pax_kernel"
-
-LICENSE="AMD GPL-2 QPL-1.0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="bindist test"
-
-# Note: do not add !>ati-userspace-ver or !<ati-userspace-ver
-# because it would cause pkg_postrm to set the wrong opengl implementation
-RDEPEND="<=x11-base/xorg-server-1.14.49[-minimal]
-	!x11-drivers/ati-drivers:0
-	!x11-apps/ati-drivers-extra
-	>=app-eselect/eselect-opengl-1.0.7
-	app-eselect/eselect-opencl
-	sys-power/acpid
-	x11-apps/xauth
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x-multilib? (
-			app-emulation/emul-linux-x86-opengl
-			app-emulation/emul-linux-x86-xlibs
-	)"
-
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto
-	x11-libs/libXtst
-	sys-apps/findutils
-	app-misc/pax-utils
-	app-arch/unzip
-"
-
-EMULTILIB_PKG="true"
-
-S="${WORKDIR}"
-
-# QA Silencing
-QA_TEXTRELS="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/libatiadlxx.so
-	usr/lib*/xorg/modules/glesx.so
-	usr/lib*/libaticaldd.so
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_EXECSTACK="
-	opt/bin/atiode
-	opt/bin/amdcccle
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_WX_LOAD="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_PRESTRIPPED="
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-"
-
-QA_SONAME="
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
-"
-
-QA_DT_HASH="
-	opt/bin/amdcccle
-	opt/bin/aticonfig
-	opt/bin/atiodcli
-	opt/bin/atiode
-	opt/bin/clinfo
-	opt/bin/fglrxinfo
-	opt/sbin/atieventsd
-	opt/sbin/amdnotifyui
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libatiuki.so.1.0
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
-	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
-"
-
-pkg_setup() {
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	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
-
-	elog
-	elog "Please note that this driver only supports graphic cards based on"
-	elog "Evergreen chipset and newer."
-	elog "This includes the AMD Radeon HD 5400+ series at this moment."
-	elog
-	elog "If your card is older then use ${CATEGORY}/xf86-video-ati"
-	elog "For migration information please refer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	local DRIVERS_DISTFILE XVBA_SDK_DISTFILE
-	DRIVERS_DISTFILE=${DRIVERS_URI##*/}
-	XVBA_SDK_DISTFILE=${XVBA_SDK_URI##*/}
-
-	if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then
-		unpack ${DRIVERS_DISTFILE}
-	else
-		#please note, RUN may be insanely assigned at top near SRC_URI
-		if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then
-			unpack ${DRIVERS_DISTFILE}
-			[[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}"
-		else
-			RUN="${DISTDIR}/${DRIVERS_DISTFILE}"
-		fi
-		sh "${RUN}" --extract "${S}" 2>&1 > /dev/null || die
-	fi
-
-	mkdir xvba_sdk
-	cd xvba_sdk
-	unpack ${XVBA_SDK_DISTFILE}
-}
-
-src_prepare() {
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
-		|| die "bin rm failed"
-
-        # amdcccle is shipped separately
-        rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle || die "cannot rm amdcccle"
-
-	# ACPI fixups
-	sed -i \
-		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-		-e "s:/var/lib/gdm/:/var/gdm/:" \
-		"${S}/${FOLDER_PREFIX}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}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-		|| die "Replacing 'finger' with 'who' failed."
-	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-	# add function to detect default state.
-	epatch "${FILESDIR}"/ati-powermode-opt-path-3.patch
-
-	# see http://ati.cchtml.com/show_bug.cgi?id=495
-	#epatch "${FILESDIR}"/ati-drivers-old_rsp.patch
-	# first hunk applied upstream second (x32 related) was not
-	epatch "${FILESDIR}"/ati-drivers-x32_something_something.patch
-
-	# compile fix for AGP-less kernel, bug #435322
-	epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch
-
-	# Compile fix for kernel typesafe uid types #469160
-	epatch "${FILESDIR}/typesafe-kuid.diff"
-
-	epatch "${FILESDIR}/ati-drivers-13.8-beta-include-seq_file.patch"
-
-	epatch "${FILESDIR}/check-for-iommu-only-if-iommu-is-supported.patch"
-
-	# Mesa 9.2 compatibility. This is a hack, has_version shouldn't be
-	# used this way. But it seems to work because only fgl_glxinfo is
-	# affected
-	if has_version ">=media-libs/mesa-9.2"; then
-		epatch "${FILESDIR}/ati-drivers-13.8-mesa-9.2-debug.patch"
-	fi
-
-	# Fix build on new kernels
-	epatch "${FILESDIR}/ati-drivers-13.12-acpi.patch"
-
-	# Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870
-	use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch"
-
-	cd "${S}"
-	mkdir extra || die "mkdir extra failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-
-	# Get rid of watermark. Oldest known reference:
-	# http://phoronix.com/forums/showthread.php?19875-Unsupported-Hardware-watermark
-	if use disable-watermark; then
-		ebegin "Disabling watermark"
-		driver="${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
-		for x in $(objdump -d ${driver}|awk '/call/&&/EnableLogo/{print "\\x"$2"\\x"$3"\\x"$4"\\x"$5"\\x"$6}'); do
-		sed -i "s/${x/x5b/\x5b}/\x90\x90\x90\x90\x90/g" ${driver} || break 1
-		done
-		eend $? || die "Disabling watermark failed"
-	fi
-}
-
-src_compile() {
-	ebegin "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}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-	eend $?
-}
-
-src_test() { :; } # no tests present
-
-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" || die
-
-	# 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 && use multilib; 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/{glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	dobin "${ARCH_DIR}"/usr/bin/clinfo
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	exeinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
-
-	# include.
-	insinto /usr
-	doins -r ${FOLDER_PREFIX}usr/include
-	insinto /usr/include/X11/extensions
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin ${FOLDER_PREFIX}usr/sbin/*
-
-	# doc.
-	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
-
-	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
-
-	pushd ${FOLDER_PREFIX}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
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	# Gentoo-specific stuff:
-	newinitd "${FILESDIR}"/atieventsd.init atieventsd
-	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-	newconfd "${T}"/atieventsd.conf atieventsd
-
-	# PowerXpress stuff
-	exeinto /usr/$(get_libdir)/fglrx
-	doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
-	cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
-	doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
-}
-
-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"
-		local oclsuffix=64
-	else
-		local EX_BASE_DIR="${BASE_DIR}"
-		local pkglibdir=lib
-		local MY_ARCH_DIR="${S}/arch/x86"
-		local oclsuffix=32
-	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
-	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
-		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/fglrx/fglrx-libglx.so
-	mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
-
-	# other libs
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed some row above
-	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# AMD Cal and OpenCL libraries
-	exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
-	dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
-	exeinto /usr/$(get_libdir)
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
-
-	# OpenCL vendor files
-	insinto /etc/OpenCL/vendors/
-	cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
-		/usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so
-	EOF
-	doins "${T}"/amdocl${oclsuffix}.icd
-
-	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}"
-
-	# Silence the QA notice by creating missing soname symlinks
-	for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
-	do
-		local soname=${so##*/}
-		local soname_one=${soname%.[0-9]}
-		local soname_zero=${soname_one%.[0-9]}
-		dosym ${soname} /usr/$(get_libdir)/${soname_one}
-		dosym ${soname_one} /usr/$(get_libdir)/${soname_zero}
-	done
-
-	# See https://bugs.gentoo.org/show_bug.cgi?id=443466
-	dodir /etc/revdep-rebuild/
-	echo "SEARCH_DIRS_MASK=\"/opt/bin/clinfo\"" > "${ED}/etc/revdep-rebuild/62-ati-drivers"
-
-	#remove static libs if not wanted
-	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a
-
-	#install xvba sdk headers
-	doheader xvba_sdk/include/amdxvba.h
-
-	if use pax_kernel; then
-		pax-mark m "${D}"/usr/lib*/opengl/ati/lib/libGL.so.1.2 || die "pax-mark failed"
-	fi
-}
-
-pkg_postinst() {
-	elog "To switch to AMD 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 "Fully rebooting the system after an ${PN} update is recommended"
-	elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
-	elog "might not work"
-	elog
-	elog "Some cards need acpid running to handle events"
-	elog "Please add it to boot runlevel with rc-update add acpid boot"
-	elog
-
-	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
-	"${ROOT}"/usr/bin/eselect opencl set --use-old amd
-
-	if has_version "x11-drivers/xf86-video-intel[sna]"; then
-		ewarn "It is reported that xf86-video-intel built with USE=\"sna\" causes the X server"
-		ewarn "to crash on systems that use hybrid AMD/Intel graphics. If you experience"
-		ewarn "this crash, downgrade to xf86-video-intel-2.20.2 or earlier or"
-		ewarn "try disabling sna for xf86-video-intel."
-		ewarn "For details, see https://bugs.gentoo.org/show_bug.cgi?id=430000"
-	fi
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-userspace/ati-userspace-13.4.ebuild b/x11-drivers/ati-userspace/ati-userspace-13.4.ebuild
deleted file mode 100644
index 83360820..00000000
--- a/x11-drivers/ati-userspace/ati-userspace-13.4.ebuild
+++ /dev/null
@@ -1,487 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs versionator pax-utils
-
-DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-MY_V=( $(get_version_components) )
-#RUN="${WORKDIR}/amd-driver-installer-9.00-x86.x86_64.run"
-SLOT="1"
-[[ "${MY_V[2]}" =~  beta.* ]] && BETADIR="beta/" || BETADIR="linux/"
-if [[ legacy != ${SLOT} ]]; then
-	DRIVERS_URI="http://www2.ati.com/drivers/${BETADIR}amd-catalyst-${PV/_beta/-beta}-linux-x86.x86_64.zip"
-else
-	DRIVERS_URI="http://www2.ati.com/drivers/legacy/amd-driver-installer-catalyst-$(get_version_component_range 1-2)-$(get_version_component_range 3)-legacy-linux-x86.x86_64.zip"
-fi
-XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"
-SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
-FOLDER_PREFIX="common/"
-IUSE="debug multilib x-multilib static-libs +disable-watermark pax_kernel"
-
-LICENSE="AMD GPL-2 QPL-1.0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="bindist test"
-
-RDEPEND="<=x11-base/xorg-server-1.13.49[-minimal]
-	!x11-drivers/ati-drivers:0
-	!x11-apps/ati-drivers-extra
-	>=app-eselect/eselect-opengl-1.0.7
-	app-eselect/eselect-opencl
-	sys-power/acpid
-	x11-apps/xauth
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x-multilib? (
-			app-emulation/emul-linux-x86-opengl
-			app-emulation/emul-linux-x86-xlibs
-	)
-	!<x11-drivers/ati-userspace-${PV}
-	!>x11-drivers/ati-userspace-${PV}"
-
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto
-	x11-libs/libXtst
-	sys-apps/findutils
-	app-misc/pax-utils
-	app-arch/unzip
-"
-
-EMULTILIB_PKG="true"
-
-S="${WORKDIR}"
-
-# QA Silencing
-QA_TEXTRELS="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/libatiadlxx.so
-	usr/lib*/xorg/modules/glesx.so
-	usr/lib*/libaticaldd.so
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_EXECSTACK="
-	opt/bin/atiode
-	opt/bin/amdcccle
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_WX_LOAD="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_PRESTRIPPED="
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-"
-
-QA_SONAME="
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
-"
-
-QA_DT_HASH="
-	opt/bin/amdcccle
-	opt/bin/aticonfig
-	opt/bin/atiodcli
-	opt/bin/atiode
-	opt/bin/clinfo
-	opt/bin/fglrxinfo
-	opt/sbin/atieventsd
-	opt/sbin/amdnotifyui
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libatiuki.so.1.0
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
-	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
-"
-
-pkg_setup() {
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	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
-
-	elog
-	elog "Please note that this driver only supports graphic cards based on"
-	elog "Evergreen chipset and newer."
-	elog "This includes the AMD Radeon HD 5400+ series at this moment."
-	elog
-	elog "If your card is older then use ${CATEGORY}/xf86-video-ati"
-	elog "For migration information please refer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	local DRIVERS_DISTFILE XVBA_SDK_DISTFILE
-	DRIVERS_DISTFILE=${DRIVERS_URI##*/}
-	XVBA_SDK_DISTFILE=${XVBA_SDK_URI##*/}
-
-	if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then
-		unpack ${DRIVERS_DISTFILE}
-	else
-		#please note, RUN may be insanely assigned at top near SRC_URI
-		if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then
-			unpack ${DRIVERS_DISTFILE}
-			[[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}"
-		else
-			RUN="${DISTDIR}/${DRIVERS_DISTFILE}"
-		fi
-		sh ${RUN} --extract "${S}" 2>&1 > /dev/null || die
-	fi
-
-	mkdir xvba_sdk
-	cd xvba_sdk
-	unpack ${XVBA_SDK_DISTFILE}
-}
-
-src_prepare() {
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
-		|| die "bin rm failed"
-
-        # amdcccle is shipped separately
-        rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle || die "cannot rm amdcccle"
-
-	# ACPI fixups
-	sed -i \
-		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-		-e "s:/var/lib/gdm/:/var/gdm/:" \
-		"${S}/${FOLDER_PREFIX}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}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-		|| die "Replacing 'finger' with 'who' failed."
-	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-	# add function to detect default state.
-	epatch "${FILESDIR}"/ati-powermode-opt-path-3.patch
-
-	# see http://ati.cchtml.com/show_bug.cgi?id=495
-	#epatch "${FILESDIR}"/ati-drivers-old_rsp.patch
-	# first hunk applied upstream second (x32 related) was not
-	epatch "${FILESDIR}"/ati-drivers-x32_something_something.patch
-
-	# compile fix for AGP-less kernel, bug #435322
-	epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch
-
-	# Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870
-	use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch"
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-
-	# Get rid of watermark. Oldest known reference:
-	# http://phoronix.com/forums/showthread.php?19875-Unsupported-Hardware-watermark
-	if use disable-watermark; then
-		ebegin "Disabling watermark"
-		driver="${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
-		for x in $(objdump -d ${driver}|awk '/call/&&/EnableLogo/{print "\\x"$2"\\x"$3"\\x"$4"\\x"$5"\\x"$6}'); do
-		sed -i "s/${x/x5b/\x5b}/\x90\x90\x90\x90\x90/g" ${driver} || break 1
-		done
-		eend $? || die "Disabling watermark failed"
-	fi
-}
-
-src_compile() {
-	ebegin "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}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-	eend $?
-}
-
-src_test() { :; } # no tests present
-
-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" || die
-
-	# 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 && use multilib; 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/{glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	dobin "${ARCH_DIR}"/usr/bin/clinfo
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	exeinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
-
-	# include.
-	insinto /usr
-	doins -r ${FOLDER_PREFIX}usr/include
-	insinto /usr/include/X11/extensions
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin ${FOLDER_PREFIX}usr/sbin/*
-
-	# doc.
-	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
-
-	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
-
-	pushd ${FOLDER_PREFIX}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
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	# Gentoo-specific stuff:
-	newinitd "${FILESDIR}"/atieventsd.init atieventsd
-	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-	newconfd "${T}"/atieventsd.conf atieventsd
-
-	# PowerXpress stuff
-	exeinto /usr/$(get_libdir)/fglrx
-	doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
-	cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
-	doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
-}
-
-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"
-		local oclsuffix=64
-	else
-		local EX_BASE_DIR="${BASE_DIR}"
-		local pkglibdir=lib
-		local MY_ARCH_DIR="${S}/arch/x86"
-		local oclsuffix=32
-	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
-	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
-		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/fglrx/fglrx-libglx.so
-	mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
-
-	# other libs
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed some row above
-	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# AMD Cal and OpenCL libraries
-	exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
-	dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
-	exeinto /usr/$(get_libdir)
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
-
-	# OpenCL vendor files
-	insinto /etc/OpenCL/vendors/
-	cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
-		/usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so
-	EOF
-	doins "${T}"/amdocl${oclsuffix}.icd
-
-	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}"
-
-	# Silence the QA notice by creating missing soname symlinks
-	for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
-	do
-		local soname=${so##*/}
-		local soname_one=${soname%.[0-9]}
-		local soname_zero=${soname_one%.[0-9]}
-		dosym ${soname} /usr/$(get_libdir)/${soname_one}
-		dosym ${soname_one} /usr/$(get_libdir)/${soname_zero}
-	done
-
-	# See https://bugs.gentoo.org/show_bug.cgi?id=443466
-	dodir /etc/revdep-rebuild/
-	echo "SEARCH_DIRS_MASK=\"/opt/bin/clinfo\"" > "${ED}/etc/revdep-rebuild/62-ati-drivers"
-
-	#remove static libs if not wanted
-	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a
-
-	#install xvba sdk headers
-	doheader xvba_sdk/include/amdxvba.h
-
-	if use pax_kernel; then
-		pax-mark m "${D}"/usr/lib*/opengl/ati/lib/libGL.so.1.2 || die "pax-mark failed"
-	fi
-}
-
-pkg_postinst() {
-	elog "To switch to AMD 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 "Fully rebooting the system after an ${PN} update is recommended"
-	elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
-	elog "might not work"
-	elog
-	elog "Some cards need acpid running to handle events"
-	elog "Please add it to boot runlevel with rc-update add acpid boot"
-	elog
-
-	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
-	"${ROOT}"/usr/bin/eselect opencl set --use-old amd
-
-	if has_version ">=x11-drivers/xf86-video-intel-2.20.3"; then
-		ewarn "It is reported that xf86-video-intel-2.20.3 and later cause the X server"
-		ewarn "to crash on systems that use hybrid AMD/Intel graphics. If you experience"
-		ewarn "this crash, downgrade to xf86-video-intel-2.20.2 or earlier."
-		ewarn "For details, see https://bugs.gentoo.org/show_bug.cgi?id=430000"
-	fi
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-userspace/ati-userspace-13.9.ebuild b/x11-drivers/ati-userspace/ati-userspace-13.9.ebuild
deleted file mode 100644
index 48c7a900..00000000
--- a/x11-drivers/ati-userspace/ati-userspace-13.9.ebuild
+++ /dev/null
@@ -1,494 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs versionator pax-utils
-
-DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-#RUN="${WORKDIR}/amd-driver-installer-9.00-x86.x86_64.run"
-SLOT="1"
-DRIVERS_URI="https://www2.ati.com/drivers/linux/amd-catalyst-13.9-linux-x86.x86_64.zip"
-XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"
-SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
-FOLDER_PREFIX="common/"
-IUSE="debug multilib x-multilib static-libs +disable-watermark pax_kernel"
-
-LICENSE="AMD GPL-2 QPL-1.0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="bindist test"
-
-# Note: do not add !>ati-userspace-ver or !<ati-userspace-ver
-# because it would cause pkg_postrm to set the wrong opengl implementation
-RDEPEND="<=x11-base/xorg-server-1.14.49[-minimal]
-	!x11-drivers/ati-drivers:0
-	!x11-apps/ati-drivers-extra
-	>=app-eselect/eselect-opengl-1.0.7
-	app-eselect/eselect-opencl
-	sys-power/acpid
-	x11-apps/xauth
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x-multilib? (
-			app-emulation/emul-linux-x86-opengl
-			app-emulation/emul-linux-x86-xlibs
-	)"
-
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto
-	x11-libs/libXtst
-	sys-apps/findutils
-	app-misc/pax-utils
-	app-arch/unzip
-"
-
-EMULTILIB_PKG="true"
-
-S="${WORKDIR}"
-
-# QA Silencing
-QA_TEXTRELS="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/libatiadlxx.so
-	usr/lib*/xorg/modules/glesx.so
-	usr/lib*/libaticaldd.so
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_EXECSTACK="
-	opt/bin/atiode
-	opt/bin/amdcccle
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_WX_LOAD="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_PRESTRIPPED="
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-"
-
-QA_SONAME="
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
-"
-
-QA_DT_HASH="
-	opt/bin/amdcccle
-	opt/bin/aticonfig
-	opt/bin/atiodcli
-	opt/bin/atiode
-	opt/bin/clinfo
-	opt/bin/fglrxinfo
-	opt/sbin/atieventsd
-	opt/sbin/amdnotifyui
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libatiuki.so.1.0
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
-	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
-"
-
-pkg_setup() {
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	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
-
-	elog
-	elog "Please note that this driver only supports graphic cards based on"
-	elog "Evergreen chipset and newer."
-	elog "This includes the AMD Radeon HD 5400+ series at this moment."
-	elog
-	elog "If your card is older then use ${CATEGORY}/xf86-video-ati"
-	elog "For migration information please refer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	local DRIVERS_DISTFILE XVBA_SDK_DISTFILE
-	DRIVERS_DISTFILE=${DRIVERS_URI##*/}
-	XVBA_SDK_DISTFILE=${XVBA_SDK_URI##*/}
-
-	if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then
-		unpack ${DRIVERS_DISTFILE}
-	else
-		#please note, RUN may be insanely assigned at top near SRC_URI
-		if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then
-			unpack ${DRIVERS_DISTFILE}
-			[[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}"
-		else
-			RUN="${DISTDIR}/${DRIVERS_DISTFILE}"
-		fi
-		sh ${RUN} --extract "${S}" 2>&1 > /dev/null || die
-	fi
-
-	mkdir xvba_sdk
-	cd xvba_sdk
-	unpack ${XVBA_SDK_DISTFILE}
-}
-
-src_prepare() {
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
-		|| die "bin rm failed"
-
-        # amdcccle is shipped separately
-        rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle || die "cannot rm amdcccle"
-
-	# ACPI fixups
-	sed -i \
-		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-		-e "s:/var/lib/gdm/:/var/gdm/:" \
-		"${S}/${FOLDER_PREFIX}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}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-		|| die "Replacing 'finger' with 'who' failed."
-	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-	# add function to detect default state.
-	epatch "${FILESDIR}"/ati-powermode-opt-path-3.patch
-
-	# see http://ati.cchtml.com/show_bug.cgi?id=495
-	#epatch "${FILESDIR}"/ati-drivers-old_rsp.patch
-	# first hunk applied upstream second (x32 related) was not
-	epatch "${FILESDIR}"/ati-drivers-x32_something_something.patch
-
-	# compile fix for AGP-less kernel, bug #435322
-	epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch
-
-	# Compile fix for kernel typesafe uid types #469160
-	epatch "${FILESDIR}/typesafe-kuid.diff"
-
-	epatch "${FILESDIR}/ati-drivers-13.6-linux-3.10-proc.diff"
-
-	# Mesa 9.2 compatibility. This is a hack, has_version shouldn't be
-	# used this way. But it seems to work because only fgl_glxinfo is
-	# affected
-	if has_version ">=media-libs/mesa-9.2"; then
-		epatch "${FILESDIR}/ati-drivers-13.8-mesa-9.2-debug.patch"
-	fi
-
-	# Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870
-	use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch"
-
-	cd "${S}"
-	mkdir extra || die "mkdir extra failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-
-	# Get rid of watermark. Oldest known reference:
-	# http://phoronix.com/forums/showthread.php?19875-Unsupported-Hardware-watermark
-	if use disable-watermark; then
-		ebegin "Disabling watermark"
-		driver="${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
-		for x in $(objdump -d ${driver}|awk '/call/&&/EnableLogo/{print "\\x"$2"\\x"$3"\\x"$4"\\x"$5"\\x"$6}'); do
-		sed -i "s/${x/x5b/\x5b}/\x90\x90\x90\x90\x90/g" ${driver} || break 1
-		done
-		eend $? || die "Disabling watermark failed"
-	fi
-}
-
-src_compile() {
-	ebegin "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}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-	eend $?
-}
-
-src_test() { :; } # no tests present
-
-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" || die
-
-	# 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 && use multilib; 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/{glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	dobin "${ARCH_DIR}"/usr/bin/clinfo
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	exeinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
-
-	# include.
-	insinto /usr
-	doins -r ${FOLDER_PREFIX}usr/include
-	insinto /usr/include/X11/extensions
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin ${FOLDER_PREFIX}usr/sbin/*
-
-	# doc.
-	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
-
-	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
-
-	pushd ${FOLDER_PREFIX}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
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	# Gentoo-specific stuff:
-	newinitd "${FILESDIR}"/atieventsd.init atieventsd
-	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-	newconfd "${T}"/atieventsd.conf atieventsd
-
-	# PowerXpress stuff
-	exeinto /usr/$(get_libdir)/fglrx
-	doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
-	cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
-	doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
-}
-
-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"
-		local oclsuffix=64
-	else
-		local EX_BASE_DIR="${BASE_DIR}"
-		local pkglibdir=lib
-		local MY_ARCH_DIR="${S}/arch/x86"
-		local oclsuffix=32
-	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
-	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
-		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/fglrx/fglrx-libglx.so
-	mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
-
-	# other libs
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed some row above
-	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# AMD Cal and OpenCL libraries
-	exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
-	dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
-	exeinto /usr/$(get_libdir)
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
-
-	# OpenCL vendor files
-	insinto /etc/OpenCL/vendors/
-	cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
-		/usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so
-	EOF
-	doins "${T}"/amdocl${oclsuffix}.icd
-
-	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}"
-
-	# Silence the QA notice by creating missing soname symlinks
-	for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
-	do
-		local soname=${so##*/}
-		local soname_one=${soname%.[0-9]}
-		local soname_zero=${soname_one%.[0-9]}
-		dosym ${soname} /usr/$(get_libdir)/${soname_one}
-		dosym ${soname_one} /usr/$(get_libdir)/${soname_zero}
-	done
-
-	# See https://bugs.gentoo.org/show_bug.cgi?id=443466
-	dodir /etc/revdep-rebuild/
-	echo "SEARCH_DIRS_MASK=\"/opt/bin/clinfo\"" > "${ED}/etc/revdep-rebuild/62-ati-drivers"
-
-	#remove static libs if not wanted
-	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a
-
-	#install xvba sdk headers
-	doheader xvba_sdk/include/amdxvba.h
-
-	if use pax_kernel; then
-		pax-mark m "${D}"/usr/lib*/opengl/ati/lib/libGL.so.1.2 || die "pax-mark failed"
-	fi
-}
-
-pkg_postinst() {
-	elog "To switch to AMD 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 "Fully rebooting the system after an ${PN} update is recommended"
-	elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
-	elog "might not work"
-	elog
-	elog "Some cards need acpid running to handle events"
-	elog "Please add it to boot runlevel with rc-update add acpid boot"
-	elog
-
-	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
-	"${ROOT}"/usr/bin/eselect opencl set --use-old amd
-
-	if has_version "x11-drivers/xf86-video-intel[sna]"; then
-		ewarn "It is reported that xf86-video-intel built with USE=\"sna\" causes the X server"
-		ewarn "to crash on systems that use hybrid AMD/Intel graphics. If you experience"
-		ewarn "this crash, downgrade to xf86-video-intel-2.20.2 or earlier or"
-		ewarn "try disabling sna for xf86-video-intel."
-		ewarn "For details, see https://bugs.gentoo.org/show_bug.cgi?id=430000"
-	fi
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-userspace/ati-userspace-14.12-r3.ebuild b/x11-drivers/ati-userspace/ati-userspace-14.12-r3.ebuild
deleted file mode 100644
index 92586d0e..00000000
--- a/x11-drivers/ati-userspace/ati-userspace-14.12-r3.ebuild
+++ /dev/null
@@ -1,479 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit eutils multilib-build toolchain-funcs versionator pax-utils
-
-DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-RUN="${WORKDIR}/fglrx-14.501.1003/amd-driver-installer-14.501.1003-x86.x86_64.run"
-SLOT="1"
-# Uses javascript for download YESSSS
-#DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip"
-DRIVERS_URI="mirror://gentoo/amd-catalyst-omega-14.12-linux-run-installers.zip"
-XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"
-SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
-FOLDER_PREFIX="common/"
-IUSE="debug static-libs pax_kernel"
-
-LICENSE="AMD GPL-2 QPL-1.0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="bindist test"
-
-RDEPEND="
-	<=x11-base/xorg-server-1.16.49[-minimal]
-	>=app-eselect/eselect-opengl-1.0.7
-	app-eselect/eselect-opencl
-	sys-power/acpid
-	x11-apps/xauth
-	virtual/glu[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXinerama[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	x11-libs/libXrender[${MULTILIB_USEDEP}]
-	!x11-libs/xvba-video
-"
-
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto
-	x11-libs/libXtst
-	sys-apps/findutils
-	app-misc/pax-utils
-	app-arch/unzip
-"
-
-EMULTILIB_PKG="true"
-
-S="${WORKDIR}"
-
-# QA Silencing
-QA_TEXTRELS="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/libatiadlxx.so
-	usr/lib*/xorg/modules/glesx.so
-	usr/lib*/libaticaldd.so
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_EXECSTACK="
-	opt/bin/atiode
-	opt/bin/amdcccle
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_WX_LOAD="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_PRESTRIPPED="
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\).so
-"
-
-QA_SONAME="
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
-	usr/lib\(32\|64\)\?/libamdhsasc\(32\|64\)\?.so
-"
-
-QA_DT_HASH="
-	opt/bin/amdcccle
-	opt/bin/aticonfig
-	opt/bin/atiodcli
-	opt/bin/atiode
-	opt/bin/clinfo
-	opt/bin/fglrxinfo
-	opt/sbin/atieventsd
-	opt/sbin/amdnotifyui
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libatiuki.so.1.0
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
-	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
-"
-
-pkg_setup() {
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	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
-
-	elog
-	elog "Please note that this driver only supports graphic cards based on"
-	elog "Evergreen chipset and newer."
-	elog "This includes the AMD Radeon HD 5400+ series at this moment."
-	elog
-	elog "If your card is older then use ${CATEGORY}/xf86-video-ati"
-	elog "For migration information please refer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	local DRIVERS_DISTFILE XVBA_SDK_DISTFILE
-	DRIVERS_DISTFILE=${DRIVERS_URI##*/}
-	XVBA_SDK_DISTFILE=${XVBA_SDK_URI##*/}
-
-	if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then
-		unpack ${DRIVERS_DISTFILE}
-	else
-		#please note, RUN may be insanely assigned at top near SRC_URI
-		if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then
-			unpack ${DRIVERS_DISTFILE}
-			[[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}"
-		else
-			RUN="${DISTDIR}/${DRIVERS_DISTFILE}"
-		fi
-		sh "${RUN}" --extract "${S}" 2>&1 > /dev/null || die
-	fi
-
-	mkdir xvba_sdk
-	cd xvba_sdk
-	unpack ${XVBA_SDK_DISTFILE}
-
-	mkdir -p "${WORKDIR}/extra" || die "mkdir extra failed"
-	cd "${WORKDIR}/extra"
-	tar -xf "../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz"
-}
-
-src_prepare() {
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
-		|| die "bin rm failed"
-
-        # amdcccle is shipped separately
-        rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle || die "cannot rm amdcccle"
-
-	# ACPI fixups
-	sed -i \
-		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-		-e "s:/var/lib/gdm/:/var/gdm/:" \
-		"${S}/${FOLDER_PREFIX}etc/ati/authatieventsd.sh" \
-		|| die "ACPI fixups failed."
-
-	# Since "who" is in coreutils, we're using that one instead of "finger".
-	sed -i -e 's:finger:who:' \
-		"${S}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-		|| die "Replacing 'finger' with 'who' failed."
-	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-	# add function to detect default state.
-	epatch "${FILESDIR}"/ati-powermode-opt-path-3.patch
-
-	# see http://ati.cchtml.com/show_bug.cgi?id=495
-	#epatch "${FILESDIR}"/ati-drivers-old_rsp.patch
-	# first hunk applied upstream second (x32 related) was not
-	epatch "${FILESDIR}"/ati-drivers-x32_something_something.patch
-
-	# compile fix for AGP-less kernel, bug #435322
-	epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch
-
-	epatch "${FILESDIR}/ati-drivers-13.8-beta-include-seq_file.patch"
-
-	# Fix #483400
-	epatch "${FILESDIR}/fgl_glxgears-do-not-include-glATI.patch"
-
-	# Fix #524658
-	epatch "${FILESDIR}/fix-the-linux-3.17-no_hotplug-error.patch"
-
-	# Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870
-	use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch"
-
-	# Compile fix, #526602
-	epatch "${FILESDIR}/use-kernel_fpu_begin.patch"
-}
-
-src_compile() {
-	ebegin "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}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-	eend $?
-}
-
-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" || die
-
-	# 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.
-	multilib_foreach_abi src_install-libs
-
-	# 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/{glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	dobin "${ARCH_DIR}"/usr/bin/clinfo
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	exeinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,signature,amdpcsdb.default}
-	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
-
-	# include.
-	insinto /usr
-	doins -r ${FOLDER_PREFIX}usr/include
-	insinto /usr/include/X11/extensions
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin ${FOLDER_PREFIX}usr/sbin/*
-
-	# doc.
-	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
-
-	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
-
-	pushd ${FOLDER_PREFIX}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
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	# Gentoo-specific stuff:
-	newinitd "${FILESDIR}"/atieventsd.init atieventsd
-	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-	newconfd "${T}"/atieventsd.conf atieventsd
-
-	# PowerXpress stuff
-	exeinto /usr/$(get_libdir)/fglrx
-	doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
-	cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
-	doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
-}
-
-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"
-		local oclsuffix=64
-	else
-		local EX_BASE_DIR="${BASE_DIR}"
-		local pkglibdir=lib
-		local MY_ARCH_DIR="${S}/arch/x86"
-		local oclsuffix=32
-	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
-	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
-		libGL.so.${libver}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
-
-	if multilib_is_native_abi; then
-		exeinto ${ATI_ROOT}/extensions
-		doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/fglrx/fglrx-libglx.so
-		mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
-	fi
-
-	# other libs
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed some row above
-	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# AMD Cal and OpenCL libraries
-	exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
-	dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
-	exeinto /usr/$(get_libdir)
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdhsasc*.so
-
-	# OpenCL vendor files
-	insinto /etc/OpenCL/vendors/
-	cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
-		/usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so
-	EOF
-	doins "${T}"/amdocl${oclsuffix}.icd
-
-	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}"
-
-	# Silence the QA notice by creating missing soname symlinks
-	for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
-	do
-		local soname=${so##*/}
-		local soname_one=${soname%.[0-9]}
-		local soname_zero=${soname_one%.[0-9]}
-		dosym ${soname} /usr/$(get_libdir)/${soname_one}
-		dosym ${soname_one} /usr/$(get_libdir)/${soname_zero}
-	done
-
-	# See https://bugs.gentoo.org/show_bug.cgi?id=443466
-	dodir /etc/revdep-rebuild/
-	echo "SEARCH_DIRS_MASK=\"/opt/bin/clinfo\"" > "${ED}/etc/revdep-rebuild/62-ati-drivers"
-
-	#remove static libs if not wanted
-	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a
-
-	#install xvba sdk headers
-	doheader xvba_sdk/include/amdxvba.h
-
-	# VA-API internal wrapper
-	dosym /usr/$(get_libdir)/libXvBAW.so.1.0 /usr/$(get_libdir)/va/drivers/fglrx_drv_video.so
-
-	if use pax_kernel; then
-		pax-mark m "${D}"/usr/lib*/opengl/ati/lib/libGL.so.1.2 || die "pax-mark failed"
-	fi
-}
-
-pkg_postinst() {
-	elog "To switch to AMD 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 "Fully rebooting the system after an ${PN} update is recommended"
-	elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
-	elog "might not work"
-	elog
-	elog "Some cards need acpid running to handle events"
-	elog "Please add it to boot runlevel with rc-update add acpid boot"
-	elog
-
-	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
-	"${ROOT}"/usr/bin/eselect opencl set --use-old amd
-
-	if has_version "x11-drivers/xf86-video-intel[sna]"; then
-		ewarn "It is reported that xf86-video-intel built with USE=\"sna\" causes the X server"
-		ewarn "to crash on systems that use hybrid AMD/Intel graphics. If you experience"
-		ewarn "this crash, downgrade to xf86-video-intel-2.20.2 or earlier or"
-		ewarn "try disabling sna for xf86-video-intel."
-		ewarn "For details, see https://bugs.gentoo.org/show_bug.cgi?id=430000"
-	fi
-
-	if use pax_kernel; then
-		ewarn "Please run \"revdep-pax -s libGL.so.1 -me\" after installation and"
-		ewarn "after you have run \"eselect opengl set ati\". Executacle"
-		ewarn "revdep-pax is part of package sys-apps/elfix."
-	fi
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-userspace/ati-userspace-14.4.ebuild b/x11-drivers/ati-userspace/ati-userspace-14.4.ebuild
deleted file mode 100644
index bfcd84bf..00000000
--- a/x11-drivers/ati-userspace/ati-userspace-14.4.ebuild
+++ /dev/null
@@ -1,478 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs versionator pax-utils
-
-DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-RUN="${WORKDIR}/fglrx-14.10.1006/amd-driver-installer-14.10.1006-x86.x86_64.run"
-SLOT="1"
-DRIVERS_URI="mirror://kogaion/${CATEGORY}/amd-catalyst-14-4-linux-x86-x86-64.zip"
-XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"
-SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
-FOLDER_PREFIX="common/"
-IUSE="debug multilib x-multilib static-libs pax_kernel"
-
-LICENSE="AMD GPL-2 QPL-1.0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="bindist test"
-
-# Note: do not add !>ati-userspace-ver or !<ati-userspace-ver
-# because it would cause pkg_postrm to set the wrong opengl implementation
-RDEPEND="<=x11-base/xorg-server-1.14.49[-minimal]
-	!x11-drivers/ati-drivers:0
-	!x11-apps/ati-drivers-extra
-	>=app-eselect/eselect-opengl-1.0.7
-	app-eselect/eselect-opencl
-	sys-power/acpid
-	x11-apps/xauth
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x-multilib? (
-			app-emulation/emul-linux-x86-opengl
-			app-emulation/emul-linux-x86-xlibs
-	)"
-
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto
-	x11-libs/libXtst
-	sys-apps/findutils
-	app-misc/pax-utils
-	app-arch/unzip
-"
-
-EMULTILIB_PKG="true"
-
-S="${WORKDIR}"
-
-# QA Silencing
-QA_TEXTRELS="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/libatiadlxx.so
-	usr/lib*/xorg/modules/glesx.so
-	usr/lib*/libaticaldd.so
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_EXECSTACK="
-	opt/bin/atiode
-	opt/bin/amdcccle
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_WX_LOAD="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_PRESTRIPPED="
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\).so
-"
-
-QA_SONAME="
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
-"
-
-QA_DT_HASH="
-	opt/bin/amdcccle
-	opt/bin/aticonfig
-	opt/bin/atiodcli
-	opt/bin/atiode
-	opt/bin/clinfo
-	opt/bin/fglrxinfo
-	opt/sbin/atieventsd
-	opt/sbin/amdnotifyui
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libatiuki.so.1.0
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
-	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
-"
-
-pkg_setup() {
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	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
-
-	elog
-	elog "Please note that this driver only supports graphic cards based on"
-	elog "Evergreen chipset and newer."
-	elog "This includes the AMD Radeon HD 5400+ series at this moment."
-	elog
-	elog "If your card is older then use ${CATEGORY}/xf86-video-ati"
-	elog "For migration information please refer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	local DRIVERS_DISTFILE XVBA_SDK_DISTFILE
-	DRIVERS_DISTFILE=${DRIVERS_URI##*/}
-	XVBA_SDK_DISTFILE=${XVBA_SDK_URI##*/}
-
-	if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then
-		unpack ${DRIVERS_DISTFILE}
-	else
-		#please note, RUN may be insanely assigned at top near SRC_URI
-		if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then
-			unpack ${DRIVERS_DISTFILE}
-			[[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}"
-		else
-			RUN="${DISTDIR}/${DRIVERS_DISTFILE}"
-		fi
-		sh "${RUN}" --extract "${S}" 2>&1 > /dev/null || die
-	fi
-
-	mkdir xvba_sdk
-	cd xvba_sdk
-	unpack ${XVBA_SDK_DISTFILE}
-
-	mkdir -p "${WORKDIR}/extra" || die "mkdir extra failed"
-	cd "${WORKDIR}/extra"
-	tar -xf "../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz"
-}
-
-src_prepare() {
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
-		|| die "bin rm failed"
-
-        # amdcccle is shipped separately
-        rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle || die "cannot rm amdcccle"
-
-	# ACPI fixups
-	sed -i \
-		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-		-e "s:/var/lib/gdm/:/var/gdm/:" \
-		"${S}/${FOLDER_PREFIX}etc/ati/authatieventsd.sh" \
-		|| die "ACPI fixups failed."
-
-	# Since "who" is in coreutils, we're using that one instead of "finger".
-	sed -i -e 's:finger:who:' \
-		"${S}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-		|| die "Replacing 'finger' with 'who' failed."
-	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-	# add function to detect default state.
-	epatch "${FILESDIR}"/ati-powermode-opt-path-3.patch
-
-	# see http://ati.cchtml.com/show_bug.cgi?id=495
-	#epatch "${FILESDIR}"/ati-drivers-old_rsp.patch
-	# first hunk applied upstream second (x32 related) was not
-	epatch "${FILESDIR}"/ati-drivers-x32_something_something.patch
-
-	# compile fix for AGP-less kernel, bug #435322
-	epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch
-
-	# Compile fix for kernel typesafe uid types #469160
-	epatch "${FILESDIR}/typesafe-kuid.diff"
-
-	epatch "${FILESDIR}/ati-drivers-13.8-beta-include-seq_file.patch"
-
-	# Fix #483400
-	epatch "${FILESDIR}/fgl_glxgears-do-not-include-glATI.patch"
-
-	# Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870
-	use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch"
-}
-
-src_compile() {
-	ebegin "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}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-	eend $?
-}
-
-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" || die
-
-	# 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 && use multilib; 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/{glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	dobin "${ARCH_DIR}"/usr/bin/clinfo
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	exeinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,signature,amdpcsdb.default}
-	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
-
-	# include.
-	insinto /usr
-	doins -r ${FOLDER_PREFIX}usr/include
-	insinto /usr/include/X11/extensions
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin ${FOLDER_PREFIX}usr/sbin/*
-
-	# doc.
-	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
-
-	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
-
-	pushd ${FOLDER_PREFIX}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
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	# Gentoo-specific stuff:
-	newinitd "${FILESDIR}"/atieventsd.init atieventsd
-	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-	newconfd "${T}"/atieventsd.conf atieventsd
-
-	# PowerXpress stuff
-	exeinto /usr/$(get_libdir)/fglrx
-	doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
-	cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
-	doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
-}
-
-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"
-		local oclsuffix=64
-	else
-		local EX_BASE_DIR="${BASE_DIR}"
-		local pkglibdir=lib
-		local MY_ARCH_DIR="${S}/arch/x86"
-		local oclsuffix=32
-	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
-	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
-		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/fglrx/fglrx-libglx.so
-	mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
-
-	# other libs
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed some row above
-	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# AMD Cal and OpenCL libraries
-	exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
-	dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
-	exeinto /usr/$(get_libdir)
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
-
-	# OpenCL vendor files
-	insinto /etc/OpenCL/vendors/
-	cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
-		/usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so
-	EOF
-	doins "${T}"/amdocl${oclsuffix}.icd
-
-	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}"
-
-	# Silence the QA notice by creating missing soname symlinks
-	for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
-	do
-		local soname=${so##*/}
-		local soname_one=${soname%.[0-9]}
-		local soname_zero=${soname_one%.[0-9]}
-		dosym ${soname} /usr/$(get_libdir)/${soname_one}
-		dosym ${soname_one} /usr/$(get_libdir)/${soname_zero}
-	done
-
-	# See https://bugs.gentoo.org/show_bug.cgi?id=443466
-	dodir /etc/revdep-rebuild/
-	echo "SEARCH_DIRS_MASK=\"/opt/bin/clinfo\"" > "${ED}/etc/revdep-rebuild/62-ati-drivers"
-
-	#remove static libs if not wanted
-	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a
-
-	#install xvba sdk headers
-	doheader xvba_sdk/include/amdxvba.h
-
-	if use pax_kernel; then
-		pax-mark m "${D}"/usr/lib*/opengl/ati/lib/libGL.so.1.2 || die "pax-mark failed"
-	fi
-}
-
-pkg_postinst() {
-	elog "To switch to AMD 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 "Fully rebooting the system after an ${PN} update is recommended"
-	elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
-	elog "might not work"
-	elog
-	elog "Some cards need acpid running to handle events"
-	elog "Please add it to boot runlevel with rc-update add acpid boot"
-	elog
-
-	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
-	"${ROOT}"/usr/bin/eselect opencl set --use-old amd
-
-	if has_version "x11-drivers/xf86-video-intel[sna]"; then
-		ewarn "It is reported that xf86-video-intel built with USE=\"sna\" causes the X server"
-		ewarn "to crash on systems that use hybrid AMD/Intel graphics. If you experience"
-		ewarn "this crash, downgrade to xf86-video-intel-2.20.2 or earlier or"
-		ewarn "try disabling sna for xf86-video-intel."
-		ewarn "For details, see https://bugs.gentoo.org/show_bug.cgi?id=430000"
-	fi
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-userspace/ati-userspace-15.7.ebuild b/x11-drivers/ati-userspace/ati-userspace-15.7.ebuild
deleted file mode 100644
index 5663f751..00000000
--- a/x11-drivers/ati-userspace/ati-userspace-15.7.ebuild
+++ /dev/null
@@ -1,529 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit eutils multilib-build linux-info linux-mod toolchain-funcs versionator pax-utils
-
-DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-#RUN="${WORKDIR}/fglrx-14.501.1003/amd-driver-installer-14.501.1003-x86.x86_64.run"
-SLOT="1"
-# Uses javascript for download YESSSS
-#DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip"
-DRIVERS_URI="mirror://gentoo/amd-driver-installer-15.20.1046-x86.x86_64.zip"
-XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"
-SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
-FOLDER_PREFIX="common/"
-IUSE="debug static-libs pax_kernel +gdm-hack"
-
-LICENSE="AMD GPL-2 QPL-1.0"
-KEYWORDS="-* ~amd64 ~x86"
-
-RESTRICT="bindist test"
-
-RDEPEND="
-    <=x11-base/xorg-server-1.17.49[-minimal]
-    >=app-eselect/eselect-opengl-1.0.7
-    app-eselect/eselect-opencl
-    sys-power/acpid
-    x11-apps/xauth
-    !x11-libs/xvba-video
-    virtual/glu[${MULTILIB_USEDEP}]
-    x11-libs/libX11[${MULTILIB_USEDEP}]
-    x11-libs/libXext[${MULTILIB_USEDEP}]
-    x11-libs/libXinerama[${MULTILIB_USEDEP}]
-    x11-libs/libXrandr[${MULTILIB_USEDEP}]
-    x11-libs/libXrender[${MULTILIB_USEDEP}]
-    gdm-hack? (
-        x11-base/xorg-server:=
-    )
-"
-
-DEPEND="${RDEPEND}
-    x11-proto/inputproto
-    x11-proto/xf86miscproto
-    x11-proto/xf86vidmodeproto
-    x11-proto/xineramaproto
-    x11-libs/libXtst
-    sys-apps/findutils
-    app-misc/pax-utils
-    app-arch/unzip
-"
-
-EMULTILIB_PKG="true"
-
-S="${WORKDIR}"
-
-# QA Silencing
-QA_TEXTRELS="
-    usr/lib*/opengl/ati/lib/libGL.so.1.2
-    usr/lib*/libatiadlxx.so
-    usr/lib*/xorg/modules/glesx.so
-    usr/lib*/libaticaldd.so
-    usr/lib*/dri/fglrx_dri.so
-"
-
-QA_EXECSTACK="
-    opt/bin/atiode
-    usr/lib*/opengl/ati/lib/libGL.so.1.2
-    usr/lib*/dri/fglrx_dri.so
-"
-
-QA_WX_LOAD="
-    usr/lib*/opengl/ati/lib/libGL.so.1.2
-    usr/lib*/dri/fglrx_dri.so
-"
-
-QA_PRESTRIPPED="
-    usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-    usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-    usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-    usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-    usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-    usr/lib\(32\|64\)\?/libaticaldd.so
-    usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-    usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
-    usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\).so
-"
-
-QA_SONAME="
-    usr/lib\(32\|64\)\?/libatiadlxx.so
-    usr/lib\(32\|64\)\?/libaticalcl.so
-    usr/lib\(32\|64\)\?/libaticaldd.so
-    usr/lib\(32\|64\)\?/libaticalrt.so
-    usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
-    usr/lib\(32\|64\)\?/libamdhsasc\(32\|64\)\?.so
-"
-
-QA_DT_HASH="e
-    opt/bin/aticonfig
-    opt/bin/atiodcli
-    opt/bin/atiode
-    opt/bin/clinfo
-    opt/bin/fglrxinfo
-    opt/sbin/atieventsd
-    usr/lib\(32\|64\)\?/libaticalcl.so
-    usr/lib\(32\|64\)\?/libaticalrt.so
-    usr/lib\(32\|64\)\?/libatiuki.so.1.0
-    usr/lib\(32\|64\)\?/libatiadlxx.so
-    usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
-    usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-    usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-    usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
-    usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-    usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
-    usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
-    usr/lib\(32\|64\)\?/libaticaldd.so
-    usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-    usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-    usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
-    usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
-    usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-    usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so
-    usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
-"
-
-pkg_setup() {
-    MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/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_OUT_DIR}"
-    BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
-    if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
-        BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
-    else
-        BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
-    fi
-
-    # Define module dir.
-    MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
-    # get the xorg-server version and set BASE_DIR for that
-    BASE_DIR="${S}/xpic"
-
-    # amd64/x86
-    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
-
-    elog
-    elog "Please note that this driver only supports graphic cards based on"
-    elog "Evergreen chipset and newer."
-    elog "This includes the AMD Radeon HD 5400+ series at this moment."
-    elog
-    elog "If your card is older then use ${CATEGORY}/xf86-video-ati"
-    elog "For migration informations please refer to:"
-    elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-    einfo
-}
-
-src_unpack() {
-    local DRIVERS_DISTFILE XVBA_SDK_DISTFILE
-    DRIVERS_DISTFILE=${DRIVERS_URI##*/}
-    XVBA_SDK_DISTFILE=${XVBA_SDK_URI##*/}
-
-    if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then
-        unpack ${DRIVERS_DISTFILE}
-        mkdir -p common
-        mv etc lib usr common || die "Assumed to find etc lib and usr for common"
-    else
-        #please note, RUN may be insanely assigned at top near SRC_URI
-        if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then
-            unpack ${DRIVERS_DISTFILE}
-            [[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}"
-        else
-            RUN="${DISTDIR}/${DRIVERS_DISTFILE}"
-        fi
-        sh "${RUN}" --extract "${S}" 2>&1 > /dev/null || die
-    fi
-
-    mkdir xvba_sdk
-    cd xvba_sdk
-    unpack ${XVBA_SDK_DISTFILE}
-
-    mkdir -p "${WORKDIR}/extra" || die "mkdir extra failed"
-    cd "${WORKDIR}/extra"
-    tar -xf "../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz"
-}
-
-src_prepare() {
-    if use debug; then
-        sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-            "${MODULE_DIR}/firegl_public.c" \
-            || die "Failed to enable debug output."
-    fi
-
-    # These are the userspace utilities that we also have source for.
-    # We rebuild these later.
-    rm \
-        "${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
-        || die "bin rm failed"
-
-
-        # amdcccle is shipped separately
-        rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle || die "cannot rm amdcccle"
-
-    # ACPI fixups
-    sed -i \
-        -e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-        -e "s:/var/lib/gdm/:/var/gdm/:" \
-        "${S}/${FOLDER_PREFIX}etc/ati/authatieventsd.sh" \
-        || die "ACPI fixups failed."
-
-    # Since "who" is in coreutils, we're using that one instead of "finger".
-    sed -i -e 's:finger:who:' \
-        "${S}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-        || die "Replacing 'finger' with 'who' failed."
-    # Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-    # add function to detect default state.
-    epatch "${FILESDIR}"/ati-powermode-opt-path-3.patch
-
-    # see http://ati.cchtml.com/show_bug.cgi?id=495
-    #epatch "${FILESDIR}"/ati-drivers-old_rsp.patch
-    # first hunk applied upstream second (x32 related) was not
-    epatch "${FILESDIR}"/ati-drivers-x32_something_something.patch
-
-    # compile fix for AGP-less kernel, bug #435322
-    epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch
-
-    epatch "${FILESDIR}/ati-drivers-13.8-beta-include-seq_file.patch"
-
-    # Fix #483400
-    epatch "${FILESDIR}/fgl_glxgears-do-not-include-glATI.patch"
-
-    # Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870
-    use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch"
-
-    # Compile fix, #526602
-    epatch "${FILESDIR}/use-kernel_fpu_begin.patch"
-
-	epatch_user
-
-    cd "${MODULE_DIR}"
-
-    # bugged fglrx build system, this file should be copied by hand
-    cp ${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
-
-    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"
-}
-
-src_compile() {
-    ebegin "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}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
-        -lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-    eend $?
-}
-
-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" || die
-
-    # 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.
-    multilib_foreach_abi src_install-libs
-
-    # 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/{glesx.so,amdxmm.so}
-
-    #516816
-    if use gdm-hack; then
-        sed -i 's#/proc/%i/fd/0#/etc/ati/xvrn#g' "${D}/usr/$(get_libdir)/xorg/modules/drivers/fglrx_drv.so" || die "Applying gdm-hack failed"
-    fi
-
-    # Arch-specific files.
-    # (s)bin.
-    into /opt
-    dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-    dobin "${ARCH_DIR}"/usr/bin/clinfo
-    # We cleaned out the compilable stuff in src_unpack
-    dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-    # Common files.
-    # etc.
-    insinto /etc/ati
-    exeinto /etc/ati
-    # Everything except for the authatieventsd.sh script.
-    doins ${FOLDER_PREFIX}etc/ati/{logo*,control,signature,amdpcsdb.default}
-    doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
-
-    # include.
-    insinto /usr
-    doins -r ${FOLDER_PREFIX}usr/include
-    insinto /usr/include/X11/extensions
-
-    # Just the atigetsysteminfo.sh script.
-    into /usr
-    dosbin ${FOLDER_PREFIX}usr/sbin/*
-
-    # doc.
-    dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
-
-    doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
-
-    pushd ${FOLDER_PREFIX}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
-
-    # Done with the "source" tree. Install tools we rebuilt:
-    dobin extra/fgl_glxgears/fgl_glxgears
-    newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-    # Gentoo-specific stuff:
-    newinitd "${FILESDIR}"/atieventsd.init atieventsd
-    echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-    newconfd "${T}"/atieventsd.conf atieventsd
-
-    # PowerXpress stuff
-    exeinto /usr/$(get_libdir)/fglrx
-    doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
-    cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
-    doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
-
-    #516816
-    use gdm-hack && Xorg -version > "${D}/etc/ati/xvrn" 2>&1
-}
-
-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"
-        local oclsuffix=64
-    else
-        local EX_BASE_DIR="${BASE_DIR}"
-        local pkglibdir=lib
-        local MY_ARCH_DIR="${S}/arch/x86"
-        local oclsuffix=32
-    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
-    newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
-        libGL.so.${libver}
-    dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
-    dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
-
-    if multilib_is_native_abi; then
-        exeinto ${ATI_ROOT}/extensions
-        doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/fglrx/fglrx-libglx.so
-        mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
-
-        #516816
-        if use gdm-hack; then
-            sed -i 's#/proc/%i/fd/0#/etc/ati/xvrn#g' "${D}/${ATI_ROOT}/extensions/libglx.so" || die "Applying gdm-hack failed"
-        fi
-    fi
-
-    # other libs
-    exeinto /usr/$(get_libdir)
-    # Everything except for the libGL.so installed some row above
-    doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-        -maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
-    insinto /usr/$(get_libdir)
-    doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-        -maxdepth 1 -type f -not -name '*.so*')
-
-    # DRI modules, installed into the path used by recent versions of mesa.
-    exeinto /usr/$(get_libdir)/dri
-    doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-    # AMD Cal and OpenCL libraries
-    exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
-    doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
-    doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
-    dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
-    exeinto /usr/$(get_libdir)
-    doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
-
-    # OpenCL vendor files
-    insinto /etc/OpenCL/vendors/
-    echo "/usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so" > "${T}"/amdocl${oclsuffix}.icd
-
-    doins "${T}"/amdocl${oclsuffix}.icd
-
-    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}"
-
-    # Silence the QA notice by creating missing soname symlinks
-    for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
-    do
-        local soname=${so##*/}
-        local soname_one=${soname%.[0-9]}
-        local soname_zero=${soname_one%.[0-9]}
-        dosym ${soname} /usr/$(get_libdir)/${soname_one}
-        dosym ${soname_one} /usr/$(get_libdir)/${soname_zero}
-    done
-
-    # See https://bugs.gentoo.org/show_bug.cgi?id=443466
-    dodir /etc/revdep-rebuild/
-    echo "SEARCH_DIRS_MASK=\"/opt/bin/clinfo\"" > "${ED}/etc/revdep-rebuild/62-ati-drivers"
-
-    #remove static libs if not wanted
-    use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a
-
-    #install xvba sdk headers
-    doheader xvba_sdk/include/amdxvba.h
-
-    # VA-API internal wrapper
-    dosym /usr/$(get_libdir)/libXvBAW.so.1.0 /usr/$(get_libdir)/va/drivers/fglrx_drv_video.so
-
-    if use pax_kernel; then
-        pax-mark m "${D}"/usr/lib*/opengl/ati/lib/libGL.so.1.2 || die "pax-mark failed"
-    fi
-}
-
-
-pkg_postinst() {
-    elog "To switch to AMD 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 "Fully rebooting the system after an ${PN} update is recommended"
-    elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
-    elog "might not work"
-    elog
-    elog "Some cards need acpid running to handle events"
-    elog "Please add it to boot runlevel with rc-update add acpid boot"
-    elog
-
-    "${ROOT}"/usr/bin/eselect opengl set --use-old ati
-    "${ROOT}"/usr/bin/eselect opencl set --use-old amd
-
-    if has_version "x11-drivers/xf86-video-intel[sna]"; then
-        ewarn "It is reported that xf86-video-intel built with USE=\"sna\" causes the X server"
-        ewarn "to crash on systems that use hybrid AMD/Intel graphics. If you experience"
-        ewarn "this crash, downgrade to xf86-video-intel-2.20.2 or earlier or"
-        ewarn "try disabling sna for xf86-video-intel."
-        ewarn "For details, see https://bugs.gentoo.org/show_bug.cgi?id=430000"
-    fi
-
-    if use pax_kernel; then
-        ewarn "Please run \"revdep-pax -s libGL.so.1 -me\" after installation and"
-        ewarn "after you have run \"eselect opengl set ati\". Executacle"
-        ewarn "revdep-pax is part of package sys-apps/elfix."
-    fi
-}
-
-pkg_prerm() {
-    "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-    "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-userspace/files/amd-drivers-3.2.7.1.patch b/x11-drivers/ati-userspace/files/amd-drivers-3.2.7.1.patch
deleted file mode 100644
index 104c8788..00000000
--- a/x11-drivers/ati-userspace/files/amd-drivers-3.2.7.1.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -5797,10 +5797,16 @@ void ATI_API_CALL KCL_fpu_begin(void)
- #ifdef CONFIG_X86_64
-     kernel_fpu_begin();
- #else
-+#ifndef TS_USEDFPU
-+    preempt_disable();
-+    if (__thread_has_fpu(current))
-+        __save_init_fpu(current);
-+#else
-     struct thread_info *cur_task = current_thread_info();
-     preempt_disable();
-     if (cur_task->status & TS_USEDFPU)
-         __save_init_fpu(cur_task->task);
-+#endif
-     else
-         clts();
- #endif
diff --git a/x11-drivers/ati-userspace/files/ati-drivers-12.2-redefine-WARN.patch b/x11-drivers/ati-userspace/files/ati-drivers-12.2-redefine-WARN.patch
deleted file mode 100644
index f4fab432..00000000
--- a/x11-drivers/ati-userspace/files/ati-drivers-12.2-redefine-WARN.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- common/lib/modules/fglrx/build_mod/kcl_debug.h.orig	2012-03-08 19:30:38.195025328 +0100
-+++ common/lib/modules/fglrx/build_mod/kcl_debug.h	2012-03-08 19:31:24.976024507 +0100
-@@ -85,8 +85,8 @@
- #ifdef ERROR
- #undef ERROR
- #endif
--#ifdef WARN
--#undef WARN
-+#ifdef AMD_WARN
-+#undef AMD_WARN
- #endif
- #ifdef INFO
- #undef INFO
-@@ -122,7 +122,7 @@
- {
-     SPECIAL = 0,
-     ERROR  ,
--    WARN  ,
-+    AMD_WARN  ,
-     INFO ,
-     INFOEX,
-     TRACE,
-@@ -160,7 +160,7 @@
- }log_map;
- 
- 
--#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(ERROR) |___BIT(WARN) | ___BIT(TRACE)| ___BIT(SPECIAL)  ))
-+#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(ERROR) |___BIT(AMD_WARN) | ___BIT(TRACE)| ___BIT(SPECIAL)  ))
- #define INFO_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX)))
- extern const log_map module_log_map[];
- extern const module_map module_type_map[];
---- common/lib/modules/fglrx/build_mod/kcl_debug.c.orig	2012-03-08 19:36:18.244019310 +0100
-+++ common/lib/modules/fglrx/build_mod/kcl_debug.c	2012-03-08 19:36:36.197018973 +0100
-@@ -69,7 +69,7 @@
- {
-     {SPECIAL        ,   'S'},
-     {ERROR          ,   'E'},
--    {WARN           ,   'W'},
-+    {AMD_WARN           ,   'W'},
-     {INFO           ,   'I'},
-     {INFOEX         ,   'X'},
-     {TRACE          ,   'T'},
diff --git a/x11-drivers/ati-userspace/files/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch b/x11-drivers/ati-userspace/files/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch
deleted file mode 100644
index 0ea461b8..00000000
--- a/x11-drivers/ati-userspace/files/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Vasiliy Yeremeyev <vayerx@gmail.com>
-Date: Sun, 4 Nov 2012 23:59:36 +0400
-Subject: [PATCH] KCL_AGP_FindCapsRegisters stub for AGP-less systems
-
----
- common/lib/modules/fglrx/build_mod/kcl_agp.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/common/lib/modules/fglrx/build_mod/kcl_agp.c b/common/lib/modules/fglrx/build_mod/kcl_agp.c
-index b9c0655..cb1902b 100644
---- a/common/lib/modules/fglrx/build_mod/kcl_agp.c
-+++ b/common/lib/modules/fglrx/build_mod/kcl_agp.c
-@@ -479,6 +479,11 @@ int ATI_API_CALL KCL_AGP_Enable(unsigned long mode)
-     return -EINVAL;
- }
- 
-+int ATI_API_CALL KCL_AGP_FindCapsRegisters(KCL_PCI_DevHandle dev)
-+{
-+    return -EINVAL;
-+}
-+
- int ATI_API_CALL KCL_AGP_ReadCapsRegisters(KCL_PCI_DevHandle dev, unsigned int *caps)
- {
-     return -EINVAL;
--- 
-1.7.12
-
diff --git a/x11-drivers/ati-userspace/files/ati-drivers-13.12-acpi.patch b/x11-drivers/ati-userspace/files/ati-drivers-13.12-acpi.patch
deleted file mode 100644
index 3c568742..00000000
--- a/x11-drivers/ati-userspace/files/ati-drivers-13.12-acpi.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -urN common.old/lib/modules/fglrx/build_mod/kcl_acpi.c common/lib/modules/fglrx/build_mod/kcl_acpi.c
---- common.old/lib/modules/fglrx/build_mod/kcl_acpi.c	2013-12-27 13:32:34.734832283 +0100
-+++ common/lib/modules/fglrx/build_mod/kcl_acpi.c	2013-12-27 13:33:31.849831765 +0100
-@@ -1002,7 +1002,11 @@
- #endif
-     {
-         return KCL_ACPI_ERROR;
--    }    
-+    }
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)
-+    ((acpi_tbl_table_handler)handler)(hdr);
-+#else
-     ((acpi_table_handler)handler)(hdr);
-+#endif
-     return KCL_ACPI_OK;
- }
diff --git a/x11-drivers/ati-userspace/files/ati-drivers-13.6-linux-3.10-proc.diff b/x11-drivers/ati-userspace/files/ati-drivers-13.6-linux-3.10-proc.diff
deleted file mode 100644
index bdb22eae..00000000
--- a/x11-drivers/ati-userspace/files/ati-drivers-13.6-linux-3.10-proc.diff
+++ /dev/null
@@ -1,356 +0,0 @@
-diff --git a/common/lib/modules/fglrx/build_mod/drmP.h b/common/lib/modules/fglrx/build_mod/drmP.h
-index 81546b2..4e74526 100755
---- a/common/lib/modules/fglrx/build_mod/drmP.h
-+++ b/common/lib/modules/fglrx/build_mod/drmP.h
-@@ -901,10 +901,6 @@ int                   DRM(stub_register)(const char *name,
- int                   DRM(stub_unregister)(int minor);
- 
- 				/* Proc support (drm_proc.h) */
--extern struct proc_dir_entry *DRM(proc_init)(drm_device_t *dev,
--					     int minor,
--					     struct proc_dir_entry *root,
--					     struct proc_dir_entry **dev_root);
- extern int            DRM(proc_cleanup)(int minor,
- 					struct proc_dir_entry *root,
- 					struct proc_dir_entry *dev_root);
-diff --git a/common/lib/modules/fglrx/build_mod/drm_proc.h b/common/lib/modules/fglrx/build_mod/drm_proc.h
-index 1e3ab4a..c52ad7e 100755
---- a/common/lib/modules/fglrx/build_mod/drm_proc.h
-+++ b/common/lib/modules/fglrx/build_mod/drm_proc.h
-@@ -75,61 +75,6 @@ struct drm_proc_list {
- #define DRM_PROC_ENTRIES (sizeof(DRM(proc_list))/sizeof(DRM(proc_list)[0]))
- 
- /**
-- * Initialize the DRI proc filesystem for a device.
-- *
-- * \param dev DRM device.
-- * \param minor device minor number.
-- * \param root DRI proc dir entry.
-- * \param dev_root resulting DRI device proc dir entry.
-- * \return root entry pointer on success, or NULL on failure.
-- * 
-- * Create the DRI proc root entry "/proc/ati", the device proc root entry
-- * "/proc/ati/%minor%/", and each entry in proc_list as
-- * "/proc/ati/%minor%/%name%".
-- */
--struct proc_dir_entry *DRM(proc_init)(drm_device_t *dev, int minor,
--				      struct proc_dir_entry *root,
--				      struct proc_dir_entry **dev_root)
--{
--	struct proc_dir_entry *ent;
--	int		      i, j;
--	char                  name[64];
--
--	if (!minor) root = create_proc_entry("dri", S_IFDIR, NULL);
--	if (!root) {
--		DRM_ERROR("Cannot create /proc/ati\n");
--		return NULL;
--	}
--
--	sprintf(name, "%d", minor);
--	*dev_root = create_proc_entry(name, S_IFDIR, root);
--	if (!*dev_root) {
--		DRM_ERROR("Cannot create /proc/ati/%s\n", name);
--		return NULL;
--	}
--
--	for (i = 0; i < DRM_PROC_ENTRIES; i++) {
--		ent = create_proc_entry(DRM(proc_list)[i].name,
--					S_IFREG|S_IRUGO, *dev_root);
--		if (!ent) {
--			DRM_ERROR("Cannot create /proc/ati/%s/%s\n",
--				  name, DRM(proc_list)[i].name);
--			for (j = 0; j < i; j++)
--				remove_proc_entry(DRM(proc_list)[i].name,
--						  *dev_root);
--			remove_proc_entry(name, root);
--			if (!minor) remove_proc_entry("dri", NULL);
--			return NULL;
--		}
--		ent->read_proc = DRM(proc_list)[i].f;
--		ent->data      = dev;
--	}
--
--	return root;
--}
--
--
--/**
-  * Cleanup the proc filesystem resources.
-  *
-  * \param minor device minor number.
-diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
-index d3ad3ce..890a0aa 100755
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -583,6 +583,202 @@ kcl_proc_list_t KCL_PROC_FileList[] =
-     { "NULL",           NULL,                       NULL} // Terminate List!!!
- };
- 
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
-+typedef int (read_proc_t)(char *page, char **start, off_t off, int count, int *eof, void *data);
-+typedef int (write_proc_t)(struct file *file, const char __user *buffer, unsigned long count, void *data);
-+#else
-+#define PDE_DATA(inode) (PDE((inode))->data)
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
-+typedef struct {
-+	read_proc_t *read_func;
-+	write_proc_t *write_func;
-+	void *data;
-+} gentoo_proc_wrapper_t;
-+
-+#define GENTOO_PROC_WRAPPER_OVERFLOW_MAGIC 939750305
-+
-+static ssize_t gentoo_proc_wrapper_read (struct file *myfile, char __user *buffer, size_t count, loff_t *offset) {
-+	int is_eof=0, retval;
-+	char *start, *usebuffer=NULL;
-+	gentoo_proc_wrapper_t* wrapper_data=(gentoo_proc_wrapper_t*)(myfile->private_data);
-+	if (PAGE_SIZE<*offset) {
-+		printk(KERN_ERR "Trying to read beyond 4k on proc\n");
-+		return -EIO;
-+	}
-+	//printk(KERN_NOTICE " call with: dev %p, func %p\n", wrapper_data->data, wrapper_data->read_func);
-+
-+	usebuffer=kmalloc(2*PAGE_SIZE, GFP_KERNEL);
-+	if (!usebuffer)
-+		return -ENOMEM;
-+	((u32*)usebuffer)[1024]=GENTOO_PROC_WRAPPER_OVERFLOW_MAGIC;
-+
-+	retval=wrapper_data->read_func(usebuffer, &start, *offset, count, &is_eof, wrapper_data->data);
-+
-+	BUG_ON(GENTOO_PROC_WRAPPER_OVERFLOW_MAGIC != ((u32*)usebuffer)[1024]);
-+
-+	if (0 > retval)
-+	{
-+		printk(KERN_ERR "Proc read failed with %d", retval);
-+		goto out;
-+	}
-+
-+	if (copy_to_user(buffer, start, retval)) {
-+		printk(KERN_NOTICE "copy to user failed in amd drivers proc code\n");
-+		retval=-EFAULT;
-+		goto out;
-+	}
-+	*offset+=retval;
-+
-+out:
-+	if (usebuffer)
-+		kfree(usebuffer);
-+	return retval;
-+}
-+static ssize_t gentoo_proc_wrapper_write (struct file *myfile, const char __user *buffer, size_t count, loff_t *offset) {
-+	gentoo_proc_wrapper_t* wrapper_data=(gentoo_proc_wrapper_t*)(myfile->private_data);
-+	int retval=0;
-+	void *usebuffer=NULL;
-+
-+	BUG_ON(*offset);
-+	if (!wrapper_data->write_func)
-+		return -EPERM;
-+
-+	usebuffer=kmalloc(count, GFP_KERNEL);
-+	if (!usebuffer)
-+		return -ENOMEM;
-+	if (copy_from_user(usebuffer, buffer, count)) {
-+		printk(KERN_NOTICE "copy from user failed in amd drivers proc code\n");
-+		retval=-EFAULT;
-+		goto out;
-+	}
-+
-+	retval=wrapper_data->write_func(myfile, buffer, count, wrapper_data->data);
-+	*offset+=retval;
-+out:
-+	if (usebuffer)
-+		kfree(usebuffer);
-+	return retval;
-+}
-+static int gentoo_proc_wrapper_open(struct inode *myinode, struct file *myfile) {
-+	myfile->private_data=PDE_DATA(myinode);
-+	return generic_file_open(myinode, myfile);
-+}
-+struct file_operations gentoo_proc_fops = {
-+	.read=gentoo_proc_wrapper_read,
-+	.write=gentoo_proc_wrapper_write,
-+	.open=gentoo_proc_wrapper_open,
-+};
-+
-+static void *gentoo_proc_wrapper_data(read_proc_t *reader, write_proc_t *writer, void *mydata) {
-+	gentoo_proc_wrapper_t *retval=kmalloc(sizeof(gentoo_proc_wrapper_t), GFP_KERNEL);
-+	if (!retval)
-+		return retval;
-+	retval->read_func=reader;
-+	retval->write_func=writer;
-+	retval->data=mydata;
-+	return retval;
-+}
-+
-+static struct proc_dir_entry *firegl_proc_init( device_t *dev,
-+                                                int minor,
-+                                                struct proc_dir_entry *root,
-+                                                struct proc_dir_entry **dev_root,
-+                                                kcl_proc_list_t *proc_list ) // proc_list must be terminated!
-+{
-+    struct proc_dir_entry *ent;
-+    char    name[64];
-+    kcl_proc_list_t *list = proc_list;
-+	void *tempdata;
-+    KCL_DEBUG1(FN_FIREGL_PROC, "minor %d, proc_list 0x%08lx\n", minor, (unsigned long)proc_list);
-+    if (!minor)
-+    {
-+        root = proc_mkdir("ati", NULL);
-+    }
-+
-+    if (!root)
-+    {
-+        KCL_DEBUG_ERROR("Cannot create /proc/ati\n");
-+        return NULL;
-+    }
-+
-+    if (minor == 0)
-+    {
-+        // Global major debice number entry
-+		tempdata=gentoo_proc_wrapper_data((read_proc_t*)firegl_major_proc_read, NULL, NULL);
-+		if (!tempdata)
-+			return NULL;
-+        ent = proc_create_data("major", S_IFREG|S_IRUGO, root, &gentoo_proc_fops, tempdata);
-+        if (!ent)
-+        {
-+            remove_proc_entry("ati", NULL);
-+            KCL_DEBUG_ERROR("Cannot create /proc/ati/major\n");
-+            return NULL;
-+        }
-+    }
-+
-+    sprintf(name, "%d", minor);
-+    *dev_root = proc_mkdir(name, root);
-+    if (!*dev_root) {
-+        remove_proc_entry("major", root);
-+        remove_proc_entry("ati", NULL);
-+        KCL_DEBUG_ERROR("Cannot create /proc/ati/%s\n", name);
-+        return NULL;
-+    }
-+
-+    while (list->f || list->fops)
-+    {
-+		struct file_operations *my_fops = &gentoo_proc_fops;
-+        if (list->fops)
-+        {
-+            my_fops = (struct file_operations*)list->fops;
-+			tempdata=(dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev);
-+        }
-+		else {
-+			BUG_ON(!list->f);
-+			tempdata=gentoo_proc_wrapper_data((read_proc_t*)list->f, NULL, (dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev) );
-+			if (!tempdata)
-+				return NULL;
-+		}
-+		//printk(KERN_NOTICE "name %s, dev %p, func %p, data %p\n", list->name, (dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev), list->f, tempdata);
-+        ent = proc_create_data(list->name, S_IFREG|S_IRUGO, *dev_root, my_fops, tempdata);
-+
-+        if (!ent)
-+        {
-+            KCL_DEBUG_ERROR("Cannot create /proc/ati/%s/%s\n", name, list->name);
-+            while (proc_list != list)
-+            {
-+                remove_proc_entry(proc_list->name, *dev_root);
-+                proc_list++;
-+            }
-+            remove_proc_entry(name, root);
-+            if (!minor)
-+            {
-+                remove_proc_entry("major", root);
-+                remove_proc_entry("ati", NULL);
-+            }
-+            return NULL;
-+        }
-+
-+        list++;
-+    }
-+
-+    if (minor == 0)
-+    {
-+        // Global debug entry, only create it once
-+		tempdata=gentoo_proc_wrapper_data((read_proc_t*)firegl_debug_proc_read_wrap, (write_proc_t*)firegl_debug_proc_write_wrap, dev);
-+		if (!tempdata)
-+			return NULL;
-+        ent=proc_create_data("debug", S_IFREG|S_IRUGO, root, &gentoo_proc_fops, tempdata);
-+		if (!ent)
-+			return NULL;
-+    }
-+
-+    return root;
-+}
-+#else
- static struct proc_dir_entry *firegl_proc_init( device_t *dev,
-                                                 int minor,
-                                                 struct proc_dir_entry *root,
-@@ -677,6 +873,7 @@ static struct proc_dir_entry *firegl_proc_init( device_t *dev,
- 
-     return root;
- }
-+#endif
- 
- static int firegl_proc_cleanup( int minor,
-                                 struct proc_dir_entry *root,
-@@ -6135,59 +6332,4 @@ void ATI_API_CALL KCL_fpu_end(void)
-     kernel_fpu_end();
- }
- 
--/** Create new directory entry under "/proc/ati/...."
-- * Where
-- * root_dir - Root directory. If NULL then we should use "/proc/ati" root.
-- * name    - Pointer to the name of directory
-- * access  - Access attribute. We could use it to disable access to the directory for everybody accept owner.
-- *                By default owner is root.
-- * Return NULL if failure. Pointer to proc_dir_entry otherwise
-- */
--void * KCL_create_proc_dir(void *root_dir, const char *name, unsigned int access)
--{
--    struct proc_dir_entry *dir = NULL;
--
--    if (root_dir == NULL)
--         dir = create_proc_entry(name, S_IFDIR | access, firegl_stub_root);
--    else
--         dir = create_proc_entry(name, S_IFDIR | access, (struct proc_dir_entry *)root_dir);
--
--    return dir;
--}
--
--/* Remove proc directory entry
-- * root   - Pointer to directory proc entry or NULL if for "/proc/ati"
-- * name - Name to delete
-- */
--void KCL_remove_proc_dir_entry(void *root, const char *name)
--{
--    if (root == NULL)
--        remove_proc_entry(name, firegl_stub_root);
--    else
--        remove_proc_entry(name, (struct proc_dir_entry *)root);
--}
--
--
--/* Create proc_entry under "root_dir"
-- * read_fn - Function which will be called on read request
-- * write_fn - Function which will be called on write request
-- * private_data - Pointer to private data which will be passed
-- */
--void KCL_create_proc_entry(void *root_dir, const char *name, unsigned int access_mode, void *read_fn, void *write_fn, void *private_data)
--{
--    struct proc_dir_entry *ent = NULL;
--
--    if (root_dir == NULL || name == NULL)
--        return;
--
--    ent = create_proc_entry(name, access_mode, (struct proc_dir_entry *)root_dir);
--
--    if (ent)
--    {
--        ent->read_proc = (read_proc_t *)read_fn;    
--        ent->write_proc = (write_proc_t *)write_fn; 
--        ent->data = private_data;
--    }
--}
--
- #endif /* __KERNEL__ */
diff --git a/x11-drivers/ati-userspace/files/ati-drivers-13.8-beta-include-seq_file.patch b/x11-drivers/ati-userspace/files/ati-drivers-13.8-beta-include-seq_file.patch
deleted file mode 100644
index fb1ba17e..00000000
--- a/x11-drivers/ati-userspace/files/ati-drivers-13.8-beta-include-seq_file.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
-index 22561c5..fdfe65e 100755
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -520,6 +520,8 @@ static int func##_wrap(char *buf, char **start, kcl_off_t offset,       \
- }
- 
- #else
-+#include <linux/seq_file.h>
-+
- #define READ_PROC_WRAP(func)                                            \
- static int func##_wrap(struct seq_file *m, void* data)                  \
- {                                                                       \
diff --git a/x11-drivers/ati-userspace/files/ati-drivers-13.8-mesa-9.2-debug.patch b/x11-drivers/ati-userspace/files/ati-drivers-13.8-mesa-9.2-debug.patch
deleted file mode 100644
index 8a15e0af..00000000
--- a/x11-drivers/ati-userspace/files/ati-drivers-13.8-mesa-9.2-debug.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- work.orig/common/usr/include/GL/glATI.h
-+++ work/common/usr/include/GL/glATI.h
-@@ -6006,6 +6006,7 @@ typedef GLvoid (APIENTRY * PFNGLDEBUGMES
- typedef GLvoid (APIENTRY * PFNGLDEBUGMESSAGECALLBACKARB)(GLvoid* callback, GLvoid* userParam);
- typedef GLuint (APIENTRY * PFNGLGETDEBUGMESSAGELOGARB)(GLuint count, GLsizei bufsize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, GLchar* messageLog);
- 
-+#if 0
- typedef void (APIENTRY *GLDEBUGPROCARB)(GLenum source,
-                                         GLenum type,
-                                         GLuint id,
-@@ -6014,6 +6015,7 @@ typedef void (APIENTRY *GLDEBUGPROCARB)(
-                                         const GLchar* message,
-                                         GLvoid* userParam);
- // end ARB_debug_output
-+#endif
- 
- 
- /* ARB_debug_group (KHR_debug) */
diff --git a/x11-drivers/ati-userspace/files/ati-drivers-13.8-proc-permissions.diff b/x11-drivers/ati-userspace/files/ati-drivers-13.8-proc-permissions.diff
deleted file mode 100644
index 26015f41..00000000
--- a/x11-drivers/ati-userspace/files/ati-drivers-13.8-proc-permissions.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
-index 22561c5..6480d1a 100755
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -821,7 +821,7 @@ static struct proc_dir_entry *firegl_proc_init( device_t *dev,
-     KCL_DEBUG1(FN_FIREGL_PROC, "minor %d, proc_list 0x%08lx\n", minor, (unsigned long)proc_list);
-     if (!minor)
-     {
--        root = KCL_create_proc_dir(NULL, "ati", S_IFDIR);
-+        root = KCL_create_proc_dir(NULL, "ati", S_IFDIR|S_IRUGO|S_IXUGO);
-     }
- 
-     if (!root)
diff --git a/x11-drivers/ati-userspace/files/ati-drivers-2.6.33.patch b/x11-drivers/ati-userspace/files/ati-drivers-2.6.33.patch
deleted file mode 100644
index 85f9aff7..00000000
--- a/x11-drivers/ati-userspace/files/ati-drivers-2.6.33.patch
+++ /dev/null
@@ -1,140 +0,0 @@
---- work.orig/common/lib/modules/fglrx/build_mod/drmP.h
-+++ work/common/lib/modules/fglrx/build_mod/drmP.h
-@@ -42,7 +42,11 @@
-  * can build the DRM (part of PI DRI). 4/21/2000 S + B */
- #include <asm/current.h>
- #endif /* __alpha__ */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/miscdevice.h>
---- work.orig/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ work/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -28,7 +28,11 @@
- #error Kernel versions older than 2.6.0 are no longer supported by this module.
- #endif 
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- 
- #if !defined(CONFIG_X86) 
- #if !defined(CONFIG_X86_PC) 
-@@ -163,8 +167,12 @@
- 
- //  For 2.6.18 or higher, the UTS_RELEASE is defined in the linux/utsrelease.h. 
- #ifndef UTS_RELEASE 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/utsrelease.h>
-+#else
- #include <linux/utsrelease.h>
- #endif
-+#endif
- 
- #if defined(__i386__)
- #ifndef do_div
---- work.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c
-+++ work/common/lib/modules/fglrx/build_mod/kcl_acpi.c
-@@ -15,7 +15,11 @@
-  ****************************************************************************/
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/acpi.h>
- 
- #include "kcl_config.h"
---- work.orig/common/lib/modules/fglrx/build_mod/kcl_agp.c
-+++ work/common/lib/modules/fglrx/build_mod/kcl_agp.c
-@@ -31,7 +31,11 @@
-  */
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/pci.h>
- #include <linux/agp_backend.h>
- #include <linux/string.h>
---- work.orig/common/lib/modules/fglrx/build_mod/kcl_io.c
-+++ work/common/lib/modules/fglrx/build_mod/kcl_io.c
-@@ -37,7 +37,11 @@
-  */
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/poll.h>
- #include <linux/signal.h>
- #include <asm/io.h>
---- work.orig/common/lib/modules/fglrx/build_mod/kcl_osconfig.h
-+++ work/common/lib/modules/fglrx/build_mod/kcl_osconfig.h
-@@ -20,7 +20,11 @@
- #define KCL_OSCONFIG_H
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- 
- // Choose modern way to call 32-on-64 IOCTLs if configured in the kernel
- #if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
---- work.orig/common/lib/modules/fglrx/build_mod/kcl_pci.c
-+++ work/common/lib/modules/fglrx/build_mod/kcl_pci.c
-@@ -31,7 +31,11 @@
-  */
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/pci.h>
- 
- #include "kcl_config.h"
---- work.orig/common/lib/modules/fglrx/build_mod/kcl_str.c
-+++ work/common/lib/modules/fglrx/build_mod/kcl_str.c
-@@ -30,7 +30,12 @@
-  *
-  */
- 
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/string.h>
- #include <linux/module.h>
- 
---- work.orig/common/lib/modules/fglrx/build_mod/kcl_wait.c
-+++ work/common/lib/modules/fglrx/build_mod/kcl_wait.c
-@@ -31,7 +31,11 @@
-  */
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/wait.h>
- #include <linux/highmem.h>
- #include <linux/sched.h>
diff --git a/x11-drivers/ati-userspace/files/ati-drivers-2.6.34.patch b/x11-drivers/ati-userspace/files/ati-drivers-2.6.34.patch
deleted file mode 100644
index 1993d134..00000000
--- a/x11-drivers/ati-userspace/files/ati-drivers-2.6.34.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- work.orig/common/lib/modules/fglrx/build_mod/kcl_wait.c	2010-04-13 20:02:46.494496561 +0200
-+++ work/common/lib/modules/fglrx/build_mod/kcl_wait.c	2010-04-13 19:52:00.054563389 +0200
-@@ -39,6 +39,7 @@
- #include <linux/wait.h>
- #include <linux/highmem.h>
- #include <linux/sched.h>
-+#include <linux/slab.h>
-
- #include "kcl_config.h"
- #include "kcl_wait.h"
diff --git a/x11-drivers/ati-userspace/files/ati-drivers-2.6.35-and-newer.patch b/x11-drivers/ati-userspace/files/ati-drivers-2.6.35-and-newer.patch
deleted file mode 100644
index e1703f34..00000000
--- a/x11-drivers/ati-userspace/files/ati-drivers-2.6.35-and-newer.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- work.orig/common/lib/modules/fglrx/build_mod/kcl_ioctl.c	2010-09-19 11:45:04.922760268 +0200
-+++ work/common/lib/modules/fglrx/build_mod/kcl_ioctl.c	2010-09-19 12:04:29.092812959 +0200
-@@ -193,7 +193,7 @@ void ATI_API_CALL KCL_IOCTL_UnregisterCo
-  */
- void* ATI_API_CALL KCL_IOCTL_AllocUserSpace32(long size)
- {
--    return compat_alloc_user_space(size);
-+    return arch_compat_alloc_user_space(size);
- }
- 
- #endif // __x86_64__
diff --git a/x11-drivers/ati-userspace/files/ati-drivers-2.6.36.patch b/x11-drivers/ati-userspace/files/ati-drivers-2.6.36.patch
deleted file mode 100644
index 5f8f5845..00000000
--- a/x11-drivers/ati-userspace/files/ati-drivers-2.6.36.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- work.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-08-20 21:51:48.000000000 +0200
-+++ work/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-08-20 23:46:37.000000000 +0200
-@@ -320,7 +320,11 @@
-     return firegl_release((KCL_IO_FILE_Handle)filp);
- }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
-+int ip_firegl_ioctl(struct file* filp, unsigned int cmd, unsigned long arg)
-+#else
- int ip_firegl_ioctl(struct inode* inode, struct file* filp, unsigned int cmd, unsigned long arg)
-+#endif
- {
-     return firegl_ioctl((KCL_IO_FILE_Handle)filp, cmd, arg);
- }
-@@ -407,7 +411,11 @@
- #endif
-     open:    ip_firegl_open,
-     release: ip_firegl_release,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
-+    unlocked_ioctl:   ip_firegl_ioctl,
-+#else
-     ioctl:   ip_firegl_ioctl,
-+#endif
-     mmap:    ip_firegl_mmap,
- 
-     write:   ip_firegl_write,
diff --git a/x11-drivers/ati-userspace/files/ati-drivers-2.6.37.patch b/x11-drivers/ati-userspace/files/ati-drivers-2.6.37.patch
deleted file mode 100644
index 75522b41..00000000
--- a/x11-drivers/ati-userspace/files/ati-drivers-2.6.37.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- work.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-08-20 21:51:48.000000000 +0200
-+++ work/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-08-20 23:46:37.000000000 +0200
-@@ -5094,7 +5094,7 @@
- unsigned int ATI_API_CALL KAS_Mutex_Initialize(void* hMutex)
- {
-     kasMutex_t* mutex_obj = (kasMutex_t*)hMutex;
--    init_MUTEX(&(mutex_obj->mutex));
-+    sema_init(&(mutex_obj->mutex),1);
-     return 1;
- }
- 
diff --git a/x11-drivers/ati-userspace/files/ati-drivers-2.6.38.patch b/x11-drivers/ati-userspace/files/ati-drivers-2.6.38.patch
deleted file mode 100644
index 1ecafece..00000000
--- a/x11-drivers/ati-userspace/files/ati-drivers-2.6.38.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Description: Add Linux 2.6.38 support
- The following commit renamed acquire_console_sem to console_lock and
- release_console_sem to console_unlock on the Linux kernel:
- http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=ac751efa6a0d70f2c9daef5c7e3a92270f5c2dff
-Author: Miguel Colon <debian.micove@gmail.com>
-Forwarded: no
-Last-Update: 2011-02-01
-
---- fglrx-driver-11-1.orig/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ fglrx-driver-11-1/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -850,7 +850,12 @@ static int fglrx_pci_suspend(struct pci_
-      * happen much less frequent then without this workaround.
-      */
-     if (state == PM_EVENT_SUSPEND)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
-+        console_lock();
-+#else
-         acquire_console_sem();
-+#endif
-+
- 
-     if (firegl_cail_powerdown(privdev, state))
-         ret = -EIO;
-@@ -872,7 +877,11 @@ static int fglrx_pci_suspend(struct pci_
-     }
- 
-     if (state == PM_EVENT_SUSPEND)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
-+        console_unlock();
-+#else
-         release_console_sem();
-+#endif
- 
-     KCL_DEBUG_TRACEOUT(FN_FIREGL_ACPI, ret, NULL);  
-     
-@@ -896,7 +905,11 @@ static int fglrx_pci_resume(struct pci_d
-     if (PMSG_EVENT(pdev->dev.power.power_state) == 0) return 0;
- 
-     if (PMSG_EVENT(pdev->dev.power.power_state) == PM_EVENT_SUSPEND)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
-+        console_lock();
-+#else
-         acquire_console_sem();
-+#endif
- 
- #ifdef FIREGL_USWC_SUPPORT
-     // Restore the PAT after resuming from S3 or S4.
-@@ -921,7 +934,11 @@ static int fglrx_pci_resume(struct pci_d
-     firegl_cail_powerup(privdev);
- 
-     if (PMSG_EVENT(pdev->dev.power.power_state) == PM_EVENT_SUSPEND)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
-+        console_unlock();
-+#else
-         release_console_sem();
-+#endif
- 
-     PMSG_EVENT(pdev->dev.power.power_state) = 0;
-     KCL_DEBUG_TRACEOUT(FN_FIREGL_ACPI, 0, NULL);  
diff --git a/x11-drivers/ati-userspace/files/ati-drivers-CVE-2010-3081-fix.patch b/x11-drivers/ati-userspace/files/ati-drivers-CVE-2010-3081-fix.patch
deleted file mode 100644
index 5a71da10..00000000
--- a/x11-drivers/ati-userspace/files/ati-drivers-CVE-2010-3081-fix.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
- *                                                                          *
- * Copyright 1999-2005 ATI Technologies Inc., Markham, Ontario, CANADA.     *
- * All Rights Reserved.                                                     *
- *                                                                          *
- * Your use and or redistribution of this software in source and \ or       *
- * binary form, with or without modification, is subject to: (i) your       *
- * ongoing acceptance of and compliance with the terms and conditions of    *
- * the ATI Technologies Inc. software End User License Agreement; and (ii)  *
- * your inclusion of this notice in any version of this software that you   *
- * use or redistribute.  A copy of the ATI Technologies Inc. software End   *
- * User License Agreement is included with this software and is also        *
- * available by contacting ATI Technologies Inc. at http://www.ati.com      *
- *                                                                          *
- ****************************************************************************/
-
---- common/lib/modules/fglrx/build_mod/kcl_ioctl.c.orig	2010-09-01 16:05:31.000000000 +0200
-+++ common/lib/modules/fglrx/build_mod/kcl_ioctl.c	2010-09-23 01:41:46.711844303 +0200
-@@ -35,6 +35,9 @@
- 
- #ifdef __x86_64__
- #   include "asm/compat.h"
-+#   if ARCH_COMPAT_ALLOC_USER_SPACE
-+#      include "linux/compat.h"
-+#   endif
- #   if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
- #       if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
- #           include "linux/ioctl32.h"
-@@ -193,7 +196,20 @@
-  */
- void* ATI_API_CALL KCL_IOCTL_AllocUserSpace32(long size)
- {
--    return compat_alloc_user_space(size);
-+    void __user *ptr;
-+
-+    /* If size would occupy more than half of the entire compat space... */
-+    if (unlikely(size > (((compat_uptr_t)~0) >> 1)))
-+        return NULL;
-+#if ARCH_COMPAT_ALLOC_USER_SPACE
-+    ptr = arch_compat_alloc_user_space(size);
-+#else
-+    ptr = compat_alloc_user_space(size);
-+#endif
-+    if (unlikely(!access_ok(VERIFY_WRITE, ptr, size)))
-+        return NULL;
-+
-+    return ptr;
- }
- 
- #endif // __x86_64__
---- common/lib/modules/fglrx/build_mod/2.6.x/Makefile.orig	2010-09-01 16:05:31.000000000 +0200
-+++ common/lib/modules/fglrx/build_mod/2.6.x/Makefile	2010-09-23 01:47:46.533415019 +0200
-@@ -66,6 +66,7 @@
-                 -DFGL_GART_RESERVED_SLOT \
-                 -DFGL_LINUX253P1_VMA_API \
-                 -DPAGE_ATTR_FIX=$(PAGE_ATTR_FIX) \
-+                -DARCH_COMPAT_ALLOC_USER_SPACE=$(ARCH_COMPAT_ALLOC_USER_SPACE) \
- 
- ifeq ($(KERNELRELEASE),)
- # on first call from remote location we get into this path
diff --git a/x11-drivers/ati-userspace/files/ati-drivers-do_mmap.patch b/x11-drivers/ati-userspace/files/ati-drivers-do_mmap.patch
deleted file mode 100644
index 04248eb7..00000000
--- a/x11-drivers/ati-userspace/files/ati-drivers-do_mmap.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-06-15 18:30:13.483762070 +0200
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-06-17 17:47:36.543041869 +0200
-@@ -2106,6 +2106,12 @@
-     }
- }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
-+# define NO_DO_MMAP
-+# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, f)
-+# define do_munmap(a,b,c) vm_munmap(b, c)
-+#endif
-+
- unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval(
-                                         KCL_IO_FILE_Handle file,
-                                         unsigned long addr,
-@@ -2117,10 +2123,13 @@
- 
-     flags = MAP_SHARED;
-     prot  = PROT_READ|PROT_WRITE;
--
-+#ifdef NO_DO_MMAP
-+    vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff);
-+#else
-     down_write(&current->mm->mmap_sem);
-     vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff);
-     up_write(&current->mm->mmap_sem);
-+#endif
-     if (IS_ERR(vaddr))
-        return 0;
-     else
-@@ -2131,7 +2140,9 @@
- {
-     int retcode = 0;
- 
-+#ifndef NO_DO_MMAP
-     down_write(&current->mm->mmap_sem);
-+#endif
- #ifdef FGL_LINUX_RHEL_MUNMAP_API
-     retcode = do_munmap(current->mm,
-                         addr,
-@@ -2142,7 +2153,9 @@
-                         addr,
-                         len);
- #endif                        
-+#ifndef NO_DO_MMAP
-     up_write(&current->mm->mmap_sem);
-+#endif
-     return retcode;
- }
- 
diff --git a/x11-drivers/ati-userspace/files/ati-drivers-fix_compilation-bug-297322.patch b/x11-drivers/ati-userspace/files/ati-drivers-fix_compilation-bug-297322.patch
deleted file mode 100644
index e2af915a..00000000
--- a/x11-drivers/ati-userspace/files/ati-drivers-fix_compilation-bug-297322.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -1441,7 +1441,9 @@
- todo !!!
- #endif
- 
--unsigned long ATI_API_CALL __ke__cmpxchg(volatile void *ptr, unsigned long old,
-+void __cmpxchg_wrong_size(void) {}
-+
-+unsigned long ATI_API_CALL __ke__cmpxchg(volatile unsigned long *ptr, unsigned long old,
-          unsigned long new, int size)
- {
- #ifndef __HAVE_ARCH_CMPXCHG
---- common/lib/modules/fglrx/build_mod/firegl_public.h
-+++ common/lib/modules/fglrx/build_mod/firegl_public.h
-@@ -441,7 +441,8 @@
- extern void ATI_API_CALL KCL_SIGNAL_BlockAll(int (*notifier)(void *priv), void *pPriv, __ke_sigset_t *pSigMask);
- extern void ATI_API_CALL KCL_SIGNAL_UnblockAll(void);
- 
--extern unsigned long ATI_API_CALL __ke__cmpxchg(volatile void *ptr, unsigned long old,                      
-+extern void __cmpxchg_wrong_size(void);
-+extern unsigned long ATI_API_CALL __ke__cmpxchg(volatile unsigned long *ptr, unsigned long old,                      
-                       unsigned long new, int size);
- 
- #define __ke_cmpxchg(ptr,o,n)                        \
diff --git a/x11-drivers/ati-userspace/files/ati-drivers-kernel-3.8-acpihandle.patch b/x11-drivers/ati-userspace/files/ati-drivers-kernel-3.8-acpihandle.patch
deleted file mode 100644
index bdff4fb7..00000000
--- a/x11-drivers/ati-userspace/files/ati-drivers-kernel-3.8-acpihandle.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- common/lib/modules/fglrx/build_mod/kcl_acpi.c	2012-07-04 21:43:47.000000000 +0200
-+++ common/lib/modules/fglrx/build_mod/kcl_acpi.c.new	2012-12-23 11:25:38.000000000 +0100
-@@ -775,11 +775,7 @@
- unsigned int ATI_API_CALL KCL_ACPI_GetHandles(kcl_match_info_t *pInfo)
- {
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
--    #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19)
--        pInfo->video_handle = pInfo->pcidev->dev.archdata.acpi_handle;
--    #else 
--        pInfo->video_handle = pInfo->pcidev->dev.firmware_data;
--    #endif    
-+    pInfo->video_handle = DEVICE_ACPI_HANDLE(&pInfo->pcidev->dev);
-     if ( pInfo->video_handle &&
-         (KCL_ACPI_videoDevice(pInfo->video_handle) != KCL_ACPI_OK) )
-     {
diff --git a/x11-drivers/ati-userspace/files/ati-drivers-old_rsp.patch b/x11-drivers/ati-userspace/files/ati-drivers-old_rsp.patch
deleted file mode 100644
index 0456bd6b..00000000
--- a/x11-drivers/ati-userspace/files/ati-drivers-old_rsp.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-05-26 18:33:25.044695179 +0200

-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-05-26 18:28:39.692699095 +0200

-@@ -4154,7 +4154,7 @@

- {

-     unsigned int p;

-     KCL_DEBUG5(FN_FIREGL_KAS, "%d\n", level_init);

--    for_each_cpu_mask(p, cpu_possible_map)

-+    for_each_possible_cpu(p)

-     {

-         KCL_DEBUG1(FN_FIREGL_KAS,"Setting initial execution level for CPU # %d\n", p);

-         preempt_disable();

---- a/common/lib/modules/fglrx/build_mod/kcl_ioctl.c	2012-05-26 19:11:03.402987821 +0200

-+++ b/common/lib/modules/fglrx/build_mod/kcl_ioctl.c	2012-05-26 19:13:00.273986422 +0200

-@@ -217,6 +217,10 @@

-  *  \param size [in] Number of bytes to allocate

-  *  \return Pointer to allocated memory

-  */

-+#ifndef CONFIG_X86_X32

-+DEFINE_PER_CPU(unsigned long, old_rsp);

-+#endif

-+

- void* ATI_API_CALL KCL_IOCTL_AllocUserSpace32(long size)

- {

-     void __user *ret = COMPAT_ALLOC_USER_SPACE(size);
\ No newline at end of file
diff --git a/x11-drivers/ati-userspace/files/ati-drivers-vm-reserverd.patch b/x11-drivers/ati-userspace/files/ati-drivers-vm-reserverd.patch
deleted file mode 100644
index 08045a65..00000000
--- a/x11-drivers/ati-userspace/files/ati-drivers-vm-reserverd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- common/lib/modules/fglrx/build_mod/firegl_public.c	2012-10-18 00:29:21.778369464 +0200
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c.new	2012-10-18 00:30:39.647416026 +0200
-@@ -222,6 +222,10 @@
- #define preempt_enable()
- #endif
- 
-+#ifndef VM_RESERVED
-+#define  VM_RESERVED   (VM_DONTEXPAND | VM_DONTDUMP)
-+#endif
-+
- // ============================================================
- /* globals */
diff --git a/x11-drivers/ati-userspace/files/ati-drivers-x32_something_something.patch b/x11-drivers/ati-userspace/files/ati-drivers-x32_something_something.patch
deleted file mode 100644
index d37c1191..00000000
--- a/x11-drivers/ati-userspace/files/ati-drivers-x32_something_something.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/common/lib/modules/fglrx/build_mod/kcl_ioctl.c	2012-05-26 19:11:03.402987821 +0200
-+++ b/common/lib/modules/fglrx/build_mod/kcl_ioctl.c	2012-05-26 19:13:00.273986422 +0200
-@@ -217,6 +217,10 @@
-  *  \param size [in] Number of bytes to allocate
-  *  \return Pointer to allocated memory
-  */
-+#ifndef CONFIG_X86_X32
-+DEFINE_PER_CPU(unsigned long, old_rsp);
-+#endif
-+
- void* ATI_API_CALL KCL_IOCTL_AllocUserSpace32(long size)
- {
-     void __user *ret = COMPAT_ALLOC_USER_SPACE(size);
diff --git a/x11-drivers/ati-userspace/files/ati-drivers-xen.patch b/x11-drivers/ati-userspace/files/ati-drivers-xen.patch
deleted file mode 100644
index a1b88df7..00000000
--- a/x11-drivers/ati-userspace/files/ati-drivers-xen.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- common/lib/modules/fglrx/build_mod/firegl_public.c	2008-12-09 15:17:27.000000000 +0000
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c	2008-12-09 15:12:34.000000000 +0000
-@@ -31,6 +31,9 @@
- #include <linux/autoconf.h>
- 
- #if !defined(CONFIG_X86_PC) 
-+#if !defined(CONFIG_X86_PC_XEN)
-+#if !defined(CONFIG_X86_XEN)
-+#if !defined(CONFIG_X86_64_XEN)
- #if !defined(CONFIG_X86_64)
- #if !defined(CONFIG_X86_VOYAGER)
- #if !defined(CONFIG_X86_NUMAQ)
-@@ -47,6 +50,9 @@
- #endif
- #endif
- #endif
-+#endif
-+#endif
-+#endif
- 
- /* The dirty-page-tracking patch included in NLD 9 SMP kernels defines
-  * a static inline function that uses a GPL-only symbol in a header
---- common/lib/modules/fglrx/build_mod/firegl_public.h	2008-12-09 15:17:27.000000000 +0000
-+++ common/lib/modules/fglrx/build_mod/firegl_public.h	2008-12-09 15:15:45.000000000 +0000
-@@ -30,9 +30,13 @@
- #endif
- 
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
--
-+#ifdef CONFIG_XEN
-+#define REMAP_PAGE_RANGE_FN io_remap_pfn_range
-+#define REMAP_PAGE_RANGE_STR "io_remap_pfn_range"
-+#else
- #define REMAP_PAGE_RANGE_FN remap_pfn_range
- #define REMAP_PAGE_RANGE_STR "remap_pfn_range"
-+#endif
- #define REMAP_PAGE_RANGE_OFF(offset) ((offset) >> PAGE_SHIFT)
- 
- #else /* LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,9) */
-@@ -43,13 +47,21 @@
- 
- #endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) */
- 
-+#ifdef CONFIG_XEN
-+#define REMAP_PAGE_RANGE(vma,offset) \
-+    REMAP_PAGE_RANGE_FN((vma), \
-+                        (vma)->vm_start,       \
-+                        REMAP_PAGE_RANGE_OFF(offset), \
-+                        (vma)->vm_end - (vma)->vm_start, \
-+                        (vma)->vm_page_prot)
-+#else
- #define REMAP_PAGE_RANGE(vma,offset) \
-     REMAP_PAGE_RANGE_FN(FGL_VMA_API_PASS \
-                         (vma)->vm_start,	\
-                         REMAP_PAGE_RANGE_OFF(offset), \
-                         (vma)->vm_end - (vma)->vm_start, \
-                         (vma)->vm_page_prot)
--
-+#endif
- 
- /* Page table macros */
- 
diff --git a/x11-drivers/ati-userspace/files/ati-powermode-opt-path-2.patch b/x11-drivers/ati-userspace/files/ati-powermode-opt-path-2.patch
deleted file mode 100644
index f5a35a30..00000000
--- a/x11-drivers/ati-userspace/files/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-userspace/files/ati-powermode-opt-path-3.patch b/x11-drivers/ati-userspace/files/ati-powermode-opt-path-3.patch
deleted file mode 100644
index 106e67ee..00000000
--- a/x11-drivers/ati-userspace/files/ati-powermode-opt-path-3.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2012-08-17 22:39:05.077984979 +0800
-+++ b/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2012-08-17 22:41:15.919976149 +0800
-@@ -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 --effective=now"
-     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=3 --effective=now"
-     fi
- fi
diff --git a/x11-drivers/ati-userspace/files/atieventsd.init b/x11-drivers/ati-userspace/files/atieventsd.init
deleted file mode 100644
index 73139ce3..00000000
--- a/x11-drivers/ati-userspace/files/atieventsd.init
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/files/atieventsd.init,v 1.3 2007/05/18 23:58:01 marienz Exp $
-
-depend() {
-    need acpid
-}
-
-start() {
-    ebegin "Starting ${SVCNAME}"
-    start-stop-daemon --start --exec /opt/sbin/atieventsd -- ${ATIEVENTSDOPTS}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping ${SVCNAME}"
-    start-stop-daemon --stop --quiet --exec /opt/sbin/atieventsd
-    eend $?
-}
\ No newline at end of file
diff --git a/x11-drivers/ati-userspace/files/check-for-iommu-only-if-iommu-is-supported.patch b/x11-drivers/ati-userspace/files/check-for-iommu-only-if-iommu-is-supported.patch
deleted file mode 100644
index 79324873..00000000
--- a/x11-drivers/ati-userspace/files/check-for-iommu-only-if-iommu-is-supported.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1633d55aa0fb9c2ceb0ae1eab15bdec5066d35ae Mon Sep 17 00:00:00 2001
-From: Emil Karlson <jekarlson@gmail.com>
-Date: Fri, 2 Aug 2013 01:18:41 +0300
-Subject: [PATCH 1/3] Check for iommu only, if iommu is supported.
-
----
- common/lib/modules/fglrx/build_mod/kcl_iommu.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/common/lib/modules/fglrx/build_mod/kcl_iommu.c b/common/lib/modules/fglrx/build_mod/kcl_iommu.c
-index c6602dd..803455c 100755
---- a/common/lib/modules/fglrx/build_mod/kcl_iommu.c
-+++ b/common/lib/modules/fglrx/build_mod/kcl_iommu.c
-@@ -183,11 +183,13 @@ void ATI_API_CALL KCL_IOMMU_UnbindPasid( KCL_PCI_DevHandle pcidev,int pasid)
-  */
- int ATI_API_CALL KCL_IOMMU_CheckInfo( KCL_PCI_DevHandle pcidev)
- {
-+#if defined(CONFIG_INTEL_IOMMU) || defined(CONFIG_AMD_IOMMU)
-     struct pci_dev* pdev = (struct pci_dev*)pcidev;
--    if ( pdev->dev.archdata.iommu )
-+	if ( pdev->dev.archdata.iommu )
-     {
-         return 1;
-     }
-+#endif
-     return 0;
- }
- 
--- 
-1.8.1.5
-
diff --git a/x11-drivers/ati-userspace/files/const-notifier-block.patch b/x11-drivers/ati-userspace/files/const-notifier-block.patch
deleted file mode 100644
index ba1fdb2b..00000000
--- a/x11-drivers/ati-userspace/files/const-notifier-block.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Nur common/lib/modules/fglrx/build_mod/kcl_acpi.c common-r1/lib/modules/fglrx/build_mod/kcl_acpi.c
---- common/lib/modules/fglrx/build_mod/kcl_acpi.c	2013-01-29 17:03:51.000000000 +0200
-+++ common-r1/lib/modules/fglrx/build_mod/kcl_acpi.c	2013-02-15 20:33:10.611838616 +0200
-@@ -15,6 +15,9 @@
-  ****************************************************************************/
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
-+#include <linux/notifier.h>
-+#endif
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
- #include <generated/autoconf.h>
- #else
-@@ -145,7 +148,11 @@
-     return NOTIFY_OK;
- }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
-+static notifier_block_no_const firegl_acpi_lid_notifier = {
-+#else
- static struct notifier_block firegl_acpi_lid_notifier = {
-+#endif
-         .notifier_call = firegl_acpi_lid_event,
- };
- #endif
diff --git a/x11-drivers/ati-userspace/files/fgl_glxgears-do-not-include-glATI.patch b/x11-drivers/ati-userspace/files/fgl_glxgears-do-not-include-glATI.patch
deleted file mode 100644
index d46e027c..00000000
--- a/x11-drivers/ati-userspace/files/fgl_glxgears-do-not-include-glATI.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur extra/fgl_glxgears/fgl_glxgears.c extra-r1/fgl_glxgears/fgl_glxgears.c
---- extra/fgl_glxgears/fgl_glxgears.c	2012-08-29 09:59:03.000000000 +0300
-+++ extra-r1/fgl_glxgears/fgl_glxgears.c	2013-09-07 09:26:11.034723135 +0300
-@@ -78,7 +78,6 @@
- #endif // _WIN32
- 
- #define INT_PTR ptrdiff_t
--#include <GL/glATI.h>
- 
- #ifdef _WIN32
- #include <GL/wglATI.h>
diff --git a/x11-drivers/ati-userspace/files/fix-the-linux-3.17-no_hotplug-error.patch b/x11-drivers/ati-userspace/files/fix-the-linux-3.17-no_hotplug-error.patch
deleted file mode 100644
index a8b54625..00000000
--- a/x11-drivers/ati-userspace/files/fix-the-linux-3.17-no_hotplug-error.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- common/lib/modules/fglrx/build_mod/kcl_acpi.c.orig	2014-07-11 11:46:19.000000000 +0200
-+++ common/lib/modules/fglrx/build_mod/kcl_acpi.c	2014-10-08 15:12:55.535638391 +0200
-@@ -829,6 +829,7 @@
- 
- static acpi_status KCL_ACPI_Slot_No_Hotplug(KCL_ACPI_DevHandle handle, u32 lvl, void *data, void **rv)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,7)
-    struct acpi_device *tdev;
-    struct pci_dev *pdev = (struct pci_dev *)data;
-@@ -844,6 +845,7 @@
-       }
-    }
- #endif
-+#endif
-    return 0;
- }
- 
diff --git a/x11-drivers/ati-userspace/files/kernel/2.6.31-fglrx_find_task_by_vpid.patch b/x11-drivers/ati-userspace/files/kernel/2.6.31-fglrx_find_task_by_vpid.patch
deleted file mode 100644
index 1d4e030b..00000000
--- a/x11-drivers/ati-userspace/files/kernel/2.6.31-fglrx_find_task_by_vpid.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- common/lib/modules/fglrx/build_mod/firegl_public.c.orig	2009-09-10 20:14:10.302938534 +0200
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c	2009-09-10 20:16:21.828943780 +0200
-@@ -183,6 +183,7 @@
- #include <linux/string.h>
- #include <linux/gfp.h>
- #include <linux/swap.h>
-+#include <linux/pid.h>
- 
- #include "firegl_public.h"
- #include "kcl_osconfig.h"
-@@ -1315,7 +1316,7 @@
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)  
-    p = find_task_by_pid( pid );
- #else   
--   p = find_task_by_vpid( pid );
-+   p = pid_task( pid, PIDTYPE_PID );
- #endif   
-    if (p) 
-    {
diff --git a/x11-drivers/ati-userspace/files/kernel/2.6.32-9.11-fix_compilation.patch b/x11-drivers/ati-userspace/files/kernel/2.6.32-9.11-fix_compilation.patch
deleted file mode 100644
index 38519d76..00000000
--- a/x11-drivers/ati-userspace/files/kernel/2.6.32-9.11-fix_compilation.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- work/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ work.new/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -1441,7 +1441,9 @@
- todo !!!
- #endif
- 
--unsigned long ATI_API_CALL __ke__cmpxchg(volatile void *ptr, unsigned long old,
-+void __cmpxchg_wrong_size(void) {}
-+
-+unsigned long ATI_API_CALL __ke__cmpxchg(volatile unsigned long *ptr, unsigned long old,
-          unsigned long new, int size)
- {
- #ifndef __HAVE_ARCH_CMPXCHG
---- work/common/lib/modules/fglrx/build_mod/firegl_public.h
-+++ work.new/common/lib/modules/fglrx/build_mod/firegl_public.h
-@@ -441,7 +441,8 @@
- extern void ATI_API_CALL KCL_SIGNAL_BlockAll(int (*notifier)(void *priv), void *pPriv, __ke_sigset_t *pSigMask);
- extern void ATI_API_CALL KCL_SIGNAL_UnblockAll(void);
- 
--extern unsigned long ATI_API_CALL __ke__cmpxchg(volatile void *ptr, unsigned long old,                      
-+extern void __cmpxchg_wrong_size(void);
-+extern unsigned long ATI_API_CALL __ke__cmpxchg(volatile unsigned long *ptr, unsigned long old,                      
-                       unsigned long new, int size);
- 
- #define __ke_cmpxchg(ptr,o,n)                        \
---- work/common/lib/modules/fglrx/build_mod/kcl_io.c
-+++ work.new/common/lib/modules/fglrx/build_mod/kcl_io.c
-@@ -37,8 +37,9 @@
-  */
- 
- #include <linux/version.h>
- #include <linux/autoconf.h>
- #include <linux/poll.h>
-+#include <linux/signal.h>
- #include <asm/io.h>
- 
- #include "kcl_config.h"
diff --git a/x11-drivers/ati-userspace/files/switchlibGL b/x11-drivers/ati-userspace/files/switchlibGL
deleted file mode 100644
index a6aa4fce..00000000
--- a/x11-drivers/ati-userspace/files/switchlibGL
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-#  switchlibGL
-#
-#  Copyright (c) 2011 Advanced Micro Devices, Inc.
-#
-#  Purpose:
-#    For switch between AMD and Intel graphic driver library.
-#
-#  Usage:
-#  switchlibGL   amd|intel|query
-#    amd:   switches to the AMD version of libGL.
-#    intel: switches to the open-source version of libGL .
-#    query: checks, which version is currently active and prints either "amd"
-#    or "intel" or "unknown" on the standard output.
-#    must be root to execute this script
-
-ARCH=`uname -m`
-E_ERR=1
-
-# Check if root
-if [ "`whoami`" != "root" ]; then
-  echo "Must be root to run this script." 1>&2
-  exit $E_ERR
-fi
-
-# One parameter
-if [ $# -ne 1 ]; then
-  echo "Usage: `basename $0` amd|intel|query " 1>&2
-  echo "Please choose one parameter " 1>&2
-  exit $E_ERR
-fi
-
-current=$(eselect opengl show)
-# Switch to right mode
-case "$1" in
-	"amd" )
-		if [ $current != ati ] ; then
-			eselect opengl set ati || return 1
-		fi
-	;;
-	"intel" )
-		if [ $current != xorg-x11 ] ; then
-			eselect opengl set xorg-x11 || return 1
-		fi
-	;;
-	"query" )
-		case "$current" in
-			"ati" )
-				echo "amd"
-			;;
-			"xorg-x11" )
-				echo "intel"
-			;;
-		esac
-	;;
-	* ) echo "Usage: `basename $0` amd|intel|query" 1>&2; exit $E_ERR;;
-	# other than amd|intel|query parameter report an error
-esac
-
-#  A zero return value from the script upon exit indicates success.
-exit 0
diff --git a/x11-drivers/ati-userspace/files/typesafe-kuid.diff b/x11-drivers/ati-userspace/files/typesafe-kuid.diff
deleted file mode 100644
index c226ea3d..00000000
--- a/x11-drivers/ati-userspace/files/typesafe-kuid.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
-index d3ad3ce..9362b58 100755
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -34,6 +34,11 @@
- #include <linux/autoconf.h>
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
-+#include <linux/uidgid.h>
-+#endif
-+
-+
- #if !defined(CONFIG_X86) 
- #if !defined(CONFIG_X86_PC) 
- #if !defined(CONFIG_X86_XEN) 
-@@ -1543,9 +1548,17 @@ KCL_TYPE_Pid ATI_API_CALL KCL_GetTgid(void)
- KCL_TYPE_Uid ATI_API_CALL KCL_GetEffectiveUid(void)
- {
- #ifdef current_euid
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
-+    return __kuid_val(current_euid());
-+# else
-     return current_euid();
-+# endif
- #else
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
-+    return __kuid_val(current->euid);
-+# else
-     return current->euid;
-+# endif
- #endif
- }
- 
diff --git a/x11-drivers/ati-userspace/files/use-kernel_fpu_begin.patch b/x11-drivers/ati-userspace/files/use-kernel_fpu_begin.patch
deleted file mode 100644
index f0ba2785..00000000
--- a/x11-drivers/ati-userspace/files/use-kernel_fpu_begin.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c	2014-10-27 23:30:58.630304842 +0200
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c	2014-10-27 23:32:57.300306011 +0200
-@@ -6389,7 +6389,7 @@
-  */
- void ATI_API_CALL KCL_fpu_begin(void)
- {
--#ifdef CONFIG_X86_64
-+#if defined(CONFIG_X86_64) || LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
-     kernel_fpu_begin();
- #else
- #ifdef TS_USEDFPU
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
deleted file mode 100644
index 139cebdf..00000000
--- a/x11-drivers/nvidia-drivers/Manifest
+++ /dev/null
@@ -1,43 +0,0 @@
-DIST NVIDIA-FreeBSD-x86-173.14.39.tar.gz 20038266 SHA256 63a922ce4c5b676b4cb1ace98094dace4cc5408f2553e183df7b2127777a238b SHA512 96982fe7e0751c52fbef534193de09d187b99c1984c05e791223eb804719d8b3ba72efd983f227661ded4b71569bdbb914f1f629ab73a8bc9b8172832ccf3ec6 WHIRLPOOL 21f5906f42adf0064c7a7f81ac8e323de488e6d36356ee42c31a15c31ebb64335d5e2cff0ff022d41de480f9e0a57b3b96387f17151c7b59eceba2c61a7a102b
-DIST NVIDIA-FreeBSD-x86-304.125.tar.gz 34494889 SHA256 806d0bff9d394390b3a257472bc342857f150e9dba6673e6b930f47a93ec0269 SHA512 d2760196d3f0dfb1837d496bd11dbedab6a2bf3de98da35f16c92133452b915b425a718f72e560f5d6483caf5e2e5bcf99a462b2e392d7a08c77b59695649108 WHIRLPOOL eb008e1956043d48af5f928dc594c8ae9c8a946834d889db5b4a9b3f16bfaeb311221e5d3f83c8c599dee860b54a42030dccf2aaec31dffb6e8460bf646b82ad
-DIST NVIDIA-FreeBSD-x86-331.67.tar.gz 55876749 SHA256 0c88c363db516ef09b0027aacb1e686191d3d4676f44445bab2156c2197a6cae SHA512 0394aefbcd99a40e5cfc03a169bbf4bd8d34828cf2656ea49c560312e1cb7f575eeb32cd8dfe6f22a259e04efcf5183149846dee18b6ee254987f333fba82cba WHIRLPOOL 8b179600db7e8d1be476761ab0d5e6b5d10167e936044bf5de89115012bcdc0ecdd1ee7ed6da969261fe95f8b05c4b97a41343ed0ae2d283ff777d58971fbd7e
-DIST NVIDIA-FreeBSD-x86-337.25.tar.gz 58137349 SHA256 9857b24b5d910fb8688a2b9e11039d88b70ec250e900149183454675a363e8db SHA512 0c85814061732bd09948b5fd203d5d3a1fd5df0e1c23f4af11e1cfae6f7d8c7d7f569f35398c2c5551abf7eb5ce357229fa9b16ce2c21799e96396cff3313777 WHIRLPOOL a7ca516e184334117e1cdd45b3f4c1b0a8c50281ffd1c3859865d877c2bfb20136c308b1ff09e4d64d0e7fef8eeddacab488d0bc30c98d82a9280572be5f0de0
-DIST NVIDIA-FreeBSD-x86-340.32.tar.gz 59021194 SHA256 ee4f34a279ae84b97373adbc8c91ab7d34eb52dd4a7b095d51d8592b3e264df8 SHA512 9b5eafa48ccb105fe978242096c99355a291314cacf7a232cb81292355dffac5496cdb8667fa4ad3f0f2286792bf0473f523535e3258bb3b0237c76dbf5ba837 WHIRLPOOL b9438f675f65ec0b55aa2c1ca8c3beb35d20f3c56837bbeb02d511b66d4bce825ba95852ecbca70f6f83ff53f23c98e1c0d2bd313d195426fea63baed27c1cce
-DIST NVIDIA-FreeBSD-x86-340.46.tar.gz 59013852 SHA256 5aa4ec5f9ca4425cd3fdc47ac19c76900cecae8a9606632a8063514481363571 SHA512 03bddeb919c6ff58e11df2a4d7f0c30a8f47a9970704dde762c81183773057cdffadf37d60bb920c218b1c72bc8f71949aadcf250747f48b1cd27b1a6164949b WHIRLPOOL 0ce3f23d4660e368b10972a39366a1d26116e38fddaee1a3a4764e85e868151bc7f1e27f3c1dbbc52187c74acabd483c65455d7fd0b9679d89a2c05200e05d83
-DIST NVIDIA-FreeBSD-x86-340.58.tar.gz 59074607 SHA256 be4fdf4502532c39483a1072ed89bd33e0e49717a2523f412fe3c75da5edbc6c SHA512 c02d160ffc6a027a26c5fe2e6d7eff833f1e2cdb2c2006baad571bb733ddee68a8675175bddb1e154bea69571af633b125a524ca7b8ffd535b88ac91579f7bfb WHIRLPOOL 0999d380ae8770e1240287de002dc133d816c0895d39110fdc3f7455a7d25effbce09cbfea1b09b8b01b2214cd1f33554ba202a5f816c80b9884edb03ce2d9d6
-DIST NVIDIA-FreeBSD-x86-340.76.tar.gz 59362290 SHA256 0abbcc3bed3f017e7f1887a5c2d014e2b5a020462071998986ed49cdb8e7119f SHA512 e6d8b6d03fe0f9ab25ddeef680e0159ea4073d03762d3419761c02b917edefa9a1f81c209bd386838141c1924364c81126b0a356c325b056a0c2451865bed5eb WHIRLPOOL 7ec0cef6f92bfbd4c8b6a051dc8de4b6b138f63fd4f7e18756178a9aebb91ea32523d5ca885481d8c8c3d1531b153699f4e5606c155d6c3aa79a340637d3744b
-DIST NVIDIA-FreeBSD-x86-343.36.tar.gz 59205879 SHA256 8634e7537eca778790296f8355e39ae9a7e16642648e671a6c9339ee55fe340c SHA512 35fcf57d5e830cbe3c07ec70362ad9f0ff6ec327c6b11b6d3c533315e59031501501b9fdb80a3bef720506e5221ad84496745ce13d2c9885076f1c8e8537ba46 WHIRLPOOL 3ed3230dc190e7670c960743d94b8db1c0d9908b597f952746d851b403847e7b2836f1c60e6af0fe73072c1fda3971dfacc37c21908c227b2c20b5045dbfd61f
-DIST NVIDIA-FreeBSD-x86-346.35.tar.gz 57980205 SHA256 c2decd38b2ff3e46a611acfd2ca41fd887b7223f6aee1f57f52717b4206e2be3 SHA512 acf8a7792a9a0bd388139548d5923a2daa59680e44877083e8de2935f8eed83821505b036bd18ea282e9c4996d069675f8406d0958b49a0efa9c0fd64e69c3d1 WHIRLPOOL 1ed58654eee9b6e38275c60a6197faff095082ff176e548522c03cf2e5f91f2b632d49341eed8f537422343a43577419239327266243402b0425b6a46ee21f83
-DIST NVIDIA-FreeBSD-x86-346.59.tar.gz 57992895 SHA256 6cb7ad1b38f4f01fea898f335452e95ebe350285c9dfe1bf83c73f450231c9ae SHA512 2e421047dc850c6d3071df17f1507ce4f925ba05adca8efd01e3b6c2451cc45231e077aa4df29b398b99a44ff054b84555803b4d9bf6c11fb681706d3b5c1e50 WHIRLPOOL 88c965f850d6c9daaa27d95124ca456f0484581c1901026fe1becf2c6932cd2ee4e8bffaeca7c0239971f7418bee4565af96ba7e2eebd3b6e60dcc244df20abb
-DIST NVIDIA-FreeBSD-x86_64-304.125.tar.gz 35498616 SHA256 46b14b8c5ee1c02ff5e30afc9c99f4dd2edc426ccb2b73764093a1787639699d SHA512 34d48f24b1f5019b23c2937f8b5280fcc596764e1f5833cfe33db5e4d8395a0d69aa4c4214a5b97620dbaade73ac0fa333c36cceb4a137bb26d3ba37c31a0eb7 WHIRLPOOL 82677bd2aec3a60fe64211170573ef702b1dd1ab5a71ec922fb56b8d40f2163c0151a7c7f8bdace9127c8afcaf278f8f23a1cb585a8ad3bb7a0d42787ab17fb2
-DIST NVIDIA-FreeBSD-x86_64-331.67.tar.gz 46997728 SHA256 5781bba8b7783f96c1f239961140317426910633fbfa3ba80fdcefe54aec7e92 SHA512 1653c03e091451f14c040c2b56de8574e5fd5d7b24db6ce979f99693f6a10e61e6c28fb3a962288a135551664973bba6d2f29b92aff726a4ee592fddc807db4e WHIRLPOOL a97d473c786451c7cb88155edb12a86da5f2888a584da7538dae93056357d0c63f294d638f6949c7a6f8255c60c3db84fdbb28ce10cd6da4c82758f95eb90679
-DIST NVIDIA-FreeBSD-x86_64-337.25.tar.gz 58941876 SHA256 189dc0f70528d0099d0396a52bf759af74d6a99203484be2d2d6514faf0d4161 SHA512 458c9200579a6caed02aabbc196ec998a0d19149cca665c5ef9bc709c018b991b27713c92d00bdd1ea6ddd86e04c641f387e1ec8a1235cc9581af9e7a3b19ebf WHIRLPOOL d819cf486edc443b1da39ea67582a12698b1dea1501f3b6738014a80f8a96260aa0ba30a9e2f1fac075f0f7d604dc94978f7f82092b40531dd4989a2954cc420
-DIST NVIDIA-FreeBSD-x86_64-340.32.tar.gz 59836909 SHA256 4a55cbd4f87528d4d5b5a8809a8c6e2dac9ad22b0f8b357590893dfb39e52512 SHA512 ef333d94a147e04292d6e197ee72a7abfb10a84665931876455b689409af42ac713d1a16f965214a46d9dd28fd324769fa4dd14dde5caf20a8b23a9683b6c55e WHIRLPOOL 76fd78eb97b69d7a5d7dc46e06a8d7b4dc3fadc1f2c6995d86161ca90ce99ec4a0b42eedf09939a4436481bad33ef201f49c73c8add833cf912af86774d47b34
-DIST NVIDIA-FreeBSD-x86_64-340.46.tar.gz 59835566 SHA256 699a65b5184f8705ba4ddbefb5776136bec98619ea00af3304725e5e028b7346 SHA512 7a6ba9fbd769aec45985664edd7291403e70c0e89a90f5c0665d6433e4baa8e0b59ceb99e817b377753576d189c0091d5af0bc2da796726ce0a9f0ebfa831d5b WHIRLPOOL aea421916646f68efbba007c08319d7b26259e1ee146bd420910468c36c04c3bc574ee6db103d64259083b11190cb3d5342a3dd1af42b0a306aa4515eb4bc9af
-DIST NVIDIA-FreeBSD-x86_64-340.58.tar.gz 59892350 SHA256 c59e4c4e1c95a53d1dd797b99c852272fad0a256be65599eef82a6a2a16ce502 SHA512 bad7975662045e8e8075a558e3805b65e69536c9c8896a31245ff9e28b44c723ec7b3e9c9b40fa92622c0f5a966ea89bcf247156ee34e4977e933eab4595f22d WHIRLPOOL 893744d9f532ab463e7ba7d99999714816ad8eaed18a9e72ef47b3d9da4d493da4f4f2b6bf415dc20dec70d3ec850dfa26c8fae69a5166b093c8de36797b94e2
-DIST NVIDIA-FreeBSD-x86_64-340.76.tar.gz 60206978 SHA256 60037d035b9af9f1d4dcdd5033e1b28b0cd4c7ca94f6bcb8d267e037a930fdc0 SHA512 d478eac282dfb43205f7464d6542cf1f71ed4dea6b8381314affb8647d104c5ddf7e658b6b8eb5e0bdb18207b92f76c574b24959ce23034d375cc712998e6e7c WHIRLPOOL 98ebffd792a47e3a9ef369976db11909bc13551f38977f85ece41e5a31a790c2c173badfc166e3a0bfe4361d5221129d19364c074ba11fc4aa9062d5cb1499a8
-DIST NVIDIA-FreeBSD-x86_64-343.36.tar.gz 60045074 SHA256 aa189d9fd6448ed49ff4a8dd09dd15c06f6b3ef662fd3d960b4853c485cbab8a SHA512 23c38de071ac6e2c87db2c767b07f243703e55cd6485eb8e538fb72f38e9856b7ff28430fdd7eccc4728f3d36c14eac8b1fbf7155fe864ead93ed4218d5b65b5 WHIRLPOOL 401cdc5675d5fe60b6ca492be912573e9fc56a0a67ad680e2cada783ec8a34c15c6ca1a495c8fdbf09e384bc420295750540f5c77907c459c80f400d8291e44a
-DIST NVIDIA-FreeBSD-x86_64-346.35.tar.gz 58753495 SHA256 0a1c92efb9e29d0d4e1c099a5f2c69a29ac2431dbc33009cc83a35c794c48d33 SHA512 8838602a1e739043158b29ada81fceb36bb68385b5bdc21cc675eb8daafff45acb75efe9c8c00a45ce74164f510198490e820dcd0a797e52ff41254d93e467d3 WHIRLPOOL 7ecd9a92d3a7fe415faf3c7b9bda9af288aa65880fcbc0ec5131d85f1099dde569497e93e6060d8c96c426145d30e2bcd8d74e53d951591726888137fc3f5873
-DIST NVIDIA-FreeBSD-x86_64-346.59.tar.gz 58735813 SHA256 074840aeacb8965f14bc312db432efa320f97380bb8b21bb9cf1b242384d6651 SHA512 23c74f4ee9268b0583cee06b4e2109d33547a0e8789a67d7450b056f657d745930b834a5831a8709b9a095bcc63dbc76cbee219240519490ece1e40e2bf413eb WHIRLPOOL 985fe2fc59b38f3babaf534d7d04924b1d43ce3bc42b71420ea426f99ecbaed98aed5224bb5d30fbcc2b44978f38d8e812767a2bb7ee41c1d551c32bb345dc8d
-DIST NVIDIA-Linux-x86-173.14.39-pkg0.run 15134997 SHA256 a09935f37121ed3db8ae3da63a0d8e9d4348a19c859811c9fe44d6ce8e3eab23 SHA512 e24e15ccec725d3cbca502c2b77061776a81ef92917a950adec4ff6bdc34f10903aa654433177ea74be0dade4af81c5380d5710d375a5ea445940d06154bde93 WHIRLPOOL fce3d8e4f6cdf698f5a057514b6fe220bb1011025bdce5bd4cf0e424fb4d306d38251b6726bda03f290ea8137d5a95ed418cf8751722879f9042462abd9181b6
-DIST NVIDIA-Linux-x86-304.125.run 40589395 SHA256 aec5b3a792910e152d5af756ef6fd7224c448c564564c7c448ab8ec3fc78c4f7 SHA512 cd77736790876b66c1e88bf30b7a93f755c0f94118edda8fde1701dc07dc4eb60f89a27b0ed432db74729f269cb239f32f3c5e045d701f60baf69da7fc0d0ea7 WHIRLPOOL 85cd375e1b67bbabe9a8119affec20b7a9a258f8b5be89d755f7ea596a94f98df053e8ade33f1aba1f74f753dcb636268c4f2074a09eaf68d858241f1482552c
-DIST NVIDIA-Linux-x86-331.67.run 37064511 SHA256 696b4a574ad3cb2b3286e0848e7e831940110cc33c63de51890154dbbd31acc6 SHA512 2a17854b366aa67a398c8d66134fb78d0ccdf4a6b2fe874bb7c146cfd24501431ed7448f5b7e24c8f78c6b1f6c2d5da207fbf568c2135ef53e51e83ce02cc374 WHIRLPOOL 4ad64717eb43043bacfbecdd6efe38bc5bf598acf172984e7c3eb1dcd779a9cbe53a76ac6e7b94b1d950d1f279147ceee4037d89be589fef2219d826eb86d09e
-DIST NVIDIA-Linux-x86-337.25.run 37649836 SHA256 f76ece6bd98bfe2ae641a1847094e98c6f7ad7a01af682b4f38108d6b6227f9b SHA512 f68105a43f9129f4112c8a091ed7c9641708b62d20c199544e5e7079d5c5bdc0b6c83427be868e62c7134400ca62cab6a65eaff96ddb940768750250cbd50112 WHIRLPOOL 1ff92ffe33dad59bf393a7b6fe7523362433704dc8329701e74814c2eef833d15e44334264601080b90f723f5390ce6502fa3ed530fe9fadaf3efff139e65047
-DIST NVIDIA-Linux-x86-340.32.run 38587515 SHA256 1d0489c35c5b332c9b949d9de3c3cbab4ac3a94385aa41e7a7b62ef23f4395f5 SHA512 a67e57a1bd70a9cd5ae2bed70403920ed94d8eac9d08dcd380f6065cd597d5824e26ae25a0bcd56626190124c07d128f3b0429040794c8e8d3ead85860fcb646 WHIRLPOOL 66bf6db27edddae845606e82cf9397dbf483bbde23e97899575c8ac3f6ce86c84d88f8e60c60b1aad1360fe9bea4f43de030a849f88f43d482508de23cd24d8e
-DIST NVIDIA-Linux-x86-340.46.run 38635506 SHA256 a2e6d779397372dea77466e85ba30a15211c24502687512694604e570db11f87 SHA512 3d90a73fbe07eb25ec80a485c3827bebaf64a941331d6f28fb9b925678d74d66421dfecf6fe9637fb57b4aece268e987bfa8f29c06567243ae998d7ddac25f98 WHIRLPOOL dca92cff7d72f105e89deea74d6de69d4f78f1a7b15adea9e4a8cbbca9007b4bee4cc9b9f0cb39d7a2436e141785a5cfd3011b235418e701d27e7393ffefbf66
-DIST NVIDIA-Linux-x86-340.58.run 38527667 SHA256 7cc48ff0681667aad8213a4dd3cf7695cad29a5a23a3110d22566c362c76fb5b SHA512 71381af39622feaaa84e005212f2bfa0800d2b100cac8aafdaeaa3ae1cb5aff47e1d2927bbed059ec1667a41c65946fee4ee763c9cfc5d78b68c06bac55757e7 WHIRLPOOL 31230ddaf971fe35086c1c42530bf066d8632d1d2082329b42c076afacfcab4f0edeae87b27a9a59ee9915f8451ad9d4305a32ff87af459a4e87bedac181241b
-DIST NVIDIA-Linux-x86-340.76.run 38818911 SHA256 9b29d93b49009caed84a8852825c3e7c6ebbbba8ec99b03ee5113108c8b036d0 SHA512 45d7b29670f9ca50de80d6d61260015b45f74422bbd12039923d04ae8b033b903b27e9f4c174461055f3cf45a4af44565ce9a8b9cd671e0e54d37770a1156839 WHIRLPOOL da7e072a56e3aff8b4688e60c5acd76c97804fa582d21c70dce043b13fa2317d1021f19927e827cf6132aebe2d40371c750e3eb56697bc7eda16bb7369bf2994
-DIST NVIDIA-Linux-x86-343.36.run 41073259 SHA256 8cc1c99fbda29b3258f57dbdacef11921aca2e3ac106ef591f0815716e1b829e SHA512 a6287cf8ad6379daa7c6d7ae6bc08f9985ad9e9353de6d88eb72d8a1acad3e25eb65076b904152c6ddd8ac54b9afcdbb7a5dfb9a46e75c5654be87b3df0e48e1 WHIRLPOOL 7aaa7977a850314045bcfcc36a8f6ed8b3f487ec972e109ea48cbe3edda4ff29c0bf02e7c11dacf6a3e71783259dc809840c32e301aa16f2d4394d7f07cffc0a
-DIST NVIDIA-Linux-x86-346.35.run 40692611 SHA256 bba63c30c730ad7b8500a77c81cae58562b9f9b57cd576b61f37a2d8bc45df25 SHA512 df9213fe4743b6c329c1789dbdfe962af9c647a4e20380f957bc55369554fc731ffc098c00de922529d372b9686a170f6ccb1ce2e573ae57402396db9a3dc73d WHIRLPOOL 111b5a52fba139171163c6c31faade9d4ff40940520a10477cf90c998b2254c74fa571d7697b82ac515b80b71a3e205d1968b06c60ab057d008a41c45406e68e
-DIST NVIDIA-Linux-x86-346.59.run 41370855 SHA256 65cf83fccc02399d54212cbeea1c2364e4974687c3ad6cba87cc109476ad2129 SHA512 f7fd76cd4c73528c9476494e1a35b27dedbbbdc4a190ae5909c27b8e1b0c3ef5c446ef40c199b245eaf39621eda55ef8d4f4adbe8d2d75b8d5f1ba14f703c56c WHIRLPOOL 2895275d549084c596396f6dd7a25f040a4af52c70090ed393f3eb409edb2cbfc17c622d0fd200b44e1ba3e4d4e3f2f6ea11a8c379e81e8c2bc514eb8e0fafcf
-DIST NVIDIA-Linux-x86_64-173.14.39-pkg2.run 21100833 SHA256 15a953666d5681ba54c97498b578ffd286a1dc96d605f3b02110f3f99813100e SHA512 a65cd496e6ed57f771c3d99f37f616a1242d97844f6faef7a807825ad899c0e536a99fde397020839f0857883b934032f9491024f3047a6b06d3eea1f5d77713 WHIRLPOOL dc5f243b7d1de7e2d1b7f005e018a2940d63335b11a7c83c234b348b7a1839e9131169d2ea928bd8c2f549a4535149b03e16e6c94d59dfa745f7f904ff790a45
-DIST NVIDIA-Linux-x86_64-304.125.run 69108272 SHA256 c654889b85a18326f2c610260a8fbc3b1bb6f9b8be1c052a46a213f60bd62262 SHA512 75bd5700281b0aa4e19be5b779e3484711ce3db92641a32f3bf5e890601b353b23113f6218d5a2fa6b2c8d93702fac92810013c7c0f8efe484b0a39d09b1b073 WHIRLPOOL d8b9794253b1ab270680da7420f50df5ab6aa4d5123bad695be5b7891b2df55bf06ecdd0b221fd29e799077c0a64da8059df16ebea9a3535e402f2c0cf482dcf
-DIST NVIDIA-Linux-x86_64-331.67.run 60231750 SHA256 9c7f2bb44bb26a5effb915d8aa22132a6c06483e0cfa6f47b7265b15da83bbd7 SHA512 7368a60c282386bc5b68599cacd07a18a9be4c3fd624eac9eb92966221318723c3f44ae033163789eae1ae683e729d49268769e79c465aca6632c5a7e6d6942a WHIRLPOOL 552f590257e3e1e53b83563aeea840a78869c10ea2707cea779da99ec726cc17398fada84379537ac2e6a7dc8a653c8b00141ab35adb10a5a49d0da565c2eb73
-DIST NVIDIA-Linux-x86_64-337.25.run 68053486 SHA256 83280f7738f65bb2e790e7530a38978cf0bd0aa741eda51629c9e9b068128af0 SHA512 27cb5030da00d6fa2a2dd6701cc149ce885e7ff7e7ca4f1629c27737357fdadedec41e830f5cacabef14646515d6d2729f753d78424260316e28111f2c3e53b9 WHIRLPOOL 72eba5239ae7272d3501403ef292f0e131896b3dd852a7e2423e79206d99aa5a4a3b98eb4193ad5cd1e0247ffd48189d3a3ba02ca307a759a4f15b9c9a386dbd
-DIST NVIDIA-Linux-x86_64-340.32.run 69753673 SHA256 ef96003110564953cad4ffaec073696dcf9652338dfe5eb0c58ae3ce45db42ac SHA512 24c2dec161022bd229862ad66711232cf6424a0bd1eb056d7eb22a34e265d4b1f6208779cf507b480189f95f795d580a30ec5f8ab1bff549d2a41a57adcc14b4 WHIRLPOOL 6422498998253003fc1e1d6396449d2fe35b5836a083a254d9d7439434e5a3e1cf55afbcc3860a234ee9b3d0a1b18b9c58e4946107465559f0dcb121ef796e5a
-DIST NVIDIA-Linux-x86_64-340.46.run 69693129 SHA256 57e7694b5a985ee95d2da37598ec37cdabf40f914490f4cdb0c5184f12a74270 SHA512 43cce2911c1894fe9240453179666c5fd1f437b49a1e3e5990463e9009ffa25d5da7f91105d1520c6133a0bdef9070c768efdc087e2d8ef85ed7896fcf555c7a WHIRLPOOL 9f845c5b6621fcc34a5b64d1c5823a3978a04c669ee4d3f7e3aee3f8da06c1c6eaa3b51792be2e1006945ee06df0c1a2650fc70d4257b768ca4d144a79775892
-DIST NVIDIA-Linux-x86_64-340.58.run 69851185 SHA256 70cc452161b969d659225a3a7d4cc17d5827f8f8ce6eb053757f30f6a666a643 SHA512 c88a83d7a5493b8069d2cac24363c7ca2e87ea9ca617cf9ffb0277c52dc39624019479b61e218f7d7a033c58b685131582e38a02e5a529c96126225f5b8cf8db WHIRLPOOL 9bc7f8c6c4a4be0b7b1f10a3de02ad0a3c1039522df5e3703ba180988ad4cab007801b1858c274f41edc87d7851db6eb54f2f4599cc91ae9e2cf11b5ac0d8fb4
-DIST NVIDIA-Linux-x86_64-340.76.run 69955037 SHA256 3bf670e9a2bdb184648dec54ce06fab65e798a9a4c9dd5155e2be4efee3e0994 SHA512 59ad49a49f170ec971e2b5ee3a45b9f972521bc4b7ab6f02f46a5cfc5b1998841195cc5c91dffc417d2183de39c5a589eabf7b48864e0c6842363a75051db40c WHIRLPOOL 8c846f2b5b6f56bd2962fe4660751a4485e0ddd2186bde0affccece32271b03f4f3c226377c0b1877ea391ab130ed6f282c316f227205488a63e4f0a19db82cc
-DIST NVIDIA-Linux-x86_64-343.36.run 73775989 SHA256 2285efa2c0e6675d8724e47a09403630a674c32e514bdcfb54cec3c81810fc78 SHA512 6e76e54b24b0c1fa16e94eaf0f99d2e7dfd28e5aaae0bcb6df3e6d4e20c7a13d5d30902e2bc9bc7609c8d87e5ec8fbf16a5a2dd513bb9d761714176c4ce5e283 WHIRLPOOL 73040a3f3073486c5d6d0a5d84be7d478a3c15bb4aee21f3c590592afe2845f8e9c7064010ddc8f93b764e48940e523952abf9978d09cd32ec1ce8b644e59eb6
-DIST NVIDIA-Linux-x86_64-346.35.run 73462796 SHA256 8625acbbc7a2abdda436a5cb9d06f2a7f5913b16e0a35ac4f9f106853a94d086 SHA512 dab2ce5a722a93e83822cb83db6d3ef612274a6e3236b0ff34f081630cc00f76be5a0a1637b85dda2ca289336e44b6586afc82a228cb5de8ca1105d6bd4f4750 WHIRLPOOL f5255f714ff9f14edb26246826c810de05de1d6bcaeaf30f52294313aa1f68fbd432ddbddf576757cee711e19e4b7d2f14fb30f8975c9e2686395fb31998f413
-DIST NVIDIA-Linux-x86_64-346.59.run 73468725 SHA256 231020548431569c0172605815ba131a18f969966b4abf82129f974740bc64ca SHA512 a8d2cfcf750c4f0f155450a50132e1c2a6736212d654ab5539f1dd17233ed6f9ed64777f73f2b394e236d27abee4f4c7a344855372a641552ea40a8973fddfe9 WHIRLPOOL 0e919b147c9088106a8a3bf138262998a02b0da71c8e656d6b888f952e19b11ad8a0b6b4eee6e7181a8421aa2f0b4be86b82c0a14282e56e135f80e1c00aa659
diff --git a/x11-drivers/nvidia-drivers/files/10nvidia b/x11-drivers/nvidia-drivers/files/10nvidia
deleted file mode 100644
index f1bc2fef..00000000
--- a/x11-drivers/nvidia-drivers/files/10nvidia
+++ /dev/null
@@ -1 +0,0 @@
-__GL_NO_DSO_FINALIZER="1"
diff --git a/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch b/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch
deleted file mode 100644
index da92b8f0..00000000
--- a/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -NuarpbB NVIDIA-Linux-x86-256.25-ori/kernel/conftest.sh NVIDIA-Linux-x86-256.25/kernel/conftest.sh
---- NVIDIA-Linux-x86-256.25-ori/kernel/conftest.sh	2010-05-19 05:38:57.000000000 +0200
-+++ NVIDIA-Linux-x86-256.25/kernel/conftest.sh	2010-05-22 02:13:56.000000000 +0200
-@@ -101,7 +101,7 @@ build_cflags() {
- 
-     if [ "$OUTPUT" != "$SOURCES" ]; then
-         MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default"
--        if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-+        if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
-             MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
-             MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
-         fi
-@@ -110,7 +110,7 @@ build_cflags() {
-         fi
-     else
-         MACH_CFLAGS="-I$HEADERS/asm/mach-default"
--        if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-+        if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
-             MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
-             MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
-         fi
-@@ -121,7 +121,7 @@ build_cflags() {
- 
-     CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
- 
--    if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-+    if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
-         CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
-     fi
-     if [ -n "$BUILD_PARAMS" ]; then
diff --git a/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit b/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit
deleted file mode 100644
index 75b39cfb..00000000
--- a/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit
+++ /dev/null
@@ -1,21 +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/nvidia-drivers/files/eblits/donvidia.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $
-
-# Install nvidia library:
-# the first parameter is the place where to install it
-# the second parameter is the base name of the library
-# the third parameter is the provided soversion
-donvidia() {
-	dodir $1
-	exeinto $1
-
-	libname=$(basename $2)
-
-	# libnvidia-cfg.so is no longer supplied in lib32; step over it gracefully
-	if [ -e $2.$3 ] ; then
-		doexe $2.$3
-		dosym ${libname}.$3 $1/${libname}
-		[[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1
-	fi
-}
diff --git a/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit b/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit
deleted file mode 100644
index b14df34b..00000000
--- a/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit
+++ /dev/null
@@ -1,19 +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/nvidia-drivers/files/eblits/mtrr_check.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
diff --git a/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit b/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit
deleted file mode 100644
index e48d11ce..00000000
--- a/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distribnuted under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $
-#
-src_install-libs() {
-	local pkglibdir=lib
-	local inslibdir=$(get_libdir)
-
-	if [[ ${#} -eq 2 ]] ; then
-		pkglibdir=${1}
-		inslibdir=${2}
-	elif has_multilib_profile && [[ ${ABI} == "x86" ]] ; then
-		pkglibdir=lib32
-	fi
-
-	local usrpkglibdir=usr/${pkglibdir}
-	local libdir=usr/X11R6/${pkglibdir}
-	local drvdir=${libdir}/modules/drivers
-	local extdir=${libdir}/modules/extensions
-	local incdir=usr/include/GL
-	local sover=${PV}
-	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
-	local NO_TLS_ROOT="${NV_ROOT}/no-tls"
-	local TLS_ROOT="${NV_ROOT}/tls"
-	local X11_LIB_DIR="/usr/${inslibdir}/xorg"
-
-	if use x86-fbsd; then
-		# on FreeBSD everything is on obj/
-		pkglibdir=obj
-		usrpkglibdir=obj
-		x11pkglibdir=obj
-		drvdir=obj
-		extdir=obj
-
-		# don't ask me why the headers are there.. glxext.h is missing
-		incdir=doc
-
-		# on FreeBSD it has just .1 suffix
-		sover=1
-	fi
-
-	# The GLX libraries
-	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGL.so ${sover}
-	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGLcore.so ${sover}
-
-	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libnvidia-cfg.so ${sover}
-
-	dodir ${NO_TLS_ROOT}
-	donvidia ${NO_TLS_ROOT} ${usrpkglibdir}/libnvidia-tls.so ${sover}
-
-	if ! use x86-fbsd; then
-		donvidia ${TLS_ROOT} ${usrpkglibdir}/tls/libnvidia-tls.so ${sover}
-	fi
-
-	if want_tls ; then
-		dosym ../tls/libnvidia-tls.so ${NV_ROOT}/lib
-		dosym ../tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
-		dosym ../tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib
-	else
-		dosym ../no-tls/libnvidia-tls.so ${NV_ROOT}/lib
-		dosym ../no-tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
-		dosym ../no-tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib
-	fi
-
-	if ! use x86-fbsd; then
-		# Install the .la file for libtool, to prevent e.g. bug #176423
-		[ -f "${FILESDIR}/libGL.la-r2" ] || die "libGL.la-r2 missing in FILESDIR"
-		local ver1=$(get_version_component_range 1)
-		local ver2=$(get_version_component_range 2)
-		local ver3=$(get_version_component_range 3)
-		sed -e "s:\${PV}:${PV}:"     \
-			-e "s:\${ver1}:${ver1}:" \
-			-e "s:\${ver2}:${ver2}:" \
-			-e "s:\${ver3}:${ver3}:" \
-			-e "s:\${libdir}:${inslibdir}:" \
-			"${FILESDIR}"/libGL.la-r2 > "${D}"/${NV_ROOT}/lib/libGL.la
-	fi
-
-	exeinto ${X11_LIB_DIR}/modules/drivers
-
-	[[ -f ${drvdir}/nvidia_drv.so ]] && \
-		doexe ${drvdir}/nvidia_drv.so
-
-	insinto /usr/${inslibdir}
-	[[ -f ${libdir}/libXvMCNVIDIA.a ]] && \
-		doins ${libdir}/libXvMCNVIDIA.a
-	exeinto /usr/${inslibdir}
-	# fix Bug 131315
-	[[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \
-		doexe ${libdir}/libXvMCNVIDIA.so.${PV} && \
-		dosym libXvMCNVIDIA.so.${PV} \
-			/usr/${inslibdir}/libXvMCNVIDIA.so
-
-	exeinto ${NV_ROOT}/extensions
-	[[ -f ${libdir}/modules/libnvidia-wfb.so.${sover} ]] && \
-		newexe ${libdir}/modules/libnvidia-wfb.so.${sover} libwfb.so
-	[[ -f ${extdir}/libglx.so.${sover} ]] && \
-		newexe ${extdir}/libglx.so.${sover} libglx.so
-
-	# Includes
-	insinto ${NV_ROOT}/include
-	doins ${incdir}/*.h
-
-	#cuda
-	if [[ -f usr/include/cuda/cuda.h ]]; then
-		dodir /usr/include/cuda
-		insinto /usr/include/cuda
-		doins usr/include/cuda/*.h
-
-		if [[ -f usr/${pkglibdir}/libcuda.so.${PV} ]]; then
-			dolib.so usr/${pkglibdir}/libcuda.so.${PV}
-			dosym libcuda.so.${PV} /usr/${inslibdir}/libcuda.so.1
-			dosym libcuda.so.1 /usr/${inslibdir}/libcuda.so
-		fi
-	fi
-}
diff --git a/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit b/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit
deleted file mode 100644
index 4debb85d..00000000
--- a/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit
+++ /dev/null
@@ -1,33 +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/nvidia-drivers/files/eblits/want_tls.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $
-
-want_tls() {
-	# For uclibc or anything non glibc, return false
-	has_version sys-libs/glibc || return 1
-
-	# Old versions of glibc were lt/no-tls only
-	has_version '<sys-libs/glibc-2.3.2' && return 1
-
-	if use x86 ; then
-		case ${CHOST/-*} in
-			i486|i586|i686) ;;
-			*) return 1 ;;
-		esac
-	fi
-
-	# If we've got nptl, we've got tls
-	built_with_use --missing true sys-libs/glibc nptl && return 0
-
-	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
-	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
-		case ${CHOST/-*} in
-			i486|i586) return 1 ;;
-		esac
-	fi
-
-	# These versions built linuxthreads version to support tls, too
-	has_version '>=sys-libs/glibc-2.3.4.20040619-r2' && return 0
-
-	return 1
-}
diff --git a/x11-drivers/nvidia-drivers/files/libGL.la-r2 b/x11-drivers/nvidia-drivers/files/libGL.la-r2
deleted file mode 100644
index 863d1844..00000000
--- a/x11-drivers/nvidia-drivers/files/libGL.la-r2
+++ /dev/null
@@ -1,32 +0,0 @@
-# libGL.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libGL.so.1'
-
-# Names of this library.
-library_names='libGL.so.${PV} libGL.so.1 libGL.so'
-
-# The name of the static archive.
-old_library=''
-
-# Libraries that this one depends upon.
-dependency_libs='-L/usr/${libdir} -lm -lX11 -lXext -ldl'
-
-# Version information for libGL.
-current=${ver1}
-age=${ver2}
-revision=${ver3}
-
-# Is this an already installed library?
-installed=yes
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/usr/${libdir}'
diff --git a/x11-drivers/nvidia-drivers/files/make-use-of-the-new-uapi-framework.patch b/x11-drivers/nvidia-drivers/files/make-use-of-the-new-uapi-framework.patch
deleted file mode 100644
index b408b6ae..00000000
--- a/x11-drivers/nvidia-drivers/files/make-use-of-the-new-uapi-framework.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 1e3d34ce7d8c4912c08386589843fcc4ba4d38bf Mon Sep 17 00:00:00 2001
-From: Alberto Milone <alberto.milone@canonical.com>
-Date: Wed, 7 Nov 2012 12:03:46 +0100
-Subject: [PATCH 1/2] Make use of the new uapi framework
-
----
- conftest.sh |    7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/conftest.sh b/conftest.sh
-index 388e268..8eff4d7 100755
---- a/conftest.sh
-+++ b/conftest.sh
-@@ -20,6 +20,7 @@ ARCH=$3
- ISYSTEM=`$CC -print-file-name=include 2> /dev/null`
- SOURCES=$4
- HEADERS=$SOURCES/include
-+HEADERSA=$SOURCES/include/uapi
- OUTPUT=$5
- XEN_PRESENT=1
- 
-@@ -118,7 +119,7 @@ build_cflags() {
-         fi
-     fi
- 
--    CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
-+    CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
- 
-     test_xen
- 
-@@ -146,10 +147,10 @@ build_cflags() {
-         fi
-     fi
- 
--    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
-+    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
- 
-     if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
--        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
-+        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/uapi -I$OUTPUT/arch/x86/include/generated -I$OUTPUT/arch/x86/include/generated/uapi"
-     elif [ "$ARCH" = "arm" ]; then
-         CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include -I$OUTPUT/arch/arm/include/generated"
-     fi
--- 
-1.7.9.5
-
diff --git a/x11-drivers/nvidia-drivers/files/nvidia b/x11-drivers/nvidia-drivers/files/nvidia
deleted file mode 100644
index 7cf0f7c0..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia
+++ /dev/null
@@ -1,40 +0,0 @@
-# Nvidia drivers support
-alias char-major-195 nvidia
-alias /dev/nvidiactl char-major-195
-
-# To tweak the driver the following options can be used, note that
-# you should be careful, as it could cause instability!! For more 
-# options see /usr/share/doc/PACKAGE/README 
-#
-#   To enable Side Band Adressing:  NVreg_EnableAGPSBA=1
-#
-#   To enable Fast Writes: NVreg_EnableAGPFW=1
-#
-# To enable both for instance, uncomment following line:
-#
-#options nvidia NVreg_EnableAGPSBA=1 NVreg_EnableAGPFW=1
-# If you have a mobile chip, you may need to enable this option
-# if you have hard lockups when starting X.
-#
-# See: Appendix I. Configuring your laptop
-# In /usr/share/doc/PACKAGE/README for full details
-#
-# Choose the appropriate value for NVreg_Mobile from the table:
-#        Value		Meaning
-#        ----------	--------------------------------------------------
-#        0xFFFFFFFF	let the kernel module autodetect the correct value
-#        1		Dell laptops
-#        2		non-Compal Toshiba laptops
-#        3		all other laptops
-#        4		Compal Toshiba laptops
-#        5		Gateway laptops
-#
-#options nvidia NVreg_SoftEDIDs=0 NVreg_Mobile=3
-
-
-# !!! SECURITY WARNING !!!
-# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW
-# WHAT YOU ARE DOING.
-# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH,
-# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE.
-options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-169.07 b/x11-drivers/nvidia-drivers/files/nvidia-169.07
deleted file mode 100644
index a96b0cd1..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-169.07
+++ /dev/null
@@ -1,14 +0,0 @@
-# Nvidia drivers support
-alias char-major-195 nvidia
-alias /dev/nvidiactl char-major-195
-
-# To tweak the driver the following options can be used, note that
-# you should be careful, as it could cause instability!! For more 
-# options see /usr/share/doc/PACKAGE/README 
-#
-# !!! SECURITY WARNING !!!
-# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW
-# WHAT YOU ARE DOING.
-# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH,
-# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE.
-options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-173-3.10.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-173-3.10.patch
deleted file mode 100644
index 9d3016ba..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-173-3.10.patch
+++ /dev/null
@@ -1,714 +0,0 @@
-From c3248bb6c976c112e9efa9e8f202590b2f9b40a5 Mon Sep 17 00:00:00 2001
-From: Alberto Milone <alberto.milone@canonical.com>
-Date: Tue, 18 Jun 2013 15:16:18 +0200
-Subject: [PATCH 1/1] Add support for Linux 3.10
-
----
- nv-i2c.c   |   13 +--
- nv-linux.h |    1 +
- nv.c       |  375 ++++++++++++++++++++++++++++++++++++++----------------------
- 3 files changed, 241 insertions(+), 148 deletions(-)
-
-diff --git a/nv-i2c.c b/nv-i2c.c
-index 143f9e4..aaee787 100644
---- a/usr/src/nv/nv-i2c.c
-+++ b/usr/src/nv/nv-i2c.c
-@@ -307,8 +307,6 @@ void* NV_API_CALL nv_i2c_add_adapter(nv_state_t *nv, U032 port)
- BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void *data)
- {
-     struct i2c_adapter *pI2cAdapter = (struct i2c_adapter *)data;
--    int osstatus = 0;
--    BOOL wasReleased = FALSE;
- 
- #if defined(KERNEL_2_4)
-     if (!NV_WEAK_SYMBOL_PRESENT(i2c_add_adapter))
-@@ -320,15 +318,10 @@ BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void *data)
-     if (!pI2cAdapter) return FALSE;
- 
-     // attempt release with the OS
--    osstatus = i2c_del_adapter(pI2cAdapter);
--
--    if (!osstatus)
--    {
--        os_free_mem(pI2cAdapter);
--        wasReleased = TRUE;
--    }
-+    i2c_del_adapter(pI2cAdapter);
-+    os_free_mem(pI2cAdapter);
- 
--    return wasReleased;
-+    return TRUE;
- }
- 
- #else // (defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE))
-diff --git a/nv-linux.h b/nv-linux.h
-index 963e059..9aac81a 100644
---- a/usr/src/nv/nv-linux.h
-+++ b/usr/src/nv/nv-linux.h
-@@ -163,6 +163,7 @@
- 
- #ifdef CONFIG_PROC_FS
- #include <linux/proc_fs.h>
-+#include <linux/seq_file.h>
- #endif
- 
- #ifdef CONFIG_MTRR
-diff --git a/nv.c b/nv.c
-index f82e46f..570c266 100644
---- a/usr/src/nv/nv.c
-+++ b/usr/src/nv/nv.c
-@@ -291,7 +291,6 @@ void NV_API_CALL nv_verify_pci_config(nv_state_t *nv, BOOL check_the_bars)
- 
- /* nvos_ functions.. do not take a state device parameter  */
- static void     nvos_proc_create(void);
--static void     nvos_proc_remove_all(struct proc_dir_entry *);
- static void     nvos_proc_remove(void);
- static int      nvos_count_devices(nv_stack_t *);
- 
-@@ -333,12 +332,34 @@ void          nv_kern_rc_timer(unsigned long);
- static int    nv_kern_apm_event(struct pm_dev *, pm_request_t, void *);
- #endif
- 
--static int    nv_kern_read_cardinfo(char *, char **, off_t off, int, int *, void *);
--static int    nv_kern_read_status(char *, char **, off_t off, int, int *, void *);
--static int    nv_kern_read_registry(char *, char **, off_t off, int, int *, void *);       
--static int    nv_kern_read_agpinfo(char *, char **, off_t off, int, int *, void *);
--static int    nv_kern_read_version(char *, char **, off_t off, int, int *, void *);
--static int    nv_kern_read_text_file(char *, char **, off_t off, int, int *, void *);
-+static const struct file_operations nv_procfs_text_fops;
-+static const struct file_operations nv_procfs_read_card_info_fops;
-+static const struct file_operations nv_procfs_version_fops;
-+static const struct file_operations nv_procfs_read_agp_info_fops;
-+static const struct file_operations nv_procfs_read_agp_info_gpu_fops;
-+static const struct file_operations nv_procfs_read_agp_status_fops;
-+static const struct file_operations nv_procfs_registry_fops;
-+
-+static int nv_procfs_show_text_file(struct seq_file *, void *);
-+static int nv_procfs_open_text_file(struct inode *, struct file *);
-+static void nvos_proc_add_text_file(struct proc_dir_entry *, const char *, const char *);
-+
-+static int nv_procfs_show_card_info(struct seq_file *, void *);
-+static int nv_procfs_read_card_info(struct inode *, struct file *);
-+
-+static int nv_procfs_show_version(struct seq_file *, void *);
-+static int nv_procfs_open_version(struct inode *, struct file *);
-+
-+static int nv_procfs_show_agp_info(struct seq_file *, void *);
-+static int nv_procfs_read_agp_info(struct inode *, struct file *);
-+
-+static int nv_procfs_read_agp_info_gpu(struct inode *, struct file *file);
-+static int nv_procfs_show_agp_status(struct seq_file *, void *);
-+static int nv_procfs_read_agp_status(struct inode *, struct file *);
-+
-+static int nv_procfs_show_registry(struct seq_file *, void *);
-+static int nv_procfs_open_registry(struct inode *, struct file *);
-+
- 
- int           nv_kern_ctl_open(struct inode *, struct file *);
- int           nv_kern_ctl_close(struct inode *, struct file *);
-@@ -604,6 +625,12 @@ static struct pci_dev* nv_get_pci_device(nv_state_t *nv)
-     return NULL;
- }
- 
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,9,255)
-+static inline void *PDE_DATA(const struct inode *inode) {
-+	return PDE(inode)->data;
-+}
-+#endif
-+
- static void nvos_proc_create(void)
- {
- #ifdef CONFIG_PROC_FS
-@@ -623,19 +650,19 @@ static void nvos_proc_create(void)
-     nv_state_t *nv;
-     nv_linux_state_t *nvl;
- 
--    proc_nvidia = create_proc_entry("driver/nvidia", d_flags, NULL);
-+    proc_nvidia = proc_mkdir_mode("driver/nvidia", d_flags, NULL);
-     if (!proc_nvidia)
-         goto failed;
- 
--    proc_nvidia_cards = create_proc_entry("cards", d_flags, proc_nvidia);
-+    proc_nvidia_cards = proc_mkdir_mode("cards", d_flags, proc_nvidia);
-     if (!proc_nvidia_cards)
-         goto failed;
- 
--    proc_nvidia_warnings = create_proc_entry("warnings", d_flags, proc_nvidia);
-+    proc_nvidia_warnings = proc_mkdir_mode("warnings", d_flags, proc_nvidia);
-     if (!proc_nvidia_warnings)
-         goto failed;
- 
--    proc_nvidia_patches = create_proc_entry("patches", d_flags, proc_nvidia);
-+    proc_nvidia_patches = proc_mkdir_mode("patches", d_flags, proc_nvidia);
-     if (!proc_nvidia_patches)
-         goto failed;
- 
-@@ -660,24 +687,19 @@ static void nvos_proc_create(void)
-             break;
- 
-         sprintf(name, "%d", i++);
--        entry = create_proc_entry(name, flags, proc_nvidia_cards);
-+        entry = proc_create_data(name, flags, proc_nvidia_cards,
-+                &nv_procfs_read_card_info_fops, nv);
-         if (!entry) {
-             NV_PCI_DEV_PUT(dev);
-             goto failed;
-         }
- 
--        entry->data = nv;
--        entry->read_proc = nv_kern_read_cardinfo;
--#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
--        entry->owner = THIS_MODULE;
--#endif
--
-         if (nvos_find_agp_capability(dev)) {
-             /*
-              * Create the /proc/driver/nvidia/agp/{status,host-bridge,card}
-              * entries now that we know there's AGP hardware.
-              */
--            entry = create_proc_entry("agp", d_flags, proc_nvidia);
-+            entry = proc_mkdir_mode("agp", d_flags, proc_nvidia);
-             if (!entry) {
-                 NV_PCI_DEV_PUT(dev);
-                 goto failed;
-@@ -688,72 +710,78 @@ static void nvos_proc_create(void)
- #endif
-             proc_nvidia_agp = entry;
- 
--            entry = create_proc_entry("status", flags, proc_nvidia_agp);
-+            entry = proc_create_data("status", flags, proc_nvidia_agp,
-+                &nv_procfs_read_agp_status_fops, nv);
-             if (!entry) {
-                 NV_PCI_DEV_PUT(dev);
-                 goto failed;
-             }
- 
--            entry->data = nv;
--            entry->read_proc = nv_kern_read_status;
--#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
--            entry->owner = THIS_MODULE;
--#endif
-+            entry = proc_create("host-bridge", flags, proc_nvidia_agp,
-+                &nv_procfs_read_agp_info_fops);
- 
--            entry = create_proc_entry("host-bridge", flags, proc_nvidia_agp);
-             if (!entry) {
-                 NV_PCI_DEV_PUT(dev);
-                 goto failed;
-             }
- 
--            entry->data = NULL;
--            entry->read_proc = nv_kern_read_agpinfo;
--#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
--            entry->owner = THIS_MODULE;
--#endif
--
--            entry = create_proc_entry("card", flags, proc_nvidia_agp);
-+            entry = proc_create_data("card", flags, proc_nvidia_agp,
-+                &nv_procfs_read_agp_info_gpu_fops, nv);
-             if (!entry) {
-                 NV_PCI_DEV_PUT(dev);
-                 goto failed;
-             }
- 
--            entry->data = nv;
--            entry->read_proc = nv_kern_read_agpinfo;
--#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
--            entry->owner = THIS_MODULE;
--#endif
-         }
- 
-         NV_PCI_DEV_PUT(dev);
-     }
- 
--    entry = create_proc_entry("version", flags, proc_nvidia);
-+    entry = proc_create("version", flags, proc_nvidia, &nv_procfs_version_fops);
-     if (!entry)
-         goto failed;
- 
--    entry->read_proc = nv_kern_read_version;
--#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
--    entry->owner = THIS_MODULE;
--#endif
--
--    entry = create_proc_entry("registry", flags, proc_nvidia);
-+    entry = proc_create("registry", flags, proc_nvidia,
-+        &nv_procfs_registry_fops);
-     if (!entry)
-         goto failed;
- 
--    entry->read_proc = nv_kern_read_registry;
--#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
--    entry->owner = THIS_MODULE;
--#endif
--
-     return;
- 
- failed:
-     nv_printf(NV_DBG_ERRORS, "NVRM: failed to create /proc entries!\n");
--    nvos_proc_remove_all(proc_nvidia);
-+    remove_proc_subtree("nvidia", proc_nvidia);
- #endif
- }
- 
-+static int
-+nv_procfs_show_text_file(
-+    struct seq_file *m,
-+    void *v
-+)
-+{
-+    seq_printf(m, "%s", (char *)m->private);
-+
-+    return 0;
-+}
-+
-+static int
-+nv_procfs_open_text_file(
-+    struct inode *inode,
-+    struct file *file
-+)
-+{
-+    return single_open(file, nv_procfs_show_text_file, PDE_DATA(inode));
-+}
-+
-+static const struct file_operations nv_procfs_text_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_text_file,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
- static void
- nvos_proc_add_text_file(
-     struct proc_dir_entry *parent,
-@@ -762,41 +790,18 @@ nvos_proc_add_text_file(
- )
- {
- #ifdef CONFIG_PROC_FS
--    struct proc_dir_entry *entry;
--
-     /* world readable file */
-     int flags = S_IFREG | S_IRUGO;
- 
--    entry = create_proc_entry(filename, flags, parent);
--    if (!entry) return;
--
--    entry->data = (void *)text;
--    entry->read_proc = nv_kern_read_text_file;
--#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
--    entry->owner = THIS_MODULE;
--#endif
-+    proc_create_data(filename, flags, parent, &nv_procfs_text_fops,
-+        (void *)text);
- #endif
- }
- 
--#ifdef CONFIG_PROC_FS
--static void nvos_proc_remove_all(struct proc_dir_entry *entry)
--{
--    while (entry) {
--        struct proc_dir_entry *next = entry->next;
--        if (entry->subdir)
--            nvos_proc_remove_all(entry->subdir);
--        remove_proc_entry(entry->name, entry->parent);
--        if (entry == proc_nvidia)
--            break;
--        entry = next;
--    }
--}
--#endif
--
- static void nvos_proc_remove(void)
- {
- #ifdef CONFIG_PROC_FS
--    nvos_proc_remove_all(proc_nvidia);
-+    remove_proc_subtree("nvidia", proc_nvidia);
- #endif
- }
- 
-@@ -3065,18 +3070,19 @@ void   NV_API_CALL  nv_set_dma_address_size(
- }
- 
- static int
--nv_kern_read_cardinfo(char *page, char **start, off_t off,
--        int count, int *eof, void *data)
-+nv_procfs_show_card_info(
-+    struct seq_file *m,
-+    void *v
-+)
- {
-     struct pci_dev *dev;
-     char *type, *fmt, tmpstr[NV_DEVICE_NAME_LENGTH];
--    int len = 0, status;
-+    int status;
-     U032 vbios_rev1, vbios_rev2, vbios_rev3, vbios_rev4, vbios_rev5;
-     nv_stack_t *sp = NULL;
- 
-     nv_state_t *nv;
--    nv = (nv_state_t *) data;
--    *eof = 1;
-+    nv = (nv_state_t *) m->private;
- 
-     dev = nv_get_pci_device(nv);
-     if (!dev)
-@@ -3094,38 +3100,38 @@ nv_kern_read_cardinfo(char *page, char **start, off_t off,
-         strcpy (tmpstr, "Unknown");
-     }
-     
--    len += sprintf(page+len, "Model: \t\t %s\n", tmpstr);
--    len += sprintf(page+len, "IRQ:   \t\t %d\n", nv->interrupt_line);
-+    seq_printf(m, "Model: \t\t %s\n", tmpstr);
-+    seq_printf(m, "IRQ:   \t\t %d\n", nv->interrupt_line);
- 
-     status = rm_get_vbios_version(sp, nv, &vbios_rev1, &vbios_rev2,
-                                   &vbios_rev3, &vbios_rev4, &vbios_rev5);
- 
-     if (status < 0) {
-         /* before rm_init_adapter */
--        len += sprintf(page+len, "Video BIOS: \t ??.??.??.??.??\n");
-+        seq_printf(m, "Video BIOS: \t ??.??.??.??.??\n");
-     } else {
-         fmt = "Video BIOS: \t %02x.%02x.%02x.%02x.%02x\n";
--        len += sprintf(page+len, fmt, vbios_rev1, vbios_rev2, vbios_rev3,
-+        seq_printf(m, fmt, vbios_rev1, vbios_rev2, vbios_rev3,
-                                                   vbios_rev4, vbios_rev5);
-     }
- 
-     if (nvos_find_agp_capability(dev)) type = "AGP";
-     else if (nvos_find_pci_express_capability(dev)) type = "PCI-E";
-     else type = "PCI";
--    len += sprintf(page+len, "Card Type: \t %s\n", type);
-+    seq_printf(m, "Card Type: \t %s\n", type);
- 
-     // Report the number of bits set in dev->dma_mask
--    len += sprintf(page+len, "DMA Size: \t %d bits\n",
-+    seq_printf(m, "DMA Size: \t %d bits\n",
-      nv_count_bits(dev->dma_mask));
--    len += sprintf(page+len, "DMA Mask: \t 0x%llx\n", dev->dma_mask);
--    len += sprintf(page+len, "Bus Location: \t %02x.%02x.%x\n",
-+    seq_printf(m, "DMA Mask: \t 0x%llx\n", dev->dma_mask);
-+    seq_printf(m, "Bus Location: \t %02x.%02x.%x\n",
-                    nv->bus, nv->slot, PCI_FUNC(dev->devfn));
- #ifdef DEBUG
-     do
-     {
-         int j;
-         for (j = 0; j < NV_GPU_NUM_BARS; j++)
--            len += sprintf(page+len, "BAR%i: \t\t 0x%08x (%iMB)\n",
-+            seq_printf(m, "BAR%i: \t\t 0x%08x (%iMB)\n",
-                            j, nv->bars[j].address, nv->bars[j].size >> 20);
-     } while(0);
- #endif
-@@ -3133,35 +3139,68 @@ nv_kern_read_cardinfo(char *page, char **start, off_t off,
-     NV_KMEM_CACHE_FREE_STACK(sp);
-  
-     NV_PCI_DEV_PUT(dev);
--    return len;
-+    return 0;
-+}
-+
-+static int
-+nv_procfs_read_card_info(
-+    struct inode *inode,
-+    struct file *file
-+)
-+{
-+    return single_open(file, nv_procfs_show_card_info, PDE_DATA(inode));
- }
- 
-+static const struct file_operations nv_procfs_read_card_info_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_read_card_info,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
- static int
--nv_kern_read_version(char *page, char **start, off_t off,
--        int count, int *eof, void *data)
-+nv_procfs_show_version(
-+    struct seq_file *m,
-+    void *v
-+)
- {
--    int len = 0;
--    *eof = 1;
--    
--    len += sprintf(page+len, "NVRM version: %s\n", pNVRM_ID);
--    len += sprintf(page+len, "GCC version:  %s\n", NV_COMPILER);
--    
--    return len;
-+    seq_printf(m, "NVRM version: %s\n", pNVRM_ID);
-+    seq_printf(m, "GCC version:  %s\n", NV_COMPILER);
-+
-+    return 0;
-+}
-+
-+static int
-+nv_procfs_open_version(
-+    struct inode *inode,
-+    struct file *file
-+)
-+{
-+    return single_open(file, nv_procfs_show_version, NULL);
- }
- 
-+static const struct file_operations nv_procfs_version_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_version,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
- static int
--nv_kern_read_agpinfo(char *page, char **start, off_t off,
--        int count, int *eof, void *data)
-+nv_procfs_show_agp_info(
-+    struct seq_file *m,
-+    void *v
-+)
- {
-     struct pci_dev *dev;
-     char   *fw, *sba;
-     u8     cap_ptr;
-     u32    status, command, agp_rate;
--    int    len = 0;
-     
-     nv_state_t *nv;
--    nv = (nv_state_t *) data;
--    *eof = 1;
-+    nv = (nv_state_t *) m->private;
- 
-     if (nv) {
-         dev = nv_get_pci_device(nv);
-@@ -3172,12 +3211,12 @@ nv_kern_read_agpinfo(char *page, char **start, off_t off,
-         if (!dev)
-             return 0;
- 
--        len += sprintf(page+len, "Host Bridge: \t ");
-+        seq_printf(m, "Host Bridge: \t ");
- 
- #if defined(CONFIG_PCI_NAMES)
--        len += sprintf(page+len, "%s\n", NV_PCI_DEVICE_NAME(dev));
-+        seq_printf(m, "%s\n", NV_PCI_DEVICE_NAME(dev));
- #else
--        len += sprintf(page+len, "PCI device %04x:%04x\n",
-+        seq_printf(m, "PCI device %04x:%04x\n",
-                 dev->vendor, dev->device);
- #endif
-     }
-@@ -3191,40 +3230,74 @@ nv_kern_read_agpinfo(char *page, char **start, off_t off,
-     fw  = (status & 0x00000010) ? "Supported" : "Not Supported";
-     sba = (status & 0x00000200) ? "Supported" : "Not Supported";
- 
--    len += sprintf(page+len, "Fast Writes: \t %s\n", fw);
--    len += sprintf(page+len, "SBA: \t\t %s\n", sba);
-+    seq_printf(m, "Fast Writes: \t %s\n", fw);
-+    seq_printf(m, "SBA: \t\t %s\n", sba);
- 
-     agp_rate = status & 0x7;
-     if (status & 0x8) // agp 3.0
-         agp_rate <<= 2;
- 
--    len += sprintf(page+len, "AGP Rates: \t %s%s%s%s\n",
-+    seq_printf(m, "AGP Rates: \t %s%s%s%s\n",
-             (agp_rate & 0x00000008) ? "8x " : "",
-             (agp_rate & 0x00000004) ? "4x " : "",
-             (agp_rate & 0x00000002) ? "2x " : "",
-             (agp_rate & 0x00000001) ? "1x " : "");
- 
--    len += sprintf(page+len, "Registers: \t 0x%08x:0x%08x\n", status, command);
-+    seq_printf(m, "Registers: \t 0x%08x:0x%08x\n", status, command);
- 
-     NV_PCI_DEV_PUT(dev);
--    return len;
-+    return 0;
-+}
-+
-+static int
-+nv_procfs_read_agp_info(
-+    struct inode *inode,
-+    struct file *file
-+)
-+{
-+    return single_open(file, nv_procfs_show_agp_info, NULL);
- }
- 
-+static const struct file_operations nv_procfs_read_agp_info_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_read_agp_info,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
- static int
--nv_kern_read_status(char *page, char **start, off_t off,
--        int count, int *eof, void *data)
-+nv_procfs_read_agp_info_gpu(
-+    struct inode *inode,
-+    struct file *file
-+)
-+{
-+    return single_open(file, nv_procfs_show_agp_info, PDE_DATA(inode));
-+}
-+
-+static const struct file_operations nv_procfs_read_agp_info_gpu_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_read_agp_info_gpu,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
-+static int
-+nv_procfs_show_agp_status(
-+    struct seq_file *m,
-+    void *v
-+)
- {
-     struct pci_dev *dev;
-     char   *fw, *sba, *drv;
--    int    len = 0;
-     u8     cap_ptr;
-     u32    scratch;
-     u32    status, command, agp_rate;
-     nv_stack_t *sp = NULL;
- 
-     nv_state_t *nv;
--    nv = (nv_state_t *) data;
--    *eof = 1;
-+    nv = (nv_state_t *) m->private;
- 
-     dev = nvos_get_agp_device_by_class(PCI_CLASS_BRIDGE_HOST);
-     if (!dev)
-@@ -3246,10 +3319,10 @@ nv_kern_read_status(char *page, char **start, off_t off,
-     command &= scratch;
- 
-     if (NV_AGP_ENABLED(nv) && (command & 0x100)) {
--        len += sprintf(page+len, "Status: \t Enabled\n");
-+        seq_printf(m, "Status: \t Enabled\n");
- 
-         drv = NV_OSAGP_ENABLED(nv) ? "AGPGART" : "NVIDIA";
--        len += sprintf(page+len, "Driver: \t %s\n", drv);
-+        seq_printf(m, "Driver: \t %s\n", drv);
- 
-         // mask off agp rate. 
-         // If this is agp 3.0, we need to shift the value
-@@ -3257,13 +3330,13 @@ nv_kern_read_status(char *page, char **start, off_t off,
-         if (status & 0x8) // agp 3.0
-             agp_rate <<= 2;
- 
--        len += sprintf(page+len, "AGP Rate: \t %dx\n", agp_rate);
-+        seq_printf(m, "AGP Rate: \t %dx\n", agp_rate);
- 
-         fw = (command & 0x00000010) ? "Enabled" : "Disabled";
--        len += sprintf(page+len, "Fast Writes: \t %s\n", fw);
-+        seq_printf(m, "Fast Writes: \t %s\n", fw);
- 
-         sba = (command & 0x00000200) ? "Enabled" : "Disabled";
--        len += sprintf(page+len, "SBA: \t\t %s\n", sba);
-+        seq_printf(m, "SBA: \t\t %s\n", sba);
-     } else {
-         int agp_config = 0;
- 
-@@ -3274,7 +3347,7 @@ nv_kern_read_status(char *page, char **start, off_t off,
-             return 0;
-         }
- 
--        len += sprintf(page+len, "Status: \t Disabled\n\n");
-+        seq_printf(m, "Status: \t Disabled\n\n");
- 
-         /*
-          * If we find AGP is disabled, but the RM registry indicates it
-@@ -3288,7 +3361,7 @@ nv_kern_read_status(char *page, char **start, off_t off,
-         rm_read_registry_dword(sp, nv, "NVreg", "XNvAGP", &agp_config);
- 
-         if (agp_config != NVOS_AGP_CONFIG_DISABLE_AGP && NV_AGP_FAILED(nv)) {
--            len += sprintf(page+len,
-+            seq_printf(m,
-                   "AGP initialization failed, please check the ouput  \n"
-                   "of the 'dmesg' command and/or your system log file \n"
-                   "for additional information on this problem.        \n");
-@@ -3298,37 +3371,63 @@ nv_kern_read_status(char *page, char **start, off_t off,
-     }
- 
-     NV_PCI_DEV_PUT(dev);
--    return len;
-+    return 0;
-+}
-+
-+static int
-+nv_procfs_read_agp_status(
-+    struct inode *inode,
-+    struct file *file
-+)
-+{
-+    return single_open(file, nv_procfs_show_agp_status, PDE_DATA(inode));
- }
- 
-+static const struct file_operations nv_procfs_read_agp_status_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_read_agp_status,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
- extern nv_parm_t nv_parms[];
- extern char *NVreg_RegistryDwords;
- 
- static int
--nv_kern_read_registry(char *page, char **start, off_t off,
--        int count, int *eof, void *data)
-+nv_procfs_show_registry(
-+    struct seq_file *m,
-+    void *v
-+)
- {
--    unsigned int i, len = 0;
-+    unsigned int i;
-     nv_parm_t *entry;
--    *eof = 1;
- 
-     for (i = 0; (entry = &nv_parms[i])->name != NULL; i++)
--        len += sprintf(page+len, "%s: %u\n", entry->name, *entry->data);
-+        seq_printf(m, "%s: %u\n", entry->name, *entry->data);
- 
--    len += sprintf(page+len, "RegistryDwords: \"%s\"\n",
-+    seq_printf(m, "RegistryDwords: \"%s\"\n",
-                 (NVreg_RegistryDwords != NULL) ? NVreg_RegistryDwords : "");
- 
--    return len;
-+    return 0;
- }
- 
- static int
--nv_kern_read_text_file(char *page, char **start, off_t off,
--        int count, int *eof, void *data)
-+nv_procfs_open_registry(
-+    struct inode *inode,
-+    struct file  *file
-+)
- {
--    *eof = 1;
--    return sprintf(page, "%s", (char *)data);
-+    return single_open(file, nv_procfs_show_registry, NULL);
- }
- 
-+static const struct file_operations nv_procfs_registry_fops = {
-+    .open    = nv_procfs_open_registry,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
- /***
-  *** EXPORTS to rest of resman
-  ***/
--- 
-1.7.9.5
-
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-173-3.13.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-173-3.13.patch
deleted file mode 100644
index ab3de168..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-173-3.13.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/usr/src/nv/nvacpi.c
-+++ b/usr/src/nv/nvacpi.c
-@@ -303,7 +307,10 @@ static int nv_acpi_remove(struct acpi_de
- 
-     if (pNvAcpiObject->notify_handler_installed)
-     {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
-+ /* beginning with 3.13, acpi_remove_notify_handler() waits for events to finish */
-         NV_ACPI_OS_WAIT_EVENTS_COMPLETE();
-+#endif
- 
-         // remove event notifier
-         status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-173-3.14.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-173-3.14.patch
deleted file mode 100644
index 47bb70bc..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-173-3.14.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/usr/src/nv/nv-linux.h
-+++ b/usr/src/nv/nv-linux.h
-@@ -206,8 +206,7 @@ extern int nv_pat_mode;
- #endif
- 
- #if defined(CONFIG_ACPI) 
--#include <acpi/acpi.h>
--#include <acpi/acpi_drivers.h>
-+#include <linux/acpi.h>
- #if defined(NV_ACPI_DEVICE_OPS_HAS_MATCH) || defined(ACPI_VIDEO_HID)
- #define NV_LINUX_ACPI_EVENTS_SUPPORTED 1
- #endif
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-260.19.44-2.6.39.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-260.19.44-2.6.39.patch
deleted file mode 100644
index 32efbf12..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-260.19.44-2.6.39.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kernel.orig/nv-linux.h
-+++ kernel/nv-linux.h
-@@ -87,7 +87,6 @@
- #if !defined(KERNEL_2_4)
- #include <linux/sched.h>            /* suser(), capable() replacement   */
- #include <linux/moduleparam.h>      /* module_param()                   */
--#include <linux/smp_lock.h>         /* kernel_locked                    */
- #include <asm/tlbflush.h>           /* flush_tlb(), flush_tlb_all()     */
- #include <asm/kmap_types.h>         /* page table entry lookup          */
- #endif
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-290.10-3.2.8+.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-290.10-3.2.8+.patch
deleted file mode 100644
index 4834f7b8..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-290.10-3.2.8+.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/kernel/conftest.sh
-+++ b/kernel/conftest.sh
-@@ -122,7 +122,7 @@ build_cflags() {
-     CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
- 
-     if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
--        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
-+        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/generated"
-     fi
-     if [ -n "$BUILD_PARAMS" ]; then
-         CFLAGS="$CFLAGS -D$BUILD_PARAMS"
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-3.13.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-3.13.patch
deleted file mode 100644
index 69c1ef85..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-3.13.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/kernel/nv-acpi.c
-+++ b/kernel/nv-acpi.c
-@@ -303,7 +307,10 @@ static int nv_acpi_remove(struct acpi_de
- 
-     if (pNvAcpiObject->notify_handler_installed)
-     {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
-+ /* beginning with 3.13, acpi_remove_notify_handler() waits for events to finish */
-         NV_ACPI_OS_WAIT_EVENTS_COMPLETE();
-+#endif
- 
-         // remove event notifier
-         status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);
---- a/kernel/uvm/nvidia_uvm_linux.h
-+++ b/kernel/uvm/nvidia_uvm_linux.h
-@@ -405,11 +405,17 @@ typedef void irqreturn_t;
- // not require the RCU's read lock on current->cred.
- //
- //
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
-+#define NV_KUID_TO_UID(value) (__kuid_val(value))
-+#else
-+#define NV_KUID_TO_UID(value) (value)
-+#endif
-+
- #if defined(NV_TASK_STRUCT_HAS_CRED)
- #define NV_CURRENT_EUID() \
--    (((typeof(*current->cred) __force __kernel *)current->cred)->euid)
-+        NV_KUID_TO_UID(((typeof(*current->cred) __force __kernel *)current->cred)->euid)
- #else
--#define NV_CURRENT_EUID() (current->euid)
-+#define NV_CURRENT_EUID() NV_KUID_TO_UID(current->euid)
- #endif
- 
- #define NV_ATOMIC_SET(data,val)         atomic_set(&(data), (val))
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-3.14.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-3.14.patch
deleted file mode 100644
index 48df3cba..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-3.14.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/kernel/nv-linux.h
-+++ b/kernel/nv-linux.h
-@@ -273,8 +273,7 @@
- #endif
- 
- #if !defined(NV_VMWARE) && defined(CONFIG_ACPI)
--#include <acpi/acpi.h>
--#include <acpi/acpi_drivers.h>
-+#include <linux/acpi.h>
- #if defined(NV_ACPI_DEVICE_OPS_HAS_MATCH) || defined(ACPI_VIDEO_HID)
- #define NV_LINUX_ACPI_EVENTS_SUPPORTED 1
- #endif
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-3.19.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-3.19.patch
deleted file mode 100644
index 3cdaa598..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-3.19.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/kernel/nv.c
-+++ b/kernel/nv.c
-@@ -2026,7 +2026,7 @@ long nv_kern_unlocked_ioctl(
-     unsigned long i_arg
- )
- {
--    return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
-+    return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
- }
- 
- long nv_kern_compat_ioctl(
-@@ -2035,7 +2035,7 @@ long nv_kern_compat_ioctl(
-     unsigned long i_arg
- )
- {
--    return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
-+    return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
- }
- 
- /*
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-304-3.10.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-304-3.10.patch
deleted file mode 100644
index 514e671e..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-304-3.10.patch
+++ /dev/null
@@ -1,626 +0,0 @@
-diff -Nurp work.orig/kernel/nv-i2c.c work/kernel/nv-i2c.c
---- work.orig/kernel/nv-i2c.c	2013-07-04 13:19:12.255911539 +0000
-+++ work/kernel/nv-i2c.c	2013-07-04 13:08:08.479793566 +0000
-@@ -311,8 +311,6 @@ void* NV_API_CALL nv_i2c_add_adapter(nv_
- BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void *data)
- {
-     struct i2c_adapter *pI2cAdapter = (struct i2c_adapter *)data;
--    int osstatus = 0;
--    BOOL wasReleased = FALSE;
- 
- #if defined(KERNEL_2_4)
-     if (!NV_WEAK_SYMBOL_PRESENT(i2c_add_adapter))
-@@ -324,15 +322,10 @@ BOOL NV_API_CALL nv_i2c_del_adapter(nv_s
-     if (!pI2cAdapter) return FALSE;
- 
-     // attempt release with the OS
--    osstatus = i2c_del_adapter(pI2cAdapter);
-+    i2c_del_adapter(pI2cAdapter);
-+    os_free_mem(pI2cAdapter);
- 
--    if (!osstatus)
--    {
--        os_free_mem(pI2cAdapter);
--        wasReleased = TRUE;
--    }
--
--    return wasReleased;
-+    return TRUE;
- }
- 
- #else // (defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE))
-diff -Nurp work.orig/kernel/nv-procfs.c work/kernel/nv-procfs.c
---- work.orig/kernel/nv-procfs.c	2013-07-04 13:19:12.259244771 +0000
-+++ work/kernel/nv-procfs.c	2013-07-04 13:17:31.246205962 +0000
-@@ -60,60 +60,41 @@ static char nv_registry_keys[NV_MAX_REGI
-         __entry;                                          \
-     })
- 
--#define NV_CREATE_PROC_FILE(name,parent,__read_proc,           \
--    __write_proc,__fops,__data)                                \
--   ({                                                          \
--        struct proc_dir_entry *__entry;                        \
--        int __mode = (S_IFREG | S_IRUGO);                      \
--        if ((NvUPtr)(__write_proc) != 0)                       \
--            __mode |= S_IWUSR;                                 \
--        __entry = NV_CREATE_PROC_ENTRY(name, __mode, parent);  \
--        if (__entry != NULL)                                   \
--        {                                                      \
--            if ((NvUPtr)(__read_proc) != 0)                    \
--                __entry->read_proc = (__read_proc);            \
--            if ((NvUPtr)(__write_proc) != 0)                   \
--            {                                                  \
--                __entry->write_proc = (__write_proc);          \
--                __entry->proc_fops = (__fops);                 \
--            }                                                  \
--            __entry->data = (__data);                          \
--        }                                                      \
--        __entry;                                               \
--    })
-+#define NV_PROC_RW (S_IFREG|S_IRUGO|S_IWUSR)
-+#define NV_PROC_RO (S_IFREG|S_IRUGO)
- 
- #define NV_CREATE_PROC_DIR(name,parent)                        \
-    ({                                                          \
-         struct proc_dir_entry *__entry;                        \
-         int __mode = (S_IFDIR | S_IRUGO | S_IXUGO);            \
--        __entry = NV_CREATE_PROC_ENTRY(name, __mode, parent);  \
-+        __entry = proc_mkdir_mode(name, __mode, parent);       \
-         __entry;                                               \
-     })
- 
-+//#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,9,255)
-+//static inline void *PDE_DATA(const struct inode *inode) {
-+//	return PDE(inode)->data;
-+//}
-+//#endif
-+
- #define NV_PROC_WRITE_BUFFER_SIZE   (64 * RM_PAGE_SIZE)
- 
- static int
--nv_procfs_read_gpu_info(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
-+nv_procfs_show_gpu_info(
-+    struct seq_file *m,
-+    void *v
- )
- {
--    nv_state_t *nv = data;
-+    nv_state_t *nv = m->private;
-     nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
-     struct pci_dev *dev = nvl->dev;
-     char *type, *fmt, tmpstr[NV_DEVICE_NAME_LENGTH];
--    int len = 0, status;
-+    int status;
-     NvU8 *uuid;
-     NvU32 vbios_rev1, vbios_rev2, vbios_rev3, vbios_rev4, vbios_rev5;
-     NvU32 fpga_rev1, fpga_rev2, fpga_rev3;
-     nv_stack_t *sp = NULL;
- 
--    *eof = 1;
--
-     NV_KMEM_CACHE_ALLOC_STACK(sp);
-     if (sp == NULL)
-     {
-@@ -134,31 +115,31 @@ nv_procfs_read_gpu_info(
-         if (rm_get_device_name(sp, nv, dev->device, dev->subsystem_vendor,
-                     dev->subsystem_device, NV_DEVICE_NAME_LENGTH,
-                     tmpstr) != RM_OK)
--        {
-+ 		       {
-             strcpy (tmpstr, "Unknown");
-         }
-     }
- 
--    len += sprintf(page+len, "Model: \t\t %s\n", tmpstr);
--    len += sprintf(page+len, "IRQ:   \t\t %d\n", nv->interrupt_line);
-+    seq_printf(m, "Model: \t\t %s\n", tmpstr);
-+    seq_printf(m, "IRQ:   \t\t %d\n", nv->interrupt_line);
- 
-     if (NV_IS_GVI_DEVICE(nv))
-     {
-         status = rm_gvi_get_firmware_version(sp, nv, &fpga_rev1, &fpga_rev2,
-                                              &fpga_rev3);
-         if (status != RM_OK)
--            len += sprintf(page+len, "Firmware: \t ????.??.??\n");
-+            seq_printf(m, "Firmware: \t ????.??.??\n");
-         else
-         {
-             fmt = "Firmware: \t %x.%x.%x\n";
--            len += sprintf(page+len, fmt, fpga_rev1, fpga_rev2, fpga_rev3);
-+            seq_printf(m, fmt, fpga_rev1, fpga_rev2, fpga_rev3);
-         }
-     }
-     else
-     {
-         if (rm_get_gpu_uuid(sp, nv, &uuid, NULL) == RM_OK)
-         {
--            len += sprintf(page+len, "GPU UUID: \t %s\n", (char *)uuid);
-+            seq_printf(m, "GPU UUID: \t %s\n", (char *)uuid);
-             os_free_mem(uuid);
-         }
- 
-@@ -166,12 +147,12 @@ nv_procfs_read_gpu_info(
-                     &vbios_rev3, &vbios_rev4,
-                     &vbios_rev5) != RM_OK)
-         {
--            len += sprintf(page+len, "Video BIOS: \t ??.??.??.??.??\n");
-+            seq_printf(m, "Video BIOS: \t ??.??.??.??.??\n");
-         }
-         else
-         {
-             fmt = "Video BIOS: \t %02x.%02x.%02x.%02x.%02x\n";
--            len += sprintf(page+len, fmt, vbios_rev1, vbios_rev2, vbios_rev3,
-+            seq_printf(m, fmt, vbios_rev1, vbios_rev2, vbios_rev3,
-                            vbios_rev4, vbios_rev5);
-         }
-     }
-@@ -182,12 +163,12 @@ nv_procfs_read_gpu_info(
-         type = "PCI-E";
-     else
-         type = "PCI";
--    len += sprintf(page+len, "Bus Type: \t %s\n", type);
-+    seq_printf(m, "Bus Type: \t %s\n", type);
- 
--    len += sprintf(page+len, "DMA Size: \t %d bits\n",
-+    seq_printf(m, "DMA Size: \t %d bits\n",
-      nv_count_bits(dev->dma_mask));
--    len += sprintf(page+len, "DMA Mask: \t 0x%llx\n", dev->dma_mask);
--    len += sprintf(page+len, "Bus Location: \t %04x:%02x.%02x.%x\n",
-+    seq_printf(m, "DMA Mask: \t 0x%llx\n", dev->dma_mask);
-+    seq_printf(m, "Bus Location: \t %04x:%02x.%02x.%x\n",
-                    nv->domain, nv->bus, nv->slot, PCI_FUNC(dev->devfn));
- #if defined(DEBUG)
-     do
-@@ -195,7 +176,7 @@ nv_procfs_read_gpu_info(
-         int j;
-         for (j = 0; j < NV_GPU_NUM_BARS; j++)
-         {
--            len += sprintf(page+len, "BAR%u: \t\t 0x%llx (%lluMB)\n",
-+            seq_printf(m, "BAR%u: \t\t 0x%llx (%lluMB)\n",
-                            j, nv->bars[j].address, (nv->bars[j].size >> 20));
-         }
-     } while (0);
-@@ -203,26 +184,120 @@ nv_procfs_read_gpu_info(
- 
-     NV_KMEM_CACHE_FREE_STACK(sp);
- 
--    return len;
-+    return 0;
- }
- 
- static int
--nv_procfs_read_version(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
-+nv_procfs_open_gpu_info(
-+    struct inode *inode,
-+    struct file *file
- )
- {
--    int len = 0;
--    *eof = 1;
-+    return single_open(file, nv_procfs_show_gpu_info, PDE_DATA(inode));
-+}
- 
--    len += sprintf(page+len, "NVRM version: %s\n", pNVRM_ID);
--    len += sprintf(page+len, "GCC version:  %s\n", NV_COMPILER);
-+static const struct file_operations nv_procfs_gpu_info_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_gpu_info,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
- 
--    return len;
-+static int
-+nv_procfs_show_version(
-+    struct seq_file *m,
-+    void *v
-+)
-+{
-+    seq_printf(m, "NVRM version: %s\n", pNVRM_ID);
-+    seq_printf(m, "GCC version:  %s\n", NV_COMPILER);
-+
-+    return 0;
-+}
-+
-+static int
-+nv_procfs_open_version(
-+    struct inode *inode,
-+    struct file *file
-+)
-+{
-+    return single_open(file, nv_procfs_show_version, NULL);
-+}
-+
-+static const struct file_operations nv_procfs_version_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_version,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
-+static int
-+nv_procfs_show_registry(
-+    struct seq_file *m,
-+    void *v
-+)
-+{
-+    nv_state_t *nv = m->private;
-+    nv_linux_state_t *nvl = NULL;
-+    char *registry_keys;
-+
-+    if (nv != NULL)
-+        nvl = NV_GET_NVL_FROM_NV_STATE(nv);
-+    registry_keys = ((nvl != NULL) ?
-+            nvl->registry_keys : nv_registry_keys);
-+
-+    seq_printf(m, "Binary: \"%s\"\n", registry_keys);
-+
-+    return 0;
-+}
-+
-+static ssize_t
-+nv_procfs_write_registry(
-+    struct file       *file,
-+    const char __user *buffer,
-+    size_t             count,
-+    loff_t            *pos
-+)
-+{
-+    int status = 0;
-+    nv_file_private_t *nvfp = NV_GET_FILE_PRIVATE(file);
-+    char *proc_buffer;
-+    unsigned long bytes_left;
-+
-+    down(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
-+
-+    bytes_left = (NV_PROC_WRITE_BUFFER_SIZE - nvfp->off - 1);
-+
-+    if (count == 0)
-+    {
-+        status = -EINVAL;
-+        goto done;
-+    }
-+    else if ((bytes_left == 0) || (count > bytes_left))
-+    {
-+        status = -ENOSPC;
-+        goto done;
-+    }
-+
-+    proc_buffer = &((char *)nvfp->data)[nvfp->off];
-+
-+    if (copy_from_user(proc_buffer, buffer, count))
-+    {
-+        nv_printf(NV_DBG_ERRORS, "NVRM: failed to copy in proc data!\n");
-+        status = -EFAULT;
-+    }
-+    else
-+    {
-+        nvfp->proc_data = PDE_DATA(file->f_inode);
-+        nvfp->off += count;
-+    }
-+
-+done:
-+    up(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
-+
-+    return ((status < 0) ? status : count);
- }
- 
- static struct pci_dev *nv_get_agp_device_by_class(unsigned int class)
-@@ -432,7 +507,7 @@ nv_procfs_open_registry(
-     nv_stack_t *sp = NULL;
- 
-     if (0 == (file->f_mode & FMODE_WRITE))
--        return 0;
-+        return single_open(file, nv_procfs_show_registry, PDE_DATA(inode));
- 
-     nvfp = nv_alloc_file_private();
-     if (nvfp == NULL)
-@@ -481,6 +556,9 @@ nv_procfs_close_registry(
-     RM_STATUS rm_status;
-     int rc = 0;
- 
-+    if (0 == (file->f_mode & FMODE_WRITE))
-+        return single_release(inode, file);
-+
-     nvfp = NV_GET_FILE_PRIVATE(file);
-     if (nvfp == NULL)
-         return 0;
-@@ -545,122 +623,81 @@ done:
-     return rc;
- }
- 
--static struct file_operations nv_procfs_registry_fops = {
-+static const struct file_operations nv_procfs_registry_fops = {
-     .open    = nv_procfs_open_registry,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .write   = nv_procfs_write_registry,
-     .release = nv_procfs_close_registry,
- };
- 
- static int
--nv_procfs_read_params(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
-+nv_procfs_show_params(
-+    struct seq_file *m,
-+    void *v
- )
- {
-     unsigned int i;
--    int len = 0;
-     nv_parm_t *entry;
- 
--    *eof = 1;
- 
-     for (i = 0; (entry = &nv_parms[i])->name != NULL; i++)
--        len += sprintf(page+len, "%s: %u\n", entry->name, *entry->data);
-+        seq_printf(m, "%s: %u\n", entry->name, *entry->data);
- 
--    len += sprintf(page+len, "RegistryDwords: \"%s\"\n",
-+    seq_printf(m, "RegistryDwords: \"%s\"\n",
-                 (NVreg_RegistryDwords != NULL) ? NVreg_RegistryDwords : "");
--    len += sprintf(page+len, "RmMsg: \"%s\"\n",
-+    seq_printf(m, "RmMsg: \"%s\"\n",
-                 (NVreg_RmMsg != NULL) ? NVreg_RmMsg : "");
- 
--    return len;
-+    return 0;
- }
- 
- static int
--nv_procfs_read_registry(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
--)
-+nv_procfs_open_params(
-+    struct inode *inode,
-+    struct file *file
-+)    
- {
--    nv_state_t *nv = data;
--    nv_linux_state_t *nvl = NULL;
--    char *registry_keys;
-+    return single_open(file, nv_procfs_show_params, NULL);
-+}
- 
--    if (nv != NULL)
--        nvl = NV_GET_NVL_FROM_NV_STATE(nv);
--    registry_keys = ((nvl != NULL) ?
--            nvl->registry_keys : nv_registry_keys);
-+static const struct file_operations nv_procfs_params_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_params,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
- 
--    *eof = 1;
--    return sprintf(page, "Binary: \"%s\"\n", registry_keys);
--}
- 
- static int
--nv_procfs_write_registry(
--    struct file   *file,
--    const char    *buffer,
--    unsigned long  count,
--    void          *data
-+nv_procfs_show_text_file(
-+    struct seq_file *m,
-+    void *v
- )
- {
--    int status = 0;
--    nv_file_private_t *nvfp = NV_GET_FILE_PRIVATE(file);
--    char *proc_buffer;
--    unsigned long bytes_left;
--
--    down(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
-+    seq_printf(m, "%s", (char *)m->private);
- 
--    bytes_left = (NV_PROC_WRITE_BUFFER_SIZE - nvfp->off - 1);
--
--    if (count == 0)
--    {
--        status = -EINVAL;
--        goto done;
--    }
--    else if ((bytes_left == 0) || (count > bytes_left))
--    {
--        status = -ENOSPC;
--        goto done;
--    }
--
--    proc_buffer = &((char *)nvfp->data)[nvfp->off];
--
--    if (copy_from_user(proc_buffer, buffer, count))
--    {
--        nv_printf(NV_DBG_ERRORS, "NVRM: failed to copy in proc data!\n");
--        status = -EFAULT;
--    }
--    else
--    {
--        nvfp->proc_data = data;
--        nvfp->off += count;
--    }
--
--done:
--    up(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
--
--    return ((status < 0) ? status : (int)count);
-+    return 0;
- }
- 
- static int
--nv_procfs_read_text_file(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
-+nv_procfs_open_text_file(
-+    struct inode *inode,
-+    struct file *file
- )
- {
--    *eof = 1;
--    return sprintf(page, "%s", (char *)data);
-+    return single_open(file, nv_procfs_show_text_file, PDE_DATA(inode));
- }
- 
-+static const struct file_operations nv_procfs_text_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_text_file,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
- static void
- nv_procfs_add_text_file(
-     struct proc_dir_entry *parent,
-@@ -668,22 +705,7 @@ nv_procfs_add_text_file(
-     const char *text
- )
- {
--    NV_CREATE_PROC_FILE(filename, parent,
--            nv_procfs_read_text_file, NULL, NULL, (void *)text);
--}
--
--static void nv_procfs_unregister_all(struct proc_dir_entry *entry)
--{
--    while (entry)
--    {
--        struct proc_dir_entry *next = entry->next;
--        if (entry->subdir)
--            nv_procfs_unregister_all(entry->subdir);
--        remove_proc_entry(entry->name, entry->parent);
--        if (entry == proc_nvidia)
--            break;
--        entry = next;
--    }
-+    proc_create_data(filename, NV_PROC_RO, parent, &nv_procfs_text_fops, (void *)text);
- }
- #endif
- 
-@@ -713,26 +735,11 @@ int nv_register_procfs(void)
-     if (!proc_nvidia)
-         goto failed;
- 
--    entry = NV_CREATE_PROC_FILE("params", proc_nvidia,
--        nv_procfs_read_params, NULL, NULL, NULL);
-+    entry = proc_create("params", NV_PROC_RO, proc_nvidia, &nv_procfs_params_fops);
-     if (!entry)
-         goto failed;
- 
--    /*
--     * entry->proc_fops originally points to a constant
--     * structure, so to add more methods for the
--     * binary registry write path, we need to replace the
--     * said entry->proc_fops with a new fops structure.
--     * However, in preparation for this, we need to preserve
--     * the procfs read() and write() operations.
--     */
--    nv_procfs_registry_fops.read = entry->proc_fops->read;
--    nv_procfs_registry_fops.write = entry->proc_fops->write;
--
--    entry = NV_CREATE_PROC_FILE("registry", proc_nvidia,
--        nv_procfs_read_registry,
--        nv_procfs_write_registry,
--        &nv_procfs_registry_fops, NULL);
-+    entry = proc_create("registry", NV_PROC_RW, proc_nvidia, &nv_procfs_registry_fops);
-     if (!entry)
-         goto failed;
- 
-@@ -753,8 +760,7 @@ int nv_register_procfs(void)
- 
-     nv_procfs_add_text_file(proc_nvidia_patches, "README", __README_patches);
- 
--    entry = NV_CREATE_PROC_FILE("version", proc_nvidia,
--        nv_procfs_read_version, NULL, NULL, NULL);
-+    entry = proc_create("version", NV_PROC_RO, proc_nvidia, &nv_procfs_version_fops);
-     if (!entry)
-         goto failed;
- 
-@@ -771,15 +777,11 @@ int nv_register_procfs(void)
-         if (!proc_nvidia_gpu)
-             goto failed;
- 
--        entry = NV_CREATE_PROC_FILE("information", proc_nvidia_gpu,
--            nv_procfs_read_gpu_info, NULL, NULL, nv);
-+	entry = proc_create_data("information", NV_PROC_RO, proc_nvidia_gpu, &nv_procfs_gpu_info_fops, nv);
-         if (!entry)
-             goto failed;
- 
--        entry = NV_CREATE_PROC_FILE("registry", proc_nvidia_gpu,
--            nv_procfs_read_registry,
--            nv_procfs_write_registry,
--            &nv_procfs_registry_fops, nv);
-+	entry = proc_create_data("registry", NV_PROC_RW, proc_nvidia_gpu, &nv_procfs_registry_fops, nv);
-         if (!entry)
-             goto failed;
- 
-@@ -789,18 +791,15 @@ int nv_register_procfs(void)
-             if (!proc_nvidia_agp)
-                 goto failed;
- 
--            entry = NV_CREATE_PROC_FILE("status", proc_nvidia_agp,
--                nv_procfs_read_agp_status, NULL, NULL, nv);
-+	    entry = proc_create("status", NV_PROC_RO, proc_nvidia_agp, &nv_procfs_read_agp_status);
-             if (!entry)
-                 goto failed;
- 
--            entry = NV_CREATE_PROC_FILE("host-bridge", proc_nvidia_agp,
--                nv_procfs_read_agp_info, NULL, NULL, NULL);
-+	    entry = proc_create("host-bridge", NV_PROC_RO, proc_nvidia_agp, &nv_procfs_read_agp_info);
-             if (!entry)
-                 goto failed;
- 
--            entry = NV_CREATE_PROC_FILE("gpu", proc_nvidia_agp,
--                nv_procfs_read_agp_info, NULL, NULL, nv);
-+	    entry = proc_create("gpu", NV_PROC_RO, proc_nvidia_agp, &nv_procfs_read_agp_info);
-             if (!entry)
-                 goto failed;
-         }
-@@ -809,7 +808,7 @@ int nv_register_procfs(void)
-     return 0;
- #if defined(CONFIG_PROC_FS)
- failed:
--    nv_procfs_unregister_all(proc_nvidia);
-+    remove_proc_subtree("nvidia", proc_nvidia);
-     return -1;
- #endif
- }
-@@ -817,6 +816,6 @@ failed:
- void nv_unregister_procfs(void)
- {
- #if defined(CONFIG_PROC_FS)
--    nv_procfs_unregister_all(proc_nvidia);
-+    remove_proc_subtree("nvidia", proc_nvidia);
- #endif
- }
-
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-304-3.13.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-304-3.13.patch
deleted file mode 100644
index 90b10036..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-304-3.13.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/kernel/nv-acpi.c
-+++ b/kernel/nv-acpi.c
-@@ -303,7 +307,10 @@ static int nv_acpi_remove(struct acpi_de
- 
-     if (pNvAcpiObject->notify_handler_installed)
-     {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
-+ /* beginning with 3.13, acpi_remove_notify_handler() waits for events to finish */
-         NV_ACPI_OS_WAIT_EVENTS_COMPLETE();
-+#endif
- 
-         // remove event notifier
-         status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-313.18-3.8.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-313.18-3.8.patch
deleted file mode 100644
index bf2f95e6..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-313.18-3.8.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 9100c380c0a8c15b658b3153c107cd99e7110a7b Mon Sep 17 00:00:00 2001
-From: Alberto Milone <alberto.milone@canonical.com>
-Date: Wed, 9 Jan 2013 11:42:03 +0100
-Subject: [PATCH 1/1] Add support for Linux 3.8
-
----
- conftest.sh |    1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/conftest.sh b/conftest.sh
-index 9720cab..1bfbe6f 100755
---- a/kernel/conftest.sh
-+++ b/kernel/conftest.sh
-@@ -160,6 +160,7 @@ build_cflags() {
- 
-     if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-         CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
-+        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include/uapi"
-         CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated"
-         CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated/uapi"
-     elif [ "$ARCH" = "arm" ]; then
--- 
-1.7.9.5
-
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-319.23-3.10.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-319.23-3.10.patch
deleted file mode 100644
index b81967bb..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-319.23-3.10.patch
+++ /dev/null
@@ -1,604 +0,0 @@
-diff -ur -X - NVIDIA-Linux-x86_64-319.17-no-compat32.orig/kernel/nv-i2c.c NVIDIA-Linux-x86_64-319.17-no-compat32/kernel/nv-i2c.c
---- NVIDIA-Linux-x86_64-319.17-no-compat32.orig/kernel/nv-i2c.c	2013-04-26 00:22:30.000000000 -0400
-+++ NVIDIA-Linux-x86_64-319.17-no-compat32/kernel/nv-i2c.c	2013-05-13 05:20:55.571981365 -0400
-@@ -311,8 +311,6 @@
- BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void *data)
- {
-     struct i2c_adapter *pI2cAdapter = (struct i2c_adapter *)data;
--    int osstatus = 0;
--    BOOL wasReleased = FALSE;
- 
- #if defined(KERNEL_2_4)
-     if (!NV_WEAK_SYMBOL_PRESENT(i2c_add_adapter))
-@@ -324,15 +322,10 @@
-     if (!pI2cAdapter) return FALSE;
- 
-     // attempt release with the OS
--    osstatus = i2c_del_adapter(pI2cAdapter);
-+    i2c_del_adapter(pI2cAdapter);
-+    os_free_mem(pI2cAdapter);
- 
--    if (!osstatus)
--    {
--        os_free_mem(pI2cAdapter);
--        wasReleased = TRUE;
--    }
--
--    return wasReleased;
-+    return TRUE;
- }
- 
- #else // (defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE))
-diff -ur -X - NVIDIA-Linux-x86_64-319.17-no-compat32.orig/kernel/nv-procfs.c NVIDIA-Linux-x86_64-319.17-no-compat32/kernel/nv-procfs.c
---- NVIDIA-Linux-x86_64-319.17-no-compat32.orig/kernel/nv-procfs.c	2013-04-26 00:22:30.000000000 -0400
-+++ NVIDIA-Linux-x86_64-319.17-no-compat32/kernel/nv-procfs.c	2013-05-22 04:52:45.229495748 -0400
-@@ -60,60 +60,41 @@
-         __entry;                                          \
-     })
- 
--#define NV_CREATE_PROC_FILE(name,parent,__read_proc,           \
--    __write_proc,__fops,__data)                                \
--   ({                                                          \
--        struct proc_dir_entry *__entry;                        \
--        int __mode = (S_IFREG | S_IRUGO);                      \
--        if ((NvUPtr)(__write_proc) != 0)                       \
--            __mode |= S_IWUSR;                                 \
--        __entry = NV_CREATE_PROC_ENTRY(name, __mode, parent);  \
--        if (__entry != NULL)                                   \
--        {                                                      \
--            if ((NvUPtr)(__read_proc) != 0)                    \
--                __entry->read_proc = (__read_proc);            \
--            if ((NvUPtr)(__write_proc) != 0)                   \
--            {                                                  \
--                __entry->write_proc = (__write_proc);          \
--                __entry->proc_fops = (__fops);                 \
--            }                                                  \
--            __entry->data = (__data);                          \
--        }                                                      \
--        __entry;                                               \
--    })
-+#define NV_PROC_RW (S_IFREG|S_IRUGO|S_IWUSR)
-+#define NV_PROC_RO (S_IFREG|S_IRUGO)
- 
- #define NV_CREATE_PROC_DIR(name,parent)                        \
-    ({                                                          \
-         struct proc_dir_entry *__entry;                        \
-         int __mode = (S_IFDIR | S_IRUGO | S_IXUGO);            \
--        __entry = NV_CREATE_PROC_ENTRY(name, __mode, parent);  \
-+        __entry = proc_mkdir_mode(name, __mode, parent);       \
-         __entry;                                               \
-     })
- 
-+//#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,9,255)
-+//static inline void *PDE_DATA(const struct inode *inode) {
-+//	return PDE(inode)->data;
-+//}
-+//#endif
-+
- #define NV_PROC_WRITE_BUFFER_SIZE   (64 * RM_PAGE_SIZE)
- 
- static int
--nv_procfs_read_gpu_info(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
-+nv_procfs_show_gpu_info(
-+    struct seq_file *m,
-+    void *v
- )
- {
--    nv_state_t *nv = data;
-+    nv_state_t *nv = m->private;
-     nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
-     struct pci_dev *dev = nvl->dev;
-     char *type, *fmt, tmpstr[NV_DEVICE_NAME_LENGTH];
--    int len = 0, status;
-+    int status;
-     NvU8 *uuid;
-     NvU32 vbios_rev1, vbios_rev2, vbios_rev3, vbios_rev4, vbios_rev5;
-     NvU32 fpga_rev1, fpga_rev2, fpga_rev3;
-     nv_stack_t *sp = NULL;
- 
--    *eof = 1;
--
-     NV_KMEM_CACHE_ALLOC_STACK(sp);
-     if (sp == NULL)
-     {
-@@ -134,31 +115,31 @@
-         if (rm_get_device_name(sp, nv, dev->device, dev->subsystem_vendor,
-                     dev->subsystem_device, NV_DEVICE_NAME_LENGTH,
-                     tmpstr) != RM_OK)
--        {
-+ 		       {
-             strcpy (tmpstr, "Unknown");
-         }
-     }
- 
--    len += sprintf(page+len, "Model: \t\t %s\n", tmpstr);
--    len += sprintf(page+len, "IRQ:   \t\t %d\n", nv->interrupt_line);
-+    seq_printf(m, "Model: \t\t %s\n", tmpstr);
-+    seq_printf(m, "IRQ:   \t\t %d\n", nv->interrupt_line);
- 
-     if (NV_IS_GVI_DEVICE(nv))
-     {
-         status = rm_gvi_get_firmware_version(sp, nv, &fpga_rev1, &fpga_rev2,
-                                              &fpga_rev3);
-         if (status != RM_OK)
--            len += sprintf(page+len, "Firmware: \t ????.??.??\n");
-+            seq_printf(m, "Firmware: \t ????.??.??\n");
-         else
-         {
-             fmt = "Firmware: \t %x.%x.%x\n";
--            len += sprintf(page+len, fmt, fpga_rev1, fpga_rev2, fpga_rev3);
-+            seq_printf(m, fmt, fpga_rev1, fpga_rev2, fpga_rev3);
-         }
-     }
-     else
-     {
-         if (rm_get_gpu_uuid(sp, nv, &uuid, NULL) == RM_OK)
-         {
--            len += sprintf(page+len, "GPU UUID: \t %s\n", (char *)uuid);
-+            seq_printf(m, "GPU UUID: \t %s\n", (char *)uuid);
-             os_free_mem(uuid);
-         }
- 
-@@ -166,12 +147,12 @@
-                     &vbios_rev3, &vbios_rev4,
-                     &vbios_rev5) != RM_OK)
-         {
--            len += sprintf(page+len, "Video BIOS: \t ??.??.??.??.??\n");
-+            seq_printf(m, "Video BIOS: \t ??.??.??.??.??\n");
-         }
-         else
-         {
-             fmt = "Video BIOS: \t %02x.%02x.%02x.%02x.%02x\n";
--            len += sprintf(page+len, fmt, vbios_rev1, vbios_rev2, vbios_rev3,
-+            seq_printf(m, fmt, vbios_rev1, vbios_rev2, vbios_rev3,
-                            vbios_rev4, vbios_rev5);
-         }
-     }
-@@ -180,12 +161,12 @@
-         type = "PCI-E";
-     else
-         type = "PCI";
--    len += sprintf(page+len, "Bus Type: \t %s\n", type);
-+    seq_printf(m, "Bus Type: \t %s\n", type);
- 
--    len += sprintf(page+len, "DMA Size: \t %d bits\n",
-+    seq_printf(m, "DMA Size: \t %d bits\n",
-      nv_count_bits(dev->dma_mask));
--    len += sprintf(page+len, "DMA Mask: \t 0x%llx\n", dev->dma_mask);
--    len += sprintf(page+len, "Bus Location: \t %04x:%02x.%02x.%x\n",
-+    seq_printf(m, "DMA Mask: \t 0x%llx\n", dev->dma_mask);
-+    seq_printf(m, "Bus Location: \t %04x:%02x.%02x.%x\n",
-                    nv->domain, nv->bus, nv->slot, PCI_FUNC(dev->devfn));
- #if defined(DEBUG)
-     do
-@@ -193,7 +174,7 @@
-         int j;
-         for (j = 0; j < NV_GPU_NUM_BARS; j++)
-         {
--            len += sprintf(page+len, "BAR%u: \t\t 0x%llx (%lluMB)\n",
-+            seq_printf(m, "BAR%u: \t\t 0x%llx (%lluMB)\n",
-                            j, nv->bars[j].address, (nv->bars[j].size >> 20));
-         }
-     } while (0);
-@@ -201,26 +182,120 @@
- 
-     NV_KMEM_CACHE_FREE_STACK(sp);
- 
--    return len;
-+    return 0;
- }
- 
- static int
--nv_procfs_read_version(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
-+nv_procfs_open_gpu_info(
-+    struct inode *inode,
-+    struct file *file
-+)
-+{
-+    return single_open(file, nv_procfs_show_gpu_info, PDE_DATA(inode));
-+}
-+
-+static const struct file_operations nv_procfs_gpu_info_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_gpu_info,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
-+static int
-+nv_procfs_show_version(
-+    struct seq_file *m,
-+    void *v
-+)
-+{
-+    seq_printf(m, "NVRM version: %s\n", pNVRM_ID);
-+    seq_printf(m, "GCC version:  %s\n", NV_COMPILER);
-+
-+    return 0;
-+}
-+
-+static int
-+nv_procfs_open_version(
-+    struct inode *inode,
-+    struct file *file
-+)
-+{
-+    return single_open(file, nv_procfs_show_version, NULL);
-+}
-+
-+static const struct file_operations nv_procfs_version_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_version,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
-+static int
-+nv_procfs_show_registry(
-+    struct seq_file *m,
-+    void *v
-+)
-+{
-+    nv_state_t *nv = m->private;
-+    nv_linux_state_t *nvl = NULL;
-+    char *registry_keys;
-+
-+    if (nv != NULL)
-+        nvl = NV_GET_NVL_FROM_NV_STATE(nv);
-+    registry_keys = ((nvl != NULL) ?
-+            nvl->registry_keys : nv_registry_keys);
-+
-+    seq_printf(m, "Binary: \"%s\"\n", registry_keys);
-+
-+    return 0;
-+}
-+
-+static ssize_t
-+nv_procfs_write_registry(
-+    struct file       *file,
-+    const char __user *buffer,
-+    size_t             count,
-+    loff_t            *pos
- )
- {
--    int len = 0;
--    *eof = 1;
-+    int status = 0;
-+    nv_file_private_t *nvfp = NV_GET_FILE_PRIVATE(file);
-+    char *proc_buffer;
-+    unsigned long bytes_left;
-+
-+    down(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
-+
-+    bytes_left = (NV_PROC_WRITE_BUFFER_SIZE - nvfp->off - 1);
-+
-+    if (count == 0)
-+    {
-+        status = -EINVAL;
-+        goto done;
-+    }
-+    else if ((bytes_left == 0) || (count > bytes_left))
-+    {
-+        status = -ENOSPC;
-+        goto done;
-+    }
-+
-+    proc_buffer = &((char *)nvfp->data)[nvfp->off];
-+
-+    if (copy_from_user(proc_buffer, buffer, count))
-+    {
-+        nv_printf(NV_DBG_ERRORS, "NVRM: failed to copy in proc data!\n");
-+        status = -EFAULT;
-+    }
-+    else
-+    {
-+        nvfp->proc_data = PDE_DATA(file->f_inode);
-+        nvfp->off += count;
-+    }
- 
--    len += sprintf(page+len, "NVRM version: %s\n", pNVRM_ID);
--    len += sprintf(page+len, "GCC version:  %s\n", NV_COMPILER);
-+done:
-+    up(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
- 
--    return len;
-+    return ((status < 0) ? status : count);
- }
- 
- static int
-@@ -233,7 +308,7 @@
-     nv_stack_t *sp = NULL;
- 
-     if (0 == (file->f_mode & FMODE_WRITE))
--        return 0;
-+        return single_open(file, nv_procfs_show_registry, PDE_DATA(inode));
- 
-     nvfp = nv_alloc_file_private();
-     if (nvfp == NULL)
-@@ -282,6 +357,9 @@
-     RM_STATUS rm_status;
-     int rc = 0;
- 
-+    if (0 == (file->f_mode & FMODE_WRITE))
-+        return single_release(inode, file);
-+
-     nvfp = NV_GET_FILE_PRIVATE(file);
-     if (nvfp == NULL)
-         return 0;
-@@ -346,122 +424,81 @@
-     return rc;
- }
- 
--static struct file_operations nv_procfs_registry_fops = {
-+static const struct file_operations nv_procfs_registry_fops = {
-     .open    = nv_procfs_open_registry,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .write   = nv_procfs_write_registry,
-     .release = nv_procfs_close_registry,
- };
- 
- static int
--nv_procfs_read_params(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
-+nv_procfs_show_params(
-+    struct seq_file *m,
-+    void *v
- )
- {
-     unsigned int i;
--    int len = 0;
-     nv_parm_t *entry;
- 
--    *eof = 1;
- 
-     for (i = 0; (entry = &nv_parms[i])->name != NULL; i++)
--        len += sprintf(page+len, "%s: %u\n", entry->name, *entry->data);
-+        seq_printf(m, "%s: %u\n", entry->name, *entry->data);
- 
--    len += sprintf(page+len, "RegistryDwords: \"%s\"\n",
-+    seq_printf(m, "RegistryDwords: \"%s\"\n",
-                 (NVreg_RegistryDwords != NULL) ? NVreg_RegistryDwords : "");
--    len += sprintf(page+len, "RmMsg: \"%s\"\n",
-+    seq_printf(m, "RmMsg: \"%s\"\n",
-                 (NVreg_RmMsg != NULL) ? NVreg_RmMsg : "");
- 
--    return len;
-+    return 0;
- }
- 
- static int
--nv_procfs_read_registry(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
--)
-+nv_procfs_open_params(
-+    struct inode *inode,
-+    struct file *file
-+)    
- {
--    nv_state_t *nv = data;
--    nv_linux_state_t *nvl = NULL;
--    char *registry_keys;
-+    return single_open(file, nv_procfs_show_params, NULL);
-+}
- 
--    if (nv != NULL)
--        nvl = NV_GET_NVL_FROM_NV_STATE(nv);
--    registry_keys = ((nvl != NULL) ?
--            nvl->registry_keys : nv_registry_keys);
-+static const struct file_operations nv_procfs_params_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_params,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
- 
--    *eof = 1;
--    return sprintf(page, "Binary: \"%s\"\n", registry_keys);
--}
- 
- static int
--nv_procfs_write_registry(
--    struct file   *file,
--    const char    *buffer,
--    unsigned long  count,
--    void          *data
-+nv_procfs_show_text_file(
-+    struct seq_file *m,
-+    void *v
- )
- {
--    int status = 0;
--    nv_file_private_t *nvfp = NV_GET_FILE_PRIVATE(file);
--    char *proc_buffer;
--    unsigned long bytes_left;
--
--    down(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
--
--    bytes_left = (NV_PROC_WRITE_BUFFER_SIZE - nvfp->off - 1);
-+    seq_printf(m, "%s", (char *)m->private);
- 
--    if (count == 0)
--    {
--        status = -EINVAL;
--        goto done;
--    }
--    else if ((bytes_left == 0) || (count > bytes_left))
--    {
--        status = -ENOSPC;
--        goto done;
--    }
--
--    proc_buffer = &((char *)nvfp->data)[nvfp->off];
--
--    if (copy_from_user(proc_buffer, buffer, count))
--    {
--        nv_printf(NV_DBG_ERRORS, "NVRM: failed to copy in proc data!\n");
--        status = -EFAULT;
--    }
--    else
--    {
--        nvfp->proc_data = data;
--        nvfp->off += count;
--    }
--
--done:
--    up(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
--
--    return ((status < 0) ? status : (int)count);
-+    return 0;
- }
- 
- static int
--nv_procfs_read_text_file(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
-+nv_procfs_open_text_file(
-+    struct inode *inode,
-+    struct file *file
- )
- {
--    *eof = 1;
--    return sprintf(page, "%s", (char *)data);
-+    return single_open(file, nv_procfs_show_text_file, PDE_DATA(inode));
- }
- 
-+static const struct file_operations nv_procfs_text_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_text_file,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
- static void
- nv_procfs_add_text_file(
-     struct proc_dir_entry *parent,
-@@ -469,22 +506,7 @@
-     const char *text
- )
- {
--    NV_CREATE_PROC_FILE(filename, parent,
--            nv_procfs_read_text_file, NULL, NULL, (void *)text);
--}
--
--static void nv_procfs_unregister_all(struct proc_dir_entry *entry)
--{
--    while (entry)
--    {
--        struct proc_dir_entry *next = entry->next;
--        if (entry->subdir)
--            nv_procfs_unregister_all(entry->subdir);
--        remove_proc_entry(entry->name, entry->parent);
--        if (entry == proc_nvidia)
--            break;
--        entry = next;
--    }
-+    proc_create_data(filename, NV_PROC_RO, parent, &nv_procfs_text_fops, (void *)text);
- }
- #endif
- 
-@@ -513,26 +535,11 @@
-     if (!proc_nvidia)
-         goto failed;
- 
--    entry = NV_CREATE_PROC_FILE("params", proc_nvidia,
--        nv_procfs_read_params, NULL, NULL, NULL);
-+    entry = proc_create("params", NV_PROC_RO, proc_nvidia, &nv_procfs_params_fops);
-     if (!entry)
-         goto failed;
- 
--    /*
--     * entry->proc_fops originally points to a constant
--     * structure, so to add more methods for the
--     * binary registry write path, we need to replace the
--     * said entry->proc_fops with a new fops structure.
--     * However, in preparation for this, we need to preserve
--     * the procfs read() and write() operations.
--     */
--    nv_procfs_registry_fops.read = entry->proc_fops->read;
--    nv_procfs_registry_fops.write = entry->proc_fops->write;
--
--    entry = NV_CREATE_PROC_FILE("registry", proc_nvidia,
--        nv_procfs_read_registry,
--        nv_procfs_write_registry,
--        &nv_procfs_registry_fops, NULL);
-+    entry = proc_create("registry", NV_PROC_RW, proc_nvidia, &nv_procfs_registry_fops);
-     if (!entry)
-         goto failed;
- 
-@@ -553,8 +560,7 @@
- 
-     nv_procfs_add_text_file(proc_nvidia_patches, "README", __README_patches);
- 
--    entry = NV_CREATE_PROC_FILE("version", proc_nvidia,
--        nv_procfs_read_version, NULL, NULL, NULL);
-+    entry = proc_create("version", NV_PROC_RO, proc_nvidia, &nv_procfs_version_fops);
-     if (!entry)
-         goto failed;
- 
-@@ -571,15 +577,11 @@
-         if (!proc_nvidia_gpu)
-             goto failed;
- 
--        entry = NV_CREATE_PROC_FILE("information", proc_nvidia_gpu,
--            nv_procfs_read_gpu_info, NULL, NULL, nv);
-+	entry = proc_create_data("information", NV_PROC_RO, proc_nvidia_gpu, &nv_procfs_gpu_info_fops, nv);
-         if (!entry)
-             goto failed;
- 
--        entry = NV_CREATE_PROC_FILE("registry", proc_nvidia_gpu,
--            nv_procfs_read_registry,
--            nv_procfs_write_registry,
--            &nv_procfs_registry_fops, nv);
-+	entry = proc_create_data("registry", NV_PROC_RW, proc_nvidia_gpu, &nv_procfs_registry_fops, nv);
-         if (!entry)
-             goto failed;
-     }
-@@ -587,7 +589,7 @@
-     return 0;
- #if defined(CONFIG_PROC_FS)
- failed:
--    nv_procfs_unregister_all(proc_nvidia);
-+    remove_proc_subtree("nvidia", proc_nvidia);
-     return -1;
- #endif
- }
-@@ -595,6 +597,6 @@
- void nv_unregister_procfs(void)
- {
- #if defined(CONFIG_PROC_FS)
--    nv_procfs_unregister_all(proc_nvidia);
-+    remove_proc_subtree("nvidia", proc_nvidia);
- #endif
- }
-
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-331.13-pax-usercopy.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-331.13-pax-usercopy.patch
deleted file mode 100644
index 9777ce6c..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-331.13-pax-usercopy.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/kernel/nv-linux.h
-+++ b/kernel/nv-linux.h
-@@ -757,16 +757,16 @@
- 
- #if defined(NV_KMEM_CACHE_CREATE_PRESENT)
- #if (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 6)
--#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type)            \
-+#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type, flags)     \
-     {                                                           \
-         kmem_cache = kmem_cache_create(name, sizeof(type),      \
--                        0, 0, NULL, NULL);                      \
-+                        0, flags, NULL, NULL);                  \
-     }
- #elif (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 5)
--#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type)            \
-+#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type, flags)     \
-     {                                                           \
-         kmem_cache = kmem_cache_create(name, sizeof(type),      \
--                        0, 0, NULL);                            \
-+                        0, flags, NULL);                        \
-     }
- #else
- #error "NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT value unrecognized!"
---- a/kernel/nv.c
-+++ b/kernel/nv.c
-@@ -794,7 +794,7 @@
-     NV_SPIN_LOCK_INIT(&km_lock);
- #endif
- 
--    NV_KMEM_CACHE_CREATE(nv_stack_t_cache, NV_STACK_CACHE_STR, nv_stack_t);
-+    NV_KMEM_CACHE_CREATE(nv_stack_t_cache, NV_STACK_CACHE_STR, nv_stack_t, SLAB_USERCOPY);
-     if (nv_stack_t_cache == NULL)
-     {
-         nv_printf(NV_DBG_ERRORS, "NVRM: stack cache allocation failed!\n");
-@@ -924,7 +924,7 @@
-     nv->os_state = (void *) &nv_ctl_device;
-     nv_lock_init_locks(nv);
- 
--    NV_KMEM_CACHE_CREATE(nv_pte_t_cache, NV_PTE_CACHE_STR, nv_pte_t);
-+    NV_KMEM_CACHE_CREATE(nv_pte_t_cache, NV_PTE_CACHE_STR, nv_pte_t, 0);
-     if (nv_pte_t_cache == NULL)
-     {
-         rc = -ENOMEM;
-@@ -935,7 +935,7 @@
-     if (NV_BUILD_MODULE_INSTANCES == 0)
-     {
-         NV_KMEM_CACHE_CREATE(nvidia_p2p_page_t_cache, "nvidia_p2p_page_t",
--                             nvidia_p2p_page_t);
-+                             nvidia_p2p_page_t, 0);
-         if (nvidia_p2p_page_t_cache == NULL)
-         {
-             rc = -ENOMEM;
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-346.16-pax-constify.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-346.16-pax-constify.patch
deleted file mode 100644
index 9b9f53e4..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-346.16-pax-constify.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/kernel/uvm/uvm_common.c
-+++ b/kernel/uvm/uvm_common.c
-@@ -95,7 +95,6 @@ static RM_STATUS uvmnext_gpu_event_stop_
- #endif // NVIDIA_UVM_NEXT_ENABLED
- 
- static dev_t g_uvmBaseDev;
--struct UvmOpsUvmEvents g_exportedUvmOps;
- 
- // TODO: This would be easier if RM allowed for multiple registrations, since we
- //       could register UVM-Lite and UVM-Next separately (bug 1372835).
-@@ -147,9 +146,11 @@ static RM_STATUS uvmSetupGpuProvider(voi
-     RM_STATUS status = RM_OK;
- 
- #ifdef NVIDIA_UVM_RM_ENABLED
--    g_exportedUvmOps.startDevice = uvm_gpu_event_start_device;
--    g_exportedUvmOps.stopDevice  = uvm_gpu_event_stop_device;
--    g_exportedUvmOps.isrTopHalf  = uvmnext_isr_top_half;
-+    static struct UvmOpsUvmEvents g_exportedUvmOps = {
-+        .startDevice = uvm_gpu_event_start_device,
-+        .stopDevice  = uvm_gpu_event_stop_device,
-+        .isrTopHalf  = uvmnext_isr_top_half,
-+    };
- 
-     // call RM to exchange the function pointers.
-     status = nvUvmInterfaceRegisterUvmCallbacks(&g_exportedUvmOps);
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-346.16-pax-usercopy.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-346.16-pax-usercopy.patch
deleted file mode 100644
index d1a440c9..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-346.16-pax-usercopy.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/kernel/nv.c
-+++ b/kernel/nv.c
-@@ -705,7 +705,7 @@ int __init nvidia_init_module(void)
- #endif
- 
-     nvidia_stack_t_cache = NV_KMEM_CACHE_CREATE(nvidia_stack_cache_name,
--                                                nvidia_stack_t);
-+                                                nvidia_stack_t, SLAB_USERCOPY);
-     if (nvidia_stack_t_cache == NULL)
-     {
-         nv_printf(NV_DBG_ERRORS, "NVRM: stack cache allocation failed!\n");
-@@ -846,7 +846,7 @@ int __init nvidia_init_module(void)
-     nv_lock_init_locks(nv);
- 
-     nvidia_pte_t_cache = NV_KMEM_CACHE_CREATE(nvidia_pte_cache_name,
--                                              nvidia_pte_t);
-+                                              nvidia_pte_t, 0);
-     if (nvidia_pte_t_cache == NULL)
-     {
-         rc = -ENOMEM;
-@@ -857,7 +857,7 @@ int __init nvidia_init_module(void)
-     if (!nv_multiple_kernel_modules)
-     {
-         nvidia_p2p_page_t_cache = NV_KMEM_CACHE_CREATE(nvidia_p2p_page_cache_name,
--                                                       nvidia_p2p_page_t);
-+                                                       nvidia_p2p_page_t, 0);
-         if (nvidia_p2p_page_t_cache == NULL)
-         {
-             rc = -ENOMEM;
---- a/kernel/nv-linux.h
-+++ b/kernel/nv-linux.h
-@@ -1431,11 +1431,11 @@ extern void *nvidia_stack_t_cache;
- 
- #if !defined(NV_VMWARE)
- #if (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 5)
--#define NV_KMEM_CACHE_CREATE(name, type)    \
--    kmem_cache_create(name, sizeof(type), 0, 0, NULL)
-+#define NV_KMEM_CACHE_CREATE(name, type, flags)    \
-+    kmem_cache_create(name, sizeof(type), 0, flags, NULL)
- #else
--#define NV_KMEM_CACHE_CREATE(name, type)    \
--    kmem_cache_create(name, sizeof(type), 0, 0, NULL, \
-+#define NV_KMEM_CACHE_CREATE(name, type, flags)    \
-+    kmem_cache_create(name, sizeof(type), 0, flags, NULL, \
-                       NULL)
- #endif
- #define NV_KMEM_CACHE_DESTROY(kmem_cache)   \
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-96.43.19-2.6.39.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-96.43.19-2.6.39.patch
deleted file mode 100644
index 4ee8ba60..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-96.43.19-2.6.39.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- usr/src/nv/nv-linux.h.orig	2010-10-28 04:23:04.000000000 +0200
-+++ usr/src/nv/nv-linux.h	2011-05-21 08:58:35.714633248 +0200
-@@ -80,7 +80,6 @@
- #if !defined(KERNEL_2_4)
- #include <linux/sched.h>            /* suser(), capable() replacement   */
- #include <linux/moduleparam.h>      /* module_param()                   */
--#include <linux/smp_lock.h>         /* kernel_locked                    */
- #include <asm/tlbflush.h>           /* flush_tlb(), flush_tlb_all()     */
- #include <asm/kmap_types.h>         /* page table entry lookup          */
- #endif
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-pax-const.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-pax-const.patch
deleted file mode 100644
index f3b82593..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-pax-const.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Binary files kernel.orig/.nv-procfs.c.swp and kernel/.nv-procfs.c.swp differ
-diff -urp kernel.orig/nv-procfs.c kernel/nv-procfs.c
---- kernel.orig/nv-procfs.c	2011-07-13 03:29:30.000000000 +0200
-+++ kernel/nv-procfs.c	2011-07-19 15:45:27.982993911 +0200
-@@ -707,8 +707,10 @@ int nv_register_procfs(void)
-      * However, in preparation for this, we need to preserve
-      * the procfs read() and write() operations.
-      */
--    nv_procfs_registry_fops.read = entry->proc_fops->read;
--    nv_procfs_registry_fops.write = entry->proc_fops->write;
-+    pax_open_kernel();
-+    *(void **)&nv_procfs_registry_fops.read = entry->proc_fops->read;
-+    *(void **)&nv_procfs_registry_fops.write = entry->proc_fops->write;
-+    pax_close_kernel();
- 
-     entry = NV_CREATE_PROC_FILE("registry", proc_nvidia,
-         nv_procfs_read_registry,
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-pax-usercopy.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-pax-usercopy.patch
deleted file mode 100644
index ce8c201b..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-pax-usercopy.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -urp kernel.orig/nv.c kernel/nv.c
---- kernel.orig/nv.c	2011-09-24 02:32:09.000000000 +0200
-+++ kernel/nv.c	2011-10-05 19:13:41.474242252 +0200
-@@ -1105,7 +1105,7 @@ static int __init nvidia_init_module(voi
-     NV_SPIN_LOCK_INIT(&km_lock);
- #endif
- 
--    NV_KMEM_CACHE_CREATE(nv_stack_t_cache, "nv_stack_t", nv_stack_t);
-+    NV_KMEM_CACHE_CREATE(nv_stack_t_cache, "nv_stack_t", nv_stack_t, SLAB_USERCOPY);
-     if (nv_stack_t_cache == NULL)
-     {
-         nv_printf(NV_DBG_ERRORS, "NVRM: stack cache allocation failed!\n");
-@@ -1220,7 +1220,7 @@ static int __init nvidia_init_module(voi
-     }
- #endif
- 
--    NV_KMEM_CACHE_CREATE(nv_pte_t_cache, "nv_pte_t", nv_pte_t);
-+    NV_KMEM_CACHE_CREATE(nv_pte_t_cache, "nv_pte_t", nv_pte_t, 0);
-     if (nv_pte_t_cache == NULL)
-     {
-         rc = -ENOMEM;
-@@ -1229,7 +1229,7 @@ static int __init nvidia_init_module(voi
-     }
- 
-     NV_KMEM_CACHE_CREATE(nvidia_p2p_page_t_cache, "nvidia_p2p_page_t",
--            nvidia_p2p_page_t);
-+            nvidia_p2p_page_t, 0);
-     if (nvidia_p2p_page_t_cache == NULL)
-     {
-         rc = -ENOMEM;
-diff -urp kernel.orig/nv-linux.h kernel/nv-linux.h
---- kernel.orig/nv-linux.h	2011-09-24 02:32:09.000000000 +0200
-+++ kernel/nv-linux.h	2011-10-05 19:14:42.522238996 +0200
-@@ -695,16 +695,16 @@ extern nv_spinlock_t km_lock;
- 
- #if defined(NV_KMEM_CACHE_CREATE_PRESENT)
- #if (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 6)
--#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type)            \
-+#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type, flags)     \
-     {                                                           \
-         kmem_cache = kmem_cache_create(name, sizeof(type),      \
--                        0, 0, NULL, NULL);                      \
-+                        0, flags, NULL, NULL);                  \
-     }
- #elif (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 5)
--#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type)            \
-+#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type, flags)     \
-     {                                                           \
-         kmem_cache = kmem_cache_create(name, sizeof(type),      \
--                        0, 0, NULL);                            \
-+                        0, flags, NULL);                        \
-     }
- #else
- #error "NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT value unrecognized!"
diff --git a/x11-drivers/nvidia-drivers/files/replace-VM_RESERVED-with-VM_DONTEXPAND-and-VM_DONTDU.patch b/x11-drivers/nvidia-drivers/files/replace-VM_RESERVED-with-VM_DONTEXPAND-and-VM_DONTDU.patch
deleted file mode 100644
index 51aa2851..00000000
--- a/x11-drivers/nvidia-drivers/files/replace-VM_RESERVED-with-VM_DONTEXPAND-and-VM_DONTDU.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From fed1fa17202cf13bf80bbbad3bf0ffdfd192df42 Mon Sep 17 00:00:00 2001
-From: Alberto Milone <alberto.milone@canonical.com>
-Date: Wed, 7 Nov 2012 12:11:02 +0100
-Subject: [PATCH 1/1] Replace VM_RESERVED with VM_DONTEXPAND and VM_DONTDUMP
-
----
- nv-mmap.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/nv-mmap.c b/nv-mmap.c
-index acc02ec..b2d5cdb 100644
---- a/nv-mmap.c
-+++ b/nv-mmap.c
-@@ -463,7 +463,11 @@ int nv_kern_mmap(
-         NV_PRINT_AT(NV_DBG_MEMINFO, at);
-         nv_vm_list_page_count(&at->page_table[i], pages);
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
-+        vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP));
-+#else
-         vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
-+#endif
- 
- #if defined(VM_DRIVER_PAGES)
-         vma->vm_flags |= VM_DRIVER_PAGES;
--- 
-1.7.9.5
-
diff --git a/x11-drivers/nvidia-drivers/metadata.xml b/x11-drivers/nvidia-drivers/metadata.xml
deleted file mode 100644
index b4cf3e70..00000000
--- a/x11-drivers/nvidia-drivers/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>lxnay@gentoo.org</email>
-  <description>General maintainer</description>
-</maintainer>
-<longdescription>NVIDIA X11 driver and GLX libraries</longdescription>
-</pkgmetadata>
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39.ebuild
deleted file mode 100644
index 0c57deb1..00000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils unpacker portability versionator linux-mod flag-o-matic nvidia-driver
-
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-
-DESCRIPTION="NVIDIA GPUs kernel drivers"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}-pkg0.run )
-	 amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}-pkg2.run )
-	 x86-fbsd? ( ftp://download.nvidia.com/freebsd/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="acpi custom-cflags multilib kernel_linux"
-RESTRICT="strip"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )"
-RDEPEND="<x11-base/xorg-server-1.15.99
-	~x11-drivers/nvidia-userspace-${PV}
-	multilib? ( ~x11-drivers/nvidia-userspace-${PV}[multilib] )
-	acpi? ( sys-power/acpid )"
-PDEPEND=""
-
-if use x86; then
-	PKG_V="-pkg0"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="-pkg2"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-elif use x86-fbsd; then
-	PKG_V=""
-	NV_PACKAGE="${X86_FBSD_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}${PKG_V}"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-lockdep_check() {
-	if linux_chkconfig_present LOCKDEP; then
-		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
-		eerror "Unfortunately, this option exports the symbol 'lockdep_init_map' as GPL-only"
-		eerror "which will prevent ${P} from compiling."
-		eerror "Please make sure the following options have been unset:"
-		eerror "    Kernel hacking  --->"
-		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
-		eerror "        [ ] Lock debugging: prove locking correctness"
-		eerror "        [ ] Lock usage statistics"
-		eerror "in 'menuconfig'"
-		die "LOCKDEP enabled"
-	fi
-}
-
-pkg_setup() {
-	if use kernel_linux; then
-		linux-mod_pkg_setup
-		MODULE_NAMES="nvidia(video:${S}/usr/src/nv)"
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} HOST_CC=$(tc-getBUILD_CC)"
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-		mtrr_check
-		lockdep_check
-	fi
-
-	# On BSD userland it wants real make command
-	use userland_BSD && MAKE="$(get_bmake)"
-
-	export _POSIX2_VERSION="199209"
-
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		NV_SRC="${S}/src"
-	elif use kernel_linux; then
-		NV_SRC="${S}/usr/src/nv"
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_unpack() {
-	if use kernel_linux && kernel_is lt 2 6 7; then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	if ! use x86-fbsd; then
-		mkdir "${S}"
-		cd "${S}"
-		unpack_makeself
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-	use x86-fbsd && cd doc
-
-	if use kernel_linux; then
-		# Quiet down warnings the user does not need to see
-		sed -i \
-			-e 's:-Wpointer-arith::g' \
-			-e 's:-Wsign-compare::g' \
-			"${NV_SRC}"/Makefile.kbuild
-
-		# If you set this then it's your own fault when stuff breaks :)
-		use custom-cflags && sed -i "s:-O:${CFLAGS}:" "${NV_SRC}"/Makefile.*
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-
-	# Linux 3.13 support
-	epatch "${FILESDIR}/nvidia-drivers-173-3.13.patch"
-
-        # Linux 3.14 support
-        kernel_is ge 3 14 0 && epatch "${FILESDIR}/${PN}-173-3.14.patch"
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use x86-fbsd; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use kernel_linux; then
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-	elif use x86-fbsd; then
-		insinto /boot/modules
-		doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld" || die
-
-		exeinto /boot/modules
-		doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko" || die
-	fi
-}
-
-pkg_preinst() {
-	if use kernel_linux; then
-		linux-mod_pkg_postinst
-	fi
-}
-
-pkg_postinst() {
-	if use kernel_linux; then
-		linux-mod_pkg_postinst
-	fi
-
-	echo
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-
-	elog "This package installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-	echo
-}
-
-pkg_postrm() {
-	if use kernel_linux; then
-		linux-mod_pkg_postrm
-	fi
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.125.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.125.ebuild
deleted file mode 100644
index 4a60d0f0..00000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.125.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user versionator
-
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA GPUs kernel drivers"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-	amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi custom-cflags multilib x-multilib kernel_FreeBSD kernel_linux pax_kernel tools X"
-RESTRICT="strip"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )"
-RDEPEND="~x11-drivers/nvidia-userspace-${PV}
-	x-multilib? ( ~x11-drivers/nvidia-userspace-${PV}[x-multilib] )
-	multilib? ( ~x11-drivers/nvidia-userspace-${PV}[multilib] )
-	~x11-drivers/nvidia-userspace-${PV}[tools=]
-	~x11-drivers/nvidia-userspace-${PV}[X=]"
-PDEPEND=""
-
-S="${WORKDIR}/"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-lockdep_check() {
-	# Kernel features/options to check for
-	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
-	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use kernel_linux; then
-		linux-mod_pkg_setup
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_SRC="${S}/src"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_SRC="${S}/kernel"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_unpack() {
-	if ! use kernel_FreeBSD; then
-		cd "${S}"
-		unpack_makeself
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	if use kernel_linux; then
-		if kernel_is lt 2 6 9 ; then
-			eerror "You must build this against 2.6.9 or higher kernels."
-		fi
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-	if use pax_kernel; then
-		ewarn "Using PAX patches is not supported. You will be asked to"
-		ewarn "use a standard kernel should you have issues. Should you"
-		ewarn "need support with these patches, contact the PaX team."
-		epatch "${FILESDIR}"/nvidia-drivers-pax-const.patch
-		epatch "${FILESDIR}"/nvidia-drivers-pax-usercopy.patch
-	fi
-	cat <<- EOF > "${S}"/nvidia.icd
-		/usr/$(get_libdir)/libnvidia-opencl.so
-	EOF
-
-	if kernel_is ge 3 19 0; then
-		epatch "${FILESDIR}/${PN}-3.19.patch"
-	fi
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use kernel_linux; then
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld" || die
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko" || die
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-}
-
-pkg_preinst() {
-	use kernel_linux && linux-mod_pkg_preinst
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	echo
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-
-	elog "This package installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-331.67.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-331.67.ebuild
deleted file mode 100644
index e250156c..00000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-331.67.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA GPUs kernel drivers"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="NVIDIA-r1"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi custom-cflags multilib x-multilib kernel_FreeBSD kernel_linux pax_kernel tools X"
-RESTRICT="bindist mirror strip"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )"
-RDEPEND="~x11-drivers/nvidia-userspace-${PV}
-	x-multilib? ( ~x11-drivers/nvidia-userspace-${PV}[x-multilib] )
-	multilib? ( ~x11-drivers/nvidia-userspace-${PV}[multilib] )
-	~x11-drivers/nvidia-userspace-${PV}[tools=]
-	~x11-drivers/nvidia-userspace-${PV}[X=]"
-PDEPEND=""
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# Kernel features/options to check for
-	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
-	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use kernel_linux; then
-		linux-mod_pkg_setup
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_SRC="${S}/src"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_SRC="${S}/kernel"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_unpack() {
-	if ! use kernel_FreeBSD; then
-		cd "${S}"
-		unpack_makeself
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	if use kernel_linux; then
-		if kernel_is lt 2 6 9 ; then
-			eerror "You must build this against 2.6.9 or higher kernels."
-		fi
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-#		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-	if use pax_kernel; then
-		ewarn "Using PAX patches is not supported. You will be asked to"
-		ewarn "use a standard kernel should you have issues. Should you"
-		ewarn "need support with these patches, contact the PaX team."
-		epatch "${FILESDIR}"/${P}-pax-usercopy.patch
-	fi
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use kernel_linux; then
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-}
-
-pkg_preinst() {
-	use kernel_linux && linux-mod_pkg_preinst
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	echo
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-
-	elog "This package installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-337.25.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-337.25.ebuild
deleted file mode 100644
index bcfd2149..00000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-337.25.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA GPUs kernel drivers"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="NVIDIA-r1"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi custom-cflags multilib x-multilib kernel_FreeBSD kernel_linux pax_kernel tools X uvm"
-RESTRICT="bindist mirror strip"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )"
-RDEPEND="~x11-drivers/nvidia-userspace-${PV}
-	x-multilib? ( ~x11-drivers/nvidia-userspace-${PV}[x-multilib] )
-	multilib? ( ~x11-drivers/nvidia-userspace-${PV}[multilib] )
-	~x11-drivers/nvidia-userspace-${PV}[tools=]
-	~x11-drivers/nvidia-userspace-${PV}[X=]"
-PDEPEND=""
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# Kernel features/options to check for
-	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
-	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use kernel_linux; then
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_SRC="${S}/src"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_SRC="${S}/kernel"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	if use kernel_linux; then
-		if kernel_is lt 2 6 9 ; then
-			eerror "You must build this against 2.6.9 or higher kernels."
-		fi
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-#		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-	if use pax_kernel; then
-		ewarn "Using PAX patches is not supported. You will be asked to"
-		ewarn "use a standard kernel should you have issues. Should you"
-		ewarn "need support with these patches, contact the PaX team."
-		epatch "${FILESDIR}"/${PN}-331.13-pax-usercopy.patch
-	fi
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use kernel_linux; then
-		use uvm && MAKEOPTS=-j1
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-}
-
-pkg_preinst() {
-	use kernel_linux && linux-mod_pkg_preinst
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	echo
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-
-	elog "This package installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.32.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.32.ebuild
deleted file mode 100644
index bcfd2149..00000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.32.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA GPUs kernel drivers"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="NVIDIA-r1"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi custom-cflags multilib x-multilib kernel_FreeBSD kernel_linux pax_kernel tools X uvm"
-RESTRICT="bindist mirror strip"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )"
-RDEPEND="~x11-drivers/nvidia-userspace-${PV}
-	x-multilib? ( ~x11-drivers/nvidia-userspace-${PV}[x-multilib] )
-	multilib? ( ~x11-drivers/nvidia-userspace-${PV}[multilib] )
-	~x11-drivers/nvidia-userspace-${PV}[tools=]
-	~x11-drivers/nvidia-userspace-${PV}[X=]"
-PDEPEND=""
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# Kernel features/options to check for
-	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
-	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use kernel_linux; then
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_SRC="${S}/src"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_SRC="${S}/kernel"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	if use kernel_linux; then
-		if kernel_is lt 2 6 9 ; then
-			eerror "You must build this against 2.6.9 or higher kernels."
-		fi
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-#		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-	if use pax_kernel; then
-		ewarn "Using PAX patches is not supported. You will be asked to"
-		ewarn "use a standard kernel should you have issues. Should you"
-		ewarn "need support with these patches, contact the PaX team."
-		epatch "${FILESDIR}"/${PN}-331.13-pax-usercopy.patch
-	fi
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use kernel_linux; then
-		use uvm && MAKEOPTS=-j1
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-}
-
-pkg_preinst() {
-	use kernel_linux && linux-mod_pkg_preinst
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	echo
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-
-	elog "This package installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.46.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.46.ebuild
deleted file mode 100644
index bcfd2149..00000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.46.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA GPUs kernel drivers"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="NVIDIA-r1"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi custom-cflags multilib x-multilib kernel_FreeBSD kernel_linux pax_kernel tools X uvm"
-RESTRICT="bindist mirror strip"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )"
-RDEPEND="~x11-drivers/nvidia-userspace-${PV}
-	x-multilib? ( ~x11-drivers/nvidia-userspace-${PV}[x-multilib] )
-	multilib? ( ~x11-drivers/nvidia-userspace-${PV}[multilib] )
-	~x11-drivers/nvidia-userspace-${PV}[tools=]
-	~x11-drivers/nvidia-userspace-${PV}[X=]"
-PDEPEND=""
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# Kernel features/options to check for
-	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
-	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use kernel_linux; then
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_SRC="${S}/src"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_SRC="${S}/kernel"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	if use kernel_linux; then
-		if kernel_is lt 2 6 9 ; then
-			eerror "You must build this against 2.6.9 or higher kernels."
-		fi
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-#		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-	if use pax_kernel; then
-		ewarn "Using PAX patches is not supported. You will be asked to"
-		ewarn "use a standard kernel should you have issues. Should you"
-		ewarn "need support with these patches, contact the PaX team."
-		epatch "${FILESDIR}"/${PN}-331.13-pax-usercopy.patch
-	fi
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use kernel_linux; then
-		use uvm && MAKEOPTS=-j1
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-}
-
-pkg_preinst() {
-	use kernel_linux && linux-mod_pkg_preinst
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	echo
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-
-	elog "This package installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.58.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.58.ebuild
deleted file mode 100644
index bcfd2149..00000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.58.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA GPUs kernel drivers"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="NVIDIA-r1"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi custom-cflags multilib x-multilib kernel_FreeBSD kernel_linux pax_kernel tools X uvm"
-RESTRICT="bindist mirror strip"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )"
-RDEPEND="~x11-drivers/nvidia-userspace-${PV}
-	x-multilib? ( ~x11-drivers/nvidia-userspace-${PV}[x-multilib] )
-	multilib? ( ~x11-drivers/nvidia-userspace-${PV}[multilib] )
-	~x11-drivers/nvidia-userspace-${PV}[tools=]
-	~x11-drivers/nvidia-userspace-${PV}[X=]"
-PDEPEND=""
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# Kernel features/options to check for
-	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
-	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use kernel_linux; then
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_SRC="${S}/src"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_SRC="${S}/kernel"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	if use kernel_linux; then
-		if kernel_is lt 2 6 9 ; then
-			eerror "You must build this against 2.6.9 or higher kernels."
-		fi
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-#		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-	if use pax_kernel; then
-		ewarn "Using PAX patches is not supported. You will be asked to"
-		ewarn "use a standard kernel should you have issues. Should you"
-		ewarn "need support with these patches, contact the PaX team."
-		epatch "${FILESDIR}"/${PN}-331.13-pax-usercopy.patch
-	fi
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use kernel_linux; then
-		use uvm && MAKEOPTS=-j1
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-}
-
-pkg_preinst() {
-	use kernel_linux && linux-mod_pkg_preinst
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	echo
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-
-	elog "This package installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.76.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.76.ebuild
deleted file mode 100644
index bcfd2149..00000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.76.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA GPUs kernel drivers"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="NVIDIA-r1"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi custom-cflags multilib x-multilib kernel_FreeBSD kernel_linux pax_kernel tools X uvm"
-RESTRICT="bindist mirror strip"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )"
-RDEPEND="~x11-drivers/nvidia-userspace-${PV}
-	x-multilib? ( ~x11-drivers/nvidia-userspace-${PV}[x-multilib] )
-	multilib? ( ~x11-drivers/nvidia-userspace-${PV}[multilib] )
-	~x11-drivers/nvidia-userspace-${PV}[tools=]
-	~x11-drivers/nvidia-userspace-${PV}[X=]"
-PDEPEND=""
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# Kernel features/options to check for
-	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
-	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use kernel_linux; then
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_SRC="${S}/src"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_SRC="${S}/kernel"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	if use kernel_linux; then
-		if kernel_is lt 2 6 9 ; then
-			eerror "You must build this against 2.6.9 or higher kernels."
-		fi
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-#		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-	if use pax_kernel; then
-		ewarn "Using PAX patches is not supported. You will be asked to"
-		ewarn "use a standard kernel should you have issues. Should you"
-		ewarn "need support with these patches, contact the PaX team."
-		epatch "${FILESDIR}"/${PN}-331.13-pax-usercopy.patch
-	fi
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use kernel_linux; then
-		use uvm && MAKEOPTS=-j1
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-}
-
-pkg_preinst() {
-	use kernel_linux && linux-mod_pkg_preinst
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	echo
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-
-	elog "This package installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-343.36.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-343.36.ebuild
deleted file mode 100644
index 40237657..00000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-343.36.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA GPUs kernel drivers"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="NVIDIA-r1"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi custom-cflags multilib x-multilib kernel_FreeBSD kernel_linux pax_kernel tools X uvm"
-RESTRICT="bindist mirror strip"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )"
-RDEPEND="~x11-drivers/nvidia-userspace-${PV}
-	x-multilib? ( ~x11-drivers/nvidia-userspace-${PV}[x-multilib] )
-	multilib? ( ~x11-drivers/nvidia-userspace-${PV}[multilib] )
-	~x11-drivers/nvidia-userspace-${PV}[tools=]
-	~x11-drivers/nvidia-userspace-${PV}[X=]"
-PDEPEND=""
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# Kernel features/options to check for
-	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
-	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use kernel_linux; then
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_SRC="${S}/src"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_SRC="${S}/kernel"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	if use kernel_linux; then
-		if kernel_is lt 2 6 9 ; then
-			eerror "You must build this against 2.6.9 or higher kernels."
-		fi
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-#		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-	if use pax_kernel; then
-		ewarn "Using PAX patches is not supported. You will be asked to"
-		ewarn "use a standard kernel should you have issues. Should you"
-		ewarn "need support with these patches, contact the PaX team."
-		epatch "${FILESDIR}"/${PN}-331.13-pax-usercopy.patch
-	fi
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use kernel_linux; then
-		use uvm && MAKEOPTS=-j1
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-}
-
-pkg_preinst() {
-	use kernel_linux && linux-mod_pkg_preinst
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	echo
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-
-	elog "This package installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-346.35.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-346.35.ebuild
deleted file mode 100644
index 027c511a..00000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-346.35.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA GPUs kernel drivers"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="NVIDIA-r2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi custom-cflags multilib x-multilib kernel_FreeBSD kernel_linux pax_kernel tools X uvm"
-RESTRICT="bindist mirror strip"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )"
-RDEPEND="~x11-drivers/nvidia-userspace-${PV}
-	x-multilib? ( ~x11-drivers/nvidia-userspace-${PV}[x-multilib] )
-	multilib? ( ~x11-drivers/nvidia-userspace-${PV}[multilib] )
-	~x11-drivers/nvidia-userspace-${PV}[tools=]
-	~x11-drivers/nvidia-userspace-${PV}[X=]"
-PDEPEND=""
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# Kernel features/options to check for
-	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
-	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use kernel_linux; then
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_SRC="${S}/src"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_SRC="${S}/kernel"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	if use kernel_linux; then
-		if kernel_is lt 2 6 9 ; then
-			eerror "You must build this against 2.6.9 or higher kernels."
-		fi
-		if kernel_is ge 4 0 ; then
-			epatch "${FILESDIR}"/${PN}-4.0.patch
-		fi
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-#		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-	if use pax_kernel; then
-		ewarn "Using PAX patches is not supported. You will be asked to"
-		ewarn "use a standard kernel should you have issues. Should you"
-		ewarn "need support with these patches, contact the PaX team."
-		epatch "${FILESDIR}"/${PN}-346.16-pax-usercopy.patch
-		epatch "${FILESDIR}"/${PN}-346.16-pax-constify.patch
-	fi
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use kernel_linux; then
-		MAKEOPTS=-j1
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-}
-
-pkg_preinst() {
-	use kernel_linux && linux-mod_pkg_preinst
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	echo
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-
-	elog "This package installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-346.59.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-346.59.ebuild
deleted file mode 100644
index c86373e8..00000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-346.59.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA GPUs kernel drivers"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="NVIDIA-r2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi custom-cflags multilib x-multilib kernel_FreeBSD kernel_linux pax_kernel tools X uvm"
-RESTRICT="bindist mirror strip"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )"
-RDEPEND="~x11-drivers/nvidia-userspace-${PV}
-	x-multilib? ( ~x11-drivers/nvidia-userspace-${PV}[x-multilib] )
-	multilib? ( ~x11-drivers/nvidia-userspace-${PV}[multilib] )
-	~x11-drivers/nvidia-userspace-${PV}[tools=]
-	~x11-drivers/nvidia-userspace-${PV}[X=]"
-PDEPEND=""
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# Kernel features/options to check for
-	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
-	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use kernel_linux; then
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_SRC="${S}/src"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_SRC="${S}/kernel"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	if use kernel_linux; then
-		if kernel_is lt 2 6 9 ; then
-			eerror "You must build this against 2.6.9 or higher kernels."
-		fi
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-#		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-	if use pax_kernel; then
-		ewarn "Using PAX patches is not supported. You will be asked to"
-		ewarn "use a standard kernel should you have issues. Should you"
-		ewarn "need support with these patches, contact the PaX team."
-		epatch "${FILESDIR}"/${PN}-346.16-pax-usercopy.patch
-		epatch "${FILESDIR}"/${PN}-346.16-pax-constify.patch
-	fi
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use kernel_linux; then
-		MAKEOPTS=-j1
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-}
-
-pkg_preinst() {
-	use kernel_linux && linux-mod_pkg_preinst
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	echo
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-
-	elog "This package installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/nvidia-userspace/Manifest b/x11-drivers/nvidia-userspace/Manifest
deleted file mode 100644
index 139cebdf..00000000
--- a/x11-drivers/nvidia-userspace/Manifest
+++ /dev/null
@@ -1,43 +0,0 @@
-DIST NVIDIA-FreeBSD-x86-173.14.39.tar.gz 20038266 SHA256 63a922ce4c5b676b4cb1ace98094dace4cc5408f2553e183df7b2127777a238b SHA512 96982fe7e0751c52fbef534193de09d187b99c1984c05e791223eb804719d8b3ba72efd983f227661ded4b71569bdbb914f1f629ab73a8bc9b8172832ccf3ec6 WHIRLPOOL 21f5906f42adf0064c7a7f81ac8e323de488e6d36356ee42c31a15c31ebb64335d5e2cff0ff022d41de480f9e0a57b3b96387f17151c7b59eceba2c61a7a102b
-DIST NVIDIA-FreeBSD-x86-304.125.tar.gz 34494889 SHA256 806d0bff9d394390b3a257472bc342857f150e9dba6673e6b930f47a93ec0269 SHA512 d2760196d3f0dfb1837d496bd11dbedab6a2bf3de98da35f16c92133452b915b425a718f72e560f5d6483caf5e2e5bcf99a462b2e392d7a08c77b59695649108 WHIRLPOOL eb008e1956043d48af5f928dc594c8ae9c8a946834d889db5b4a9b3f16bfaeb311221e5d3f83c8c599dee860b54a42030dccf2aaec31dffb6e8460bf646b82ad
-DIST NVIDIA-FreeBSD-x86-331.67.tar.gz 55876749 SHA256 0c88c363db516ef09b0027aacb1e686191d3d4676f44445bab2156c2197a6cae SHA512 0394aefbcd99a40e5cfc03a169bbf4bd8d34828cf2656ea49c560312e1cb7f575eeb32cd8dfe6f22a259e04efcf5183149846dee18b6ee254987f333fba82cba WHIRLPOOL 8b179600db7e8d1be476761ab0d5e6b5d10167e936044bf5de89115012bcdc0ecdd1ee7ed6da969261fe95f8b05c4b97a41343ed0ae2d283ff777d58971fbd7e
-DIST NVIDIA-FreeBSD-x86-337.25.tar.gz 58137349 SHA256 9857b24b5d910fb8688a2b9e11039d88b70ec250e900149183454675a363e8db SHA512 0c85814061732bd09948b5fd203d5d3a1fd5df0e1c23f4af11e1cfae6f7d8c7d7f569f35398c2c5551abf7eb5ce357229fa9b16ce2c21799e96396cff3313777 WHIRLPOOL a7ca516e184334117e1cdd45b3f4c1b0a8c50281ffd1c3859865d877c2bfb20136c308b1ff09e4d64d0e7fef8eeddacab488d0bc30c98d82a9280572be5f0de0
-DIST NVIDIA-FreeBSD-x86-340.32.tar.gz 59021194 SHA256 ee4f34a279ae84b97373adbc8c91ab7d34eb52dd4a7b095d51d8592b3e264df8 SHA512 9b5eafa48ccb105fe978242096c99355a291314cacf7a232cb81292355dffac5496cdb8667fa4ad3f0f2286792bf0473f523535e3258bb3b0237c76dbf5ba837 WHIRLPOOL b9438f675f65ec0b55aa2c1ca8c3beb35d20f3c56837bbeb02d511b66d4bce825ba95852ecbca70f6f83ff53f23c98e1c0d2bd313d195426fea63baed27c1cce
-DIST NVIDIA-FreeBSD-x86-340.46.tar.gz 59013852 SHA256 5aa4ec5f9ca4425cd3fdc47ac19c76900cecae8a9606632a8063514481363571 SHA512 03bddeb919c6ff58e11df2a4d7f0c30a8f47a9970704dde762c81183773057cdffadf37d60bb920c218b1c72bc8f71949aadcf250747f48b1cd27b1a6164949b WHIRLPOOL 0ce3f23d4660e368b10972a39366a1d26116e38fddaee1a3a4764e85e868151bc7f1e27f3c1dbbc52187c74acabd483c65455d7fd0b9679d89a2c05200e05d83
-DIST NVIDIA-FreeBSD-x86-340.58.tar.gz 59074607 SHA256 be4fdf4502532c39483a1072ed89bd33e0e49717a2523f412fe3c75da5edbc6c SHA512 c02d160ffc6a027a26c5fe2e6d7eff833f1e2cdb2c2006baad571bb733ddee68a8675175bddb1e154bea69571af633b125a524ca7b8ffd535b88ac91579f7bfb WHIRLPOOL 0999d380ae8770e1240287de002dc133d816c0895d39110fdc3f7455a7d25effbce09cbfea1b09b8b01b2214cd1f33554ba202a5f816c80b9884edb03ce2d9d6
-DIST NVIDIA-FreeBSD-x86-340.76.tar.gz 59362290 SHA256 0abbcc3bed3f017e7f1887a5c2d014e2b5a020462071998986ed49cdb8e7119f SHA512 e6d8b6d03fe0f9ab25ddeef680e0159ea4073d03762d3419761c02b917edefa9a1f81c209bd386838141c1924364c81126b0a356c325b056a0c2451865bed5eb WHIRLPOOL 7ec0cef6f92bfbd4c8b6a051dc8de4b6b138f63fd4f7e18756178a9aebb91ea32523d5ca885481d8c8c3d1531b153699f4e5606c155d6c3aa79a340637d3744b
-DIST NVIDIA-FreeBSD-x86-343.36.tar.gz 59205879 SHA256 8634e7537eca778790296f8355e39ae9a7e16642648e671a6c9339ee55fe340c SHA512 35fcf57d5e830cbe3c07ec70362ad9f0ff6ec327c6b11b6d3c533315e59031501501b9fdb80a3bef720506e5221ad84496745ce13d2c9885076f1c8e8537ba46 WHIRLPOOL 3ed3230dc190e7670c960743d94b8db1c0d9908b597f952746d851b403847e7b2836f1c60e6af0fe73072c1fda3971dfacc37c21908c227b2c20b5045dbfd61f
-DIST NVIDIA-FreeBSD-x86-346.35.tar.gz 57980205 SHA256 c2decd38b2ff3e46a611acfd2ca41fd887b7223f6aee1f57f52717b4206e2be3 SHA512 acf8a7792a9a0bd388139548d5923a2daa59680e44877083e8de2935f8eed83821505b036bd18ea282e9c4996d069675f8406d0958b49a0efa9c0fd64e69c3d1 WHIRLPOOL 1ed58654eee9b6e38275c60a6197faff095082ff176e548522c03cf2e5f91f2b632d49341eed8f537422343a43577419239327266243402b0425b6a46ee21f83
-DIST NVIDIA-FreeBSD-x86-346.59.tar.gz 57992895 SHA256 6cb7ad1b38f4f01fea898f335452e95ebe350285c9dfe1bf83c73f450231c9ae SHA512 2e421047dc850c6d3071df17f1507ce4f925ba05adca8efd01e3b6c2451cc45231e077aa4df29b398b99a44ff054b84555803b4d9bf6c11fb681706d3b5c1e50 WHIRLPOOL 88c965f850d6c9daaa27d95124ca456f0484581c1901026fe1becf2c6932cd2ee4e8bffaeca7c0239971f7418bee4565af96ba7e2eebd3b6e60dcc244df20abb
-DIST NVIDIA-FreeBSD-x86_64-304.125.tar.gz 35498616 SHA256 46b14b8c5ee1c02ff5e30afc9c99f4dd2edc426ccb2b73764093a1787639699d SHA512 34d48f24b1f5019b23c2937f8b5280fcc596764e1f5833cfe33db5e4d8395a0d69aa4c4214a5b97620dbaade73ac0fa333c36cceb4a137bb26d3ba37c31a0eb7 WHIRLPOOL 82677bd2aec3a60fe64211170573ef702b1dd1ab5a71ec922fb56b8d40f2163c0151a7c7f8bdace9127c8afcaf278f8f23a1cb585a8ad3bb7a0d42787ab17fb2
-DIST NVIDIA-FreeBSD-x86_64-331.67.tar.gz 46997728 SHA256 5781bba8b7783f96c1f239961140317426910633fbfa3ba80fdcefe54aec7e92 SHA512 1653c03e091451f14c040c2b56de8574e5fd5d7b24db6ce979f99693f6a10e61e6c28fb3a962288a135551664973bba6d2f29b92aff726a4ee592fddc807db4e WHIRLPOOL a97d473c786451c7cb88155edb12a86da5f2888a584da7538dae93056357d0c63f294d638f6949c7a6f8255c60c3db84fdbb28ce10cd6da4c82758f95eb90679
-DIST NVIDIA-FreeBSD-x86_64-337.25.tar.gz 58941876 SHA256 189dc0f70528d0099d0396a52bf759af74d6a99203484be2d2d6514faf0d4161 SHA512 458c9200579a6caed02aabbc196ec998a0d19149cca665c5ef9bc709c018b991b27713c92d00bdd1ea6ddd86e04c641f387e1ec8a1235cc9581af9e7a3b19ebf WHIRLPOOL d819cf486edc443b1da39ea67582a12698b1dea1501f3b6738014a80f8a96260aa0ba30a9e2f1fac075f0f7d604dc94978f7f82092b40531dd4989a2954cc420
-DIST NVIDIA-FreeBSD-x86_64-340.32.tar.gz 59836909 SHA256 4a55cbd4f87528d4d5b5a8809a8c6e2dac9ad22b0f8b357590893dfb39e52512 SHA512 ef333d94a147e04292d6e197ee72a7abfb10a84665931876455b689409af42ac713d1a16f965214a46d9dd28fd324769fa4dd14dde5caf20a8b23a9683b6c55e WHIRLPOOL 76fd78eb97b69d7a5d7dc46e06a8d7b4dc3fadc1f2c6995d86161ca90ce99ec4a0b42eedf09939a4436481bad33ef201f49c73c8add833cf912af86774d47b34
-DIST NVIDIA-FreeBSD-x86_64-340.46.tar.gz 59835566 SHA256 699a65b5184f8705ba4ddbefb5776136bec98619ea00af3304725e5e028b7346 SHA512 7a6ba9fbd769aec45985664edd7291403e70c0e89a90f5c0665d6433e4baa8e0b59ceb99e817b377753576d189c0091d5af0bc2da796726ce0a9f0ebfa831d5b WHIRLPOOL aea421916646f68efbba007c08319d7b26259e1ee146bd420910468c36c04c3bc574ee6db103d64259083b11190cb3d5342a3dd1af42b0a306aa4515eb4bc9af
-DIST NVIDIA-FreeBSD-x86_64-340.58.tar.gz 59892350 SHA256 c59e4c4e1c95a53d1dd797b99c852272fad0a256be65599eef82a6a2a16ce502 SHA512 bad7975662045e8e8075a558e3805b65e69536c9c8896a31245ff9e28b44c723ec7b3e9c9b40fa92622c0f5a966ea89bcf247156ee34e4977e933eab4595f22d WHIRLPOOL 893744d9f532ab463e7ba7d99999714816ad8eaed18a9e72ef47b3d9da4d493da4f4f2b6bf415dc20dec70d3ec850dfa26c8fae69a5166b093c8de36797b94e2
-DIST NVIDIA-FreeBSD-x86_64-340.76.tar.gz 60206978 SHA256 60037d035b9af9f1d4dcdd5033e1b28b0cd4c7ca94f6bcb8d267e037a930fdc0 SHA512 d478eac282dfb43205f7464d6542cf1f71ed4dea6b8381314affb8647d104c5ddf7e658b6b8eb5e0bdb18207b92f76c574b24959ce23034d375cc712998e6e7c WHIRLPOOL 98ebffd792a47e3a9ef369976db11909bc13551f38977f85ece41e5a31a790c2c173badfc166e3a0bfe4361d5221129d19364c074ba11fc4aa9062d5cb1499a8
-DIST NVIDIA-FreeBSD-x86_64-343.36.tar.gz 60045074 SHA256 aa189d9fd6448ed49ff4a8dd09dd15c06f6b3ef662fd3d960b4853c485cbab8a SHA512 23c38de071ac6e2c87db2c767b07f243703e55cd6485eb8e538fb72f38e9856b7ff28430fdd7eccc4728f3d36c14eac8b1fbf7155fe864ead93ed4218d5b65b5 WHIRLPOOL 401cdc5675d5fe60b6ca492be912573e9fc56a0a67ad680e2cada783ec8a34c15c6ca1a495c8fdbf09e384bc420295750540f5c77907c459c80f400d8291e44a
-DIST NVIDIA-FreeBSD-x86_64-346.35.tar.gz 58753495 SHA256 0a1c92efb9e29d0d4e1c099a5f2c69a29ac2431dbc33009cc83a35c794c48d33 SHA512 8838602a1e739043158b29ada81fceb36bb68385b5bdc21cc675eb8daafff45acb75efe9c8c00a45ce74164f510198490e820dcd0a797e52ff41254d93e467d3 WHIRLPOOL 7ecd9a92d3a7fe415faf3c7b9bda9af288aa65880fcbc0ec5131d85f1099dde569497e93e6060d8c96c426145d30e2bcd8d74e53d951591726888137fc3f5873
-DIST NVIDIA-FreeBSD-x86_64-346.59.tar.gz 58735813 SHA256 074840aeacb8965f14bc312db432efa320f97380bb8b21bb9cf1b242384d6651 SHA512 23c74f4ee9268b0583cee06b4e2109d33547a0e8789a67d7450b056f657d745930b834a5831a8709b9a095bcc63dbc76cbee219240519490ece1e40e2bf413eb WHIRLPOOL 985fe2fc59b38f3babaf534d7d04924b1d43ce3bc42b71420ea426f99ecbaed98aed5224bb5d30fbcc2b44978f38d8e812767a2bb7ee41c1d551c32bb345dc8d
-DIST NVIDIA-Linux-x86-173.14.39-pkg0.run 15134997 SHA256 a09935f37121ed3db8ae3da63a0d8e9d4348a19c859811c9fe44d6ce8e3eab23 SHA512 e24e15ccec725d3cbca502c2b77061776a81ef92917a950adec4ff6bdc34f10903aa654433177ea74be0dade4af81c5380d5710d375a5ea445940d06154bde93 WHIRLPOOL fce3d8e4f6cdf698f5a057514b6fe220bb1011025bdce5bd4cf0e424fb4d306d38251b6726bda03f290ea8137d5a95ed418cf8751722879f9042462abd9181b6
-DIST NVIDIA-Linux-x86-304.125.run 40589395 SHA256 aec5b3a792910e152d5af756ef6fd7224c448c564564c7c448ab8ec3fc78c4f7 SHA512 cd77736790876b66c1e88bf30b7a93f755c0f94118edda8fde1701dc07dc4eb60f89a27b0ed432db74729f269cb239f32f3c5e045d701f60baf69da7fc0d0ea7 WHIRLPOOL 85cd375e1b67bbabe9a8119affec20b7a9a258f8b5be89d755f7ea596a94f98df053e8ade33f1aba1f74f753dcb636268c4f2074a09eaf68d858241f1482552c
-DIST NVIDIA-Linux-x86-331.67.run 37064511 SHA256 696b4a574ad3cb2b3286e0848e7e831940110cc33c63de51890154dbbd31acc6 SHA512 2a17854b366aa67a398c8d66134fb78d0ccdf4a6b2fe874bb7c146cfd24501431ed7448f5b7e24c8f78c6b1f6c2d5da207fbf568c2135ef53e51e83ce02cc374 WHIRLPOOL 4ad64717eb43043bacfbecdd6efe38bc5bf598acf172984e7c3eb1dcd779a9cbe53a76ac6e7b94b1d950d1f279147ceee4037d89be589fef2219d826eb86d09e
-DIST NVIDIA-Linux-x86-337.25.run 37649836 SHA256 f76ece6bd98bfe2ae641a1847094e98c6f7ad7a01af682b4f38108d6b6227f9b SHA512 f68105a43f9129f4112c8a091ed7c9641708b62d20c199544e5e7079d5c5bdc0b6c83427be868e62c7134400ca62cab6a65eaff96ddb940768750250cbd50112 WHIRLPOOL 1ff92ffe33dad59bf393a7b6fe7523362433704dc8329701e74814c2eef833d15e44334264601080b90f723f5390ce6502fa3ed530fe9fadaf3efff139e65047
-DIST NVIDIA-Linux-x86-340.32.run 38587515 SHA256 1d0489c35c5b332c9b949d9de3c3cbab4ac3a94385aa41e7a7b62ef23f4395f5 SHA512 a67e57a1bd70a9cd5ae2bed70403920ed94d8eac9d08dcd380f6065cd597d5824e26ae25a0bcd56626190124c07d128f3b0429040794c8e8d3ead85860fcb646 WHIRLPOOL 66bf6db27edddae845606e82cf9397dbf483bbde23e97899575c8ac3f6ce86c84d88f8e60c60b1aad1360fe9bea4f43de030a849f88f43d482508de23cd24d8e
-DIST NVIDIA-Linux-x86-340.46.run 38635506 SHA256 a2e6d779397372dea77466e85ba30a15211c24502687512694604e570db11f87 SHA512 3d90a73fbe07eb25ec80a485c3827bebaf64a941331d6f28fb9b925678d74d66421dfecf6fe9637fb57b4aece268e987bfa8f29c06567243ae998d7ddac25f98 WHIRLPOOL dca92cff7d72f105e89deea74d6de69d4f78f1a7b15adea9e4a8cbbca9007b4bee4cc9b9f0cb39d7a2436e141785a5cfd3011b235418e701d27e7393ffefbf66
-DIST NVIDIA-Linux-x86-340.58.run 38527667 SHA256 7cc48ff0681667aad8213a4dd3cf7695cad29a5a23a3110d22566c362c76fb5b SHA512 71381af39622feaaa84e005212f2bfa0800d2b100cac8aafdaeaa3ae1cb5aff47e1d2927bbed059ec1667a41c65946fee4ee763c9cfc5d78b68c06bac55757e7 WHIRLPOOL 31230ddaf971fe35086c1c42530bf066d8632d1d2082329b42c076afacfcab4f0edeae87b27a9a59ee9915f8451ad9d4305a32ff87af459a4e87bedac181241b
-DIST NVIDIA-Linux-x86-340.76.run 38818911 SHA256 9b29d93b49009caed84a8852825c3e7c6ebbbba8ec99b03ee5113108c8b036d0 SHA512 45d7b29670f9ca50de80d6d61260015b45f74422bbd12039923d04ae8b033b903b27e9f4c174461055f3cf45a4af44565ce9a8b9cd671e0e54d37770a1156839 WHIRLPOOL da7e072a56e3aff8b4688e60c5acd76c97804fa582d21c70dce043b13fa2317d1021f19927e827cf6132aebe2d40371c750e3eb56697bc7eda16bb7369bf2994
-DIST NVIDIA-Linux-x86-343.36.run 41073259 SHA256 8cc1c99fbda29b3258f57dbdacef11921aca2e3ac106ef591f0815716e1b829e SHA512 a6287cf8ad6379daa7c6d7ae6bc08f9985ad9e9353de6d88eb72d8a1acad3e25eb65076b904152c6ddd8ac54b9afcdbb7a5dfb9a46e75c5654be87b3df0e48e1 WHIRLPOOL 7aaa7977a850314045bcfcc36a8f6ed8b3f487ec972e109ea48cbe3edda4ff29c0bf02e7c11dacf6a3e71783259dc809840c32e301aa16f2d4394d7f07cffc0a
-DIST NVIDIA-Linux-x86-346.35.run 40692611 SHA256 bba63c30c730ad7b8500a77c81cae58562b9f9b57cd576b61f37a2d8bc45df25 SHA512 df9213fe4743b6c329c1789dbdfe962af9c647a4e20380f957bc55369554fc731ffc098c00de922529d372b9686a170f6ccb1ce2e573ae57402396db9a3dc73d WHIRLPOOL 111b5a52fba139171163c6c31faade9d4ff40940520a10477cf90c998b2254c74fa571d7697b82ac515b80b71a3e205d1968b06c60ab057d008a41c45406e68e
-DIST NVIDIA-Linux-x86-346.59.run 41370855 SHA256 65cf83fccc02399d54212cbeea1c2364e4974687c3ad6cba87cc109476ad2129 SHA512 f7fd76cd4c73528c9476494e1a35b27dedbbbdc4a190ae5909c27b8e1b0c3ef5c446ef40c199b245eaf39621eda55ef8d4f4adbe8d2d75b8d5f1ba14f703c56c WHIRLPOOL 2895275d549084c596396f6dd7a25f040a4af52c70090ed393f3eb409edb2cbfc17c622d0fd200b44e1ba3e4d4e3f2f6ea11a8c379e81e8c2bc514eb8e0fafcf
-DIST NVIDIA-Linux-x86_64-173.14.39-pkg2.run 21100833 SHA256 15a953666d5681ba54c97498b578ffd286a1dc96d605f3b02110f3f99813100e SHA512 a65cd496e6ed57f771c3d99f37f616a1242d97844f6faef7a807825ad899c0e536a99fde397020839f0857883b934032f9491024f3047a6b06d3eea1f5d77713 WHIRLPOOL dc5f243b7d1de7e2d1b7f005e018a2940d63335b11a7c83c234b348b7a1839e9131169d2ea928bd8c2f549a4535149b03e16e6c94d59dfa745f7f904ff790a45
-DIST NVIDIA-Linux-x86_64-304.125.run 69108272 SHA256 c654889b85a18326f2c610260a8fbc3b1bb6f9b8be1c052a46a213f60bd62262 SHA512 75bd5700281b0aa4e19be5b779e3484711ce3db92641a32f3bf5e890601b353b23113f6218d5a2fa6b2c8d93702fac92810013c7c0f8efe484b0a39d09b1b073 WHIRLPOOL d8b9794253b1ab270680da7420f50df5ab6aa4d5123bad695be5b7891b2df55bf06ecdd0b221fd29e799077c0a64da8059df16ebea9a3535e402f2c0cf482dcf
-DIST NVIDIA-Linux-x86_64-331.67.run 60231750 SHA256 9c7f2bb44bb26a5effb915d8aa22132a6c06483e0cfa6f47b7265b15da83bbd7 SHA512 7368a60c282386bc5b68599cacd07a18a9be4c3fd624eac9eb92966221318723c3f44ae033163789eae1ae683e729d49268769e79c465aca6632c5a7e6d6942a WHIRLPOOL 552f590257e3e1e53b83563aeea840a78869c10ea2707cea779da99ec726cc17398fada84379537ac2e6a7dc8a653c8b00141ab35adb10a5a49d0da565c2eb73
-DIST NVIDIA-Linux-x86_64-337.25.run 68053486 SHA256 83280f7738f65bb2e790e7530a38978cf0bd0aa741eda51629c9e9b068128af0 SHA512 27cb5030da00d6fa2a2dd6701cc149ce885e7ff7e7ca4f1629c27737357fdadedec41e830f5cacabef14646515d6d2729f753d78424260316e28111f2c3e53b9 WHIRLPOOL 72eba5239ae7272d3501403ef292f0e131896b3dd852a7e2423e79206d99aa5a4a3b98eb4193ad5cd1e0247ffd48189d3a3ba02ca307a759a4f15b9c9a386dbd
-DIST NVIDIA-Linux-x86_64-340.32.run 69753673 SHA256 ef96003110564953cad4ffaec073696dcf9652338dfe5eb0c58ae3ce45db42ac SHA512 24c2dec161022bd229862ad66711232cf6424a0bd1eb056d7eb22a34e265d4b1f6208779cf507b480189f95f795d580a30ec5f8ab1bff549d2a41a57adcc14b4 WHIRLPOOL 6422498998253003fc1e1d6396449d2fe35b5836a083a254d9d7439434e5a3e1cf55afbcc3860a234ee9b3d0a1b18b9c58e4946107465559f0dcb121ef796e5a
-DIST NVIDIA-Linux-x86_64-340.46.run 69693129 SHA256 57e7694b5a985ee95d2da37598ec37cdabf40f914490f4cdb0c5184f12a74270 SHA512 43cce2911c1894fe9240453179666c5fd1f437b49a1e3e5990463e9009ffa25d5da7f91105d1520c6133a0bdef9070c768efdc087e2d8ef85ed7896fcf555c7a WHIRLPOOL 9f845c5b6621fcc34a5b64d1c5823a3978a04c669ee4d3f7e3aee3f8da06c1c6eaa3b51792be2e1006945ee06df0c1a2650fc70d4257b768ca4d144a79775892
-DIST NVIDIA-Linux-x86_64-340.58.run 69851185 SHA256 70cc452161b969d659225a3a7d4cc17d5827f8f8ce6eb053757f30f6a666a643 SHA512 c88a83d7a5493b8069d2cac24363c7ca2e87ea9ca617cf9ffb0277c52dc39624019479b61e218f7d7a033c58b685131582e38a02e5a529c96126225f5b8cf8db WHIRLPOOL 9bc7f8c6c4a4be0b7b1f10a3de02ad0a3c1039522df5e3703ba180988ad4cab007801b1858c274f41edc87d7851db6eb54f2f4599cc91ae9e2cf11b5ac0d8fb4
-DIST NVIDIA-Linux-x86_64-340.76.run 69955037 SHA256 3bf670e9a2bdb184648dec54ce06fab65e798a9a4c9dd5155e2be4efee3e0994 SHA512 59ad49a49f170ec971e2b5ee3a45b9f972521bc4b7ab6f02f46a5cfc5b1998841195cc5c91dffc417d2183de39c5a589eabf7b48864e0c6842363a75051db40c WHIRLPOOL 8c846f2b5b6f56bd2962fe4660751a4485e0ddd2186bde0affccece32271b03f4f3c226377c0b1877ea391ab130ed6f282c316f227205488a63e4f0a19db82cc
-DIST NVIDIA-Linux-x86_64-343.36.run 73775989 SHA256 2285efa2c0e6675d8724e47a09403630a674c32e514bdcfb54cec3c81810fc78 SHA512 6e76e54b24b0c1fa16e94eaf0f99d2e7dfd28e5aaae0bcb6df3e6d4e20c7a13d5d30902e2bc9bc7609c8d87e5ec8fbf16a5a2dd513bb9d761714176c4ce5e283 WHIRLPOOL 73040a3f3073486c5d6d0a5d84be7d478a3c15bb4aee21f3c590592afe2845f8e9c7064010ddc8f93b764e48940e523952abf9978d09cd32ec1ce8b644e59eb6
-DIST NVIDIA-Linux-x86_64-346.35.run 73462796 SHA256 8625acbbc7a2abdda436a5cb9d06f2a7f5913b16e0a35ac4f9f106853a94d086 SHA512 dab2ce5a722a93e83822cb83db6d3ef612274a6e3236b0ff34f081630cc00f76be5a0a1637b85dda2ca289336e44b6586afc82a228cb5de8ca1105d6bd4f4750 WHIRLPOOL f5255f714ff9f14edb26246826c810de05de1d6bcaeaf30f52294313aa1f68fbd432ddbddf576757cee711e19e4b7d2f14fb30f8975c9e2686395fb31998f413
-DIST NVIDIA-Linux-x86_64-346.59.run 73468725 SHA256 231020548431569c0172605815ba131a18f969966b4abf82129f974740bc64ca SHA512 a8d2cfcf750c4f0f155450a50132e1c2a6736212d654ab5539f1dd17233ed6f9ed64777f73f2b394e236d27abee4f4c7a344855372a641552ea40a8973fddfe9 WHIRLPOOL 0e919b147c9088106a8a3bf138262998a02b0da71c8e656d6b888f952e19b11ad8a0b6b4eee6e7181a8421aa2f0b4be86b82c0a14282e56e135f80e1c00aa659
diff --git a/x11-drivers/nvidia-userspace/files/09nvidia b/x11-drivers/nvidia-userspace/files/09nvidia
deleted file mode 100644
index 1fcbef41..00000000
--- a/x11-drivers/nvidia-userspace/files/09nvidia
+++ /dev/null
@@ -1,2 +0,0 @@
-# Has to precede X11's own libraries!
-LDPATH=/opt/nvidia/lib
diff --git a/x11-drivers/nvidia-userspace/files/90mutter-disable-culling b/x11-drivers/nvidia-userspace/files/90mutter-disable-culling
deleted file mode 100644
index d9b64408..00000000
--- a/x11-drivers/nvidia-userspace/files/90mutter-disable-culling
+++ /dev/null
@@ -1,2 +0,0 @@
-# See https://bugzilla.gnome.org/show_bug.cgi?id=664858
-CLUTTER_PAINT=disable-clipped-redraws:disable-culling
diff --git a/x11-drivers/nvidia-userspace/files/NVIDIA_glx-defines.patch b/x11-drivers/nvidia-userspace/files/NVIDIA_glx-defines.patch
deleted file mode 100644
index da9933f6..00000000
--- a/x11-drivers/nvidia-userspace/files/NVIDIA_glx-defines.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h
---- NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h	2002-12-09 21:26:55.000000000 +0100
-+++ NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h	2003-01-30 18:20:23.000000000 +0100
-@@ -39,6 +39,7 @@
- typedef XID GLXPixmap;
- typedef XID GLXDrawable;
- typedef XID GLXPbuffer;
-+typedef XID GLXPbufferSGIX;
- typedef XID GLXWindow;
- typedef XID GLXFBConfigID;
- 
diff --git a/x11-drivers/nvidia-userspace/files/NVIDIA_glx-glheader.patch b/x11-drivers/nvidia-userspace/files/NVIDIA_glx-glheader.patch
deleted file mode 100644
index e0393e1b..00000000
--- a/x11-drivers/nvidia-userspace/files/NVIDIA_glx-glheader.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- usr/include/GL/gl.g.orig	2004-07-17 19:56:59.789410584 +1000
-+++ usr/include/GL/gl.h	2004-07-17 19:59:08.844791184 +1000
-@@ -66,6 +66,10 @@
- typedef double GLclampd;
- typedef void GLvoid;
- 
-+/* Patching for some better defines in the global system */
-+#ifndef GL_GLEXT_LEGACY
-+#include <GL/glext.h>
-+#endif
- 
- /*************************************************************/
- 
diff --git a/x11-drivers/nvidia-userspace/files/eblits/donvidia.eblit b/x11-drivers/nvidia-userspace/files/eblits/donvidia.eblit
deleted file mode 100644
index 75b39cfb..00000000
--- a/x11-drivers/nvidia-userspace/files/eblits/donvidia.eblit
+++ /dev/null
@@ -1,21 +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/nvidia-drivers/files/eblits/donvidia.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $
-
-# Install nvidia library:
-# the first parameter is the place where to install it
-# the second parameter is the base name of the library
-# the third parameter is the provided soversion
-donvidia() {
-	dodir $1
-	exeinto $1
-
-	libname=$(basename $2)
-
-	# libnvidia-cfg.so is no longer supplied in lib32; step over it gracefully
-	if [ -e $2.$3 ] ; then
-		doexe $2.$3
-		dosym ${libname}.$3 $1/${libname}
-		[[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1
-	fi
-}
diff --git a/x11-drivers/nvidia-userspace/files/eblits/mtrr_check.eblit b/x11-drivers/nvidia-userspace/files/eblits/mtrr_check.eblit
deleted file mode 100644
index b14df34b..00000000
--- a/x11-drivers/nvidia-userspace/files/eblits/mtrr_check.eblit
+++ /dev/null
@@ -1,19 +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/nvidia-drivers/files/eblits/mtrr_check.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
diff --git a/x11-drivers/nvidia-userspace/files/eblits/src_install-libs.eblit b/x11-drivers/nvidia-userspace/files/eblits/src_install-libs.eblit
deleted file mode 100644
index e48d11ce..00000000
--- a/x11-drivers/nvidia-userspace/files/eblits/src_install-libs.eblit
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distribnuted under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $
-#
-src_install-libs() {
-	local pkglibdir=lib
-	local inslibdir=$(get_libdir)
-
-	if [[ ${#} -eq 2 ]] ; then
-		pkglibdir=${1}
-		inslibdir=${2}
-	elif has_multilib_profile && [[ ${ABI} == "x86" ]] ; then
-		pkglibdir=lib32
-	fi
-
-	local usrpkglibdir=usr/${pkglibdir}
-	local libdir=usr/X11R6/${pkglibdir}
-	local drvdir=${libdir}/modules/drivers
-	local extdir=${libdir}/modules/extensions
-	local incdir=usr/include/GL
-	local sover=${PV}
-	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
-	local NO_TLS_ROOT="${NV_ROOT}/no-tls"
-	local TLS_ROOT="${NV_ROOT}/tls"
-	local X11_LIB_DIR="/usr/${inslibdir}/xorg"
-
-	if use x86-fbsd; then
-		# on FreeBSD everything is on obj/
-		pkglibdir=obj
-		usrpkglibdir=obj
-		x11pkglibdir=obj
-		drvdir=obj
-		extdir=obj
-
-		# don't ask me why the headers are there.. glxext.h is missing
-		incdir=doc
-
-		# on FreeBSD it has just .1 suffix
-		sover=1
-	fi
-
-	# The GLX libraries
-	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGL.so ${sover}
-	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGLcore.so ${sover}
-
-	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libnvidia-cfg.so ${sover}
-
-	dodir ${NO_TLS_ROOT}
-	donvidia ${NO_TLS_ROOT} ${usrpkglibdir}/libnvidia-tls.so ${sover}
-
-	if ! use x86-fbsd; then
-		donvidia ${TLS_ROOT} ${usrpkglibdir}/tls/libnvidia-tls.so ${sover}
-	fi
-
-	if want_tls ; then
-		dosym ../tls/libnvidia-tls.so ${NV_ROOT}/lib
-		dosym ../tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
-		dosym ../tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib
-	else
-		dosym ../no-tls/libnvidia-tls.so ${NV_ROOT}/lib
-		dosym ../no-tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
-		dosym ../no-tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib
-	fi
-
-	if ! use x86-fbsd; then
-		# Install the .la file for libtool, to prevent e.g. bug #176423
-		[ -f "${FILESDIR}/libGL.la-r2" ] || die "libGL.la-r2 missing in FILESDIR"
-		local ver1=$(get_version_component_range 1)
-		local ver2=$(get_version_component_range 2)
-		local ver3=$(get_version_component_range 3)
-		sed -e "s:\${PV}:${PV}:"     \
-			-e "s:\${ver1}:${ver1}:" \
-			-e "s:\${ver2}:${ver2}:" \
-			-e "s:\${ver3}:${ver3}:" \
-			-e "s:\${libdir}:${inslibdir}:" \
-			"${FILESDIR}"/libGL.la-r2 > "${D}"/${NV_ROOT}/lib/libGL.la
-	fi
-
-	exeinto ${X11_LIB_DIR}/modules/drivers
-
-	[[ -f ${drvdir}/nvidia_drv.so ]] && \
-		doexe ${drvdir}/nvidia_drv.so
-
-	insinto /usr/${inslibdir}
-	[[ -f ${libdir}/libXvMCNVIDIA.a ]] && \
-		doins ${libdir}/libXvMCNVIDIA.a
-	exeinto /usr/${inslibdir}
-	# fix Bug 131315
-	[[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \
-		doexe ${libdir}/libXvMCNVIDIA.so.${PV} && \
-		dosym libXvMCNVIDIA.so.${PV} \
-			/usr/${inslibdir}/libXvMCNVIDIA.so
-
-	exeinto ${NV_ROOT}/extensions
-	[[ -f ${libdir}/modules/libnvidia-wfb.so.${sover} ]] && \
-		newexe ${libdir}/modules/libnvidia-wfb.so.${sover} libwfb.so
-	[[ -f ${extdir}/libglx.so.${sover} ]] && \
-		newexe ${extdir}/libglx.so.${sover} libglx.so
-
-	# Includes
-	insinto ${NV_ROOT}/include
-	doins ${incdir}/*.h
-
-	#cuda
-	if [[ -f usr/include/cuda/cuda.h ]]; then
-		dodir /usr/include/cuda
-		insinto /usr/include/cuda
-		doins usr/include/cuda/*.h
-
-		if [[ -f usr/${pkglibdir}/libcuda.so.${PV} ]]; then
-			dolib.so usr/${pkglibdir}/libcuda.so.${PV}
-			dosym libcuda.so.${PV} /usr/${inslibdir}/libcuda.so.1
-			dosym libcuda.so.1 /usr/${inslibdir}/libcuda.so
-		fi
-	fi
-}
diff --git a/x11-drivers/nvidia-userspace/files/eblits/want_tls.eblit b/x11-drivers/nvidia-userspace/files/eblits/want_tls.eblit
deleted file mode 100644
index 4debb85d..00000000
--- a/x11-drivers/nvidia-userspace/files/eblits/want_tls.eblit
+++ /dev/null
@@ -1,33 +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/nvidia-drivers/files/eblits/want_tls.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $
-
-want_tls() {
-	# For uclibc or anything non glibc, return false
-	has_version sys-libs/glibc || return 1
-
-	# Old versions of glibc were lt/no-tls only
-	has_version '<sys-libs/glibc-2.3.2' && return 1
-
-	if use x86 ; then
-		case ${CHOST/-*} in
-			i486|i586|i686) ;;
-			*) return 1 ;;
-		esac
-	fi
-
-	# If we've got nptl, we've got tls
-	built_with_use --missing true sys-libs/glibc nptl && return 0
-
-	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
-	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
-		case ${CHOST/-*} in
-			i486|i586) return 1 ;;
-		esac
-	fi
-
-	# These versions built linuxthreads version to support tls, too
-	has_version '>=sys-libs/glibc-2.3.4.20040619-r2' && return 0
-
-	return 1
-}
diff --git a/x11-drivers/nvidia-userspace/files/libGL.la-r2 b/x11-drivers/nvidia-userspace/files/libGL.la-r2
deleted file mode 100644
index 863d1844..00000000
--- a/x11-drivers/nvidia-userspace/files/libGL.la-r2
+++ /dev/null
@@ -1,32 +0,0 @@
-# libGL.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libGL.so.1'
-
-# Names of this library.
-library_names='libGL.so.${PV} libGL.so.1 libGL.so'
-
-# The name of the static archive.
-old_library=''
-
-# Libraries that this one depends upon.
-dependency_libs='-L/usr/${libdir} -lm -lX11 -lXext -ldl'
-
-# Version information for libGL.
-current=${ver1}
-age=${ver2}
-revision=${ver3}
-
-# Is this an already installed library?
-installed=yes
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/usr/${libdir}'
diff --git a/x11-drivers/nvidia-userspace/files/nvidia b/x11-drivers/nvidia-userspace/files/nvidia
deleted file mode 100644
index 7cf0f7c0..00000000
--- a/x11-drivers/nvidia-userspace/files/nvidia
+++ /dev/null
@@ -1,40 +0,0 @@
-# Nvidia drivers support
-alias char-major-195 nvidia
-alias /dev/nvidiactl char-major-195
-
-# To tweak the driver the following options can be used, note that
-# you should be careful, as it could cause instability!! For more 
-# options see /usr/share/doc/PACKAGE/README 
-#
-#   To enable Side Band Adressing:  NVreg_EnableAGPSBA=1
-#
-#   To enable Fast Writes: NVreg_EnableAGPFW=1
-#
-# To enable both for instance, uncomment following line:
-#
-#options nvidia NVreg_EnableAGPSBA=1 NVreg_EnableAGPFW=1
-# If you have a mobile chip, you may need to enable this option
-# if you have hard lockups when starting X.
-#
-# See: Appendix I. Configuring your laptop
-# In /usr/share/doc/PACKAGE/README for full details
-#
-# Choose the appropriate value for NVreg_Mobile from the table:
-#        Value		Meaning
-#        ----------	--------------------------------------------------
-#        0xFFFFFFFF	let the kernel module autodetect the correct value
-#        1		Dell laptops
-#        2		non-Compal Toshiba laptops
-#        3		all other laptops
-#        4		Compal Toshiba laptops
-#        5		Gateway laptops
-#
-#options nvidia NVreg_SoftEDIDs=0 NVreg_Mobile=3
-
-
-# !!! SECURITY WARNING !!!
-# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW
-# WHAT YOU ARE DOING.
-# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH,
-# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE.
-options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1
diff --git a/x11-drivers/nvidia-userspace/files/nvidia-169.07 b/x11-drivers/nvidia-userspace/files/nvidia-169.07
deleted file mode 100644
index a96b0cd1..00000000
--- a/x11-drivers/nvidia-userspace/files/nvidia-169.07
+++ /dev/null
@@ -1,14 +0,0 @@
-# Nvidia drivers support
-alias char-major-195 nvidia
-alias /dev/nvidiactl char-major-195
-
-# To tweak the driver the following options can be used, note that
-# you should be careful, as it could cause instability!! For more 
-# options see /usr/share/doc/PACKAGE/README 
-#
-# !!! SECURITY WARNING !!!
-# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW
-# WHAT YOU ARE DOING.
-# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH,
-# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE.
-options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1
diff --git a/x11-drivers/nvidia-userspace/files/nvidia-drivers-331.13-pax-usercopy.patch b/x11-drivers/nvidia-userspace/files/nvidia-drivers-331.13-pax-usercopy.patch
deleted file mode 100644
index 9777ce6c..00000000
--- a/x11-drivers/nvidia-userspace/files/nvidia-drivers-331.13-pax-usercopy.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/kernel/nv-linux.h
-+++ b/kernel/nv-linux.h
-@@ -757,16 +757,16 @@
- 
- #if defined(NV_KMEM_CACHE_CREATE_PRESENT)
- #if (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 6)
--#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type)            \
-+#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type, flags)     \
-     {                                                           \
-         kmem_cache = kmem_cache_create(name, sizeof(type),      \
--                        0, 0, NULL, NULL);                      \
-+                        0, flags, NULL, NULL);                  \
-     }
- #elif (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 5)
--#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type)            \
-+#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type, flags)     \
-     {                                                           \
-         kmem_cache = kmem_cache_create(name, sizeof(type),      \
--                        0, 0, NULL);                            \
-+                        0, flags, NULL);                        \
-     }
- #else
- #error "NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT value unrecognized!"
---- a/kernel/nv.c
-+++ b/kernel/nv.c
-@@ -794,7 +794,7 @@
-     NV_SPIN_LOCK_INIT(&km_lock);
- #endif
- 
--    NV_KMEM_CACHE_CREATE(nv_stack_t_cache, NV_STACK_CACHE_STR, nv_stack_t);
-+    NV_KMEM_CACHE_CREATE(nv_stack_t_cache, NV_STACK_CACHE_STR, nv_stack_t, SLAB_USERCOPY);
-     if (nv_stack_t_cache == NULL)
-     {
-         nv_printf(NV_DBG_ERRORS, "NVRM: stack cache allocation failed!\n");
-@@ -924,7 +924,7 @@
-     nv->os_state = (void *) &nv_ctl_device;
-     nv_lock_init_locks(nv);
- 
--    NV_KMEM_CACHE_CREATE(nv_pte_t_cache, NV_PTE_CACHE_STR, nv_pte_t);
-+    NV_KMEM_CACHE_CREATE(nv_pte_t_cache, NV_PTE_CACHE_STR, nv_pte_t, 0);
-     if (nv_pte_t_cache == NULL)
-     {
-         rc = -ENOMEM;
-@@ -935,7 +935,7 @@
-     if (NV_BUILD_MODULE_INSTANCES == 0)
-     {
-         NV_KMEM_CACHE_CREATE(nvidia_p2p_page_t_cache, "nvidia_p2p_page_t",
--                             nvidia_p2p_page_t);
-+                             nvidia_p2p_page_t, 0);
-         if (nvidia_p2p_page_t_cache == NULL)
-         {
-             rc = -ENOMEM;
diff --git a/x11-drivers/nvidia-userspace/files/nvidia-smi.init b/x11-drivers/nvidia-userspace/files/nvidia-smi.init
deleted file mode 100644
index 2cfd4c43..00000000
--- a/x11-drivers/nvidia-userspace/files/nvidia-smi.init
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/nvidia-smi.init,v 1.1 2012/07/22 21:08:43 cardoe Exp $
-
-pidfile="/var/run/nvidia-smi.pid"
-
-depend() {
-    after modules
-}
-
-start() {
-	ebegin "Starting NVIDIA System Management Interface"
-	rm -f ${pidfile}
-	start-stop-daemon --start --quiet --pidfile ${pidfile} \
-		--make-pidfile --background --exec /opt/bin/nvidia-smi -- \
-		-q -l 300
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping NVIDIA System Management Interface"
-	start-stop-daemon --stop --quiet --pidfile ${pidfile}
-	eend $?
-}
diff --git a/x11-drivers/nvidia-userspace/files/nvidia-udev.sh b/x11-drivers/nvidia-userspace/files/nvidia-udev.sh
deleted file mode 100644
index 9487b08e..00000000
--- a/x11-drivers/nvidia-userspace/files/nvidia-udev.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-if [ $# -ne 1 ]; then
-	echo "Invalid args" >&2
-	exit 1
-fi
-
-case $1 in
-	add|ADD)
-		/opt/bin/nvidia-smi > /dev/null
-		;;
-	remove|REMOVE)
-		rm -f /dev/nvidia*
-		;;
-esac
-
-exit 0
diff --git a/x11-drivers/nvidia-userspace/files/nvidia-uvm.conf b/x11-drivers/nvidia-userspace/files/nvidia-uvm.conf
deleted file mode 100644
index 222c5ba3..00000000
--- a/x11-drivers/nvidia-userspace/files/nvidia-uvm.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# Nvidia UVM support
-
-remove nvidia modprobe -r --ignore-remove nvidia-uvm nvidia
diff --git a/x11-drivers/nvidia-userspace/files/nvidia.udev-rule b/x11-drivers/nvidia-userspace/files/nvidia.udev-rule
deleted file mode 100644
index 2eb30bb0..00000000
--- a/x11-drivers/nvidia-userspace/files/nvidia.udev-rule
+++ /dev/null
@@ -1,6 +0,0 @@
-ACTION=="add", DEVPATH=="/module/nvidia", SUBSYSTEM=="module", RUN+="nvidia-udev.sh $env{ACTION}"
-# Previously the ACTION was "add|remove" but one user on bug #376527 had a
-# problem until he recompiled udev-171-r5, which is one of the versions I
-# tested with and it was fine. I'm breaking the rules out just to be safe
-# so someone else doesn't have an issue
-ACTION=="remove", DEVPATH=="/module/nvidia", SUBSYSTEM=="module", RUN+="nvidia-udev.sh $env{ACTION}"
diff --git a/x11-drivers/nvidia-userspace/metadata.xml b/x11-drivers/nvidia-userspace/metadata.xml
deleted file mode 100644
index 2d64b717..00000000
--- a/x11-drivers/nvidia-userspace/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer>
-  <email>lxnay@gentoo.org</email>
-  <description>General maintainer</description>
-</maintainer>
-<longdescription>NVIDIA X11 driver and GLX libraries</longdescription>
-</pkgmetadata>
diff --git a/x11-drivers/nvidia-userspace/nvidia-userspace-173.14.39.ebuild b/x11-drivers/nvidia-userspace/nvidia-userspace-173.14.39.ebuild
deleted file mode 100644
index 6dccd0c1..00000000
--- a/x11-drivers/nvidia-userspace/nvidia-userspace-173.14.39.ebuild
+++ /dev/null
@@ -1,395 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils unpacker multilib portability versionator flag-o-matic
-
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-
-DESCRIPTION="NVIDIA X11 userspace libraries and applications"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}-pkg0.run )
-	 amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}-pkg2.run )
-	 x86-fbsd? ( ftp://download.nvidia.com/freebsd/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="multilib kernel_linux"
-RESTRICT="strip"
-EMULTILIB_PKG="true"
-
-COMMON="x11-base/xorg-server
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	multilib? ( app-emulation/emul-linux-x86-opengl )
-	>=app-eselect/eselect-opengl-1.0.9"
-DEPEND="${COMMON}
-	kernel_linux? ( virtual/linux-sources )"
-# Note: do not add !>nvidia-userspace-ver or !<nvidia-userspace-ver
-# because it would cause pkg_postrm to set the wrong opengl implementation
-RDEPEND="${COMMON}"
-PDEPEND=""
-
-QA_TEXTRELS_x86="usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib/xorg/modules/drivers/nvidia_drv.so
-	usr/lib/libcuda.so.${PV}
-	usr/lib/libnvidia-cfg.so.${PV}
-	usr/lib/libvdpau_nvidia.so.${PV}
-	usr/lib/libXvMCNVIDIA.so.${PV}"
-
-QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko
-	usr/lib/opengl/nvidia/lib/libGL.so.1
-	usr/lib/opengl/nvidia/lib/libGLcore.so.1
-	usr/lib/libnvidia-cfg.so.1
-	usr/lib/opengl/nvidia/extensions/libglx.so.1
-	usr/lib/xorg/modules/drivers/nvidia_drv.so"
-
-QA_TEXTRELS_amd64="usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/libcuda.so.${PV}
-	usr/lib32/libvdpau_nvidia.so.${PV}"
-
-QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib/xorg/modules/drivers/nvidia_drv.so
-	usr/lib/libXvMCNVIDIA.a:NVXVMC.o"
-
-QA_EXECSTACK_amd64="usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/libnvcompiler.so.${PV}
-	usr/lib64/libXvMCNVIDIA.so.${PV}
-	usr/lib64/libXvMCNVIDIA.a:NVXVMC.o
-	usr/lib64/libnvidia-cfg.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib64/xorg/modules/drivers/nvidia_drv.so
-	usr/bin/nvidia-smi
-	usr/bin/nvidia-xconfig"
-
-QA_WX_LOAD_x86="usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib/libXvMCNVIDIA.a"
-
-QA_WX_LOAD_amd64="usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}"
-
-QA_SONAME_amd64="usr/lib64/libnvcompiler.so.${PV}"
-
-QA_DT_HASH_amd64="usr/lib32/libcuda.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib32/libvdpau_nvidia.so.${PV}
-	usr/lib64/libXvMCNVIDIA.so.${PV}
-	usr/lib64/libcuda.so.${PV}
-	usr/lib64/libnvidia-cfg.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib64/xorg/modules/drivers/nvidia_drv.so
-	usr/lib64/libvdpau_nvidia.so.${PV}
-	usr/bin/nvidia-smi
-	usr/bin/nvidia-xconfig"
-
-QA_DT_HASH_x86="usr/lib/libcuda.so.${PV}
-	usr/lib/libnvidia-cfg.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib/xorg/modules/drivers/nvidia_drv.so
-	usr/lib/libXvMCNVIDIA.so.${PV}
-	usr/lib/libvdpau_nvidia.so.${PV}
-	usr/bin/nvidia-smi
-	usr/bin/nvidia-xconfig"
-
-if use x86; then
-	PKG_V="-pkg0"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="-pkg2"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-elif use x86-fbsd; then
-	PKG_V=""
-	NV_PACKAGE="${X86_FBSD_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}${PKG_V}"
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default abi."
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-
-	# On BSD userland it wants real make command
-	use userland_BSD && MAKE="$(get_bmake)"
-
-	export _POSIX2_VERSION="199209"
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		NV_DOC="${S}/doc"
-		NV_EXEC="${S}/obj"
-		NV_LIB="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_X11_DRV="${NV_X11}"
-		NV_X11_EXT="${NV_X11}"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}/usr/share/doc"
-		NV_EXEC="${S}/usr/bin"
-		NV_LIB="${S}/usr/lib"
-		NV_SRC="${S}/usr/src/nv"
-		NV_MAN="${S}/usr/share/man/man1"
-		NV_X11="${S}/usr/X11R6/lib"
-		NV_X11_DRV="${NV_X11}/modules/drivers"
-		NV_X11_EXT="${NV_X11}/modules/extensions"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_unpack() {
-	if ! use x86-fbsd; then
-		mkdir "${S}"
-		cd "${S}"
-		unpack_makeself
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-	use x86-fbsd && cd doc
-
-	# Use the correct defines to make gtkglext build work
-	epatch "${FILESDIR}"/NVIDIA_glx-defines.patch
-	# Use some more sensible gl headers and make way for new glext.h
-	epatch "${FILESDIR}"/NVIDIA_glx-glheader.patch
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use x86-fbsd; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	fi
-}
-
-src_install() {
-	if use kernel_linux; then
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_postinst, see bug #491414
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	dolib.so ${NV_LIB}/libnvidia-cfg.so.${NV_SOVER} || \
-		die "failed to install libnvidia-cfg"
-
-	# Xorg DDX driver
-	insinto /usr/$(get_libdir)/xorg/modules/drivers
-	doins ${NV_X11_DRV}/nvidia_drv.so || die "failed to install nvidia_drv.so"
-
-	# Xorg GLX driver
-	insinto /usr/$(get_libdir)/opengl/nvidia/extensions
-	doins ${NV_X11_EXT}/libglx.so.${NV_SOVER} || \
-		die "failed to install libglx.so"
-	dosym /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so.${NV_SOVER} \
-		/usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so || \
-		die "failed to create libglx.so symlink"
-
-	# XvMC driver
-	dolib.a ${NV_X11}/libXvMCNVIDIA.a || \
-		die "failed to install libXvMCNVIDIA.so"
-	dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER} || \
-		die "failed to install libXvMCNVIDIA.so"
-	dosym libXvMCNVIDIA.so.${NV_SOVER} /usr/$(get_libdir)/libXvMCNVIDIA.so || \
-		die "failed to create libXvMCNVIDIA.so symlink"
-
-	# CUDA headers (driver to come)
-	if use kernel_linux && [[ -d ${S}/usr/include/cuda ]]; then
-		dodir /usr/include/cuda
-		insinto /usr/include/cuda
-		doins usr/include/cuda/*.h || die "failed to install cuda headers"
-	fi
-
-	# OpenCL headers (driver to come)
-	if [[ -d ${S}/usr/include/CL ]]; then
-		dodir /usr/include/CL
-		insinto /usr/include/CL
-		doins usr/include/CL/*.h || die "failed to install OpenCL headers"
-	fi
-
-	# Documentation
-	dodoc ${NV_DOC}/XF86Config.sample
-	dohtml ${NV_DOC}/html/*
-	if use x86-fbsd; then
-		dodoc "${NV_DOC}/README"
-		doman "${NV_MAN}/nvidia-xconfig.1"
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-#		doman "${NV_MAN}/nvidia-smi.1.gz"
-		doman "${NV_MAN}/nvidia-xconfig.1.gz"
-	fi
-
-	# Helper Apps
-	dobin ${NV_EXEC}/nvidia-xconfig || die
-	dobin ${NV_EXEC}/nvidia-bug-report.sh || die
-	if use kernel_linux; then
-		dobin ${NV_EXEC}/nvidia-smi || die
-	fi
-
-	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
-
-	is_final_abi || die "failed to iterate through all ABIs"
-}
-
-# Install nvidia library:
-# the first parameter is the place where to install it
-# the second parameter is the base name of the library
-# the third parameter is the provided soversion
-donvidia() {
-	dodir $1
-	exeinto $1
-
-	libname=$(basename $2)
-
-	doexe $2.$3 || die "failed to install $2"
-	dosym ${libname}.$3 $1/${libname} || die "failed to symlink $2"
-	[[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
-	local libdir= sover=
-
-	if use kernel_linux; then
-		if has_multilib_profile && [[ ${ABI} == "x86" ]] ; then
-			libdir=usr/lib32
-		else
-			libdir=usr/lib
-		fi
-		sover=${PV}
-	else
-		libdir=obj
-		# on FreeBSD it has just .1 suffix
-		sover=1
-	fi
-
-	# The GLX libraries
-	donvidia ${NV_ROOT}/lib ${libdir}/libGL.so ${sover}
-	donvidia ${NV_ROOT}/lib ${libdir}/libGLcore.so ${sover}
-	if use x86-fbsd; then
-		donvidia ${NV_ROOT}/lib ${libdir}/libnvidia-tls.so ${sover}
-	else
-		donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover}
-	fi
-
-	#cuda
-	if [[ -f ${libdir}/libcuda.so.${sover} ]]; then
-		dolib.so ${libdir}/libcuda.so.${sover}
-		[[ "${sover}" != "1" ]] && dosym libcuda.so.${sover} /usr/${inslibdir}/libcuda.so.1
-		dosym libcuda.so.1 /usr/${inslibdir}/libcuda.so
-	fi
-
-	#vdpau
-	if [[ -f ${libdir}/libvdpau_nvidia.so.${sover} ]]; then
-		dolib.so ${libdir}/libvdpau_nvidia.so.${sover}
-		dosym libvdpau_nvidia.so.${sover} /usr/${inslibdir}/libvdpau_nvidia.so
-	fi
-
-	# OpenCL
-	# NOTE: This isn't currently available in the publicly released drivers.
-	if [[ -f ${libdir}/libOpenCL.so.1.0.0 ]]; then
-
-		dolib.so ${libdir}/libnvcompiler.so.${sover}
-		[[ "${sover}" != "1" ]] && dosym libnvcompiler.so.${sover} /usr/${inslibdir}/libnvcompiler.so.1
-		dosym libnvcompiler.so.1 /usr/${inslibdir}/libnvcompiler.so
-
-		dolib.so ${libdir}/libOpenCL.so.1.0.0
-		dosym libOpenCL.so.1.0.0 /usr/${inslibdir}/libOpenCL.so.1
-		dosym libOpenCL.so.1 /usr/${inslibdir}/libOpenCL.so
-	fi
-}
-
-pkg_preinst() {
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-
-	local videogroup="$(getent group video | cut -d ':' -f 3)"
-	if [ -n "${videogroup}" ]; then
-		sed -i -e "s:PACKAGE:${PF}:g" \
-			-e "s:VIDEOGID:${videogroup}:g" "${ROOT}"/etc/modprobe.d/nvidia.conf
-	else
-		eerror "Failed to determine the video group gid."
-		die "Failed to determine the video group gid."
-	fi
-}
-
-pkg_postinst() {
-	# Switch to the nvidia implementation
-	eselect opengl set --use-old nvidia
-
-	elog "To use the NVIDIA GLX, run \"eselect opengl set nvidia\""
-	elog
-	elog "NVIDIA has requested that any bug reports submitted have the"
-	elog "output of /usr/bin/nvidia-bug-report.sh included."
-	elog
-	elog "To work with compiz, you must enable the AddARGBGLXVisuals option."
-	elog
-	elog "If you are having resolution problems, try disabling DynamicTwinView."
-}
-
-pkg_postrm() {
-	eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-userspace/nvidia-userspace-304.125.ebuild b/x11-drivers/nvidia-userspace/nvidia-userspace-304.125.ebuild
deleted file mode 100644
index 0ef41a65..00000000
--- a/x11-drivers/nvidia-userspace/nvidia-userspace-304.125.ebuild
+++ /dev/null
@@ -1,379 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user versionator udev
-
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA X11 userspace libraries and applications"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-	amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi multilib x-multilib kernel_FreeBSD kernel_linux tools +X"
-RESTRICT="strip"
-EMULTILIB_PKG="true"
-
-COMMON="app-eselect/eselect-opencl
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	x-multilib? ( app-emulation/emul-linux-x86-xlibs )
-	multilib? ( app-emulation/emul-linux-x86-baselibs )
-	X? (
-		<x11-base/xorg-server-1.15.99
-		>=app-eselect/eselect-opengl-1.0.9
-	)"
-DEPEND="${COMMON}"
-# Note: do not add !>nvidia-userspace-ver or !<nvidia-userspace-ver
-# because it would cause pkg_postrm to set the wrong opengl implementation
-RDEPEND="${COMMON}
-	X? ( x11-libs/libXvMC )
-	acpi? ( sys-power/acpid )
-	tools? ( media-video/nvidia-settings )"
-PDEPEND="X? ( >=x11-libs/libvdpau-0.3-r1 )"
-
-REQUIRED_USE="tools? ( X )"
-QA_PREBUILT="opt/* usr/lib*"
-S="${WORKDIR}/"
-
-pkg_pretend() {
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-
-	# Kernel features/options to check for
-	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
-	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use kernel_linux; then
-		linux-mod_pkg_setup
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_unpack() {
-	if ! use kernel_FreeBSD; then
-		cd "${S}"
-		unpack_makeself
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-	cat <<- EOF > "${S}"/nvidia.icd
-		/usr/$(get_libdir)/libnvidia-opencl.so
-	EOF
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if its not /usr/lib
-donvidia() {
-	# Full path to library minus SOVER
-	MY_LIB="$1"
-
-	# SOVER to use
-	MY_SOVER="$2"
-
-	# Where to install
-	MY_DEST="$3"
-
-	if [[ -z "${MY_DEST}" ]]; then
-		MY_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	else
-		exeinto ${MY_DEST}
-		action="doexe"
-	fi
-
-	# Get just the library name
-	libname=$(basename $1)
-
-	# Install the library with the correct SOVER
-	${action} ${MY_LIB}.${MY_SOVER} || \
-		die "failed to install ${libname}"
-
-	# If SOVER wasn't 1, then we need to create a .1 symlink
-	if [[ "${MY_SOVER}" != "1" ]]; then
-		dosym ${libname}.${MY_SOVER} \
-			${MY_DEST}/${libname}.1 || \
-			die "failed to create ${libname} symlink"
-	fi
-
-	# Always create the symlink from the raw lib to the .1
-	dosym ${libname}.1 \
-		${MY_DEST}/${libname} || \
-		die "failed to create ${libname} symlink"
-}
-
-src_install() {
-	if use kernel_linux; then
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_postinst, see bug #491414
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		doexe "${FILESDIR}"/nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld" || die
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko" || die
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
-
-	if use kernel_linux; then
-		# NVIDIA video decode <-> CUDA
-		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so || die "failed to install nvidia_drv.so"
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
-			/usr/$(get_libdir)/opengl/nvidia/extensions
-
-		# XvMC driver
-		dolib.a ${NV_X11}/libXvMCNVIDIA.a || \
-			die "failed to install libXvMCNVIDIA.so"
-		donvidia ${NV_X11}/libXvMCNVIDIA.so ${NV_SOVER}
-		dosym libXvMCNVIDIA.so.${NV_SOVER} \
-			/usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \
-			die "failed to create libXvMCNVIDIA_dynamic.so symlink"
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins nvidia.icd
-		donvidia ${NV_OBJ}/libnvidia-opencl.so ${NV_SOVER}
-	fi
-
-	# Documentation
-	dohtml ${NV_DOC}/html/*
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1"
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}/nvidia-smi.1.gz"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
-		doman "${NV_MAN}/nvidia-cuda-proxy-control.1.gz"
-	fi
-
-	# Helper Apps
-	exeinto /opt/bin/
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig || die
-	fi
-
-	if use kernel_linux ; then
-		doexe ${NV_OBJ}/nvidia-debugdump || die
-		doexe ${NV_OBJ}/nvidia-cuda-proxy-control || die
-		doexe ${NV_OBJ}/nvidia-cuda-proxy-server || die
-		doexe ${NV_OBJ}/nvidia-smi || die
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-	fi
-
-	exeinto /usr/bin/
-	doexe ${NV_OBJ}/nvidia-bug-report.sh || die
-
-	if has_multilib_profile && use multilib ; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis) ; do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	# GNOME3 gnome-terminal redraw bug workaround,
-	# see: https://bugzilla.gnome.org/show_bug.cgi?id=664858
-	doenvd "${FILESDIR}/90mutter-disable-culling"
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local libdir=${NV_OBJ}
-
-	if use kernel_linux && has_multilib_profile && \
-			[[ ${ABI} == "x86" ]] ; then
-		libdir=${NV_OBJ}/32
-	fi
-
-	if use X; then
-		# The GLX libraries
-		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
-		if use kernel_FreeBSD; then
-			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER} ${GL_ROOT}
-		else
-			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER} ${GL_ROOT}
-		fi
-
-		# VDPAU
-		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
-	fi
-
-	# NVIDIA monitoring library
-	if use kernel_linux ; then
-		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
-	fi
-
-	# CUDA & OpenCL
-	if use kernel_linux; then
-		donvidia ${libdir}/libcuda.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
-		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
-	fi
-}
-
-pkg_preinst() {
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-
-	local videogroup="$(getent group video | cut -d ':' -f 3)"
-	if [ -n "${videogroup}" ]; then
-		sed -i -e "s:PACKAGE:${PF}:g" \
-			-e "s:VIDEOGID:${videogroup}:g" "${ROOT}"/etc/modprobe.d/nvidia.conf
-	else
-		eerror "Failed to determine the video group gid."
-		die "Failed to determine the video group gid."
-	fi
-}
-
-pkg_postinst() {
-	# Switch to the nvidia implementation
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-	elog "To use the NVIDIA GLX, run \"eselect opengl set nvidia\""
-	elog
-	elog "To use the NVIDIA CUDA/OpenCL, run \"eselect opencl set nvidia\""
-	elog
-	elog "NVIDIA has requested that any bug reports submitted have the"
-	elog "output of /opt/bin/nvidia-bug-report.sh included."
-	elog
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries, XvMC, and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-}
-
-pkg_prerm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-userspace/nvidia-userspace-331.67.ebuild b/x11-drivers/nvidia-userspace/nvidia-userspace-331.67.ebuild
deleted file mode 100644
index 673d18a1..00000000
--- a/x11-drivers/nvidia-userspace/nvidia-userspace-331.67.ebuild
+++ /dev/null
@@ -1,375 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA X11 userspace libraries and applications"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="GPL-2 NVIDIA-r1"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi multilib x-multilib kernel_FreeBSD kernel_linux tools +X"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-COMMON="app-eselect/eselect-opencl
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	x-multilib? (
-		|| (
-			 (
-				x11-libs/libX11[abi_x86_32]
-				x11-libs/libXext[abi_x86_32]
-			 )
-			app-emulation/emul-linux-x86-xlibs
-		)
-	)
-	multilib? ( app-emulation/emul-linux-x86-baselibs )
-	X? (
-		>=app-eselect/eselect-opengl-1.0.9
-	)"
-DEPEND="${COMMON}"
-# Note: do not add !>nvidia-userspace-ver or !<nvidia-userspace-ver
-# because it would cause pkg_postrm to set the wrong opengl implementation
-RDEPEND="${COMMON}
-	X? ( x11-libs/libXvMC )
-	acpi? ( sys-power/acpid )
-	tools? ( media-video/nvidia-settings )"
-PDEPEND="X? (
-		<x11-base/xorg-server-1.15.99
-		>=x11-libs/libvdpau-0.3-r1
-	)"
-
-REQUIRED_USE="tools? ( X )"
-QA_PREBUILT="opt/* usr/lib*"
-S=${WORKDIR}/
-
-pkg_pretend() {
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# Kernel features/options to check for
-	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
-	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use kernel_linux; then
-		linux-mod_pkg_setup
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_unpack() {
-	if ! use kernel_FreeBSD; then
-		cd "${S}"
-		unpack_makeself
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if its not /usr/lib
-donvidia() {
-	# Full path to library minus SOVER
-	MY_LIB="$1"
-
-	# SOVER to use
-	MY_SOVER="$2"
-
-	# Where to install
-	MY_DEST="$3"
-
-	if [[ -z "${MY_DEST}" ]]; then
-		MY_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	else
-		exeinto ${MY_DEST}
-		action="doexe"
-	fi
-
-	# Get just the library name
-	libname=$(basename $1)
-
-	# Install the library with the correct SOVER
-	${action} ${MY_LIB}.${MY_SOVER} || \
-		die "failed to install ${libname}"
-
-	# If SOVER wasn't 1, then we need to create a .1 symlink
-	if [[ "${MY_SOVER}" != "1" ]]; then
-		dosym ${libname}.${MY_SOVER} \
-			${MY_DEST}/${libname}.1 || \
-			die "failed to create ${libname} symlink"
-	fi
-
-	# Always create the symlink from the raw lib to the .1
-	dosym ${libname}.1 \
-		${MY_DEST}/${libname} || \
-		die "failed to create ${libname} symlink"
-}
-
-src_install() {
-	if use kernel_linux; then
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_postinst, see bug #491414
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		doexe "${FILESDIR}"/nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
-			/usr/$(get_libdir)/opengl/nvidia/extensions
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins ${NV_OBJ}/nvidia.icd
-	fi
-
-	# Documentation
-	dohtml ${NV_DOC}/html/*
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1"
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}/nvidia-smi.1.gz"
-		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
-	fi
-
-	# Helper Apps
-	exeinto /opt/bin/
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-	fi
-
-	if use kernel_linux ; then
-		doexe ${NV_OBJ}/nvidia-cuda-mps-control
-		doexe ${NV_OBJ}/nvidia-cuda-mps-server
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-modprobe
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-		doman nvidia-cuda-mps-control.1.gz
-		doman nvidia-modprobe.1.gz
-		doman nvidia-persistenced.1.gz
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-	fi
-
-	exeinto /usr/bin/
-	doexe ${NV_OBJ}/nvidia-bug-report.sh
-
-	if has_multilib_profile && use multilib ; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis) ; do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	readme.gentoo_create_doc
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local libdir=${NV_OBJ}
-
-	if use kernel_linux && has_multilib_profile && \
-			[[ ${ABI} == "x86" ]] ; then
-		libdir=${NV_OBJ}/32
-	fi
-
-	if use X; then
-		# The GLX libraries
-		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
-		if use kernel_FreeBSD; then
-			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
-		else
-			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
-		fi
-
-		# VDPAU
-		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
-	fi
-
-	# NVIDIA monitoring library
-	if use kernel_linux ; then
-		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
-	fi
-
-	# CUDA & OpenCL
-	if use kernel_linux; then
-		donvidia ${libdir}/libcuda.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
-		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
-		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
-	fi
-}
-
-pkg_preinst() {
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-
-	local videogroup="$(getent group video | cut -d ':' -f 3)"
-	if [ -n "${videogroup}" ]; then
-		sed -i -e "s:PACKAGE:${PF}:g" \
-			-e "s:VIDEOGID:${videogroup}:g" "${ROOT}"/etc/modprobe.d/nvidia.conf
-	else
-		eerror "Failed to determine the video group gid."
-		die "Failed to determine the video group gid."
-	fi
-}
-
-pkg_postinst() {
-	# Switch to the nvidia implementation
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
-	readme.gentoo_print_elog
-
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-}
-
-pkg_prerm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-userspace/nvidia-userspace-337.25.ebuild b/x11-drivers/nvidia-userspace/nvidia-userspace-337.25.ebuild
deleted file mode 100644
index b255c92c..00000000
--- a/x11-drivers/nvidia-userspace/nvidia-userspace-337.25.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA X11 userspace libraries and applications"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="GPL-2 NVIDIA-r1"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi multilib x-multilib kernel_FreeBSD kernel_linux tools +X uvm"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-COMMON="app-eselect/eselect-opencl
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	x-multilib? (
-		|| (
-			 (
-				x11-libs/libX11[abi_x86_32]
-				x11-libs/libXext[abi_x86_32]
-			 )
-			app-emulation/emul-linux-x86-xlibs
-		)
-	)
-	multilib? ( app-emulation/emul-linux-x86-baselibs )
-	X? (
-		>=app-eselect/eselect-opengl-1.0.9
-	)"
-DEPEND="${COMMON}"
-# Note: do not add !>nvidia-userspace-ver or !<nvidia-userspace-ver
-# because it would cause pkg_postrm to set the wrong opengl implementation
-RDEPEND="${COMMON}
-	X? ( x11-libs/libXvMC )
-	acpi? ( sys-power/acpid )
-	tools? ( media-video/nvidia-settings )"
-PDEPEND="X? (
-		<x11-base/xorg-server-1.16.99
-		>=x11-libs/libvdpau-0.3-r1
-	)"
-
-REQUIRED_USE="tools? ( X )"
-QA_PREBUILT="opt/* usr/lib*"
-S=${WORKDIR}/
-
-pkg_pretend() {
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() { :; }
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if its not /usr/lib
-donvidia() {
-	# Full path to library minus SOVER
-	MY_LIB="$1"
-
-	# SOVER to use
-	MY_SOVER="$2"
-
-	# Where to install
-	MY_DEST="$3"
-
-	if [[ -z "${MY_DEST}" ]]; then
-		MY_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	else
-		exeinto ${MY_DEST}
-		action="doexe"
-	fi
-
-	# Get just the library name
-	libname=$(basename $1)
-
-	# Install the library with the correct SOVER
-	${action} ${MY_LIB}.${MY_SOVER} || \
-		die "failed to install ${libname}"
-
-	# If SOVER wasn't 1, then we need to create a .1 symlink
-	if [[ "${MY_SOVER}" != "1" ]]; then
-		dosym ${libname}.${MY_SOVER} \
-			${MY_DEST}/${libname}.1 || \
-			die "failed to create ${libname} symlink"
-	fi
-
-	# Always create the symlink from the raw lib to the .1
-	dosym ${libname}.1 \
-		${MY_DEST}/${libname} || \
-		die "failed to create ${libname} symlink"
-}
-
-src_install() {
-	if use kernel_linux; then
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		doexe "${FILESDIR}"/nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
-			/usr/$(get_libdir)/opengl/nvidia/extensions
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins ${NV_OBJ}/nvidia.icd
-	fi
-
-	# Documentation
-	dohtml ${NV_DOC}/html/*
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1"
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}/nvidia-smi.1.gz"
-		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
-	fi
-
-	# Helper Apps
-	exeinto /opt/bin/
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-	fi
-
-	if use kernel_linux ; then
-		doexe ${NV_OBJ}/nvidia-cuda-mps-control
-		doexe ${NV_OBJ}/nvidia-cuda-mps-server
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-
-		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
-		doexe ${NV_OBJ}/nvidia-modprobe
-		fowners root:video /opt/bin/nvidia-modprobe
-		fperms 4710 /opt/bin/nvidia-modprobe
-		dosym /{opt,usr}/bin/nvidia-modprobe
-
-		doman nvidia-cuda-mps-control.1.gz
-		doman nvidia-modprobe.1.gz
-		doman nvidia-persistenced.1.gz
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-	fi
-
-	exeinto /usr/bin/
-	doexe ${NV_OBJ}/nvidia-bug-report.sh
-
-	if has_multilib_profile && use multilib ; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis) ; do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	readme.gentoo_create_doc
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local libdir=${NV_OBJ}
-
-	if use kernel_linux && has_multilib_profile && \
-			[[ ${ABI} == "x86" ]] ; then
-		libdir=${NV_OBJ}/32
-	fi
-
-	if use X; then
-		# The GLX libraries
-		donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
-		if use kernel_FreeBSD; then
-			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
-		else
-			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
-		fi
-
-		# VDPAU
-		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
-
-		# GLES v2 libraries
-		insinto ${GL_ROOT}
-		doexe ${libdir}/libGLESv2.so.${PV}
-		dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
-		dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
-	fi
-
-	# NVIDIA monitoring library
-	if use kernel_linux ; then
-		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
-	fi
-
-	# CUDA & OpenCL
-	if use kernel_linux; then
-		donvidia ${libdir}/libcuda.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
-		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
-		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
-	fi
-}
-
-pkg_preinst() {
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-
-	local videogroup="$(getent group video | cut -d ':' -f 3)"
-	if [ -n "${videogroup}" ]; then
-		sed -i -e "s:PACKAGE:${PF}:g" \
-			-e "s:VIDEOGID:${videogroup}:g" "${ROOT}"/etc/modprobe.d/nvidia.conf
-	else
-		eerror "Failed to determine the video group gid."
-		die "Failed to determine the video group gid."
-	fi
-}
-
-pkg_postinst() {
-	# Switch to the nvidia implementation
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
-	readme.gentoo_print_elog
-
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-}
-
-pkg_prerm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-userspace/nvidia-userspace-340.32.ebuild b/x11-drivers/nvidia-userspace/nvidia-userspace-340.32.ebuild
deleted file mode 100644
index b255c92c..00000000
--- a/x11-drivers/nvidia-userspace/nvidia-userspace-340.32.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA X11 userspace libraries and applications"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="GPL-2 NVIDIA-r1"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi multilib x-multilib kernel_FreeBSD kernel_linux tools +X uvm"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-COMMON="app-eselect/eselect-opencl
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	x-multilib? (
-		|| (
-			 (
-				x11-libs/libX11[abi_x86_32]
-				x11-libs/libXext[abi_x86_32]
-			 )
-			app-emulation/emul-linux-x86-xlibs
-		)
-	)
-	multilib? ( app-emulation/emul-linux-x86-baselibs )
-	X? (
-		>=app-eselect/eselect-opengl-1.0.9
-	)"
-DEPEND="${COMMON}"
-# Note: do not add !>nvidia-userspace-ver or !<nvidia-userspace-ver
-# because it would cause pkg_postrm to set the wrong opengl implementation
-RDEPEND="${COMMON}
-	X? ( x11-libs/libXvMC )
-	acpi? ( sys-power/acpid )
-	tools? ( media-video/nvidia-settings )"
-PDEPEND="X? (
-		<x11-base/xorg-server-1.16.99
-		>=x11-libs/libvdpau-0.3-r1
-	)"
-
-REQUIRED_USE="tools? ( X )"
-QA_PREBUILT="opt/* usr/lib*"
-S=${WORKDIR}/
-
-pkg_pretend() {
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() { :; }
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if its not /usr/lib
-donvidia() {
-	# Full path to library minus SOVER
-	MY_LIB="$1"
-
-	# SOVER to use
-	MY_SOVER="$2"
-
-	# Where to install
-	MY_DEST="$3"
-
-	if [[ -z "${MY_DEST}" ]]; then
-		MY_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	else
-		exeinto ${MY_DEST}
-		action="doexe"
-	fi
-
-	# Get just the library name
-	libname=$(basename $1)
-
-	# Install the library with the correct SOVER
-	${action} ${MY_LIB}.${MY_SOVER} || \
-		die "failed to install ${libname}"
-
-	# If SOVER wasn't 1, then we need to create a .1 symlink
-	if [[ "${MY_SOVER}" != "1" ]]; then
-		dosym ${libname}.${MY_SOVER} \
-			${MY_DEST}/${libname}.1 || \
-			die "failed to create ${libname} symlink"
-	fi
-
-	# Always create the symlink from the raw lib to the .1
-	dosym ${libname}.1 \
-		${MY_DEST}/${libname} || \
-		die "failed to create ${libname} symlink"
-}
-
-src_install() {
-	if use kernel_linux; then
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		doexe "${FILESDIR}"/nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
-			/usr/$(get_libdir)/opengl/nvidia/extensions
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins ${NV_OBJ}/nvidia.icd
-	fi
-
-	# Documentation
-	dohtml ${NV_DOC}/html/*
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1"
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}/nvidia-smi.1.gz"
-		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
-	fi
-
-	# Helper Apps
-	exeinto /opt/bin/
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-	fi
-
-	if use kernel_linux ; then
-		doexe ${NV_OBJ}/nvidia-cuda-mps-control
-		doexe ${NV_OBJ}/nvidia-cuda-mps-server
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-
-		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
-		doexe ${NV_OBJ}/nvidia-modprobe
-		fowners root:video /opt/bin/nvidia-modprobe
-		fperms 4710 /opt/bin/nvidia-modprobe
-		dosym /{opt,usr}/bin/nvidia-modprobe
-
-		doman nvidia-cuda-mps-control.1.gz
-		doman nvidia-modprobe.1.gz
-		doman nvidia-persistenced.1.gz
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-	fi
-
-	exeinto /usr/bin/
-	doexe ${NV_OBJ}/nvidia-bug-report.sh
-
-	if has_multilib_profile && use multilib ; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis) ; do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	readme.gentoo_create_doc
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local libdir=${NV_OBJ}
-
-	if use kernel_linux && has_multilib_profile && \
-			[[ ${ABI} == "x86" ]] ; then
-		libdir=${NV_OBJ}/32
-	fi
-
-	if use X; then
-		# The GLX libraries
-		donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
-		if use kernel_FreeBSD; then
-			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
-		else
-			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
-		fi
-
-		# VDPAU
-		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
-
-		# GLES v2 libraries
-		insinto ${GL_ROOT}
-		doexe ${libdir}/libGLESv2.so.${PV}
-		dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
-		dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
-	fi
-
-	# NVIDIA monitoring library
-	if use kernel_linux ; then
-		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
-	fi
-
-	# CUDA & OpenCL
-	if use kernel_linux; then
-		donvidia ${libdir}/libcuda.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
-		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
-		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
-	fi
-}
-
-pkg_preinst() {
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-
-	local videogroup="$(getent group video | cut -d ':' -f 3)"
-	if [ -n "${videogroup}" ]; then
-		sed -i -e "s:PACKAGE:${PF}:g" \
-			-e "s:VIDEOGID:${videogroup}:g" "${ROOT}"/etc/modprobe.d/nvidia.conf
-	else
-		eerror "Failed to determine the video group gid."
-		die "Failed to determine the video group gid."
-	fi
-}
-
-pkg_postinst() {
-	# Switch to the nvidia implementation
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
-	readme.gentoo_print_elog
-
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-}
-
-pkg_prerm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-userspace/nvidia-userspace-340.46.ebuild b/x11-drivers/nvidia-userspace/nvidia-userspace-340.46.ebuild
deleted file mode 100644
index ccb93726..00000000
--- a/x11-drivers/nvidia-userspace/nvidia-userspace-340.46.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA X11 userspace libraries and applications"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="GPL-2 NVIDIA-r1"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi multilib x-multilib kernel_FreeBSD kernel_linux tools +X uvm"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-COMMON="app-eselect/eselect-opencl
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	x-multilib? (
-		|| (
-			 (
-				x11-libs/libX11[abi_x86_32]
-				x11-libs/libXext[abi_x86_32]
-			 )
-			app-emulation/emul-linux-x86-xlibs
-		)
-	)
-	multilib? ( app-emulation/emul-linux-x86-baselibs )
-	X? (
-		>=app-eselect/eselect-opengl-1.0.9
-	)"
-DEPEND="${COMMON}"
-# Note: do not add !>nvidia-userspace-ver or !<nvidia-userspace-ver
-# because it would cause pkg_postrm to set the wrong opengl implementation
-RDEPEND="${COMMON}
-	X? ( x11-libs/libXvMC )
-	acpi? ( sys-power/acpid )
-	tools? ( media-video/nvidia-settings )"
-PDEPEND="X? (
-		<x11-base/xorg-server-1.16.99
-		>=x11-libs/libvdpau-0.3-r1
-	)"
-
-REQUIRED_USE="tools? ( X )"
-QA_PREBUILT="opt/* usr/lib*"
-S=${WORKDIR}/
-
-pkg_pretend() {
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() { :; }
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if its not /usr/lib
-donvidia() {
-	# Full path to library minus SOVER
-	MY_LIB="$1"
-
-	# SOVER to use
-	MY_SOVER="$2"
-
-	# Where to install
-	MY_DEST="$3"
-
-	if [[ -z "${MY_DEST}" ]]; then
-		MY_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	else
-		exeinto ${MY_DEST}
-		action="doexe"
-	fi
-
-	# Get just the library name
-	libname=$(basename $1)
-
-	# Install the library with the correct SOVER
-	${action} ${MY_LIB}.${MY_SOVER} || \
-		die "failed to install ${libname}"
-
-	# If SOVER wasn't 1, then we need to create a .1 symlink
-	if [[ "${MY_SOVER}" != "1" ]]; then
-		dosym ${libname}.${MY_SOVER} \
-			${MY_DEST}/${libname}.1 || \
-			die "failed to create ${libname} symlink"
-	fi
-
-	# Always create the symlink from the raw lib to the .1
-	dosym ${libname}.1 \
-		${MY_DEST}/${libname} || \
-		die "failed to create ${libname} symlink"
-}
-
-src_install() {
-	if use kernel_linux; then
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		doexe "${FILESDIR}"/nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
-			/usr/$(get_libdir)/opengl/nvidia/extensions
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins ${NV_OBJ}/nvidia.icd
-	fi
-
-	# Documentation
-	dohtml ${NV_DOC}/html/*
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1"
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}/nvidia-smi.1.gz"
-		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
-	fi
-
-	# Helper Apps
-	exeinto /opt/bin/
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-	fi
-
-	if use kernel_linux ; then
-		doexe ${NV_OBJ}/nvidia-cuda-mps-control
-		doexe ${NV_OBJ}/nvidia-cuda-mps-server
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-
-		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
-		doexe ${NV_OBJ}/nvidia-modprobe
-		fowners root:video /opt/bin/nvidia-modprobe
-		fperms 4710 /opt/bin/nvidia-modprobe
-		dosym /{opt,usr}/bin/nvidia-modprobe
-
-		doman nvidia-cuda-mps-control.1.gz
-		doman nvidia-modprobe.1.gz
-		doman nvidia-persistenced.1.gz
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-	fi
-
-	exeinto /usr/bin/
-	doexe ${NV_OBJ}/nvidia-bug-report.sh
-
-	if has_multilib_profile && use multilib ; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis) ; do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	readme.gentoo_create_doc
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local libdir=${NV_OBJ}
-
-	if use kernel_linux && has_multilib_profile && \
-			[[ ${ABI} == "x86" ]] ; then
-		libdir=${NV_OBJ}/32
-	fi
-
-	if use X; then
-		# The GLX libraries
-		donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
-		if use kernel_FreeBSD; then
-			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
-		else
-			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
-		fi
-
-		# VDPAU
-		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
-
-		# GLES v2 libraries
-		insinto ${GL_ROOT}
-		doexe ${libdir}/libGLESv2.so.${PV}
-		dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
-		dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
-	fi
-
-	# NVIDIA monitoring library
-	if use kernel_linux ; then
-		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
-	fi
-
-	# CUDA & OpenCL
-	if use kernel_linux; then
-		donvidia ${libdir}/libcuda.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
-		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
-		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
-	fi
-}
-
-pkg_preinst() {
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-
-	local videogroup="$(getent group video | cut -d ':' -f 3)"
-	if [ -n "${videogroup}" ]; then
-		sed -i -e "s:PACKAGE:${PF}:g" \
-			-e "s:VIDEOGID:${videogroup}:" "${ROOT}"/etc/modprobe.d/nvidia.conf
-	else
-		eerror "Failed to determine the video group gid."
-		die "Failed to determine the video group gid."
-	fi
-}
-
-pkg_postinst() {
-	# Switch to the nvidia implementation
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
-	readme.gentoo_print_elog
-
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-}
-
-pkg_prerm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-userspace/nvidia-userspace-340.58.ebuild b/x11-drivers/nvidia-userspace/nvidia-userspace-340.58.ebuild
deleted file mode 100644
index ccb93726..00000000
--- a/x11-drivers/nvidia-userspace/nvidia-userspace-340.58.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA X11 userspace libraries and applications"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="GPL-2 NVIDIA-r1"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi multilib x-multilib kernel_FreeBSD kernel_linux tools +X uvm"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-COMMON="app-eselect/eselect-opencl
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	x-multilib? (
-		|| (
-			 (
-				x11-libs/libX11[abi_x86_32]
-				x11-libs/libXext[abi_x86_32]
-			 )
-			app-emulation/emul-linux-x86-xlibs
-		)
-	)
-	multilib? ( app-emulation/emul-linux-x86-baselibs )
-	X? (
-		>=app-eselect/eselect-opengl-1.0.9
-	)"
-DEPEND="${COMMON}"
-# Note: do not add !>nvidia-userspace-ver or !<nvidia-userspace-ver
-# because it would cause pkg_postrm to set the wrong opengl implementation
-RDEPEND="${COMMON}
-	X? ( x11-libs/libXvMC )
-	acpi? ( sys-power/acpid )
-	tools? ( media-video/nvidia-settings )"
-PDEPEND="X? (
-		<x11-base/xorg-server-1.16.99
-		>=x11-libs/libvdpau-0.3-r1
-	)"
-
-REQUIRED_USE="tools? ( X )"
-QA_PREBUILT="opt/* usr/lib*"
-S=${WORKDIR}/
-
-pkg_pretend() {
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() { :; }
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if its not /usr/lib
-donvidia() {
-	# Full path to library minus SOVER
-	MY_LIB="$1"
-
-	# SOVER to use
-	MY_SOVER="$2"
-
-	# Where to install
-	MY_DEST="$3"
-
-	if [[ -z "${MY_DEST}" ]]; then
-		MY_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	else
-		exeinto ${MY_DEST}
-		action="doexe"
-	fi
-
-	# Get just the library name
-	libname=$(basename $1)
-
-	# Install the library with the correct SOVER
-	${action} ${MY_LIB}.${MY_SOVER} || \
-		die "failed to install ${libname}"
-
-	# If SOVER wasn't 1, then we need to create a .1 symlink
-	if [[ "${MY_SOVER}" != "1" ]]; then
-		dosym ${libname}.${MY_SOVER} \
-			${MY_DEST}/${libname}.1 || \
-			die "failed to create ${libname} symlink"
-	fi
-
-	# Always create the symlink from the raw lib to the .1
-	dosym ${libname}.1 \
-		${MY_DEST}/${libname} || \
-		die "failed to create ${libname} symlink"
-}
-
-src_install() {
-	if use kernel_linux; then
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		doexe "${FILESDIR}"/nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
-			/usr/$(get_libdir)/opengl/nvidia/extensions
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins ${NV_OBJ}/nvidia.icd
-	fi
-
-	# Documentation
-	dohtml ${NV_DOC}/html/*
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1"
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}/nvidia-smi.1.gz"
-		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
-	fi
-
-	# Helper Apps
-	exeinto /opt/bin/
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-	fi
-
-	if use kernel_linux ; then
-		doexe ${NV_OBJ}/nvidia-cuda-mps-control
-		doexe ${NV_OBJ}/nvidia-cuda-mps-server
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-
-		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
-		doexe ${NV_OBJ}/nvidia-modprobe
-		fowners root:video /opt/bin/nvidia-modprobe
-		fperms 4710 /opt/bin/nvidia-modprobe
-		dosym /{opt,usr}/bin/nvidia-modprobe
-
-		doman nvidia-cuda-mps-control.1.gz
-		doman nvidia-modprobe.1.gz
-		doman nvidia-persistenced.1.gz
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-	fi
-
-	exeinto /usr/bin/
-	doexe ${NV_OBJ}/nvidia-bug-report.sh
-
-	if has_multilib_profile && use multilib ; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis) ; do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	readme.gentoo_create_doc
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local libdir=${NV_OBJ}
-
-	if use kernel_linux && has_multilib_profile && \
-			[[ ${ABI} == "x86" ]] ; then
-		libdir=${NV_OBJ}/32
-	fi
-
-	if use X; then
-		# The GLX libraries
-		donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
-		if use kernel_FreeBSD; then
-			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
-		else
-			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
-		fi
-
-		# VDPAU
-		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
-
-		# GLES v2 libraries
-		insinto ${GL_ROOT}
-		doexe ${libdir}/libGLESv2.so.${PV}
-		dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
-		dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
-	fi
-
-	# NVIDIA monitoring library
-	if use kernel_linux ; then
-		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
-	fi
-
-	# CUDA & OpenCL
-	if use kernel_linux; then
-		donvidia ${libdir}/libcuda.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
-		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
-		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
-	fi
-}
-
-pkg_preinst() {
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-
-	local videogroup="$(getent group video | cut -d ':' -f 3)"
-	if [ -n "${videogroup}" ]; then
-		sed -i -e "s:PACKAGE:${PF}:g" \
-			-e "s:VIDEOGID:${videogroup}:" "${ROOT}"/etc/modprobe.d/nvidia.conf
-	else
-		eerror "Failed to determine the video group gid."
-		die "Failed to determine the video group gid."
-	fi
-}
-
-pkg_postinst() {
-	# Switch to the nvidia implementation
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
-	readme.gentoo_print_elog
-
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-}
-
-pkg_prerm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-userspace/nvidia-userspace-340.76.ebuild b/x11-drivers/nvidia-userspace/nvidia-userspace-340.76.ebuild
deleted file mode 100644
index b255c92c..00000000
--- a/x11-drivers/nvidia-userspace/nvidia-userspace-340.76.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA X11 userspace libraries and applications"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="GPL-2 NVIDIA-r1"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi multilib x-multilib kernel_FreeBSD kernel_linux tools +X uvm"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-COMMON="app-eselect/eselect-opencl
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	x-multilib? (
-		|| (
-			 (
-				x11-libs/libX11[abi_x86_32]
-				x11-libs/libXext[abi_x86_32]
-			 )
-			app-emulation/emul-linux-x86-xlibs
-		)
-	)
-	multilib? ( app-emulation/emul-linux-x86-baselibs )
-	X? (
-		>=app-eselect/eselect-opengl-1.0.9
-	)"
-DEPEND="${COMMON}"
-# Note: do not add !>nvidia-userspace-ver or !<nvidia-userspace-ver
-# because it would cause pkg_postrm to set the wrong opengl implementation
-RDEPEND="${COMMON}
-	X? ( x11-libs/libXvMC )
-	acpi? ( sys-power/acpid )
-	tools? ( media-video/nvidia-settings )"
-PDEPEND="X? (
-		<x11-base/xorg-server-1.16.99
-		>=x11-libs/libvdpau-0.3-r1
-	)"
-
-REQUIRED_USE="tools? ( X )"
-QA_PREBUILT="opt/* usr/lib*"
-S=${WORKDIR}/
-
-pkg_pretend() {
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() { :; }
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if its not /usr/lib
-donvidia() {
-	# Full path to library minus SOVER
-	MY_LIB="$1"
-
-	# SOVER to use
-	MY_SOVER="$2"
-
-	# Where to install
-	MY_DEST="$3"
-
-	if [[ -z "${MY_DEST}" ]]; then
-		MY_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	else
-		exeinto ${MY_DEST}
-		action="doexe"
-	fi
-
-	# Get just the library name
-	libname=$(basename $1)
-
-	# Install the library with the correct SOVER
-	${action} ${MY_LIB}.${MY_SOVER} || \
-		die "failed to install ${libname}"
-
-	# If SOVER wasn't 1, then we need to create a .1 symlink
-	if [[ "${MY_SOVER}" != "1" ]]; then
-		dosym ${libname}.${MY_SOVER} \
-			${MY_DEST}/${libname}.1 || \
-			die "failed to create ${libname} symlink"
-	fi
-
-	# Always create the symlink from the raw lib to the .1
-	dosym ${libname}.1 \
-		${MY_DEST}/${libname} || \
-		die "failed to create ${libname} symlink"
-}
-
-src_install() {
-	if use kernel_linux; then
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		doexe "${FILESDIR}"/nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
-			/usr/$(get_libdir)/opengl/nvidia/extensions
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins ${NV_OBJ}/nvidia.icd
-	fi
-
-	# Documentation
-	dohtml ${NV_DOC}/html/*
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1"
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}/nvidia-smi.1.gz"
-		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
-	fi
-
-	# Helper Apps
-	exeinto /opt/bin/
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-	fi
-
-	if use kernel_linux ; then
-		doexe ${NV_OBJ}/nvidia-cuda-mps-control
-		doexe ${NV_OBJ}/nvidia-cuda-mps-server
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-
-		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
-		doexe ${NV_OBJ}/nvidia-modprobe
-		fowners root:video /opt/bin/nvidia-modprobe
-		fperms 4710 /opt/bin/nvidia-modprobe
-		dosym /{opt,usr}/bin/nvidia-modprobe
-
-		doman nvidia-cuda-mps-control.1.gz
-		doman nvidia-modprobe.1.gz
-		doman nvidia-persistenced.1.gz
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-	fi
-
-	exeinto /usr/bin/
-	doexe ${NV_OBJ}/nvidia-bug-report.sh
-
-	if has_multilib_profile && use multilib ; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis) ; do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	readme.gentoo_create_doc
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local libdir=${NV_OBJ}
-
-	if use kernel_linux && has_multilib_profile && \
-			[[ ${ABI} == "x86" ]] ; then
-		libdir=${NV_OBJ}/32
-	fi
-
-	if use X; then
-		# The GLX libraries
-		donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
-		if use kernel_FreeBSD; then
-			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
-		else
-			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
-		fi
-
-		# VDPAU
-		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
-
-		# GLES v2 libraries
-		insinto ${GL_ROOT}
-		doexe ${libdir}/libGLESv2.so.${PV}
-		dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
-		dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
-	fi
-
-	# NVIDIA monitoring library
-	if use kernel_linux ; then
-		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
-	fi
-
-	# CUDA & OpenCL
-	if use kernel_linux; then
-		donvidia ${libdir}/libcuda.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
-		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
-		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
-	fi
-}
-
-pkg_preinst() {
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-
-	local videogroup="$(getent group video | cut -d ':' -f 3)"
-	if [ -n "${videogroup}" ]; then
-		sed -i -e "s:PACKAGE:${PF}:g" \
-			-e "s:VIDEOGID:${videogroup}:g" "${ROOT}"/etc/modprobe.d/nvidia.conf
-	else
-		eerror "Failed to determine the video group gid."
-		die "Failed to determine the video group gid."
-	fi
-}
-
-pkg_postinst() {
-	# Switch to the nvidia implementation
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
-	readme.gentoo_print_elog
-
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-}
-
-pkg_prerm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-userspace/nvidia-userspace-343.36.ebuild b/x11-drivers/nvidia-userspace/nvidia-userspace-343.36.ebuild
deleted file mode 100644
index b255c92c..00000000
--- a/x11-drivers/nvidia-userspace/nvidia-userspace-343.36.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA X11 userspace libraries and applications"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="GPL-2 NVIDIA-r1"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi multilib x-multilib kernel_FreeBSD kernel_linux tools +X uvm"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-COMMON="app-eselect/eselect-opencl
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	x-multilib? (
-		|| (
-			 (
-				x11-libs/libX11[abi_x86_32]
-				x11-libs/libXext[abi_x86_32]
-			 )
-			app-emulation/emul-linux-x86-xlibs
-		)
-	)
-	multilib? ( app-emulation/emul-linux-x86-baselibs )
-	X? (
-		>=app-eselect/eselect-opengl-1.0.9
-	)"
-DEPEND="${COMMON}"
-# Note: do not add !>nvidia-userspace-ver or !<nvidia-userspace-ver
-# because it would cause pkg_postrm to set the wrong opengl implementation
-RDEPEND="${COMMON}
-	X? ( x11-libs/libXvMC )
-	acpi? ( sys-power/acpid )
-	tools? ( media-video/nvidia-settings )"
-PDEPEND="X? (
-		<x11-base/xorg-server-1.16.99
-		>=x11-libs/libvdpau-0.3-r1
-	)"
-
-REQUIRED_USE="tools? ( X )"
-QA_PREBUILT="opt/* usr/lib*"
-S=${WORKDIR}/
-
-pkg_pretend() {
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() { :; }
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if its not /usr/lib
-donvidia() {
-	# Full path to library minus SOVER
-	MY_LIB="$1"
-
-	# SOVER to use
-	MY_SOVER="$2"
-
-	# Where to install
-	MY_DEST="$3"
-
-	if [[ -z "${MY_DEST}" ]]; then
-		MY_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	else
-		exeinto ${MY_DEST}
-		action="doexe"
-	fi
-
-	# Get just the library name
-	libname=$(basename $1)
-
-	# Install the library with the correct SOVER
-	${action} ${MY_LIB}.${MY_SOVER} || \
-		die "failed to install ${libname}"
-
-	# If SOVER wasn't 1, then we need to create a .1 symlink
-	if [[ "${MY_SOVER}" != "1" ]]; then
-		dosym ${libname}.${MY_SOVER} \
-			${MY_DEST}/${libname}.1 || \
-			die "failed to create ${libname} symlink"
-	fi
-
-	# Always create the symlink from the raw lib to the .1
-	dosym ${libname}.1 \
-		${MY_DEST}/${libname} || \
-		die "failed to create ${libname} symlink"
-}
-
-src_install() {
-	if use kernel_linux; then
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		doexe "${FILESDIR}"/nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
-			/usr/$(get_libdir)/opengl/nvidia/extensions
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins ${NV_OBJ}/nvidia.icd
-	fi
-
-	# Documentation
-	dohtml ${NV_DOC}/html/*
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1"
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}/nvidia-smi.1.gz"
-		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
-	fi
-
-	# Helper Apps
-	exeinto /opt/bin/
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-	fi
-
-	if use kernel_linux ; then
-		doexe ${NV_OBJ}/nvidia-cuda-mps-control
-		doexe ${NV_OBJ}/nvidia-cuda-mps-server
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-
-		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
-		doexe ${NV_OBJ}/nvidia-modprobe
-		fowners root:video /opt/bin/nvidia-modprobe
-		fperms 4710 /opt/bin/nvidia-modprobe
-		dosym /{opt,usr}/bin/nvidia-modprobe
-
-		doman nvidia-cuda-mps-control.1.gz
-		doman nvidia-modprobe.1.gz
-		doman nvidia-persistenced.1.gz
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-	fi
-
-	exeinto /usr/bin/
-	doexe ${NV_OBJ}/nvidia-bug-report.sh
-
-	if has_multilib_profile && use multilib ; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis) ; do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	readme.gentoo_create_doc
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local libdir=${NV_OBJ}
-
-	if use kernel_linux && has_multilib_profile && \
-			[[ ${ABI} == "x86" ]] ; then
-		libdir=${NV_OBJ}/32
-	fi
-
-	if use X; then
-		# The GLX libraries
-		donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
-		if use kernel_FreeBSD; then
-			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
-		else
-			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
-		fi
-
-		# VDPAU
-		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
-
-		# GLES v2 libraries
-		insinto ${GL_ROOT}
-		doexe ${libdir}/libGLESv2.so.${PV}
-		dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
-		dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
-	fi
-
-	# NVIDIA monitoring library
-	if use kernel_linux ; then
-		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
-	fi
-
-	# CUDA & OpenCL
-	if use kernel_linux; then
-		donvidia ${libdir}/libcuda.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
-		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
-		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
-	fi
-}
-
-pkg_preinst() {
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-
-	local videogroup="$(getent group video | cut -d ':' -f 3)"
-	if [ -n "${videogroup}" ]; then
-		sed -i -e "s:PACKAGE:${PF}:g" \
-			-e "s:VIDEOGID:${videogroup}:g" "${ROOT}"/etc/modprobe.d/nvidia.conf
-	else
-		eerror "Failed to determine the video group gid."
-		die "Failed to determine the video group gid."
-	fi
-}
-
-pkg_postinst() {
-	# Switch to the nvidia implementation
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
-	readme.gentoo_print_elog
-
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-}
-
-pkg_prerm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-userspace/nvidia-userspace-346.35.ebuild b/x11-drivers/nvidia-userspace/nvidia-userspace-346.35.ebuild
deleted file mode 100644
index dcf657ba..00000000
--- a/x11-drivers/nvidia-userspace/nvidia-userspace-346.35.ebuild
+++ /dev/null
@@ -1,355 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA X11 userspace libraries and applications"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi multilib x-multilib kernel_FreeBSD kernel_linux tools +X uvm"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-COMMON="app-eselect/eselect-opencl
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	x-multilib? (
-		|| (
-			 (
-				x11-libs/libX11[abi_x86_32]
-				x11-libs/libXext[abi_x86_32]
-			 )
-			app-emulation/emul-linux-x86-xlibs
-		)
-	)
-	multilib? ( app-emulation/emul-linux-x86-baselibs )
-	X? (
-		>=app-eselect/eselect-opengl-1.0.9
-	)"
-DEPEND="${COMMON}"
-# Note: do not add !>nvidia-userspace-ver or !<nvidia-userspace-ver
-# because it would cause pkg_postrm to set the wrong opengl implementation
-RDEPEND="${COMMON}
-	X? ( x11-libs/libXvMC )
-	acpi? ( sys-power/acpid )
-	tools? ( media-video/nvidia-settings )"
-PDEPEND="X? (
-		<x11-base/xorg-server-1.16.99
-		>=x11-libs/libvdpau-0.3-r1
-	)"
-
-REQUIRED_USE="tools? ( X )"
-QA_PREBUILT="opt/* usr/lib*"
-S=${WORKDIR}/
-
-pkg_pretend() {
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() { :; }
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if its not /usr/lib
-donvidia() {
-	# Full path to library minus SOVER
-	MY_LIB="$1"
-
-	# SOVER to use
-	MY_SOVER="$2"
-
-	# Where to install
-	MY_DEST="$3"
-
-	if [[ -z "${MY_DEST}" ]]; then
-		MY_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	else
-		exeinto ${MY_DEST}
-		action="doexe"
-	fi
-
-	# Get just the library name
-	libname=$(basename $1)
-
-	# Install the library with the correct SOVER
-	${action} ${MY_LIB}.${MY_SOVER} || \
-		die "failed to install ${libname}"
-
-	# If SOVER wasn't 1, then we need to create a .1 symlink
-	if [[ "${MY_SOVER}" != "1" ]]; then
-		dosym ${libname}.${MY_SOVER} \
-			${MY_DEST}/${libname}.1 || \
-			die "failed to create ${libname} symlink"
-	fi
-
-	# Always create the symlink from the raw lib to the .1
-	dosym ${libname}.1 \
-		${MY_DEST}/${libname} || \
-		die "failed to create ${libname} symlink"
-}
-
-src_install() {
-	if use kernel_linux; then
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		doexe "${FILESDIR}"/nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
-			/usr/$(get_libdir)/opengl/nvidia/extensions
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins ${NV_OBJ}/nvidia.icd
-	fi
-
-	# Documentation
-	dohtml ${NV_DOC}/html/*
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1"
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}/nvidia-smi.1.gz"
-		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
-	fi
-
-	# Helper Apps
-	exeinto /opt/bin/
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-	fi
-
-	if use kernel_linux ; then
-		doexe ${NV_OBJ}/nvidia-cuda-mps-control
-		doexe ${NV_OBJ}/nvidia-cuda-mps-server
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-
-		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
-		doexe ${NV_OBJ}/nvidia-modprobe
-		fowners root:video /opt/bin/nvidia-modprobe
-		fperms 4710 /opt/bin/nvidia-modprobe
-		dosym /{opt,usr}/bin/nvidia-modprobe
-
-		doman nvidia-cuda-mps-control.1.gz
-		doman nvidia-modprobe.1.gz
-		doman nvidia-persistenced.1.gz
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-	fi
-
-	exeinto /usr/bin/
-	doexe ${NV_OBJ}/nvidia-bug-report.sh
-
-	if has_multilib_profile && use multilib ; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis) ; do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	readme.gentoo_create_doc
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local libdir=${NV_OBJ}
-
-	if use kernel_linux && has_multilib_profile && \
-			[[ ${ABI} == "x86" ]] ; then
-		libdir=${NV_OBJ}/32
-	fi
-
-	if use X; then
-		# The GLX libraries
-		donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
-		if use kernel_FreeBSD; then
-			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
-		else
-			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
-		fi
-
-		# VDPAU
-		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
-
-		# GLES v2 libraries
-		insinto ${GL_ROOT}
-		doexe ${libdir}/libGLESv2.so.${PV}
-		dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
-		dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
-	fi
-
-	# NVIDIA monitoring library
-	if use kernel_linux ; then
-		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
-	fi
-
-	# CUDA & OpenCL
-	if use kernel_linux; then
-		donvidia ${libdir}/libcuda.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
-		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
-		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
-	fi
-}
-
-pkg_preinst() {
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-
-	local videogroup="$(getent group video | cut -d ':' -f 3)"
-	if [ -n "${videogroup}" ]; then
-		set -ex
-		sed -i -e "s:PACKAGE:${PF}:g" \
-			-e "s:VIDEOGID:${videogroup}:g" "${ROOT}"/etc/modprobe.d/nvidia.conf
-	else
-		set ex
-		eerror "Failed to determine the video group gid."
-		die "Failed to determine the video group gid."
-	fi
-}
-
-pkg_postinst() {
-	# Switch to the nvidia implementation
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
-	readme.gentoo_print_elog
-
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-}
-
-pkg_prerm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-userspace/nvidia-userspace-346.59.ebuild b/x11-drivers/nvidia-userspace/nvidia-userspace-346.59.ebuild
deleted file mode 100644
index c3de9c45..00000000
--- a/x11-drivers/nvidia-userspace/nvidia-userspace-346.59.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA X11 userspace libraries and applications"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi multilib x-multilib kernel_FreeBSD kernel_linux tools +X uvm"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-COMMON="app-eselect/eselect-opencl
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	x-multilib? (
-		|| (
-			 (
-				x11-libs/libX11[abi_x86_32]
-				x11-libs/libXext[abi_x86_32]
-			 )
-			app-emulation/emul-linux-x86-xlibs
-		)
-	)
-	multilib? ( app-emulation/emul-linux-x86-baselibs )
-	X? (
-		>=app-eselect/eselect-opengl-1.0.9
-	)"
-DEPEND="${COMMON}"
-# Note: do not add !>nvidia-userspace-ver or !<nvidia-userspace-ver
-# because it would cause pkg_postrm to set the wrong opengl implementation
-RDEPEND="${COMMON}
-	X? ( x11-libs/libXvMC )
-	acpi? ( sys-power/acpid )
-	tools? ( media-video/nvidia-settings )"
-PDEPEND="X? (
-		<x11-base/xorg-server-1.16.99
-		>=x11-libs/libvdpau-0.3-r1
-	)"
-
-REQUIRED_USE="tools? ( X )"
-QA_PREBUILT="opt/* usr/lib*"
-S=${WORKDIR}/
-
-pkg_pretend() {
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() { :; }
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if its not /usr/lib
-donvidia() {
-	# Full path to library minus SOVER
-	MY_LIB="$1"
-
-	# SOVER to use
-	MY_SOVER="$2"
-
-	# Where to install
-	MY_DEST="$3"
-
-	if [[ -z "${MY_DEST}" ]]; then
-		MY_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	else
-		exeinto ${MY_DEST}
-		action="doexe"
-	fi
-
-	# Get just the library name
-	libname=$(basename $1)
-
-	# Install the library with the correct SOVER
-	${action} ${MY_LIB}.${MY_SOVER} || \
-		die "failed to install ${libname}"
-
-	# If SOVER wasn't 1, then we need to create a .1 symlink
-	if [[ "${MY_SOVER}" != "1" ]]; then
-		dosym ${libname}.${MY_SOVER} \
-			${MY_DEST}/${libname}.1 || \
-			die "failed to create ${libname} symlink"
-	fi
-
-	# Always create the symlink from the raw lib to the .1
-	dosym ${libname}.1 \
-		${MY_DEST}/${libname} || \
-		die "failed to create ${libname} symlink"
-}
-
-src_install() {
-	if use kernel_linux; then
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		doexe "${FILESDIR}"/nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
-			/usr/$(get_libdir)/opengl/nvidia/extensions
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins ${NV_OBJ}/nvidia.icd
-	fi
-
-	# Documentation
-	dohtml ${NV_DOC}/html/*
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1"
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}/nvidia-smi.1.gz"
-		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
-	fi
-
-	# Helper Apps
-	exeinto /opt/bin/
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-	fi
-
-	if use kernel_linux ; then
-		doexe ${NV_OBJ}/nvidia-cuda-mps-control
-		doexe ${NV_OBJ}/nvidia-cuda-mps-server
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-
-		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
-		doexe ${NV_OBJ}/nvidia-modprobe
-		fowners root:video /opt/bin/nvidia-modprobe
-		fperms 4710 /opt/bin/nvidia-modprobe
-		dosym /{opt,usr}/bin/nvidia-modprobe
-
-		doman nvidia-cuda-mps-control.1.gz
-		doman nvidia-modprobe.1.gz
-		doman nvidia-persistenced.1.gz
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-	fi
-
-	exeinto /usr/bin/
-	doexe ${NV_OBJ}/nvidia-bug-report.sh
-
-	if has_multilib_profile && use multilib ; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis) ; do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	readme.gentoo_create_doc
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local libdir=${NV_OBJ}
-
-	if use kernel_linux && has_multilib_profile && \
-			[[ ${ABI} == "x86" ]] ; then
-		libdir=${NV_OBJ}/32
-	fi
-
-	if use X; then
-		# The GLX libraries
-		donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
-		if use kernel_FreeBSD; then
-			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
-		else
-			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
-		fi
-
-		# VDPAU
-		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
-
-		# GLES v2 libraries
-		insinto ${GL_ROOT}
-		doexe ${libdir}/libGLESv2.so.${PV}
-		dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
-		dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
-	fi
-
-	# NVIDIA monitoring library
-	if use kernel_linux ; then
-		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
-	fi
-
-	# CUDA & OpenCL
-	if use kernel_linux; then
-		donvidia ${libdir}/libcuda.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
-		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
-		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
-	fi
-}
-
-pkg_preinst() {
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-
-	local videogroup="$(getent group video | cut -d ':' -f 3)"
-	if [ -n "${videogroup}" ]; then
-		sed -i -e "s:PACKAGE:${PF}:g" \
-			-e "s:VIDEOGID:${videogroup}:g" "${ROOT}"/etc/modprobe.d/nvidia.conf
-	else
-		eerror "Failed to determine the video group gid."
-		die "Failed to determine the video group gid."
-	fi
-}
-
-pkg_postinst() {
-	# Switch to the nvidia implementation
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
-	readme.gentoo_print_elog
-
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-}
-
-pkg_prerm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
deleted file mode 100644
index 27ec58ca..00000000
--- a/x11-drivers/xf86-video-ati/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST xf86-video-ati-6.14.4.tar.bz2 1108681 SHA256 4ffe435ef8fbe0989f6576f04f789e147a2de7fdefc3644e39d5ef626c37ef85 SHA512 68913954607680e299cb798ff58cfdaf2381823778f85d18adf2701439cc1f954f92867c226b51830b3adf8c3967119a989b2e07ff3af7c7b4c043e784c8e078 WHIRLPOOL a6f50f2ea1233bec17929404243f08eda636af9c7a9ba46e1bf1503f14e8d42df15627a3f41909d8b04896f2ce0f5e70d912f1768089b80b10a1d5b08600debe
-DIST xf86-video-ati-6.14.6.tar.bz2 1139495 SHA256 aa5286b3e4f0187d7df14785c06dd800255d9405205dbf061da5d77df86bec36 SHA512 7ed64bb3596703f7c575aec37a6918bac251819fe638acc66a29aab7648d8a81dedd8d416f970faa1f757fa8e9e3ccdc43e4499d06271cc2751288040d1d957e WHIRLPOOL 9b72e873c3108daeb10cfc68523eb9bc2c12f5525096f9a2639a7dbeb58fd2912b474b8820172ffc9351458d2e046b43e0d064bb4f4189bb99b06a995f3204e8
-DIST xf86-video-ati-7.0.0.tar.bz2 775854 SHA256 c0acc81386425651aae5dfe02d89f935bb63b2a62104da0d88deac3c773ea10e SHA512 f82da3445684aba7f158961fc9882e777c0661ba161a4b923bdf8d3b70a8a16bca08de87af6c7f3943fa6a4308e2aa0ea42b8749a19b52374c1599d669b9512c WHIRLPOOL 4e27614e451fdf5a479695ffe207eb86ea52e45ddfbe5835a5c9912cd58c70968bc118f0586de2f7629183eed1810a70f9bc079763db065f0dc15ae33cd62347
-DIST xf86-video-ati-7.1.0.tar.bz2 804531 SHA256 c8ae44051fcb331625217f98c09a3aa69f493052b69d62c03f41fed0bfe610cd SHA512 eff193b51db162d498b41ebc5b78fbfbcbedbfb2041dcd710ced2f41cee4a039de26ca646dedd65b3cefc9157abfb37a118e3ae2f2e034280e351a00e45db805 WHIRLPOOL d2b1bd7a140fecddc246a6d94f1f6f93fb36ad1d78d447da4f7745060fb4f42fd09b0d85fccb1a7f5b490ce77fd22d3c649982bcb0a06228db2a9b9aa1d8e3d3
-DIST xf86-video-ati-7.2.0.tar.bz2 824613 SHA256 f30f5efdc8d7d18d06eda7ef2f91a8b7290f1cfbf6ff26362cd47ab8969daec4 SHA512 51d611d0d237cd8a61761c7db1b597732fe6fd3a4020cf2a9329984b05ba5f945f92a7caeaf8b2ff27a6098218e399c48addabf28908f60e70ff23bf9c27e675 WHIRLPOOL e4be92f2e491ded13f72535ccf2f67ef9bb6f4ff3b0283d55fbc5346e67565311e982a3c799b13bf509efca31b5cb1566c4d9231cf8b076ff05b902e10b9b314
diff --git a/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.4-exa-solid-accel-evergreen.patch b/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.4-exa-solid-accel-evergreen.patch
deleted file mode 100644
index 6e97a383..00000000
--- a/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.4-exa-solid-accel-evergreen.patch
+++ /dev/null
@@ -1,287 +0,0 @@
-From cac2d7ed54918579418fc762558497d3ec547fad Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexander.deucher@amd.com>
-Date: Sat, 14 Apr 2012 12:53:39 +0000
-Subject: EXA: Support acceleration of solid pictures on Evergreen/NI.
-
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
----
-diff --git a/src/evergreen_exa.c b/src/evergreen_exa.c
-index cee3ec2..61b47a4 100644
---- a/src/evergreen_exa.c
-+++ b/src/evergreen_exa.c
-@@ -748,17 +748,8 @@ static Bool EVERGREENCheckCompositeTexture(PicturePtr pPict,
- 					   int op,
- 					   int unit)
- {
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
-     unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
-     unsigned int i;
--    int max_tex_w, max_tex_h;
--
--    max_tex_w = 16384;
--    max_tex_h = 16384;
--
--    if ((w > max_tex_w) || (h > max_tex_h))
--	RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h));
- 
-     for (i = 0; i < sizeof(EVERGREENTexFormats) / sizeof(EVERGREENTexFormats[0]); i++) {
- 	if (EVERGREENTexFormats[i].fmt == pPict->format)
-@@ -798,9 +789,16 @@ static void EVERGREENXFormSetup(PicturePtr pPict, PixmapPtr pPix,
-     ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum];
-     RADEONInfoPtr info = RADEONPTR(pScrn);
-     struct radeon_accel_state *accel_state = info->accel_state;
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
-     int const_offset = unit * 8;
-+    int w, h;
-+
-+    if (pPict->pDrawable) {
-+	w = pPict->pDrawable->width;
-+	h = pPict->pDrawable->height;
-+    } else {
-+	w = 1;
-+	h = 1;
-+    }
- 
-     if (pPict->transform != 0) {
- 	accel_state->is_transform[unit] = TRUE;
-@@ -837,9 +835,7 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix,
-     ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum];
-     RADEONInfoPtr info = RADEONPTR(pScrn);
-     struct radeon_accel_state *accel_state = info->accel_state;
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
--    unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
-+    unsigned int repeatType;
-     unsigned int i;
-     tex_resource_t  tex_res;
-     tex_sampler_t   tex_samp;
-@@ -854,9 +850,17 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix,
-     }
- 
-     /* Texture */
-+    if (pPict->pDrawable) {
-+	tex_res.w               = pPict->pDrawable->width;
-+	tex_res.h               = pPict->pDrawable->height;
-+	repeatType              = pPict->repeat ? pPict->repeatType : RepeatNone;
-+    } else {
-+	tex_res.w               = 1;
-+	tex_res.h               = 1;
-+	repeatType              = RepeatNormal;
-+    }
-+
-     tex_res.id                  = unit;
--    tex_res.w                   = w;
--    tex_res.h                   = h;
-     tex_res.pitch               = accel_state->src_obj[unit].pitch;
-     tex_res.depth               = 0;
-     tex_res.dim                 = SQ_TEX_DIM_2D;
-@@ -1054,33 +1058,30 @@ static Bool EVERGREENCheckComposite(int op, PicturePtr pSrcPicture,
- {
-     uint32_t tmp1;
-     PixmapPtr pSrcPixmap, pDstPixmap;
--    int max_tex_w, max_tex_h, max_dst_w, max_dst_h;
- 
-     /* Check for unsupported compositing operations. */
-     if (op >= (int) (sizeof(EVERGREENBlendOp) / sizeof(EVERGREENBlendOp[0])))
- 	RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op));
- 
--    if (!pSrcPicture->pDrawable)
--	RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
-+    if (pSrcPicture->pDrawable) {
-+	pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
- 
--    pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
--
--    max_tex_w = 8192;
--    max_tex_h = 8192;
--    max_dst_w = 8192;
--    max_dst_h = 8192;
-+	if (pSrcPixmap->drawable.width >= 16384 ||
-+	    pSrcPixmap->drawable.height >= 16384) {
-+	    RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
-+			     pSrcPixmap->drawable.width,
-+			     pSrcPixmap->drawable.height));
-+	}
- 
--    if (pSrcPixmap->drawable.width >= max_tex_w ||
--	pSrcPixmap->drawable.height >= max_tex_h) {
--	RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
--			 pSrcPixmap->drawable.width,
--			 pSrcPixmap->drawable.height));
--    }
-+	if (!EVERGREENCheckCompositeTexture(pSrcPicture, pDstPicture, op, 0))
-+	    return FALSE;
-+    } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
- 
-     pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable);
- 
--    if (pDstPixmap->drawable.width >= max_dst_w ||
--	pDstPixmap->drawable.height >= max_dst_h) {
-+    if (pDstPixmap->drawable.width >= 16384 ||
-+	pDstPixmap->drawable.height >= 16384) {
- 	RADEON_FALLBACK(("Dest w/h too large (%d,%d).\n",
- 			 pDstPixmap->drawable.width,
- 			 pDstPixmap->drawable.height));
-@@ -1089,38 +1090,35 @@ static Bool EVERGREENCheckComposite(int op, PicturePtr pSrcPicture,
-     if (pMaskPicture) {
- 	PixmapPtr pMaskPixmap;
- 
--	if (!pMaskPicture->pDrawable)
--	    RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
--
--	pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
-+	if (pMaskPicture->pDrawable) {
-+	    pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
- 
--	if (pMaskPixmap->drawable.width >= max_tex_w ||
--	    pMaskPixmap->drawable.height >= max_tex_h) {
--	    RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
--			     pMaskPixmap->drawable.width,
--			     pMaskPixmap->drawable.height));
--	}
-+	    if (pMaskPixmap->drawable.width >= 16384 ||
-+		pMaskPixmap->drawable.height >= 16384) {
-+	      RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
-+			       pMaskPixmap->drawable.width,
-+			       pMaskPixmap->drawable.height));
-+	    }
- 
--	if (pMaskPicture->componentAlpha) {
--	    /* Check if it's component alpha that relies on a source alpha and
--	     * on the source value.  We can only get one of those into the
--	     * single source value that we get to blend with.
--	     */
--	    if (EVERGREENBlendOp[op].src_alpha &&
--		(EVERGREENBlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) !=
--		(BLEND_ZERO << COLOR_SRCBLEND_shift)) {
--		RADEON_FALLBACK(("Component alpha not supported with source "
--				 "alpha and source value blending.\n"));
-+	    if (pMaskPicture->componentAlpha) {
-+		/* Check if it's component alpha that relies on a source alpha and
-+		 * on the source value.  We can only get one of those into the
-+		 * single source value that we get to blend with.
-+		 */
-+		if (EVERGREENBlendOp[op].src_alpha &&
-+		    (EVERGREENBlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) !=
-+		    (BLEND_ZERO << COLOR_SRCBLEND_shift)) {
-+		    RADEON_FALLBACK(("Component alpha not supported with source "
-+				     "alpha and source value blending.\n"));
-+		}
- 	    }
--	}
- 
--	if (!EVERGREENCheckCompositeTexture(pMaskPicture, pDstPicture, op, 1))
--	    return FALSE;
-+	    if (!EVERGREENCheckCompositeTexture(pMaskPicture, pDstPicture, op, 1))
-+		return FALSE;
-+	} else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	    RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
-     }
- 
--    if (!EVERGREENCheckCompositeTexture(pSrcPicture, pDstPicture, op, 0))
--	return FALSE;
--
-     if (!EVERGREENGetDestFormat(pDstPicture, &tmp1))
- 	return FALSE;
- 
-@@ -1132,7 +1130,8 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
- 				      PicturePtr pMaskPicture, PicturePtr pDstPicture,
- 				      PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum];
-+    ScreenPtr pScreen = pDst->drawable.pScreen;
-+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-     RADEONInfoPtr info = RADEONPTR(pScrn);
-     struct radeon_accel_state *accel_state = info->accel_state;
-     uint32_t dst_format;
-@@ -1142,13 +1141,19 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
-     struct r600_accel_object src_obj, mask_obj, dst_obj;
-     float *cbuf;
- 
--    if (pDst->drawable.bitsPerPixel < 8 || pSrc->drawable.bitsPerPixel < 8)
-+    if (pDst->drawable.bitsPerPixel < 8 || (pSrc && pSrc->drawable.bitsPerPixel < 8))
- 	return FALSE;
- 
-+    if (!pSrc) {
-+	pSrc = RADEONSolidPixmap(pScreen, pSrcPicture->pSourcePict->solidFill.color);
-+	if (!pSrc)
-+	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+    }
-+
-     src_obj.offset = 0;
-     dst_obj.offset = 0;
--    src_obj.bo = radeon_get_pixmap_bo(pSrc);
-     dst_obj.bo = radeon_get_pixmap_bo(pDst);
-+    src_obj.bo = radeon_get_pixmap_bo(pSrc);
-     dst_obj.surface = radeon_get_pixmap_surface(pDst);
-     src_obj.surface = radeon_get_pixmap_surface(pSrc);
-     dst_obj.tiling_flags = radeon_get_pixmap_tiling(pDst);
-@@ -1166,7 +1171,15 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
-     dst_obj.bpp = pDst->drawable.bitsPerPixel;
-     dst_obj.domain = RADEON_GEM_DOMAIN_VRAM;
- 
--    if (pMask) {
-+    if (pMaskPicture) {
-+	if (!pMask) {
-+	    pMask = RADEONSolidPixmap(pScreen, pMaskPicture->pSourcePict->solidFill.color);
-+	    if (!pMask) {
-+		if (!pSrcPicture->pDrawable)
-+		    pScreen->DestroyPixmap(pSrc);
-+		RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+	    }
-+	}
- 	mask_obj.offset = 0;
- 	mask_obj.bo = radeon_get_pixmap_bo(pMask);
- 	mask_obj.tiling_flags = radeon_get_pixmap_tiling(pMask);
-@@ -1363,11 +1376,9 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
-     return TRUE;
- }
- 
--static void EVERGREENDoneComposite(PixmapPtr pDst)
-+static void EVERGREENFinishComposite(ScrnInfoPtr pScrn, PixmapPtr pDst,
-+				     struct radeon_accel_state *accel_state)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
--    RADEONInfoPtr info = RADEONPTR(pScrn);
--    struct radeon_accel_state *accel_state = info->accel_state;
-     int vtx_size;
- 
-     if (accel_state->vsync)
-@@ -1381,6 +1392,22 @@ static void EVERGREENDoneComposite(PixmapPtr pDst)
-     evergreen_finish_op(pScrn, vtx_size);
- }
- 
-+static void EVERGREENDoneComposite(PixmapPtr pDst)
-+{
-+    ScreenPtr pScreen = pDst->drawable.pScreen;
-+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+    RADEONInfoPtr info = RADEONPTR(pScrn);
-+    struct radeon_accel_state *accel_state = info->accel_state;
-+
-+    EVERGREENFinishComposite(pScrn, pDst, accel_state);
-+
-+    if (!accel_state->src_pic->pDrawable)
-+	pScreen->DestroyPixmap(accel_state->src_pix);
-+
-+    if (accel_state->msk_pic && !accel_state->msk_pic->pDrawable)
-+	pScreen->DestroyPixmap(accel_state->msk_pix);
-+}
-+
- static void EVERGREENComposite(PixmapPtr pDst,
- 			       int srcX, int srcY,
- 			       int maskX, int maskY,
-@@ -1393,7 +1420,7 @@ static void EVERGREENComposite(PixmapPtr pDst,
-     float *vb;
- 
-     if (CS_FULL(info->cs)) {
--	EVERGREENDoneComposite(info->accel_state->dst_pix);
-+	EVERGREENFinishComposite(pScrn, pDst, info->accel_state);
- 	radeon_cs_flush_indirect(pScrn);
- 	EVERGREENPrepareComposite(info->accel_state->composite_op,
- 				  info->accel_state->src_pic,
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.4-exa-solid-accel-r100.patch b/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.4-exa-solid-accel-r100.patch
deleted file mode 100644
index 2397d083..00000000
--- a/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.4-exa-solid-accel-r100.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-From a7754b076e355fef3aea082b6e2d3aefbb8e7a9b Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexander.deucher@amd.com>
-Date: Fri, 13 Apr 2012 17:24:46 +0000
-Subject: EXA: Support acceleration of solid pictures on R1xx.
-
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
----
-diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
-index b6cc9e4..451a625 100644
---- a/src/radeon_exa_render.c
-+++ b/src/radeon_exa_render.c
-@@ -338,17 +338,8 @@ static Bool R100CheckCompositeTexture(PicturePtr pPict,
- 				      int unit)
- {
-     unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
-     int i;
- 
--    /* r100 limit should be 2048, there are issues with 2048
--     * see 197a62704742a4a19736c2637ac92d1dc5ab34ed
--     */
--
--    if ((w > 2047) || (h > 2047))
--	RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h));
--
-     for (i = 0; i < sizeof(R100TexFormats) / sizeof(R100TexFormats[0]); i++) {
- 	if (R100TexFormats[i].fmt == pPict->format)
- 	    break;
-@@ -357,7 +348,7 @@ static Bool R100CheckCompositeTexture(PicturePtr pPict,
- 	RADEON_FALLBACK(("Unsupported picture format 0x%x\n",
- 			(int)pPict->format));
- 
--    if (!RADEONCheckTexturePOT(pPict, unit == 0))
-+    if (pPict->pDrawable && !RADEONCheckTexturePOT(pPict, unit == 0))
- 	return FALSE;
- 
-     if (pPict->filter != PictFilterNearest &&
-@@ -392,15 +383,24 @@ static Bool FUNC_NAME(R100TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
- {
-     RINFO_FROM_SCREEN(pPix->drawable.pScreen);
-     uint32_t txfilter, txformat, txoffset, txpitch;
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
--    unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
--    Bool repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) &&
--	!(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y));
--    int i;
-+    unsigned int repeatType;
-+    Bool repeat;
-+    int i, w, h;
-     struct radeon_exa_pixmap_priv *driver_priv;
-     ACCEL_PREAMBLE();
- 
-+    if (pPict->pDrawable) {
-+	w = pPict->pDrawable->width;
-+	h = pPict->pDrawable->height;
-+	repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
-+    } else {
-+	w = h = 1;
-+	repeatType = RepeatNormal;
-+    }
-+
-+    repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) &&
-+	!(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y));
-+
-     txpitch = exaGetPixmapPitch(pPix);
-     txoffset = 0;
- 
-@@ -510,22 +510,6 @@ static Bool R100CheckComposite(int op, PicturePtr pSrcPicture,
-     if (op >= sizeof(RadeonBlendOp) / sizeof(RadeonBlendOp[0]))
- 	RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op));
- 
--    if (!pSrcPicture->pDrawable)
--	RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
--
--    /* r100 limit should be 2048, there are issues with 2048
--     * see 197a62704742a4a19736c2637ac92d1dc5ab34ed
--     */
--
--    pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
--
--    if (pSrcPixmap->drawable.width > 2047 ||
--	pSrcPixmap->drawable.height > 2047) {
--	RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
--			 pSrcPixmap->drawable.width,
--			 pSrcPixmap->drawable.height));
--    }
--
-     pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable);
- 
-     if (pDstPixmap->drawable.width > 2047 ||
-@@ -535,20 +519,35 @@ static Bool R100CheckComposite(int op, PicturePtr pSrcPicture,
- 			 pDstPixmap->drawable.height));
-     }
- 
-+    if (pSrcPicture->pDrawable) {
-+	/* r100 limit should be 2048, there are issues with 2048
-+	 * see 197a62704742a4a19736c2637ac92d1dc5ab34ed
-+	 */
-+	pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
-+
-+	if (pSrcPixmap->drawable.width > 2047 ||
-+	    pSrcPixmap->drawable.height > 2047) {
-+	    RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
-+			     pSrcPixmap->drawable.width,
-+			     pSrcPixmap->drawable.height));
-+	}
-+    } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
-+
-     if (pMaskPicture) {
- 	PixmapPtr pMaskPixmap;
- 
--	if (!pMaskPicture->pDrawable)
--	    RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
--
--	pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
-+	if (pMaskPicture->pDrawable) {
-+	    pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
- 
--	if (pMaskPixmap->drawable.width > 2047 ||
--	    pMaskPixmap->drawable.height > 2047) {
--	    RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
--			     pMaskPixmap->drawable.width,
--			     pMaskPixmap->drawable.height));
--	}
-+	    if (pMaskPixmap->drawable.width > 2047 ||
-+		pMaskPixmap->drawable.height > 2047) {
-+		RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
-+				 pMaskPixmap->drawable.width,
-+				 pMaskPixmap->drawable.height));
-+	    }
-+	} else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	    RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
- 
- 	if (pMaskPicture->componentAlpha) {
- 	    /* Check if it's component alpha that relies on a source alpha and
-@@ -624,7 +623,8 @@ static Bool FUNC_NAME(R100PrepareComposite)(int op,
- 					    PixmapPtr pMask,
- 					    PixmapPtr pDst)
- {
--    RINFO_FROM_SCREEN(pDst->drawable.pScreen);
-+    ScreenPtr pScreen = pDst->drawable.pScreen;
-+    RINFO_FROM_SCREEN(pScreen);
-     uint32_t dst_format, dst_pitch, colorpitch;
-     uint32_t pp_cntl, blendcntl, cblend, ablend;
-     int pixel_shift;
-@@ -648,12 +648,27 @@ static Bool FUNC_NAME(R100PrepareComposite)(int op,
- 
-     CHECK_OFFSET(pDst, 0x0f, "destination");
- 
-+    if (!pSrc) {
-+	pSrc = RADEONSolidPixmap(pScreen, cpu_to_le32(pSrcPicture->pSourcePict->solidFill.color));
-+	if (!pSrc)
-+	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+    }
-+
-     if (((dst_pitch >> pixel_shift) & 0x7) != 0)
- 	RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch));
- 
-     if (!RADEONSetupSourceTile(pSrcPicture, pSrc, FALSE, TRUE))
- 	return FALSE;
- 
-+    if (pMaskPicture && !pMask) {
-+	pMask = RADEONSolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color));
-+	if (!pMask) {
-+	    if (!pSrcPicture->pDrawable)
-+		pScreen->DestroyPixmap(pSrc);
-+	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+	}
-+    }
-+
-     RADEONPrepareCompositeCS(op, pSrcPicture, pMaskPicture, pDstPicture,
- 			     pSrc, pMask, pDst);
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.4-exa-solid-accel-r200.patch b/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.4-exa-solid-accel-r200.patch
deleted file mode 100644
index ff744eec..00000000
--- a/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.4-exa-solid-accel-r200.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From 0bda305f7ab2a4720b3fea3f318ab2a73be151e5 Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexander.deucher@amd.com>
-Date: Fri, 13 Apr 2012 17:28:10 +0000
-Subject: EXA: Support acceleration of solid pictures on R2xx.
-
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
----
-diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
-index 451a625..7f1a3ff 100644
---- a/src/radeon_exa_render.c
-+++ b/src/radeon_exa_render.c
-@@ -756,17 +756,8 @@ static Bool R200CheckCompositeTexture(PicturePtr pPict,
- 				      int unit)
- {
-     unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
-     int i;
- 
--    /* r200 limit should be 2048, there are issues with 2048
--     * see bug 19269
--     */
--
--    if ((w > 2047) || (h > 2047))
--	RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h));
--
-     for (i = 0; i < sizeof(R200TexFormats) / sizeof(R200TexFormats[0]); i++)
-     {
- 	if (R200TexFormats[i].fmt == pPict->format)
-@@ -776,7 +767,7 @@ static Bool R200CheckCompositeTexture(PicturePtr pPict,
- 	RADEON_FALLBACK(("Unsupported picture format 0x%x\n",
- 			 (int)pPict->format));
- 
--    if (!RADEONCheckTexturePOT(pPict, unit == 0))
-+    if (pPict->pDrawable && !RADEONCheckTexturePOT(pPict, unit == 0))
- 	return FALSE;
- 
-     if (pPict->filter != PictFilterNearest &&
-@@ -809,15 +800,24 @@ static Bool FUNC_NAME(R200TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
- {
-     RINFO_FROM_SCREEN(pPix->drawable.pScreen);
-     uint32_t txfilter, txformat, txoffset, txpitch;
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
--    unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
--    Bool repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) &&
--	!(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y));
--    int i;
-+    unsigned int repeatType;
-+    Bool repeat;
-+    int i, w, h;
-     struct radeon_exa_pixmap_priv *driver_priv;
-     ACCEL_PREAMBLE();
- 
-+    if (pPict->pDrawable) {
-+	w = pPict->pDrawable->width;
-+	h = pPict->pDrawable->height;
-+	repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
-+    } else {
-+	w = h = 1;
-+	repeatType = RepeatNormal;
-+    }
-+
-+    repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) &&
-+	!(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y));
-+
-     txpitch = exaGetPixmapPitch(pPix);
- 
-     txoffset = 0;
-@@ -926,22 +926,6 @@ static Bool R200CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
-     if (op >= sizeof(RadeonBlendOp) / sizeof(RadeonBlendOp[0]))
- 	RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op));
- 
--    if (!pSrcPicture->pDrawable)
--	RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
--
--    /* r200 limit should be 2048, there are issues with 2048
--     * see bug 19269
--     */
--
--    pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
--
--    if (pSrcPixmap->drawable.width > 2047 ||
--	pSrcPixmap->drawable.height > 2047) {
--	RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
--			 pSrcPixmap->drawable.width,
--			 pSrcPixmap->drawable.height));
--    }
--
-     pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable);
- 
-     if (pDstPixmap->drawable.width > 2047 ||
-@@ -951,20 +935,35 @@ static Bool R200CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
- 			 pDstPixmap->drawable.height));
-     }
- 
-+    if (pSrcPicture->pDrawable) {
-+	/* r200 limit should be 2048, there are issues with 2048
-+	 * see 197a62704742a4a19736c2637ac92d1dc5ab34ed
-+	 */
-+	pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
-+
-+	if (pSrcPixmap->drawable.width > 2047 ||
-+	    pSrcPixmap->drawable.height > 2047) {
-+	    RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
-+			     pSrcPixmap->drawable.width,
-+			     pSrcPixmap->drawable.height));
-+	}
-+    } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
-+
-     if (pMaskPicture) {
- 	PixmapPtr pMaskPixmap;
- 
--	if (!pMaskPicture->pDrawable)
--	    RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
--
--	pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
-+	if (pMaskPicture->pDrawable) {
-+	    pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
- 
--	if (pMaskPixmap->drawable.width > 2047 ||
--	    pMaskPixmap->drawable.height > 2047) {
--	    RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
--			     pMaskPixmap->drawable.width,
--			     pMaskPixmap->drawable.height));
--	}
-+	    if (pMaskPixmap->drawable.width > 2047 ||
-+		pMaskPixmap->drawable.height > 2047) {
-+		RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
-+				 pMaskPixmap->drawable.width,
-+				 pMaskPixmap->drawable.height));
-+	    }
-+	} else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	    RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
- 
- 	if (pMaskPicture->componentAlpha) {
- 	    /* Check if it's component alpha that relies on a source alpha and
-@@ -997,7 +996,8 @@ static Bool FUNC_NAME(R200PrepareComposite)(int op, PicturePtr pSrcPicture,
- 				PicturePtr pMaskPicture, PicturePtr pDstPicture,
- 				PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
- {
--    RINFO_FROM_SCREEN(pDst->drawable.pScreen);
-+    ScreenPtr pScreen = pDst->drawable.pScreen;
-+    RINFO_FROM_SCREEN(pScreen);
-     uint32_t dst_format, dst_pitch;
-     uint32_t pp_cntl, blendcntl, cblend, ablend, colorpitch;
-     int pixel_shift;
-@@ -1024,9 +1024,24 @@ static Bool FUNC_NAME(R200PrepareComposite)(int op, PicturePtr pSrcPicture,
-     if (((dst_pitch >> pixel_shift) & 0x7) != 0)
- 	RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch));
- 
-+    if (!pSrc) {
-+	pSrc = RADEONSolidPixmap(pScreen, cpu_to_le32(pSrcPicture->pSourcePict->solidFill.color));
-+	if (!pSrc)
-+	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+    }
-+
-     if (!RADEONSetupSourceTile(pSrcPicture, pSrc, FALSE, TRUE))
- 	return FALSE;
- 
-+    if (pMaskPicture && !pMask) {
-+	pMask = RADEONSolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color));
-+	if (!pMask) {
-+	    if (!pSrcPicture->pDrawable)
-+		pScreen->DestroyPixmap(pSrc);
-+	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+	}
-+    }
-+
-     RADEONPrepareCompositeCS(op, pSrcPicture, pMaskPicture, pDstPicture,
- 			     pSrc, pMask, pDst);
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.4-exa-solid-accel-r300.patch b/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.4-exa-solid-accel-r300.patch
deleted file mode 100644
index 819173c5..00000000
--- a/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.4-exa-solid-accel-r300.patch
+++ /dev/null
@@ -1,560 +0,0 @@
-From d88b9700137ee407c483f263bb55c77cd6f92fef Mon Sep 17 00:00:00 2001
-From: Michel Dänzer <michel.daenzer@amd.com>
-Date: Fri, 13 Apr 2012 07:35:38 +0000
-Subject: EXA: Support acceleration of solid pictures on R3xx-R7xx.
-
-Allocate 1x1 scratch pixmaps to hold the solid picture colours.
-
-Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
----
-diff --git a/src/r600_exa.c b/src/r600_exa.c
-index e1eb62f..c3ae553 100644
---- a/src/r600_exa.c
-+++ b/src/r600_exa.c
-@@ -901,17 +901,8 @@ static Bool R600CheckCompositeTexture(PicturePtr pPict,
- 				      int op,
- 				      int unit)
- {
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
-     unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
-     unsigned int i;
--    int max_tex_w, max_tex_h;
--
--    max_tex_w = 8192;
--    max_tex_h = 8192;
--
--    if ((w > max_tex_w) || (h > max_tex_h))
--	RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h));
- 
-     for (i = 0; i < sizeof(R600TexFormats) / sizeof(R600TexFormats[0]); i++) {
- 	if (R600TexFormats[i].fmt == pPict->format)
-@@ -951,9 +942,7 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
-     ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum];
-     RADEONInfoPtr info = RADEONPTR(pScrn);
-     struct radeon_accel_state *accel_state = info->accel_state;
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
--    unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
-+    unsigned int repeatType;
-     unsigned int i;
-     tex_resource_t  tex_res;
-     tex_sampler_t   tex_samp;
-@@ -969,9 +958,16 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
-     }
- 
-     /* Texture */
-+    if (pPict->pDrawable) {
-+	tex_res.w               = pPict->pDrawable->width;
-+	tex_res.h               = pPict->pDrawable->height;
-+	repeatType              = pPict->repeat ? pPict->repeatType : RepeatNone;
-+    } else {
-+	tex_res.w               = 1;
-+	tex_res.h               = 1;
-+	repeatType              = RepeatNormal;
-+    }
-     tex_res.id                  = unit;
--    tex_res.w                   = w;
--    tex_res.h                   = h;
-     tex_res.pitch               = accel_state->src_obj[unit].pitch;
-     tex_res.depth               = 0;
-     tex_res.dim                 = SQ_TEX_DIM_2D;
-@@ -1170,24 +1166,24 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
- 	vs_alu_consts[0] = xFixedToFloat(pPict->transform->matrix[0][0]);
- 	vs_alu_consts[1] = xFixedToFloat(pPict->transform->matrix[0][1]);
- 	vs_alu_consts[2] = xFixedToFloat(pPict->transform->matrix[0][2]);
--	vs_alu_consts[3] = 1.0 / w;
-+	vs_alu_consts[3] = 1.0 / tex_res.w;
- 
- 	vs_alu_consts[4] = xFixedToFloat(pPict->transform->matrix[1][0]);
- 	vs_alu_consts[5] = xFixedToFloat(pPict->transform->matrix[1][1]);
- 	vs_alu_consts[6] = xFixedToFloat(pPict->transform->matrix[1][2]);
--	vs_alu_consts[7] = 1.0 / h;
-+	vs_alu_consts[7] = 1.0 / tex_res.h;
-     } else {
- 	accel_state->is_transform[unit] = FALSE;
- 
- 	vs_alu_consts[0] = 1.0;
- 	vs_alu_consts[1] = 0.0;
- 	vs_alu_consts[2] = 0.0;
--	vs_alu_consts[3] = 1.0 / w;
-+	vs_alu_consts[3] = 1.0 / tex_res.w;
- 
- 	vs_alu_consts[4] = 0.0;
- 	vs_alu_consts[5] = 1.0;
- 	vs_alu_consts[6] = 0.0;
--	vs_alu_consts[7] = 1.0 / h;
-+	vs_alu_consts[7] = 1.0 / tex_res.h;
-     }
- 
-     /* VS alu constants */
-@@ -1202,33 +1198,30 @@ static Bool R600CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
- {
-     uint32_t tmp1;
-     PixmapPtr pSrcPixmap, pDstPixmap;
--    int max_tex_w, max_tex_h, max_dst_w, max_dst_h;
- 
-     /* Check for unsupported compositing operations. */
-     if (op >= (int) (sizeof(R600BlendOp) / sizeof(R600BlendOp[0])))
- 	RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op));
- 
--    if (!pSrcPicture->pDrawable)
--	RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
--
--    pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
-+    if (pSrcPicture->pDrawable) {
-+	pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
- 
--    max_tex_w = 8192;
--    max_tex_h = 8192;
--    max_dst_w = 8192;
--    max_dst_h = 8192;
-+	if (pSrcPixmap->drawable.width >= 8192 ||
-+	    pSrcPixmap->drawable.height >= 8192) {
-+	    RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
-+			     pSrcPixmap->drawable.width,
-+			     pSrcPixmap->drawable.height));
-+	}
- 
--    if (pSrcPixmap->drawable.width >= max_tex_w ||
--	pSrcPixmap->drawable.height >= max_tex_h) {
--	RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
--			 pSrcPixmap->drawable.width,
--			 pSrcPixmap->drawable.height));
--    }
-+	if (!R600CheckCompositeTexture(pSrcPicture, pDstPicture, op, 0))
-+	    return FALSE;
-+    } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
- 
-     pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable);
- 
--    if (pDstPixmap->drawable.width >= max_dst_w ||
--	pDstPixmap->drawable.height >= max_dst_h) {
-+    if (pDstPixmap->drawable.width >= 8192 ||
-+	pDstPixmap->drawable.height >= 8192) {
- 	RADEON_FALLBACK(("Dest w/h too large (%d,%d).\n",
- 			 pDstPixmap->drawable.width,
- 			 pDstPixmap->drawable.height));
-@@ -1237,38 +1230,35 @@ static Bool R600CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
-     if (pMaskPicture) {
- 	PixmapPtr pMaskPixmap;
- 
--	if (!pMaskPicture->pDrawable)
--	    RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
-+	if (pMaskPicture->pDrawable) {
-+	    pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
- 
--	pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
--
--	if (pMaskPixmap->drawable.width >= max_tex_w ||
--	    pMaskPixmap->drawable.height >= max_tex_h) {
--	    RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
--			     pMaskPixmap->drawable.width,
--			     pMaskPixmap->drawable.height));
--	}
-+	    if (pMaskPixmap->drawable.width >= 8192 ||
-+		pMaskPixmap->drawable.height >= 8192) {
-+	      RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
-+			       pMaskPixmap->drawable.width,
-+			       pMaskPixmap->drawable.height));
-+	    }
- 
--	if (pMaskPicture->componentAlpha) {
--	    /* Check if it's component alpha that relies on a source alpha and
--	     * on the source value.  We can only get one of those into the
--	     * single source value that we get to blend with.
--	     */
--	    if (R600BlendOp[op].src_alpha &&
--		(R600BlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) !=
--		(BLEND_ZERO << COLOR_SRCBLEND_shift)) {
--		RADEON_FALLBACK(("Component alpha not supported with source "
--				 "alpha and source value blending.\n"));
-+	    if (pMaskPicture->componentAlpha) {
-+		/* Check if it's component alpha that relies on a source alpha and
-+		 * on the source value.  We can only get one of those into the
-+		 * single source value that we get to blend with.
-+		 */
-+		if (R600BlendOp[op].src_alpha &&
-+		    (R600BlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) !=
-+		    (BLEND_ZERO << COLOR_SRCBLEND_shift)) {
-+		    RADEON_FALLBACK(("Component alpha not supported with source "
-+				     "alpha and source value blending.\n"));
-+		}
- 	    }
--	}
- 
--	if (!R600CheckCompositeTexture(pMaskPicture, pDstPicture, op, 1))
--	    return FALSE;
-+	    if (!R600CheckCompositeTexture(pMaskPicture, pDstPicture, op, 1))
-+		return FALSE;
-+	} else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	    RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
-     }
- 
--    if (!R600CheckCompositeTexture(pSrcPicture, pDstPicture, op, 0))
--	return FALSE;
--
-     if (!R600GetDestFormat(pDstPicture, &tmp1))
- 	return FALSE;
- 
-@@ -1280,7 +1270,8 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
- 				 PicturePtr pMaskPicture, PicturePtr pDstPicture,
- 				 PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum];
-+    ScreenPtr pScreen = pDst->drawable.pScreen;
-+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-     RADEONInfoPtr info = RADEONPTR(pScrn);
-     struct radeon_accel_state *accel_state = info->accel_state;
-     uint32_t dst_format;
-@@ -1288,15 +1279,21 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
-     shader_config_t vs_conf, ps_conf;
-     struct r600_accel_object src_obj, mask_obj, dst_obj;
- 
--    if (pDst->drawable.bitsPerPixel < 8 || pSrc->drawable.bitsPerPixel < 8)
-+    if (pDst->drawable.bitsPerPixel < 8 || (pSrc && pSrc->drawable.bitsPerPixel < 8))
- 	return FALSE;
- 
-+    if (!pSrc) {
-+	pSrc = RADEONSolidPixmap(pScreen, pSrcPicture->pSourcePict->solidFill.color);
-+	if (!pSrc)
-+	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+    }
-+
- #if defined(XF86DRM_MODE)
-     if (info->cs) {
- 	src_obj.offset = 0;
- 	dst_obj.offset = 0;
--	src_obj.bo = radeon_get_pixmap_bo(pSrc);
- 	dst_obj.bo = radeon_get_pixmap_bo(pDst);
-+	src_obj.bo = radeon_get_pixmap_bo(pSrc);
- 	dst_obj.tiling_flags = radeon_get_pixmap_tiling(pDst);
- 	src_obj.tiling_flags = radeon_get_pixmap_tiling(pSrc);
- 	dst_obj.surface = radeon_get_pixmap_surface(pDst);
-@@ -1322,7 +1319,16 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
-     dst_obj.bpp = pDst->drawable.bitsPerPixel;
-     dst_obj.domain = RADEON_GEM_DOMAIN_VRAM;
- 
--    if (pMask) {
-+    if (pMaskPicture) {
-+	if (!pMask) {
-+	    pMask = RADEONSolidPixmap(pScreen, pMaskPicture->pSourcePict->solidFill.color);
-+	    if (!pMask) {
-+		if (!pSrcPicture->pDrawable)
-+		    pScreen->DestroyPixmap(pSrc);
-+		RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+	    }
-+	}
-+
- #if defined(XF86DRM_MODE)
- 	if (info->cs) {
- 	    mask_obj.offset = 0;
-@@ -1509,11 +1515,9 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
-     return TRUE;
- }
- 
--static void R600DoneComposite(PixmapPtr pDst)
-+static void R600FinishComposite(ScrnInfoPtr pScrn, PixmapPtr pDst,
-+				struct radeon_accel_state *accel_state)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
--    RADEONInfoPtr info = RADEONPTR(pScrn);
--    struct radeon_accel_state *accel_state = info->accel_state;
-     int vtx_size;
- 
-     if (accel_state->vsync)
-@@ -1527,6 +1531,22 @@ static void R600DoneComposite(PixmapPtr pDst)
-     r600_finish_op(pScrn, vtx_size);
- }
- 
-+static void R600DoneComposite(PixmapPtr pDst)
-+{
-+    ScreenPtr pScreen = pDst->drawable.pScreen;
-+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+    RADEONInfoPtr info = RADEONPTR(pScrn);
-+    struct radeon_accel_state *accel_state = info->accel_state;
-+
-+    R600FinishComposite(pScrn, pDst, accel_state);
-+
-+    if (!accel_state->src_pic->pDrawable)
-+	pScreen->DestroyPixmap(accel_state->src_pix);
-+
-+    if (accel_state->msk_pic && !accel_state->msk_pic->pDrawable)
-+	pScreen->DestroyPixmap(accel_state->msk_pix);
-+}
-+
- static void R600Composite(PixmapPtr pDst,
- 			  int srcX, int srcY,
- 			  int maskX, int maskY,
-@@ -1543,7 +1563,7 @@ static void R600Composite(PixmapPtr pDst,
- 
- #ifdef XF86DRM_MODE
-     if (info->cs && CS_FULL(info->cs)) {
--	R600DoneComposite(info->accel_state->dst_pix);
-+	R600FinishComposite(pScrn, pDst, info->accel_state);
- 	radeon_cs_flush_indirect(pScrn);
- 	R600PrepareComposite(info->accel_state->composite_op,
- 			     info->accel_state->src_pic,
-diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
-index e5c231f..b6cc9e4 100644
---- a/src/radeon_exa_render.c
-+++ b/src/radeon_exa_render.c
-@@ -299,8 +299,8 @@ static Bool RADEONSetupSourceTile(PicturePtr pPict,
-     if (repeatType == RepeatNormal || repeatType == RepeatReflect) {
- 	Bool badPitch = needMatchingPitch && !RADEONPitchMatches(pPix);
- 	
--	int w = pPict->pDrawable->width;
--	int h = pPict->pDrawable->height;
-+	int w = pPict->pDrawable ? pPict->pDrawable->width : 1;
-+	int h = pPict->pDrawable ? pPict->pDrawable->height : 1;
- 	
- 	if (pPict->transform) {
- 	    if (badPitch)
-@@ -1112,23 +1112,8 @@ static Bool R300CheckCompositeTexture(PicturePtr pPict,
-     ScreenPtr pScreen = pDstPict->pDrawable->pScreen;
-     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-     RADEONInfoPtr info = RADEONPTR(pScrn);
--
-     unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
-     int i;
--    int max_tex_w, max_tex_h;
--
--    if (is_r500) {
--	max_tex_w = 4096;
--	max_tex_h = 4096;
--    } else {
--	max_tex_w = 2048;
--	max_tex_h = 2048;
--    }
--
--    if ((w > max_tex_w) || (h > max_tex_h))
--	RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h));
- 
-     for (i = 0; i < sizeof(R300TexFormats) / sizeof(R300TexFormats[0]); i++)
-     {
-@@ -1139,7 +1124,7 @@ static Bool R300CheckCompositeTexture(PicturePtr pPict,
- 	RADEON_FALLBACK(("Unsupported picture format 0x%x\n",
- 			 (int)pPict->format));
- 
--    if (!RADEONCheckTexturePOT(pPict, unit == 0)) {
-+    if (pPict->pDrawable && !RADEONCheckTexturePOT(pPict, unit == 0)) {
- 	if (info->cs) {
-     		struct radeon_exa_pixmap_priv *driver_priv;
- 		PixmapPtr pPix;
-@@ -1181,15 +1166,23 @@ static Bool FUNC_NAME(R300TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
- {
-     RINFO_FROM_SCREEN(pPix->drawable.pScreen);
-     uint32_t txfilter, txformat0, txformat1, txoffset, txpitch, us_format = 0;
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
-+    int w, h;
-     int i, pixel_shift, out_size = 6;
--    unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
-+    unsigned int repeatType;
-     struct radeon_exa_pixmap_priv *driver_priv;
-     ACCEL_PREAMBLE();
- 
-     TRACE;
- 
-+    if (pPict->pDrawable) {
-+	w = pPict->pDrawable->width;
-+	h = pPict->pDrawable->height;
-+	repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
-+    } else {
-+	w = h = 1;
-+	repeatType = RepeatNormal;
-+    }
-+
-     txpitch = exaGetPixmapPitch(pPix);
-     txoffset = 0;
- 
-@@ -1394,11 +1387,6 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
-     if (op >= sizeof(RadeonBlendOp) / sizeof(RadeonBlendOp[0]))
- 	RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op));
- 
--    if (!pSrcPicture->pDrawable)
--	RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
--
--    pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
--
-     if (IS_R500_3D) {
- 	max_tex_w = 4096;
- 	max_tex_h = 4096;
-@@ -1416,13 +1404,6 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
- 	}
-     }
- 
--    if (pSrcPixmap->drawable.width > max_tex_w ||
--	pSrcPixmap->drawable.height > max_tex_h) {
--	RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
--			 pSrcPixmap->drawable.width,
--			 pSrcPixmap->drawable.height));
--    }
--
-     pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable);
- 
-     if (pDstPixmap->drawable.width > max_dst_w ||
-@@ -1432,20 +1413,32 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
- 			 pDstPixmap->drawable.height));
-     }
- 
-+    if (pSrcPicture->pDrawable) {
-+	pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
-+
-+	if (pSrcPixmap->drawable.width > max_tex_w ||
-+	    pSrcPixmap->drawable.height > max_tex_h) {
-+	    RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
-+			     pSrcPixmap->drawable.width,
-+			     pSrcPixmap->drawable.height));
-+	}
-+    } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
-+
-     if (pMaskPicture) {
- 	PixmapPtr pMaskPixmap;
- 
--	if (!pMaskPicture->pDrawable)
--	    RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
-+	if (pMaskPicture->pDrawable) {
-+	    pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
- 
--	pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
--
--	if (pMaskPixmap->drawable.width > max_tex_w ||
--	    pMaskPixmap->drawable.height > max_tex_h) {
--	    RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
--			     pMaskPixmap->drawable.width,
--			     pMaskPixmap->drawable.height));
--	}
-+	    if (pMaskPixmap->drawable.width > max_tex_w ||
-+		pMaskPixmap->drawable.height > max_tex_h) {
-+	      RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
-+			       pMaskPixmap->drawable.width,
-+			       pMaskPixmap->drawable.height));
-+	    }
-+	} else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	    RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
- 
- 	if (pMaskPicture->componentAlpha) {
- 	    /* Check if it's component alpha that relies on a source alpha and
-@@ -1479,7 +1472,8 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
- 				PicturePtr pMaskPicture, PicturePtr pDstPicture,
- 				PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
- {
--    RINFO_FROM_SCREEN(pDst->drawable.pScreen);
-+    ScreenPtr pScreen = pDst->drawable.pScreen;
-+    RINFO_FROM_SCREEN(pScreen);
-     uint32_t dst_format, dst_pitch;
-     uint32_t txenable, colorpitch;
-     uint32_t blendcntl, output_fmt;
-@@ -1508,9 +1502,24 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
-     if (((dst_pitch >> pixel_shift) & 0x7) != 0)
- 	RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch));
- 
-+    if (!pSrc) {
-+	pSrc = RADEONSolidPixmap(pScreen, cpu_to_le32(pSrcPicture->pSourcePict->solidFill.color));
-+	if (!pSrc)
-+	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+    }
-+
-     if (!RADEONSetupSourceTile(pSrcPicture, pSrc, TRUE, FALSE))
- 	return FALSE;
- 
-+    if (pMaskPicture && !pMask) {
-+	pMask = RADEONSolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color));
-+	if (!pMask) {
-+	    if (!pSrcPicture->pDrawable)
-+		pScreen->DestroyPixmap(pSrc);
-+	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+	}
-+    }
-+
-     RADEONPrepareCompositeCS(op, pSrcPicture, pMaskPicture, pDstPicture,
- 			     pSrc, pMask, pDst);
- 
-@@ -2132,7 +2141,7 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
-     return TRUE;
- }
- 
--static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst)
-+static void FUNC_NAME(RadeonFinishComposite)(PixmapPtr pDst)
- {
-     RINFO_FROM_SCREEN(pDst->drawable.pScreen);
-     ACCEL_PREAMBLE();
-@@ -2179,6 +2188,20 @@ static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst)
-     LEAVE_DRAW(0);
- }
- 
-+static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst)
-+{
-+    ScreenPtr pScreen = pDst->drawable.pScreen;
-+    RINFO_FROM_SCREEN(pScreen);
-+    struct radeon_accel_state *accel_state = info->accel_state;
-+
-+    FUNC_NAME(RadeonFinishComposite)(pDst);
-+
-+    if (!accel_state->src_pic->pDrawable)
-+	pScreen->DestroyPixmap(accel_state->src_pix);
-+
-+    if (accel_state->msk_pic && !accel_state->msk_pic->pDrawable)
-+	pScreen->DestroyPixmap(accel_state->msk_pix);
-+}
- 
- #ifdef ACCEL_CP
- 
-@@ -2257,7 +2280,7 @@ static void FUNC_NAME(RadeonCompositeTile)(ScrnInfoPtr pScrn,
-     if ((info->cs && CS_FULL(info->cs)) ||
- 	(!info->cs && (info->cp->indirectBuffer->used + 4 * 32) >
- 	 info->cp->indirectBuffer->total)) {
--	FUNC_NAME(RadeonDoneComposite)(info->accel_state->dst_pix);
-+	FUNC_NAME(RadeonFinishComposite)(info->accel_state->dst_pix);
- 	if (info->cs)
- 	    radeon_cs_flush_indirect(pScrn);
- 	else
-diff --git a/src/radeon_exa_shared.c b/src/radeon_exa_shared.c
-index be1d2fa..28dc335 100644
---- a/src/radeon_exa_shared.c
-+++ b/src/radeon_exa_shared.c
-@@ -126,6 +126,25 @@ Bool RADEONCheckBPP(int bpp)
- 	return FALSE;
- }
- 
-+PixmapPtr RADEONSolidPixmap(ScreenPtr pScreen, uint32_t solid)
-+{
-+    PixmapPtr pPix = pScreen->CreatePixmap(pScreen, 1, 1, 32, 0);
-+    struct radeon_bo *bo;
-+
-+    exaMoveInPixmap(pPix);
-+    bo = radeon_get_pixmap_bo(pPix);
-+
-+    if (radeon_bo_map(bo, 1)) {
-+	pScreen->DestroyPixmap(pPix);
-+	return NULL;
-+    }
-+
-+    memcpy(bo->ptr, &solid, 4);
-+    radeon_bo_unmap(bo);
-+
-+    return pPix;
-+}
-+
- static Bool radeon_vb_get(ScrnInfoPtr pScrn)
- {
-     RADEONInfoPtr info = RADEONPTR(pScrn);
-diff --git a/src/radeon_exa_shared.h b/src/radeon_exa_shared.h
-index 7b8b5ca..60a1045 100644
---- a/src/radeon_exa_shared.h
-+++ b/src/radeon_exa_shared.h
-@@ -40,6 +40,7 @@ extern void RADEONVlineHelperClear(ScrnInfoPtr pScrn);
- extern void RADEONVlineHelperSet(ScrnInfoPtr pScrn, int x1, int y1, int x2, int y2);
- extern Bool RADEONValidPM(uint32_t pm, int bpp);
- extern Bool RADEONCheckBPP(int bpp);
-+extern PixmapPtr RADEONSolidPixmap(ScreenPtr pScreen, uint32_t solid);
- 
- #define RADEON_TRACE_FALL 0
- #define RADEON_TRACE_DRAW 0
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-ati/metadata.xml b/x11-drivers/xf86-video-ati/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- a/x11-drivers/xf86-video-ati/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.4-r1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.4-r1.ebuild
deleted file mode 100644
index d153c8fe..00000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.4-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.4-r1.ebuild,v 1.8 2012/07/12 17:31:31 ranger Exp $
-
-EAPI=4
-
-XORG_DRI=always
-inherit xorg-2
-
-DESCRIPTION="ATI video driver"
-
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-libs/libdrm-2.4.33[video_cards_radeon]"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.14.4-exa-solid-accel-r300.patch
-	"${FILESDIR}"/${PN}-6.14.4-exa-solid-accel-evergreen.patch
-	"${FILESDIR}"/${PN}-6.14.4-exa-solid-accel-r100.patch
-	"${FILESDIR}"/${PN}-6.14.4-exa-solid-accel-r200.patch
-)
-
-pkg_setup() {
-	xorg-2_pkg_setup
-	XORG_CONFIGURE_OPTIONS=(
-		--enable-dri
-		--enable-kms
-		--enable-exa
-	)
-}
-
-src_install() {
-	xorg-2_src_install
-
-	# install a modprobe.d file to make sure that KMS
-	# is enabled for the radeon kernel driver
-	# if this package is installed. KMS is now mandatory
-	# but current Kogaion kernels have it disabled to
-	# allow fglrx to work
-	dodir /etc/modprobe.d
-	echo "options radeon modeset=1" > radeon.conf
-	insinto /etc/modprobe.d
-	doins radeon.conf
-}
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.6-r1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.6-r1.ebuild
deleted file mode 100644
index 8d82ae96..00000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.6-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-XORG_DRI=always
-XORG_EAUTORECONF=yes
-inherit xorg-2
-
-DESCRIPTION="ATI video driver"
-
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-libs/libdrm-2.4.36[video_cards_radeon]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# disable XAA to allow building against >=xorg-server-1.12.99.902, bug #428094
-	sed -i '/USE_XAA, 1/d' configure.ac || die
-	xorg-2_src_prepare
-}
-
-pkg_setup() {
-	xorg-2_pkg_setup
-	XORG_CONFIGURE_OPTIONS=(
-		--enable-dri
-		--enable-kms
-		--enable-exa
-	)
-}
-
-pkg_preinst() {
-	# "untrack" radeon.conf, starting from kernel 3.6, this is
-	# no longer needed. However, we don't want to break the current
-	# status-quo.
-	cp "${EROOT}/etc/modprobe.d/"{radeon.conf,radeon.conf.untracked} || die
-}
-
-pkg_postinst() {
-	mv "${EROOT}/etc/modprobe.d/"{radeon.conf.untracked,radeon.conf} || die
-}
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-7.0.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-7.0.0.ebuild
deleted file mode 100644
index cf517c11..00000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-7.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-XORG_DRI=always
-inherit xorg-2
-
-DESCRIPTION="ATI video driver"
-
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="glamor udev"
-
-RDEPEND=">=x11-libs/libdrm-2.4.36[video_cards_radeon]
-	glamor? ( x11-libs/glamor )
-	udev? ( sys-fs/udev )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable glamor)
-		$(use_enable udev)
-	)
-	xorg-2_src_configure
-}
-
-pkg_preinst() {
-	# "untrack" radeon.conf, starting from kernel 3.6, this is
-	# no longer needed. However, we don't want to break the current
-	# status-quo.
-	cp "${EROOT}/etc/modprobe.d/"{radeon.conf,radeon.conf.untracked} || die
-}
-
-pkg_postinst() {
-	mv "${EROOT}/etc/modprobe.d/"{radeon.conf.untracked,radeon.conf} || die
-}
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-7.1.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-7.1.0.ebuild
deleted file mode 100644
index 7a553de5..00000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-7.1.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-XORG_DRI=always
-inherit xorg-2
-
-DESCRIPTION="ATI video driver"
-
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="glamor udev"
-
-RDEPEND=">=x11-libs/libdrm-2.4.36[video_cards_radeon]
-	glamor? ( x11-libs/glamor )
-	udev? ( virtual/udev )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable glamor)
-		$(use_enable udev)
-	)
-	xorg-2_src_configure
-}
-
-pkg_preinst() {
-	# "untrack" radeon.conf, starting from kernel 3.6, this is
-	# no longer needed. However, we don't want to break the current
-	# status-quo.
-	if [ -f "${EROOT}/etc/modprobe.d/radeon.conf" ]; then
-		cp "${EROOT}/etc/modprobe.d/"{radeon.conf,radeon.conf.untracked} || die
-	fi
-}
-
-pkg_postinst() {
-	if [ -f "${EROOT}/etc/modprobe.d/radeon.conf.untracked" ]; then
-		mv "${EROOT}/etc/modprobe.d/"{radeon.conf.untracked,radeon.conf} || die
-	fi
-}
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-7.2.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-7.2.0.ebuild
deleted file mode 100644
index e74243d3..00000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-7.2.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-7.2.0.ebuild,v 1.1 2013/08/07 13:36:09 chithanh Exp $
-
-EAPI=5
-
-XORG_DRI=always
-inherit linux-info xorg-2
-
-DESCRIPTION="ATI video driver"
-
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="glamor udev"
-
-RDEPEND=">=x11-libs/libdrm-2.4.46[video_cards_radeon]
-	glamor? ( x11-libs/glamor )
-	udev? ( virtual/udev )"
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-	if use kernel_linux ; then
-		if kernel_is -ge 3 9; then
-			CONFIG_CHECK="~!DRM_RADEON_UMS ~!FB_RADEON"
-		else
-			CONFIG_CHECK="~DRM_RADEON_KMS ~!FB_RADEON"
-		fi
-	fi
-	check_extra_config
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable glamor)
-		$(use_enable udev)
-	)
-	xorg-2_src_configure
-}
-
-pkg_preinst() {
-	# "untrack" radeon.conf, starting from kernel 3.6, this is
-	# no longer needed. However, we don't want to break the current
-	# status-quo.
-	if [ -f "${EROOT}/etc/modprobe.d/radeon.conf" ]; then
-		cp "${EROOT}/etc/modprobe.d/"{radeon.conf,radeon.conf.untracked} || die
-	fi
-}
-
-pkg_postinst() {
-	if [ -f "${EROOT}/etc/modprobe.d/radeon.conf.untracked" ]; then
-		mv "${EROOT}/etc/modprobe.d/"{radeon.conf.untracked,radeon.conf} || die
-	fi
-}
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
deleted file mode 100644
index 098de316..00000000
--- a/x11-drivers/xf86-video-intel/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST xf86-video-intel-2.20.0.tar.bz2 1552275 SHA256 21949297220ceda32bba430f778c6409002079dc717c7190dbd1062ab4a56783 SHA512 ebd51c6031c62d5ac93b03dde712b9918778e8a58891db0747747124c4956dde19d3bf3659979d7fcc1ff08268f347a162e1ee645151ba8d0b39b5f2f4256feb WHIRLPOOL f76d89456ba833c7e3a0d136fb81af58502368803b554ba413a5029581d074cbf5a3f97c28e77dd3dbe18de0fcd2d47c4f3e01c50b51cd7de050544ae248a590
-DIST xf86-video-intel-2.21.14.tar.bz2 1974275 SHA256 cc74d482dfd1f6b87773233a6d5c36118039b42fe7f8d99ee28bda7b78aa3b49 SHA512 34e7ecc5a99b6a0f711b154755c8dc5dabb56f04150ca7f02fd1a715347dd9cfc5851b2e3763c4e89b57f3e347975ed17630630e4e07efc690b2f314e6ab0f3a WHIRLPOOL 6af573563611169e17fe5ce47e45ea850f14264c4b56497ad38f08444196d907f8cb665cc6b5aeb62324af591af9d22004e3f92401d6f2c67428bd93e85a8300
diff --git a/x11-drivers/xf86-video-intel/metadata.xml b/x11-drivers/xf86-video-intel/metadata.xml
deleted file mode 100644
index fd322713..00000000
--- a/x11-drivers/xf86-video-intel/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>x11</herd>
-	<use>
-		<flag name="glamor">Enable Glamor OpenGL 2D acceleration</flag>
-		<flag name="sna">Enable SandyBridge's New Acceleration (useful on all chipsets, not just SandyBridge)</flag>
-		<flag name="uxa">Enable UMA Acceleration Architecture</flag>
-		<flag name="xvmc">Enables X-Video Motion Compensation support</flag>
-	</use>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.0.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.0.ebuild
deleted file mode 100644
index 0a6d950f..00000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.19.0.ebuild,v 1.7 2012/07/04 22:13:45 remi Exp $
-
-EAPI=4
-
-XORG_DRI=dri
-inherit linux-info xorg-2
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-KEYWORDS="amd64 ~ia64 x86 ~amd64-fbsd -x86-fbsd"
-IUSE="glamor sna"
-
-RDEPEND="x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXvMC
-	>=x11-libs/libxcb-1.5
-	x11-libs/xcb-util
-	>=x11-libs/libdrm-2.4.29[video_cards_intel]
-	glamor? (
-		x11-libs/glamor
-	)
-	sna? (
-		>=x11-base/xorg-server-1.10
-		>=x11-libs/pixman-0.24
-	)"
-DEPEND="${RDEPEND}
-	>=x11-proto/dri2proto-2.6"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	xorg-2_pkg_setup
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable dri)
-		$(use_enable glamor)
-		$(use_enable sna)
-		--enable-xvmc
-	)
-}
-
-pkg_postinst() {
-	if linux_config_exists \
-		&& ! linux_chkconfig_present DRM_I915_KMS; then
-		echo
-		ewarn "This driver requires KMS support in your kernel"
-		ewarn "  Device Drivers --->"
-		ewarn "    Graphics support --->"
-		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
-		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
-		ewarn "              i915 driver"
-		ewarn "      [*]       Enable modesetting on intel by default"
-		echo
-	fi
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.21.14.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.21.14.ebuild
deleted file mode 100644
index aec76630..00000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.21.14.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-XORG_DRI=dri
-inherit linux-info xorg-2
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
-IUSE="glamor +sna +udev uxa xvmc"
-
-REQUIRED_USE="|| ( glamor sna uxa )"
-
-RDEPEND="x11-libs/libXext
-	x11-libs/libXfixes
-	>=x11-libs/pixman-0.27.1
-	>=x11-libs/libdrm-2.4.29[video_cards_intel]
-	glamor? (
-		x11-libs/glamor
-	)
-	sna? (
-		>=x11-base/xorg-server-1.10
-	)
-	udev? (
-		virtual/udev
-	)
-	xvmc? (
-		x11-libs/libXvMC
-		>=x11-libs/libxcb-1.5
-		x11-libs/xcb-util
-	)
-"
-DEPEND="${RDEPEND}
-	>=x11-proto/dri2proto-2.6
-	x11-proto/resourceproto"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable dri)
-		$(use_enable glamor)
-		$(use_enable sna)
-		$(use_enable uxa)
-		$(use_enable udev)
-		$(use_enable xvmc)
-	)
-	xorg-2_src_configure
-}
-
-pkg_postinst() {
-	if linux_config_exists \
-		&& ! linux_chkconfig_present DRM_I915_KMS; then
-		echo
-		ewarn "This driver requires KMS support in your kernel"
-		ewarn "  Device Drivers --->"
-		ewarn "    Graphics support --->"
-		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
-		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
-		ewarn "	      i915 driver"
-		ewarn "      [*]       Enable modesetting on intel by default"
-		echo
-	fi
-}
diff --git a/x11-drivers/xf86-video-radeonhd/Manifest b/x11-drivers/xf86-video-radeonhd/Manifest
deleted file mode 100644
index 903fdd3e..00000000
--- a/x11-drivers/xf86-video-radeonhd/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-EBUILD xf86-video-radeonhd-9999.ebuild 806 SHA256 809185958da48ea3fb412f7e6627980643cc810aeb5c4f732176b13885cb9e7b SHA512 95088fc68797647443a6f800bd48b68975e88214e35cd4c36164a642d7b2fd7f271e6dfa718fe2dfe5262031621f68fd38936a4683d176d1f5755de2e7cae642 WHIRLPOOL 58353a2324c1c46d103b88585ed324b37fa6d7cb0e64f6cddbcda64b807f07cae71a7209500fde083d878f7c25a080fc404667c073486296e3fbf313e30a5295
diff --git a/x11-drivers/xf86-video-radeonhd/xf86-video-radeonhd-9999.ebuild b/x11-drivers/xf86-video-radeonhd/xf86-video-radeonhd-9999.ebuild
deleted file mode 100644
index 4e3c34ec..00000000
--- a/x11-drivers/xf86-video-radeonhd/xf86-video-radeonhd-9999.ebuild
+++ /dev/null
@@ -1,32 +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/xf86-video-radeonhd/xf86-video-radeonhd-1.2.1.ebuild,v 1.3 2008/04/15 15:07:12 drac Exp $
-
-EAPI="5"
-
-inherit git-r3 x-modular
-
-DESCRIPTION="Experimental Radeon HD video driver."
-HOMEPAGE="http://wiki.x.org/wiki/radeonhd"
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/xf86-video-radeonhd"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dri"
-
-RDEPEND=">=x11-base/xorg-server-1.3.0
-	sys-apps/pciutils
-	dri? ( >=media-libs/mesa-7.0.3 )"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto
-	dri? (
-		x11-proto/glproto
-		x11-proto/xf86driproto
-	)"
-
-src_install() {
-	x-modular_src_install
-	dobin utils/conntest/rhd_{conntest,dump}
-}