From ed844d13ac455515f6726e46cb6c59bd64e391cb Mon Sep 17 00:00:00 2001 From: Jeffrey Gardner Date: Sat, 1 Dec 2007 19:58:35 +0000 Subject: reorganization to match the structure in the portage tree svn path=/; revision=134 --- x11-drivers/ati-drivers/Manifest | 24 ++++++++-------- x11-drivers/ati-drivers/ati-drivers-8.433.ebuild | 3 +- .../files/8.433/ati-powermode-opt-path-1.patch | 33 ++++++++++++++++++++++ .../files/ati-powermode-opt-path-1.patch | 33 ---------------------- 4 files changed, 46 insertions(+), 47 deletions(-) create mode 100644 x11-drivers/ati-drivers/files/8.433/ati-powermode-opt-path-1.patch delete mode 100644 x11-drivers/ati-drivers/files/ati-powermode-opt-path-1.patch diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest index 96b8aad..3fa0faf 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 ati-powermode-opt-path-1.patch 1139 RMD160 b42a87eba428241428cee3467156a7c80b601b17 SHA1 7fa50f72453fe4501af40c8178b748aa39c599c9 SHA256 bdbcf9e8ec4a16868c1c1889cd2a4db2f00e5a6778ea6751fc1a1a75ead1f788 -MD5 477aa48331069b6295638a417b48cc61 files/ati-powermode-opt-path-1.patch 1139 -RMD160 b42a87eba428241428cee3467156a7c80b601b17 files/ati-powermode-opt-path-1.patch 1139 -SHA256 bdbcf9e8ec4a16868c1c1889cd2a4db2f00e5a6778ea6751fc1a1a75ead1f788 files/ati-powermode-opt-path-1.patch 1139 +AUX 8.433/ati-powermode-opt-path-1.patch 1139 RMD160 b42a87eba428241428cee3467156a7c80b601b17 SHA1 7fa50f72453fe4501af40c8178b748aa39c599c9 SHA256 bdbcf9e8ec4a16868c1c1889cd2a4db2f00e5a6778ea6751fc1a1a75ead1f788 +MD5 477aa48331069b6295638a417b48cc61 files/8.433/ati-powermode-opt-path-1.patch 1139 +RMD160 b42a87eba428241428cee3467156a7c80b601b17 files/8.433/ati-powermode-opt-path-1.patch 1139 +SHA256 bdbcf9e8ec4a16868c1c1889cd2a4db2f00e5a6778ea6751fc1a1a75ead1f788 files/8.433/ati-powermode-opt-path-1.patch 1139 AUX atieventsd.init 533 RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a SHA1 982ffdb8064785c8b96fb0213ad7892ac918b5d7 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3 MD5 c2aba0f353f7fb54806ad7bb6e2d3c9f files/atieventsd.init 533 RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a files/atieventsd.init 533 @@ -19,14 +19,14 @@ 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 -EBUILD ati-drivers-8.433.ebuild 15134 RMD160 f3002186ad8a4a2b06297fc877cb6705f0d61b0e SHA1 a56a34831c1637bc0b7dab3471e8e44313e7a885 SHA256 09845ec0fd2d054dfeb033f92517358c8ab16cd41abfb4b1538887b31c3c0f88 -MD5 cfea2b3e3b4f4e5d0e9d57d9081f9636 ati-drivers-8.433.ebuild 15134 -RMD160 f3002186ad8a4a2b06297fc877cb6705f0d61b0e ati-drivers-8.433.ebuild 15134 -SHA256 09845ec0fd2d054dfeb033f92517358c8ab16cd41abfb4b1538887b31c3c0f88 ati-drivers-8.433.ebuild 15134 -MISC ChangeLog 620 RMD160 6ea22e5a308d813882cd9a7b1a98eaf40c2173ce SHA1 deae76ad919b2427ae5468c94e4655f8009233af SHA256 40ed3dcdc6b899ba1e660d1f7069b95cbf6d06d0646405eb8f26a7ff961d5b25 -MD5 5796e44e80fcd4ea24c3895bcc1ba510 ChangeLog 620 -RMD160 6ea22e5a308d813882cd9a7b1a98eaf40c2173ce ChangeLog 620 -SHA256 40ed3dcdc6b899ba1e660d1f7069b95cbf6d06d0646405eb8f26a7ff961d5b25 ChangeLog 620 +EBUILD ati-drivers-8.433.ebuild 15139 RMD160 2ce2cc3628fa4befae8c900dba814d1ae446d671 SHA1 a15be0b82d75fff3bf139f4f19dd6d1bdf3f4cb0 SHA256 814f4df3abaeb7c3c7b55565c101cc996fd7ca0ea21ae52f5d39f5917b46438e +MD5 4d79da9c3060067bd33d0b951dc89791 ati-drivers-8.433.ebuild 15139 +RMD160 2ce2cc3628fa4befae8c900dba814d1ae446d671 ati-drivers-8.433.ebuild 15139 +SHA256 814f4df3abaeb7c3c7b55565c101cc996fd7ca0ea21ae52f5d39f5917b46438e ati-drivers-8.433.ebuild 15139 +MISC ChangeLog 726 RMD160 74b20bdd626b916a946c30d897221b96201e4f6b SHA1 d08112fe04a0451c8f2b75589bbcd7ef3c03194d SHA256 42ddda329d0ab65c0e4263c0c629373db53e09107235be20a4f4fa45638dcb68 +MD5 53b6f5196984e7d7c91e22ce058c354a ChangeLog 726 +RMD160 74b20bdd626b916a946c30d897221b96201e4f6b ChangeLog 726 +SHA256 42ddda329d0ab65c0e4263c0c629373db53e09107235be20a4f4fa45638dcb68 ChangeLog 726 MISC metadata.xml 494 RMD160 6c0f807a9fcdcaee2e28906992a35dd87d24ff0a SHA1 3ba9ee03c89575c03788c087c2dea8c208b398e9 SHA256 457f40aec01e7f047adfab46ed13813853102027c1f4cd68efa45a2bd39aff08 MD5 f462ad2ddb101d99fc4860e39a197a9f metadata.xml 494 RMD160 6c0f807a9fcdcaee2e28906992a35dd87d24ff0a metadata.xml 494 diff --git a/x11-drivers/ati-drivers/ati-drivers-8.433.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.433.ebuild index c79561a..4d908d1 100644 --- a/x11-drivers/ati-drivers/ati-drivers-8.433.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-8.433.ebuild @@ -151,7 +151,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}"/ati-powermode-opt-path-1.patch + epatch "${FILESDIR}"/${PV}/ati-powermode-opt-path-1.patch fi pushd ${MODULE_DIR} >/dev/null @@ -447,4 +447,3 @@ pkg_postrm() { linux-mod_pkg_postrm /usr/bin/eselect opengl set --use-old xorg-x11 } - diff --git a/x11-drivers/ati-drivers/files/8.433/ati-powermode-opt-path-1.patch b/x11-drivers/ati-drivers/files/8.433/ati-powermode-opt-path-1.patch new file mode 100644 index 0000000..88b89a8 --- /dev/null +++ b/x11-drivers/ati-drivers/files/8.433/ati-powermode-opt-path-1.patch @@ -0,0 +1,33 @@ +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 +@@ -17,6 +17,10 @@ + fi + } + ++aticonfig='/opt/bin/aticonfig' ++ ++# default high power state ++default_state=`$aticonfig --lsp | grep 'default state' | cut -c 3` + + grep -q closed /proc/acpi/button/lid/*/state + if [ $? = 0 ]; then +@@ -46,7 +50,7 @@ + getXuser; + if [ x"$XAUTHORITY" != x"" ]; then + export DISPLAY=":$displaynum" +- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=1 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=1 --effective=now" + fi + done + else +@@ -56,7 +60,7 @@ + getXuser; + if [ x"$XAUTHORITY" != x"" ]; then + export DISPLAY=":$displaynum" +- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=3 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=$default_state --effective=now" + fi + done + fi + diff --git a/x11-drivers/ati-drivers/files/ati-powermode-opt-path-1.patch b/x11-drivers/ati-drivers/files/ati-powermode-opt-path-1.patch deleted file mode 100644 index 88b89a8..0000000 --- a/x11-drivers/ati-drivers/files/ati-powermode-opt-path-1.patch +++ /dev/null @@ -1,33 +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 -@@ -17,6 +17,10 @@ - fi - } - -+aticonfig='/opt/bin/aticonfig' -+ -+# default high power state -+default_state=`$aticonfig --lsp | grep 'default state' | cut -c 3` - - grep -q closed /proc/acpi/button/lid/*/state - if [ $? = 0 ]; then -@@ -46,7 +50,7 @@ - getXuser; - if [ x"$XAUTHORITY" != x"" ]; then - export DISPLAY=":$displaynum" -- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=1 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=1 --effective=now" - fi - done - else -@@ -56,7 +60,7 @@ - getXuser; - if [ x"$XAUTHORITY" != x"" ]; then - export DISPLAY=":$displaynum" -- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=3 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=$default_state --effective=now" - fi - done - fi - -- cgit v1.2.3-18-g5258