version bump. tunables went nuts on me once and messed up the display but things are roughly working

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

4 files changed, 129 insertions, 25 deletions

diff --git a/sys-power/powertop/ChangeLog b/sys-power/powertop/ChangeLog
index 207627defcff..11a18f72ef7b 100644
--- a/sys-power/powertop/ChangeLog
+++ b/sys-power/powertop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-power/powertop
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.100 2014/03/12 10:18:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.101 2014/05/17 02:23:35 zerochaos Exp $
+
+*powertop-2.6 (17 May 2014)
+
+  17 May 2014; Rick Farina <zerochaos@gentoo.org> +powertop-2.6.ebuild,
+  powertop-9999.ebuild:
+  version bump. tunables went nuts on me once and messed up the display but
+  things are roughly working
 
   12 Mar 2014; Agostino Sarubbo <ago@gentoo.org> powertop-2.5.ebuild:
   Stable for sparc, wrt bug #500036
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index 540a4242383f..9d262d0cefcb 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+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
@@ -12,26 +12,28 @@ AUX powertop-2.4-tinfo.patch 580 SHA256 fc1c7238d5c386c0f28ff003e998b6657826f8b3
 DIST powertop-1.13.tar.gz 104675 SHA256 2bc866089496877dd26d2d316ad5763ab8ecb5e28aefba44bc5d355dcdc58d98 SHA512 0c22a903da64798d987492336d57260372e03eab067ad94cf30b7640e9ee05e759a2fe9fa48fbdc35404cd2782b6b29d705e11e68452653b08f7f9df1a52be44 WHIRLPOOL 5ba44b84f49609f67c32563f75e20f6576c21a93fcb1ca99ebfe064475397602aa0f0fb9575e05b5a0290983791e7cf6ebae0139b39158b962e4b51027a6f5aa
 DIST powertop-2.4.tar.gz 632390 SHA256 42796c94546ae7f3d232e41b7fa09b2532396ca389908ff528870311db6327b7 SHA512 988732b199a288ef1b7c73e49857a7aab0fdc0b9f04a1d218e47fc9ba5e9af3da5bf91a4dc1473d33c9b83d7d238006a9786f4178d71cc21a6dad0c33b2cb864 WHIRLPOOL ee3d4b8671a08537cc6b178771699fb3215ef784120d33606f205c1b9c967a87a1e4bd6b948cc1fb651accb60b5ec832fda10d0deb05181087b15fc1a7a529c9
 DIST powertop-2.5.tar.gz 635979 SHA256 8b2c08a555d79e1c428863470c41cb023971d74ba4801d80a05e35adeec23c0b SHA512 696629fb6f5d0164da3ec2b259780dc635abc661de859e5e908debd3872c9a82024c0cc2dd8210c4cd1cf5586bf4238e31c3af29266f6a8ed8d90b1d876f04d8 WHIRLPOOL 5940b15ea4c5f09809e9a8febc11b1abe680df04469d75889c3a0cc0935a8c9d578d1f7c4ecaf2507cda74d574696a61b3bef21c6e30e9c768c09abf03436bcf
