7 files changed, 2 insertions, 156 deletions
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 2014c13f8b73..87de81ec8d63 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/pmtools/Manifest b/sys-power/pmtools/Manifest
index 709d571dc8be..5e36f607896d 100644
--- a/sys-power/pmtools/Manifest
+++ b/sys-power/pmtools/Manifest
@@ -1,11 +1,7 @@
 AUX pmtools-20071116-64bit.patch 674 BLAKE2B 41fb52e70b32dfa35fa0e449e4d508b74fbb8cf5d76f80172e1bead3023ab55eef891741d1637ee12b22a20c37dde55d4558ce36716afccc8be446c30838eb07 SHA512 6683f2e1c06275af9ac789a22005662ae3a9e84f5333ebd6fcc7a524d9298b2e87e4b259d0e2c2edb236821b5221180ffd2de3128fa98e4ef8dd668b7f305290
-AUX pmtools-20071116-acpixtract-pmtools.patch 1909 BLAKE2B 1a920d43900a6c7c0851af6fed82e3733d5602c5a374b6802b42adf79159d75afb9595f3cda49f7b04239e380335f55be469c0decce6e4940bd4f5c04dfa4039 SHA512 f78c199761f5ca82433bc8cb02fcdeba9b88d58e3d2f853fecdda2682929ccbf8d25df460ae4d78dcba97ff025ce3ddd7819978f65cf68862694d8c5b93b1017
 AUX pmtools-20100123-acpixtract-pmtools.patch 1822 BLAKE2B 6d7f7de1f2807ae5a2309aac553ee1e8ee818c866325fcc06ebdb233fcf98ab8d3c800da8380d6ed39ab020be4825cef486b54812574bb2b2487243d0ed1eb6c SHA512 82d86c85ab481c1aca191c67e825c0a0bd3467b7ef9b92dadbb3fa58e1cc131b10f6e88431c83ca7289c96a304c8a1d65f798280a9fe3300f1b1f998baa7b2ee
 AUX pmtools-20100123-madt.patch 1191 BLAKE2B 46d74cafb71bea3a9c7391b3636da8d9dabda9f24fcf20ff0e9469e72cbdf44477a71a42b780f9d5ba442400381add000fce0fec588f37a62b72dce93475c546 SHA512 3984c4a26248a2b152009ab3703e3fd894abd8a12716aaa7f4913b8a8d922c2a60e7e987e401a0c93c56398b63c36013bcbf7b9c51d1c119f6aa7e67e2657594
 AUX pmtools-20101124-cflags-ldflags.patch 1743 BLAKE2B 65216ce6a9a347c2bc85a4ea8b891ede00d5dd6564541188cb4641747525fff801b5d20a5e2d21c1a37250ffb61f85db11e3beff07cc1bfb1107264a60f650a2 SHA512 63342f0f1f630eeb74dbe45eddd92b4be4794b34d93f691442bb6a761798d25967d93c73389ef0abace8a285efb91677493996948a34e981959782f493963dc0
-DIST pmtools-20071116.tar.gz 51566 BLAKE2B e692e8076cb384eb5d4bb99310121f24daca2438267e27c276c53f233482d1cd8de1ae4bf91240644183834dc40e7ae03376c40d90d96ea2844e90796a209655 SHA512 119bc23c1e692591cf4f10c9a81da80de975091aa7c5d8df40b337ea127a94ac95e94eedf9676166cdc92a594ad9bb3918011056fadeca86f6808135ca26ae8b
 DIST pmtools-20110323.tar.gz 62002 BLAKE2B f1de2e266d72c8a69a61df0fc57bc0b27e9a4fc89f840e893b8fbb1bc93ec54dc5f502a1066d17d082341c99b829189911d558261409455fd1db368924fbea59 SHA512 81108c011b45c58c02013a3653c2d00bc2a9a9d80bf85438a193a4fed04a3fd2890d9cd4d64ab455e3e9c1613d35a6be59698395d9a27ca0a858e3935439bafd
-EBUILD pmtools-20071116.ebuild 1280 BLAKE2B 558241329c30dcb0316e7e2b66733e80d0af5bd687539f1b27f739ccd6bf9105b3da6e8fecefe87186baed44d0ede17e457a295f2ec904a5ed9b95ef7a811c41 SHA512 c8865ff1249b9ea9a61a4e92b47ce1562fa048ec424c7659bb285d63e0e1a560b1c3576db2f07aa39db223df69d1182c07f351db905bcf285a6ed4f380b90163
 EBUILD pmtools-20110323-r1.ebuild 1319 BLAKE2B 80709a33fcb3813255fc41b24f90f764e8d084dd3c78397f3e54c9bfa1ea15b824199bf16f8d4a25ba9dfecf4067100693c391804d5f2d05298261493b1d0131 SHA512 34be174a0d6ecf3230bc4817777f84e3d299691d106e2d4fb934670b89f1f2b04fbb8a429a37b809e5fa68a8194082da2ce571841601d2132dd690a933dade3b
