Adding new versions, ebuild will die with unsupported 2.6.29 kernels.

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

5 files changed, 565 insertions, 2 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 1fd869b7dceb..8e071079f524 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.152 2009/04/14 06:37:18 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.153 2009/04/23 03:13:26 je_fro Exp $
+
+*ati-drivers-8.593 (23 Apr 2009)
+
+  23 Apr 2009; Jeff Gardner <je_fro@gentoo.org>
+  +files/ati-powermode-opt-path-2.patch, +files/ati-drivers-xen.patch,
+  +ati-drivers-8.593.ebuild:
+  Adding new versions, ebuild will die with unsupported 2.6.29 kernels.
 
   14 Apr 2009; Jeff Gardner <je_fro@gentoo.org>
   +ati-drivers-8.33.6-r1.ebuild:
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 0ba32d569d97..d333df34caa1 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -13,6 +13,8 @@ AUX ati-drivers-2.6.19.patch 3158 RMD160 b9b3af8169f4b0e7cf655f0da9b8dcb7946b204
 AUX ati-drivers-2.6.20.patch 2386 RMD160 8b563155a63ba8d9639fa3b89719b8da49b2c8a3 SHA1 3714fa58e8ead0287d593cf0ed011e22327a5e71 SHA256 12b56122216a2fdba9f52e9939bf33f7d0c262417923ea9596c70337d44dd9f8
 AUX ati-drivers-8.35.5-2.6.19.patch 913 RMD160 511ef4e6eb7fcfa8db5419c05d160c6b538f9bc8 SHA1 adcd3860d1b0877779e85695053cda36511b4c71 SHA256 5c2b1ba7e291e118f37a87e3a653d0a654ee4e95a46c9e3d723ecef72aba1f01
 AUX ati-drivers-8.35.5-2.6.20.patch 333 RMD160 b9ef336b8dd4874854910d8eb62bc15f9ab066bd SHA1 8261034f3e539251adb0ca5b1da880e3f1231559 SHA256 cd4abde649ede2d03b5faa115acc567fcff85b6db39f19ba70d25e194e8973a6
+AUX ati-drivers-xen.patch 1994 RMD160 45fe1a96bfaec597214c2b058c720c5f71797085 SHA1 4fd6da4c726c67feed8a6484af484ea525f3a112 SHA256 514dad9629fc689ec0344875a29d713f9d8de7ccbb0a22a2b80ede11bbbc6c58
+AUX ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
 AUX ati-powermode-opt-path.patch 826 RMD160 450b5c9ecd7f4c123ce12f855b287e6b97e6ad23 SHA1 80725f60def6bd968157f09474c00722865b1f27 SHA256 e1d6dbe2e73c8ed575b2f9188e707fcb90f808d0fbdb686067c16f853662c208
 AUX ati-powermode.sh.patch 1142 RMD160 b81cdd4d2a49c2f7b04f7e00e4391b4e0ad67a40 SHA1 eef7f658474ca8e9e66ee1955a851782eba4dd0e SHA256 050602d5e0656961c0b16a75b470a7327a9e8b16f7d0ae3228341b3a8dcc9289
 AUX atieventsd.init 533 RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a SHA1 982ffdb8064785c8b96fb0213ad7892ac918b5d7 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3
@@ -30,6 +32,7 @@ DIST ati-driver-installer-8.36.5-x86.x86_64.run 53331877 RMD160 5581d7ad761f60c8
 DIST ati-driver-installer-8.39.4-x86.x86_64.run 40085391 RMD160 b23da1864ab4718ddfbc077950443507f30af70a SHA1 2b1b66169df36c3e6c811562b63642ff4dce2b1d SHA256 c8c37f2e13dc10aa223c7dc50aa04cba211c913d254704908f5d3cd57debac22
 DIST ati-driver-installer-8.40.4-x86.x86_64.run 40335704 RMD160 8a35e68aa9108186ffd91244209377387b3313e5 SHA1 6260c8596529eac34fabe3437678afe6e2761490 SHA256 765386dbe60ba66088b0d6050d1e462432e7cfaddca33d70875b2bd554ddc7a2
 DIST ati-driver-installer-9-1-x86.x86_64.run 82398155 RMD160 b7d047131c4c3dc80e8d025f312a417605c75a02 SHA1 d7a23a74bc0209c54f6a24e1622e496a6cbeda07 SHA256 178ceffc6ad195bd5b210b2531180a6c0c8bdfa69f2dbfa9ac438170ca0f299e
