Version bump.

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

5 files changed, 36 insertions, 104 deletions

diff --git a/sys-power/powertop/ChangeLog b/sys-power/powertop/ChangeLog
index 7d2f7a7a4c41..7c2815505046 100644
--- a/sys-power/powertop/ChangeLog
+++ b/sys-power/powertop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/powertop
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.50 2012/04/20 21:41:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.51 2012/05/10 22:09:09 vapier Exp $
+
+*powertop-2.0 (10 May 2012)
+
+  10 May 2012; Mike Frysinger <vapier@gentoo.org> +powertop-2.0.ebuild,
+  -powertop-1.97-r1.ebuild, -powertop-1.98.ebuild, powertop-9999.ebuild:
+  Version bump.
 
   20 Apr 2012; Mike Frysinger <vapier@gentoo.org> powertop-1.98.ebuild,
   powertop-9999.ebuild:
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index d8fe0f95ed40..a333c4fe89bf 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -7,29 +7,27 @@ AUX powertop-1.98-build.patch 2266 RMD160 b8be82c9f2763e0a566768bf0a99cee65209ca
 AUX powertop-1.98-gcc-4.7.patch 3720 RMD160 cf4fefe9b31baa8b9c7365fecf8ba5223bb0843c SHA1 439f14fd47bbdb8293ce71514fd81082a74724d3 SHA256 44335480e32fbd591e5fe45cc8f47c45ad45fcf656f371b05e6d2751dd248549
 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
+DIST powertop-2.0.tar.bz2 456654 RMD160 d2c657fac6b1c0b430099d60fe8ee80e3d379e57 SHA1 ec64a472a4e1539d6dfc9725f6d934e908d5930c SHA256 7af51d320856b3446bcc314c9414385f3b05b9360f650883b0210cd3b12c5c1c
 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 1290 RMD160 6fbe1dab20b7d9986d87fe7baf9b04aafe59a4a9 SHA1 9362d7f11e5f3f581e35e2d4d326ece6c49137c4 SHA256 4004da3a6e306bc45c7058ba918798733b06a321c1472ed56ae1cae58b1a1706
-EBUILD powertop-1.98.ebuild 1400 RMD160 6e6d1d31b099e03cd7d7f03426cfd5f02be91359 SHA1 aff7b4bcd67874b48c39a3efbb92cf1f13539eb1 SHA256 31baca3213e0f56c721a68b24aede9fa3eb6a87647c2e33f1ac8838ca6dd979e
-EBUILD powertop-9999.ebuild 1401 RMD160 989c482defa18932317d994b141ae24328d6fc9c SHA1 b4053699e9c161bde1884f61588332e66ffbea61 SHA256 d77554d06c447db7b013b08cc34e9d744be7808c3b6587ae2b627ad8423abe42
-MISC ChangeLog 7328 RMD160 36b72513cb06a24cb56cc8ea63bd2bb6455edc9e SHA1 4c110215bf584592eb86ac31848fe7e4e77fda2a SHA256 da5934fcf9960ddcd91e30221b12c6009b97d2187565dd64f7a180955c0b596d
+EBUILD powertop-2.0.ebuild 1177 RMD160 7a74d57b8e4c6804ff1e4e7b45e786ae76d899ae SHA1 75e1aab6092cb783a6d6bbe6efbe835f7026dcef SHA256 aaecc8df1b04a05e740b69edfcf5fe17c2afc52fb8b9fb98772d689ee3a66043
+EBUILD powertop-9999.ebuild 1179 RMD160 b1c92eab02dc6dde714d055da11c05ece24cb051 SHA1 8d63c9a7b06c6b160ec9610948af55c70277d198 SHA256 13c75055be4b6cfd0f78f414f2eca030b6c1b56d8a5d833f8d3b830b51a97c63
+MISC ChangeLog 7519 RMD160 43d29dd63ed31fc3bde10f8873a2a016915c55d8 SHA1 eceb5c2547f12cb21aefbcf752f1960d5150d3ca SHA256 95b8213abb53f07758f0da30e9631df2ed0bdc53a9b7bf8ca7fb35fbd31f9f1e
 MISC metadata.xml 161 RMD160 a5e1f234c4886ff31d39f229a0cf30d0bfcea869 SHA1 3876fd42cd9e63a7edb04c5025d53d773aa80bc3 SHA256 838bd208a7f948ea9b4e2b8869464622bc64a2f02468de4c3d7f6c2530e28e89
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPkdhHAAoJELEHsLL7fEFWRnQQALBGoXzqOOQGWkSuFuq3ohkp
-USN8LqeRpgilUtxEei/09bk6SgpB1Z+IL3NBTjvjZMHOFMbcoSrleEigEWUxj3Ev
-PgXIbXr4bznRyeNyze7MV1aGH/im0DmAxJshQgr6AL6o1GbQgzzsG8rYNqAyUf6F
-0ymNTp5RaY5P8CjHCE50xbUUHjhACeQSXQUe8vKzIsF868SrsTUlmFdQ+5tDZzYf
-f5OTfK4qpt5SPGopLIPhpjNQUNWOtiE4QvIubvZkT5Sz2nkm3NsPZjuqxwB0DRte
-Pa0xPwXvnB4WhoYzNFr7MnM47LqS/dFD6+iRUWjvtklk0CN+PGnjrSYJ5/bTU69E
-p1STX7zdg7dk5tujupN04S7g7pMz+o8ST7zUKlU3vzwPiyLKBV/pjICo0uX4UF+3
-Dba1/e5zb5KUTABbTsTrLIq/0Cult7Er0T129TMipVVDpJj26EOX4DXaLXbta2Bf
-M+oWqzZS+u5GCXW0+VDeV5WA3+OFeqw+2lE3Uq0l6dq0LwsGJUQIOFpacO6l8kIY
-Fw1oAgVajti5fUABP8rFe0TI9+1vOLoIR3Q7QNLf+6iMJ7GZWdWPTcjhK1e6QPg9
-+K8FDUydkQ9p1dxXDt73dgGYntzBJSOPOLjB3U+ooSusqhaBmBe812ff6RBG1a4L
-iGdwMHP2C96nPAq2LGJa
-=BkoC
+iQIcBAEBAgAGBQJPrDySAAoJELEHsLL7fEFWxcMP/0dWowivhbvhVjZzyZNtTgVu
+5L6O0kmLQOm7578Pkz2OyOaUcLXgT3G1x4oIgdO1ewthhBoahjBCFu2tMfULfoJR
+EznGOrcZN4JH1Ukm6wgjfG6RJn2rtiNAu0icK1pu8c7RI93VOWx40R+a3enEIDW4
+DXL0T+SbDDgzOqsNnPF11YAWKTzvVZfeX/ekM0vTIBlpN2SjpTZZSF6M4zEe2mll
+BDywmmEH+ePQbE/hZxE7soKFWbpxYd4Lay7v6MBizodpkhLkvQjI80OfZGmsdDhO
+CxDUVAtFj9caWWZzekI6F/eUqDFR38LFnZKQ76XNNpJ9hYZvuUuj62Zhkyy770JA
+iyQZcAPooIxg0VtkX/0wn90dy190ziAXZwTyKq3BA2qJFvdwH+n2Z54yBzc3Clvb
+tPkmJAFSGLCY/tBlwRQsPIct88LZC47D+FBiKnmTi3aVN3a7maBXDAUQ/qlMcIrl
+Trij7IFbTlT1/0PCsJADMzqbqr/ffnfbiEGtyzoAIkS7d8Alh8fnRkCTZ6Iski9p
+AMLHkgoNGSl61oYEf57bch3YAWTpFRfydKHr5nXaxHxAUY+QKvO12LfCv7pJKpBb
+FZId83WqgsWjZcnBHhRcVGMrow9icKvTBumJ0TPcYmlRuDQ4AvKQrPFDSJ8tjBA2
+0uGOWouxLWaspHWpSVMh
+=+KoI
 -----END PGP SIGNATURE-----
