Updated to latest upstream version (new patch courtesy of Fabio Rossi).

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

4 files changed, 114 insertions, 2 deletions

diff --git a/sys-power/pmtools/ChangeLog b/sys-power/pmtools/ChangeLog
index 763881d55bb1..0d9b23d06bf2 100644
--- a/sys-power/pmtools/ChangeLog
+++ b/sys-power/pmtools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/pmtools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/pmtools/ChangeLog,v 1.15 2010/10/04 06:31:16 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pmtools/ChangeLog,v 1.16 2010/12/07 04:19:02 nerdboy Exp $
+
+*pmtools-20101124 (07 Dec 2010)
+
+  07 Dec 2010; Steve Arnold <nerdboy@gentoo.org> +pmtools-20101124.ebuild,
+  +files/pmtools-20101124-cflags-ldflags.patch:
+  Updated to latest upstream version (new patch courtesy of Fabio Rossi).
 
 *pmtools-20100825 (04 Oct 2010)
 
diff --git a/sys-power/pmtools/Manifest b/sys-power/pmtools/Manifest
index 56f0bfc15c01..dc423ac37d32 100644
--- a/sys-power/pmtools/Manifest
+++ b/sys-power/pmtools/Manifest
@@ -4,14 +4,17 @@ AUX pmtools-20071116-cflags-ldflags.patch 958 RMD160 294938ebc18edb7fd6f950676a8
 AUX pmtools-20100123-acpixtract-pmtools.patch 1822 RMD160 aaf44d437596088df8fa75ab10f553e9bf48c771 SHA1 5cdcb3ba8e48e8d8758d35473fedc9f26bbbf30b SHA256 742d457f572fa30029f28998640ee6a4f8bc38ff12cebefd0063247bcd3bac8c
 AUX pmtools-20100123-cflags-ldflags.patch 1919 RMD160 87c67b1ff9d690fda5f259ebb1c808d058e640ac SHA1 074555acfd72fdd452b219eaed237d7079e1daec SHA256 394ef62903c068c94c5fa6b3a75370911314c224931577742d9d6efc6816a6d8
 AUX pmtools-20100123-madt.patch 1191 RMD160 ca99ebfaccb8432736580ac8facbd46505774b80 SHA1 1a7fcf120c1835cd2c4041177cf26d452b264153 SHA256 eb01a911c3b4261a1d80478c88b48c1c11bde01cd1de1f4b8dc97c9fd6163bf0
+AUX pmtools-20101124-cflags-ldflags.patch 1743 RMD160 9b38bde0b0f547841644cb08709b205f70b659b3 SHA1 08189f0255d565faeb66a31d3e3d9f21fa4d81e2 SHA256 030dcbd4a327e9088f8f121e1e5a880d0564e6e28ec406a6cab23601690c8823
 DIST pmtools-20071116.tar.gz 51566 RMD160 b96b8334fa400fa49cfe21cd285481e48b57e2bb SHA1 997612de90eee65c3974a07b9eee68cfeb077abd SHA256 91751774976e39f6237efd0326eb35196a9346220b92ad35894a33283e872748
 DIST pmtools-20100123.tar.gz 59303 RMD160 05472ff049a279bc10ba392a3568744473f6bb05 SHA1 beb3e83826410780ad9bd424e4b7a5966e23817a SHA256 8f98775e00102eeaebfe4594176e99652d9bc76d1b886ebd054980d27a79a407
 DIST pmtools-20100430.tar.gz 60390 RMD160 c9e93e40e7bdd656165bc7e67c76b1341237cdd8 SHA1 b35de7310c82977c7055f25edf0628cd67064026 SHA256 e5c5079770184f0e57ee64377506da6e100c7301f36f99e4ed15d68753661417
 DIST pmtools-20100825.tar.gz 62359 RMD160 794ca0addb0eedfb15c26884baca031032695120 SHA1 9c6f5eb741801f7c7b5b9ded8334b557839f0f42 SHA256 7df3c49542ab941ac389daff522e5277450007c3a5eaba9955e1a93a0dca82d8
+DIST pmtools-20101124.tar.gz 61342 RMD160 cdf20b3a2fb0be940883a36d5db9d9f11bd3f25b SHA1 f16a75a83c10b397bccfb884ddb1316211e0a415 SHA256 07df52490f2ca295bc9155ab5127549bc0873eb30a77dd7ee4a79f20c02da576
 EBUILD pmtools-20071116-r1.ebuild 1377 RMD160 3c4c0b02a5f3e0506cc73b4456372945321374d8 SHA1 06806a6ea5d6acd57fb0fd065ec5a3e67722f580 SHA256 33bfcff6e5df574a75d9faf09e95078123dc99ed7b7018d03826ece8228900ef
 EBUILD pmtools-20071116.ebuild 1419 RMD160 5ef9e0202a64fb42f5ffca9232f3b077373a8a76 SHA1 2dae37bc42a3157a46ceacea1d7790aa4fb9d171 SHA256 d5290944a2332b3ba6588be47e092760c85ff210ae4b3945567087cd9b648515
 EBUILD pmtools-20100123.ebuild 1442 RMD160 76ed7055e0f160f2e95162d905689efd26e61b34 SHA1 f8f8c8a15076d64ef4bb75db2553cf9ec1a061f3 SHA256 b3726f889d842ebc8b48216dff1c43e16ed100db2c1696b5ff9b0889ec5066d8
 EBUILD pmtools-20100430.ebuild 1496 RMD160 01f4d3869f34b4dd872237662cd9e32a7c55784f SHA1 72f845d498a77dc4521a52e56c43e0c04046c53d SHA256 a46abc351768d669d86b66a711034e338cc09bb76101c4988e28364de6759d53
 EBUILD pmtools-20100825.ebuild 1496 RMD160 1143bce2a12fe497671cde347a911b54d91c6a9d SHA1 eec3e2322c12111d51fe9b7162ec510547595c36 SHA256 04ae4d024c98d0521192f5bae1b760a5ad0e76332b572d24e4deaf1fe119ece4
