Fix to work with xorg 7.0, fix eventsd init script, fix power state restore, thanks to Armando Di Cianno and Christian Affolter in bug #139458

Package-Manager: portage-2.1.1_pre4-r2

6 files changed, 466 insertions, 14 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 4e5164d62722..2331aa43ff20 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.46 2006/08/01 22:44:42 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.47 2006/08/04 12:20:19 chrb Exp $
+
+*ati-drivers-8.27.10-r1 (04 Aug 2006)
+
+  04 Aug 2006; Chris Bainbridge <chrb@gentoo.org>
+  +files/ati-powermode.sh.patch, files/atieventsd.rc6,
+  +ati-drivers-8.27.10-r1.ebuild:
+  Fix to work with xorg 7.0, fix eventsd init script, fix power state restore,
+  thanks to Armando Di Cianno and Christian Affolter in bug #139458
 
 *ati-drivers-8.27.10 (01 Aug 2006)
 
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index de4a36a0c63b..c0c1471d3591 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -30,10 +30,14 @@ AUX ati-drivers-8.23.7-noiommu.patch 407 RMD160 12b506cb26db5ebfe11db3d0d9090080
 MD5 e33c06b8983330741fe60ab12265a144 files/ati-drivers-8.23.7-noiommu.patch 407
 RMD160 12b506cb26db5ebfe11db3d0d909008008dfac79 files/ati-drivers-8.23.7-noiommu.patch 407
 SHA256 ad666b54963a14aab83a04beed38902df4a586e0de25778905fe00a1cec37b54 files/ati-drivers-8.23.7-noiommu.patch 407
-AUX atieventsd.rc6 519 RMD160 9126fda7dd9839d265e66fb01a23282518899029 SHA1 df59bdcb587611ba175ba5c465feb30141f1f03c SHA256 483631a05b058d53dd943e3ac1a373742f8dff4532e22beb6de1cda9e898d2ea
-MD5 d1e17cbbc3cc09dd377e0ba1602075a4 files/atieventsd.rc6 519
-RMD160 9126fda7dd9839d265e66fb01a23282518899029 files/atieventsd.rc6 519
-SHA256 483631a05b058d53dd943e3ac1a373742f8dff4532e22beb6de1cda9e898d2ea files/atieventsd.rc6 519
+AUX ati-powermode.sh.patch 1142 RMD160 b81cdd4d2a49c2f7b04f7e00e4391b4e0ad67a40 SHA1 eef7f658474ca8e9e66ee1955a851782eba4dd0e SHA256 050602d5e0656961c0b16a75b470a7327a9e8b16f7d0ae3228341b3a8dcc9289
+MD5 c3d42d3e0ad9acb6b682d7d7c27e6489 files/ati-powermode.sh.patch 1142
+RMD160 b81cdd4d2a49c2f7b04f7e00e4391b4e0ad67a40 files/ati-powermode.sh.patch 1142
+SHA256 050602d5e0656961c0b16a75b470a7327a9e8b16f7d0ae3228341b3a8dcc9289 files/ati-powermode.sh.patch 1142
+AUX atieventsd.rc6 590 RMD160 fbf8aba7ada36aed666d506d6b0f7146e1b2f4ad SHA1 b2b457a4122f0a3a5db785df46880351d795fb25 SHA256 a00aa241e53b21872218bd247bfdb6292a075d9ef641f36198d8f4e399cc025e
+MD5 07a53c230d412cbfbd4a76954c5c85bb files/atieventsd.rc6 590
+RMD160 fbf8aba7ada36aed666d506d6b0f7146e1b2f4ad files/atieventsd.rc6 590
+SHA256 a00aa241e53b21872218bd247bfdb6292a075d9ef641f36198d8f4e399cc025e files/atieventsd.rc6 590
 AUX fglrx-2.6.12-inter_module_get.patch 1265 RMD160 1c349a894ed606b8f51b4caf0b63a0dc152626f8 SHA1 8f9345252cf6cc385136a4473f75e24fa6d28a9d SHA256 f1aedd70278cb8a11fdc9139ab698056dcc7ad2922aaa902fa7a8816ec10c43b
 MD5 9ae27a9d7736cb6ce30b41ff384004d8 files/fglrx-2.6.12-inter_module_get.patch 1265
 RMD160 1c349a894ed606b8f51b4caf0b63a0dc152626f8 files/fglrx-2.6.12-inter_module_get.patch 1265
