Update live ebuild to reflect reality. Add latest version (prerelease for 2.0) with only amd64 and x86 because it is completely different stuff. Non-maintainer commit.

(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)

3 files changed, 63 insertions, 11 deletions

diff --git a/sys-power/powertop/ChangeLog b/sys-power/powertop/ChangeLog
index 68373b1d0067..ece5992c406a 100644
--- a/sys-power/powertop/ChangeLog
+++ b/sys-power/powertop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-power/powertop
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.40 2011/01/26 10:44:34 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.41 2011/03/14 09:45:03 scarabeus Exp $
+
+*powertop-1.97 (14 Mar 2011)
+
+  14 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> +powertop-1.97.ebuild,
+  powertop-9999.ebuild:
+  Update live ebuild to reflect reality. Add latest version with only amd64 and
+  x86 because it is completely different stuff. Non-maintainer commit.
 
   26 Jan 2011; Thilo Bangert <bangert@gentoo.org> powertop-9999.ebuild:
   fix git url (#350783)
diff --git a/sys-power/powertop/powertop-1.97.ebuild b/sys-power/powertop/powertop-1.97.ebuild
new file mode 100644
index 000000000000..2a1a834c1702
--- /dev/null
+++ b/sys-power/powertop/powertop-1.97.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-1.97.ebuild,v 1.1 2011/03/14 09:45:03 scarabeus Exp $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="tool that helps you find what software is using the most power"
+HOMEPAGE="http://www.lesswatts.org/projects/powertop/"
+SRC_URI="mirror://kernel/linux/status/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="unicode"
+
+DEPEND="sys-libs/ncurses[unicode?]
+	dev-libs/libnl
+	sys-devel/gettext"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	use unicode || sed -i 's:-lncursesw:-lncurses:' Makefile
+	# fix ldflags
+	sed -i \
+		-e 's:g++ $(OBJS) $(LIBS) -o powertop:$(CXX) $(LDFLAGS) $(OBJS) $(LIBS) -o powertop:' \
+		-e 's:gcc:$(CC):' \
+		Makefile || die
+}
+
+src_install() {
+	emake install DESTDIR="${ED}"
+	dodoc TODO README
+	gunzip "${ED}"/usr/share/man/man1/powertop.1.gz
+}
+
+pkg_postinst() {
+	echo
+	einfo "For PowerTOP to work best, use a Linux kernel with the"
+	einfo "tickless idle (NO_HZ) feature enabled (version 2.6.21 or later)"
+	echo
+}
diff --git a/sys-power/powertop/powertop-9999.ebuild b/sys-power/powertop/powertop-9999.ebuild
index 48ae5db3e7ba..0bcb6849671b 100644
--- a/sys-power/powertop/powertop-9999.ebuild
+++ b/sys-power/powertop/powertop-9999.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-9999.ebuild,v 1.2 2011/01/26 10:44:34 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-9999.ebuild,v 1.3 2011/03/14 09:45:03 scarabeus Exp $
 
-EAPI=3
+EAPI=4
 
-inherit git toolchain-funcs eutils
+inherit eutils
 
 DESCRIPTION="tool that helps you find what software is using the most power"
 HOMEPAGE="http://www.lesswatts.org/projects/powertop/"
-SRC_URI=""
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/status/powertop/powertop.git"
+SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,20 +17,22 @@ KEYWORDS=""
 IUSE="unicode"
 
 DEPEND="sys-libs/ncurses[unicode?]
+	dev-libs/libnl
 	sys-devel/gettext"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
 	use unicode || sed -i 's:-lncursesw:-lncurses:' Makefile
-}
-
-src_configure() {
-	tc-export CC
+	# fix ldflags
+	sed -i \
+		-e 's:g++ $(OBJS) $(LIBS) -o powertop:$(CXX) $(LDFLAGS) $(OBJS) $(LIBS) -o powertop:' \
+		-e 's:gcc:$(CC):' \
+		Makefile || die
 }
 
 src_install() {
-	emake install DESTDIR="${ED}" || die
-	dodoc Changelog README
+	emake install DESTDIR="${ED}"
+	dodoc TODO README
 	gunzip "${ED}"/usr/share/man/man1/powertop.1.gz
 }