Version bump with improvements from Bugs Bunny <anarchpenguin@gmail.com>, closes bug #175337 and should fix bug #169125.

Package-Manager: portage-2.1.2.7

4 files changed, 426 insertions, 8 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 1ef50210a32b..bb36437fca19 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.73 2007/05/18 23:58:01 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.74 2007/05/24 22:22:47 marienz Exp $
+
+*ati-drivers-8.36.5 (24 May 2007)
+
+  24 May 2007; Marien Zwart <marienz@gentoo.org> +ati-drivers-8.36.5.ebuild:
+  Version bump with improvements from Bugs Bunny <anarchpenguin@gmail.com>,
+  closes bug #175337 and should fix bug #169125.
 
   18 May 2007; Marien Zwart <marienz@gentoo.org> files/atieventsd.init:
   Fix line endings issue (bug #179062), thanks to Elias Probst
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index c7d8a6ec2016..1280a7b97b45 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -50,6 +50,7 @@ DIST ati-driver-installer-8.32.5-x86.x86_64.run 58503169 RMD160 45bf6649227081f6
 DIST ati-driver-installer-8.33.6-x86.x86_64.run 58620730 RMD160 141531330a77d2981d56fd5682d3220d757cc51d SHA1 d1c364698e524da3f4cd8d43bfbd2cd261ed0ae3 SHA256 7e758637c578fe00de00e2bcdf561d92036c73125ef98512be7f1a1405e8f2ae
 DIST ati-driver-installer-8.34.8-x86.x86_64.run 49705555 RMD160 c778c5070673f3b027f5e5cdd2cfbd86e4318ffc SHA1 d7bd2804ecf5aa067aa6b1f3b3adeb8767243e79 SHA256 936f74031151fc9cf09fd8da035bd0cab3b8e6f56ffd76e8feb1f431196e915b
 DIST ati-driver-installer-8.35.5-x86.x86_64.run 57314907 RMD160 a398b0b1f5ac6ca8b56b91064ab39412dc039188 SHA1 07d02058a958a20c9b80a1802ff64524ad9a8b95 SHA256 c366ce2b53127307b1d6f301df6e060cff2b7145cb10605c864ca084e01c3414
+DIST ati-driver-installer-8.36.5-x86.x86_64.run 53331877 RMD160 5581d7ad761f60c874f7c2cd59b1d95506a2ea23 SHA1 c0edc17d1816ec7415d64d0cc85193060f61e080 SHA256 217cc46fed71eabfc3852f09f460d630dedad16bb7e86c2d761e06f6c0e0e8d1
 EBUILD ati-drivers-8.27.10-r1.ebuild 11064 RMD160 4e421f43e2a19cb5486ba90aef8a20f7940db809 SHA1 f2e114908275d963ecaa0c1c08f037d96e3e749d SHA256 a7372cde7098ca995f34a6bbc994120ea9ed7db20d535bc5969702ac176353cd
 MD5 dd800b74e110ef7f3179cdd3a68fb565 ati-drivers-8.27.10-r1.ebuild 11064
 RMD160 4e421f43e2a19cb5486ba90aef8a20f7940db809 ati-drivers-8.27.10-r1.ebuild 11064
@@ -94,10 +95,14 @@ EBUILD ati-drivers-8.35.5.ebuild 13637 RMD160 409342e19000b16acb5afae36f3b52f940
 MD5 33843b6a5f9d09348a5e130aeca3f6d6 ati-drivers-8.35.5.ebuild 13637
 RMD160 409342e19000b16acb5afae36f3b52f9408d67e6 ati-drivers-8.35.5.ebuild 13637
 SHA256 3b9a316507e0d3d3c3413454bdbe882f6c4a4dd609039256533f607b492abdb2 ati-drivers-8.35.5.ebuild 13637
-MISC ChangeLog 37117 RMD160 2acdd5d439228223090c8c49261842c2b8241508 SHA1 52099f387ea5d20c242c84ca32f7c0d1cb250a86 SHA256 7b62beed7c4f19a490f22eff8302e0d807d78992a3fcfeb8e7b9cffa9799dc47
-MD5 2ca75f3c8724b14e73eee5d7f401309c ChangeLog 37117
-RMD160 2acdd5d439228223090c8c49261842c2b8241508 ChangeLog 37117
-SHA256 7b62beed7c4f19a490f22eff8302e0d807d78992a3fcfeb8e7b9cffa9799dc47 ChangeLog 37117
+EBUILD ati-drivers-8.36.5.ebuild 13124 RMD160 8cd33fcd52cb2279bcbc2c436f2c2ce12b988c53 SHA1 8932b7a2eba40e1b3584a0d0a89f8f8b4d8350d6 SHA256 07aa031b2c3b6b7638c593733f6f29ae311e72e8f6fcef55b96b8f5caa4d3377
+MD5 d86c4ae0f7804254982b918eb3ff4d1f ati-drivers-8.36.5.ebuild 13124
+RMD160 8cd33fcd52cb2279bcbc2c436f2c2ce12b988c53 ati-drivers-8.36.5.ebuild 13124
+SHA256 07aa031b2c3b6b7638c593733f6f29ae311e72e8f6fcef55b96b8f5caa4d3377 ati-drivers-8.36.5.ebuild 13124
+MISC ChangeLog 37355 RMD160 53a9a53cbad1fec1bfe86cf34cf67832aeb0401e SHA1 5ee9d88223aa4fa63f55544cd58e9dfad862d0e5 SHA256 d3a7c8cf446d220256729b883cdc8500154eacdad45747035f4c4dcb30589103
+MD5 d016df6abf3c435e3b7e41e034af7e4f ChangeLog 37355
+RMD160 53a9a53cbad1fec1bfe86cf34cf67832aeb0401e ChangeLog 37355
+SHA256 d3a7c8cf446d220256729b883cdc8500154eacdad45747035f4c4dcb30589103 ChangeLog 37355
 MISC metadata.xml 494 RMD160 6c0f807a9fcdcaee2e28906992a35dd87d24ff0a SHA1 3ba9ee03c89575c03788c087c2dea8c208b398e9 SHA256 457f40aec01e7f047adfab46ed13813853102027c1f4cd68efa45a2bd39aff08
 MD5 f462ad2ddb101d99fc4860e39a197a9f metadata.xml 494
 RMD160 6c0f807a9fcdcaee2e28906992a35dd87d24ff0a metadata.xml 494
@@ -135,10 +140,13 @@ SHA256 817e0ef6514267acd75aa95716be2b008a506029776060602d491985f1616d4f files/di
 MD5 629cc26aa6be0ad6147ead5e0cfe21fd files/digest-ati-drivers-8.35.5 313
 RMD160 2b39001d5ced42f09891ea062ed1bde31c9cbfb2 files/digest-ati-drivers-8.35.5 313
 SHA256 659a782745be00b18560605815672be5383db3e4cbe267c299c2777048421f67 files/digest-ati-drivers-8.35.5 313
+MD5 0a1221c6a3dfb79b5f10053b80e6ccfb files/digest-ati-drivers-8.36.5 313
+RMD160 7105cac2defbf243c6a0e67fb786669041efeede files/digest-ati-drivers-8.36.5 313
+SHA256 ab93e3b6c75657e038f051d598c0051fe1a63736cbdd392fe7c98a8f12625c37 files/digest-ati-drivers-8.36.5 313
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGTj2oUElL7eJpfEQRAtFuAKCm4miqoi0qdbZPRMMu2P8QBm9mZgCgiqB3
-k3cxgck59f/2lXXX+a1DHQw=
-=CC88
+iD8DBQFGVhBpUElL7eJpfEQRAtwpAJ9lss33iFTlIdyQFCmj5Qe0/kqNUgCfaBza
+M01Ww1VKhpcBsJ6xQ2OlakI=
+=olFo
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.36.5.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.36.5.ebuild
new file mode 100644
index 000000000000..c8d459d48402
--- /dev/null
+++ b/x11-drivers/ati-drivers/ati-drivers-8.36.5.ebuild
@@ -0,0 +1,401 @@
+# Copyright 1999-2007 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.36.5.ebuild,v 1.1 2007/05/24 22:22:47 marienz Exp $
+
+IUSE="acpi qt3"
+
+inherit eutils multilib linux-mod toolchain-funcs
+
+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-${PV}-x86.x86_64.run"
+
+LICENSE="ATI GPL-2 QPL-1.0"
+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
+	!x11-apps/ati-drivers-extra
+	>=app-admin/eselect-1.0.9
+	app-admin/eselect-opengl
+	=virtual/libstdc++-3.3*
+	acpi? (
+		x11-apps/xauth
+		sys-power/acpid
+	)
+	qt3? ( =x11-libs/qt-3* )
+	>=sys-apps/portage-2.1.1-r1"
+
+DEPEND="${RDEPEND}
+	x11-proto/xf86miscproto
+	x11-proto/xf86vidmodeproto"
+
+# Ignore QA warnings about multilib-pkg-force not existing:
+# multilib.eclass uses it (without it we do not install the 32 bit
+# libraries on amd64) --marienz
+RESTRICT="multilib-pkg-force"
+
+QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so
+	usr/lib/opengl/ati/lib/libGL.so.1.2
+	opt/bin/amdcccle"
+QA_EXECSTACK_amd64="usr/lib64/dri/fglrx_dri.so
+	usr/lib32/dri/fglrx_dri.so
+	usr/lib64/opengl/ati/lib/libGL.so.1.2
+	usr/lib32/opengl/ati/lib/libGL.so.1.2
+	opt/bin/amdcccle"
+QA_TEXTRELS_x86="usr/lib/dri/fglrx_dri.so
+	usr/lib/xorg/modules/drivers/fglrx_drv.so
+	usr/lib/opengl/ati/lib/libGL.so.1.2"
+QA_TEXTRELS_amd64="
+	usr/lib64/opengl/ati/lib/libGL.so.1.2
+	usr/lib32/opengl/ati/lib/libGL.so.1.2
+	usr/lib64/dri/fglrx_dri.so
+	usr/lib32/dri/fglrx_dri.so"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	#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 2 6; then
+		eerror "Need a 2.6 kernel to compile against!"
+		die "Need a 2.6 kernel to compile against!"
+	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
+
+	# xorg-server 1.1 and its prereleases correspond to xorg 7.1.
+	if has_version ">=x11-base/xorg-server-1.0.99"; then
+		BASE_DIR="${S}/x710"
+	else
+		BASE_DIR="${S}/x690"
+	fi
+
+	if use amd64 ; then
+		BASE_DIR="${BASE_DIR}_64a"
+		# This is used like $(get_libdir) for paths in ati's package.
+		PKG_LIBDIR=lib64
+		ARCH_DIR="${S}/arch/x86_64"
+	else
+		PKG_LIBDIR=lib
+		ARCH_DIR="${S}/arch/x86"
+	fi
+}
+
+src_unpack() {
+	local src="${DISTDIR}/${A}"
+	# This is apparently a nonstandard makeself archive, so extract
+	# the offset by hand.
+	local offset=$(grep -am1 SKIP "${src}" | sed -e 's/SKIP="\([0-9]\+\)"/\1/')
+	# It is off by one because of an (unused) checksum field.
+	unpack_makeself "${src}" $(( offset + 1 )) tail || die "unpack failed"
+
+	gunzip common/usr/share/man/man8/atieventsd.8 || die "manpage unzip failed"
+	# These are the userspace utilities that we also have source for.
+	# We rebuild those in ati-drivers-extra.
+	rm \
+		"${ARCH_DIR}"/usr/X11R6/bin/{fgl_glxgears,fglrx_xgamma} \
+		"${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \
+		|| die "bin rm failed"
+
+	if use acpi; then
+		sed -i \
+			-e "s:/var/lib/xdm/authdir/:/etc/X11/xdm/authdir/:" \
+			-e "s:/var/lib/gdm/:/var/gdm/:" \
+			-e "s/#ffff#/#ffff##:.*MIT-MAGIC-COOKIE/" \
+			"${S}/common/etc/ati/authatieventsd.sh" \
+			|| die "sed failed."
+
+		# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/
+		epatch "${FILESDIR}"/ati-powermode-opt-path.patch
+	fi
+
+	pushd common/lib/modules/fglrx/build_mod >/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 panel extra || die "mkdirs failed"
+	# The ./ in these unpacks is required (or unpack looks in ${DISTDIR})
+	if use qt3; then
+		cd panel
+		unpack ./../common/usr/src/ati/fglrx_panel_sources.tgz
+		cd ..
+	fi
+	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_fglxgears ${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"
+
+	if use qt3; then
+		einfo "Building the QT panel"
+		cd "${S}"/panel
+		emake CDEBFLAGS="${CFLAGS}" CCDEBFLAGS="${CXXFLAGS}" STRIP=true \
+			|| die "panel build failed"
+	fi
+}
+
+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 "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
+	exeinto /usr/$(get_libdir)/xorg/modules/linux
+	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
+	exeinto /usr/$(get_libdir)/xorg/modules
+	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{esut.a,glesx.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/{fglrxprofiles.csv,fglrxrc,logo*}
+	if use acpi; then
+		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.xpm 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_fglxgears
+	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
+
+	if use qt3; then
+		dobin panel/fireglcontrol
+		make_desktop_entry fireglcontrol 'ATI Control' ati.xpm System
+		insinto /usr/share/pixmaps
+		doins common/usr/share/icons/ati.xpm
+	fi
+
+	# Gentoo-specific stuff:
+
+	if use acpi; then
+		newinitd "${FILESDIR}"/atieventsd.init atieventsd
+		echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
+		newconfd "${T}"/atieventsd.conf atieventsd
+	fi
+}
+
+src_install-libs() {
+	if [[ "${ABI}" == "amd64" ]]; then
+		local pkglibdir=lib64
+	else
+		local pkglibdir=lib
+	fi
+	einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
+
+	local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
+
+	# The GLX libraries
+	# (yes, this really is "lib" even on amd64/multilib --marienz)
+	exeinto ${ATI_ROOT}/lib
+	doexe "${ARCH_DIR}"/usr/X11R6/${pkglibdir}/libGL.so.1.2
+	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1
+	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so
+
+	# Same as the xorg implementation (eselect opengl does not fall
+	# back to xorg-x11 if we omit this symlink, meaning no glx).
+	dosym ../xorg-x11/extensions ${ATI_ROOT}/extensions
+
+	# DRI modules, installed into the path used by recent versions of mesa.
+	exeinto /usr/$(get_libdir)/dri
+	doexe "${ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+
+	local envname="${T}"/04ati-dri-path
+	if [[ -n ${ABI} ]]; then
+		envname="${envname}-${ABI}"
+	fi
+	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
+	doenvd "${envname}"
+}
+
+pkg_postinst() {
+	/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
+	# (to get the LIBGL_DRIVERS_PATH)
+	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."
+	# DRM module
+	linux-mod_pkg_postinst
+}
+
+pkg_postrm() {
+	linux-mod_pkg_postrm
+	/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.36.5 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.36.5
new file mode 100644
index 000000000000..c97e9ce7bdc7
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.36.5
@@ -0,0 +1,3 @@
+MD5 bf056417ac6c57acdf5e5a6bb99a7dae ati-driver-installer-8.36.5-x86.x86_64.run 53331877
+RMD160 5581d7ad761f60c874f7c2cd59b1d95506a2ea23 ati-driver-installer-8.36.5-x86.x86_64.run 53331877
+SHA256 217cc46fed71eabfc3852f09f460d630dedad16bb7e86c2d761e06f6c0e0e8d1 ati-driver-installer-8.36.5-x86.x86_64.run 53331877