@@ -78,8 +82,8 @@ DIST ati-driver-installer-8.23.7-i386.run 34448865 RMD160 f4f31ed77e84e9dc5a2885
 DIST ati-driver-installer-8.23.7-x86_64.run 28293314 RMD160 97c7b027622c2382be39751ddb249840d8269243 SHA256 a28e01b46c7187cb9542754a1b9621e1ba7f86d8803e44fed1a8c773ecf4341d
 DIST ati-driver-installer-8.24.8-x86.run 36287485 RMD160 c20a2ad9101490cdbe867f752eb1126a8fe9d26d SHA256 8bf846799ce288473805c1dd5a7cb692385de7d2518453042c51ef3bc3c30c06
 DIST ati-driver-installer-8.24.8-x86_64.run 30189769 RMD160 daaa495cf2d7597496f9e4264cfd8ff15c546fd4 SHA256 83859f349af60821a609bb40344b99bb4c48ba35af01c189dceaa458ab9049c7
-DIST ati-driver-installer-8.25.18-x86.run 36270279 RMD160 644309288fae0674f2674fd998862f84d739254a SHA256 3da4f667b5382ede8ee05aa38e60bd0539e6f1699786ca9d8d3e953f31373f34
-DIST ati-driver-installer-8.25.18-x86_64.run 30487934 RMD160 51108aea2b771df97faaf0c1f45c8ca71c8019e4 SHA256 cd4da0c00b1eae4bfba5728c6c4ebfca28c06230912c5aad6bb4a15eeeae1801
+DIST ati-driver-installer-8.25.18-x86.run 36270279 RMD160 644309288fae0674f2674fd998862f84d739254a SHA1 f3597e62295739544a8cebd64562aff340f45c60 SHA256 3da4f667b5382ede8ee05aa38e60bd0539e6f1699786ca9d8d3e953f31373f34
+DIST ati-driver-installer-8.25.18-x86_64.run 30487934 RMD160 51108aea2b771df97faaf0c1f45c8ca71c8019e4 SHA1 fab0b6ead6644f214241f43026e99c318d9ee97e SHA256 cd4da0c00b1eae4bfba5728c6c4ebfca28c06230912c5aad6bb4a15eeeae1801
 DIST ati-driver-installer-8.26.18-x86.run 23716730 RMD160 dc9ab7862e6c0a1872ba48ad08842fdbb10d1414 SHA1 5c84a8d3526accccb0154c9d701948629f7ae45d SHA256 3376608d7a0049c30c9497e2f326ad2afe6b3874777f36af33b09019cbe71c55
 DIST ati-driver-installer-8.26.18-x86_64.run 30927154 RMD160 d4cf53f10fd7ca66cd52577c7e5e9bc42502f59f SHA1 3004c7fe409293ac2882ee7ef80addb92706fc35 SHA256 390eb44786b72cb09c78a995163155739f21d6ad121d22a9e6a72a18d9b5496f
 DIST ati-driver-installer-8.27.10-x86.run 25136032 RMD160 5080d72e97101b97da661019c00a89e01cf2abd6 SHA1 dc386ae275e7623d383a83b50b8685b53fe97f03 SHA256 444c2d957308793b1164ed013c724090900aae20fcd63ebf9001b795066fc4f0
@@ -174,14 +178,18 @@ EBUILD ati-drivers-8.26.18.ebuild 9709 RMD160 8e3be8c55c12e208ba8cf7498802cc2e26
 MD5 fd471cf445a3bd8c942ae87df01cea9c ati-drivers-8.26.18.ebuild 9709
 RMD160 8e3be8c55c12e208ba8cf7498802cc2e26bcac4a ati-drivers-8.26.18.ebuild 9709
 SHA256 2072e45d32b6610948f71b9407e247695f06dd06c64c549a42ddb6eef37f7772 ati-drivers-8.26.18.ebuild 9709
