Moved the ebuild that I added to portage over here too.

svn path=/; revision=154

5 files changed, 54 insertions, 47 deletions

diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 97208a3..da355ce 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -2,10 +2,10 @@ AUX 09ati 75 RMD160 f4b42cfdc7deaa6fe7618e3506860a06a75de435 SHA1 01cac55ba02710
 MD5 5ac06946904a0282c5da617bda2a8f6b files/09ati 75
 RMD160 f4b42cfdc7deaa6fe7618e3506860a06a75de435 files/09ati 75
 SHA256 5daa70f3e4c19f2b006bc7b2b22abde5404c3b498485b9ffac428eb458c32134 files/09ati 75
-AUX 8.443.1/ati-powermode-opt-path-1.patch 1191 RMD160 6b1e4e390c8de1bc5b0f953298167e789daa8f54 SHA1 5d9600dc8a9cbf0c86f246c37c00039db1683766 SHA256 76d06dcbf3a0cd3cd38752e361e9308d67a030207206a76aa4583814e1cb92a0
-MD5 662b98bbfb1108a227d62f8f956d3ffa files/8.443.1/ati-powermode-opt-path-1.patch 1191
-RMD160 6b1e4e390c8de1bc5b0f953298167e789daa8f54 files/8.443.1/ati-powermode-opt-path-1.patch 1191
-SHA256 76d06dcbf3a0cd3cd38752e361e9308d67a030207206a76aa4583814e1cb92a0 files/8.443.1/ati-powermode-opt-path-1.patch 1191
+AUX 8.443.1/ati-powermode-opt-path-2.patch 1493 RMD160 6d1275d8800d6703caaca78705eb1864e1142f82 SHA1 9c1df16348da5e3c32303342eeb31ee66f2a3487 SHA256 d8b11aa4974bfc58cc0550eaf988faad32a8b13cc7a92d222481802de2c71465
+MD5 d9de1b747e41e41f4a4bf955c579ffb4 files/8.443.1/ati-powermode-opt-path-2.patch 1493
+RMD160 6d1275d8800d6703caaca78705eb1864e1142f82 files/8.443.1/ati-powermode-opt-path-2.patch 1493
+SHA256 d8b11aa4974bfc58cc0550eaf988faad32a8b13cc7a92d222481802de2c71465 files/8.443.1/ati-powermode-opt-path-2.patch 1493
 AUX atieventsd.init 533 RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a SHA1 982ffdb8064785c8b96fb0213ad7892ac918b5d7 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3
 MD5 c2aba0f353f7fb54806ad7bb6e2d3c9f files/atieventsd.init 533
 RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a files/atieventsd.init 533
@@ -19,10 +19,10 @@ 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-8.443.1-x86.x86_64.run 48308870 RMD160 9a5d8467602161d63e72b3716d551f8971621a66 SHA1 c287161f57085a99af8ea4c0623a42a51c358ea3 SHA256 19ca5b576cfc03f14eb4c4050b4e050572ae6bd962320efc239032fdc5ff1541
-EBUILD ati-drivers-8.443.1.ebuild 15379 RMD160 82efedcca299d1351a1d182e615c4426ab29c0ac SHA1 321a1106263b4c93903979267fd1dfd06a440f7f SHA256 3ccda969a038d7d759d45c9bc739f0f8b2598328e8294d37f78cec2ed40e7c3b
-MD5 39342d63a3a3566a0c4da2a8af563b74 ati-drivers-8.443.1.ebuild 15379
-RMD160 82efedcca299d1351a1d182e615c4426ab29c0ac ati-drivers-8.443.1.ebuild 15379
-SHA256 3ccda969a038d7d759d45c9bc739f0f8b2598328e8294d37f78cec2ed40e7c3b ati-drivers-8.443.1.ebuild 15379
+EBUILD ati-drivers-8.443.1-r1.ebuild 15283 RMD160 303daff1f6f65caccc08503134ba8c15bf1c0147 SHA1 21d1f82d0addfcfd890ff802995ebaf85650ff0e SHA256 3644e45f7b6f3a84e2d6754801dd1a12d0f8e7c8659cf324c1879bfeef2fd482
+MD5 211d27c907f94a848918e14ed55953ab ati-drivers-8.443.1-r1.ebuild 15283
+RMD160 303daff1f6f65caccc08503134ba8c15bf1c0147 ati-drivers-8.443.1-r1.ebuild 15283
+SHA256 3644e45f7b6f3a84e2d6754801dd1a12d0f8e7c8659cf324c1879bfeef2fd482 ati-drivers-8.443.1-r1.ebuild 15283
 MISC ChangeLog 726 RMD160 74b20bdd626b916a946c30d897221b96201e4f6b SHA1 d08112fe04a0451c8f2b75589bbcd7ef3c03194d SHA256 42ddda329d0ab65c0e4263c0c629373db53e09107235be20a4f4fa45638dcb68
 MD5 53b6f5196984e7d7c91e22ce058c354a ChangeLog 726
 RMD160 74b20bdd626b916a946c30d897221b96201e4f6b ChangeLog 726
