Change patch to work for Phillip Berndt <phillip.berndt@googlemail.com> in bug 176457 too

Package-Manager: portage-2.1.2.7

5 files changed, 61 insertions, 58 deletions

diff --git a/sys-power/acpitool/ChangeLog b/sys-power/acpitool/ChangeLog
index c93c7a133def..f0b581b78d4d 100644
--- a/sys-power/acpitool/ChangeLog
+++ b/sys-power/acpitool/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-power/acpitool
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpitool/ChangeLog,v 1.5 2007/02/12 19:18:11 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpitool/ChangeLog,v 1.6 2007/05/09 19:16:22 genstef Exp $
+
+*acpitool-0.4.7-r1 (09 May 2007)
+
+  09 May 2007; Stefan Schweizer <genstef@gentoo.org>
+  files/acpitool-0.4.7-proc_acpi_info_move.patch, -acpitool-0.4.7.ebuild,
+  +acpitool-0.4.7-r1.ebuild:
+  Change patch to work for Phillip Berndt <phillip.berndt@googlemail.com> in
+  bug 176457 too
 
 *acpitool-0.4.7 (12 Feb 2007)
 
diff --git a/sys-power/acpitool/Manifest b/sys-power/acpitool/Manifest
index a90357b7f010..ef61f4871c8c 100644
--- a/sys-power/acpitool/Manifest
+++ b/sys-power/acpitool/Manifest
@@ -1,21 +1,21 @@
-AUX acpitool-0.4.7-proc_acpi_info_move.patch 1860 RMD160 b72a703236fa870b179765f343656476bc8c1435 SHA1 4fc062ed03531c648aa4ee120dd5527cf666b49d SHA256 9cebb2cd4d143e43ace0bdf8f1c39325c9104c430948c5795e9e3fcec43aad68
-MD5 babd314f923e84c3530b8949ab61f5e9 files/acpitool-0.4.7-proc_acpi_info_move.patch 1860
-RMD160 b72a703236fa870b179765f343656476bc8c1435 files/acpitool-0.4.7-proc_acpi_info_move.patch 1860
-SHA256 9cebb2cd4d143e43ace0bdf8f1c39325c9104c430948c5795e9e3fcec43aad68 files/acpitool-0.4.7-proc_acpi_info_move.patch 1860
+AUX acpitool-0.4.7-proc_acpi_info_move.patch 1925 RMD160 f5c5751032161855f2ac2af78626aefb670907bb SHA1 89852d30509209be6ecf077726318852765f114f SHA256 360aa177ecf11e0ec22bc6bbebab8d865de61d15d965c6cf47063ca6215ad177
+MD5 8a335e3c9061da34450dd527e21cd69a files/acpitool-0.4.7-proc_acpi_info_move.patch 1925
+RMD160 f5c5751032161855f2ac2af78626aefb670907bb files/acpitool-0.4.7-proc_acpi_info_move.patch 1925
+SHA256 360aa177ecf11e0ec22bc6bbebab8d865de61d15d965c6cf47063ca6215ad177 files/acpitool-0.4.7-proc_acpi_info_move.patch 1925
 DIST acpitool-0.4.6.tar.bz2 101920 RMD160 b2bd2c2684bd2e792ab6fc695683743fb7b444d7 SHA1 59a44a48fab17916b77f4923f85d85d2d06ce671 SHA256 6964522c943540dd5672643de99ebea96fc579edccea9d6e20f9a8fcd59685cb
 DIST acpitool-0.4.7.tar.bz2 105943 RMD160 82385c84d94cdcbf272b2b54d8df3b05afc73cdd SHA1 203ed12250d88eb5bc5a4ab4bb837317c9222ca0 SHA256 6908261eb226edd397e43fb6e0d0f673b7cfcd1635dd0948a280e284d96b6b8c
 EBUILD acpitool-0.4.6.ebuild 602 RMD160 33555f984b890be43cb088d2d718b7766e7920ed SHA1 e55ce48c19b1b5d2291dbbf22cc342df138e3b88 SHA256 391ee1e8eba0d55e4f6fd4f3cc6c72eab3ceca9c5c7c2a6607906fa2e379658e
 MD5 48ce5f7c31681a5a2e1c695ae585d5d5 acpitool-0.4.6.ebuild 602
 RMD160 33555f984b890be43cb088d2d718b7766e7920ed acpitool-0.4.6.ebuild 602
 SHA256 391ee1e8eba0d55e4f6fd4f3cc6c72eab3ceca9c5c7c2a6607906fa2e379658e acpitool-0.4.6.ebuild 602
