Version bump and merging of live/release ebuilds.

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

6 files changed, 154 insertions, 19 deletions

diff --git a/sys-power/powertop/ChangeLog b/sys-power/powertop/ChangeLog
index d0db2ff12231..d0a77f446db4 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.45 2011/05/03 11:34:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.46 2011/08/23 22:14:16 vapier Exp $
+
+*powertop-1.98 (23 Aug 2011)
+
+  23 Aug 2011; Mike Frysinger <vapier@gentoo.org> +powertop-1.98.ebuild,
+  +files/powertop-1.98-build.patch, +files/powertop-1.98-build-cc.patch,
+  powertop-9999.ebuild:
+  Version bump and merging of live/release ebuilds.
 
   03 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> powertop-9999.ebuild:
   Move to git-2 and use eapi4 features more nicely.
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index 4c2c28923ddc..0bac684ab608 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -1,19 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX powertop-1.98-build-cc.patch 704 RMD160 487e240229d57fabf82dc6c1979123fc3055f6b9 SHA1 55a3fe982b5e24e208ce137d143a39929fb36532 SHA256 36ccfeec0c64f0131415238316e14fee2239d4af0a52b48c0162181f49ad9457
+AUX powertop-1.98-build.patch 690 RMD160 2253b0387e3fbb1163eb19e04fbe90b737149f17 SHA1 b1028d11b19c30c48d24454f546ca4c490a8151b SHA256 094ac006dbd6fa09c2b7eee3ff59b362f2d05f45c11ab5ba266564fa21907b32
 DIST powertop-1.11.tar.gz 73136 RMD160 be05916afbb808ae17f6becbef7d456a753bd652 SHA1 d1d71db9a0854fab51f295a87ec505d89e451de3 SHA256 70e7cc53e5fbade5e447bda9f0ca12f2153bf426e074dbac3a2e97adf46180f2
 DIST powertop-1.13.tar.gz 104675 RMD160 e6cf649e387a9a6f8cf036ddfa0f5def50303f76 SHA1 91a6f1ec9ca768c1a04409e154e6909458028d66 SHA256 2bc866089496877dd26d2d316ad5763ab8ecb5e28aefba44bc5d355dcdc58d98
 DIST powertop-1.97.tar.bz2 84657 RMD160 8e9f0db989a42a9a368a45cbf6e9e1985e3fb82a SHA1 0227d5199ef3092915a62aca63aaa1d3ba1a9c12 SHA256 d3dafe1ce4dabeb4edb724616d7b8533ac40ed71fca43e81b007e9fd7011e516
+DIST powertop-1.98.tar.bz2 88110 RMD160 ebbd0867aba4d2a72584e19e3ab55c50cd82911c SHA1 15c082c0ed9134b07124d90f23d4518da6d8b781 SHA256 078b2d05a467ae83a6ee567d11ed7f80b917a3e2ad9d9de0e4b9facd857353f4
 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 1292 RMD160 6ee5862919f6d49941357e94a10aaeaa32036b95 SHA1 f463f6a20e6cde51584e686609f54c2f9e1fd928 SHA256 b30b046167e087e7edbf99b5257f8e8a9f9cc44359f3b2aa13f07b49b2e5eb71
-EBUILD powertop-9999.ebuild 1268 RMD160 54fb96933a8dfef6af9c6c412e9a9ca52872463f SHA1 a0167e4729aed958ac021e3db9b2bd57934815db SHA256 2f0859793da5f078d1b1776a056b91b136377f07136821f8afbd7fba8471ea96
-MISC ChangeLog 6370 RMD160 7ed2a4331099484a9a86247db09fe9f1d36d9e54 SHA1 ac2b0287139cfcb12cd722c2ce1b5aefc66adc62 SHA256 e58f58f55816ae20cc98670ba65774d42d2425e00760751b9a7297042bb3051c
+EBUILD powertop-1.98.ebuild 1504 RMD160 bace833e5b810a0d126b3f25ba036af3311885a0 SHA1 2e8d4eedc21e383d37ddb6f224e8146ae96e96ef SHA256 26cd69b9d7425b8bc50bf869c1f8df17e9bd210651e14c4b4bc0a35488fedb30
+EBUILD powertop-9999.ebuild 1504 RMD160 15b97a3637d20db66ec51f6307f997d55b8961cb SHA1 3b450bb34c881f166344e0d64bae1fb65dc8a328 SHA256 c51f32f6d6dd366c515d54791274ba9d3ce8af573680796fcb3cc08f1c80725e
+MISC ChangeLog 6620 RMD160 f28a58956b3782d53e8c3921666e5c1efa7b4bc8 SHA1 e61488c9cdea6fd67159ef31e8972bfb91e09761 SHA256 25d5ead2df422525b135ac3e5b557db7b99b1f820875acb86869d58643f314fd
 MISC metadata.xml 161 RMD160 a5e1f234c4886ff31d39f229a0cf30d0bfcea869 SHA1 3876fd42cd9e63a7edb04c5025d53d773aa80bc3 SHA256 838bd208a7f948ea9b4e2b8869464622bc64a2f02468de4c3d7f6c2530e28e89
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2/6DgACgkQHB6c3gNBRYdrNwCeLyAUr7rO1SWStaHAr3nh4Fsm
-v0oAniJOATPyavtP8nsHOA7Paoccbtn7
-=FMjU
+iF4EAREIAAYFAk5UJj8ACgkQaC/OocHi7JaCZQD+J4Qm0zF4ek7z5xMFzzATUeE/
+se1Ho1fTKbTWmD2SEM0A/ReW6EHsojvNJti2JzOH+hiOsV2T3DdQlzxkPcWNdGbS
+=H6I5
 -----END PGP SIGNATURE-----