@@ -31,6 +31,6 @@ MISC metadata.xml 494 RMD160 6c0f807a9fcdcaee2e28906992a35dd87d24ff0a SHA1 3ba9e
 MD5 f462ad2ddb101d99fc4860e39a197a9f metadata.xml 494
 RMD160 6c0f807a9fcdcaee2e28906992a35dd87d24ff0a metadata.xml 494
 SHA256 457f40aec01e7f047adfab46ed13813853102027c1f4cd68efa45a2bd39aff08 metadata.xml 494
-MD5 7bc29359f4963e0472d4c161a46ad2bb files/digest-ati-drivers-8.443.1 316
-RMD160 858ae70003b9d4e31758b52d5b7f7b01968923d1 files/digest-ati-drivers-8.443.1 316
-SHA256 924a86ba136e0ff276108a3df742d4d4a3a83474a2a0d9870e1f2ad01c52c272 files/digest-ati-drivers-8.443.1 316
+MD5 7bc29359f4963e0472d4c161a46ad2bb files/digest-ati-drivers-8.443.1-r1 316
+RMD160 858ae70003b9d4e31758b52d5b7f7b01968923d1 files/digest-ati-drivers-8.443.1-r1 316
+SHA256 924a86ba136e0ff276108a3df742d4d4a3a83474a2a0d9870e1f2ad01c52c272 files/digest-ati-drivers-8.443.1-r1 316
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.443.1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.443.1-r1.ebuild
index 07c257f..34888b7 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.443.1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.443.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.443.1-r1.ebuild,v 1.2 2007/12/24 19:16:46 je_fro Exp $
 
 IUSE="acpi debug"
 
@@ -151,12 +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
-		# finishing fixing aticonfig path
-		sed -i -e 's:\/usr\/bin\/aticonfig:\$aticonfig:'  \
-			"${WORKDIR}"/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh \
-			|| die "failed to finish fixing paths"
+		# 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-1.patch b/x11-drivers/ati-drivers/files/8.443.1/ati-powermode-opt-path-1.patch
deleted file mode 100644
index 64dcdfb..0000000
--- a/x11-drivers/ati-drivers/files/8.443.1/ati-powermode-opt-path-1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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
-@@ -63,13 +65,13 @@
-     if [ ${has_pplib} -eq 1 ]; then
-         su $user -c '/usr/bin/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"'
-     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
-
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 0000000..3819b23
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/8.443.1/ati-powermode-opt-path-2.patch
@@ -0,0 +1,40 @@
+--- common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh-orig	2007-12-23 22:48:55.873089378 -0600
++++ common/usr/share/doc/fglrx/examples/etc/acpi/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
diff --git a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.443.1 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.443.1-r1
index 244a71d..244a71d 100644
--- a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.443.1
+++ b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.443.1-r1