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

(Portage version: 2.1.2.7)

4 files changed, 46 insertions, 43 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/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