From 1dd19a6c3092e4085487acb5d53a20b586b83045 Mon Sep 17 00:00:00 2001
From: Jeroen Roovers <jer@gentoo.org>
Date: Mon, 14 Mar 2011 20:58:23 +0000
Subject: Respect CC, CXX, CFLAGS, add cache dir.

Package-Manager: portage-2.2.0_alpha26/cvs/Linux i686
---
 sys-power/powertop/ChangeLog               |  8 ++++-
 sys-power/powertop/Manifest                |  4 +--
 sys-power/powertop/powertop-1.97-r1.ebuild | 49 ++++++++++++++++++++++++++++++
 sys-power/powertop/powertop-1.97.ebuild    | 43 --------------------------
 4 files changed, 58 insertions(+), 46 deletions(-)
 create mode 100644 sys-power/powertop/powertop-1.97-r1.ebuild
 delete mode 100644 sys-power/powertop/powertop-1.97.ebuild

(limited to 'sys-power/powertop')

diff --git a/sys-power/powertop/ChangeLog b/sys-power/powertop/ChangeLog
index ece5992c406a..f8b259976ede 100644
--- a/sys-power/powertop/ChangeLog
+++ b/sys-power/powertop/ChangeLog
@@ -1,6 +1,12 @@
 # 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.41 2011/03/14 09:45:03 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.42 2011/03/14 20:58:23 jer Exp $
+
+*powertop-1.97-r1 (14 Mar 2011)
+
+  14 Mar 2011; Jeroen Roovers <jer@gentoo.org> -powertop-1.97.ebuild,
+  +powertop-1.97-r1.ebuild:
+  Respect CC, CXX, CFLAGS, add cache dir.
 
 *powertop-1.97 (14 Mar 2011)
 
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index 50f95553c17b..740639e15d27 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -3,7 +3,7 @@ DIST powertop-1.13.tar.gz 104675 RMD160 e6cf649e387a9a6f8cf036ddfa0f5def50303f76
 DIST powertop-1.97.tar.bz2 84657 RMD160 8e9f0db989a42a9a368a45cbf6e9e1985e3fb82a SHA1 0227d5199ef3092915a62aca63aaa1d3ba1a9c12 SHA256 d3dafe1ce4dabeb4edb724616d7b8533ac40ed71fca43e81b007e9fd7011e516
 EBUILD powertop-1.11.ebuild 1103 RMD160 352796f0e4974260fe498de282270cb388e211bc SHA1 137f2c60671829387c573203f9813a6f33f50e2a SHA256 5c961061f2e057b2258f55323c0d618006abf9039816d3811064ca0f6fa84911
 EBUILD powertop-1.13.ebuild 1121 RMD160 6e9e4a84aaf6b643a4cd83f28516b0e51d36d5e9 SHA1 84deca5fe572d0820751741fb8c5bf8c114e33b4 SHA256 ad10c47049432ef0f9047eee7c5c6db033843f699cd2003c5b087169a296a030
-EBUILD powertop-1.97.ebuild 1138 RMD160 26a371e2468f3d90202f30a92d7a7aa0830045eb SHA1 d3fc33df75ee4c9e19ccba7f8118557bcee7a1db SHA256 3301f27af8a5c6256a8dab289b52db2fd11c9feefcb1aa5fb91de05378dd7acd
+EBUILD powertop-1.97-r1.ebuild 1260 RMD160 2fd2235646732c24ef6a39912182de5fefade110 SHA1 66a102b5ae05948ce2206b2b1ed5d4e6f3b28e41 SHA256 61330bcd2387a158835de4800aaf5269d3906450cfe4339f16a3677b6502580e
 EBUILD powertop-9999.ebuild 1130 RMD160 92fc02220c122349703eb057aecb7b2b220d4d2f SHA1 d9c9929dbde7a799a6da883d405d70128d9e7369 SHA256 f39a6b352d1844a32c4b9c79668e1f2dcbe921a01c02b0fd3c1b7c83d33c8d91
-MISC ChangeLog 5750 RMD160 634f71c07246f4327e24b9e7051e40cbee773829 SHA1 139f933099a84b2a7df00919f95a5f790b45157f SHA256 5e6a854c3e8fd05bfc889887a2969672f052cc0bd1ab285f9f28a157b8b437af
+MISC ChangeLog 5918 RMD160 932dd28ba6b1df3429feb999f2c04e4492aea8fa SHA1 9765f49f4e581e8800e7728e9064deb9ab58071f SHA256 ff86b2ca31d9d6079ed5b3e4ab20d3adb938c2bac7857a049c1303fcee251504
 MISC metadata.xml 161 RMD160 a5e1f234c4886ff31d39f229a0cf30d0bfcea869 SHA1 3876fd42cd9e63a7edb04c5025d53d773aa80bc3 SHA256 838bd208a7f948ea9b4e2b8869464622bc64a2f02468de4c3d7f6c2530e28e89
diff --git a/sys-power/powertop/powertop-1.97-r1.ebuild b/sys-power/powertop/powertop-1.97-r1.ebuild
new file mode 100644
index 000000000000..67dca73a73b8
--- /dev/null
+++ b/sys-power/powertop/powertop-1.97-r1.ebuild
@@ -0,0 +1,49 @@
+# 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-r1.ebuild,v 1.1 2011/03/14 20:58:23 jer Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+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 '/-o powertop/s:g++:$(CXX) $(CFLAGS) $(LDFLAGS):' \
+		-e 's: -O2 -g -fno-omit-frame-pointer -fstack-protector::g' \
+		-e 's:gcc:$(CC) $(CFLAGS):' \
+		Makefile || die
+}
+
+src_configure() {
+	tc-export CC CXX
+}
+
+src_install() {
+	emake install DESTDIR="${ED}"
+	dodoc TODO README
+	gunzip "${ED}"/usr/share/man/man1/powertop.1.gz
+	keepdir /var/cache/powertop
+}
+
+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-1.97.ebuild b/sys-power/powertop/powertop-1.97.ebuild
deleted file mode 100644
index 2a1a834c1702..000000000000
--- a/sys-power/powertop/powertop-1.97.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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
-}
-- 
cgit v1.2.3-65-gdbad