Add signature file to hopefully get rid of the watermark.

Package-Manager: portage-2.1.2.11

5 files changed, 399 insertions, 11 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 2af7ec16ce91..1adcf041b4bf 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,10 @@
 # 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.88 2007/08/14 08:41:02 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.89 2007/08/14 18:10:08 je_fro Exp $
+
+  14 Aug 2007; Jeff Gardner <je_fro@gentoo.org> +ati-drivers-8.28.8.ebuild,
+  ati-drivers-8.40.4.ebuild:
+  adding doins common/etc/ati/signature to try and avoid watermark
 
   14 Aug 2007; Jeff Gardner <je_fro@gentoo.org>
   -files/ati-drivers-8.28.8-linux-2.6.18.patch, -ati-drivers-8.28.8.ebuild,
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 9f433c063017..1d0fc04ca3ef 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -52,6 +52,7 @@ RMD160 b2eb11cd123cb0e789adb1e22dffdbfc03542f69 files/libGL.la.in 749
 SHA256 a7b4b58b1311f8e1caf83222cb020dfbc48e2881a8deef21eddefa23b3992f13 files/libGL.la.in 749
 DIST ati-driver-installer-8.27.10-x86.run 25136032 RMD160 5080d72e97101b97da661019c00a89e01cf2abd6 SHA1 dc386ae275e7623d383a83b50b8685b53fe97f03 SHA256 444c2d957308793b1164ed013c724090900aae20fcd63ebf9001b795066fc4f0
 DIST ati-driver-installer-8.27.10-x86_64.run 32487472 RMD160 04dc8598253791b52215ba3be847a9dc6eb54079 SHA1 9844ad5dc79a8d914d8707d2d17cf6be0de9e7d5 SHA256 1039d0b2218bab7076ef55626e510a779027ab658e62730c74dc2de439f4ab33
+DIST ati-driver-installer-8.28.8.run 53989404 RMD160 0ea23d37c0e203fc8acc5bd7e100bdf78c05745f SHA1 811b73481f82d178b26417fd3d4b227864bd4527 SHA256 5eaeab1b906a0b8a30f88ab733390ecbc3ebeaa0c04c0368b757b99c31919e77
 DIST ati-driver-installer-8.32.5-x86.x86_64.run 58503169 RMD160 45bf6649227081f6ec10f65305661417c0314748 SHA1 a7411f8e43bb08a822e94d2db7630f868e23afe8 SHA256 d30b7302d4d7952e82ada8a28df0fb8ddd995d2e3f7aac53b67de450c7895475
 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
@@ -64,6 +65,10 @@ EBUILD ati-drivers-8.27.10-r1.ebuild 10543 RMD160 a137a262e4e1bb9e4118d87a1c804a
 MD5 233ad0d0a2e7d383bc357293b876d9f2 ati-drivers-8.27.10-r1.ebuild 10543
 RMD160 a137a262e4e1bb9e4118d87a1c804a8a0641eb97 ati-drivers-8.27.10-r1.ebuild 10543
 SHA256 22855d255a6cee2204040913cfebef1bb3cfac2d115700b428d8ff6205e0c67a ati-drivers-8.27.10-r1.ebuild 10543
+EBUILD ati-drivers-8.28.8.ebuild 10456 RMD160 8a8e6083b90708cece57a0f5cdee56534fc32d15 SHA1 74b91115102bec64d9989f33542e965f3e6fc190 SHA256 8f1c184733ed743165fd0694b1f6e813c467f6c251736d51907b1101d6587c63
+MD5 219570333f63f83461ad868ff9445b94 ati-drivers-8.28.8.ebuild 10456
+RMD160 8a8e6083b90708cece57a0f5cdee56534fc32d15 ati-drivers-8.28.8.ebuild 10456
+SHA256 8f1c184733ed743165fd0694b1f6e813c467f6c251736d51907b1101d6587c63 ati-drivers-8.28.8.ebuild 10456
 EBUILD ati-drivers-8.32.5.ebuild 9895 RMD160 9a0794acebea3582ac88cc81b801d892e612f3a6 SHA1 252febb980d42a15023d3c185c64c2ed21ea6f13 SHA256 0dd6f92b58226a3d27c7a8ef52d80dd70f9fb31d2a762b63a3e573a934f74d43
 MD5 f482fb5fc8ecff29fff3854dc8ef9792 ati-drivers-8.32.5.ebuild 9895
 RMD160 9a0794acebea3582ac88cc81b801d892e612f3a6 ati-drivers-8.32.5.ebuild 9895
