Removed a couple of stale versions and updated to latest upstream

releases.  Closes bug 358319.

(Portage version: 2.1.9.45/cvs/Linux x86_64)

3 files changed, 30 insertions, 12 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/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() {