diff --git a/sys-power/powertop/powertop-1.97-r1.ebuild b/sys-power/powertop/powertop-1.97-r1.ebuild
deleted file mode 100644
index 71ddb5df0004..000000000000
--- a/sys-power/powertop/powertop-1.97-r1.ebuild
+++ /dev/null
@@ -1,56 +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-r1.ebuild,v 1.4 2011/10/27 16:21:54 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="
-	dev-libs/libnl:1.1
-	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 '/-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
-	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.98.ebuild b/sys-power/powertop/powertop-2.0.ebuild
index a1f6d7984654..ae672a946061 100644
--- a/sys-power/powertop/powertop-1.98.ebuild
+++ b/sys-power/powertop/powertop-2.0.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2012 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.5 2012/04/20 21:41:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-2.0.ebuild,v 1.1 2012/05/10 22:09:09 vapier Exp $
 
 EAPI="4"
 
-inherit eutils toolchain-funcs
+inherit eutils
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://github.com/fenrus75/powertop.git"
 	inherit git-2
 	SRC_URI=""
 else
-	SRC_URI="mirror://kernel/linux/status/${PN}/${P}.tar.bz2"
+	SRC_URI="https://01.org/powertop/sites/default/files/downloads/${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/"
+HOMEPAGE="https://01.org/powertop/ http://www.lesswatts.org/projects/powertop/"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -30,22 +30,14 @@ DEPEND="
 "
 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
-	epatch "${FILESDIR}"/${PN}-1.98-build-libnl-3.patch
-	epatch "${FILESDIR}"/${PN}-1.98-gcc-4.7.patch
-}
-
 src_configure() {
-	tc-export BUILD_CC CC CXX
+	export ac_cv_search_delwin=$(usex unicode -lncursesw no)
+	default
 }
 
 src_install() {
diff --git a/sys-power/powertop/powertop-9999.ebuild b/sys-power/powertop/powertop-9999.ebuild
index 808e6b6090b5..8c2966a7c1ee 100644
--- a/sys-power/powertop/powertop-9999.ebuild
+++ b/sys-power/powertop/powertop-9999.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2012 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.10 2012/04/20 21:41:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-9999.ebuild,v 1.11 2012/05/10 22:09:09 vapier Exp $
 
 EAPI="4"
 
-inherit eutils toolchain-funcs
+inherit eutils
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://github.com/fenrus75/powertop.git"
 	inherit git-2
 	SRC_URI=""
 else
-	SRC_URI="mirror://kernel/linux/status/${PN}/${P}.tar.bz2"
+	SRC_URI="https://01.org/powertop/sites/default/files/downloads/${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/"
+HOMEPAGE="https://01.org/powertop/ http://www.lesswatts.org/projects/powertop/"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -30,22 +30,14 @@ DEPEND="
 "
 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
-	epatch "${FILESDIR}"/${PN}-1.98-build-libnl-3.patch
-	epatch "${FILESDIR}"/${PN}-1.98-gcc-4.7.patch
-}
-
 src_configure() {
-	tc-export BUILD_CC CC CXX
+	export ac_cv_search_delwin=$(usex unicode -lncursesw no)
+	default
 }
 
 src_install() {