Bump to latest beta. Remove some old versions.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)

10 files changed, 14 insertions, 3097 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index c0b8210b27b0..7b9b33d58244 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.360 2014/06/02 13:33:12 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.361 2014/06/05 13:49:43 chithanh Exp $
+
+*ati-drivers-14.6_beta1 (05 Jun 2014)
+
+  05 Jun 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +ati-drivers-14.6_beta1.ebuild, -ati-drivers-13.10_beta.ebuild,
+  -ati-drivers-13.11_beta.ebuild, -ati-drivers-13.11_beta6.ebuild,
+  -ati-drivers-14.1_beta.ebuild, -ati-drivers-14.3_beta.ebuild,
+  -ati-drivers-14.4.ebuild, -files/ati-drivers-13.8-proc-permissions.diff,
+  -files/ati-drivers-old_rsp.patch, -files/ati-drivers-vm-reserverd.patch:
+  Bump to latest beta. Remove some old versions.
 
   02 Jun 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   ati-drivers-14.4_p1.ebuild:
diff --git a/x11-drivers/ati-drivers/ati-drivers-13.10_beta.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.10_beta.ebuild
deleted file mode 100644
index 9d32d62d4c45..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-13.10_beta.ebuild
+++ /dev/null
@@ -1,611 +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/ati-drivers/ati-drivers-13.10_beta.ebuild,v 1.1 2013/10/04 23:27:30 chithanh Exp $
-
-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="http://www2.ati.com/drivers/beta/amd-catalyst-13.10-beta2-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 +modules multilib qt4 static-libs pax_kernel"
-
-LICENSE="AMD GPL-2 QPL-1.0"
-KEYWORDS="-* ~amd64 ~x86"
-
-RESTRICT="bindist test"
-
-RDEPEND="
-	<=x11-base/xorg-server-1.14.49[-minimal]
-	>=app-admin/eselect-opengl-1.0.7
-	app-admin/eselect-opencl
-	sys-power/acpid
-	x11-apps/xauth
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	virtual/glu
-	multilib? (
-			app-emulation/emul-linux-x86-opengl
-			|| (
-				(
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-					x11-libs/libXinerama[abi_x86_32]
-					x11-libs/libXrandr[abi_x86_32]
-					x11-libs/libXrender[abi_x86_32]
-				)
-				app-emulation/emul-linux-x86-xlibs
-			)
-	)
-	qt4? (
-			x11-libs/libICE
-			x11-libs/libSM
-			x11-libs/libXcursor
-			x11-libs/libXfixes
-			x11-libs/libXxf86vm
-			dev-qt/qtcore:4
-			dev-qt/qtgui:4[accessibility]
-	)
-"
-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}"
-
-# 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
-"
-
-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
-	if use modules; then
-		linux-info_pkg_setup
-		require_configured_kernel
-		_check_kernel_config
-	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() {
-	if use modules; then
-		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
-	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}
-	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 modules; then
-		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
-	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"
-
-	# in this version amdcccle isn't static, thus we depend on qt4
-	use qt4 || rm "${ARCH_DIR}"/usr/X11R6/bin/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"
-
-	epatch "${FILESDIR}/check-for-iommu-only-if-iommu-is-supported.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"
-
-	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() {
-	use modules && linux-mod_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() {
-	use modules && linux-mod_src_install
-
-	# We can do two things here, and neither of them is very nice.
-
-	# For direct rendering libGL has to be able to load one or more
-	# dri modules (files ending in _dri.so, like fglrx_dri.so).
-	# Gentoo's mesa looks for these files in the location specified by
-	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
-	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
-	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
-	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
-	# 64bit. So we can either put the .so files in that (unusual,
-	# compared to "normal" mesa libGL) location or set
-	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
-	# 101539.
-
-	# The problem with this approach is that LIBGL_DRIVERS_PATH
-	# *overrides* the default hardcoded location, it does not extend
-	# it. So if ati-drivers is merged but a non-ati libGL is selected
-	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
-	# (because it changed in a newer mesa or because it was compiled
-	# for a different set of multilib abis than we are) stuff breaks.
-
-	# We create one file per ABI to work with "native" multilib, see
-	# below.
-
-	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
-	doenvd "${T}/03ati-colon-sep" || 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 qt4 && dosbin "${ARCH_DIR}"/usr/sbin/amdnotifyui
-	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/*
-
-	# data files for the control panel.
-	if use qt4 ; then
-		insinto /usr/share
-		doins -r ${FOLDER_PREFIX}usr/share/ati
-		insinto /usr/share/pixmaps
-		doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm
-		make_desktop_entry amdcccle 'AMD Catalyst Control Center' \
-			ccc_large System
-	fi
-
-	# 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
-
-	use modules && linux-mod_pkg_postinst
-	"${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_preinst() {
-	use modules && linux-mod_pkg_preinst
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use modules && linux-mod_pkg_postrm
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-13.11_beta.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.11_beta.ebuild
deleted file mode 100644
index 49d072d68c7b..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-13.11_beta.ebuild
+++ /dev/null
@@ -1,604 +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/ati-drivers/ati-drivers-13.11_beta.ebuild,v 1.1 2013/10/10 15:57:37 chithanh Exp $
-
-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"
-DRIVERS_URI="http://www2.ati.com/drivers/beta/amd-catalyst-13.11-betav1-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 +modules multilib qt4 static-libs pax_kernel"
-
-LICENSE="AMD GPL-2 QPL-1.0"
-KEYWORDS="-* ~amd64 ~x86"
-
-RESTRICT="bindist test"
-
-RDEPEND="
-	<=x11-base/xorg-server-1.14.49[-minimal]
-	>=app-admin/eselect-opengl-1.0.7
-	app-admin/eselect-opencl
-	sys-power/acpid
-	x11-apps/xauth
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	virtual/glu
-	multilib? (
-			app-emulation/emul-linux-x86-opengl
-			|| (
-				(
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-					x11-libs/libXinerama[abi_x86_32]
-					x11-libs/libXrandr[abi_x86_32]
-					x11-libs/libXrender[abi_x86_32]
-				)
-				app-emulation/emul-linux-x86-xlibs
-			)
-	)
-	qt4? (
-			x11-libs/libICE
-			x11-libs/libSM
-			x11-libs/libXcursor
-			x11-libs/libXfixes
-			x11-libs/libXxf86vm
-			dev-qt/qtcore:4
-			dev-qt/qtgui:4[accessibility]
-	)
-"
-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}"
-
-# 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_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
-	if use modules; then
-		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
-	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() {
-	if use modules; then
-		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
-	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}
-	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 modules; then
-		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
-	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"
-
-	# in this version amdcccle isn't static, thus we depend on qt4
-	use qt4 || rm "${ARCH_DIR}"/usr/X11R6/bin/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"
-
-	epatch "${FILESDIR}/check-for-iommu-only-if-iommu-is-supported.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"
-
-	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() {
-	use modules && linux-mod_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() {
-	use modules && linux-mod_src_install
-
-	# We can do two things here, and neither of them is very nice.
-
-	# For direct rendering libGL has to be able to load one or more
-	# dri modules (files ending in _dri.so, like fglrx_dri.so).
-	# Gentoo's mesa looks for these files in the location specified by
-	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
-	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
-	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
-	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
-	# 64bit. So we can either put the .so files in that (unusual,
-	# compared to "normal" mesa libGL) location or set
-	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
-	# 101539.
-
-	# The problem with this approach is that LIBGL_DRIVERS_PATH
-	# *overrides* the default hardcoded location, it does not extend
-	# it. So if ati-drivers is merged but a non-ati libGL is selected
-	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
-	# (because it changed in a newer mesa or because it was compiled
-	# for a different set of multilib abis than we are) stuff breaks.
-
-	# We create one file per ABI to work with "native" multilib, see
-	# below.
-
-	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
-	doenvd "${T}/03ati-colon-sep" || 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 qt4 && dosbin "${ARCH_DIR}"/usr/sbin/amdnotifyui
-	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/*
-
-	# data files for the control panel.
-	if use qt4 ; then
-		insinto /usr/share
-		doins -r ${FOLDER_PREFIX}usr/share/ati
-		insinto /usr/share/pixmaps
-		doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm
-		make_desktop_entry amdcccle 'AMD Catalyst Control Center' \
-			ccc_large System
-	fi
-
-	# 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
-
-	use modules && linux-mod_pkg_postinst
-	"${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_preinst() {
-	use modules && linux-mod_pkg_preinst
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use modules && linux-mod_pkg_postrm
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-13.11_beta6.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.11_beta6.ebuild
deleted file mode 100644
index 876b6bec246e..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-13.11_beta6.ebuild
+++ /dev/null
@@ -1,604 +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/ati-drivers/ati-drivers-13.11_beta6.ebuild,v 1.1 2013/11/10 18:46:58 chithanh Exp $
-
-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"
-DRIVERS_URI="http://www2.ati.com/drivers/beta/amd-catalyst-13.11-beta6-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 +modules multilib qt4 static-libs pax_kernel"
-
-LICENSE="AMD GPL-2 QPL-1.0"
-KEYWORDS="-* ~amd64 ~x86"
-
-RESTRICT="bindist test"
-
-RDEPEND="
-	<=x11-base/xorg-server-1.14.49[-minimal]
-	>=app-admin/eselect-opengl-1.0.7
-	app-admin/eselect-opencl
-	sys-power/acpid
-	x11-apps/xauth
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	virtual/glu
-	multilib? (
-			app-emulation/emul-linux-x86-opengl
-			|| (
-				(
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-					x11-libs/libXinerama[abi_x86_32]
-					x11-libs/libXrandr[abi_x86_32]
-					x11-libs/libXrender[abi_x86_32]
-				)
-				app-emulation/emul-linux-x86-xlibs
-			)
-	)
-	qt4? (
-			x11-libs/libICE
-			x11-libs/libSM
-			x11-libs/libXcursor
-			x11-libs/libXfixes
-			x11-libs/libXxf86vm
-			dev-qt/qtcore:4
-			dev-qt/qtgui:4[accessibility]
-	)
-"
-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}"
-
-# 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_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
-	if use modules; then
-		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
-	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() {
-	if use modules; then
-		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
-	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}
-	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 modules; then
-		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
-	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"
-
-	# in this version amdcccle isn't static, thus we depend on qt4
-	use qt4 || rm "${ARCH_DIR}"/usr/X11R6/bin/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"
-
-	epatch "${FILESDIR}/check-for-iommu-only-if-iommu-is-supported.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"
-
-	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() {
-	use modules && linux-mod_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() {
-	use modules && linux-mod_src_install
-
-	# We can do two things here, and neither of them is very nice.
-
-	# For direct rendering libGL has to be able to load one or more
-	# dri modules (files ending in _dri.so, like fglrx_dri.so).
-	# Gentoo's mesa looks for these files in the location specified by
-	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
-	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
-	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
-	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
-	# 64bit. So we can either put the .so files in that (unusual,
-	# compared to "normal" mesa libGL) location or set
-	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
-	# 101539.
-
-	# The problem with this approach is that LIBGL_DRIVERS_PATH
-	# *overrides* the default hardcoded location, it does not extend
-	# it. So if ati-drivers is merged but a non-ati libGL is selected
-	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
-	# (because it changed in a newer mesa or because it was compiled
-	# for a different set of multilib abis than we are) stuff breaks.
-
-	# We create one file per ABI to work with "native" multilib, see
-	# below.
-
-	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
-	doenvd "${T}/03ati-colon-sep" || 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 qt4 && dosbin "${ARCH_DIR}"/usr/sbin/amdnotifyui
-	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/*
-
-	# data files for the control panel.
-	if use qt4 ; then
-		insinto /usr/share
-		doins -r ${FOLDER_PREFIX}usr/share/ati
-		insinto /usr/share/pixmaps
-		doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm
-		make_desktop_entry amdcccle 'AMD Catalyst Control Center' \
-			ccc_large System
-	fi
-
-	# 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
-
-	use modules && linux-mod_pkg_postinst
-	"${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_preinst() {
-	use modules && linux-mod_pkg_preinst
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use modules && linux-mod_pkg_postrm
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-14.1_beta.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.1_beta.ebuild
deleted file mode 100644
index f71db083e9a7..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-14.1_beta.ebuild
+++ /dev/null
@@ -1,611 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.1_beta.ebuild,v 1.1 2014/02/16 20:14:17 chithanh Exp $
-
-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-13.35.1005-x86.x86_64.run"
-SLOT="1"
-# Uses javascript for download YESSSS
-DRIVERS_URI="http://www2.ati.com/drivers/beta/amd-catalyst-14.1-betav1.3-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 +modules multilib qt4 static-libs pax_kernel"
-
-LICENSE="AMD GPL-2 QPL-1.0"
-KEYWORDS="-* ~amd64 ~x86"
-
-RESTRICT="bindist test"
-
-RDEPEND="
-	<=x11-base/xorg-server-1.15.49[-minimal]
-	>=app-admin/eselect-opengl-1.0.7
-	app-admin/eselect-opencl
-	sys-power/acpid
-	x11-apps/xauth
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	virtual/glu
-	multilib? (
-			app-emulation/emul-linux-x86-opengl
-			|| (
-				(
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-					x11-libs/libXinerama[abi_x86_32]
-					x11-libs/libXrandr[abi_x86_32]
-					x11-libs/libXrender[abi_x86_32]
-				)
-				app-emulation/emul-linux-x86-xlibs
-			)
-	)
-	qt4? (
-			x11-libs/libICE
-			x11-libs/libSM
-			x11-libs/libXcursor
-			x11-libs/libXfixes
-			x11-libs/libXxf86vm
-			dev-qt/qtcore:4
-			dev-qt/qtgui:4[accessibility]
-	)
-"
-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}"
-
-# 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_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
-	if use modules; then
-		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
-	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() {
-	if use modules; then
-		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
-	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}
-	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 modules; then
-		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
-	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"
-
-	# in this version amdcccle isn't static, thus we depend on qt4
-	use qt4 || rm "${ARCH_DIR}"/usr/X11R6/bin/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"
-
-	epatch "${FILESDIR}/check-for-iommu-only-if-iommu-is-supported.patch"
-
-	# Fix #483400
-	epatch "${FILESDIR}/fgl_glxgears-do-not-include-glATI.patch"
-
-	# Fix build on new kernels
-	#epatch "${FILESDIR}/ati-drivers-13.12-acpi.patch"
-
-	# Add support for linux-3.13. See #498766
-	#epatch "${FILESDIR}/ati-drivers-linux-3.13-acpi-handle.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"
-}
-
-src_compile() {
-	use modules && linux-mod_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() {
-	use modules && linux-mod_src_install
-
-	# We can do two things here, and neither of them is very nice.
-
-	# For direct rendering libGL has to be able to load one or more
-	# dri modules (files ending in _dri.so, like fglrx_dri.so).
-	# Gentoo's mesa looks for these files in the location specified by
-	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
-	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
-	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
-	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
-	# 64bit. So we can either put the .so files in that (unusual,
-	# compared to "normal" mesa libGL) location or set
-	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
-	# 101539.
-
-	# The problem with this approach is that LIBGL_DRIVERS_PATH
-	# *overrides* the default hardcoded location, it does not extend
-	# it. So if ati-drivers is merged but a non-ati libGL is selected
-	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
-	# (because it changed in a newer mesa or because it was compiled
-	# for a different set of multilib abis than we are) stuff breaks.
-
-	# We create one file per ABI to work with "native" multilib, see
-	# below.
-
-	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
-	doenvd "${T}/03ati-colon-sep" || 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 qt4 && dosbin "${ARCH_DIR}"/usr/sbin/amdnotifyui
-	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/*
-
-	# data files for the control panel.
-	if use qt4 ; then
-		insinto /usr/share
-		doins -r ${FOLDER_PREFIX}usr/share/ati
-		insinto /usr/share/pixmaps
-		doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm
-		make_desktop_entry amdcccle 'AMD Catalyst Control Center' \
-			ccc_large System
-	fi
-
-	# 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
-
-	use modules && linux-mod_pkg_postinst
-	"${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_preinst() {
-	use modules && linux-mod_pkg_preinst
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use modules && linux-mod_pkg_postrm
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-14.3_beta.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.3_beta.ebuild
deleted file mode 100644
index a7c4efa71e6d..000000000000
--- a/x11-drivers/ati-drivers/ati-drivers-14.3_beta.ebuild
+++ /dev/null
@@ -1,614 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.3_beta.ebuild,v 1.1 2014/03/27 19:02:32 chithanh Exp $
-
-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-13.35.1005/amd-driver-installer-13.35.1005-x86.x86_64.run"
-SLOT="1"
-# Uses javascript for download YESSSS
-#DRIVERS_URI="http://www2.ati.com/drivers/beta/Linux_AMD_Catalyst_14.3_Beta_V1.0_B22_March12_2014.zip"
-DRIVERS_URI="mirror://gentoo/Linux_AMD_Catalyst_14.3_Beta_V1.0_B22_March12_2014.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 +modules multilib qt4 static-libs pax_kernel"
-
-LICENSE="AMD GPL-2 QPL-1.0"
-KEYWORDS="-* ~amd64 ~x86"
-
-RESTRICT="bindist test"
-
-RDEPEND="
-	<=x11-base/xorg-server-1.15.49[-minimal]
-	>=app-admin/eselect-opengl-1.0.7
-	app-admin/eselect-opencl
-	sys-power/acpid
-	x11-apps/xauth
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	virtual/glu
-	multilib? (
-			app-emulation/emul-linux-x86-opengl
-			|| (
-				(
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-					x11-libs/libXinerama[abi_x86_32]
-					x11-libs/libXrandr[abi_x86_32]
-					x11-libs/libXrender[abi_x86_32]
-				)
-				app-emulation/emul-linux-x86-xlibs
-			)
-	)
-	qt4? (
-			x11-libs/libICE
-			x11-libs/libSM
-			x11-libs/libXcursor
-			x11-libs/libXfixes
-			x11-libs/libXxf86vm
-			dev-qt/qtcore:4
-			dev-qt/qtgui:4[accessibility]
-	)
-"
-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}"
-
-# 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_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
-	if use modules; then
-		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
-	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() {
-	if use modules; then
-		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
-	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}
-	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 modules; then
-		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
-	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"
-
-	# in this version amdcccle isn't static, thus we depend on qt4
-	use qt4 || rm "${ARCH_DIR}"/usr/X11R6/bin/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"
-
-	epatch "${FILESDIR}/check-for-iommu-only-if-iommu-is-supported.patch"
-
-	# Fix #483400
-	epatch "${FILESDIR}/fgl_glxgears-do-not-include-glATI.patch"
-
-	# Fix build on new kernels
-	#epatch "${FILESDIR}/ati-drivers-13.12-acpi.patch"
-
-	# Add support for linux-3.13. See #498766
-	#epatch "${FILESDIR}/ati-drivers-linux-3.13-acpi-handle.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"
-}
-
-src_compile() {
-	use modules && linux-mod_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() {
-	use modules && linux-mod_src_install
-
-	# We can do two things here, and neither of them is very nice.
-
-	# For direct rendering libGL has to be able to load one or more
-	# dri modules (files ending in _dri.so, like fglrx_dri.so).
-	# Gentoo's mesa looks for these files in the location specified by
-	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
-	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
-	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
-	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
-	# 64bit. So we can either put the .so files in that (unusual,
-	# compared to "normal" mesa libGL) location or set
-	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
-	# 101539.
-
-	# The problem with this approach is that LIBGL_DRIVERS_PATH
-	# *overrides* the default hardcoded location, it does not extend
-	# it. So if ati-drivers is merged but a non-ati libGL is selected
-	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
-	# (because it changed in a newer mesa or because it was compiled
-	# for a different set of multilib abis than we are) stuff breaks.
-
-	# We create one file per ABI to work with "native" multilib, see
-	# below.
-
-	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
-	doenvd "${T}/03ati-colon-sep" || 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 qt4 && dosbin "${ARCH_DIR}"/usr/sbin/amdnotifyui
-	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/*
-
-	# data files for the control panel.
-	if use qt4 ; then
-		insinto /usr/share
-		doins -r ${FOLDER_PREFIX}usr/share/ati
-		insinto /usr/share/pixmaps
-		doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm
-		make_desktop_entry amdcccle 'AMD Catalyst Control Center' \
-			ccc_large System
-	fi
-
-	# 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
-
-	use modules && linux-mod_pkg_postinst
-	"${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_preinst() {
-	use modules && linux-mod_pkg_preinst
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use modules && linux-mod_pkg_postrm
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-drivers/ati-drivers-14.4.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.6_beta1.ebuild
index a18871e41328..43e8597df99b 100644
--- a/x11-drivers/ati-drivers/ati-drivers-14.4.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-14.6_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.4.ebuild,v 1.2 2014/05/25 20:22:09 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.6_beta1.ebuild,v 1.1 2014/06/05 13:49:43 chithanh Exp $
 
 EAPI=5
 
@@ -8,11 +8,11 @@ inherit eutils multilib linux-info linux-mod toolchain-funcs versionator pax-uti
 
 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"
+RUN="${WORKDIR}/fglrx-14.20/amd-driver-installer-14.20-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-14-4-linux-x86-x86-64.zip"
+DRIVERS_URI="mirror://gentoo/linux-amd-catalyst-14.6-beta-v1.0-may23.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/"
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-13.8-proc-permissions.diff b/x11-drivers/ati-drivers/files/ati-drivers-13.8-proc-permissions.diff
deleted file mode 100644
index 26015f41381f..000000000000
--- a/x11-drivers/ati-drivers/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-drivers/files/ati-drivers-old_rsp.patch b/x11-drivers/ati-drivers/files/ati-drivers-old_rsp.patch
deleted file mode 100644
index 0456bd6b2f94..000000000000
--- 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-vm-reserverd.patch b/x11-drivers/ati-drivers/files/ati-drivers-vm-reserverd.patch
deleted file mode 100644
index 08045a65d9db..000000000000
--- 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 */