@@ -100,14 +105,14 @@ EBUILD ati-drivers-8.39.4.ebuild 14118 RMD160 2f568b599a26594f51e7ca60884f86f0e8
 MD5 db3c39566c08885771db5424ed918200 ati-drivers-8.39.4.ebuild 14118
 RMD160 2f568b599a26594f51e7ca60884f86f0e846e225 ati-drivers-8.39.4.ebuild 14118
 SHA256 96d3f3c796164ab5d4e4c1d0f7ffcfac6eaff7ac5412d13b3cd6201ec180bc27 ati-drivers-8.39.4.ebuild 14118
-EBUILD ati-drivers-8.40.4.ebuild 14162 RMD160 1e0e3affd8944f103aa4be548d6c52f2bf113ee0 SHA1 e8ac4ab0a9ae32c715a9d2e264b168c602b7eac5 SHA256 1b77fbf5d2ee8bed1720a374a1dabbf045e5bfa62345211b494e16857f3838d1
-MD5 da633d03e6bb7359f10b3fcecffed96b ati-drivers-8.40.4.ebuild 14162
-RMD160 1e0e3affd8944f103aa4be548d6c52f2bf113ee0 ati-drivers-8.40.4.ebuild 14162
-SHA256 1b77fbf5d2ee8bed1720a374a1dabbf045e5bfa62345211b494e16857f3838d1 ati-drivers-8.40.4.ebuild 14162
-MISC ChangeLog 40704 RMD160 924883c07ac18770298df311b7e5d9a36e8abce5 SHA1 12934be20a9493406d4c6eece0cd77e415a8b47c SHA256 d88abcc56e84c6b19fde21c0c71709094d7480e6136b53336fa2d9c167e43d3e
-MD5 a0aa6ed6fa2ed5fbf91e6c6de73f8d5e ChangeLog 40704
-RMD160 924883c07ac18770298df311b7e5d9a36e8abce5 ChangeLog 40704
-SHA256 d88abcc56e84c6b19fde21c0c71709094d7480e6136b53336fa2d9c167e43d3e ChangeLog 40704
+EBUILD ati-drivers-8.40.4.ebuild 14172 RMD160 eea60ae9a81d0a47c7147d62b35b1e0f25810990 SHA1 2c9719a65188cf444c67bfafeaebf59c52c3059c SHA256 80c2c0b5fa1b7a0497e64d43f11ba7f6c95f4d3871fb5a247ec18da97358c970
+MD5 9dbb01648951499c19999f28d3eced1c ati-drivers-8.40.4.ebuild 14172
+RMD160 eea60ae9a81d0a47c7147d62b35b1e0f25810990 ati-drivers-8.40.4.ebuild 14172
+SHA256 80c2c0b5fa1b7a0497e64d43f11ba7f6c95f4d3871fb5a247ec18da97358c970 ati-drivers-8.40.4.ebuild 14172
+MISC ChangeLog 40877 RMD160 58d025050d925e7e84529878a6ae58e078ed3734 SHA1 8f6482ffffae8ee3dc5eb2b9b041cb6b8e3954b2 SHA256 d54d1b97835a52f2c1c7607869d1990f0085aef2f1d5852f0938919c7066eb1b
+MD5 bba5aa7a610941e50d9add818e275dc9 ChangeLog 40877
+RMD160 58d025050d925e7e84529878a6ae58e078ed3734 ChangeLog 40877
+SHA256 d54d1b97835a52f2c1c7607869d1990f0085aef2f1d5852f0938919c7066eb1b ChangeLog 40877
 MISC metadata.xml 494 RMD160 6c0f807a9fcdcaee2e28906992a35dd87d24ff0a SHA1 3ba9ee03c89575c03788c087c2dea8c208b398e9 SHA256 457f40aec01e7f047adfab46ed13813853102027c1f4cd68efa45a2bd39aff08
 MD5 f462ad2ddb101d99fc4860e39a197a9f metadata.xml 494
 RMD160 6c0f807a9fcdcaee2e28906992a35dd87d24ff0a metadata.xml 494
