fix for bug #486124 thanks to Jeroen

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

5 files changed, 38 insertions, 10 deletions

diff --git a/sys-power/powertop/ChangeLog b/sys-power/powertop/ChangeLog
index 81a53ab31522..301121ca1eae 100644
--- a/sys-power/powertop/ChangeLog
+++ b/sys-power/powertop/ChangeLog
@@ -1,6 +1,10 @@
 # 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.92 2013/09/06 15:54:15 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.93 2013/10/03 04:44:26 zerochaos Exp $
+
+  03 Oct 2013; Rick Farina <zerochaos@gentoo.org>
+  +files/powertop-2.4-tinfo.patch, powertop-2.4.ebuild, powertop-9999.ebuild:
+  fix for bug #486124 thanks to Jeroen
 
   06 Sep 2013; Markus Meier <maekke@gentoo.org> powertop-2.4.ebuild:
   arm stable, bug #445214
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index b705af4c7cd9..7c4dfbb8f270 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
@@ -8,17 +8,28 @@ AUX powertop-1.98-build.patch 2266 SHA256 8b76948494deb0bece80e7300ec8f84c2fab7b
 AUX powertop-1.98-gcc-4.7.patch 3720 SHA256 44335480e32fbd591e5fe45cc8f47c45ad45fcf656f371b05e6d2751dd248549 SHA512 98b3f0155d517cadc27bd32e87777ef74278c38d019ffdfff00eb68174ba846ea1899b1bfbf4841a843114d0978dde8a880528c7ce8486cb1132d1d0b0f3ab6b WHIRLPOOL 4c45cdaf5098c2093df41eec6f4e719ffea490ca870e049c7715a78c37fe932250cb8ce73e0d1c98e3194f1e786174596c98a6b21dcf648de1ba4798686f224d
 AUX powertop-2.2-cpu-add-new-Intel-cpuid.patch 1308 SHA256 ac53965cebf261cea753e73a17f95478d39294847d92581fd10260a5cdcaae67 SHA512 5c36318d0ea7ebf166162957fb72e8b38e4e010e8029128a3f5e9bc789ee6efbf4b87b1a5a96fba2c675397e90c8c37333542c5cab4ea5077a3d26f8e6df0eaa WHIRLPOOL 8d76929edd03ceabff268e7d39584b1e68c6338e3f1452d4bfff0ee80d66df7e4f81084392a635077569c372e747827ae74f39dfc4cc4904b904a80d20b221aa
 AUX powertop-2.2-use-package_version.patch 740 SHA256 40258728ae75fb0ba425bd1295ce88784ca03bde59ef52aa114a2269020f1cd8 SHA512 196a866d13999103a6c0d7b5e1b03ce0a11ce1c3a7550346b45bcbb5597b1080b0b9fbd7b18b5d66e2b9d140d5e7ec460cd8be4749bc52c7b904287a0e621999 WHIRLPOOL 715823eb0e936764ebfc5ad6c4bbc7b818f54c310081dd3112da2640923046582b4eaec8b8c0f85891adcf147b04fb25150d1322099664b75a091f39b3c729b5
+AUX powertop-2.4-tinfo.patch 580 SHA256 fc1c7238d5c386c0f28ff003e998b6657826f8b354d051caa45ff52168d162cb SHA512 51a075ec585a8bc33a8e91f5b808e6f7f8fb63f1b77f879dee75811b61e78ee105887e3a02edcb2ff7cd624216b7139572c81cbe2b54d8e4b06946a730b53a5d WHIRLPOOL 4fbc00dc642376c237746194b5ad46540a12aa2831d342b4c76f030ad6042ffd48b14ccc30009765de4ca733fce3ba8b5bf1dfc3f3922827aeebb7934099422a
 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
 EBUILD powertop-1.13.ebuild 1158 SHA256 b996887bff17065a57aac201aac438a2c6310f5423109e4cb62de10c3e3dfdfd SHA512 c1ed8ee2fd7416138b9ab84072766071047e557ffc35fc57d32d8e4dc86f8986fa3a642f1875e2cf929eeabeb8a0b20025babc27808602b1123c970869c51146 WHIRLPOOL 570c6c80e97351859f9758b581a103a1a98d6c5ee58a63b4277431f21bcef9bed94ee35e3ed0193259a44978aa7aac717c597db4cba2aaa2d201ffe13998610f
