fix gettext deps per bug #398977 and clean out old ebuilds

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

7 files changed, 11 insertions, 307 deletions

diff --git a/sys-power/powertop/ChangeLog b/sys-power/powertop/ChangeLog
index e7bfe209ceac..3edfdedf44ae 100644
--- a/sys-power/powertop/ChangeLog
+++ b/sys-power/powertop/ChangeLog
@@ -1,6 +1,11 @@
 # 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.73 2012/11/23 18:05:35 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.74 2012/12/09 20:48:24 zerochaos Exp $
+
+  09 Dec 2012; Rick Farina <zerochaos@gentoo.org> -powertop-1.11.ebuild,
+  -powertop-2.0.ebuild, -powertop-2.1-r1.ebuild, -powertop-2.1.ebuild,
+  powertop-2.2-r1.ebuild:
+  fix gettext deps per bug #398977 and clean out old ebuilds
 
 *powertop-2.2-r1 (23 Nov 2012)
 
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index 62633aff0d57..a7d8c5d4caaa 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -1,40 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX csstoh 198 SHA256 03e4300bd73e0b8da29546e79f2c94be90626c545d88c84c2c95dd04b2d94035 SHA512 321087047f82cc2001e8f85495cefd7bdc19a6ede32ac9065f72e7e7970b979bdb5e1a534f0e6070502adc18a2c3c5f509aa21c39590e10c15b293b6f231d08d WHIRLPOOL 221f3cfdc896812e86a6241999e8c9acf453f37c47fa34dd8f49b60c1191849e33b641dcaef41bb5e1f9ecf270b681dfe093d45c122c5fe1c5572245c73d0f3c
 AUX powertop-1.98-build-cc.patch 704 SHA256 36ccfeec0c64f0131415238316e14fee2239d4af0a52b48c0162181f49ad9457 SHA512 90c8fa25b59ebc726faee96a7a01fe992a271f6cd0c259d59eaf9276b557d84847e1e1588f0db43098cb9b10d04766f727271df99e51cb31592c0e98b76b2793 WHIRLPOOL 0e259abbcded879ecf8f6bb951bd84190a74fe186dd34fba31e24cadf2cc5c93c558f3c506e684d95638a05cd130b8db5c344d97a24ab96e6934bedeed7c29ad
 AUX powertop-1.98-build-libnl-3.patch 611 SHA256 0799362cdf6923a1a8a0c9ac61097dbaa6ffa21d5b0dd038bae44f58102e4328 SHA512 c81b029c18d192792b6ffa89e7f56e12d3c74a37338fa56ea1f7401bd7bf83353b54cbe6b53e85285a2e1627b8b92c8ea84d2bcd59f24035d4e34fef4f6ac256 WHIRLPOOL 7771eb8c61b17c730d338bee42a604e52acb6a4d7ce0b68e419a73b5acd5620cf0771d3885c877bb76de20a4388b83b96afe2517e24e689c7143044eebcd1925
 AUX powertop-1.98-build.patch 2266 SHA256 8b76948494deb0bece80e7300ec8f84c2fab7bf1d79838faa3e52478142ebfeb SHA512 3f356e8526c337756bb803c7a3c695bda0f6eb0da686d53c0d627341bf443be1f925b96a56a9b066512e7f48f1fccb1c9c4db9033100bc9794626744fe74f696 WHIRLPOOL 555abbc36d90c26b46fbb9236895946e61752350ffcf3b2ec8bc53db6babcdcfe2ef8a2841212e7286e23395a63c9c540b723c3a57663c533692494bdafd302b
 AUX powertop-1.98-gcc-4.7.patch 3720 SHA256 44335480e32fbd591e5fe45cc8f47c45ad45fcf656f371b05e6d2751dd248549 SHA512 98b3f0155d517cadc27bd32e87777ef74278c38d019ffdfff00eb68174ba846ea1899b1bfbf4841a843114d0978dde8a880528c7ce8486cb1132d1d0b0f3ab6b WHIRLPOOL 4c45cdaf5098c2093df41eec6f4e719ffea490ca870e049c7715a78c37fe932250cb8ce73e0d1c98e3194f1e786174596c98a6b21dcf648de1ba4798686f224d
 AUX powertop-2.2-use-package_version.patch 740 SHA256 40258728ae75fb0ba425bd1295ce88784ca03bde59ef52aa114a2269020f1cd8 SHA512 196a866d13999103a6c0d7b5e1b03ce0a11ce1c3a7550346b45bcbb5597b1080b0b9fbd7b18b5d66e2b9d140d5e7ec460cd8be4749bc52c7b904287a0e621999 WHIRLPOOL 715823eb0e936764ebfc5ad6c4bbc7b818f54c310081dd3112da2640923046582b4eaec8b8c0f85891adcf147b04fb25150d1322099664b75a091f39b3c729b5