+DIST powertop-2.6.tar.gz 3024009 SHA256 3024c2b13c8f32cdac0b0ea9359eb5668dc9bd11776cf063481daa878533d1ee SHA512 7c44b9c49f74d0f415d0332b60629940e05cf1c9170a9a7b98427da630c25c0cc9c8ece49e059ec8c665847ff03fa8a341e0cf8f7ca792d889f2c52a39ddbb62 WHIRLPOOL eaa6e05d2fdb3050eb3a37f39fb5d760a8d3d91461b8c6f0ae825138080a0dd8a532e490a71246d62d2e340e3820b402d761a1331a6e7b6bc23db116c98cf0d9
 EBUILD powertop-1.13.ebuild 1158 SHA256 b996887bff17065a57aac201aac438a2c6310f5423109e4cb62de10c3e3dfdfd SHA512 c1ed8ee2fd7416138b9ab84072766071047e557ffc35fc57d32d8e4dc86f8986fa3a642f1875e2cf929eeabeb8a0b20025babc27808602b1123c970869c51146 WHIRLPOOL 570c6c80e97351859f9758b581a103a1a98d6c5ee58a63b4277431f21bcef9bed94ee35e3ed0193259a44978aa7aac717c597db4cba2aaa2d201ffe13998610f
 EBUILD powertop-2.4.ebuild 3384 SHA256 89b700e38e31b6f23923247f4e3727a6eb9bbe05cc988e6d1aa6abcf91dd4187 SHA512 a1de133cbcd1b9e732cc7e693e68454827b2fd709b336d51a623e845180633f8dde63c89763510916fbde2c8979032c1fc49ab1e8c9ad91f0926ebf4f0c21800 WHIRLPOOL 2576849f92ae6e3495c3643da5e46effaf4abb0b4388d63f9d627083fab6b8b977ff4022259f0abb4a3547df1099d8f2ba5a53eb60c9f2cea82bb04febe5c4b1
 EBUILD powertop-2.5.ebuild 3378 SHA256 7e59cf6687b3b6d6ae7c5045c508d2a5d4b37819783e9af419ba0826df167e40 SHA512 2cff8cfe282f475bcf32356073f0b34418e14b376d08c7353b8426bfb83198dfc411f6d2945b8bbe0ed4e4f228f62d6504d84c460c5cfba064e0afe47453b1f8 WHIRLPOOL 2a22cb3a1307a667dae0fe93f96f583cd20ce1b9b9fa8691d9f31d765cc1331022dc556b6599a11d4fde8e0ae95f2c2452d86284daf33a0bb822abda441c2d44
-EBUILD powertop-9999.ebuild 3391 SHA256 bc88977f5a2b69c914f18cc75c10e325f4cdf8bcfdb4fd13647fb0c5c93ee1d7 SHA512 07a6801c5e32122eb53bdee0b1c12bed28d4a66ffc6ba53a97de17146084c4c806688746b2b9cc72f424ee5da276697f434a43e13ac144641b1fd87de9a9714f WHIRLPOOL 24c8e38fc0f289cd92867d873a940b3d3dfb9e0591299731e9c833046d4b81bcf439b3a5bc2fd31c5499642672f49c94f1aeccdb2b0333fb3c44425670440159
-MISC ChangeLog 14543 SHA256 6987935919529be5c8546a70a02020b5dd7f799f8290572bab401de31221044c SHA512 4d348c85402b617a62b5dbf5993b68f55f12ad81d41f6cb2df6e74fc14a88464a60a1fff47082fb72b32a97da2504d30d9457bb86a3c948fac30c05155d41c84 WHIRLPOOL 8eac88771989f1c2a0254b9c6e86db60072f24c0446c3ef98f6f36a4ecb8b0a7d11dd5311a9d5ffbc8d5d6813fd00a33c47b0f87a1e96df526ce550e9f81e578
+EBUILD powertop-2.6.ebuild 3351 SHA256 a3b96aa70440916eec11cf8b12bacc11c66f63f6d21fba7fc036db6bb4601556 SHA512 58f7c1bcaded73a2acc45a47466069804dd91a7bef011398bde508ad044e72b9148770cdf543b6990297f119ec25ed28eca84ff0a5d392a649032384c33ff5e2 WHIRLPOOL a77acf094114574766d804538961ad2d0bb96dfa560e4a9e24c310eadfeef1aff0697f86765d9c1fc941a35beaff71e09e2d8a63f4a7ce7c74599cc68a245249
+EBUILD powertop-9999.ebuild 3331 SHA256 3560c43afec34994a85ac02a9863933d0554b6c0e778ca5e12ed4db80cbba7c7 SHA512 3c21980b9729681eb8361fe0eeb2cfbe294c47670a9adf32022032161d247caf026a8c017fd89a43c37e2c76ea648f43a980174c34cf1445519a478f4e3c67e4 WHIRLPOOL 642bd9a7ff76a039e261ac207ed44d666669502c71d2e7793a3569eed543e44224f1be553fc992d2636b005cc1a9cb143803ccba3be73fe9faadf7985e14a2f7
+MISC ChangeLog 14780 SHA256 dc77d016b13700c1b3fffb02512a526dd88bdd78191d10158167d9462002f842 SHA512 4496eadea95a3f67cca930a638e7e8479f7a6e180e069620178086ac63788c1045309a0b24b0d1be862029ab99d0bd02e1e0439796363e345dac134722c65196 WHIRLPOOL 16da7f9321aeef7a32caecdc7405b7e2bde09574c2c485f4d3bba937ede13089860be4a61264c782c45e883bf40c758492cd1e18061b4dc06aac029a78913e97
 MISC metadata.xml 239 SHA256 24d3268dbe675a5446456b139438c1bd59bd6190077399a4a715805ef28da3cc SHA512 2fa025f3394a125b4a92ee5fdb579bcfe74755f4e4306d90979bbb04c5239adfd2fdf9242ee7623642909597100ca88a6f6b7578a24512d976930fad186e10f9 WHIRLPOOL ab1b126e1a8170eba68412f8704d38ac7a479cb80a461cb2466ad87966ab8f78ddc04ce66341e5056df8c3aa21e3cf2c530a1f3236461bb502b91842089b49bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTIDRfAAoJELp701BxlEWfKcsQAMcfdkAQ7K6Zyr0tItGeZooU