-EBUILD powertop-2.4.ebuild 3362 SHA256 567c690b32fe412fb0e7b624d02c920e3eeacd6e48ed713e7807ac5be90beea1 SHA512 006a504aa96c83cb16ab8e71f67498fd9c5950fc1608738f03f6b4c9795a074478e8302a28c715d2d14aaa7be92261565993572e56aface2efca3f97cf54bb55 WHIRLPOOL a57dfc24e09ea6fd289180a70dbd3c600d82a6e6f18f8266c6eb1a60b5c3e558abcfc9c5506f329f7ef3daa3225fa826ea345d4d0fce4c4666124769dce6f2bc
-EBUILD powertop-9999.ebuild 3372 SHA256 4f4ad32a03ac8d91880d60bd155e7111df110caf4bcc4344505e8bdf4905e0ec SHA512 b64cbd085eb03fa7f0bdb3188d3d52cf6fa4dd5951057edded66fddb7268b17c7d0f75da51a9322af2e75d55d859c58e973024a63f444bffc70ae3549d323322 WHIRLPOOL 6de5df19399ff9e94d70ee184d0f2acdd1a2a2fa30ac90057b2dee80c47bab4355813b70c60285b11662e043d2c80fa78fb71de993ba0146b48dfc4c481739b4
-MISC ChangeLog 13548 SHA256 0f961841446fbc8c490af75bb3a0aa52490ef17a3cb4fd11c99332ddaee0fe19 SHA512 bef08ef9af6e275e9dd95b5fb9d4fb03223368fe83a10d1aaa554d5515105e72c34a3754376f1db7900c34fa2c3459940796f8e2359866bf6e494f97227b0df0 WHIRLPOOL 04d47de62653dbde7167a15d7c16d7bb5b1cc7456aeef7e43d08d147c589e2a246d509dbde0fd36fb2aea68314e6bb0de5fb01e9db7d96b2cc8f2c576c6051a5
+EBUILD powertop-2.4.ebuild 3412 SHA256 414dffe316e0dfd0ad8de5a131f3cbda959be105d23b7621669f7d33e5126a50 SHA512 d85406f73b6093abecf0648faa3765cab2289a5a0f48e89b805e9de057ec3a398bf1f0fe10ad27ceac93ff158a5922f510f5368acb2def1ddfc35152fcaf1cf2 WHIRLPOOL cbad3eab03e16055d243605263c2ae92d0bedea7068bc8d3ffdd1f3a8bd823f5aa5912946d89de3fda95afbc68f5cc6aad4b9a87db69d013670214eec8ed8e3b
+EBUILD powertop-9999.ebuild 3419 SHA256 fef1b207f8e11292194de6de4abf0ae2733765bbd0f1df9221ef69b55be8de61 SHA512 53e8e3c43514e42ef08a3c3ff4b3b497dda59740c54b8482854f676c1570335bd5251edda690216e8ed121fd86763d5846c612f36a6c6800d71acf0f7f7f99b2 WHIRLPOOL 59dcf4ecaf542b2c7d738e220ce622fb0a095861bb8bbf5b5eff3c66b2be3069ec4f3fefa325071395d85c79f1b63a52638bb4fe2dd145e1481bd46432b56fa9
+MISC ChangeLog 13719 SHA256 4e05ffb631d057fbee9d24cf0cc4fb1bf64a56059769b9329d40ce5076eecd95 SHA512 0dc75625046d43c701dc4eff33a1c0aa9c61ee009fbebf02554df4b60d91c009cd837e32c84396a7c740eb61fc70586b6a6748d5e29f0872bbd59b426c561230 WHIRLPOOL ae33bc9132a9dfbebe50f4a928022992026986f93cdea3a1b2ea05ff17692711da40ba276937cf4c0ebf6749030eed2239074454be968dee321d72406dcc95ff
 MISC metadata.xml 239 SHA256 24d3268dbe675a5446456b139438c1bd59bd6190077399a4a715805ef28da3cc SHA512 2fa025f3394a125b4a92ee5fdb579bcfe74755f4e4306d90979bbb04c5239adfd2fdf9242ee7623642909597100ca88a6f6b7578a24512d976930fad186e10f9 WHIRLPOOL ab1b126e1a8170eba68412f8704d38ac7a479cb80a461cb2466ad87966ab8f78ddc04ce66341e5056df8c3aa21e3cf2c530a1f3236461bb502b91842089b49bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIp/D4ACgkQkKaRLQcq0GLxcgCgtel+oxJhbxDmpOTmjQTVYeDG
