Merge remote-tracking branch 'upstream/master'

4 files changed, 792 insertions, 0 deletions

diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index b0172763..515df79a 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -10,6 +10,7 @@ DIST amd-driver-installer-12-4-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af
 DIST amd-driver-installer-12-6-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
 DIST amd-driver-installer-12-8-x86.x86_64.zip 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
 DIST amd-driver-installer-12.6-legacy-x86.x86_64.zip 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
+DIST amd-driver-installer-15.20.1046-x86.x86_64.zip 51988 SHA256 7a967062bfed30c50f757e649f01d558393d0e2cd9e5fc71e93ece97ff7f877a SHA512 97fdceba59d5914b464fcb1c33242307c3d939552f7de93882d0b4701673609974d790380e0a33890f736393d6d2999bbd1d8118ec3e87145eb6d091b1e7b0c1 WHIRLPOOL 1cbb3f7934f5f9dabdddbfff2241f3bf1d39c33bcb3bc80d0a99dcf030d376c996aeb559f7ec5a84dd782b389c0c70f0a74f2f08fa2e6906f0515a74168730d9
 DIST amd-driver-installer-catalyst-12.10-x86.x86_64.zip 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
 DIST amd-driver-installer-catalyst-13.1-linux-x86.x86_64.zip 114850263 SHA256 67898a922b6b58f25a276a144f16b19014f79c39e4d44d8d2883a467d31e34ad SHA512 30763ab7f47ac22c5b5055495e2d8ae6cc2c8e5ce711fa389f1145a48da2799020c2b8cbf082759d93628017860c39d69337f42ce21b78e1d60c9eda32096df9 WHIRLPOOL ee5dc85a89bc56858ef1c2bcdc6cbfde7e2f9e5675d209c1f6db877e0104cc536f1e18139f0b991a064b14b231a982770eef47368ea281067d62647b4c5365a5
 DIST ati-driver-installer-11-10-x86.x86_64.run 50201 SHA256 a8136110a0117cdfb29f1ce7f4a9ffe42fb2132ef2388baffe0d9922f4d50bfb SHA512 0cdde584ed578d5da11335c1d2e4189b1f3f54f8e8ac4b49e07e66014b79a06c146686519dc6615a83bdccff627d9a940a5d55eb73afff2c5ca710267d8f52aa WHIRLPOOL 088d5d4a8a1851e4da879d8d39188271ef7f302d2cd0615b4c54def147f5e8ec1bd026beb8f36abd0941a57e7d57fb9865bae93d09ebd987825df11ce66fda9a