-Y1l+jIIXmnWXzBTmNHN5zR94zmfWPvXKO6E11UJvx9oYp7t38IlWyc7WnXwmc+DE
-L7/S8lC82vt35nZTRSgCV2amSVsDkQ6RvUsbt/WQ6Vfv3RS6Llba0mNLT14yg+Zn
-5XQyite2TqWD00qyGnyiKtN7SQ/TN34u0fcR3VBEcBCkHJbRkfn6dr8L6600ZUMq
-b4EHioMkIjrfOc9ldqyfUUXDfgNmLbIfEQqKAcAidaMfY0t7sS4HeYgY1htNjsmR
-1gDy/dgIOxxb7fEvMqHE/FRulgvXptXgqKiPwgq/5AaHg6MEcsuWjz35wPy6i77h
-Z+fb4UmT2QtGXdJlM4FCIhqwxRRrOATYBiIbbQIFC++wyf3WcMsJ6ovv2HPALmgZ
-l/9ehFDAMvBtMqtvbx3Sl4KuyljC4ZlYzGPRmUT03uwsUAPLJ2np76sM170yHGYy
-ltl+BEJ0x6oNKTs8XtyA593ZN7PSrAXMvwu+nJZPmcKF8k3HQOlmxiJJFkx/XPY3
-HWjchwXBTlQB+db4SajbW68IHRYf2BmiTW2sU9lWiiAyIyhu4C3Rggw7eeVC0sTf
-RtFbceLz1C4ZglQ/xliQ5yB/jkHl8NelwnY2ztiEKhFGEsxFm1eGg9e0FiRL5LH6
-p1Ck/1KlhLQcPEtNzPb/
-=bf1n
+iQIcBAEBCgAGBQJTdsi0AAoJEKXdFCfdEflKPBEP/1VrGg5aR54OuvSLadTGTz7n
+BvxZUVA4j5rwaz+sdg4XYGg9u9K6Uko8CHhx8xDX/2Aep1LGXmRb/FtQVx/NafPa
+r5fwJl+BxRfUcxQ0URhy3GMgqoKES+dv+DKr0MAyEV9kHpAnP0yFpQmx7Klu5qxr
+li3XJQqK8ErQCnPjHeCZ+5ISSQGwzIQzbh+/4ngw+ZH8ZW9Q3XUtLCS/JWaEO7Xi
+v6p08h4ozAkNNL2F18veD8YiX45CSrC2156eYqm/ayjEk3SQnumlSrnGpnSfGzU3
+xhaIalK+5I32aw+8sWU7PJTFEX3m3k53i/pZV6MIddRU6ps4SXOuVencqq1Wx7h7
+z7hgAR56TxyzNrUl4NtYb0zbu9BcHiL+38zh4NrD7Jej8NtnS8/ChpnHVouOb1xn
+hADs031VAP2e5qGQMEYPqDdi7tUIij0btSLWI+WAHXWedm9K3SfskV4cx4qCr6PM
+xZl6JU7TfUEo8aP9cPdCaC64mVaRGEl6TYnsSQ95ex9C9KCXg3nwO/Gh5QCbraoC
+h2/H1q8Lkh3BT0BxxvXmzxTZ31nyB6iEY6XLO3ydmuC5Q1OYfHPU5kAUJBBDiisY
+1lAh1lcjutccbiocBsdv27YM2ziF2k4Rnlfd4nLfDHdFfs6p5LEvng/Ah7m6IP0I
+e29a4N8Bkh3QG2FBLyIz
+=GARA
 -----END PGP SIGNATURE-----