-UEAAniugvKV+cIxuP0WCszw08s/n6T+S
-=40rd
+iQIcBAEBCgAGBQJSTPbCAAoJEKXdFCfdEflKTV8P/A/6sr5Tlvzl+rFAV2KESSdO
+3wR86VA89eQicVM3vvNtc7/xL09CLdx/XeryHr1fCNfegWL+BCVmY2bDDhr31tcZ
+qgmzmGSP5k/bSOiGr3yePA6QfLQutAlBuf2i3j0AQKBTiw9tNGsD711gciHMdDbt
+gUspm0haZRx3+MrEDaic8vedNMwjvSB33K2mZQEIMv9ZXJQQOOviT024WCNTehMV
+R2K3uiyghPAlhQocESzls7H62NkDVyG+yg5TCaYQX0T1ZNHf7urOVOBF1xzlfNqM
+hawx79BDVh64qXClFMYPVGLAIV+3ASyLE8Ami5HDVaFUQR4+YsioXBMT9tkpXcR6
+IPL1GW4B8fzypWrmZV8jg8n2P1vublguwzKHTPbrgtyldvn56CaSENIYm/ELDaNn
+WHad8xmMIJL4Tgw2dK6pK1XK9kilOoTCZ5lRWS+DA90R0klk5aM7LZDV8LvixSok
+lKypnb4fbW/1G+tAVfZz8yxXn3tkdDSORcVFX3AfFeBGV5R3Qjb4TP3T+94Wh0L2
+MgNO3J9Bz+FNVLTOEt5aF/eqCLQhzrkOffQdw6mQx4vl6ODag0T2tCPgHKverAJn
+jnWsxyNvQM4i3tEFLkeBICKZHeTRYPk14iAaVi+BiINc4s0mEvWNFIBJWQR2dTJv
+NjFOcG/4bwBhK92aISn/
+=gBOT
 -----END PGP SIGNATURE-----
diff --git a/sys-power/powertop/files/powertop-2.4-tinfo.patch b/sys-power/powertop/files/powertop-2.4-tinfo.patch
new file mode 100644
index 000000000000..b965d8e06a59
--- /dev/null
+++ b/sys-power/powertop/files/powertop-2.4-tinfo.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -46,7 +46,7 @@
+ AC_FUNC_STRTOD
+ AC_CHECK_FUNCS([fdatasync getpagesize gettimeofday memmove memset mkdir munmap pow realpath regcomp select setlocale socket sqrt strcasecmp strchr strdup strerror strncasecmp strstr strtoul strtoull])
+ 
+-AC_SEARCH_LIBS([delwin], [ncursesw ncurses], [], AC_MSG_ERROR([ncurses is required but was not found]), [])
++PKG_CHECK_MODULES(ncurses, ncurses, [LIBS="$LIBS $ncurses_LIBS"], AC_MSG_ERROR([ncurses is required but was not found]))
+ 
+ has_libpci=0
+ PKG_CHECK_MODULES([PCIUTILS], [libpci],[has_libpci=1],[
diff --git a/sys-power/powertop/powertop-2.4.ebuild b/sys-power/powertop/powertop-2.4.ebuild
index c95504709401..0cb035be9dc0 100644
--- a/sys-power/powertop/powertop-2.4.ebuild
+++ b/sys-power/powertop/powertop-2.4.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-2.4.ebuild,v 1.7 2013/09/06 15:54:15 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-2.4.ebuild,v 1.8 2013/10/03 04:44:26 zerochaos Exp $
 
 EAPI="5"
 
@@ -88,6 +88,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/powertop-2.4-tinfo.patch
 	if [[ ${PV} == "9999" ]] ; then
 		eautoreconf
 	fi
diff --git a/sys-power/powertop/powertop-9999.ebuild b/sys-power/powertop/powertop-9999.ebuild
index 972b7f61a9df..d7f50e7acf33 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.24 2013/09/03 18:22:31 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-9999.ebuild,v 1.25 2013/10/03 04:44:26 zerochaos Exp $
 
 EAPI="5"
 
@@ -88,6 +88,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/powertop-2.4-tinfo.patch
 	if [[ ${PV} == "9999" ]] ; then
 		eautoreconf
 	fi