-DIST powertop-1.11.tar.gz 73136 SHA256 70e7cc53e5fbade5e447bda9f0ca12f2153bf426e074dbac3a2e97adf46180f2
 DIST powertop-1.13.tar.gz 104675 SHA256 2bc866089496877dd26d2d316ad5763ab8ecb5e28aefba44bc5d355dcdc58d98 SHA512 0c22a903da64798d987492336d57260372e03eab067ad94cf30b7640e9ee05e759a2fe9fa48fbdc35404cd2782b6b29d705e11e68452653b08f7f9df1a52be44 WHIRLPOOL 5ba44b84f49609f67c32563f75e20f6576c21a93fcb1ca99ebfe064475397602aa0f0fb9575e05b5a0290983791e7cf6ebae0139b39158b962e4b51027a6f5aa
-DIST powertop-2.0.tar.bz2 456654 SHA256 7af51d320856b3446bcc314c9414385f3b05b9360f650883b0210cd3b12c5c1c SHA512 3d78d0840d2253a7287914ecfadb8183fd06d1ad3d9b7300306171352299259a41a8c470484a40fcd1700305f02c98505254742327b89574bca40a3d279f7043 WHIRLPOOL f0e51f28903f56a6b5151a0e99673fe847dd047d993e1bbb6de26ba08f0fcfe32f4dcd89b8e2b4e2e3f1fb6d6d5bc6e7e8bf84882f2e47e5021eaeb813c8830d
-DIST powertop-2.1.tar.gz 960274 SHA256 3dd4816cca4167063b78d2d7772aff8dc58377d0ed74bf11862412a8a80d2698 SHA512 2ff74d6ced30336674ec6508e9f93dfa280b4dd61cfb98d742ccbe967928e21178df98799c79a0659c192356194f68cfaf023f494ff522e761c154875e98e59d WHIRLPOOL 32e93b0a5c28bffb11e125adbd98af429b420ba099c8e0834a8786fa58db21af182d775d74b58b2552b65ccbfa64ea27085a09c1fefd1cbb97ea7c43ba02bf80
 DIST powertop-2.2.tar.gz 617805 SHA256 1339e1bc3b9675c71dd70fed1132abf215d01469b348d23be7344bc65557b028 SHA512 f57586e100ca36a6787cd9a3794a8f057fffe7bd9decaa8cf04b9d81300bb1da7c2d1f7eab91e3c0faa9616b7d47007b6b796dcd777bde5aec53dbe3a7ed4bec WHIRLPOOL 62aae460529032d30174f51e1cd22d3986a197f6b03460184a4bd9b199c2f08a031e5f7c8732d552f479548c90cba567d93b95629d8ca1e668a5dd8aaa5c8d98
-EBUILD powertop-1.11.ebuild 1103 SHA256 5c961061f2e057b2258f55323c0d618006abf9039816d3811064ca0f6fa84911 SHA512 2860fe9ba9b288850fec2746ac30f66850afe27f7eb558a313dacc272a6f354e54c930783a0e6d8304a77c7c5318bedc27264f32ed4cc9da1f30d66079ac7cca WHIRLPOOL b28a7b9ef2f3a5dde8f6b9cade705ef21d36e3b67be0bdcb014a918ffaea4c3adb06ea4bc7240f4e2191d60ce80ec3ec33a67fa0e292049944356649c220d3d8
 EBUILD powertop-1.13.ebuild 1121 SHA256 ad10c47049432ef0f9047eee7c5c6db033843f699cd2003c5b087169a296a030 SHA512 d87e4874baf0163ddef11ab5c2984ca276e98d551caaf2760e1054cde03e60248ee17ed143a0dcbca23f4a591b883c3b2e46fd1c7f773ab78e1fcb117340232e WHIRLPOOL a372742bb77b08e8b208342ca14e33f1a2d2d6287610613aebb7ec73ae76714448fd4baa39ec84f1f75658fcbd34ec42e058a1dc181e04c68c1d901ef0a78a2f
