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

(Portage version: 2.1.9.24/cvs/Linux x86_64)

3 files changed, 110 insertions, 1 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/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."
+}