diff --git a/x11-drivers/ati-drivers/ati-drivers-15.7.ebuild b/x11-drivers/ati-drivers/ati-drivers-15.7.ebuild
new file mode 100644
index 00000000..b77bf26c
--- /dev/null
+++ b/x11-drivers/ati-drivers/ati-drivers-15.7.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit eutils multilib-build linux-info linux-mod toolchain-funcs versionator pax-utils
+
+DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets"
+HOMEPAGE="http://www.amd.com"
+#RUN="${WORKDIR}/fglrx-14.501.1003/amd-driver-installer-14.501.1003-x86.x86_64.run"
+SLOT="1"
+# Uses javascript for download YESSSS
+#DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip"
+DRIVERS_URI="mirror://gentoo/amd-driver-installer-15.20.1046-x86.x86_64.zip http://www2.ati.com/drivers/linux/amd-driver-installer-15.20.1046-x86.x86_64.zip"
+XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"
+SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
+FOLDER_PREFIX="common/"
+IUSE="debug static-libs pax_kernel"
+
+LICENSE="AMD GPL-2 QPL-1.0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RESTRICT="bindist test"
+
+RDEPEND="
+	~x11-drivers/ati-userspace-${PV}
+"
+if [[ legacy != ${SLOT} ]]; then
+	RDEPEND="${RDEPEND}
+		!x11-drivers/ati-drivers:legacy"
+else
+	RDEPEND="${RDEPEND}
+		!x11-drivers/ati-drivers:1"
+fi
+
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/xf86miscproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xineramaproto
+	x11-libs/libXtst
+	sys-apps/findutils
+	app-misc/pax-utils
+	app-arch/unzip
+"
+
+EMULTILIB_PKG="true"
+
+S="${WORKDIR}"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR"
+	use amd64 && CONFIG_CHECK+=" COMPAT"
+
+	local ERROR_MTRR="CONFIG_MTRR required for direct rendering."
+	local ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module and not loaded for direct
+		rendering to work."
+	local ERROR_LOCKDEP="CONFIG_LOCKDEP (lock tracking) exports the symbol lock_acquire
+		as GPL-only. This prevents ${P} from compiling with an error like this:
+		FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
+	local ERROR_PAX_KERNEXEC_PLUGIN_METHOD_OR="This config option will cause
+		kernel to reject loading the fglrx module with
+		\"ERROR: could not insert 'fglrx': Exec format error.\"
+		You may want to try CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS instead."
+	local ERROR_BKL="CONFIG_BKL must be enabled for kernels 2.6.37-2.6.38."
+
+	if ! has XT ${PAX_MARKINGS} && use pax_kernel; then
+		ewarn "You have disabled xattr pax markings for portage."
+		ewarn "This will likely cause programs using ati-drivers provided"
+		ewarn "libraries to be killed kernel."
+	fi
+}
+
+pkg_setup() {
+	MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod/2.6.x)"
+	BUILD_TARGETS="kmod_build"
+	linux-mod_pkg_setup
+	BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_OUT_DIR}"
+	BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
+	if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
+		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
+	else
+		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
+	fi
+
+	# Define module dir.
+	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
+	# get the xorg-server version and set BASE_DIR for that
+	BASE_DIR="${S}/xpic"
+
+	# amd64/x86
+	if use amd64 ; then
+		MY_BASE_DIR="${BASE_DIR}_64a"
+		PKG_LIBDIR=lib64
+		ARCH_DIR="${S}/arch/x86_64"
+	else
+		MY_BASE_DIR="${BASE_DIR}"
+		PKG_LIBDIR=lib
+		ARCH_DIR="${S}/arch/x86"
+	fi
+
+	elog
+	elog "Please note that this driver only supports graphic cards based on"
+	elog "Evergreen chipset and newer."
+	elog "This includes the AMD Radeon HD 5400+ series at this moment."
+	elog
+	elog "If your card is older then use ${CATEGORY}/xf86-video-ati"
+	elog "For migration informations please refer to:"
+	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
+	einfo
+}
+
+src_unpack() {
+	local DRIVERS_DISTFILE XVBA_SDK_DISTFILE
+	DRIVERS_DISTFILE=${DRIVERS_URI##*/}
+	XVBA_SDK_DISTFILE=${XVBA_SDK_URI##*/}
+
+	if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then
+		unpack ${DRIVERS_DISTFILE}
+		mkdir -p common
+		mv etc lib usr common || die "Assumed to find etc lib and usr for common"
+	else
+		#please note, RUN may be insanely assigned at top near SRC_URI
+		if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then
+			unpack ${DRIVERS_DISTFILE}
+			[[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}"
+		else
+			RUN="${DISTDIR}/${DRIVERS_DISTFILE}"
+		fi
+		sh "${RUN}" --extract "${S}" 2>&1 > /dev/null || die
+	fi
+
+	mkdir xvba_sdk
+	cd xvba_sdk
+	unpack ${XVBA_SDK_DISTFILE}
+
+	mkdir -p "${WORKDIR}/extra" || die "mkdir extra failed"
+	cd "${WORKDIR}/extra"
+	tar -xf "../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz"
+}
+
+src_prepare() {
+	if use debug; then
+		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
+			"${MODULE_DIR}/firegl_public.c" \
+			|| die "Failed to enable debug output."
+	fi
+
+
+	# These are the userspace utilities that we also have source for.
+	# We rebuild these later.
+	rm \
+		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
+		|| die "bin rm failed"
+
+
+	# ACPI fixups
+	sed -i \
+		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
+		-e "s:/var/lib/gdm/:/var/gdm/:" \
+		"${S}/${FOLDER_PREFIX}etc/ati/authatieventsd.sh" \
+		|| die "ACPI fixups failed."
+
+	# Since "who" is in coreutils, we're using that one instead of "finger".
+	sed -i -e 's:finger:who:' \
+		"${S}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
+		|| die "Replacing 'finger' with 'who' failed."
+	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
+	# add function to detect default state.
+	epatch "${FILESDIR}"/ati-powermode-opt-path-3.patch
+
+	# see http://ati.cchtml.com/show_bug.cgi?id=495
+	#epatch "${FILESDIR}"/ati-drivers-old_rsp.patch
+	# first hunk applied upstream second (x32 related) was not
+	epatch "${FILESDIR}"/ati-drivers-x32_something_something.patch
+
+	# compile fix for AGP-less kernel, bug #435322
+	epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch
+
+	epatch "${FILESDIR}/ati-drivers-13.8-beta-include-seq_file.patch"
+
+	# Fix #483400
+	epatch "${FILESDIR}/fgl_glxgears-do-not-include-glATI.patch"
+
+	# Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870
+	use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch"
+
+	# Compile fix, #526602
+	epatch "${FILESDIR}/use-kernel_fpu_begin.patch"
+
+
+	# Linux < 4.0 support
+	epatch "${FILESDIR}/${PN}-linux-4.0.patch"
+
+	# Linux 4.0, 4.1 support
+	if kernel_is ge 3 18; then
+		epatch "${FILESDIR}/${P}-linux-3.19-4.0.patch"
+	fi
+
+	if kernel_is ge 4 1; then
+		epatch "${FILESDIR}/${P}-linux-4.1.patch"
+	fi
+
+	epatch_user
+
+	cd "${MODULE_DIR}"
+
+	# bugged fglrx build system, this file should be copied by hand
+	cp ${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
+
+	convert_to_m 2.6.x/Makefile || die "convert_to_m failed"
+
+	# When built with ati's make.sh it defines a bunch of macros if
+	# certain .config values are set, falling back to less reliable
+	# detection methods if linux/autoconf.h is not available. We
+	# simply use the linux/autoconf.h settings directly, bypassing the
+	# detection script.
+	sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
+	sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
+		|| die "MODVERSIONS sed failed"
+}
+
+src_compile() {
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+}
+
+pkg_postinst() {
+	elog "To switch to AMD OpenGL, run \"eselect opengl set ati\""
+	elog "To change your xorg.conf you can use the bundled \"aticonfig\""
+	elog
+	elog "If you experience unexplained segmentation faults and kernel crashes"
+	elog "with this driver and multi-threaded applications such as wine,"
+	elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
+	elog
+	elog "Fully rebooting the system after an ${PN} update is recommended"
+	elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
+	elog "might not work"
+	elog
+	elog "Some cards need acpid running to handle events"
+	elog "Please add it to boot runlevel with rc-update add acpid boot"
+	elog
+	linux-mod_pkg_postinst
+}
+
+pkg_prerm() {
+	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_preinst() {
+	linux-mod_pkg_preinst
+}
+
+pkg_postrm() {
+	linux-mod_pkg_postrm
+}
diff --git a/x11-drivers/ati-userspace/Manifest b/x11-drivers/ati-userspace/Manifest
index b0172763..515df79a 100644
--- a/x11-drivers/ati-userspace/Manifest
+++ b/x11-drivers/ati-userspace/Manifest
@@ -10,6 +10,7 @@ DIST amd-driver-installer-12-4-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af
 DIST amd-driver-installer-12-6-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
 DIST amd-driver-installer-12-8-x86.x86_64.zip 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
 DIST amd-driver-installer-12.6-legacy-x86.x86_64.zip 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
+DIST amd-driver-installer-15.20.1046-x86.x86_64.zip 51988 SHA256 7a967062bfed30c50f757e649f01d558393d0e2cd9e5fc71e93ece97ff7f877a SHA512 97fdceba59d5914b464fcb1c33242307c3d939552f7de93882d0b4701673609974d790380e0a33890f736393d6d2999bbd1d8118ec3e87145eb6d091b1e7b0c1 WHIRLPOOL 1cbb3f7934f5f9dabdddbfff2241f3bf1d39c33bcb3bc80d0a99dcf030d376c996aeb559f7ec5a84dd782b389c0c70f0a74f2f08fa2e6906f0515a74168730d9
 DIST amd-driver-installer-catalyst-12.10-x86.x86_64.zip 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
 DIST amd-driver-installer-catalyst-13.1-linux-x86.x86_64.zip 114850263 SHA256 67898a922b6b58f25a276a144f16b19014f79c39e4d44d8d2883a467d31e34ad SHA512 30763ab7f47ac22c5b5055495e2d8ae6cc2c8e5ce711fa389f1145a48da2799020c2b8cbf082759d93628017860c39d69337f42ce21b78e1d60c9eda32096df9 WHIRLPOOL ee5dc85a89bc56858ef1c2bcdc6cbfde7e2f9e5675d209c1f6db877e0104cc536f1e18139f0b991a064b14b231a982770eef47368ea281067d62647b4c5365a5
 DIST ati-driver-installer-11-10-x86.x86_64.run 50201 SHA256 a8136110a0117cdfb29f1ce7f4a9ffe42fb2132ef2388baffe0d9922f4d50bfb SHA512 0cdde584ed578d5da11335c1d2e4189b1f3f54f8e8ac4b49e07e66014b79a06c146686519dc6615a83bdccff627d9a940a5d55eb73afff2c5ca710267d8f52aa WHIRLPOOL 088d5d4a8a1851e4da879d8d39188271ef7f302d2cd0615b4c54def147f5e8ec1bd026beb8f36abd0941a57e7d57fb9865bae93d09ebd987825df11ce66fda9a
diff --git a/x11-drivers/ati-userspace/ati-userspace-15.7.ebuild b/x11-drivers/ati-userspace/ati-userspace-15.7.ebuild
new file mode 100644
index 00000000..5663f751
--- /dev/null
+++ b/x11-drivers/ati-userspace/ati-userspace-15.7.ebuild
@@ -0,0 +1,529 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit eutils multilib-build linux-info linux-mod toolchain-funcs versionator pax-utils
+
+DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets"
+HOMEPAGE="http://www.amd.com"
+#RUN="${WORKDIR}/fglrx-14.501.1003/amd-driver-installer-14.501.1003-x86.x86_64.run"
+SLOT="1"
+# Uses javascript for download YESSSS
+#DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip"
+DRIVERS_URI="mirror://gentoo/amd-driver-installer-15.20.1046-x86.x86_64.zip"
+XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"
+SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
+FOLDER_PREFIX="common/"
+IUSE="debug static-libs pax_kernel +gdm-hack"
+
+LICENSE="AMD GPL-2 QPL-1.0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RESTRICT="bindist test"
+
+RDEPEND="
+    <=x11-base/xorg-server-1.17.49[-minimal]
+    >=app-eselect/eselect-opengl-1.0.7
+    app-eselect/eselect-opencl
+    sys-power/acpid
+    x11-apps/xauth
+    !x11-libs/xvba-video
+    virtual/glu[${MULTILIB_USEDEP}]
+    x11-libs/libX11[${MULTILIB_USEDEP}]
+    x11-libs/libXext[${MULTILIB_USEDEP}]
+    x11-libs/libXinerama[${MULTILIB_USEDEP}]
+    x11-libs/libXrandr[${MULTILIB_USEDEP}]
+    x11-libs/libXrender[${MULTILIB_USEDEP}]
+    gdm-hack? (
+        x11-base/xorg-server:=
+    )
+"
+
+DEPEND="${RDEPEND}
+    x11-proto/inputproto
+    x11-proto/xf86miscproto
+    x11-proto/xf86vidmodeproto
+    x11-proto/xineramaproto
+    x11-libs/libXtst
+    sys-apps/findutils
+    app-misc/pax-utils
+    app-arch/unzip
+"
+
+EMULTILIB_PKG="true"
+
+S="${WORKDIR}"
+
+# QA Silencing
+QA_TEXTRELS="
+    usr/lib*/opengl/ati/lib/libGL.so.1.2
+    usr/lib*/libatiadlxx.so
+    usr/lib*/xorg/modules/glesx.so
+    usr/lib*/libaticaldd.so
+    usr/lib*/dri/fglrx_dri.so
+"
+
+QA_EXECSTACK="
+    opt/bin/atiode
+    usr/lib*/opengl/ati/lib/libGL.so.1.2
+    usr/lib*/dri/fglrx_dri.so
+"
+
+QA_WX_LOAD="
+    usr/lib*/opengl/ati/lib/libGL.so.1.2
+    usr/lib*/dri/fglrx_dri.so
+"
+
+QA_PRESTRIPPED="
+    usr/lib\(32\|64\)\?/libXvBAW.so.1.0
+    usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
+    usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
+    usr/lib\(32\|64\)\?/xorg/modules/glesx.so
+    usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
+    usr/lib\(32\|64\)\?/libaticaldd.so
+    usr/lib\(32\|64\)\?/dri/fglrx_dri.so
+    usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
+    usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\).so
+"
+
+QA_SONAME="
+    usr/lib\(32\|64\)\?/libatiadlxx.so
+    usr/lib\(32\|64\)\?/libaticalcl.so
+    usr/lib\(32\|64\)\?/libaticaldd.so
+    usr/lib\(32\|64\)\?/libaticalrt.so
+    usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
+    usr/lib\(32\|64\)\?/libamdhsasc\(32\|64\)\?.so
+"
+
+QA_DT_HASH="e
+    opt/bin/aticonfig
+    opt/bin/atiodcli
+    opt/bin/atiode
+    opt/bin/clinfo
+    opt/bin/fglrxinfo
+    opt/sbin/atieventsd
+    usr/lib\(32\|64\)\?/libaticalcl.so
+    usr/lib\(32\|64\)\?/libaticalrt.so
+    usr/lib\(32\|64\)\?/libatiuki.so.1.0
+    usr/lib\(32\|64\)\?/libatiadlxx.so
+    usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
+    usr/lib\(32\|64\)\?/libXvBAW.so.1.0
+    usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
+    usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
+    usr/lib\(32\|64\)\?/xorg/modules/glesx.so
+    usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
+    usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
+    usr/lib\(32\|64\)\?/libaticaldd.so
+    usr/lib\(32\|64\)\?/dri/fglrx_dri.so
+    usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
+    usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
+    usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
+    usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
+    usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so
+    usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
+"
+
+pkg_setup() {
+    MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod/2.6.x)"
+    BUILD_TARGETS="kmod_build"
+    linux-mod_pkg_setup
+    BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_OUT_DIR}"
+    BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
+    if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
+        BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
+    else
+        BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
+    fi
+
+    # Define module dir.
+    MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
+    # get the xorg-server version and set BASE_DIR for that
+    BASE_DIR="${S}/xpic"
+
+    # amd64/x86
+    if use amd64 ; then
+        MY_BASE_DIR="${BASE_DIR}_64a"
+        PKG_LIBDIR=lib64
+        ARCH_DIR="${S}/arch/x86_64"
+    else
+        MY_BASE_DIR="${BASE_DIR}"
+        PKG_LIBDIR=lib
+        ARCH_DIR="${S}/arch/x86"
+    fi
+
+    elog
+    elog "Please note that this driver only supports graphic cards based on"
+    elog "Evergreen chipset and newer."
+    elog "This includes the AMD Radeon HD 5400+ series at this moment."
+    elog
+    elog "If your card is older then use ${CATEGORY}/xf86-video-ati"
+    elog "For migration informations please refer to:"
+    elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
+    einfo
+}
+
+src_unpack() {
+    local DRIVERS_DISTFILE XVBA_SDK_DISTFILE
+    DRIVERS_DISTFILE=${DRIVERS_URI##*/}
+    XVBA_SDK_DISTFILE=${XVBA_SDK_URI##*/}
+
+    if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then
+        unpack ${DRIVERS_DISTFILE}
+        mkdir -p common
+        mv etc lib usr common || die "Assumed to find etc lib and usr for common"
+    else
+        #please note, RUN may be insanely assigned at top near SRC_URI
+        if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then
+            unpack ${DRIVERS_DISTFILE}
+            [[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}"
+        else
+            RUN="${DISTDIR}/${DRIVERS_DISTFILE}"
+        fi
+        sh "${RUN}" --extract "${S}" 2>&1 > /dev/null || die
+    fi
+
+    mkdir xvba_sdk
+    cd xvba_sdk
+    unpack ${XVBA_SDK_DISTFILE}
+
+    mkdir -p "${WORKDIR}/extra" || die "mkdir extra failed"
+    cd "${WORKDIR}/extra"
+    tar -xf "../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz"
+}
+
+src_prepare() {
+    if use debug; then
+        sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
+            "${MODULE_DIR}/firegl_public.c" \
+            || die "Failed to enable debug output."
+    fi
+
+    # These are the userspace utilities that we also have source for.
+    # We rebuild these later.
+    rm \
+        "${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
+        || die "bin rm failed"
+
+
+        # amdcccle is shipped separately
+        rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle || die "cannot rm amdcccle"
+
+    # ACPI fixups
+    sed -i \
+        -e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
+        -e "s:/var/lib/gdm/:/var/gdm/:" \
+        "${S}/${FOLDER_PREFIX}etc/ati/authatieventsd.sh" \
+        || die "ACPI fixups failed."
+
+    # Since "who" is in coreutils, we're using that one instead of "finger".
+    sed -i -e 's:finger:who:' \
+        "${S}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
+        || die "Replacing 'finger' with 'who' failed."
+    # Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
+    # add function to detect default state.
+    epatch "${FILESDIR}"/ati-powermode-opt-path-3.patch
+
+    # see http://ati.cchtml.com/show_bug.cgi?id=495
+    #epatch "${FILESDIR}"/ati-drivers-old_rsp.patch
+    # first hunk applied upstream second (x32 related) was not
+    epatch "${FILESDIR}"/ati-drivers-x32_something_something.patch
+
+    # compile fix for AGP-less kernel, bug #435322
+    epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch
+
+    epatch "${FILESDIR}/ati-drivers-13.8-beta-include-seq_file.patch"
+
+    # Fix #483400
+    epatch "${FILESDIR}/fgl_glxgears-do-not-include-glATI.patch"
+
+    # Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870
+    use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch"
+
+    # Compile fix, #526602
+    epatch "${FILESDIR}/use-kernel_fpu_begin.patch"
+
+	epatch_user
+
+    cd "${MODULE_DIR}"
+
+    # bugged fglrx build system, this file should be copied by hand
+    cp ${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
+
+    convert_to_m 2.6.x/Makefile || die "convert_to_m failed"
+
+    # When built with ati's make.sh it defines a bunch of macros if
+    # certain .config values are set, falling back to less reliable
+    # detection methods if linux/autoconf.h is not available. We
+    # simply use the linux/autoconf.h settings directly, bypassing the
+    # detection script.
+    sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
+    sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
+        || die "MODVERSIONS sed failed"
+}
+
+src_compile() {
+    ebegin "Building fgl_glxgears"
+    cd "${S}"/extra/fgl_glxgears
+    # These extra libs/utils either have an Imakefile that does not
+    # work very well without tweaking or a Makefile ignoring CFLAGS
+    # and the like. We bypass those.
+    # The -DUSE_GLU is needed to compile using nvidia headers
+    # according to a comment in ati-drivers-extra-8.33.6.ebuild.
+    "$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
+        -I"${S}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
+        -lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
+    eend $?
+}
+
+src_install() {
+    # We can do two things here, and neither of them is very nice.
+
+    # For direct rendering libGL has to be able to load one or more
+    # dri modules (files ending in _dri.so, like fglrx_dri.so).
+    # Gentoo's mesa looks for these files in the location specified by
+    # LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
+    # location /usr/$(get_libdir)/dri. Ati's libGL does the same
+    # thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
+    # on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
+    # 64bit. So we can either put the .so files in that (unusual,
+    # compared to "normal" mesa libGL) location or set
+    # LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
+    # 101539.
+
+    # The problem with this approach is that LIBGL_DRIVERS_PATH
+    # *overrides* the default hardcoded location, it does not extend
+    # it. So if ati-drivers is merged but a non-ati libGL is selected
+    # and its hardcoded path does not match our LIBGL_DRIVERS_PATH
+    # (because it changed in a newer mesa or because it was compiled
+    # for a different set of multilib abis than we are) stuff breaks.
+
+    # We create one file per ABI to work with "native" multilib, see
+    # below.
+
+    echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
+    doenvd "${T}/03ati-colon-sep" || die
+
+    # All libraries that we have a 32 bit and 64 bit version of on
+    # amd64 are installed in src_install-libs. Everything else
+    # (including libraries only available in native 64bit on amd64)
+    # goes in here.
+    multilib_foreach_abi src_install-libs
+
+    # This is sorted by the order the files occur in the source tree.
+
+    # X modules.
+    exeinto /usr/$(get_libdir)/xorg/modules/drivers
+    doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
+    exeinto /usr/$(get_libdir)/xorg/modules/linux
+    doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
+    exeinto /usr/$(get_libdir)/xorg/modules
+    doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{glesx.so,amdxmm.so}
+
+    #516816
+    if use gdm-hack; then
+        sed -i 's#/proc/%i/fd/0#/etc/ati/xvrn#g' "${D}/usr/$(get_libdir)/xorg/modules/drivers/fglrx_drv.so" || die "Applying gdm-hack failed"
+    fi
+
+    # Arch-specific files.
+    # (s)bin.
+    into /opt
+    dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
+    dobin "${ARCH_DIR}"/usr/bin/clinfo
+    # We cleaned out the compilable stuff in src_unpack
+    dobin "${ARCH_DIR}"/usr/X11R6/bin/*
+
+    # Common files.
+    # etc.
+    insinto /etc/ati
+    exeinto /etc/ati
+    # Everything except for the authatieventsd.sh script.
+    doins ${FOLDER_PREFIX}etc/ati/{logo*,control,signature,amdpcsdb.default}
+    doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
+
+    # include.
+    insinto /usr
+    doins -r ${FOLDER_PREFIX}usr/include
+    insinto /usr/include/X11/extensions
+
+    # Just the atigetsysteminfo.sh script.
+    into /usr
+    dosbin ${FOLDER_PREFIX}usr/sbin/*
+
+    # doc.
+    dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
+
+    doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
+
+    pushd ${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi > /dev/null
+
+    exeinto /etc/acpi
+    doexe ati-powermode.sh
+    insinto /etc/acpi/events
+    doins events/*
+
+    popd > /dev/null
+
+    # Done with the "source" tree. Install tools we rebuilt:
+    dobin extra/fgl_glxgears/fgl_glxgears
+    newdoc extra/fgl_glxgears/README README.fgl_glxgears
+
+    # Gentoo-specific stuff:
+    newinitd "${FILESDIR}"/atieventsd.init atieventsd
+    echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
+    newconfd "${T}"/atieventsd.conf atieventsd
+
+    # PowerXpress stuff
+    exeinto /usr/$(get_libdir)/fglrx
+    doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
+    cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
+    doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
+
+    #516816
+    use gdm-hack && Xorg -version > "${D}/etc/ati/xvrn" 2>&1
+}
+
+src_install-libs() {
+    if [[ "${ABI}" == "amd64" ]]; then
+        local EX_BASE_DIR="${BASE_DIR}_64a"
+        local pkglibdir=lib64
+        local MY_ARCH_DIR="${S}/arch/x86_64"
+        local oclsuffix=64
+    else
+        local EX_BASE_DIR="${BASE_DIR}"
+        local pkglibdir=lib
+        local MY_ARCH_DIR="${S}/arch/x86"
+        local oclsuffix=32
+    fi
+    einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
+
+    local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
+    # To make sure we do not miss a spot when these change.
+    local libmajor=1 libminor=2
+    local libver=${libmajor}.${libminor}
+
+    # The GLX libraries
+    # (yes, this really is "lib" even on amd64/multilib --marienz)
+    exeinto ${ATI_ROOT}/lib
+    newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
+        libGL.so.${libver}
+    dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
+    dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
+
+    if multilib_is_native_abi; then
+        exeinto ${ATI_ROOT}/extensions
+        doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/fglrx/fglrx-libglx.so
+        mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
+
+        #516816
+        if use gdm-hack; then
+            sed -i 's#/proc/%i/fd/0#/etc/ati/xvrn#g' "${D}/${ATI_ROOT}/extensions/libglx.so" || die "Applying gdm-hack failed"
+        fi
+    fi
+
+    # other libs
+    exeinto /usr/$(get_libdir)
+    # Everything except for the libGL.so installed some row above
+    doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
+        -maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
+    insinto /usr/$(get_libdir)
+    doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
+        -maxdepth 1 -type f -not -name '*.so*')
+
+    # DRI modules, installed into the path used by recent versions of mesa.
+    exeinto /usr/$(get_libdir)/dri
+    doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+
+    # AMD Cal and OpenCL libraries
+    exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
+    doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
+    doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
+    dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
+    exeinto /usr/$(get_libdir)
+    doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
+
+    # OpenCL vendor files
+    insinto /etc/OpenCL/vendors/
+    echo "/usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so" > "${T}"/amdocl${oclsuffix}.icd
+
+    doins "${T}"/amdocl${oclsuffix}.icd
+
+    local envname="${T}"/04ati-dri-path
+    if [[ -n ${ABI} ]]; then
+        envname="${envname}-${ABI}"
+    fi
+    echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
+    doenvd "${envname}"
+
+    # Silence the QA notice by creating missing soname symlinks
+    for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
+    do
+        local soname=${so##*/}
+        local soname_one=${soname%.[0-9]}
+        local soname_zero=${soname_one%.[0-9]}
+        dosym ${soname} /usr/$(get_libdir)/${soname_one}
+        dosym ${soname_one} /usr/$(get_libdir)/${soname_zero}
+    done
+
+    # See https://bugs.gentoo.org/show_bug.cgi?id=443466
+    dodir /etc/revdep-rebuild/
+    echo "SEARCH_DIRS_MASK=\"/opt/bin/clinfo\"" > "${ED}/etc/revdep-rebuild/62-ati-drivers"
+
+    #remove static libs if not wanted
+    use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a
+
+    #install xvba sdk headers
+    doheader xvba_sdk/include/amdxvba.h
+
+    # VA-API internal wrapper
+    dosym /usr/$(get_libdir)/libXvBAW.so.1.0 /usr/$(get_libdir)/va/drivers/fglrx_drv_video.so
+
+    if use pax_kernel; then
+        pax-mark m "${D}"/usr/lib*/opengl/ati/lib/libGL.so.1.2 || die "pax-mark failed"
+    fi
+}
+
+
+pkg_postinst() {
+    elog "To switch to AMD OpenGL, run \"eselect opengl set ati\""
+    elog "To change your xorg.conf you can use the bundled \"aticonfig\""
+    elog
+    elog "If you experience unexplained segmentation faults and kernel crashes"
+    elog "with this driver and multi-threaded applications such as wine,"
+    elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
+    elog
+    elog "Fully rebooting the system after an ${PN} update is recommended"
+    elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
+    elog "might not work"
+    elog
+    elog "Some cards need acpid running to handle events"
+    elog "Please add it to boot runlevel with rc-update add acpid boot"
+    elog
+
+    "${ROOT}"/usr/bin/eselect opengl set --use-old ati
+    "${ROOT}"/usr/bin/eselect opencl set --use-old amd
+
+    if has_version "x11-drivers/xf86-video-intel[sna]"; then
+        ewarn "It is reported that xf86-video-intel built with USE=\"sna\" causes the X server"
+        ewarn "to crash on systems that use hybrid AMD/Intel graphics. If you experience"
+        ewarn "this crash, downgrade to xf86-video-intel-2.20.2 or earlier or"
+        ewarn "try disabling sna for xf86-video-intel."
+        ewarn "For details, see https://bugs.gentoo.org/show_bug.cgi?id=430000"
+    fi
+
+    if use pax_kernel; then
+        ewarn "Please run \"revdep-pax -s libGL.so.1 -me\" after installation and"
+        ewarn "after you have run \"eselect opengl set ati\". Executacle"
+        ewarn "revdep-pax is part of package sys-apps/elfix."
+    fi
+}
+
+pkg_prerm() {
+    "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+    "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}