Version bump, import of Enrico Tagliavini's ebuild from the x11 overlay.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 614 insertions, 20 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 59a66fb167ec..7b76ec953017 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.243 2011/03/26 10:31:56 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.244 2011/03/31 20:39:18 chithanh Exp $
+
+*ati-drivers-11.3 (31 Mar 2011)
+
+  31 Mar 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  files/ati-drivers-2.6.38.patch, +ati-drivers-11.3.ebuild:
+  Version bump, import of Enrico Tagliavini's ebuild from the x11 overlay.
 
   26 Mar 2011; Christian Faulhammer <fauli@gentoo.org>
   ati-drivers-11.2.ebuild:
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 340933a1c66a..2bed37867f9a 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -1,11 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ati-drivers-2.6.33.patch 3888 RMD160 48ebf6ed44a681d0213aeddb15ac9659997971ca SHA1 45feff4385e49dc3ee6f813d8cb9957473e5edef SHA256 88c242d50e9e158b5cdfe8de49abb49deb9f7d4fd4a3e014b9092a5eaa58332c
 AUX ati-drivers-2.6.34.patch 358 RMD160 7fa8e781aa3850e70aef0d707a7fb4c50317a3e0 SHA1 2b4c104a76ec3af649cfb734b49e447159a536f7 SHA256 b6da2f0ad829a14b7e50d4ff2bab493ce45a2f4493bc558e28122c4fe7d4032c
 AUX ati-drivers-2.6.36.patch 876 RMD160 955b55c92a3b0a75b205c4563bc00d312298e72e SHA1 ab5234057cbd88ae5ff346e62a8a9f511d4cc2aa SHA256 00ffca26787d4c2cab6848cf0bec043e6c099c60738aebacb2148e920738fcb6
 AUX ati-drivers-2.6.37.patch 495 RMD160 2e1b3e6f2ebcd52b5e0584793956a3c24bca7dac SHA1 80ed7b03dd87fdf750a7124c7e392d124e3ba90f SHA256 acce741df8842178c54db4a01ed68a9dd54c331b0d6c153ecaf4f088cf0f18a2
-AUX ati-drivers-2.6.38.patch 1226 RMD160 c2ba42e6a45f8a25d34e8984b7d2c8d77b9e87c0 SHA1 c6acbe6b4e64eb5417d4e9d279ccbed454790a1f SHA256 c6c2ab9934219dc7f711f7d525b78e37b370290ed8b177e7971bf3ef650d549c
+AUX ati-drivers-2.6.38.patch 1645 RMD160 f91dc5e16c89e942cca63252e186b5d97d7db1c7 SHA1 f17a853df364b0942116c7fafe8372e483c1542f SHA256 46ae66c3985ce3af21e36d3bd71019a6b81e2884099253e2772384bd67a77c24
 AUX ati-drivers-CVE-2010-3081-fix.patch 2730 RMD160 10a3efde5ff66e30f0718c3dcbf1aa589234cc20 SHA1 8ff230d6283a4b4d3ca9a9e1e49f1605a36edc45 SHA256 bbace941d6e1e399b7ab46affe1887edb9a38892ccc2a498017146b838818afc
 AUX ati-drivers-fix_compilation-bug-297322.patch 1114 RMD160 69d27b8e3b45f254d3ed71c47b6b28621868af91 SHA1 d51ca6418e9644035727eb63cbe0494111c9e9b2 SHA256 edbfc56eec848389c3dfdd94362322de41027b9813128d2d4f8e476d1d8581e3
 AUX ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