diff --git a/sys-power/powertop/powertop-2.6.ebuild b/sys-power/powertop/powertop-2.6.ebuild
new file mode 100644
index 000000000000..08e82cfbd41c
--- /dev/null
+++ b/sys-power/powertop/powertop-2.6.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-2.6.ebuild,v 1.1 2014/05/17 02:23:35 zerochaos Exp $
+
+EAPI="5"
+
+inherit eutils linux-info autotools
+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/sites/default/files/downloads/${PN}/${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/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="unicode X"
+
+COMMON_DEPEND="
+	dev-libs/libnl:3
+	sys-apps/pciutils
+	sys-libs/ncurses[unicode?]
+"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	X? ( x11-apps/xset )
+	virtual/libintl
+"
+
+DOCS=( TODO README )
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	CONFIG_CHECK="
+		~X86_MSR
+		~DEBUG_FS
+		~PERF_EVENTS
+		~TRACEPOINTS
+		~NO_HZ
+		~HIGH_RES_TIMERS
+		~HPET_TIMER
+		~CPU_FREQ_STAT
+		~CPU_FREQ_GOV_ONDEMAND
+		~PM_RUNTIME
+		~FTRACE
+		~BLK_DEV_IO_TRACE
+		~TIMER_STATS
+		~TRACING
+	"
+	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_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_TRACING="TRACING should be enabled in the kernel for full powertop function"
+	linux-info_pkg_setup
+	if linux_config_exists; then
+		if kernel_is -lt 3 7 0; then
+			if linux_chkconfig_present SND_HDA_INTEL; then
+				CONFIG_CHECK="~SND_HDA_POWER_SAVE"
+				ERROR_KERNEL_SND_HDA_POWER_SAVE="SND_HDA_POWER_SAVE should be enabled in the kernel for full powertop function"
+				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
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/powertop-2.4-tinfo.patch
+	eautoreconf
+}
+
+src_configure() {
+	export ac_cv_search_delwin=$(usex unicode -lncursesw -lncurses)
+	default
+}
diff --git a/sys-power/powertop/powertop-9999.ebuild b/sys-power/powertop/powertop-9999.ebuild
index da01792c6ac9..fc1b32d30608 100644
--- a/sys-power/powertop/powertop-9999.ebuild
+++ b/sys-power/powertop/powertop-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.26 2013/10/03 19:51:51 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-9999.ebuild,v 1.27 2014/05/17 02:23:35 zerochaos Exp $
 
 EAPI="5"
 
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2 autotools
 	SRC_URI=""
 else
-	SRC_URI="https://01.org/powertop/sites/default/files/downloads/${P}.tar.gz"
+	SRC_URI="https://01.org/sites/default/files/downloads/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
@@ -96,8 +96,3 @@ src_configure() {
 	export ac_cv_search_delwin=$(usex unicode -lncursesw -lncurses)
 	default
 }
-
-src_install() {
-	default
-	keepdir /var/cache/powertop
-}