diff --git a/sys-power/powertop/files/powertop-1.98-build-cc.patch b/sys-power/powertop/files/powertop-1.98-build-cc.patch
new file mode 100644
index 000000000000..70beb81db3ba
--- /dev/null
+++ b/sys-power/powertop/files/powertop-1.98-build-cc.patch
@@ -0,0 +1,28 @@
+From e2a8efc2d349880833215ccbe9ac6cb80cdfe5d0 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 23 Aug 2011 18:03:38 -0400
+Subject: [PATCH] allow control over the build compiler
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index f637bfe..75e6e63 100644
+--- a/Makefile
++++ b/Makefile
+@@ -80,8 +80,9 @@ install: powertop
+ 	@(cd po/ && env LOCALESDIR=$(LOCALESDIR) DESTDIR=$(DESTDIR) $(MAKE) $@)
+ 	
+ 
++BUILD_CC ?= gcc
+ csstoh: csstoh.c
+-	gcc -o csstoh csstoh.c
++	$(BUILD_CC) -o csstoh csstoh.c
+ 
+ css.h: csstoh powertop.css
+ 	./csstoh powertop.css css.h
+-- 
+1.7.6
+
diff --git a/sys-power/powertop/files/powertop-1.98-build.patch b/sys-power/powertop/files/powertop-1.98-build.patch
new file mode 100644
index 000000000000..cebb09f4ee3d
--- /dev/null
+++ b/sys-power/powertop/files/powertop-1.98-build.patch
@@ -0,0 +1,26 @@
+From f60a30a247fd1bfdd58de42934937a861e4b927a Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 23 Aug 2011 18:01:36 -0400
+Subject: [PATCH] use CFLAGS/LDFLAGS when linking
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index b0b6cb7..f637bfe 100644
+--- a/Makefile
++++ b/Makefile
+@@ -70,7 +70,7 @@ clean:
+ 	rm -f *.o *~ powertop DEADJOE core.* */*.o */*~ csstoh css.h
+ 	
+ powertop: $(OBJS) $(HEADERS)
+-	$(CXX) $(OBJS) $(LIBS) -o powertop
++	$(CXX) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o powertop
+ 	@(cd po/ && $(MAKE))
+ 	
+ install: powertop
+-- 
+1.7.6
+
diff --git a/sys-power/powertop/powertop-1.98.ebuild b/sys-power/powertop/powertop-1.98.ebuild
new file mode 100644
index 000000000000..9e7c34dc1b6e
--- /dev/null
+++ b/sys-power/powertop/powertop-1.98.ebuild
@@ -0,0 +1,64 @@
+# 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.98.ebuild,v 1.1 2011/08/23 22:14:16 vapier Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/status/powertop/powertop.git"
+	inherit git-2
+	SRC_URI=""
+else
+	SRC_URI="mirror://kernel/linux/status/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="tool that helps you find what software is using the most power"
+HOMEPAGE="http://www.lesswatts.org/projects/powertop/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="unicode"
+
+DEPEND="
+	dev-libs/libnl
+	sys-apps/pciutils
+	sys-devel/gettext
+	sys-libs/ncurses[unicode?]
+	sys-libs/zlib
+"
+RDEPEND="
+	${DEPEND}
+	net-wireless/bluez
+	x11-apps/xset
+"
+
+DOCS=( TODO README )
+
+src_prepare() {
+	use unicode || sed -i 's:-lncursesw:-lncurses:' Makefile
+	epatch "${FILESDIR}"/${PN}-1.98-build.patch
+	epatch "${FILESDIR}"/${PN}-1.98-build-cc.patch
+	sed -i -r \
+		-e '/FLAGS/s: (-O2|-g|-fno-omit-frame-pointer|-fstack-protector|-D_FORTIFY_SOURCE=2)\>: :g' \
+		-e '/@\$\(CC\)/s:@::' \
+		Makefile || die
+}
+
+src_configure() {
+	tc-export BUILD_CC CC CXX
+	CFLAGS+=" ${CPPFLAGS}" # blah!
+}
+
+src_install() {
+	default
+	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-9999.ebuild b/sys-power/powertop/powertop-9999.ebuild
index 8932a3a594c0..c70e4ee7bf9a 100644
--- a/sys-power/powertop/powertop-9999.ebuild
+++ b/sys-power/powertop/powertop-9999.ebuild
@@ -1,19 +1,24 @@
 # 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.6 2011/05/03 11:34:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-9999.ebuild,v 1.7 2011/08/23 22:14:16 vapier Exp $
 
-EAPI=4
+EAPI="4"
 
-inherit eutils toolchain-funcs git-2
+inherit eutils toolchain-funcs
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/status/powertop/powertop.git"
+	inherit git-2
+	SRC_URI=""
+else
+	SRC_URI="mirror://kernel/linux/status/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
 
 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"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="unicode"
 
 DEPEND="
@@ -33,16 +38,17 @@ DOCS=( TODO README )
 
 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):' \
+	epatch "${FILESDIR}"/${PN}-1.98-build.patch
+	epatch "${FILESDIR}"/${PN}-1.98-build-cc.patch
+	sed -i -r \
+		-e '/FLAGS/s: (-O2|-g|-fno-omit-frame-pointer|-fstack-protector|-D_FORTIFY_SOURCE=2)\>: :g' \
+		-e '/@\$\(CC\)/s:@::' \
 		Makefile || die
 }
 
 src_configure() {
-	tc-export CC CXX
+	tc-export BUILD_CC CC CXX
+	CFLAGS+=" ${CPPFLAGS}" # blah!
 }
 
 src_install() {