updating 9999 to match already fixed 2.4 wrt bug 477280

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

3 files changed, 27 insertions, 21 deletions

diff --git a/sys-power/powertop/ChangeLog b/sys-power/powertop/ChangeLog
index 9d04e39475ab..eea346a0ff6e 100644
--- a/sys-power/powertop/ChangeLog
+++ b/sys-power/powertop/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-power/powertop
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.87 2013/09/03 18:15:14 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.88 2013/09/03 18:22:31 zerochaos Exp $
+
+  03 Sep 2013; Rick Farina <zerochaos@gentoo.org> powertop-9999.ebuild:
+  updating 9999 to match already fixed 2.4 wrt bug 477280
 
   03 Sep 2013; Rick Farina <zerochaos@gentoo.org> -powertop-2.3.ebuild,
   powertop-9999.ebuild:
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index 7eac8f74105d..62e19c6d70f4 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -12,23 +12,23 @@ DIST powertop-1.13.tar.gz 104675 SHA256 2bc866089496877dd26d2d316ad5763ab8ecb5e2
 DIST powertop-2.4.tar.gz 632390 SHA256 42796c94546ae7f3d232e41b7fa09b2532396ca389908ff528870311db6327b7 SHA512 988732b199a288ef1b7c73e49857a7aab0fdc0b9f04a1d218e47fc9ba5e9af3da5bf91a4dc1473d33c9b83d7d238006a9786f4178d71cc21a6dad0c33b2cb864 WHIRLPOOL ee3d4b8671a08537cc6b178771699fb3215ef784120d33606f205c1b9c967a87a1e4bd6b948cc1fb651accb60b5ec832fda10d0deb05181087b15fc1a7a529c9
 EBUILD powertop-1.13.ebuild 1158 SHA256 b996887bff17065a57aac201aac438a2c6310f5423109e4cb62de10c3e3dfdfd SHA512 c1ed8ee2fd7416138b9ab84072766071047e557ffc35fc57d32d8e4dc86f8986fa3a642f1875e2cf929eeabeb8a0b20025babc27808602b1123c970869c51146 WHIRLPOOL 570c6c80e97351859f9758b581a103a1a98d6c5ee58a63b4277431f21bcef9bed94ee35e3ed0193259a44978aa7aac717c597db4cba2aaa2d201ffe13998610f
 EBUILD powertop-2.4.ebuild 3363 SHA256 c38f4e152b1059984886bc130c2361bc8b82abb96d4d7fae2131cd1bf5b464e0 SHA512 9781ddb05a712e52e4a8716d935b62fa95a1589c7035380df54cbea8023c6c12161cacd7c074272ae9a9199621581055513bbba6705379fc45fcdfbc1eabb71b WHIRLPOOL 869a6c3b6c55d3018def07a61d54f38b5d475337bf7dec269a8cd58cd45756b65f64262a155eace1ed15ade83c382ee6dd4d0224d49bab4e08068578d722c1b3
-EBUILD powertop-9999.ebuild 3299 SHA256 379ec28aa6b365f2c32fe0e9479dbfad7a3826eea13e7d71caa3811dcc8bf1c0 SHA512 15610d3419c39456e75a986947fa4410385bc45f67f76f9111f2b5a1d263be49cb8a47260c9bd4babfd7611beee6dddcf1f1d2f2ac029d85efd443d785a039f1 WHIRLPOOL 649ee5a54f01e5e357075b2c1ebab5b1f9eabfecbd06caf0d9783badaf6c806e3738fd91022780467427b1fd6dd602231b3a3b96db0c671dbc1718d26907e331
-MISC ChangeLog 13007 SHA256 05450de73852cceb5a0720b4a0446e4d366b389d3491b119ecfbbc17434d5757 SHA512 90a8e8406302951235c05b031a620eb5d38ec6731590479b0bc5ee9af24c3b6229fcd77456a3ccc3075d7cdea400b57636e70a35fc6025cd6a1db53fdccfa6a4 WHIRLPOOL 2366553be58ee8f66b34e2fd2a88b6d3f73e08a45621d56c36a39243edc652ac8680715927c0b1e625021208c4c95034544c2bb8bb3fd1859006aa65cd8d21fc
+EBUILD powertop-9999.ebuild 3372 SHA256 4f4ad32a03ac8d91880d60bd155e7111df110caf4bcc4344505e8bdf4905e0ec SHA512 b64cbd085eb03fa7f0bdb3188d3d52cf6fa4dd5951057edded66fddb7268b17c7d0f75da51a9322af2e75d55d859c58e973024a63f444bffc70ae3549d323322 WHIRLPOOL 6de5df19399ff9e94d70ee184d0f2acdd1a2a2fa30ac90057b2dee80c47bab4355813b70c60285b11662e043d2c80fa78fb71de993ba0146b48dfc4c481739b4
+MISC ChangeLog 13138 SHA256 721f281645d0b2dc5444048c922004f6cf54561d957791f004840135e998666c SHA512 bdd91bbbb50d3939287d3a46161b0089d6ac1e5ae1e33561c12e04063979ed650fff18b6081498e9c024d5b42c3a6b709a6ec505f57b454a2afb1a114b0d0caa WHIRLPOOL d55763c5c6783cbc5a6cdafd101dc6bc4bf04b7695fd85ecad2e32632a99b1a37a0b36f51a9c3c08e4a5c4469f699add1be06a2bd7a985f1fa0ed5dabb35be4e
 MISC metadata.xml 239 SHA256 24d3268dbe675a5446456b139438c1bd59bd6190077399a4a715805ef28da3cc SHA512 2fa025f3394a125b4a92ee5fdb579bcfe74755f4e4306d90979bbb04c5239adfd2fdf9242ee7623642909597100ca88a6f6b7578a24512d976930fad186e10f9 WHIRLPOOL ab1b126e1a8170eba68412f8704d38ac7a479cb80a461cb2466ad87966ab8f78ddc04ce66341e5056df8c3aa21e3cf2c530a1f3236461bb502b91842089b49bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSJieLAAoJEKXdFCfdEflKWCoP/0VC0XyuhWwU3UOZ+qxI3/fm