-EBUILD pmtools-20110323.ebuild 1513 BLAKE2B 7ebe11c5e75a330fc569c47a25296889b01f8a0332e412dc7f909cd0582f256790c4df7726bedfdbf1dafb1fd83d58ddbb9e4c61040f53c3d5965a0f3be8f886 SHA512 0b9204f0add25d778ecc00249ab94caa864a10e136a35f6cb3e8737732c355f3ddb1d2536f5ce5c400510b521e037b663cc782049337a986895e47c9d274b389
 MISC metadata.xml 643 BLAKE2B e61f52f14ac46ff098eab04e4cf05b0b2e85f088d64f2f593d9d82c6fb26b3cbd467b2e5132a87f5ac53029e33cb4f4e8c10484c698c8adf3236b64629368ca5 SHA512 b5d35fb4bc2ad9062c9d089447521adcd717dd4b88ac54a49b56cc9a334ad9c6020ea66d5c0aaeb575b25143d1714f15e0b83025fe8859fd9f010091409a48f2
diff --git a/sys-power/pmtools/files/pmtools-20071116-acpixtract-pmtools.patch b/sys-power/pmtools/files/pmtools-20071116-acpixtract-pmtools.patch
deleted file mode 100644
index 1e733663f3ed..000000000000
--- a/sys-power/pmtools/files/pmtools-20071116-acpixtract-pmtools.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Nuar --exclude '*.orig' --exclude '*.rej' pmtools-20071116.orig/acpixtract/acpixtract.c pmtools-20071116/acpixtract/acpixtract.c
---- pmtools-20071116.orig/acpixtract/acpixtract.c	2007-11-16 10:45:44.000000000 -0800
-+++ pmtools-20071116/acpixtract/acpixtract.c	2008-06-06 18:28:34.203106692 -0700
-@@ -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 --exclude '*.orig' --exclude '*.rej' pmtools-20071116.orig/madt/README pmtools-20071116/madt/README
---- pmtools-20071116.orig/madt/README	2007-11-16 10:39:50.000000000 -0800
-+++ pmtools-20071116/madt/README	2008-06-06 18:30:18.101885794 -0700
-@@ -2,7 +2,7 @@
- Hacked out of Linux kernel code to do the same.
- 
- # ./acpidmp > acpidump.txt
--$ acpixtract -a acpidump.txt
-+$ acpixtract-pmtools -a acpidump.txt
- $ madt < APIC.dat
- 
- ACPI: APIC (v001 INTEL  D845EBT2 0x20021021 MSFT 0x00000097) @ 0x(nil)
-diff -Nuar --exclude '*.orig' --exclude '*.rej' pmtools-20071116.orig/README pmtools-20071116/README
---- pmtools-20071116.orig/README	2007-11-16 10:54:27.000000000 -0800
-+++ pmtools-20071116/README	2008-06-06 18:29:53.513505961 -0700
-@@ -24,11 +24,11 @@
- and it is why the output doesn't change when different
- kernels are booted.
- 
--./acpidump/acpixtract
----------------------
-+./acpidump/acpixtract-pmtools
-+-----------------------------
- Convert ASCII acpidump output to raw binary tables:
- 
--	$ acpixtract/acpixtract -a acpidump.txt
-+	$ acpixtract/acpixtract-pmtools -a acpidump.txt
- 	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/pmtools-20071116.ebuild b/sys-power/pmtools/pmtools-20071116.ebuild
deleted file mode 100644
index 9453c5d8037f..000000000000
--- a/sys-power/pmtools/pmtools-20071116.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="ACPI disassembler tools, including acpidump"
-HOMEPAGE="http://www.lesswatts.org/projects/acpi/utilities.php"
-SRC_URI="http://www.lesswatts.org/patches/linux_acpi/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	>=sys-power/iasl-20060512"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-20071116-acpixtract-pmtools.patch
-
-	sed -i.orig -e '/^CFLAGS/s, -s , ,' \
-		-i.orig -e "s:-Os::g" \
-		acpidump/Makefile || die "sed failed"
-
-	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."
-}
diff --git a/sys-power/pmtools/pmtools-20110323.ebuild b/sys-power/pmtools/pmtools-20110323.ebuild
deleted file mode 100644
index 13799c368ab1..000000000000
--- a/sys-power/pmtools/pmtools-20110323.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="ACPI disassembler tools, including acpidump"
-HOMEPAGE="https://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/"
-SRC_URI="https://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
-
-	# update version info
-	sed -i -e "s|20060324|20110323|" acpixtract/acpixtract.c
-
-	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."
-}
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index a07e1560e381..d598e5f2893c 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -2,6 +2,6 @@ AUX powertop-2.9-libc++.patch 1182 BLAKE2B cad53198b44a1b402995207c33e33d06cec5f
 DIST powertop-2.8.tar.gz 670000 BLAKE2B 4259f462d36fe0cbb157859d6e1d3e1face67f7232fe8d4112d77f844b545f49e9cf486e21bcbc34f64ffb0c891c1864141784dde14e3a96647d6535641a840a SHA512 253d0e15f0972cf8639735c510f4884d49a0da76c31dd2f39603e2297e6c6f0b9fa283c7b3cb04a431c91f8296275c0adaecc4c3e9ea132c0c31064f7f432c80
 DIST powertop-v2.9.tar.gz 718763 BLAKE2B bb6ce789614397b02f0e9f1cb71585cb456c1428cc43e9fe1c4b3bc9f96171fede4c587410e78e58ad8d0b0f772549a93f454bcd1b521e6dd3c809a85dc3cf30 SHA512 783af538c44e3fae7215a5b4247eb32a72e02150b3f297e6b9777a450823dd30aca014601892c0e80937a366eed95b42b622c68161d53e905ad4fbcb574b26f5
 EBUILD powertop-2.8.ebuild 3356 BLAKE2B ab7b2846e8752558a56545e94fb036d7c4f5322cf02d29b3f9c30e76c3f3b9690e2cb962c8180991b169363bc22d1109fd4139a287f87cf6c53edb251d659cdd SHA512 e243fd2facd6195480a121d665d80ce049561713d81a1165ced9a18756d2ac9728620b83c0c6acbe9433c5a87e568003f70980b77d1866b302a55d22e75c2e90
