Updated to current release for new turbostat tool; closes bug 308233.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 196 insertions, 2 deletions

diff --git a/sys-power/pmtools/ChangeLog b/sys-power/pmtools/ChangeLog
index 2a5cf07cf5af..7cb8c0d9124c 100644
--- a/sys-power/pmtools/ChangeLog
+++ b/sys-power/pmtools/ChangeLog
@@ -1,6 +1,16 @@
 # 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.12 2009/09/23 20:57:57 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pmtools/ChangeLog,v 1.13 2010/04/05 05:19:58 nerdboy Exp $
+
+*pmtools-20100123 (05 Apr 2010)
+
+  05 Apr 2010; Steve Arnold <nerdboy@gentoo.org> +pmtools-20100123.ebuild,
+  +files/pmtools-20100123-acpixtract-pmtools.patch,
+  +files/pmtools-20100123-cflags-ldflags.patch,
+  +files/pmtools-20100123-madt.patch:
+  Updated to current release; closes bug 308233.  Thanks to Philipp 
+  Nordhus <philipp@tigerclaw.de> for submitting the bug with updated
+  patches.  Includes new turbostat tool for Intel CPUs.
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> pmtools-20071116.ebuild,
   pmtools-20071116-r1.ebuild:
diff --git a/sys-power/pmtools/files/pmtools-20100123-acpixtract-pmtools.patch b/sys-power/pmtools/files/pmtools-20100123-acpixtract-pmtools.patch
new file mode 100644
index 000000000000..feca654687b3
--- /dev/null
+++ b/sys-power/pmtools/files/pmtools-20100123-acpixtract-pmtools.patch
@@ -0,0 +1,42 @@
+diff -Nuar pmtools-20100123.orig/acpixtract/acpixtract.c pmtools-20100123/acpixtract/acpixtract.c
+--- pmtools-20100123.orig/acpixtract/acpixtract.c	2010-01-23 19:31:07.000000000 +0100
++++ pmtools-20100123/acpixtract/acpixtract.c	2010-03-07 14:44:32.451141841 +0100
+@@ -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 pmtools-20100123.orig/madt/README pmtools-20100123/madt/README
+--- pmtools-20100123.orig/madt/README	2005-11-11 18:07:04.000000000 +0100
++++ pmtools-20100123/madt/README	2010-03-07 14:45:31.818052302 +0100
+@@ -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 -Nuar pmtools-20100123.orig/README pmtools-20100123/README
+--- pmtools-20100123.orig/README	2010-01-23 19:31:52.000000000 +0100
++++ pmtools-20100123/README	2010-03-07 14:47:18.286017297 +0100
+@@ -17,11 +17,11 @@
+ 
+     # ./acpidump > acpidump.out
+ 
+-./acpidump/acpixtract
+---------------------
++./acpidump/acpixtract-pmtools
++-----------------------------
+ Convert ASCII acpidump output to raw binary tables:
+ 
+-	$ acpixtract/acpixtract -a acpidump.out
++	$ acpixtract/acpixtract-pmtools -a acpidump.out
+ 	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/files/pmtools-20100123-cflags-ldflags.patch b/sys-power/pmtools/files/pmtools-20100123-cflags-ldflags.patch
new file mode 100644
index 000000000000..57642abacfe6
--- /dev/null
+++ b/sys-power/pmtools/files/pmtools-20100123-cflags-ldflags.patch
@@ -0,0 +1,52 @@
+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
+diff -Nuar pmtools-20100123.orig/turbostat/Makefile pmtools-20100123/turbostat/Makefile
+--- pmtools-20100123.orig/turbostat/Makefile	2010-01-23 19:19:32.000000000 +0100
++++ pmtools-20100123/turbostat/Makefile	2010-03-07 14:26:10.473010923 +0100
+@@ -4,7 +4,7 @@
+ all: turbostat
+ 
+ $(PROG) : $(SRCS)
+-	$(CC) $(CFLAGS) $(SRCS) -o $(PROG)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(SRCS) -o $(PROG)
+ 
+ CLEANFILES= $(PROG)
+ 
diff --git a/sys-power/pmtools/files/pmtools-20100123-madt.patch b/sys-power/pmtools/files/pmtools-20100123-madt.patch
new file mode 100644
index 000000000000..49aca9f4c76c
--- /dev/null
+++ b/sys-power/pmtools/files/pmtools-20100123-madt.patch
@@ -0,0 +1,39 @@
+diff -Nuar pmtools-20100123.orig/madt/madt.c pmtools-20100123/madt/madt.c
+--- pmtools-20100123.orig/madt/madt.c	2005-11-11 18:07:04.000000000 +0100
++++ pmtools-20100123/madt/madt.c	2010-03-07 14:39:31.657017114 +0100
+@@ -26,8 +26,6 @@
+ 
+ #define printk printf
+ 
+-#include "./tables.c"
+-
+ //#define INPUT_FILE "madt.dat"
+ //#include <sys/types.h>
+ //#include <sys/stat.h>
+@@ -37,6 +35,8 @@
+ #include <stdio.h> // fread
+ #include <stdlib.h> // malloc
+ 
++#include "./tables.c"
++
+ int verbose = 0;
+ /*
+ /* read standard input
+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:34:17.486002917 +0100
+@@ -1,3 +1,5 @@
++all: madt
++
+ test: madt
+ 	./madt < APIC
+ madt: madt.c acpi.h tables.c
+diff -Nuar pmtools-20100123.orig/Makefile pmtools-20100123/Makefile
+--- pmtools-20100123.orig/Makefile	2010-01-23 19:18:18.000000000 +0100
++++ pmtools-20100123/Makefile	2010-03-07 14:33:01.729955480 +0100
+@@ -1,4 +1,4 @@
+-DIRS = acpidump acpixtract turbostat
++DIRS = acpidump acpixtract madt turbostat
+ 
+ all:
+ 	for i in $(DIRS); do $(MAKE) -C $$i $@; done
diff --git a/sys-power/pmtools/pmtools-20100123.ebuild b/sys-power/pmtools/pmtools-20100123.ebuild
new file mode 100644
index 000000000000..71323f521ccc
--- /dev/null
+++ b/sys-power/pmtools/pmtools-20100123.ebuild
@@ -0,0 +1,51 @@
+# 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-20100123.ebuild,v 1.1 2010/04/05 05:19:58 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=""
+RDEPEND="${DEPEND}
+		dev-lang/perl
+		>=sys-power/iasl-20090521"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-acpixtract-pmtools.patch
+	epatch "${FILESDIR}"/${P}-cflags-ldflags.patch
+	epatch "${FILESDIR}"/${P}-madt.patch
+	epatch "${FILESDIR}"/${PN}-20071116-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
+	dosbin turbostat/turbostat
+
+	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."
+}