Updated for EAPI2 and to address bug #281567 (thanks to Zeev Tarantov).

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 123 insertions, 2 deletions

diff --git a/sys-power/pmtools/ChangeLog b/sys-power/pmtools/ChangeLog
index 189e66dd5bec..f93d8572fb73 100644
--- a/sys-power/pmtools/ChangeLog
+++ b/sys-power/pmtools/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-power/pmtools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/pmtools/ChangeLog,v 1.10 2009/02/28 20:04:59 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pmtools/ChangeLog,v 1.11 2009/08/16 17:10:55 nerdboy Exp $
+
+*pmtools-20071116-r1 (16 Aug 2009)
+
+  16 Aug 2009; Steve Arnold <nerdboy@gentoo.org>
+  +pmtools-20071116-r1.ebuild, +files/pmtools-20071116-64bit.patch,
+  +files/pmtools-20071116-cflags-ldflags.patch:
+  Changes in this revision:
+	1) updated with build patches (kindly provided by Zeev Tarantov 
+	   <zeev.tarantov _at_ gmail.com>, see bug #281567)
+	2) updated to EAPI2
+	3) removed ppc, since ACPI is really only relevant for x86/amd64
 
   28 Feb 2009; Steve Arnold <nerdboy@gentoo.org> pmtools-20071116.ebuild:
   Updated to respect user LDFLAGS (see bug #253087), although I don't
diff --git a/sys-power/pmtools/Manifest b/sys-power/pmtools/Manifest
index fdfd167b1152..d071a853d090 100644
--- a/sys-power/pmtools/Manifest
+++ b/sys-power/pmtools/Manifest
@@ -1,5 +1,8 @@
+AUX pmtools-20071116-64bit.patch 674 RMD160 d77490b14a5824f56e6c4cb1c4b87027c7392180 SHA1 e5287c9cb6a476645ee992588a8a2fad7cabb96f SHA256 4c2087bf707eeac438b9d4ef0934de5531b2ab3d1e1f28fb0fddac2ac0940516
 AUX pmtools-20071116-acpixtract-pmtools.patch 1909 RMD160 29d0d477b0fd4c17c5c780890f8d7c3830353729 SHA1 81a1fab47e202fae77851cbceb519eb5ca7c133c SHA256 90d0b281563a3389ff90d2bcd3cea7492876c395c80e7050fe14a8f1f244d235
+AUX pmtools-20071116-cflags-ldflags.patch 958 RMD160 294938ebc18edb7fd6f950676a837d86c3bf5c53 SHA1 55fefbb9ce20d1c7b518cd5574330a32581b7918 SHA256 8a078c5c7341af90d5b71fc94997971a3af89b51f3ec9d2f62b184f1967939ba
 DIST pmtools-20071116.tar.gz 51566 RMD160 b96b8334fa400fa49cfe21cd285481e48b57e2bb SHA1 997612de90eee65c3974a07b9eee68cfeb077abd SHA256 91751774976e39f6237efd0326eb35196a9346220b92ad35894a33283e872748
+EBUILD pmtools-20071116-r1.ebuild 1389 RMD160 40c4a3a620cc298704f035e03a6d59b031d8d969 SHA1 39b74c308dbce841d1bb6270833ad3003988da02 SHA256 59e743f77528da070e3ad0e4c841991ce99097e05ec167e135f48b163c3521c6
 EBUILD pmtools-20071116.ebuild 1433 RMD160 87878e99b2fa8c158853494d5427eba4a1a60b88 SHA1 04bdba51d7e2940d991f215c3d26c05ec2f53bf6 SHA256 93521b190ec9f9bdcab1bd27bc2f20403e39196aecfa34ad18d6a0e205f211bf
-MISC ChangeLog 2475 RMD160 fab2bbe6fb26f883331fedf2f95d4929b6b07675 SHA1 cee7e524a53a4ec06beb771d8bce2d7e2821f141 SHA256 e14e4bb8a1f1fc2142172673f98c84f13f00b538c39e92f49152f0fd5b2912b5
+MISC ChangeLog 2911 RMD160 620213addd7709f7749ec4d72003957071a23ed0 SHA1 0ad50404527623628d88398e936d3b039afd69a3 SHA256 bf0014d4ac0f7f8e50795ae836cffaab46a1b8032172f1b9dc174aac1abd73f1
 MISC metadata.xml 533 RMD160 06d6822d1d37fe42df032895be61852d748b4e60 SHA1 a0891a3a28f82a70ca3067431b2aebd8dd35b496 SHA256 095b685564533cd746483e96e141521b72a5cf63add86c58c7c4989aa0ec97b2
diff --git a/sys-power/pmtools/files/pmtools-20071116-64bit.patch b/sys-power/pmtools/files/pmtools-20071116-64bit.patch
new file mode 100644
index 000000000000..756ac8412abe
--- /dev/null
+++ b/sys-power/pmtools/files/pmtools-20071116-64bit.patch
@@ -0,0 +1,20 @@
+--- madt/madt.c.orig
++++ madt/madt.c
+@@ -46,7 +46,7 @@
+ {
+ 	size_t retval;
+ 
+-	if (verbose) printf("reading %d byte entry header\n", sizeof(acpi_table_entry_header));
++	if (verbose) printf("reading %ld byte entry header\n", sizeof(acpi_table_entry_header));
+ 	retval = fread((void *)entry_header, sizeof(acpi_table_entry_header), 1, stdin);
+ 	return retval;
+ }
+@@ -64,7 +64,7 @@
+ 
+ 	bytes_read = csum = 0;
+ 
+-	if (verbose) printf("reading %d madt header\n", sizeof(struct acpi_table_madt));
++	if (verbose) printf("reading %ld madt header\n", sizeof(struct acpi_table_madt));
+ 
+ 	retval = fread((void *)buffer, sizeof(struct acpi_table_madt), 1, stdin);
+ 	if (retval != 1) {
diff --git a/sys-power/pmtools/files/pmtools-20071116-cflags-ldflags.patch b/sys-power/pmtools/files/pmtools-20071116-cflags-ldflags.patch
new file mode 100644
index 000000000000..1d55e6a81b96
--- /dev/null
+++ b/sys-power/pmtools/files/pmtools-20071116-cflags-ldflags.patch
@@ -0,0 +1,38 @@
+--- acpidump/Makefile.orig
++++ acpidump/Makefile
+@@ -1,11 +1,11 @@
+ PROG= acpidump
+ SRCS=	acpidump.c
+ KERNEL_INCLUDE := ../include
+-CFLAGS += -Wall -Wstrict-prototypes -Wdeclaration-after-statement -Os -s -D_LINUX -DDEFINE_ALTERNATE_TYPES -I$(KERNEL_INCLUDE) 
++CFLAGS += -Wall -Wstrict-prototypes -Wdeclaration-after-statement -D_LINUX -DDEFINE_ALTERNATE_TYPES -I$(KERNEL_INCLUDE) 
+ 
+ all: acpidump
+ $(PROG) : $(SRCS)
+-	$(CC) $(CFLAGS) $(SRCS) -o $(PROG)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(SRCS) -o $(PROG)
+ 
+ CLEANFILES= $(PROG)
+ 
+--- acpixtract/Makefile.orig
++++ acpixtract/Makefile
+@@ -6,7 +6,7 @@
+ all: $(PROG)
+ 
+ $(PROG) : $(SRCS)
+-	$(CC) $(CFLAGS) $(SRCS) -o $(PROG)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(SRCS) -o $(PROG)
+ 
+ CLEANFILES= $(PROG)
+ 
+--- madt/Makefile.orig
++++ madt/Makefile
+@@ -3,7 +3,7 @@
+ 
+ all: madt
+ $(PROG) : $(SRCS)
+-	$(CC) $(CFLAGS) $(SRCS) -o $(PROG)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(SRCS) -o $(PROG)
+ 
+ test: madt
+ 	./madt < example.APIC.dat
diff --git a/sys-power/pmtools/pmtools-20071116-r1.ebuild b/sys-power/pmtools/pmtools-20071116-r1.ebuild
new file mode 100644
index 000000000000..aef33fb1a0af
--- /dev/null
+++ b/sys-power/pmtools/pmtools-20071116-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pmtools/pmtools-20071116-r1.ebuild,v 1.1 2009/08/16 17:10:55 nerdboy Exp $
+
+EAPI=2
+
+inherit eutils flag-o-matic 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="~amd64 ~x86"
+IUSE=""
+DEPEND="virtual/libc"
+RDEPEND="${DEPEND}
+		dev-lang/perl
+		>=sys-power/iasl-20060512"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-acpixtract-pmtools.patch
+	epatch "${FILESDIR}"/${P}-cflags-ldflags.patch
+	epatch "${FILESDIR}"/${P}-64bit.patch
+
+	strip-unsupported-flags
+}
+
+src_compile() {
+	# respect user's LDFLAGS
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" || 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 acpixtract/acpixtract acpixtract-pmtools
+	dobin madt/madt
+
+	dodoc README
+	docinto madt
+	dodoc madt/README madt/example.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."
+}