+DIST ati-driver-installer-9-3-x86.x86_64.run 84841550 RMD160 76d4aa6ec575403190b8feadce99000b69d64d14 SHA1 ceefdfd2f8ecee4998a4ce4b7b87a45f1851e8d0 SHA256 5efec58f92f2fbb90b0d9a9059eb27c9cfffcea0a4ba64f3c8f24fc5dbf8053e
 DIST ati-driver-installer-9.2-x86.x86_64.run 83286827 RMD160 fe98a9b39dbf27c7350afd4767c793826e94c53d SHA1 3ae672145f60f0348c44a7dfef98ec730a51fbf5 SHA256 7a611b83a3a8937e3511a02a730f8c7fb0b89d9070f4fa4de4e7fa9aeada421a
 EBUILD ati-drivers-8.27.10-r1.ebuild 10567 RMD160 1f895a73a94524b74a12e146965fa12d5141f3a1 SHA1 7ddd8c9955487d4e642241130a2f13c8e6dad330 SHA256 f1792d199b950647d4a2b827e5e017094e96cf5f5002a65a12689823a6bd2215
 EBUILD ati-drivers-8.32.5.ebuild 9917 RMD160 af7cdad20a43f8e2fdef17745506724945afa63a SHA1 843e3ade7c92de12d1d0a2d9bb7d43d3924a62a8 SHA256 0d8d854f157559671c96910aaf041a044c6174b0bf466580c839a71da11b6318
@@ -43,5 +46,6 @@ EBUILD ati-drivers-8.471.3.ebuild 14679 RMD160 6207bd14a240106959bae07c123527b11
 EBUILD ati-drivers-8.552-r2.ebuild 15132 RMD160 08693686e3a767576533c9625b6efaa0e727f5de SHA1 3f41f7bfc6e95f6520d5f38dbb6b05001db6b767 SHA256 059888be71be3759d9cd63cc4fa3300227ba9d99fcea1f32eb065ed5761aec79
 EBUILD ati-drivers-8.573-r1.ebuild 14797 RMD160 b08db9339579ad4641f2328617dbb67e77239239 SHA1 fd188e633a4a78f989936841b2263d3671c12ad1 SHA256 8c659c640e4e9bf078840b97bfa47918cc84fe772a560962accf330f3c64698e
 EBUILD ati-drivers-8.582.ebuild 14794 RMD160 581ae32efc15a474a80256bb9dc30c7d56453e75 SHA1 2769b8687ecb459af943d337e1ea582df21f288a SHA256 a02439b55b6d18a4bf078b7465e9ba38907edf09e2ab5dd919fc21b7d3ba9122