-EBUILD powertop-2.0.ebuild 1397 SHA256 503e73fcc9867a2f152b8fc0c8e25c457407bdac253a9c091935a51dc3388e63 SHA512 b58aed84f3200e181e127c237f040240b838d5c45a92c7419b00dc809956e9f206aa2d6c835c144aff5acf6f59b3a0d43900499ed8dcb229101d1c1f5553751b WHIRLPOOL 776052e2dab2e1278f51c8aea5114bd892c7af9cbcf521382d9dbf406b8c668bb92e73c0316a4b7f97432d579fcbcf0b7515aaab6ccd7efdd2860b6eaea609b0
-EBUILD powertop-2.1-r1.ebuild 3541 SHA256 188e7d91e664413ed68cac99b4325a5d94af42c8ab9706ef25db0a47a33a900f SHA512 d333df3ec062749a1b34b6019c94da3e892854166061ce244c6a1b8c5f662ac3badac2bc38ba80e4ddd0ccda7522d9a05c6253f1a0911a8ceb8c368ac78626c3 WHIRLPOOL 18e6354409785505e670faf1a5fdbcaa99fa987885c6e710fc500f7191bb217514a1a57b61b63c9267f94003609441ebe6a5ba8ddd9713fb827b8fa50565ce97
-EBUILD powertop-2.1.ebuild 1382 SHA256 1fd1be405ed17d56a51908673fc9822cf47da62ef404f9e7812aae8a76afee48 SHA512 7be332a56b7bf9ded309a87af6ea924efa5bac56cdd55bac26b7b4d88d36cc2e79b2ebf36a935fdaf60814be5c7cf96b653fc540fcfce27827e9fe8f90b642d6 WHIRLPOOL 4d02d000442929fde535676f29c23c1b34cef10235d9e593fadcc5f331018ef535c8eed63e62e5b0917702477da37889dd6d44fd32b78792d8e7d4495a6bc409
-EBUILD powertop-2.2-r1.ebuild 3594 SHA256 87a93d295a252a93c16c9ece0229635d3f5fd5972ad568d216f56c800ca28c79 SHA512 6afaa5982bfa1c5f30c7055d849439abeecdf1e1ea01258239467993dc25a1be81736531eb208d1d8cffd03eed0567a45d2989a22db37905d4ef6824d57aeeba WHIRLPOOL b9a86dec955bc14afdf997d803e10d9d93090d1b0b136f177238e646488e9fb615ec45c5fe1be958e5c135614948f2f65a3d7354d54df0d740c45d4b28e17076
+EBUILD powertop-2.2-r1.ebuild 3611 SHA256 6fe87328a9cdd1a36aa96a5670ffc09a17c0e885f54bbc09ef36613a17e06490 SHA512 ac7c40d0f6297df5c5f3b2142fdddf97264112769a55a08359663dffb87b99112a8c4177cade94a50792c5e74205501ddb9677bf853b8c65ad6db7b6c7b94375 WHIRLPOOL b92664bdc3d9458548762192c6e87ce28c18a81bc887a2661fdeefdd65fd6cd735c38a29a384d092a7de0b7c045bfffe796d4322ce6c5c11dc06abf298b1647d
 EBUILD powertop-9999.ebuild 3423 SHA256 daa3420ab6ef011b084486dd9e1ec6aea837b8ef9c5cd6c331d881ad4a30d1fc SHA512 e2075b5c8f8465c59fbeacf7517991c8ece4325ae7afbce9c612b992084d70a81d33d865e3145f5407239b4fbfbd8d583a94d5c21ba10d743cb0a6d4b6fc9df4 WHIRLPOOL d000d6c661171660a4bc9683b3a8db493d918bf500ffc0b39e914c6fceb6eef880fa4e4c76ca3a3902abf5b1e193020ad95c1ea766e4b1606b5499b20741ccbe