+EBUILD ati-drivers-8.27.10-r1.ebuild 11280 RMD160 0e66ba5fab7370de54a59a8fba0363b5aa8833b7 SHA1 e368e9a435ed55d68dc6c7a4ac2c3b99a65ac066 SHA256 6e81632acf70d3497975a85b72dbba6a4b6f105014323622ed08c63e97279f23
+MD5 52dc812e7a27aabd7fbef50c382751be ati-drivers-8.27.10-r1.ebuild 11280
+RMD160 0e66ba5fab7370de54a59a8fba0363b5aa8833b7 ati-drivers-8.27.10-r1.ebuild 11280
+SHA256 6e81632acf70d3497975a85b72dbba6a4b6f105014323622ed08c63e97279f23 ati-drivers-8.27.10-r1.ebuild 11280
 EBUILD ati-drivers-8.27.10.ebuild 11111 RMD160 a703a71ca00a1c1daacafcc0a6069c95e8933342 SHA1 138fe0d528ba6dde40fb82bdd75184aad4d53288 SHA256 4a8e4ff64a4cf7ae84f1885aa2d2ab53c772026cd0930e0858059a9078796470
 MD5 0ad9d5094c34dbcd6e4df0081dda1b3b ati-drivers-8.27.10.ebuild 11111
 RMD160 a703a71ca00a1c1daacafcc0a6069c95e8933342 ati-drivers-8.27.10.ebuild 11111
 SHA256 4a8e4ff64a4cf7ae84f1885aa2d2ab53c772026cd0930e0858059a9078796470 ati-drivers-8.27.10.ebuild 11111
-MISC ChangeLog 30632 RMD160 a20fe9ae6bebdf81a5bd6730da5462cf25a38e61 SHA1 bf524593dc17298b94752eb232e52876709dc166 SHA256 84363b078830fec978c8eea6c6f427754d522283a44b26adc6b627c5661cd166
-MD5 4c15ca52ed79acba9fcc1238251caa4b ChangeLog 30632
-RMD160 a20fe9ae6bebdf81a5bd6730da5462cf25a38e61 ChangeLog 30632
-SHA256 84363b078830fec978c8eea6c6f427754d522283a44b26adc6b627c5661cd166 ChangeLog 30632
+MISC ChangeLog 30955 RMD160 3f16584952a6780dbef4bedb795d797574801498 SHA1 f39cd21f36acd03e730a08600b5f42080270e571 SHA256 968ac53d8331b27250565a05b4c27bbb810512512d75d28b6ee37a77a0397f56
+MD5 b93fe69b749155cbd799d5507e075349 ChangeLog 30955
+RMD160 3f16584952a6780dbef4bedb795d797574801498 ChangeLog 30955
+SHA256 968ac53d8331b27250565a05b4c27bbb810512512d75d28b6ee37a77a0397f56 ChangeLog 30955
 MISC metadata.xml 227 RMD160 e2ed1445a0405b39e40741d3d1f67746daab8fff SHA1 47e1824ff5e7e3789fcbb4ca5de9c3ccd9162b76 SHA256 4fbed7030b32bcdc95b70000adbbcb6f1d73092c4a2f20e6cfb737a1b44d6e07
 MD5 c306bb93866a4dd8913899229dd20726 metadata.xml 227
 RMD160 e2ed1445a0405b39e40741d3d1f67746daab8fff metadata.xml 227
@@ -252,3 +260,6 @@ SHA256 180ded06d335b8f8053b8a8587d1707fe650e4915e87a7ca7315326e8727939f files/di
 MD5 918748360fc78a295d9b5495f3f6b762 files/digest-ati-drivers-8.27.10 599
 RMD160 400d87e50df2105715fe51eb3181598b4d9d3756 files/digest-ati-drivers-8.27.10 599
 SHA256 d4d707b283f07b61963445d17b9454993007acb26a60cf48ea82e01654f686d8 files/digest-ati-drivers-8.27.10 599