-MISC ChangeLog 52014 RMD160 7d8c14089d0310981e8b827864b609c9165dba54 SHA1 5541de902c9f5d07f263a246f94b7cc53b642f24 SHA256 061c8ef0dc5e2c907764695fb84c38717525dadf87ab70eea4950fce7f6f594d
+EBUILD ati-drivers-8.593.ebuild 15025 RMD160 920ec6d2623fa6a82350c3a218733c54931c3922 SHA1 ee02b762371bef8dc40dd524089987fc36c08693 SHA256 fcbd917e71a9cc0a5069ab19d92ffb50183aa3dc8fd08336d6f8f8ed73fbb8a5
+MISC ChangeLog 52269 RMD160 ab9f50515dc419c115c30836db5752d3b0958487 SHA1 d93ea9d2e0b11f74cccd77d70ec4ed11474d0e6b SHA256 78d6741da95f95ef39596dfe446f697cca14c43af45138376a08e06868efae08
 MISC metadata.xml 294 RMD160 ce6129af48ca9c259fa89b297249a558c58657a2 SHA1 f17731063fe83ac4b733ec2127b2dcf1017a7095 SHA256 5db182fb2524bf0627a165b0fc4fbdb17b9e1668a49428ec68c9c6ac13a02eea
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.593.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.593.ebuild
new file mode 100644
index 000000000000..02266a1ef91c
--- /dev/null
+++ b/x11-drivers/ati-drivers/ati-drivers-8.593.ebuild
@@ -0,0 +1,448 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.593.ebuild,v 1.1 2009/04/23 03:13:26 je_fro Exp $
+
+IUSE="acpi debug"
+
+inherit eutils multilib linux-mod toolchain-funcs versionator
+
+DESCRIPTION="Ati precompiled drivers for recent chipsets"
+HOMEPAGE="http://www.ati.com"
+ATI_URL="https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/"
+SRC_URI="${ATI_URL}/ati-driver-installer-9-3-x86.x86_64.run"
+
+LICENSE="AMD GPL-2 QPL-1.0 as-is"
+KEYWORDS="~amd64 ~x86"
+
+# The portage dep is for COLON_SEPARATED support in env-update.
+# The eselect dep (>=1.0.9) is for COLON_SEPARATED in eselect env update.
+RDEPEND=">=x11-base/xorg-server-1.5
+	!x11-apps/ati-drivers-extra
+	>=app-admin/eselect-1.0.9
+	app-admin/eselect-opengl
+	sys-libs/libstdc++-v3
+	amd64? ( app-emulation/emul-linux-x86-xlibs )
+	acpi? (
+		x11-apps/xauth
+		sys-power/acpid
+	)
+	x11-libs/libXrandr
+	>=sys-apps/portage-2.1.1-r1"
+
+DEPEND="${RDEPEND}
+	x11-proto/xf86miscproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/inputproto
+	!<x11-drivers/ati-drivers-8.552-r1"
+
+EMULTILIB_PKG="true"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+
+	# Define module dir.
+	MODULE_DIR="${S}/common/lib/modules/fglrx/build_mod"
+
+	#check kernel and sets up KV_OBJ
+	MODULE_NAMES="fglrx(video:${S}/common/lib/modules/fglrx/build_mod/2.6.x)"
+	BUILD_TARGETS="kmod_build"
+	linux-mod_pkg_setup
+	BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}"
+
+	if kernel_is ge 2 6 29; then
+		die "${P} is not yet compatible with 2.6.29 kernels. See bug #264021."
+	fi
+
+	if ! kernel_is 2 6; then
+		eerror "Need a 2.6 kernel to compile against!"
+		die "Need a 2.6 kernel to compile against!"
+	fi
+
+	if kernel_is ge 2 6 25 && linux_chkconfig_present PREEMPT_RCU; then
+		die "${P} is not compatible with RCU Preemption (bug #223281), please disable it"
+	fi
+
+	if kernel_is ge 2 6 26 && ! linux_chkconfig_present UNUSED_SYMBOLS; then
+			ewarn "You have to Enable unused/obsolete exported symbols in Kernel hacking section of kernel config for fglrx to load"
+	fi
+
+	if kernel_is ge 2 6 24 && ! linux_chkconfig_present PCI_LEGACY; then
+		eerror "${P} requires support for pci_find_slot."
+		die "${P} requires support for pci_find_slot."
+	fi
+
+	if ! linux_chkconfig_present MTRR; then
+		ewarn "You don't have MTRR support enabled, the direct rendering will not work."
+	fi
+
+	if linux_chkconfig_builtin DRM; then
+		ewarn "You have DRM support enabled builtin, the direct rendering will not work."
+	fi
+
+	if ! linux_chkconfig_present AGP && \
+		! linux_chkconfig_present PCIEPORTBUS; then
+		ewarn "You need AGP and/or PCI Express support for direct rendering to work."
+	fi
+
+	if linux_chkconfig_present PARAVIRT; then
+		eerror "The current ati-drivers don't compile when having"
+		eerror "paravirtualization active due to GPL symbol export"
+		eerror "restrictions."
+		eerror "Please disable it:"
+		eerror "	CONFIG_PARAVIRT=n"
+		eerror "in /usr/src/linux/.config or"
+		eerror "	Processor type and features -->"
+		eerror "		[ ] Paravirtualization support (EXPERIMENTAL)"
+		eerror "in 'menuconfig'"
+		die "CONFIG_PARAVIRT enabled"
+	fi
+
+	if ! linux_chkconfig_present MAGIC_SYSRQ; then
+		eerror "You need MAGIC_SYSRQ enabled in order to build ati-drivers"
+		die "CONFIG_MAGIC_SYSRQ disabled"
+	fi
+
+	# Only support xorg-server >=1.5
+	BASE_DIR="${S}/x740"
+
+	if ! linux_chkconfig_present PCI_MSI; then
+		eerror "You need PCI_MSI enabled in order to build ati-drivers"
+		die "CONFIG_PCI_MSI disabled"
+	fi
+
+	# This is used like $(get_libdir) for paths in ati's package.
+	if use amd64 ; then
+		MY_BASE_DIR="${BASE_DIR}_64a"
+		PKG_LIBDIR=lib64
+		ARCH_DIR="${S}/arch/x86_64"
+	else
+		MY_BASE_DIR="${BASE_DIR}"
+		PKG_LIBDIR=lib
+		ARCH_DIR="${S}/arch/x86"
+	fi
+}
+
+src_unpack() {
+	#Switching to a standard way to extract the files since otherwise no signature file
+	#would be created
+	local src="${DISTDIR}/${A}"
+	sh "${src}" --extract "${S}"  2&>1 /dev/null
+	cd "${S}"
+	epatch "${FILESDIR}"/ati-drivers-xen.patch || die "epatch failed"
+
+	# These are the userspace utilities that we also have source for.
+	# We rebuild these later.
+	rm \
+		"${ARCH_DIR}"/usr/X11R6/bin/{fgl_glxgears,fglrx_xgamma} \
+		"${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \
+		|| die "bin rm failed"
+
+	if use debug; then
+		# Enable debug mode in the Source Code.
+		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
+			"${MODULE_DIR}/firegl_public.c" \
+			|| die "Failed to enable debug output."
+	fi
+
+	if kernel_is ge 2 6 29; then
+			pwd && epatch "${FILESDIR}"/ati-drivers-2.6.19.patch
+	fi
+
+	if use acpi; then
+		sed -i \
+			-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
+			-e "s:/var/lib/gdm/:/var/gdm/:" \
+			"${S}/common/etc/ati/authatieventsd.sh" \
+			|| die "sed failed."
+
+		# Since "who" is in coreutils, we're using that one instead of "finger".
+		sed -i -e 's:finger:who:' \
+			"${S}/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
+			|| die "Replacing 'finger' with 'who' failed."
+		# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
+		# add function to detect default state.
+		epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch || die "Failed to epatch powermode-opt-path-2.patch"
+	fi
+
+	pushd ${MODULE_DIR} >/dev/null
+	ln -s "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
+		|| die "symlinking precompiled core failed"
+
+	convert_to_m 2.6.x/Makefile || die "convert_to_m failed"
+
+	# When built with ati's make.sh it defines a bunch of macros if
+	# certain .config values are set, falling back to less reliable
+	# detection methods if linux/autoconf.h is not available. We
+	# simply use the linux/autoconf.h settings directly, bypassing the
+	# detection script.
+	sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
+	sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
+		|| die "MODVERSIONS sed failed"
+	popd >/dev/null
+
+	mkdir extra || die "mkdir failed"
+	cd extra
+	unpack ./../common/usr/src/ati/fglrx_sample_source.tgz
+	sed -i -e 's:include/extensions/extutil.h:X11/extensions/extutil.h:' \
+		lib/fglrx_gamma/fglrx_gamma.c || die "include fixup failed"
+	# Add a category.
+	mv programs/fglrx_gamma/fglrx_xgamma.{man,1} || die "man mv failed"
+	cd ..
+}
+
+src_compile() {
+	linux-mod_src_compile
+
+	einfo "Building fgl_glxgears"
+	cd "${S}"/extra/fgl_glxgears
+	# These extra libs/utils either have an Imakefile that does not
+	# work very well without tweaking or a Makefile ignoring CFLAGS
+	# and the like. We bypass those.
+
+	# The -DUSE_GLU is needed to compile using nvidia headers
+	# according to a comment in ati-drivers-extra-8.33.6.ebuild.
+	"$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
+		-I"${S}"/common/usr/include fgl_glxgears.c \
+		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
+
+	einfo "Building fglrx_gamma lib"
+	cd "${S}"/extra/lib/fglrx_gamma
+	"$(tc-getCC)" -shared -fpic -o libfglrx_gamma.so.1.0 ${CFLAGS} ${LDFLAGS} \
+		-DXF86MISC -Wl,-soname,libfglrx_gamma.so.1.0 fglrx_gamma.c \
+		-lXext || die "fglrx_gamma lib build failed"
+	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so || die "ln failed"
+	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so.1 || die "ln failed"
+
+	einfo "Building fglrx_gamma util"
+	cd "${S}"/extra/programs/fglrx_gamma
+	"$(tc-getCC)" -o fglrx_xgamma ${CFLAGS} ${LDFLAGS} \
+		-I../../../common/usr/X11R6/include -L../../lib/fglrx_gamma \
+		fglrx_xgamma.c -lm -lfglrx_gamma -lX11 \
+		|| die "fglrx_gamma util build failed"
+
+}
+
+src_install() {
+	linux-mod_src_install
+
+	# We can do two things here, and neither of them is very nice.
+
+	# For direct rendering libGL has to be able to load one or more
+	# dri modules (files ending in _dri.so, like fglrx_dri.so).
+	# Gentoo's mesa looks for these files in the location specified by
+	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
+	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
+	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
+	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
+	# 64bit. So we can either put the .so files in that (unusual,
+	# compared to "normal" mesa libGL) location or set
+	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
+	# 101539.
+
+	# The problem with this approach is that LIBGL_DRIVERS_PATH
+	# *overrides* the default hardcoded location, it does not extend
+	# it. So if ati-drivers is merged but a non-ati libGL is selected
+	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
+	# (because it changed in a newer mesa or because it was compiled
+	# for a different set of multilib abis than we are) stuff breaks.
+
+	# We create one file per ABI to work with "native" multilib, see
+	# below.
+
+	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
+	doenvd "${T}/03ati-colon-sep"
+
+	# All libraries that we have a 32 bit and 64 bit version of on
+	# amd64 are installed in src_install-libs. Everything else
+	# (including libraries only available in native 64bit on amd64)
+	# goes in here.
+
+	# There used to be some code here that tried to detect running
+	# under a "native multilib" portage ((precursor of)
+	# http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it
+	# should just work (only doing some duplicate work). --marienz
+	if has_multilib_profile; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	# This is sorted by the order the files occur in the source tree.
+
+	# X modules.
+	exeinto /usr/$(get_libdir)/xorg/modules/drivers
+	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
+	exeinto /usr/$(get_libdir)/xorg/modules/linux
+	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
+	exeinto /usr/$(get_libdir)/xorg/modules
+	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{esut.a,glesx.so,amdxmm.so}
+
+	# Arch-specific files.
+	# (s)bin.
+	into /opt
+	if use acpi; then
+		dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
+	fi
+	# We cleaned out the compilable stuff in src_unpack
+	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
+
+	# lib.
+	exeinto /usr/$(get_libdir)
+	# Everything except for the libGL.so installed in src_install-libs.
+	doexe $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
+		-maxdepth 1 -type f -name '*.so*' -not -name 'libGL.so*')
+	insinto /usr/$(get_libdir)
+	doins $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
+		-maxdepth 1 -type f -not -name '*.so*')
+
+	# Common files.
+	# etc.
+	insinto /etc/ati
+	# Everything except for the authatieventsd.sh script.
+	doins common/etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
+	if use acpi; then
+		insopts -m0755
+		doins common/etc/ati/authatieventsd.sh
+	fi
+
+	# include.
+	insinto /usr
+	doins -r common/usr/include
+	insinto /usr/include/X11/extensions
+	doins common/usr/X11R6/include/X11/extensions/fglrx_gamma.h
+
+	# Just the atigetsysteminfo.sh script.
+	into /usr
+	dosbin common/usr/sbin/*
+
+	# data files for the control panel.
+	insinto /usr/share
+	doins -r common/usr/share/ati
+	insinto /usr/share/pixmaps
+	doins common/usr/share/icons/ccc_{large,small}.xpm
+	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
+		ccc_large System
+
+	# doc.
+	dohtml -r common/usr/share/doc/fglrx
+
+	if use acpi; then
+		doman common/usr/share/man/man8/atieventsd.8
+
+		pushd common/usr/share/doc/fglrx/examples/etc/acpi >/dev/null
+
+		exeinto /etc/acpi
+		doexe ati-powermode.sh
+		insinto /etc/acpi/events
+		doins events/*
+
+		popd >/dev/null
+	fi
+
+	# Done with the "source" tree. Install tools we rebuilt:
+	dobin extra/fgl_glxgears/fgl_glxgears
+	newdoc extra/fgl_glxgears/README README.fgl_glxgears
+
+	dolib extra/lib/fglrx_gamma/*so*
+	newdoc extra/lib/fglrx_gamma/README README.libfglrx_gamma
+
+	dobin extra/programs/fglrx_gamma/fglrx_xgamma
+	doman extra/programs/fglrx_gamma/fglrx_xgamma.1
+	newdoc extra/programs/fglrx_gamma/README README.fglrx_gamma
+
+	# Gentoo-specific stuff:
+	if use acpi; then
+		newinitd "${FILESDIR}"/atieventsd.init atieventsd \
+			|| die "Failed to install atieventsd.init.d"
+		echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
+		newconfd "${T}"/atieventsd.conf atieventsd
+	fi
+}
+
+src_install-libs() {
+	if [[ "${ABI}" == "amd64" ]]; then
+		local EX_BASE_DIR="${BASE_DIR}_64a"
+		local pkglibdir=lib64
+		local MY_ARCH_DIR="${S}/arch/x86_64"
+	else
+		local EX_BASE_DIR="${BASE_DIR}"
+		local pkglibdir=lib
+		local MY_ARCH_DIR="${S}/arch/x86"
+	fi
+	einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
+
+	local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
+	# To make sure we do not miss a spot when these change.
+	local libmajor=1 libminor=2
+	local libver=${libmajor}.${libminor}
+
+	# The GLX libraries
+	# (yes, this really is "lib" even on amd64/multilib --marienz)
+	exeinto ${ATI_ROOT}/lib
+	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/libGL.so.${libver}
+	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
+	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
+
+	exeinto ${ATI_ROOT}/extensions
+	doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/*
+
+	# DRI modules, installed into the path used by recent versions of mesa.
+	exeinto /usr/$(get_libdir)/dri
+	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+
+	# AMD Cal libraries
+	exeinto /usr/$(get_libdir)
+	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/*.so
+
+	# Make up a libGL.la. Ati does not provide one, but mesa does. If
+	# a (libtool-based) libfoo is built with libGL.la present a
+	# reference to it is put into libfoo.la, and compiling
+	# (libtool-based) things that link too libfoo.la will complain if
+	# libGL.la disappears. So if we do not make up a libGL.la
+	# switching between mesa and ati becomes painful.
+	local revision=$(printf '%d%02d%02d' $(get_version_components))
+	sed -e "s:\${libmajor}:${libmajor}:g" \
+		-e "s:\${libminor}:${libminor}:g" \
+		-e "s:\${libdir}:$(get_libdir):g" \
+		-e "s:\${revision}:${revision}:g" \
+		"${FILESDIR}"/libGL.la.in > "${D}"/${ATI_ROOT}/lib/libGL.la \
+		|| die "sed failed to make libGL.la"
+
+	local envname="${T}"/04ati-dri-path
+	if [[ -n ${ABI} ]]; then
+		envname="${envname}-${ABI}"
+	fi
+	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
+	doenvd "${envname}"
+}
+
+pkg_postinst() {
+	/usr/bin/eselect opengl set --use-old ati
+
+	elog "To switch to ATI OpenGL, run \"eselect opengl set ati\""
+	elog "To change your xorg.conf you can use the bundled \"aticonfig\""
+	elog
+	elog "If you experience unexplained segmentation faults and kernel crashes"
+	elog "with this driver and multi-threaded applications such as wine,"
+	elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
+	elog
+	elog "You will have to source /etc/profile (or logout and back in) for dri"
+	elog "to work, unless you previously had ati-drivers installed."
+
+	# Workaroud screen corruption
+	ewarn "If you experience screen corruption with this driver, try putting"
+	ewarn '         Option "XAANoOffscreenPixmaps" "true"'
+	ewarn "in the Device Section of /etc/X11/xorg.conf."
+
+	linux-mod_pkg_postinst
+}
+
+pkg_prerm() {
+	/usr/bin/eselect opengl set xorg-x11
+}
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-xen.patch b/x11-drivers/ati-drivers/files/ati-drivers-xen.patch
new file mode 100644
index 000000000000..a1b88df7fa84
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/ati-drivers-xen.patch
@@ -0,0 +1,62 @@
+--- common/lib/modules/fglrx/build_mod/firegl_public.c	2008-12-09 15:17:27.000000000 +0000
++++ common/lib/modules/fglrx/build_mod/firegl_public.c	2008-12-09 15:12:34.000000000 +0000
+@@ -31,6 +31,9 @@
+ #include <linux/autoconf.h>
+ 
+ #if !defined(CONFIG_X86_PC) 
++#if !defined(CONFIG_X86_PC_XEN)
++#if !defined(CONFIG_X86_XEN)
++#if !defined(CONFIG_X86_64_XEN)
+ #if !defined(CONFIG_X86_64)
+ #if !defined(CONFIG_X86_VOYAGER)
+ #if !defined(CONFIG_X86_NUMAQ)
+@@ -47,6 +50,9 @@
+ #endif
+ #endif
+ #endif
++#endif
++#endif
++#endif
+ 
+ /* The dirty-page-tracking patch included in NLD 9 SMP kernels defines
+  * a static inline function that uses a GPL-only symbol in a header
+--- common/lib/modules/fglrx/build_mod/firegl_public.h	2008-12-09 15:17:27.000000000 +0000
++++ common/lib/modules/fglrx/build_mod/firegl_public.h	2008-12-09 15:15:45.000000000 +0000
+@@ -30,9 +30,13 @@
+ #endif
+ 
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
+-
++#ifdef CONFIG_XEN
++#define REMAP_PAGE_RANGE_FN io_remap_pfn_range
++#define REMAP_PAGE_RANGE_STR "io_remap_pfn_range"
++#else
+ #define REMAP_PAGE_RANGE_FN remap_pfn_range
+ #define REMAP_PAGE_RANGE_STR "remap_pfn_range"
++#endif
+ #define REMAP_PAGE_RANGE_OFF(offset) ((offset) >> PAGE_SHIFT)
+ 
+ #else /* LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,9) */
+@@ -43,13 +47,21 @@
+ 
+ #endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) */
+ 
++#ifdef CONFIG_XEN
++#define REMAP_PAGE_RANGE(vma,offset) \
++    REMAP_PAGE_RANGE_FN((vma), \
++                        (vma)->vm_start,       \
++                        REMAP_PAGE_RANGE_OFF(offset), \
++                        (vma)->vm_end - (vma)->vm_start, \
++                        (vma)->vm_page_prot)
++#else
+ #define REMAP_PAGE_RANGE(vma,offset) \
+     REMAP_PAGE_RANGE_FN(FGL_VMA_API_PASS \
+                         (vma)->vm_start,	\
+                         REMAP_PAGE_RANGE_OFF(offset), \
+                         (vma)->vm_end - (vma)->vm_start, \
+                         (vma)->vm_page_prot)
+-
++#endif
+ 
+ /* Page table macros */
+ 
diff --git a/x11-drivers/ati-drivers/files/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/ati-powermode-opt-path-2.patch
new file mode 100644
index 000000000000..f5a35a304ec4
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/ati-powermode-opt-path-2.patch
@@ -0,0 +1,42 @@
+diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh
+--- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-07-28 04:22:36.000000000 +0100
++++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-08-04 12:19:42.000000000 +0100
+@@ -4,6 +4,8 @@
+ # Control script for ACPI lid state and AC adapter state
+ #
+ 
++aticonfig='/opt/bin/aticonfig'
++
+ getXuser() {
+         user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'`
+         if [ x"$user" = x"" ]; then
+@@ -47,7 +49,7 @@
+ done
+ 
+ #If PPLIB is enabled
+-su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB
++su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB
+ if [ $? = 0 ]; then
+    echo "Has PPLIB"
+    has_pplib=1
+@@ -61,15 +63,15 @@
+ if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then
+     echo "Low power"
+     if [ ${has_pplib} -eq 1 ]; then
+-        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"'
++        su $user -c '$aticonfig --pplib-cmd="notify psrc dc"'
+     else
+-        su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now"
++        su $user -c "$aticonfig --set-powerstate=1"
+     fi
+ else
+     echo "high power"
+     if [ ${has_pplib} -eq 1 ]; then
+-        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"'
++        su $user -c '$aticonfig --pplib-cmd="notify psrc ac"'
+     else
+-        su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now"
++	su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)"
+     fi
+ fi
+