Add patch, fix bug #266029.

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

4 files changed, 52 insertions, 5 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index e2c35abfcf82..d6d347ab68e6 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.150 2009/04/13 03:42:48 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.151 2009/04/13 20:18:05 je_fro Exp $
+
+  13 Apr 2009; Jeff Gardner <je_fro@gentoo.org>
+  +files/8.552/ati-powermode-opt-path-2.patch, ati-drivers-8.552-r2.ebuild:
+  Add patch, fix bug #266029.
 
   13 Apr 2009; Jeff Gardner <je_fro@gentoo.org>
   -files/8.476/ati-powermode-opt-path-2.patch:
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 55f3f438d2ef..dc49b1e90d2d 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -4,6 +4,7 @@ AUX 8.40.4/ati-drivers-8.40.4-warnings.patch 3262 RMD160 158206cf638fd0f2ee34e8f
 AUX 8.452/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
 AUX 8.471.3/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
 AUX 8.552/ati-drivers-xen-8.552.patch 1994 RMD160 45fe1a96bfaec597214c2b058c720c5f71797085 SHA1 4fd6da4c726c67feed8a6484af484ea525f3a112 SHA256 514dad9629fc689ec0344875a29d713f9d8de7ccbb0a22a2b80ede11bbbc6c58
+AUX 8.552/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
 AUX 8.573/ati-drivers-xen-8.552.patch 1994 RMD160 45fe1a96bfaec597214c2b058c720c5f71797085 SHA1 4fd6da4c726c67feed8a6484af484ea525f3a112 SHA256 514dad9629fc689ec0344875a29d713f9d8de7ccbb0a22a2b80ede11bbbc6c58
 AUX 8.573/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
 AUX 8.582/ati-drivers-xen-8.552.patch 1994 RMD160 45fe1a96bfaec597214c2b058c720c5f71797085 SHA1 4fd6da4c726c67feed8a6484af484ea525f3a112 SHA256 514dad9629fc689ec0344875a29d713f9d8de7ccbb0a22a2b80ede11bbbc6c58
@@ -37,8 +38,8 @@ EBUILD ati-drivers-8.39.4.ebuild 14111 RMD160 4cd7d87055e941a56da78b2c0e00f28559
 EBUILD ati-drivers-8.40.4.ebuild 14345 RMD160 8a608073caf8e8579eb7fee67738f9ffaeefe992 SHA1 259ba6119e672165d69dbc2e1fad4a294e7fe740 SHA256 353dd4b1d8c86a79cee19d6f119f512110e4002d57b3908308918c094a6eaad8
 EBUILD ati-drivers-8.452.ebuild 14542 RMD160 6d7160caec31ff239b86f8e2a2a43b7361bbf616 SHA1 97c4930133dcf8f9875b56599de4ee69a8f992a8 SHA256 443e93f4ab60709c3b76cd861ca1539fe7ac8575fbe2093febe442852f296ec7
 EBUILD ati-drivers-8.471.3.ebuild 14679 RMD160 6207bd14a240106959bae07c123527b11972eb17 SHA1 9a58d33ce0b36f04a47779fd04b875efcedb3287 SHA256 6a1b45e02825fff153b10f39eb6aa2982f7d7bf14702e7eab9a0e7243ae7851c
-EBUILD ati-drivers-8.552-r2.ebuild 15132 RMD160 44c6ec9a5ebb654ee26f9de9d5642c2fe26e8953 SHA1 2baa17e8c707517f1b6d8039da3091bc9e43bc43 SHA256 7e23beef6be16911f04766df35ebb30d4541fd45f9a23f18be94a4d34f9a707d
+EBUILD ati-drivers-8.552-r2.ebuild 15132 RMD160 08693686e3a767576533c9625b6efaa0e727f5de SHA1 3f41f7bfc6e95f6520d5f38dbb6b05001db6b767 SHA256 059888be71be3759d9cd63cc4fa3300227ba9d99fcea1f32eb065ed5761aec79
 EBUILD ati-drivers-8.573-r1.ebuild 14797 RMD160 b08db9339579ad4641f2328617dbb67e77239239 SHA1 fd188e633a4a78f989936841b2263d3671c12ad1 SHA256 8c659c640e4e9bf078840b97bfa47918cc84fe772a560962accf330f3c64698e
 EBUILD ati-drivers-8.582.ebuild 14794 RMD160 581ae32efc15a474a80256bb9dc30c7d56453e75 SHA1 2769b8687ecb459af943d337e1ea582df21f288a SHA256 a02439b55b6d18a4bf078b7465e9ba38907edf09e2ab5dd919fc21b7d3ba9122
-MISC ChangeLog 51725 RMD160 c52ee2687b22cf982d2bacab4c1293c73bb55057 SHA1 6bda600091edf861a4490846d6adc77ab147cab8 SHA256 86d08d675ab67fa409c616d77892f79e1f80342e9b6577a253bf0f4f57346c70
+MISC ChangeLog 51880 RMD160 ca3e624a97dd651018a140a3b08302e8257eedb0 SHA1 0c4fab71a30c36afad8497de66107b040041961e SHA256 c1ea65c5f436497bd02c3afcef2f964b3658a2a5dac3fdac4892f39cc4694b67
 MISC metadata.xml 294 RMD160 ce6129af48ca9c259fa89b297249a558c58657a2 SHA1 f17731063fe83ac4b733ec2127b2dcf1017a7095 SHA256 5db182fb2524bf0627a165b0fc4fbdb17b9e1668a49428ec68c9c6ac13a02eea
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.552-r2.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.552-r2.ebuild
index cbee8d341b9e..048d6d11001e 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.552-r2.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.552-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.552-r2.ebuild,v 1.7 2009/04/05 22:26:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.552-r2.ebuild,v 1.8 2009/04/13 20:18:05 je_fro Exp $
 
 IUSE="acpi debug"
 
@@ -167,7 +167,7 @@ src_unpack() {
 			|| die "Replacing 'finger' with 'who' failed."
 		# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
 		# add funktion to detect default state.
-		epatch "${FILESDIR}"/8.532/ati-powermode-opt-path-2.patch
+		epatch "${FILESDIR}"/${PV}/ati-powermode-opt-path-2.patch
 	fi
 
 	pushd ${MODULE_DIR} >/dev/null
diff --git a/x11-drivers/ati-drivers/files/8.552/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.552/ati-powermode-opt-path-2.patch
new file mode 100644
index 000000000000..f5a35a304ec4
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/8.552/ati-powermode-opt-path-2.patch
@@ -0,0 +1,42 @@
+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
+@@ -4,6 +4,8 @@
+ # Control script for ACPI lid state and AC adapter state
+ #
+ 
++aticonfig='/opt/bin/aticonfig'
++
+ getXuser() {
+         user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'`
+         if [ x"$user" = x"" ]; then
+@@ -47,7 +49,7 @@
+ done
+ 
+ #If PPLIB is enabled
+-su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB
++su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB
+ if [ $? = 0 ]; then
+    echo "Has PPLIB"
+    has_pplib=1
+@@ -61,15 +63,15 @@
+ if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then
+     echo "Low power"
+     if [ ${has_pplib} -eq 1 ]; then
+-        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"'
++        su $user -c '$aticonfig --pplib-cmd="notify psrc dc"'
+     else
+-        su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now"
++        su $user -c "$aticonfig --set-powerstate=1"
+     fi
+ else
+     echo "high power"
+     if [ ${has_pplib} -eq 1 ]; then
+-        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"'
++        su $user -c '$aticonfig --pplib-cmd="notify psrc ac"'
+     else
+-        su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now"
++	su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)"
+     fi
+ fi
+