@@ -16,18 +13,13 @@ DIST ati-driver-installer-10-12-x86.x86_64.run 125184835 RMD160 6f863fe37ed80e11
 DIST ati-driver-installer-10-8-x86.x86_64.run 103164399 RMD160 95552a73d16cb6cfdc94f4b8ee64aad06ad78370 SHA1 9f762d110bdd8d7639ae3280b7080dcdec120b01 SHA256 2df7cb5e1e5730c2f8a0a98eceb4179cbb8c541d5950b3a439e994150be2eb78
 DIST ati-driver-installer-10-9-x86.x86_64.run 104049193 RMD160 1a961316bbe733b7e82886bc536ef8fe93276c1b SHA1 39be217ef14dcb1dd86a5c6296a98f485ff86675 SHA256 d2bbb9de8fce91bc95793fe02d086b635943878127a59712c98afe46b53fbd0c
 DIST ati-driver-installer-11-2-x86.x86_64.run 87023769 RMD160 ca67202bd5b49c700fcb5d503e25593e4335d392 SHA1 adfa10cfc75d0859538ecefa953c982567bbf49e SHA256 5a538e256487dc45441e907e5f0644446c5e2d6e50d724419c3df5b17e8585f8
+DIST ati-driver-installer-11-3-x86.x86_64.run 72899696 RMD160 8e1e0dfa5decde85a6f2fae46141dfbcb1b18fd9 SHA1 1f69ca14766ca0dcba8f7ccef2c0357c528c6ca0 SHA256 e0bcb7e6c12ff1961c057df58fba396ab59356aaebbb1f5dd508c40b8610ed5e
 EBUILD ati-drivers-10.10.ebuild 19776 RMD160 00c7ea8b0d9b2ff88010fa05606b7f29182cf49d SHA1 bae618daca204b70a711acff0cb68b4c998e1ea9 SHA256 0471423ded33e1e194ff6406abd0492c4c512d464ef41247486e8fc3670ff641
 EBUILD ati-drivers-10.11.ebuild 19772 RMD160 87ff0d1086dd754603c44c4c74487bd986726494 SHA1 4837a24906454a2dc453b7debd4c92e67df46556 SHA256 749b527601834b529d2f574806058db02b5df26222df888d85334512506773ed
 EBUILD ati-drivers-10.12.ebuild 19996 RMD160 fe099682e3d10cfabd7c62c7212fb558ebc7eafb SHA1 a9d10b7133ac68e49ba6415a3aa6bb69d77702b9 SHA256 3c2f80f1b8c7db128a9761461e66650de0b3269e75f8b32e4fccce204896b8b4
 EBUILD ati-drivers-10.8.ebuild 17521 RMD160 9c76639d57f9d6b75860841324ed2379083280f2 SHA1 7e92a2f4879918e9a773f92da6b538f6898ef720 SHA256 a9e2150f39aa74e5cf4074e6f1f3506257f9decae3de51a264310df0d2239669
 EBUILD ati-drivers-10.9-r1.ebuild 18720 RMD160 6e5ba5a32a741101ece7cfbc961099bb57a58bfa SHA1 8855961ebed58e1f3d1fc8cd266f2b2e488812c7 SHA256 07ae462dcb388cd146eef18af0f57d26d40e2ef8445093a9bcce8f4b05564b70
 EBUILD ati-drivers-11.2.ebuild 19695 RMD160 678ffdc48256ae2f4f693e4a3e94e43d5696fbf6 SHA1 fe1e5bb42f28aa1c2b0b974da02b34b02c0c20c5 SHA256 1d9dafbe3e18a9b771768139f152d4b3fe02f5f964b7dd74295bfb33b82ead5a
