Removed a couple of stale versions and updated to latest upstream

releases.  Closes bug 358319.

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

4 files changed, 35 insertions, 16 deletions

diff --git a/sys-power/pmtools/ChangeLog b/sys-power/pmtools/ChangeLog
index 0d9b23d06bf2..7a3ff7e3689e 100644
--- a/sys-power/pmtools/ChangeLog
+++ b/sys-power/pmtools/ChangeLog
@@ -1,6 +1,15 @@
 # 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.16 2010/12/07 04:19:02 nerdboy Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pmtools/ChangeLog,v 1.17 2011/04/03 03:58:56 nerdboy Exp $
+
+*pmtools-20110323 (03 Apr 2011)
+*pmtools-20101221 (03 Apr 2011)
+
+  03 Apr 2011; Steve Arnold <nerdboy@gentoo.org>
+  -pmtools-20071116-r1.ebuild, -pmtools-20101124.ebuild,
+  +pmtools-20101221.ebuild, +pmtools-20110323.ebuild:
+  Removed a couple of stale versions and updated to latest two upstream
+  releases (the only two available).  Closes bug #358319.
 
 *pmtools-20101124 (07 Dec 2010)
 
diff --git a/sys-power/pmtools/Manifest b/sys-power/pmtools/Manifest
index dc423ac37d32..a0587c4de56b 100644
--- a/sys-power/pmtools/Manifest
+++ b/sys-power/pmtools/Manifest
@@ -9,12 +9,13 @@ DIST pmtools-20071116.tar.gz 51566 RMD160 b96b8334fa400fa49cfe21cd285481e48b57e2
 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
+DIST pmtools-20101221.tar.gz 63223 RMD160 18cc91f188566e0bd25ba6ceb92b62eb843d48ef SHA1 beef8bc78f4f5698a67e6951cf3a8cd98fd55922 SHA256 453d69c96983e464b23f17c92d0e30084412e75707ec9999ff869d7af7cc4eb3
+DIST pmtools-20110323.tar.gz 62002 RMD160 2f035fdc9b262f45158dd982acface5905f1e67a SHA1 a0cefe69d97482f4daa21dc62867645f8cb71d91 SHA256 192ee6623ecb96cdcf20c73d8b93eadce003a343b3bab10f08a950ef3667a77a
 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
-EBUILD pmtools-20101124.ebuild 1546 RMD160 206a770d6d30ce89ae2163b61d0923bef9c02ff7 SHA1 ed50bfbb76c8c3d5f750f7685288f33418ea0332 SHA256 cbaad0ae2156298716f7cc0929a1c9fc3324248441b86eba7073e0415e20d071
-MISC ChangeLog 4021 RMD160 ab3bfa47506cbca07729e156d2447dc2672c3f31 SHA1 5f4dd994b4149b0608f75ba698c89e3ad4a08190 SHA256 4a8414b97df74fd32059cd99c6f1b28af8187da9368547d298c83da855ec0b34
+EBUILD pmtools-20101221.ebuild 1546 RMD160 9788133fb7633c6b3810a6d830bdec439a937ebd SHA1 79f9daf39d8c0e3005a81ecdf6dcec034051b5ec SHA256 3972dddeb4a2d2add612dc2fa85665f333f593f68cfbb3d075a185e22c5c8a22
+EBUILD pmtools-20110323.ebuild 1628 RMD160 aae193943fcbcde363f34e800dea862fe88973e0 SHA1 4b70ced4d3038054563f5f51b9f896f2f5608692 SHA256 839bdc94bccd5c6cf48800cf9649685488751441cb2cca2327b43410a4695083
+MISC ChangeLog 4377 RMD160 d15476cd9bca219f22114f90d9b718809e5f1571 SHA1 256c2b90f75ccda09826784a4bef366f1af73fab SHA256 8e2292cc2780aff1a4c77b338df89ae8756b7aafbd110904a25c5da231910afb
 MISC metadata.xml 533 RMD160 06d6822d1d37fe42df032895be61852d748b4e60 SHA1 a0891a3a28f82a70ca3067431b2aebd8dd35b496 SHA256 095b685564533cd746483e96e141521b72a5cf63add86c58c7c4989aa0ec97b2
diff --git a/sys-power/pmtools/pmtools-20101124.ebuild b/sys-power/pmtools/pmtools-20101221.ebuild
index 3e5869ba9206..c24c1d3adfaf 100644
--- a/sys-power/pmtools/pmtools-20101124.ebuild
+++ b/sys-power/pmtools/pmtools-20101221.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pmtools/pmtools-20101221.ebuild,v 1.1 2011/04/03 03:58:56 nerdboy Exp $
 
 EAPI=2
 
diff --git a/sys-power/pmtools/pmtools-20071116-r1.ebuild b/sys-power/pmtools/pmtools-20110323.ebuild
index 9358efcae4ae..a19f66ebde3e 100644
--- a/sys-power/pmtools/pmtools-20071116-r1.ebuild
+++ b/sys-power/pmtools/pmtools-20110323.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 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.2 2009/09/23 20:57:57 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pmtools/pmtools-20110323.ebuild,v 1.1 2011/04/03 03:58:56 nerdboy Exp $
 
 EAPI=2
 
@@ -12,16 +12,22 @@ SRC_URI="http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/utils/${P}.tar.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="doc"
 DEPEND=""
 RDEPEND="${DEPEND}
 		dev-lang/perl
-		>=sys-power/iasl-20060512"
+		>=sys-power/iasl-20090521"
+
+S="${WORKDIR}/pmtools"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-acpixtract-pmtools.patch
-	epatch "${FILESDIR}"/${P}-cflags-ldflags.patch
-	epatch "${FILESDIR}"/${P}-64bit.patch
+	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
 }
@@ -37,10 +43,13 @@ src_install() {
 	# 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 madt/example.APIC*
+	dodoc madt/README
+	use doc && dodoc madt/APIC*
 }
 
 pkg_postinst() {