Fixup wrt bug #202906. Thanks to Jory Pratt and Bernd Steinhauser.

(Portage version: 2.1.4_rc11)

3 files changed, 48 insertions, 4 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index ae24497ad34a..79f2b46effda 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.100 2007/12/21 05:01:58 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.101 2007/12/24 05:03:46 je_fro Exp $
+
+  24 Dec 2007; Jeff Gardner <je_fro@gentoo.org>
+  +files/8.443.1/ati-powermode-opt-path-2.patch, ati-drivers-8.443.1.ebuild:
+  Fixup wrt bug #202906. Thanks to Jory Pratt and Bernd Steinhauser.
 
 *ati-drivers-8.443.1 (21 Dec 2007)
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.443.1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.443.1.ebuild
index 6f49409a44a8..84e22bfe5869 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.443.1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.443.1.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.443.1.ebuild,v 1.1 2007/12/21 05:01:58 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.443.1.ebuild,v 1.2 2007/12/24 05:03:46 je_fro Exp $
 
 IUSE="acpi debug"
 
@@ -151,8 +151,8 @@ src_unpack() {
 			"${S}/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
 			|| 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}"/${PV}/ati-powermode-opt-path-1.patch
+		# add function to detect default state.
+		epatch "${FILESDIR}"/${PV}/ati-powermode-opt-path-2.patch
 	fi
 
 	pushd ${MODULE_DIR} >/dev/null
diff --git a/x11-drivers/ati-drivers/files/8.443.1/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.443.1/ati-powermode-opt-path-2.patch
new file mode 100644
index 000000000000..ca8903335c1f
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/8.443.1/ati-powermode-opt-path-2.patch
@@ -0,0 +1,40 @@
+--- ati-powermode.sh-orig	2007-12-23 22:48:55.873089378 -0600
++++ ati-powermode.sh	2007-12-23 22:49:59.246421379 -0600
+@@ -4,6 +4,8 @@
+ # Control script for ACPI lid state and AC adapter state
+ #
+ 
++aticonfig='/opt/bin/aticonfig'
++
+ getXuser() {
+         user=`who| 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