New version, thanks to Jory Pratt.

svn path=/; revision=120

3 files changed, 41 insertions, 25 deletions

diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 806ed95..f7a38a6 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -62,11 +62,16 @@ AUX libGL.la.in 749 RMD160 b2eb11cd123cb0e789adb1e22dffdbfc03542f69 SHA1 be41cc2
 MD5 164dbf7ccea38894db8dab919c06a677 files/libGL.la.in 749
 RMD160 b2eb11cd123cb0e789adb1e22dffdbfc03542f69 files/libGL.la.in 749
 SHA256 a7b4b58b1311f8e1caf83222cb020dfbc48e2881a8deef21eddefa23b3992f13 files/libGL.la.in 749
+DIST ati-driver-installer-7-11-x86.x86_64.run 47667647 RMD160 87f7c704b8af3fc6988fce9f9e99a09c9d430c85 SHA1 7dd70cda9e5953b98e3f831dc04937f58ceacf09 SHA256 c93efb20bc18412b32152c8974865164876f16377cea62a69fab1ce8d574a78a
 DIST ati-driver-installer-8.40.4-x86.x86_64.run 40335704 RMD160 8a35e68aa9108186ffd91244209377387b3313e5 SHA1 6260c8596529eac34fabe3437678afe6e2761490 SHA256 765386dbe60ba66088b0d6050d1e462432e7cfaddca33d70875b2bd554ddc7a2
 EBUILD ati-drivers-8.40.4.ebuild 14174 RMD160 3203749c4e3e8a7ab37a00469c8a3dbb2ac208ac SHA1 0eac7179363564ac7725bb9b0a3ad492e061578e SHA256 0229630520138a8350886b3b8bf8d8701c1df9f202b1c35323be9724c9e3bba7
 MD5 8d602bfbf0dbae290232d55767170383 ati-drivers-8.40.4.ebuild 14174
 RMD160 3203749c4e3e8a7ab37a00469c8a3dbb2ac208ac ati-drivers-8.40.4.ebuild 14174
 SHA256 0229630520138a8350886b3b8bf8d8701c1df9f202b1c35323be9724c9e3bba7 ati-drivers-8.40.4.ebuild 14174
+EBUILD ati-drivers-8.433.ebuild 14629 RMD160 41eae32a2fb8be92735496279db12e066e671fa4 SHA1 334a6ced8739353d6495fdb05f37d214be59e5b9 SHA256 2c7e1a0afc8dd43a5a42f83cca64791e90a376759ba5e01cff3a03af566da09a
+MD5 089945d9843191a7bd4234ce3226528d ati-drivers-8.433.ebuild 14629
+RMD160 41eae32a2fb8be92735496279db12e066e671fa4 ati-drivers-8.433.ebuild 14629
+SHA256 2c7e1a0afc8dd43a5a42f83cca64791e90a376759ba5e01cff3a03af566da09a ati-drivers-8.433.ebuild 14629
 MISC ChangeLog 41744 RMD160 42fa6fd4bf9a15b49cb17ccf2471fe0995280210 SHA1 c4d588b3dadc21907652698736adae1ae621e0eb SHA256 b6e7327ead45c06112e24bebdb4f8426fc79a44529ffdfc66a62623f2df39472
 MD5 abfdfa657a181189e3902391abab0ba5 ChangeLog 41744
 RMD160 42fa6fd4bf9a15b49cb17ccf2471fe0995280210 ChangeLog 41744
@@ -75,6 +80,9 @@ MISC metadata.xml 494 RMD160 6c0f807a9fcdcaee2e28906992a35dd87d24ff0a SHA1 3ba9e
 MD5 f462ad2ddb101d99fc4860e39a197a9f metadata.xml 494
 RMD160 6c0f807a9fcdcaee2e28906992a35dd87d24ff0a metadata.xml 494
 SHA256 457f40aec01e7f047adfab46ed13813853102027c1f4cd68efa45a2bd39aff08 metadata.xml 494