@@ -115,6 +120,9 @@ SHA256 457f40aec01e7f047adfab46ed13813853102027c1f4cd68efa45a2bd39aff08 metadata
 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
+MD5 aafcc244946dfdff8fd6543d396d521a files/digest-ati-drivers-8.28.8 280
+RMD160 4c5be72a1a2c1908d1fae07d0437c6807192ac79 files/digest-ati-drivers-8.28.8 280
+SHA256 a172c7af9725583e45454906174254b91c5ee6fdea38d8a56f22f3c28abcb82b files/digest-ati-drivers-8.28.8 280
 MD5 1963ca03d87d124fb7e1860ddb48abcb files/digest-ati-drivers-8.32.5 313
 RMD160 03a500dde0ac58356dc1ea7f447e8b88e284697c files/digest-ati-drivers-8.32.5 313
 SHA256 791d1512c572ce00dbaef63785b6cad94794d6b86181f3ed984df941cd49bd00 files/digest-ati-drivers-8.32.5 313
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild
new file mode 100644
index 000000000000..a54cb226e5e1
--- /dev/null
+++ b/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild
@@ -0,0 +1,373 @@
+# 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.28.8.ebuild,v 1.9 2007/08/14 18:10:08 je_fro 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="${ATI_URL}/ati-driver-installer-${PV}.run"
+
+LICENSE="ATI"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="x11-base/xorg-server
+	 app-admin/eselect-opengl
+	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )
+	 acpi? (
+	 	x11-apps/xauth
+	 	sys-power/acpid
+	 )"
+
+DEPEND=">=virtual/linux-sources-2.4
+	${RDEPEND}"
+
+PROVIDE="virtual/opengl"
+
+ATIBIN="${D}/opt/ati/bin"
+RESTRICT="strip"
+EMULTILIB_PKG="true"
+
+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_TEXTRELS_x86="usr/lib/xorg/modules/dri/fglrx_dri.so usr/lib/opengl/ati/lib/libGL.so.1.2"
+QA_TEXTRELS_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
+	X11_IMPLEM=xorg-x11
+	X11_IMPLEM_V="$(best_version x11-base/xorg-server)"
+	X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}"
+	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"
+
+	if has_multilib_profile; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	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/ati-drivers-8.40.4.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.40.4.ebuild
index 85a49ed2061a..1275acfa8868 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.40.4.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.40.4.ebuild
@@ -1,6 +1,6 @@
 # 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.40.4.ebuild,v 1.1 2007/08/14 04:24:40 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.40.4.ebuild,v 1.2 2007/08/14 18:10:08 je_fro Exp $
 
 IUSE="acpi multilib"
 
@@ -287,7 +287,7 @@ src_install() {
 	# etc.
 	insinto /etc/ati
 	# Everything except for the authatieventsd.sh script.
-	doins common/etc/ati/{fglrxprofiles.csv,fglrxrc,logo*,control,atiogl.xml}
+	doins common/etc/ati/{fglrxprofiles.csv,fglrxrc,logo*,control,atiogl.xml,signature}
 	if use acpi; then
 		doins common/etc/ati/authatieventsd.sh
 	fi
diff --git a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.28.8 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.28.8
new file mode 100644
index 000000000000..efb57e52df1a
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.28.8
@@ -0,0 +1,3 @@
+MD5 58189d7cc3625e399b1a434df893100f ati-driver-installer-8.28.8.run 53989404
+RMD160 0ea23d37c0e203fc8acc5bd7e100bdf78c05745f ati-driver-installer-8.28.8.run 53989404
+SHA256 5eaeab1b906a0b8a30f88ab733390ecbc3ebeaa0c04c0368b757b99c31919e77 ati-driver-installer-8.28.8.run 53989404