-MISC ChangeLog 10818 SHA256 8f1c289196e75f2dd4694c6b133085d5c0c1e05c99ecc6d4191966cecb306b7f SHA512 8f8b3f8fc5273503b20c491708be8a54a90d3cd06eb54a487960c7806c8e9bbd417b6e2e96754eaf646e903dc7fb633400ab9898ffbc7a0813c75f6a2fe58748 WHIRLPOOL f3836e0f222ba174395cc3af88de0e3fd4695ba08b0903e7a4ae954c755d40c34f909cbd5d8dff32556e0faf21d7ac6f6263e2efdc66553379889cbe74d233db
+MISC ChangeLog 11050 SHA256 2b88d8cd8d4584a96dc03ed82b66969fc1e4234214051bc93622e7e24456514a SHA512 52bb36f90b683c7d96f4ff40d0a54544be42b70b9d2ed7c2d22a278290517b93ac87f4d4d19304f5f87d6da35e39dcc31a742a366a4d6da4175790951a266ee7 WHIRLPOOL 3bb02d74acd888c4b083478c9d6fd0488ee167b0d60c9928851cc9c871461dfc329c862a5a034ed460c6b8c30b66fc2bd03ec9527a6e5cfc89dff75d2d3c4036
 MISC metadata.xml 239 SHA256 24d3268dbe675a5446456b139438c1bd59bd6190077399a4a715805ef28da3cc SHA512 2fa025f3394a125b4a92ee5fdb579bcfe74755f4e4306d90979bbb04c5239adfd2fdf9242ee7623642909597100ca88a6f6b7578a24512d976930fad186e10f9 WHIRLPOOL ab1b126e1a8170eba68412f8704d38ac7a479cb80a461cb2466ad87966ab8f78ddc04ce66341e5056df8c3aa21e3cf2c530a1f3236461bb502b91842089b49bb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCgAGBQJQr7sXAAoJEKXdFCfdEflK3z0QAKQocnvEr4cxi2+JNWm60n85