+MD5 918748360fc78a295d9b5495f3f6b762 files/digest-ati-drivers-8.27.10-r1 599
+RMD160 400d87e50df2105715fe51eb3181598b4d9d3756 files/digest-ati-drivers-8.27.10-r1 599
+SHA256 d4d707b283f07b61963445d17b9454993007acb26a60cf48ea82e01654f686d8 files/digest-ati-drivers-8.27.10-r1 599
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.27.10-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.27.10-r1.ebuild
new file mode 100644
index 000000000000..cd44c916bca9
--- /dev/null
+++ b/x11-drivers/ati-drivers/ati-drivers-8.27.10-r1.ebuild
@@ -0,0 +1,392 @@
+# Copyright 1999-2006 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.27.10-r1.ebuild,v 1.1 2006/08/04 12:20:19 chrb Exp $
+
+IUSE="acpi doc opengl"
+
+inherit eutils rpm multilib linux-mod linux-info toolchain-funcs
+
+DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
+HOMEPAGE="http://www.ati.com"
+ATI_URL="https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/"
+SRC_URI="x86?	( ${ATI_URL}/ati-driver-installer-${PV}-x86.run )
+		 amd64? ( ${ATI_URL}/64bit/ati-driver-installer-${PV}-x86_64.run )"
+
+LICENSE="ATI"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="|| ( x11-base/xorg-server virtual/x11 )
+	 app-admin/eselect-opengl
+	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )
+	 acpi? (
+	 	|| ( x11-apps/xauth virtual/x11 )
+	 	sys-power/acpid 
+	 )"
+
+DEPEND=">=virtual/linux-sources-2.4
+	${RDEPEND}"
+
+PROVIDE="virtual/opengl"
+
+ATIBIN="${D}/opt/ati/bin"
+RESTRICT="nostrip multilib-pkg-force stricter"
+
+MODULE_NAMES="fglrx(video:${WORKDIR}/common/lib/modules/fglrx/build_mod)"
+
+QA_EXECSTACK_x86="usr/lib/xorg/modules/dri/fglrx_dri.so"
+QA_EXECSTACK_amd64="usr/lib64/xorg/modules/dri/fglrx_dri.so usr/lib32/xorg/modules/dri/fglrx_dri.so"
+QA_TEXTREL_x86="usr/lib/xorg/modules/dri/fglrx_dri.so usr/lib/opengl/ati/lib/libGL.so.1.2"
+QA_TEXTREL_amd64="usr/lib64/xorg/modules/dri/fglrx_dri.so usr/lib32/opengl/ati/lib/libGL.so.1.2 usr/lib32/xorg/modules/dri/fglrx_dri.so usr/lib32/xorg/modules/dri/atiogl_a_dri.so"
+
+choose_driver_paths() {
+	ARCH_DIR="${WORKDIR}/arch"
+	COMMON_DIR="${WORKDIR}/common"
+
+	#new modular X paths, 0 is a workaround.
+	if has_version "x11-base/xorg-server"; then
+		if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 1 ] &&
+		   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" = 0 ] &&
+		   [ "$(get_version_component_range 3 ${X11_IMPLEM_V})" = 99 ] ||
+		   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" != 0 ]
+		then
+			BASE_DIR="${WORKDIR}/x710"
+		else
+			BASE_DIR="${WORKDIR}/x690"
+		fi
+			xlibdir="xorg"
+	else
+		BASE_DIR="${WORKDIR}/x$(get_version_component_range 1 ${X11_IMPLEM_V})"
+		xlibdir=""
+
+		# Determine if we are facing X.org 6.8.99 aka 6.9
+		if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 6 ] &&
+		   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" = 8 ] &&
+		   [ "$(get_version_component_range 3 ${X11_IMPLEM_V})" = 99 ]
+		then
+			BASE_DIR="${BASE_DIR}90"
+		else
+			BASE_DIR="${BASE_DIR}$(get_version_component_range 2 ${X11_IMPLEM_V})0"
+		fi
+	fi
+
+	if use amd64 ; then
+		BASE_DIR="${BASE_DIR}_64a"
+		ARCH_DIR="${ARCH_DIR}/x86_64"
+	else
+		ARCH_DIR="${ARCH_DIR}/x86"
+	fi
+}
+
+pkg_setup(){
+	#check kernel and sets up KV_OBJ
+	linux-mod_pkg_setup
+	local agp
+	ebegin "Checking for MTRR support enabled"
+	linux_chkconfig_present MTRR
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You don't have MTRR support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+
+	ebegin "Checking for AGP support enabled"
+	linux_chkconfig_present AGP
+	eend $?
+
+	if [[ $? -ne 0 ]] ; then
+
+		ebegin "Checking for PCI Express support enabled"
+		linux_chkconfig_present PCIEPORTBUS
+		eend $?
+
+		if [[ $? -ne 0 ]] ; then
+			ewarn "If you don't have either AGP or PCI Express support enabled, direct rendering"
+			ewarn "could work only using the internal support."
+		fi
+
+	fi
+	ebegin "Checking for DRM support disabled"
+	! linux_chkconfig_builtin DRM
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You have DRM support enabled builtin, the direct rendering"
+	ewarn "will not work."
+	fi
+
+	# Set up X11 implementation
+	if has_version "x11-base/xorg-server"; then
+		X11_IMPLEM=xorg-x11
+		X11_IMPLEM_V="$(best_version x11-base/xorg-server)"
+		X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}"
+	elif has_version "<x11-base/xorg-x11-6.8.99"; then
+		X11_IMPLEM=xorg-x11
+		X11_IMPLEM_V="$(best_version x11-base/xorg-x11)"
+		X11_IMPLEM_V="${X11_IMPLEM_V/${X11_IMPLEM}-/}"
+		X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
+	else
+		X11_IMPLEM_P="$(best_version virtual/x11)"
+		X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
+		X11_IMPLEM="${X11_IMPLEM##*\/}"
+		X11_IMPLEM_V="${X11_IMPLEM_P/${X11_IMPLEM}-/}"
+		X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
+	fi
+	einfo "X11 implementation is ${X11_IMPLEM}."
+	choose_driver_paths
+}
+
+src_unpack() {
+	local OLDBIN="/usr/X11R6/bin"
+
+	ebegin "Unpacking Ati drivers"
+	sh ${DISTDIR}/${A} --extract ${WORKDIR} &> /dev/null
+	eend $? || die "unpack failed"
+
+	rm -rf ${ARCH_DIR}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel}
+
+	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/" \
+		"${WORKDIR}/common/etc/ati/authatieventsd.sh" \
+			|| die "sed failed."
+
+		cd ${WORKDIR}
+		epatch ${FILESDIR}/ati-powermode.sh.patch
+	fi
+}
+
+src_compile() {
+	einfo "Building the DRM module..."
+	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
+	ln -s \
+	${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
+	|| die "cannot find precompiled core"
+
+	if kernel_is 2 6
+	then
+		set_arch_to_kernel
+		addwrite "/usr/src/${FK}"
+		cp 2.6.x/Makefile .
+		export _POSIX2_VERSION="199209"
+		if use_m ;
+		then
+			make -C ${KV_DIR} M="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		else
+			make -C ${KV_DIR} SUBDIRS="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		fi
+		set_arch_to_portage
+	else
+		export _POSIX2_VERSION="199209"
+		# That is the dirty way to avoid the id -u check
+		sed -e 's:`id -u`:0:' \
+			-e "s:\`uname -r\`:${KV_FULL}:" \
+			-i make.sh
+		chmod +x make.sh
+		./make.sh || ewarn "DRM module not built"
+	fi
+}
+
+pkg_preinst() {
+	# Clean the dynamic libGL stuff's home to ensure
+	# we don't have stale libs floating around ...
+	if [ -d "${ROOT}/usr/lib/opengl/ati" ]
+	then
+		rm -rf ${ROOT}/usr/lib/opengl/ati/*
+	fi
+}
+
+src_install() {
+	local ATI_LIBGL_PATH=""
+	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
+	linux-mod_src_install
+
+	cd ${WORKDIR}
+
+	local native_dir
+	use x86 && native_dir="lib"
+	use amd64 && native_dir="lib64"
+
+	# Install the libs
+	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+	local MLTEST=$(type dyn_unpack)
+	if [ "${MLTEST/set_abi/}" = "${MLTEST}" ] && has_multilib_profile; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	elif has_multilib_profile; then
+		src_install-libs
+	elif use amd64; then
+		src_install-libs lib $(get_multilibdir)
+		src_install-libs lib64 $(get_libdir)
+	else
+		src_install-libs
+	fi &> /dev/null
+
+	#apps, man pages, and conf files
+	exeinto /opt/ati/bin
+	doexe ${ARCH_DIR}/usr/X11R6/bin/*
+	if use acpi
+	then
+		exeinto /opt/ati/sbin
+		doexe ${ARCH_DIR}/usr/sbin/*
+		insinto /opt/ati/man/man8
+		doins common/usr/share/man/man8/*
+		newinitd ${FILESDIR}/atieventsd.rc6 atieventsd
+		dodir /etc/conf.d
+		echo 'ATIEVENTSDOPTS=""' > ${D}/etc/conf.d/atieventsd
+	fi
+	#ati custom stuff
+	insinto /usr
+	doins -r ${WORKDIR}/common/usr/include
+
+	#documentation
+	if use doc; then
+		dodir /usr/share/doc/fglrx
+		cp -pPR common/usr/share/doc/fglrx/* \
+			${D}/usr/share/doc/fglrx
+	fi
+
+	#env.d entry
+	cp ${FILESDIR}/09ati ${T}/
+
+	if use acpi
+	then
+		local ATIETC="${WORKDIR}/common/usr/share/doc/fglrx/examples/etc/acpi"
+		exeinto /etc/acpi
+		doexe ${ATIETC}/ati-powermode.sh
+		insinto /etc/acpi/events
+		doins ${ATIETC}/events/a-ac-aticonfig
+		doins ${ATIETC}/events/a-lid-aticonfig
+	fi
+
+	#Work around hardcoded path in 32bit libGL.so on amd64, bug 101539
+	if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then
+		ATI_LIBGL_PATH="/usr/lib/dri:/usr/$(get_libdir)/dri:/usr/lib32/${xlibdir}/modules/dri/:/usr/$(get_libdir)/${xlibdir}/modules/dri"
+	fi
+		cat >>${T}/09ati <<EOF
+
+LIBGL_DRIVERS_PATH="\$LIBGL_DRIVERS_PATH:$ATI_LIBGL_PATH"
+EOF
+
+	doenvd ${T}/09ati
+}
+
+src_install-libs() {
+	local pkglibdir=lib
+	local inslibdir="$(get_libdir)/${xlibdir}"
+	ATI_LIBGL_PATH="${ATI_LIBGL_PATH}:/usr/$(get_libdir)/${xlibdir}/modules/dri"
+	if [ ${#} -eq 2 ]; then
+		pkglibdir=${1}
+		inslibdir=${2}
+	elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then
+		pkglibdir=lib64
+	fi
+
+	einfo "${pkglibdir} -> ${inslibdir}"
+
+	local ATI_ROOT="/usr/$(get_libdir)/opengl/ati"
+
+	# The GLX libraries
+	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
+
+	# Don't do this... see bug #47598
+	#dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
+
+	# same as the xorg implementation
+	dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions
+	#Workaround
+	if use opengl ; then
+	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
+		/usr/$(get_libdir)/opengl/${X11_IMPLEM}/lib/libGL.la \
+		> $D/${ATI_ROOT}/lib/libGL.la
+	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
+	fi
+	# X and DRI driver
+	if has_version "<x11-base/xorg-x11-6.8.0-r4"
+	then
+		local X11_DIR="/usr/X11R6/"
+	else
+		local X11_DIR="/usr/"
+	fi
+
+	local X11_LIB_DIR="${X11_DIR}${inslibdir}"
+
+	exeinto ${X11_LIB_DIR}/modules/drivers
+	# In X.org 6.8.99 / 6.9 this is a .so
+	doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.*o
+
+	exeinto ${X11_LIB_DIR}/modules/dri
+	doexe ${ARCH_DIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+	doexe ${ARCH_DIR}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so
+
+	exeinto ${X11_LIB_DIR}/modules/linux
+	# In X.org 6.8.99 / 6.9 this is a .so
+	if has_version ">=x11-base/xorg-x11-6.8.99" || \
+		has_version "x11-base/xorg-server"
+	then
+		doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so
+	else
+		doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
+	fi
+
+	if has_version ">=x11-base/xorg-x11-6.8.99" || \
+		has_version "x11-base/xorg-server"
+	then
+		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig} \
+			${D}/usr/$(get_libdir)
+	else
+		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig.a} \
+			${D}/usr/$(get_libdir)
+	fi
+
+	#Not the best place
+	insinto ${X11_DIR}/include/X11/extensions
+	doins ${COMMON_DIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
+
+	# misc ati configuration files for /etc
+	dodir /etc
+	cp -pP ${COMMON_DIR}/etc/fglrxprofiles.csv ${D}/etc/
+	cp -pP ${COMMON_DIR}/etc/fglrxrc ${D}/etc/
+	dodir /etc/ati
+	cp -pP ${COMMON_DIR}/etc/ati/logo* ${D}/etc/ati/
+	if use acpi
+	then
+		cp -pP ${COMMON_DIR}/etc/ati/authatieventsd.sh ${D}/etc/ati/
+	fi
+}
+
+
+pkg_postinst() {
+	/usr/bin/eselect opengl set --use-old ati
+
+	echo
+	einfo "To switch to ATI OpenGL, run \"eselect opengl set ati\""
+	einfo "To change your xorg.conf you can use the bundled \"aticonfig\""
+	if use !opengl ; then
+	ewarn "You don't have the opengl useflag enabled, you won't be able to build"
+	ewarn "opengl applications nor use opengl driver features, if that isn't"
+	ewarn "the intended behaviour please add opengl to your useflag and issue"
+	ewarn "# emerge -Nu ati-drivers"
+	fi
+	echo
+	einfo "If you experience unexplained segmentation faults and kernel crashes"
+	einfo "with this driver and multi-threaded applications such as wine,"
+	einfo "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
+	# 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/ati-powermode.sh.patch b/x11-drivers/ati-drivers/files/ati-powermode.sh.patch
new file mode 100644
index 000000000000..cd776e0ac118
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/ati-powermode.sh.patch
@@ -0,0 +1,32 @@
+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
+@@ -17,6 +17,10 @@
+         fi
+ }
+ 
++aticonfig='/opt/ati/bin/aticonfig'
++
++# default high power state
++default_state=`$aticonfig --lsp | grep 'default state' | cut -c 3`
+ 
+ grep -q closed /proc/acpi/button/lid/*/state
+ if [ $? = 0 ]; then
+@@ -46,7 +50,7 @@
+ 	getXuser;
+ 	if [ x"$XAUTHORITY" != x"" ]; then
+ 	    export DISPLAY=":$displaynum"	    
+-	    su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=1 --effective=now"
++	    su $user -c "$aticonfig --set-powerstate=1 --effective=now"
+ 	fi
+     done
+ else
+@@ -56,7 +60,7 @@
+ 	getXuser;
+ 	if [ x"$XAUTHORITY" != x"" ]; then
+ 	    export DISPLAY=":$displaynum"
+-	    su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=3 --effective=now"
++	    su $user -c "$aticonfig --set-powerstate=$default_state --effective=now"
+ 	fi
+     done
+ fi
diff --git a/x11-drivers/ati-drivers/files/atieventsd.rc6 b/x11-drivers/ati-drivers/files/atieventsd.rc6
index 93ac053049fd..2180e0eb13bc 100644
--- a/x11-drivers/ati-drivers/files/atieventsd.rc6
+++ b/x11-drivers/ati-drivers/files/atieventsd.rc6
@@ -1,15 +1,17 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/files/atieventsd.rc6,v 1.1 2006/07/06 13:04:06 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/files/atieventsd.rc6,v 1.2 2006/08/04 12:20:19 chrb Exp $
 
 depend() {
     need acpid
 }
 
 start() {
-    start-stop-daemon --start pidfile /var/run/atieventsd.pid \
-        --exec /opt/ati/sbin/atieventsd -- ${ATIEVENTSDOPTS}
+    start-stop-daemon --start --pidfile /var/run/atieventsd.pid \
+      --exec /opt/ati/sbin/atieventsd -- ${ATIEVENTSDOPTS}
+    local pid=`pidof atieventsd`
+    echo $pid > /var/run/atieventsd.pid
     eend $?
 }
 
@@ -17,3 +19,4 @@ stop() {
     start-stop-daemon --stop --quiet --pidfile /var/run/atieventsd.pid
     eend $?
 }
+
diff --git a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.27.10-r1 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.27.10-r1
new file mode 100644
index 000000000000..fcd61d64a9c4
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.27.10-r1
@@ -0,0 +1,6 @@
+MD5 72f69477c66d8b2d1a580c7885afa892 ati-driver-installer-8.27.10-x86.run 25136032
+RMD160 5080d72e97101b97da661019c00a89e01cf2abd6 ati-driver-installer-8.27.10-x86.run 25136032
+SHA256 444c2d957308793b1164ed013c724090900aae20fcd63ebf9001b795066fc4f0 ati-driver-installer-8.27.10-x86.run 25136032
+MD5 4cc78c0fc864fd2b3205cee5f866f3d7 ati-driver-installer-8.27.10-x86_64.run 32487472
+RMD160 04dc8598253791b52215ba3be847a9dc6eb54079 ati-driver-installer-8.27.10-x86_64.run 32487472
+SHA256 1039d0b2218bab7076ef55626e510a779027ab658e62730c74dc2de439f4ab33 ati-driver-installer-8.27.10-x86_64.run 32487472