-EBUILD powertop-2.9.ebuild 3707 BLAKE2B 2c6b8eae3726f5e4d77231ca94982e2bcdba7877fec1d2b2e542acc1af320c3eaf8ccde7280cbdb9a4afd4fdd7f17fb8606eccaafa33a53ebb93965dc63f94e5 SHA512 a151c2bcd5485fe8a37cde813378e42e0284fb5550baa64de90def92adc1fc27167daf0a3bd51b59b1038caa65a8963f707348bd14887cfffcaea5be6f692f69
+EBUILD powertop-2.9.ebuild 3706 BLAKE2B 5391fe6238a6f41938d676fa64d835fefa3f0fa2c33c665bfb7019231e800ae9469ff0af6a3140bd49f205abf93bc2db613a714e02118969a8f0b6884d4660e3 SHA512 f0aa44ab19c6dcc7b5d4ad49c695846ba2cad021b783ee1cc520bc6ac1126f3a5da1e858a5cd7262025aca878e37c655ed3719216b30e5eaed22cf411969db2a
 EBUILD powertop-9999.ebuild 3663 BLAKE2B b020232c48201403e5467004745f82dad3f25231107b8bd6b227b257f20611a305545195a3ff89a7990a05f4cca3d73c761966af4d0b61b663118043fbf0e522 SHA512 9020b3bb5e59d05150cc8e3bc22f18d959c18c08db02256f1b06754a1a4293a04e400fe3d37b1a6910ff4f167221e2b37abf67a52d13d76a9c4941d7d6cbf8d7
 MISC metadata.xml 253 BLAKE2B 48f33288fc58b41b96f50af29bb4ce8989e714fa989ed445afc8933d1483e1026a019783805ad1b42399227819f461ed5c874df1c78c4bf144bccd07306ee995 SHA512 fad4a58e4c2a6eaa8bbbdc75e3995b5da53c9291f82480e35a9badfc1374bcc484663f2577790a46218be90d3b42bb45620297316c5493bc4a46af0dbd29189e
diff --git a/sys-power/powertop/powertop-2.9.ebuild b/sys-power/powertop/powertop-2.9.ebuild
index f78a9b404c02..74ac81bb587e 100644
--- a/sys-power/powertop/powertop-2.9.ebuild
+++ b/sys-power/powertop/powertop-2.9.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-v${PV}"
 	SRC_URI="https://01.org/sites/default/files/downloads/${PN}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~ppc sparc x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi