Revamp ebuild to include all binaries, not conflict with iasl, build cleaner, and be generally better. Also add myself to the maintainer list.

(Portage version: 2.1_rc3-r3)

6 files changed, 164 insertions, 1 deletions

diff --git a/sys-apps/pmtools/ChangeLog b/sys-apps/pmtools/ChangeLog
index 7821c8d28c67..b2f011645649 100644
--- a/sys-apps/pmtools/ChangeLog
+++ b/sys-apps/pmtools/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/pmtools
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmtools/ChangeLog,v 1.1 2006/05/07 02:22:00 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmtools/ChangeLog,v 1.2 2006/06/02 02:35:36 robbat2 Exp $
+
+*pmtools-20051111-r1 (02 Jun 2006)
+
+  02 Jun 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +files/pmtools-20051111-acpixtract-pmtools.patch,
+  +files/pmtools-20051111-madt.patch, metadata.xml,
+  +pmtools-20051111-r1.ebuild:
+  Revamp ebuild to include all binaries, not conflict with iasl, build
+  cleaner, and be generally better. Also add myself to the maintainer list.
 
 *pmtools-20051111 (07 May 2006)
 
diff --git a/sys-apps/pmtools/files/digest-pmtools-20051111-r1 b/sys-apps/pmtools/files/digest-pmtools-20051111-r1
new file mode 100644
index 000000000000..82694a02bd5b
--- /dev/null
+++ b/sys-apps/pmtools/files/digest-pmtools-20051111-r1
@@ -0,0 +1,3 @@
+MD5 48024576f24ce8cf30cd17a1353aef6e pmtools-20051111.tar.gz 48602
+RMD160 16158a4e56dc2934c91cb07c6086beb141b486f7 pmtools-20051111.tar.gz 48602
+SHA256 622c505c0cbb08a03a078e2b1e44c06491611c7345dcb59a28d18270bcd90bed pmtools-20051111.tar.gz 48602
diff --git a/sys-apps/pmtools/files/pmtools-20051111-acpixtract-pmtools.patch b/sys-apps/pmtools/files/pmtools-20051111-acpixtract-pmtools.patch
new file mode 100644
index 000000000000..d9d9b4650653
--- /dev/null
+++ b/sys-apps/pmtools/files/pmtools-20051111-acpixtract-pmtools.patch
@@ -0,0 +1,76 @@
+diff -Nuar --exclude '*~' pmtools-20051111.orig/README pmtools-20051111/README
+--- pmtools-20051111.orig/README	2005-11-11 09:07:04.000000000 -0800
++++ pmtools-20051111/README	2006-06-01 19:24:56.917710915 -0700
+@@ -17,27 +17,27 @@
+ 
+     # ./acpidump -t DSDT -o DSDT
+ 
+-./acpidump/acpixtract
++./acpidump/acpixtract-pmtools
+ --------------------
+ Convert ASCII acpidump output to raw binary table:
+ 
+     # ./acpidump -t DSDT -b -o DSDT
+-    $ cat email | ./acpixtract DSDT > DSDT
++    $ cat email | ./acpixtract-pmtools DSDT > DSDT
+ 
+ ./acpidump/acpitbl
+ -----------------
+ Dump the table header or contents of a raw ACPI table:
+ 
+     # ./acpidump -t FACP -b | ./acpitbl
+-    $ cat email | ./acpixtract FACP | ./acpitbl
++    $ cat email | ./acpixtract-pmtools FACP | ./acpitbl
+ 
+ or
+-    $ ./acpixtract FACP acpidump.out > FACP.bin
++    $ ./acpixtract-pmtools FACP acpidump.out > FACP.bin
+ and then
+     $ ./acpitbl FACP.bin
+ 
+ or
+-    $ ./acpixtract -n 3 SSDT acpidump.out > SSDT3.bin
++    $ ./acpixtract-pmtools -n 3 SSDT acpidump.out > SSDT3.bin
+ to extract the n-th instance of a specified table type.
+ 
+ Disassembler
+diff -Nuar --exclude '*~' pmtools-20051111.orig/acpidump/acpitbl pmtools-20051111/acpidump/acpitbl
+--- pmtools-20051111.orig/acpidump/acpitbl	2005-11-11 09:07:04.000000000 -0800
++++ pmtools-20051111/acpidump/acpitbl	2006-06-01 19:24:37.848245056 -0700
+@@ -2,7 +2,7 @@
+ #
+ # acpitbl - ACPI table dumper
+ #
+-# Example: ./acpidump -t FACP | ./acpixtract | ./acpitbl
++# Example: ./acpidump -t FACP | ./acpixtract-pmtools | ./acpitbl
+ #
+ 
+ ($ME = $0) =~ s|.*/||;
+diff -Nuar --exclude '*~' pmtools-20051111.orig/acpidump/acpixtract pmtools-20051111/acpidump/acpixtract
+--- pmtools-20051111.orig/acpidump/acpixtract	2005-11-11 09:07:04.000000000 -0800
++++ pmtools-20051111/acpidump/acpixtract	2006-06-01 19:24:44.136728439 -0700
+@@ -1,9 +1,9 @@
+ #!/usr/bin/perl
+ #
+-# acpixtract - extract raw table from acpidump output
+-# usage: acpixtract [-n instance_number] <table> [input text file]
++# acpixtract-pmtools - extract raw table from acpidump output
++# usage: acpixtract-pmtools [-n instance_number] <table> [input text file]
+ #
+-# Example: cat mail.txt | ./acpixtract [-n instance_number] DSDT > DSDT
++# Example: cat mail.txt | ./acpixtract-pmtools [-n instance_number] DSDT > DSDT
+ # iasl -d DSDT
+ #
+ 
+diff -Nuar --exclude '*~' pmtools-20051111.orig/madt/README pmtools-20051111/madt/README
+--- pmtools-20051111.orig/madt/README	2005-11-11 09:07:04.000000000 -0800
++++ pmtools-20051111/madt/README	2006-06-01 19:24:51.717311154 -0700
+@@ -1,7 +1,7 @@
+ User utility to parse the ACPI MADT
+ Hacked out of Linux kernel code to do the same.
+ 
+-# ./acpidmp | ./acpixtract APIC | ./madt
++# ./acpidmp | ./acpixtract-pmtools APIC | ./madt
+ 
+ ACPI: APIC (v001 INTEL  D845EBT2 0x20021021 MSFT 0x00000097) @ 0x(nil)
+ ACPI: LAPIC (acpi_id[0x01] lapic_id[0x00] enabled)
diff --git a/sys-apps/pmtools/files/pmtools-20051111-madt.patch b/sys-apps/pmtools/files/pmtools-20051111-madt.patch
new file mode 100644
index 000000000000..963da5210cfa
--- /dev/null
+++ b/sys-apps/pmtools/files/pmtools-20051111-madt.patch
@@ -0,0 +1,24 @@
+diff -Nuar --exclude '*~' --exclude '*.orig' pmtools-20051111.orig/Makefile pmtools-20051111/Makefile
+--- pmtools-20051111.orig/Makefile	2005-11-11 09:07:04.000000000 -0800
++++ pmtools-20051111/Makefile	2006-05-29 17:12:54.153948801 -0700
+@@ -1,4 +1,4 @@
+-DIRS = acpidump
++DIRS = acpidump madt
+ 
+ all:
+ 	for i in $(DIRS); do $(MAKE) -C $$i $@; done
+diff -Nuar --exclude '*~' --exclude '*.orig' pmtools-20051111.orig/madt/Makefile pmtools-20051111/madt/Makefile
+--- pmtools-20051111.orig/madt/Makefile	2005-11-11 09:07:04.000000000 -0800
++++ pmtools-20051111/madt/Makefile	2006-05-29 17:15:41.877439276 -0700
+@@ -1,6 +1,10 @@
++all: madt
++
+ test: madt
+ 	./madt < APIC
++
+ madt: madt.c acpi.h tables.c
+-	cc -o madt madt.c
++	$(CC) $(CFLAGS) -o $@ madt.c
++
+ clean:
+ 	rm madt
diff --git a/sys-apps/pmtools/metadata.xml b/sys-apps/pmtools/metadata.xml
index 7ef2488c775b..bb6d633cfc30 100644
--- a/sys-apps/pmtools/metadata.xml
+++ b/sys-apps/pmtools/metadata.xml
@@ -5,6 +5,9 @@
 <maintainer>
   <email>nerdboy@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>robbat2@gentoo.org</email>
+</maintainer>
 <longdescription>This package really just provides acpidump and associated tools
 for extracting ACPI tables to edit/reload buggy BIOS tables (works with iasl). 
 Useful for all ACPI-based systems (not just mobile/laptop systems).
diff --git a/sys-apps/pmtools/pmtools-20051111-r1.ebuild b/sys-apps/pmtools/pmtools-20051111-r1.ebuild
new file mode 100644
index 000000000000..b5ef46734d34
--- /dev/null
+++ b/sys-apps/pmtools/pmtools-20051111-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmtools/pmtools-20051111-r1.ebuild,v 1.1 2006/06/02 02:35:36 robbat2 Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="ACPI disassembler tools, including acpidump"
+HOMEPAGE="http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/"
+SRC_URI="http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/utils/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~amd64 ~x86"
+IUSE=""
+DEPEND="virtual/libc"
+RDEPEND="${DEPEND}
+		dev-lang/perl
+		>=sys-power/iasl-20060512"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-madt.patch
+	epatch ${FILESDIR}/${P}-acpixtract-pmtools.patch
+	sed -i.orig \
+		-e '/^CFLAGS/s, -s , ,' \
+		${S}/acpidump/Makefile || die "sed failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	# acpidump access the ACPI data via /dev/mem or EFI firmware in /sys
+	dosbin acpidump/acpidump
+	# the other tools only process data
+	newbin acpidump/acpixtract acpixtract-pmtools
+	dobin acpidump/acpitbl
+	dobin madt/madt
+
+	dodoc README
+	docinto madt
+	dodoc madt/README madt/APIC*
+}
+
+pkg_postinst() {
+	ewarn "Please note that acpixtract is now named acpixtract-pmtools to avoid"
+	ewarn "conflicts with the new tool of the same name from the iasl package."
+}