Respin the pmtools patch.

Package-Manager: portage-2.1.5.4

4 files changed, 54 insertions, 6 deletions

diff --git a/sys-power/pmtools/ChangeLog b/sys-power/pmtools/ChangeLog
index 866bb22f5f5b..cf69830c6879 100644
--- a/sys-power/pmtools/ChangeLog
+++ b/sys-power/pmtools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-power/pmtools
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/pmtools/ChangeLog,v 1.5 2008/06/07 01:23:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pmtools/ChangeLog,v 1.6 2008/06/07 01:39:12 robbat2 Exp $
+
+  07 Jun 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +files/pmtools-20071116-acpixtract-pmtools.patch, pmtools-20071116.ebuild:
+  Respin the pmtools patch.
 
 *pmtools-20071116 (07 Jun 2008)
 
diff --git a/sys-power/pmtools/Manifest b/sys-power/pmtools/Manifest
index dec6144bdeed..d8624537c7b0 100644
--- a/sys-power/pmtools/Manifest
+++ b/sys-power/pmtools/Manifest
@@ -2,12 +2,13 @@ AUX pmtools-20051111-acpixtract-pmtools.patch 2876 RMD160 d5f86bfb22fde70f9bc309
 AUX pmtools-20051111-madt.patch 769 RMD160 94c13d627c3777ad463ce8d8c6386f1c89f94df8 SHA1 f204c4565a8efc55d1034418adc6f92661f8278a SHA256 f2434c65de462a26f8d97b75fa1eff815cade46d0ef91b8dc939da111ee1af18
 AUX pmtools-20061130-acpixtract-pmtools.patch 1968 RMD160 0689c2beedfb33d9fde1cccc5f51d7e10296f0ae SHA1 ac185b3af068be6adf6b845c47e705e93889738f SHA256 bede9f4165ae92932d07f0449d10b5fe92ed2c3ce3d872d721f92bb6bc6b48b0
 AUX pmtools-20061130-madt.patch 363 RMD160 470aa0c91bbf317ce10ef5936cc54c92692a7d9f SHA1 8b2a96f71147ffe0dc242c5c1b7c379ce6752a8c SHA256 d1a9e6e1d58e43783d0159e8bc53bd42facc78e7e88bd937a5989c40ae83da7c
+AUX pmtools-20071116-acpixtract-pmtools.patch 1909 RMD160 29d0d477b0fd4c17c5c780890f8d7c3830353729 SHA1 81a1fab47e202fae77851cbceb519eb5ca7c133c SHA256 90d0b281563a3389ff90d2bcd3cea7492876c395c80e7050fe14a8f1f244d235
 DIST pmtools-20051111.tar.gz 48602 RMD160 16158a4e56dc2934c91cb07c6086beb141b486f7 SHA1 16c63d694e61a01ebb991a3eafa08f7f784ce1af SHA256 622c505c0cbb08a03a078e2b1e44c06491611c7345dcb59a28d18270bcd90bed
 DIST pmtools-20061130.tar.gz 53155 RMD160 25771b23bd32afe722586d852e8e17c40a59d88e SHA1 40537a667aff62798d68c18701607f5ee2030db4 SHA256 3b776339f9d25466e168358d93725704babe6b8a129d473e7f7d432756ab56de
 DIST pmtools-20071116.tar.gz 51566 RMD160 b96b8334fa400fa49cfe21cd285481e48b57e2bb SHA1 997612de90eee65c3974a07b9eee68cfeb077abd SHA256 91751774976e39f6237efd0326eb35196a9346220b92ad35894a33283e872748
 EBUILD pmtools-20051111-r1.ebuild 1361 RMD160 8583ef5e47fd42b52a254068d41ea8654e720461 SHA1 d675443b397647f928f5db467ea8c5d98a28e647 SHA256 8be1792b3ee2cad6d69bb659825271a934dd00f564fc47d87deceed5cb661f08
 EBUILD pmtools-20051111.ebuild 664 RMD160 5da51e6dd5e491fd079b28580727c51056867a1a SHA1 c38551f49be4dd93e077653f1310b3bdf395e93b SHA256 6c5686c1bb1e17d1fc79fedba8fad0b09fc5ec3ed72fac09173449c4c1ff4a66
 EBUILD pmtools-20061130.ebuild 1369 RMD160 c6739dd7240a370dfa7a1ea55f6fbd49cb98aa05 SHA1 d1a1f8c85e40cea096f793e998c45c258e73061a SHA256 ea90554525a8d33aa226ea4232aeb767e93032ee4d7902374781f4e280d72702