-MISC ChangeLog 69049 RMD160 e143ee8735dddbc690fd31f273641bff1569d044 SHA1 031f0d3bc8f9abcc697d57981a6f04cffa8d8a18 SHA256 9f9f600d29d248e611f931c3a02182150f770e74b2fe88d162dcee01fef6a3f6
+EBUILD ati-drivers-11.3.ebuild 18366 RMD160 1594fafb28d7d7a2e43f7c3efbafb049d911efa2 SHA1 8c63ff4ae4b97722eb7e5953f0e3f24c51028e67 SHA256 2d9031a129d8fbac89cee6edb12b8f97236b6d50af4ba0156574e87729b2cfa2
+MISC ChangeLog 69290 RMD160 a9d1e2d8386081ccb5a58eae70bfb8d04de97cce SHA1 7ca50744428dfeb7a633f8fa38409964bc3270a2 SHA256 c9c150f15dac363d2a5e856b439a29413ea363ad048e094e3e2a3b8dfdd9dd41
 MISC metadata.xml 570 RMD160 0a020753d41a48670dccdf8da444e29531426bbb SHA1 4b0d5dace7a76499468fe40c9645ef11ff864776 SHA256 e20880954026ec88b69b99b3015edbfcb3bb3067b693064aecf8770a8cf76072
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk2NwKMACgkQNQqtfCuFneNiKwCfWj5mOyHXYAO0zmhpQgjqMIUw
-05sAnRocqncypS28J0N5JWz09TWgHqh2
-=n7Av
------END PGP SIGNATURE-----
diff --git a/x11-drivers/ati-drivers/ati-drivers-11.3.ebuild b/x11-drivers/ati-drivers/ati-drivers-11.3.ebuild
new file mode 100644
index 000000000000..77f635e72923
--- /dev/null
+++ b/x11-drivers/ati-drivers/ati-drivers-11.3.ebuild
@@ -0,0 +1,574 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-11.3.ebuild,v 1.1 2011/03/31 20:39:18 chithanh Exp $
+
+EAPI="2"
+
+inherit eutils multilib linux-mod toolchain-funcs versionator
+
+DESCRIPTION="Ati precompiled drivers for r600 (HD Series) and newer chipsets"
+HOMEPAGE="http://www.ati.com"
+# 8.ble will be used for beta releases.
+if [[ $(get_major_version) -gt 8 ]]; then
+	ATI_URL="https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/"
+	SRC_URI="${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run"
+	FOLDER_PREFIX="common/"
+else
+	SRC_URI="https://launchpad.net/ubuntu/maverick/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
+	FOLDER_PREFIX=""
+fi
+IUSE="debug +modules multilib qt4"
+
+LICENSE="AMD GPL-2 QPL-1.0 as-is"
+KEYWORDS="~amd64 ~x86"
+SLOT="1"
+
+RDEPEND="
+	<x11-base/xorg-server-1.9.99
+	!x11-drivers/ati-drivers:0
+	!x11-apps/ati-drivers-extra
+	>=app-admin/eselect-opengl-1.0.7
+	sys-power/acpid
+	x11-apps/xauth
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	multilib? ( app-emulation/emul-linux-x86-opengl )
+	qt4? (
+			x11-libs/libICE
+			x11-libs/libSM
+			x11-libs/libXcursor
+			x11-libs/libXfixes
+			x11-libs/libXxf86vm
+			x11-libs/qt-core
+			x11-libs/qt-gui
+		 )
+"
+
+DEPEND="${RDEPEND}
+	app-portage/portage-utils
+	x11-proto/inputproto
+	x11-proto/xf86miscproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xineramaproto
+	x11-libs/libXtst
+"
+
+EMULTILIB_PKG="true"
+
+S="${WORKDIR}"
+
+# QA Silencing
+QA_TEXTRELS="
+	usr/lib*/opengl/ati/lib/libGL.so.1.2
+	usr/lib*/libatiadlxx.so
+	usr/lib*/xorg/modules/glesx.so
+	usr/lib*/libaticaldd.so
+	usr/lib*/dri/fglrx_dri.so
+"
+
+QA_EXECSTACK="
+	opt/bin/atiode
+	opt/bin/amdcccle
+	usr/lib*/opengl/ati/lib/libGL.so.1.2
+	usr/lib*/dri/fglrx_dri.so
+"
+
+QA_WX_LOAD="
+	usr/lib*/opengl/ati/lib/libGL.so.1.2
+	usr/lib*/dri/fglrx_dri.so
+"
+
+QA_PRESTRIPPED="
+	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
+	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
+	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
+	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
+	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
+	usr/lib\(32\|64\)\?/libaticaldd.so
+	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
+"
+
+QA_SONAME="
+	usr/lib\(32\|64\)\?/libatiadlxx.so
+	usr/lib\(32\|64\)\?/libaticalcl.so
+	usr/lib\(32\|64\)\?/libaticaldd.so
+	usr/lib\(32\|64\)\?/libaticalrt.so
+"
+
+QA_DT_HASH="
+	opt/bin/amdcccle
+	opt/bin/aticonfig
+	opt/bin/atiodcli
+	opt/bin/atiode
+	opt/bin/fglrxinfo
+	opt/sbin/atieventsd
+	usr/lib\(32\|64\)\?/libaticalcl.so
+	usr/lib\(32\|64\)\?/libaticalrt.so
+	usr/lib\(32\|64\)\?/libatiuki.so.1.0
+	usr/lib\(32\|64\)\?/libatiadlxx.so
+	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
+	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
+	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
+	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
+	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
+	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
+	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
+	usr/lib\(32\|64\)\?/libaticaldd.so
+	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
+	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
+	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
+"
+
+_check_kernel_config() {
+	local failed=0
+	local error=""
+	if ! kernel_is 2 6; then
+		eerror "You need a 2.6 linux kernel to compile against!"
+		die "No 2.6 Kernel found"
+	fi
+
+	if ! linux_chkconfig_present MTRR; then
+		ewarn "You don't have MTRR support enabled in the kernel."
+		ewarn "Direct rendering will not work."
+	fi
+
+	if linux_chkconfig_builtin DRM; then
+		ewarn "You have DRM support built in to the kernel"
+		ewarn "Direct rendering will not work."
+	fi
+
+	if ! linux_chkconfig_present AGP && \
+		! linux_chkconfig_present PCIEPORTBUS; then
+		ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
+		ewarn "Direct rendering will not work."
+	fi
+
+	if ! linux_chkconfig_present ACPI; then
+		eerror "${P} requires the ACPI support in the kernel"
+		eerror "Please enable it:"
+		eerror "    CONFIG_ACPI=y"
+		eerror "in /usr/src/linux/.config or"
+		eerror "    Power management and ACPI options --->"
+		eerror "        [*] Power Management support"
+		eerror "in the 'menuconfig'"
+		error="${error} CONFIG_ACPI disabled"
+		failed=1
+	fi
+
+	if ! linux_chkconfig_present MAGIC_SYSRQ; then
+		eerror "${P} requires the magic SysRq keys in the kernel."
+		eerror "Please enable it:"
+		eerror "    CONFIG_MAGIC_SYSRQ=y"
+		eerror "in /usr/src/linux/.config or"
+		eerror "    Kernel hacking  --->"
+		eerror "        [*] Magic SysRq key"
+		eerror "in the 'menuconfig'"
+		error="${error} CONFIG_MAGIC_SYSRQ disabled"
+		failed=1
+	fi
+
+	if ! linux_chkconfig_present PCI_MSI; then
+		eerror "${P} requires MSI in the kernel."
+		eerror "Please enable it:"
+		eerror "    CONFIG_PCI_MSI=y"
+		eerror "in /usr/src/linux/.config or"
+		eerror "    Bus options (PCI etc.)  --->"
+		eerror "        [*] Message Signaled Interrupts (MSI and MSI-X)"
+		eerror "in the kernel config."
+		error="${error} CONFIG_PCI_MSI disabled"
+		failed=1
+	fi
+
+	if linux_chkconfig_present LOCKDEP; then
+		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
+		eerror "Unfortunately, this option exports the symbol lock_acquire as GPL-only."
+		eerror "This prevents ${P} from compiling with an error like this:"
+		eerror "FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
+		eerror "Please make sure the following options have been unset:"
+		eerror "    Kernel hacking  --->"
+		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
+		eerror "        [ ] Lock debugging: prove locking correctness"
+		eerror "        [ ] Lock usage statistics"
+		eerror "in 'menuconfig'"
+		error="${error} LOCKDEP enabled"
+		failed=1
+	fi
+
+	use amd64 && if ! linux_chkconfig_present COMPAT; then
+		eerror "${P} requires COMPAT."
+		eerror "Please enable the 32 bit emulation:"
+		eerror "Executable file formats / Emulations  --->"
+		eerror "    [*] IA32 Emulation"
+		eerror "in the kernel config."
+		eerror "if this doesn't enable CONFIG_COMPAT add"
+		eerror "    CONFIG_COMPAT=y"
+		eerror "in /usr/src/linux/.config"
+		error="${error} COMPAT disabled"
+		failed=1
+	fi
+
+	kernel_is ge 2 6 37 && if ! linux_chkconfig_present BKL ; then
+		eerror "${P} requires BKL."
+		eerror "Please enable the Big Kernel Lock:"
+		eerror "Kernel hacking  --->"
+		eerror "    [*] Big Kernel Lock"
+		eerror "in the kernel config."
+		eerror "or add"
+		eerror "    CONFIG_BKL=y"
+		eerror "in /usr/src/linux/.config"
+		error="${error} BKL disabled"
+		failed=1
+	fi
+
+	[ "x${failed}" != "x0" ] && die "${error}"
+}
+
+pkg_setup() {
+	# Define module dir.
+	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
+	# get the xorg-server version and set BASE_DIR for that
+	local ver_str=$(qatom `best_version x11-base/xorg-server` | cut -d ' ' -f 3)
+	case ${ver_str} in
+		1\.9*) BASE_DIR="${S}/xpic" ;;
+		9999*) BASE_DIR="${S}/xpic"
+			ewarn "Experimental xorg-server-${ver_str}"
+			ewarn "Picking the last implementation" ;;
+		1\.8*|1\.7*) BASE_DIR="${S}/xpic" ;;
+		*) die "xorg-server-${ver_str} not supported" ;;
+	esac
+
+	# 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
+
+	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
+		_check_kernel_config
+	fi
+
+	elog
+	elog "Please note that this driver supports only graphic cards based on"
+	elog "r600 chipset and newer."
+	elog "This represent the ATI Radeon HD series at this moment."
+	elog
+	elog "If your card is older then usage of ${CATEGORY}/xf86-video-ati"
+	elog "as replacement is highly recommended. Rather than staying with"
+	elog "old versions of this driver."
+	elog "For migration informations please reffer to:"
+	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
+	einfo
+}
+
+src_unpack() {
+	if [[ $(get_major_version) -gt 8 ]]; then
+		# Switching to a standard way to extract the files since otherwise no signature file
+		# would be created
+		local src="${DISTDIR}/${A}"
+		sh "${src}" --extract "${S}"  2&>1 /dev/null
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	# All kernel options for prepare are ment to be in here
+	if use modules; then
+		# version patches
+		# epatch "${FILESDIR}"/kernel/${PV}-*.patch
+		if use debug; then
+			sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
+				"${MODULE_DIR}/firegl_public.c" \
+				|| die "Failed to enable debug output."
+		fi
+	fi
+
+	# Fix a known compilation error
+	epatch "${FILESDIR}"/ati-drivers-fix_compilation-bug-297322.patch
+
+	if kernel_is ge 2 6 38 ; then
+		epatch "${FILESDIR}"/ati-drivers-2.6.38.patch || \
+			die "epatch ati-drivers-2.6.38.patch failed"
+	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 "sed failed."
+
+	# Since "who" is in coreutils, we're using that one instead of "finger".
+	sed -i -e 's:finger:who:' \
+		"${S}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
+		|| die "Replacing 'finger' with 'who' failed."
+	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
+	# add function to detect default state.
+	epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch || die "Failed to epatch powermode-opt-path-2.patch"
+
+	cd "${MODULE_DIR}"
+
+	# bugged fglrx build system, this file should be copied by hand
+	cp ${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
+
+	convert_to_m 2.6.x/Makefile || die "convert_to_m failed"
+
+	# When built with ati's make.sh it defines a bunch of macros if
+	# certain .config values are set, falling back to less reliable
+	# detection methods if linux/autoconf.h is not available. We
+	# simply use the linux/autoconf.h settings directly, bypassing the
+	# detection script.
+	sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
+	sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
+		|| die "MODVERSIONS sed failed"
+	cd "${S}"
+
+	mkdir extra || die "mkdir failed"
+	cd extra
+	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
+}
+
+src_compile() {
+	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 || die
+	exeinto /usr/$(get_libdir)/xorg/modules/linux
+	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so || die
+	exeinto /usr/$(get_libdir)/xorg/modules
+	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{glesx.so,amdxmm.so} || die
+
+	# Arch-specific files.
+	# (s)bin.
+	into /opt
+	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd || die
+	# We cleaned out the compilable stuff in src_unpack
+	dobin "${ARCH_DIR}"/usr/X11R6/bin/* || die
+
+	# lib.
+	exeinto /usr/$(get_libdir)
+	# Everything except for the libGL.so installed in src_install-libs.
+	doexe $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
+		-maxdepth 1 -type f -name '*.so*' -not -name 'libGL.so*')
+	insinto /usr/$(get_libdir)
+	doins $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
+		-maxdepth 1 -type f -not -name '*.so*')
+
+	# Common files.
+	# etc.
+	insinto /etc/ati
+	# Everything except for the authatieventsd.sh script.
+	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
+	insopts -m0755
+	doins ${FOLDER_PREFIX}etc/ati/authatieventsd.sh || die
+
+	# include.
+	insinto /usr
+	doins -r ${FOLDER_PREFIX}usr/include || die
+	insinto /usr/include/X11/extensions
+
+	# Just the atigetsysteminfo.sh script.
+	into /usr
+	dosbin ${FOLDER_PREFIX}usr/sbin/* || die
+
+	# data files for the control panel.
+	if use qt4 ; then
+		insinto /usr/share
+		doins -r ${FOLDER_PREFIX}usr/share/ati || die
+		insinto /usr/share/pixmaps
+		doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm || die
+		make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
+			ccc_large System
+	fi
+
+	# doc.
+	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx || die
+
+	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8 || die
+
+	pushd ${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi > /dev/null
+
+	exeinto /etc/acpi
+	doexe ati-powermode.sh || die
+	insinto /etc/acpi/events
+	doins events/* || die
+
+	popd > /dev/null
+
+	# Done with the "source" tree. Install tools we rebuilt:
+	dobin extra/fgl_glxgears/fgl_glxgears || die
+	newdoc extra/fgl_glxgears/README README.fgl_glxgears || die
+
+	# Gentoo-specific stuff:
+	newinitd "${FILESDIR}"/atieventsd.init atieventsd \
+		|| die "Failed to install atieventsd.init.d"
+	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
+	insopts -m0644
+	newconfd "${T}"/atieventsd.conf atieventsd || die
+}
+
+src_install-libs() {
+	if [[ "${ABI}" == "amd64" ]]; then
+		local EX_BASE_DIR="${BASE_DIR}_64a"
+		local pkglibdir=lib64
+		local MY_ARCH_DIR="${S}/arch/x86_64"
+	else
+		local EX_BASE_DIR="${BASE_DIR}"
+		local pkglibdir=lib
+		local MY_ARCH_DIR="${S}/arch/x86"
+	fi
+	einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
+
+	local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
+	# To make sure we do not miss a spot when these change.
+	local libmajor=1 libminor=2
+	local libver=${libmajor}.${libminor}
+
+	# The GLX libraries
+	# (yes, this really is "lib" even on amd64/multilib --marienz)
+	exeinto ${ATI_ROOT}/lib
+	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/libGL.so.${libver} || die
+	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor} || die
+	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so || die
+
+	exeinto ${ATI_ROOT}/extensions
+	doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/*.so || die
+
+	# 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 || die
+
+	# AMD Cal libraries
+	exeinto /usr/$(get_libdir)
+	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so* || die
+
+	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}" || die
+}
+
+pkg_postinst() {
+	elog "To switch to ATI OpenGL, run \"eselect opengl set ati\""
+	elog "To change your xorg.conf you can use the bundled \"aticonfig\""
+	elog
+	elog "If you experience unexplained segmentation faults and kernel crashes"
+	elog "with this driver and multi-threaded applications such as wine,"
+	elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
+	elog
+	elog "Fully rebooting the system after an ${PN} update is raccomended"
+	elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
+	elog "might not work"
+
+	use modules && linux-mod_pkg_postinst
+	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
+}
+
+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/files/ati-drivers-2.6.38.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.38.patch
index fea6c26ffabf..0c3970e0cbb1 100644
--- a/x11-drivers/ati-drivers/files/ati-drivers-2.6.38.patch
+++ b/x11-drivers/ati-drivers/files/ati-drivers-2.6.38.patch
@@ -1,38 +1,60 @@
---- ati.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2011-03-15 14:40:22.000000000 -0600
-+++ ati/common/lib/modules/fglrx/build_mod/firegl_public.c	2011-03-15 14:38:09.000000000 -0600
-@@ -848,7 +848,7 @@
+--- cat11.1/common/lib/modules/fglrx/build_mod/firegl_public.c	2011-01-17 15:59:26.000000000 +0100
++++ cat11.1/common/lib/modules/fglrx/build_mod/firegl_public.c	2011-02-01 18:39:08.902218444 +0100
+@@ -848,7 +848,12 @@
       * happen much less frequent then without this workaround.
       */
      if (state == PM_EVENT_SUSPEND)
 -        acquire_console_sem();
++      
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
 +        console_lock();
++#else
++	acquire_console_sem();
++#endif
  
      if (firegl_cail_powerdown(privdev, state))
          ret = -EIO;
-@@ -870,7 +870,7 @@
+@@ -870,8 +875,13 @@
      }
  
      if (state == PM_EVENT_SUSPEND)
 -        release_console_sem();
+-
++      
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
 +        console_unlock();
- 
++#else
++	release_console_sem();
++#endif
++	
      KCL_DEBUG_TRACEOUT(FN_FIREGL_ACPI, ret, NULL);  
      
-@@ -894,7 +894,7 @@
+     return ret;
+@@ -894,7 +904,12 @@
      if (PMSG_EVENT(pdev->dev.power.power_state) == 0) return 0;
  
      if (PMSG_EVENT(pdev->dev.power.power_state) == PM_EVENT_SUSPEND)
 -        acquire_console_sem();
++      
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
 +        console_lock();
++#else
++	acquire_console_sem();
++#endif
  
  #ifdef FIREGL_USWC_SUPPORT
      // Restore the PAT after resuming from S3 or S4.
-@@ -919,7 +919,7 @@
+@@ -919,7 +934,12 @@
      firegl_cail_powerup(privdev);
  
      if (PMSG_EVENT(pdev->dev.power.power_state) == PM_EVENT_SUSPEND)
 -        release_console_sem();
++      
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
 +        console_unlock();
++#else
++	release_console_sem();
++#endif
  
      PMSG_EVENT(pdev->dev.power.power_state) = 0;
      KCL_DEBUG_TRACEOUT(FN_FIREGL_ACPI, 0, NULL);