-EBUILD acpitool-0.4.7.ebuild 708 RMD160 b7cc435b5d0a6087a1516d7b2da1bc7ed04db736 SHA1 c7c7f2342ee2946764987139c5e4493aa6838273 SHA256 3d9e8495046141dd473f850d0e0bab8a405e6b176518293c7424a71bff03a2a2
-MD5 3333129ef19b198c4ad80422ba8b8f77 acpitool-0.4.7.ebuild 708
-RMD160 b7cc435b5d0a6087a1516d7b2da1bc7ed04db736 acpitool-0.4.7.ebuild 708
-SHA256 3d9e8495046141dd473f850d0e0bab8a405e6b176518293c7424a71bff03a2a2 acpitool-0.4.7.ebuild 708
-MISC ChangeLog 2798 RMD160 35c901c40253d74c8d94e9aafe402f5b4226e40b SHA1 59a7ad76c98eb7dd96442469f6aad43b32af2923 SHA256 8906284eb95fcb555ea5c7d1b76c4bd60fa2418d78aa273efc1a6aa2717c496f
-MD5 7ef52584b96a31eb2fe03a031ecc499e ChangeLog 2798
-RMD160 35c901c40253d74c8d94e9aafe402f5b4226e40b ChangeLog 2798
-SHA256 8906284eb95fcb555ea5c7d1b76c4bd60fa2418d78aa273efc1a6aa2717c496f ChangeLog 2798
+EBUILD acpitool-0.4.7-r1.ebuild 711 RMD160 999406c67c581afc3746e02dd5c02bb982a6815a SHA1 0273d845d41a77ac5e7ad670c35dcbe495735d37 SHA256 0b6664de341ce59b744e55ed5085557c467a23def315799b786d57abc222fea2
+MD5 3b7f8b4a07a0e6aea4b784bc5819c480 acpitool-0.4.7-r1.ebuild 711
+RMD160 999406c67c581afc3746e02dd5c02bb982a6815a acpitool-0.4.7-r1.ebuild 711
+SHA256 0b6664de341ce59b744e55ed5085557c467a23def315799b786d57abc222fea2 acpitool-0.4.7-r1.ebuild 711
+MISC ChangeLog 3083 RMD160 ef69f25552f450ead9bdf484568599db2ecf3584 SHA1 19fa1f00d05e1495a9ba922588e7e40df4b0fa00 SHA256 4436cfe87c6de947fbe2550360824901a781fabf47cf921b7d481fd277d8b1fc
+MD5 f4367d8093a58beb179a90b15be29860 ChangeLog 3083
+RMD160 ef69f25552f450ead9bdf484568599db2ecf3584 ChangeLog 3083
+SHA256 4436cfe87c6de947fbe2550360824901a781fabf47cf921b7d481fd277d8b1fc ChangeLog 3083
 MISC metadata.xml 224 RMD160 e73100c3b7b6e761987fafac8783a4607a96ff5b SHA1 84bc5a9f7616f4a37850c82df191c19ead26a6c0 SHA256 4649248bc71af10e619a06fa064d31e7df18cde3e446c9d67f387bffb0062e37
 MD5 8629d3ef30ef3be4b273182406eef4f2 metadata.xml 224
 RMD160 e73100c3b7b6e761987fafac8783a4607a96ff5b metadata.xml 224
@@ -23,6 +23,6 @@ SHA256 4649248bc71af10e619a06fa064d31e7df18cde3e446c9d67f387bffb0062e37 metadata
 MD5 dc4395f55153368807cd7defee7b3172 files/digest-acpitool-0.4.6 247
 RMD160 d2b2abb135038fc11169dd58c43ca0e23ae4adbc files/digest-acpitool-0.4.6 247
 SHA256 56cd3b643234669e70a789bd9e78903ca6f30c776d5de725c4cd9b04f36eb620 files/digest-acpitool-0.4.6 247
-MD5 3d655a4e8d70f4c36ed8e1754fa9dd0a files/digest-acpitool-0.4.7 247
-RMD160 15bdc7a748fa39e973934de50f48d86e05c2cada files/digest-acpitool-0.4.7 247
-SHA256 2bdee9cdf3e4ba58f469a11a69b4067fda46c862f9051d22a208847181b0d664 files/digest-acpitool-0.4.7 247
+MD5 3d655a4e8d70f4c36ed8e1754fa9dd0a files/digest-acpitool-0.4.7-r1 247
+RMD160 15bdc7a748fa39e973934de50f48d86e05c2cada files/digest-acpitool-0.4.7-r1 247
+SHA256 2bdee9cdf3e4ba58f469a11a69b4067fda46c862f9051d22a208847181b0d664 files/digest-acpitool-0.4.7-r1 247
diff --git a/sys-power/acpitool/acpitool-0.4.7.ebuild b/sys-power/acpitool/acpitool-0.4.7-r1.ebuild
index 6c1407afa264..4b88b065d6ba 100644
--- a/sys-power/acpitool/acpitool-0.4.7.ebuild
+++ b/sys-power/acpitool/acpitool-0.4.7-r1.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/sys-power/acpitool/acpitool-0.4.7.ebuild,v 1.1 2007/02/12 19:18:11 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpitool/acpitool-0.4.7-r1.ebuild,v 1.1 2007/05/09 19:16:22 genstef Exp $
 
 inherit eutils
 