-EBUILD pmtools-20071116.ebuild 1361 RMD160 f39bd6cbbab979e37dc00e4492bf22fa8e994fbe SHA1 c25886b69f82bb1a2b05fa676cca909bb5d51db6 SHA256 62dae11b2a5524b9e1b94984062b117b2cabc638695bb345b8443771a1d8f2ef
-MISC ChangeLog 1559 RMD160 5ef63983a6b34b22f0ab9778e35af7062fc9a4f3 SHA1 20c7fcf38f91d07d17bbf5e0d53883a07141a678 SHA256 aab1bef3410c445c0a801e0fbfd2e3a8d14de66ba8e0906071cf572dbacc2ac0
+EBUILD pmtools-20071116.ebuild 1409 RMD160 1890af95c9e961b357b6b87e01bb680afbcc2da3 SHA1 4c541ec85b00162bbc3b0c9d3c14c85ddbda1499 SHA256 f9fe86ac34ff1b4f1403be3a877a60c2bf9e5c5a953651f728f4781f61ff8146
+MISC ChangeLog 1718 RMD160 ad6e0d2379b9710143178fc0b6ae50922b8d38ac SHA1 dcc62ca0a911b62c80b04547a3fe83dfc0c94b51 SHA256 73add374f63cfe0eb20b7eeacde59dbc76bad9d92e8534bc55e301f31d938187
 MISC metadata.xml 533 RMD160 06d6822d1d37fe42df032895be61852d748b4e60 SHA1 a0891a3a28f82a70ca3067431b2aebd8dd35b496 SHA256 095b685564533cd746483e96e141521b72a5cf63add86c58c7c4989aa0ec97b2
diff --git a/sys-power/pmtools/files/pmtools-20071116-acpixtract-pmtools.patch b/sys-power/pmtools/files/pmtools-20071116-acpixtract-pmtools.patch
new file mode 100644
index 000000000000..1e733663f3ed
--- /dev/null
+++ b/sys-power/pmtools/files/pmtools-20071116-acpixtract-pmtools.patch
@@ -0,0 +1,42 @@
+diff -Nuar --exclude '*.orig' --exclude '*.rej' pmtools-20071116.orig/acpixtract/acpixtract.c pmtools-20071116/acpixtract/acpixtract.c
+--- pmtools-20071116.orig/acpixtract/acpixtract.c	2007-11-16 10:45:44.000000000 -0800
++++ pmtools-20071116/acpixtract/acpixtract.c	2008-06-06 18:28:34.203106692 -0700
+@@ -199,7 +199,7 @@
+     void)
+ {
+ 
+-    printf ("Usage: acpixtract [option] <InputFile>\n");
++    printf ("Usage: acpixtract-pmtools [option] <InputFile>\n");
+     printf ("\nExtract binary ACPI tables from text acpidump output\n");
+     printf ("Default invocation extracts all DSDTs and SSDTs\n");
+     printf ("Version %8.8X\n\n", VERSION);
+diff -Nuar --exclude '*.orig' --exclude '*.rej' pmtools-20071116.orig/madt/README pmtools-20071116/madt/README
+--- pmtools-20071116.orig/madt/README	2007-11-16 10:39:50.000000000 -0800
++++ pmtools-20071116/madt/README	2008-06-06 18:30:18.101885794 -0700
+@@ -2,7 +2,7 @@
+ Hacked out of Linux kernel code to do the same.
+ 
+ # ./acpidmp > acpidump.txt
+-$ acpixtract -a acpidump.txt
++$ acpixtract-pmtools -a acpidump.txt
+ $ madt < APIC.dat
+ 
+ ACPI: APIC (v001 INTEL  D845EBT2 0x20021021 MSFT 0x00000097) @ 0x(nil)
+diff -Nuar --exclude '*.orig' --exclude '*.rej' pmtools-20071116.orig/README pmtools-20071116/README
+--- pmtools-20071116.orig/README	2007-11-16 10:54:27.000000000 -0800
++++ pmtools-20071116/README	2008-06-06 18:29:53.513505961 -0700
+@@ -24,11 +24,11 @@
+ and it is why the output doesn't change when different
+ kernels are booted.
+ 
+-./acpidump/acpixtract
+---------------------
++./acpidump/acpixtract-pmtools
++-----------------------------
+ Convert ASCII acpidump output to raw binary tables:
+ 
+-	$ acpixtract/acpixtract -a acpidump.txt
++	$ acpixtract/acpixtract-pmtools -a acpidump.txt
+ 	Acpi table [DSDT] -  15974 bytes written to DSDT.dat
+ 	Acpi table [FACS] -     64 bytes written to FACS.dat
+ 	Acpi table [FACP] -    116 bytes written to FACP.dat
diff --git a/sys-power/pmtools/pmtools-20071116.ebuild b/sys-power/pmtools/pmtools-20071116.ebuild
index 681e0d959bd7..576495161a36 100644
--- a/sys-power/pmtools/pmtools-20071116.ebuild
+++ b/sys-power/pmtools/pmtools-20071116.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/pmtools/pmtools-20071116.ebuild,v 1.1 2008/06/07 01:23:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pmtools/pmtools-20071116.ebuild,v 1.2 2008/06/07 01:39:12 robbat2 Exp $
 
 inherit eutils toolchain-funcs
 
@@ -20,6 +20,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${PN}-20071116-acpixtract-pmtools.patch
+	
 	# Integrated upstream
 	#epatch "${FILESDIR}"/${PN}-20070714-madt.patch
 
@@ -37,12 +39,11 @@ src_install() {
 	dosbin acpidump/acpidump
 	# the other tools only process data
 	newbin acpixtract/acpixtract acpixtract-pmtools
-	dobin acpidump/acpitbl
 	dobin madt/madt
 
 	dodoc README
 	docinto madt
-	dodoc madt/README madt/APIC*
+	dodoc madt/README madt/example.APIC*
 }
 
 pkg_postinst() {