-BEb6BdKHUhrZ5UFXciBJAEYLTZtOEn4M+O9jthI1FlQs8Zn88O7DKO2BkiIzkYFc
-pGbX0jloxL1MliV2bipFlBECxHIYTWhCgWBGqmIRqxGjkiW5A9JKQfLUurxTEpq0
-r2xO+MNj46f68E0imIrkZd7Cgtn2OBjAUhGVays+n57gH3JyFak+PEtQLwzKOWXN
-Gbm8loxnLs+C+wUTCtLVJdWJyHqWyAo1/GdZp5Z9dl83qLdp4D2rlu53acoH6+mq
-vJkhi2aglAW3uoqtq+zpaRA7LmMBNF/6raYghbrnfKrk9A5e9G/vuh9FfpYtCfi/
-zdpSlXYU3Xa0OMjJPh2NjrJVzjOS7oBaWuCELysOXRpV8wsmDsOmcyS+v8jUt+Vd
-BzP7TIDJ4wDH/WV5txYNaIF0MajeTELSGHeWqkUluXCDjL9y4pY51a8tl7A6WO/k
-WxGNi9AwuVaU3NB5ll3oKbbIjhdBKcd52/vGu0u/mo3brJF2TZbCs+n+bo64ZTlo
-iNaxt+HAoBTN7iai2wvhqz6qSf/w2QW3aKm5qJwWDdG+HQJGwcOWHijg1v5mN0Pd
-JqQIrx/otPgXelp0o/+QH4x2PXQst66rU55UCzMmNtWilGdQC18RIs17sqxI6t4S
-UPqudjtYDhVVHIbp6DCd
-=Rj7x
------END PGP SIGNATURE-----
diff --git a/sys-power/powertop/powertop-1.11.ebuild b/sys-power/powertop/powertop-1.11.ebuild
deleted file mode 100644
index 06fe5f81bb73..000000000000
--- a/sys-power/powertop/powertop-1.11.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-1.11.ebuild,v 1.9 2010/04/05 17:02:18 armin76 Exp $
-
-EAPI=3
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="tool that helps you find what software is using the most power"
-HOMEPAGE="http://www.lesswatts.org/projects/powertop/"
-SRC_URI="http://www.lesswatts.org/projects/powertop/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE="unicode"
-
-DEPEND="sys-libs/ncurses[unicode?]
-	sys-devel/gettext"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i '/${CFLAGS}/s:$: ${LDFLAGS}:' Makefile
-	use unicode || sed -i 's:-lncursesw:-lncurses:' Makefile
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	emake install DESTDIR="${ED}" || die
-	dodoc Changelog 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-2.0.ebuild b/sys-power/powertop/powertop-2.0.ebuild
deleted file mode 100644
index 3f646d176a94..000000000000
--- a/sys-power/powertop/powertop-2.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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-2.0.ebuild,v 1.4 2012/06/01 18:36:59 vapier Exp $
-
-EAPI="4"
-
-inherit eutils
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://github.com/fenrus75/powertop.git"
-	inherit git-2
-	SRC_URI=""
-else
-	SRC_URI="https://01.org/powertop/sites/default/files/downloads/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="tool that helps you find what software is using the most power"
-HOMEPAGE="https://01.org/powertop/ 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}
-	x11-apps/xset
-"
-
-DOCS=( TODO README )
-
-src_prepare() {
-	sed -i -r \
-		-e '/^powertop_CXXFLAGS/s: (-O2|-g|-I/usr/include/) : :g' \
-		src/Makefile.in || die
-}
-
-src_configure() {
-	export ac_cv_search_delwin=$(usex unicode -lncursesw no)
-	default
-}
-
-src_compile() {
-	emake -C src csstoh
-	cp "${FILESDIR}"/csstoh src/ || die
-	emake
-}
-
-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-2.1-r1.ebuild b/sys-power/powertop/powertop-2.1-r1.ebuild
deleted file mode 100644
index e51421791703..000000000000
--- a/sys-power/powertop/powertop-2.1-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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-2.1-r1.ebuild,v 1.9 2012/11/22 15:00:37 zerochaos Exp $
-
-EAPI="4"
-
-inherit eutils linux-info
-if [ ${PV} == "9999" ] ; then
-	EGIT_REPO_URI="git://github.com/fenrus75/powertop.git"
-	inherit git-2 autotools
-	SRC_URI=""
-else
-	SRC_URI="https://01.org/powertop/sites/default/files/downloads/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="tool that helps you find what software is using the most power"
-HOMEPAGE="https://01.org/powertop/ http://www.lesswatts.org/projects/powertop/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="unicode X"
-
-COMMON_DEPEND="
-	dev-libs/libnl:3
-	sys-apps/pciutils
-	sys-devel/gettext
-	sys-libs/ncurses[unicode?]
-"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	X? ( x11-apps/xset )
-"
-
-DOCS=( TODO README )
-
-pkg_setup() {
-	if linux_config_exists; then
-		CONFIG_CHECK="
-			~X86_MSR
-			~DEBUG_FS
-			~PERF_EVENTS
-			~TRACEPOINTS
-			~NO_HZ
-			~HIGH_RES_TIMERS
-			~HPET_TIMER
-			~CPU_FREQ_STAT
-			~CPU_FREQ_GOV_ONDEMAND
-			~USB_SUSPEND
-			~FTRACE
-			~BLK_DEV_IO_TRACE
-			~TIMER_STATS
-			~EVENT_POWER_TRACING_DEPRECATED
-			~TRACING
-		"
-		if kernel_is -lt 3 7 0; then
-			linux_chkconfig_present SND_HDA_INTEL && CONFIG_CHECK+="~SND_HDA_POWER_SAVE"
-			linux_chkconfig_present SND_HDA_INTEL && ERROR_KERNEL_SND_HDA_POWER_SAVE="SND_HDA_POWER_SAVE should be enabled in the kernel for full powertop function"
-		fi
-		ERROR_KERNEL_X86_MSR="X86_MSR is not enabled in the kernel, you almost certainly need it"
-		ERROR_KERNEL_DEBUG_FS="DEBUG_FS is not enabled in the kernel, you almost certainly need it"
-		ERROR_KERNEL_PERF_EVENTS="PERF_EVENTS should be enabled in the kernel for full powertop function"
-		ERROR_KERNEL_TRACEPOINTS="TRACEPOINTS should be enabled in the kernel for full powertop function"
-		ERROR_KERNEL_NO_HZ="NO_HZ should be enabled in the kernel for full powertop function"
-		ERROR_KERNEL_HIGH_RES_TIMERS="HIGH_RES_TIMERS should be enabled in the kernel for full powertop function"
-		ERROR_KERNEL_HPET_TIMER="HPET_TIMER should be enabled in the kernel for full powertop function"
-		ERROR_KERNEL_CPU_FREQ_STAT="CPU_FREQ_STAT should be enabled in the kernel for full powertop function"
-		ERROR_KERNEL_CPU_FREQ_GOV_ONDEMAND="CPU_FREQ_GOV_ONDEMAND should be enabled in the kernel for full powertop function"
-		ERROR_KERNEL_USB_SUSPEND="USB_SUSPEND should be enabled in the kernel for full powertop function"
-		ERROR_KERNEL_FTRACE="FTRACE needs to be turned on to enable BLK_DEV_IO_TRACE"
-		ERROR_KERNEL_BLK_DEV_IO_TRACE="BLK_DEV_IO_TRACE needs to be turned on to enable TIMER_STATS, TRACING and EVENT_POWER_TRACING_DEPRECATED"
-		ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function"
-		ERROR_KERNEL_EVENT_POWER_TRACING_DEPRECATED="EVENT_POWER_TRACING_DEPRECATED should be enabled in the kernel for full powertop function"
-		ERROR_KERNEL_TRACING="TRACING should be enabled in the kernel for full powertop function"
-		linux-info_pkg_setup
-	else
-		ewarn "unable to find kernel config, all checks disabled"
-	fi
-}
-
-src_prepare() {
-	if [ ${PV} == "9999" ] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	export ac_cv_search_delwin=$(usex unicode -lncursesw -lncurses)
-	default
-}
-
-src_compile() {
-	#the clean is needed because the 2.1 tarball had object files in src/tuning/
-	emake clean
-	emake
-}
-
-src_install() {
-	default
-	keepdir /var/cache/powertop
-}
diff --git a/sys-power/powertop/powertop-2.1.ebuild b/sys-power/powertop/powertop-2.1.ebuild
deleted file mode 100644
index 69bf3f7b4e2d..000000000000
--- a/sys-power/powertop/powertop-2.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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-2.1.ebuild,v 1.5 2012/09/07 11:48:13 pinkbyte Exp $
-
-EAPI="4"
-
-inherit eutils
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://github.com/fenrus75/powertop.git"
-	inherit git-2
-	SRC_URI=""
-else
-	SRC_URI="https://01.org/powertop/sites/default/files/downloads/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="tool that helps you find what software is using the most power"
-HOMEPAGE="https://01.org/powertop/ http://www.lesswatts.org/projects/powertop/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="unicode"
-
-COMMON_DEPEND="
-	dev-libs/libnl:3
-	sys-apps/pciutils
-	sys-devel/gettext
-	sys-libs/ncurses[unicode?]
-	sys-libs/zlib
-"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-apps/xset
-"
-
-DOCS=( TODO README )
-
-src_configure() {
-	export ac_cv_search_delwin=$(usex unicode -lncursesw -lncurses)
-	default
-}
-
-src_compile() {
-	#the clean is needed because the 2.1 tarball had object files in src/tuning/
-	emake clean
-	emake
-}
-
-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-2.2-r1.ebuild b/sys-power/powertop/powertop-2.2-r1.ebuild
index 12163f7e032e..9443d3c3fcbd 100644
--- a/sys-power/powertop/powertop-2.2-r1.ebuild
+++ b/sys-power/powertop/powertop-2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-2.2-r1.ebuild,v 1.1 2012/11/23 18:05:35 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-2.2-r1.ebuild,v 1.2 2012/12/09 20:48:24 zerochaos Exp $
 
 EAPI="5"
 
@@ -24,16 +24,17 @@ IUSE="unicode X"
 COMMON_DEPEND="
 	dev-libs/libnl:3
 	sys-apps/pciutils
-	sys-devel/gettext
 	sys-libs/ncurses[unicode?]
 "
 
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
+	sys-devel/gettext
 "
 RDEPEND="
 	${COMMON_DEPEND}
 	X? ( x11-apps/xset )
+	virtual/libintl
 "
 
 DOCS=( TODO README )