Sync live ebuild again. There is no manpage now so drop needless gunzip.

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

4 files changed, 32 insertions, 16 deletions

diff --git a/sys-power/powertop/ChangeLog b/sys-power/powertop/ChangeLog
index f0b7266fe2ac..882a35fac757 100644
--- a/sys-power/powertop/ChangeLog
+++ b/sys-power/powertop/ChangeLog
@@ -1,6 +1,10 @@
 # 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.43 2011/03/14 21:53:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.44 2011/03/15 09:42:47 scarabeus Exp $
+
+  15 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> powertop-1.97-r1.ebuild,
+  powertop-9999.ebuild:
+  Sync live ebuild again. There is no manpage now so drop needless gunzip.
 
   14 Mar 2011; Jeroen Roovers <jer@gentoo.org> powertop-1.97-r1.ebuild:
   Add more build time and run time dependencies (bug #358869).
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index 7f6aec33aeec..bf970a619517 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-r1.ebuild 1335 RMD160 db3adb79b5938d8dae44f2b519591ee42d555418 SHA1 6036dee7f44ae37cbf179b4e013713553ec3e43a SHA256 44505fde231ac1b0b09414b91fd7ffccd3f4726df800ac0e3973d24564646159
-EBUILD powertop-9999.ebuild 1130 RMD160 92fc02220c122349703eb057aecb7b2b220d4d2f SHA1 d9c9929dbde7a799a6da883d405d70128d9e7369 SHA256 f39a6b352d1844a32c4b9c79668e1f2dcbe921a01c02b0fd3c1b7c83d33c8d91
-MISC ChangeLog 6054 RMD160 24e2491a8da318434ca41a9a256503dd33198ebe SHA1 abc842ff6a1b2cf7694713ff3a90cb534910b331 SHA256 2278bb7c4237966af79620377a5accf655669d6de8d8c6afc98b41e23d894ce0
+EBUILD powertop-1.97-r1.ebuild 1292 RMD160 6ee5862919f6d49941357e94a10aaeaa32036b95 SHA1 f463f6a20e6cde51584e686609f54c2f9e1fd928 SHA256 b30b046167e087e7edbf99b5257f8e8a9f9cc44359f3b2aa13f07b49b2e5eb71
+EBUILD powertop-9999.ebuild 1320 RMD160 be04e127e2135dc9f570aa3bb9b83be1f410bbfa SHA1 5777f00ad3924d9ab2cc04bc79eae3ccb01c362a SHA256 9769248a6651477508e7bb2f851eba6cb3f49db189568731b325eeea02075ba9
+MISC ChangeLog 6240 RMD160 d232b1758145c54ee8ad22dae74f7a38a1c14e10 SHA1 073b255e1e9f853cb36d60b17fe8c306f0728f3c SHA256 370580dd8c0ff34c2483e986b136f7c67e3e9854835e3c6f5cf7fb798cc52fb0
 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
index 874c159b3ce8..46d973cd629a 100644
--- a/sys-power/powertop/powertop-1.97-r1.ebuild
+++ b/sys-power/powertop/powertop-1.97-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2011/03/14 21:53:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-1.97-r1.ebuild,v 1.3 2011/03/15 09:42:47 scarabeus Exp $
 
 EAPI=4
 
@@ -45,7 +45,6 @@ src_configure() {
 src_install() {
 	emake install DESTDIR="${ED}"
 	dodoc TODO README
-	gunzip "${ED}"/usr/share/man/man1/powertop.1.gz
 	keepdir /var/cache/powertop
 }
 
diff --git a/sys-power/powertop/powertop-9999.ebuild b/sys-power/powertop/powertop-9999.ebuild
index 0bcb6849671b..74374ee8bb9c 100644
--- a/sys-power/powertop/powertop-9999.ebuild
+++ b/sys-power/powertop/powertop-9999.ebuild
@@ -1,39 +1,52 @@
 # 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.3 2011/03/14 09:45:03 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-9999.ebuild,v 1.4 2011/03/15 09:42:47 scarabeus Exp $
 
 EAPI=4
 
-inherit eutils
+inherit eutils toolchain-funcs git
 
 DESCRIPTION="tool that helps you find what software is using the most power"
 HOMEPAGE="http://www.lesswatts.org/projects/powertop/"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/status/powertop/powertop.git"
 SRC_URI=""
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/status/powertop/powertop.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="unicode"
 
-DEPEND="sys-libs/ncurses[unicode?]
+DEPEND="
 	dev-libs/libnl
-	sys-devel/gettext"
-RDEPEND="${DEPEND}"
+	sys-apps/pciutils
+	sys-devel/gettext
+	sys-libs/ncurses[unicode?]
+	sys-libs/zlib
+"
+RDEPEND="
+	${DEPEND}
+	net-wireless/bluez
+	x11-apps/xset
+"
 
 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):' \
+		-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() {