-MISC ChangeLog 3790 RMD160 fa421e6555d6c0dfa61e8b6e564f69abc81ec7ed SHA1 56dd0012b63e99547db30b21a6a77a64cf4b5af6 SHA256 63bfb79e76c7526671660117ffaa4cf7c7b4c9b7651a5cab30894ada0d4d5a2c
+EBUILD pmtools-20101124.ebuild 1546 RMD160 206a770d6d30ce89ae2163b61d0923bef9c02ff7 SHA1 ed50bfbb76c8c3d5f750f7685288f33418ea0332 SHA256 cbaad0ae2156298716f7cc0929a1c9fc3324248441b86eba7073e0415e20d071
+MISC ChangeLog 4021 RMD160 ab3bfa47506cbca07729e156d2447dc2672c3f31 SHA1 5f4dd994b4149b0608f75ba698c89e3ad4a08190 SHA256 4a8414b97df74fd32059cd99c6f1b28af8187da9368547d298c83da855ec0b34
 MISC metadata.xml 533 RMD160 06d6822d1d37fe42df032895be61852d748b4e60 SHA1 a0891a3a28f82a70ca3067431b2aebd8dd35b496 SHA256 095b685564533cd746483e96e141521b72a5cf63add86c58c7c4989aa0ec97b2
diff --git a/sys-power/pmtools/files/pmtools-20101124-cflags-ldflags.patch b/sys-power/pmtools/files/pmtools-20101124-cflags-ldflags.patch
new file mode 100644
index 000000000000..0ae69e8c46d4
--- /dev/null
+++ b/sys-power/pmtools/files/pmtools-20101124-cflags-ldflags.patch
@@ -0,0 +1,48 @@
+diff -Nuar pmtools-20100123.orig/acpidump/Makefile pmtools-20100123/acpidump/Makefile
+--- pmtools-20100123.orig/acpidump/Makefile	2006-11-30 13:41:15.000000000 +0100
++++ pmtools-20100123/acpidump/Makefile	2010-03-07 14:19:12.337141824 +0100
+@@ -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)
+ 
+diff -Nuar pmtools-20100123.orig/acpixtract/Makefile pmtools-20100123/acpixtract/Makefile
+--- pmtools-20100123.orig/acpixtract/Makefile	2006-11-30 13:45:06.000000000 +0100
++++ pmtools-20100123/acpixtract/Makefile	2010-03-07 14:19:12.337141824 +0100
+@@ -6,7 +6,7 @@
+ all: $(PROG)
+ 
+ $(PROG) : $(SRCS)
+-	$(CC) $(CFLAGS) $(SRCS) -o $(PROG)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(SRCS) -o $(PROG)
+ 
+ CLEANFILES= $(PROG)
+ 
+diff -Nuar pmtools-20100123.orig/madt/Makefile pmtools-20100123/madt/Makefile
+--- pmtools-20100123.orig/madt/Makefile	2005-11-11 18:07:04.000000000 +0100
++++ pmtools-20100123/madt/Makefile	2010-03-07 14:22:15.199017246 +0100
+@@ -1,6 +1,6 @@
+ test: madt
+ 	./madt < APIC
+ madt: madt.c acpi.h tables.c
+-	cc -o madt madt.c
++	$(CC) $(CFLAGS) $(LDFLAGS) madt.c -o madt
+ clean:
+ 	rm madt
+--- pmtools-20101124.orig/turbostat/Makefile.old	2010-11-27 22:13:00.405571001 +0100
++++ pmtools-20101124/turbostat/Makefile	2010-11-27 22:16:39.070571001 +0100
+@@ -1,3 +1,5 @@
++all : turbostat
++
+ turbostat : turbostat.c
+ 
+ clean :
diff --git a/sys-power/pmtools/pmtools-20101124.ebuild b/sys-power/pmtools/pmtools-20101124.ebuild
new file mode 100644
index 000000000000..3e5869ba9206
--- /dev/null
+++ b/sys-power/pmtools/pmtools-20101124.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pmtools/pmtools-20101124.ebuild,v 1.1 2010/12/07 04:19:02 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="doc"
+DEPEND=""
+RDEPEND="${DEPEND}
+		dev-lang/perl
+		>=sys-power/iasl-20090521"
+
+S="${WORKDIR}/pmtools"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-20100123-acpixtract-pmtools.patch
+	epatch "${FILESDIR}"/${PN}-20100123-madt.patch
+	epatch "${FILESDIR}"/${PN}-20071116-64bit.patch
+	epatch "${FILESDIR}"/${PN}-20101124-cflags-ldflags.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
+	dosbin turbostat/turbostat
+	doman turbostat/turbostat.8
+
+	dodoc README
+	docinto madt
+	dodoc madt/README
+	use doc && dodoc 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."
+}