-MD5 c28a2605a914f579e5f8d3e202ca4fb9 files/digest-ati-drivers-8.40.4 224
-RMD160 3822b00b5a9e31975d933ac85c71708357b852d1 files/digest-ati-drivers-8.40.4 224
-SHA256 8a4236e8c5f693b23b3a4d181e77378fa100ad1c19cc5fca0785bcd79ee681f3 files/digest-ati-drivers-8.40.4 224
+MD5 a70e07c461a1bdaebd820666ad4a2f2f files/digest-ati-drivers-8.40.4 313
+RMD160 2a204e1a4ec40fc3e34581008440b9426fa97401 files/digest-ati-drivers-8.40.4 313
+SHA256 adea60b9ebc1c935674db8e6a3bfbb4d362eb92bcf7c3e768c4a39f537970d20 files/digest-ati-drivers-8.40.4 313
+MD5 75c40052d1d394295caafef83a248390 files/digest-ati-drivers-8.433 307
+RMD160 d3a36372b9ac27b3ed1af67ad05051db5696ef6a files/digest-ati-drivers-8.433 307
+SHA256 f96ef7f58118744e28fc8ef8a738d3d89a443baa7a39b7b770285b741549741f files/digest-ati-drivers-8.433 307
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.40.4.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.433.ebuild
index 181176a..8aa314b 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.40.4.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.433.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.4 2007/11/01 14:56:16 opfer Exp $
+# $Header: $
 
 IUSE="acpi multilib"
 
@@ -9,10 +9,10 @@ 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-${PV}-x86.x86_64.run"
+SRC_URI="${ATI_URL}/ati-driver-installer-7-11-x86.x86_64.run"
 
 LICENSE="AMD GPL-2 QPL-1.0 as-is"
-KEYWORDS="~amd64 x86"
+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.
@@ -91,6 +91,18 @@ pkg_setup() {
 		die "CONFIG_PARAVIRT enabled"
 	fi
 
+       if linux_chkconfig_present SLUB; then
+               ewarn  "You have selected support for the SLUB allocator. Suspending is"
+               ewarn  "known to be broken with this allocator and ati-drivers. If you"
+               ewarn  "need support for Suspend-To-Ram or Suspend-To-Disk, select SLAB"
+               ewarn  "instead. To do this enable CONFIG_SLAB and disable CONFIG_SLUB"
+               ewarn  "in /usr/src/linux/.config or select"
+               ewarn  "                General setup  --->"
+               ewarn  "                        Choose SLAB allocator (SLUB)  --->"
+               ewarn  "                                (X) SLAB"
+               ewarn  "in 'menuconfig'"
+       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"
@@ -119,8 +131,6 @@ src_unpack() {
 	#would be created
 	sh "${src}" --extract "${S}" 2&>1 /dev/null
 
-	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 these later.
 	rm \
@@ -164,13 +174,6 @@ src_unpack() {
 	# Add a category.
 	mv programs/fglrx_gamma/fglrx_xgamma.{man,1} || die "man mv failed"
 	cd ..
-
-	# Misc. patches.
-	epatch "${FILESDIR}"/${PV}/${P}-warnings.patch
-
-	if kernel_is ge 2 6 23; then
-		epatch "${FILESDIR}"/${PV}/${PN}-2.6.23.patch
-	fi
 }
 
 src_compile() {
@@ -287,7 +290,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,signature}
+	doins common/etc/ati/{logo*,control,atiogl.xml,signature}
 	if use acpi; then
 		doins common/etc/ati/authatieventsd.sh
 	fi
@@ -338,7 +341,6 @@ src_install() {
 	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"
@@ -350,8 +352,10 @@ src_install() {
 src_install-libs() {
 	if [[ "${ABI}" == "amd64" ]]; then
 		local pkglibdir=lib64
+		local MY_ARCH_DIR="${S}/arch/x86_64"
 	else
 		local pkglibdir=lib
+		local MY_ARCH_DIR="${S}/arch/x86"
 	fi
 	einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
 
@@ -363,7 +367,7 @@ src_install-libs() {
 	# 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.${libver}
+	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
 
@@ -373,7 +377,7 @@ src_install-libs() {
 
 	# 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
+	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.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
@@ -381,10 +385,6 @@ src_install-libs() {
 	# (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.
-	#
-	# According to the libtool manual the "revision" should be updated
-	# whenever the code changes. We construct this from the version
-	# (8.37.6 becomes 83706).
 	local revision=$(printf '%d%02d%02d' $(get_version_components))
 	sed -e "s:\${libmajor}:${libmajor}:g" \
 		-e "s:\${libminor}:${libminor}:g" \
@@ -411,10 +411,14 @@ pkg_postinst() {
 	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
+
+	# 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
 }
 
@@ -422,3 +426,4 @@ 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.433 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.433
new file mode 100644
index 0000000..f272c3c
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.433
@@ -0,0 +1,3 @@
+MD5 099eead18eb845f83da1d743dc17cc47 ati-driver-installer-7-11-x86.x86_64.run 47667647
+RMD160 87f7c704b8af3fc6988fce9f9e99a09c9d430c85 ati-driver-installer-7-11-x86.x86_64.run 47667647
+SHA256 c93efb20bc18412b32152c8974865164876f16377cea62a69fab1ce8d574a78a ati-driver-installer-7-11-x86.x86_64.run 47667647