Add support for acpi, see bug #138414

Package-Manager: portage-2.1.1_pre2-r4

6 files changed, 430 insertions, 10 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 51ced493f65a..7dc995fa885e 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.42 2006/06/27 23:56:44 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.43 2006/07/06 13:04:05 lu_zero Exp $
+
+*ati-drivers-8.26.18-r1 (06 Jul 2006)
+
+  06 Jul 2006; Luca Barbato <lu_zero@gentoo.org> files/09ati,
+  +files/atieventsd.rc6, +ati-drivers-8.26.18-r1.ebuild:
+  Add support for acpi, thanks to Armando Di Cianno <armando@goodship.net> for
+  the initial ebuild, see bug #138414
 
 *ati-drivers-8.26.18 (27 Jun 2006)
 
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index bea041361c4f..6faa3cb9cd11 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -1,7 +1,7 @@
-AUX 09ati 39 RMD160 2eb917685ae226a6913f00d0247514faf998d92f SHA1 847e5702afa6581181883b7fc8efbe8b54d0f97b SHA256 44336cd56c2712a3260a1289c1085f08e4cb61e6a73175eac4a7b3ebabe5011e
-MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
-RMD160 2eb917685ae226a6913f00d0247514faf998d92f files/09ati 39
-SHA256 44336cd56c2712a3260a1289c1085f08e4cb61e6a73175eac4a7b3ebabe5011e files/09ati 39
+AUX 09ati 75 RMD160 f4b42cfdc7deaa6fe7618e3506860a06a75de435 SHA1 01cac55ba02710dbd7d71737dd64dbec2cc081fd SHA256 5daa70f3e4c19f2b006bc7b2b22abde5404c3b498485b9ffac428eb458c32134
+MD5 5ac06946904a0282c5da617bda2a8f6b files/09ati 75
+RMD160 f4b42cfdc7deaa6fe7618e3506860a06a75de435 files/09ati 75
+SHA256 5daa70f3e4c19f2b006bc7b2b22abde5404c3b498485b9ffac428eb458c32134 files/09ati 75
 AUX 8.8.25-smp.patch 376 RMD160 1cdbb501940e54baa5b3ecec3f1100c83d944b97 SHA1 715c3736702d3078ab60c5724ec5959148ec211d SHA256 9505ac06d77ba0fdd30c93b8b59d01fa2a3e585702dc5a728dd85b02a49c69dd
 MD5 32c54a887820a2712b641217c3b54272 files/8.8.25-smp.patch 376
 RMD160 1cdbb501940e54baa5b3ecec3f1100c83d944b97 files/8.8.25-smp.patch 376
@@ -30,6 +30,10 @@ 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 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
@@ -160,14 +164,18 @@ EBUILD ati-drivers-8.25.18.ebuild 9626 RMD160 46474f18cf41cec14ae970e6abb2287295
 MD5 f218eab19f44af1cfe1c72291b25b405 ati-drivers-8.25.18.ebuild 9626
 RMD160 46474f18cf41cec14ae970e6abb2287295e105b4 ati-drivers-8.25.18.ebuild 9626
 SHA256 ba3b29f1c80b17038b5c1bce4616987ec0937c6158d0378d67805c01b2f4c85b ati-drivers-8.25.18.ebuild 9626
+EBUILD ati-drivers-8.26.18-r1.ebuild 10722 RMD160 955585f8396d1e668654bb79ec956717d2ed2d8b SHA1 d206c0f7d36f2e40d4831d1e6f9050f227431fdd SHA256 c17677b6800cb1e208381f8764c332c60840f0ba8ee1ddc33764c2633ed321ff
+MD5 0888c853d8e717b0c04318ece4b56876 ati-drivers-8.26.18-r1.ebuild 10722
+RMD160 955585f8396d1e668654bb79ec956717d2ed2d8b ati-drivers-8.26.18-r1.ebuild 10722
+SHA256 c17677b6800cb1e208381f8764c332c60840f0ba8ee1ddc33764c2633ed321ff ati-drivers-8.26.18-r1.ebuild 10722
 EBUILD ati-drivers-8.26.18.ebuild 9709 RMD160 8e3be8c55c12e208ba8cf7498802cc2e26bcac4a SHA1 2ba3492c35ab12d94e291748c865c8cfbaea83c5 SHA256 2072e45d32b6610948f71b9407e247695f06dd06c64c549a42ddb6eef37f7772
 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
-MISC ChangeLog 30015 RMD160 f581a971ad7b8dd71a9660a26cd17c7e9d3d4e44 SHA1 412203a34680b33a1e4348189d465dc0723bb4f4 SHA256 f8f34ba53ffa973068a95e5006aa75a01a9ac27dc2ef34718d463bc11121b39e
-MD5 7877b35a4bbc8da18bd60f39f8adeca6 ChangeLog 30015
-RMD160 f581a971ad7b8dd71a9660a26cd17c7e9d3d4e44 ChangeLog 30015
-SHA256 f8f34ba53ffa973068a95e5006aa75a01a9ac27dc2ef34718d463bc11121b39e ChangeLog 30015
+MISC ChangeLog 30291 RMD160 ec7f6ea7169152c9a987e6a76e2d8c7874fb4eec SHA1 61f719ce50a991bf77d3bb1719e965304f940bf8 SHA256 3fa7528c00ef24f511177344269be2e9033b98ba5e86bc83336914f15edd2c63
+MD5 139b8f795c2e9d69bc8a606e9e2bbb63 ChangeLog 30291
+RMD160 ec7f6ea7169152c9a987e6a76e2d8c7874fb4eec ChangeLog 30291
+SHA256 3fa7528c00ef24f511177344269be2e9033b98ba5e86bc83336914f15edd2c63 ChangeLog 30291
 MISC metadata.xml 227 RMD160 e2ed1445a0405b39e40741d3d1f67746daab8fff SHA1 47e1824ff5e7e3789fcbb4ca5de9c3ccd9162b76 SHA256 4fbed7030b32bcdc95b70000adbbcb6f1d73092c4a2f20e6cfb737a1b44d6e07
 MD5 c306bb93866a4dd8913899229dd20726 metadata.xml 227
 RMD160 e2ed1445a0405b39e40741d3d1f67746daab8fff metadata.xml 227