diff --git a/sys-power/acpitool/files/acpitool-0.4.7-proc_acpi_info_move.patch b/sys-power/acpitool/files/acpitool-0.4.7-proc_acpi_info_move.patch
index 5746eb1883ff..ccdcbefd9703 100644
--- a/sys-power/acpitool/files/acpitool-0.4.7-proc_acpi_info_move.patch
+++ b/sys-power/acpitool/files/acpitool-0.4.7-proc_acpi_info_move.patch
@@ -1,12 +1,8 @@
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-Support the new location for the acpica version information, as /proc/acpi/info
-no longers exists in 2.6.21 development tree.
-
-diff -Nuar acpitool-0.4.7.orig/src/acpitool.cpp acpitool-0.4.7/src/acpitool.cpp
---- acpitool-0.4.7.orig/src/acpitool.cpp	2007-02-06 12:03:02.000000000 -0800
-+++ acpitool-0.4.7/src/acpitool.cpp	2007-02-12 12:04:35.000000000 -0800
-@@ -54,15 +54,18 @@
+Files acpitool-0.4.7.old/src/acpitool and acpitool-0.4.7/src/acpitool differ
+diff -Nru acpitool-0.4.7.old/src/acpitool.cpp acpitool-0.4.7/src/acpitool.cpp
+--- acpitool-0.4.7.old/src/acpitool.cpp	2007-04-29 14:38:46.289190064 +0000
++++ acpitool-0.4.7/src/acpitool.cpp	2007-04-29 14:43:59.411033861 +0000
+@@ -54,15 +54,15 @@
      char *filename;
      
      filename = "/proc/acpi/info";
@@ -16,58 +12,57 @@ diff -Nuar acpitool-0.4.7.orig/src/acpitool.cpp acpitool-0.4.7/src/acpitool.cpp
 -    	return 0;
 -    else
 -    {
-+    if(file_in) goto has_success;
-+    filename = "/sys/module/acpi/parameters/acpica_version";
-+    file_in.open(filename);
-+    if(file_in) goto has_success;
-+    // failure
-+    return 0;
-+
-+has_success:
- 	file_in.close();
-         return 1;
--    }
+-	file_in.close();
+-        return 1;
++    if(!file_in.is_open()) {
++        filename = "/sys/module/acpi/parameters/acpica_version";
++        file_in.open(filename);
+     }
++    if(!file_in.is_open()) return 0;
 +
++    file_in.close();
++    return 1;
  }
      
  int Print_ACPI_Info(int show_ac, int show_therm, int show_trip, int show_fan, int show_batteries, int show_empty, int show_version, int show_cpu, int show_wake, int e_set, int info_level, int verbose)
-@@ -96,23 +99,27 @@
+@@ -96,23 +96,24 @@
      char *filename, str[50];
      
      filename = "/proc/acpi/info";
 -    
      file_in.open(filename);
 -    if (!file_in)
-+    if(file_in) goto version_success;
-+    filename = "/sys/module/acpi/parameters/acpica_version";
-+    file_in.open(filename);
-+    if(file_in) goto version_success;
-+
-+    // failure
-+    if(!verbose)
-     {
+-    {
 -    	if(!verbose)
 -    	{
- 	    strcpy(c, "<n.a>");
+-	    strcpy(c, "<n.a>");
 -    	    return 0;
 -    	}
 -    	else
 -    	{
 -    	    cout<<"  Could not open file : "<<filename<<endl;
-+	    return 0;
-+    }
-+    else
-+    {
-+	    cout<<"  Could not open file : "<<filename<<endl;
- 	    cout<<"  Make sure your kernel has ACPI support enabled."<<endl;
- 	    return -1;
+-	    cout<<"  Make sure your kernel has ACPI support enabled."<<endl;
+-	    return -1;
 -    	}	
--    }
++    if(!file_in.is_open()) {
++        filename = "/sys/module/acpi/parameters/acpica_version";
++        file_in.open(filename);
++    }
++    if(!file_in.is_open()) {
++	    // failure
++	    if(!verbose) {
++		    strcpy(c, "<n.a>");
++		    return 0;
++	    }
++	    else {
++		    cout<<"  Could not open file : "<<filename<<endl;
++		    cout<<"  Make sure your kernel has ACPI support enabled."<<endl;
++		    return -1;
++	    }
+     }
 -       
-+    }	
-+
-+version_success:
 +
      file_in.getline(str, 50);
      file_in.close();
      
+Files acpitool-0.4.7.old/src/acpitool.o and acpitool-0.4.7/src/acpitool.o differ
diff --git a/sys-power/acpitool/files/digest-acpitool-0.4.7 b/sys-power/acpitool/files/digest-acpitool-0.4.7-r1
index ea6eb2cb6575..ea6eb2cb6575 100644
--- a/sys-power/acpitool/files/digest-acpitool-0.4.7
+++ b/sys-power/acpitool/files/digest-acpitool-0.4.7-r1