-JCZwETrkxbtCX4og2zsfVN+3rG0nmA/H7yz33LPQaafKYsu4xsonizJWCZM80459
-hMdwy+L42YmR7JBoOS5pPkZOpKjgmZ5f+UTfD6/xpjBs2+FRuu9IRuCEaCVmox6y
-RBwtPOYCGGQwDMOVWbwBiGMH+EUD2SqG/JDN6imXVJ49EBsyz9C0ip31jGhLq/q/
-L/LSEp+L0wif8XxWJn4LBc4r5B1+TFfyBdeqQh0kZGRIOm6YhieF812vj/Qzb45+
-urrzakl5MxTjRIHyjKGoMJtCtzfqOuP9V4dKucXriCaPqSLw8r8D4JgjbGlWdNwG
-hRrXkeWVrwXskccckBEgUA+UmcPq0DIdWQnlkmm85XowXvTd31bnDVEaqPuOU8AJ
-iu7lSpM/deoNF9P4r2kyJ66ggfJNaEHVC3kmyfti1klcHmcATCq8fI6qCfs5dGF4
-AR7Ts9rgdJckL8zWW93UZrgTsOahojj68AtTMiSzmeCCPjW0tUztnHIjIEyLt6dj
-+hBg16NM3UQK6dilNJRkp9oVaocY0FNwlIEMp0iIMSW6B6xZdL/AydTp1oRJTRMl
-mQJXU27AfCC4uy+LyTTGFIsJPAWZp+m2x4m45V4IFZOfm3sByENZH4Jw2W+trk+0
-gAHrSOvylNvxDhIIUflF
-=p1K7
+iQIcBAEBCgAGBQJSJik9AAoJEKXdFCfdEflKS5QQAJaz1q8xH6vvTX/80CRQWpZv
+Ig7PCV2zSgPnbL8pIrmICJV8QA/Al8kSKcmqf3MNOAZ2Yh8WuGacEgF3BtfoFIix
+f4LSkolnoW/83diQBC/1fMK71ZUDX+j7aaIUGe1aTAhOwOQZ3nukSOuPshArZ2R8
+XduzkFxI0DfI36/NH2usOFs9k1YD4uJkUnleKPyOuJzRAOIZbQQQ4Xz/yLkHGVth
+L8wGsTWi7rhYyNNeYepO6f7/YBoAvGOCWctaBsXhDifP9pYLVJoT9+z5ssvxjGAX
+/LvuqUfYzbLXwE5pJtK7JLRvwbgWVabukcFsRiR9jJijAREQ0hyHTBU9a1kPXB9l
+cEXZ0Wjx5poHdmF7aM9aTBNqUfcHzcGP1VZagTqUcpoBYV7kRomSPggYSUFTCJUZ
+5B1rNiOUZFKwKX8FQp8X8Oo9x/DH2MKnmfbNcTs+ol00xrnKZD/x6hyNv55e6oOK
+2IzVzEnoxLTa41qPMWthXof80QccENNlrEjq4A1ewI2R5G+auF4800o8nJcp45SI
+i+pXQZbGeMoa2XDXa2Jqg5jBUINQVkFH8XRL0clmwhjbmc2mD2M1guy/euoKZGdd
+SKXSr/eLOoeg8mfhsotHF8S299BvjS7luiEVq8zAQsicVa3LSGp6xtFdPvcCHCHX
+QXXYGSVaZ/M+UDl593MO
+=CL46
 -----END PGP SIGNATURE-----
diff --git a/sys-power/powertop/powertop-9999.ebuild b/sys-power/powertop/powertop-9999.ebuild
index 83ac956a947d..972b7f61a9df 100644
--- a/sys-power/powertop/powertop-9999.ebuild
+++ b/sys-power/powertop/powertop-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.23 2013/09/03 18:15:14 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-9999.ebuild,v 1.24 2013/09/03 18:22:31 zerochaos Exp $
 
 EAPI="5"
 
@@ -50,11 +50,10 @@ pkg_setup() {
 		~HPET_TIMER
 		~CPU_FREQ_STAT
 		~CPU_FREQ_GOV_ONDEMAND
-		~USB_SUSPEND
+		~PM_RUNTIME
 		~FTRACE
 		~BLK_DEV_IO_TRACE
 		~TIMER_STATS
-		~EVENT_POWER_TRACING_DEPRECATED
 		~TRACING
 	"
 	ERROR_KERNEL_X86_MSR="X86_MSR is not enabled in the kernel, you almost certainly need it"
@@ -66,11 +65,10 @@ pkg_setup() {
 	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_PM_RUNTIME="PM_RUNTIME 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
 	if linux_config_exists; then
@@ -81,6 +79,11 @@ pkg_setup() {
 				check_extra_config
 			fi
 		fi
+		if kernel_is -lt 3 9 0; then
+			CONFIG_CHECK="~EVENT_POWER_TRACING_DEPRECATED"
+			ERROR_KERNEL_EVENT_POWER_TRACING_DEPRECATED="EVENT_POWER_TRACING_DEPRECATED should be enabled in the kernel for full powertop function"
+			check_extra_config
+		fi
 	fi
 }