@@ -232,3 +240,6 @@ SHA256 7a56d95f00b852cfa213ac342f4e1394e84ec7bf035852127cfbee2a615c565a files/di
 MD5 864cc020053f67a28c2399f0c5e830fa files/digest-ati-drivers-8.26.18 599
 RMD160 9010de31d186da94f756eda0c6da2769d187283f files/digest-ati-drivers-8.26.18 599
 SHA256 180ded06d335b8f8053b8a8587d1707fe650e4915e87a7ca7315326e8727939f files/digest-ati-drivers-8.26.18 599
+MD5 864cc020053f67a28c2399f0c5e830fa files/digest-ati-drivers-8.26.18-r1 599
+RMD160 9010de31d186da94f756eda0c6da2769d187283f files/digest-ati-drivers-8.26.18-r1 599
+SHA256 180ded06d335b8f8053b8a8587d1707fe650e4915e87a7ca7315326e8727939f files/digest-ati-drivers-8.26.18-r1 599
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.26.18-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.26.18-r1.ebuild
new file mode 100644
index 000000000000..d71af7ad1504
--- /dev/null
+++ b/x11-drivers/ati-drivers/ati-drivers-8.26.18-r1.ebuild
@@ -0,0 +1,376 @@
+# 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.26.18-r1.ebuild,v 1.1 2006/07/06 13:04:05 lu_zero 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"
+SRC_URI="x86? ( mirror://gentoo/ati-driver-installer-${PV}-x86.run )
+	 amd64? ( mirror://gentoo/ati-driver-installer-${PV}-x86_64.run )"
+
+LICENSE="ATI"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="|| ( x11-base/xorg-server virtual/x11 )
+	 || ( x11-apps/xauth virtual/x11 )
+	 !>=x11-base/xorg-server-1.0.99
+	 app-admin/eselect-opengl
+	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )
+	 acpi? ( 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
+		BASE_DIR="${WORKDIR}/x690"
+		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
+	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}
+
+	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
+
+	#if kernel_is ge 2 6 16; then
+	#	epatch ${FILESDIR}/${PN}-8.22.5-intermodule.patch
+	#	epatch ${FILESDIR}/${PN}-8.23.7-noiommu.patch
+	#	epatch ${FILESDIR}/${PN}-8.23.7-gcc41.patch
+	#fi
+	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."
+	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 acpid
+	then
+		exeinto /opt/ati/sbin
+		doexe ${ARCH_DIR}/usr/sbin/*
+		insinto /opt/ati/man/man8
+		doins common/usr/share/man/man8/*
+		doinitd ${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
+
+	# doc's
+	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
+
+	dodir /etc
+	cp -pPR ${COMMON_DIR}/etc/* ${D}/etc/
+}
+
+
+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/09ati b/x11-drivers/ati-drivers/files/09ati
index 4b0639956072..27180e06554e 100644
--- a/x11-drivers/ati-drivers/files/09ati
+++ b/x11-drivers/ati-drivers/files/09ati
@@ -1,2 +1,3 @@
 PATH=/opt/ati/bin
-ROOTPATH=/opt/ati/bin
\ No newline at end of file
+ROOTPATH=/opt/ati/bin:/opt/ati/sbin
+MANPATH=/opt/ati/man
diff --git a/x11-drivers/ati-drivers/files/atieventsd.rc6 b/x11-drivers/ati-drivers/files/atieventsd.rc6
new file mode 100644
index 000000000000..93ac053049fd
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/atieventsd.rc6
@@ -0,0 +1,19 @@
+#!/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 $
+
+depend() {
+    need acpid
+}
+
+start() {
+    start-stop-daemon --start pidfile /var/run/atieventsd.pid \
+        --exec /opt/ati/sbin/atieventsd -- ${ATIEVENTSDOPTS}
+    eend $?
+}
+
+stop() {
+    start-stop-daemon --stop --quiet --pidfile /var/run/atieventsd.pid
+    eend $?
+}
diff --git a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.26.18-r1 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.26.18-r1
new file mode 100644
index 000000000000..181d0151e3e9
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.26.18-r1
@@ -0,0 +1,6 @@
+MD5 0cd66013e31fbaa6470f3dad3391cfd1 ati-driver-installer-8.26.18-x86.run 23716730
+RMD160 dc9ab7862e6c0a1872ba48ad08842fdbb10d1414 ati-driver-installer-8.26.18-x86.run 23716730
+SHA256 3376608d7a0049c30c9497e2f326ad2afe6b3874777f36af33b09019cbe71c55 ati-driver-installer-8.26.18-x86.run 23716730
+MD5 a755a02cd7bb71697ac4c249d0e32eb0 ati-driver-installer-8.26.18-x86_64.run 30927154
+RMD160 d4cf53f10fd7ca66cd52577c7e5e9bc42502f59f ati-driver-installer-8.26.18-x86_64.run 30927154
+SHA256 390eb44786b72cb09c78a995163155739f21d6ad121d22a9e6a72a18d9b5496f ati-driver-installer-8.26.18-x86_64.run 30927154