quiet a few useless warnings and fix live ebuild

Package-Manager: portage-2.1.11.17/cvs/Linux x86_64

4 files changed, 82 insertions, 39 deletions

diff --git a/sys-power/powertop/ChangeLog b/sys-power/powertop/ChangeLog
index 0c45bdaf91f8..e1996277e87c 100644
--- a/sys-power/powertop/ChangeLog
+++ b/sys-power/powertop/ChangeLog
@@ -1,6 +1,10 @@
 # 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.66 2012/09/17 05:14:49 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.67 2012/09/18 23:36:31 zerochaos Exp $
+
+  18 Sep 2012; Rick Farina <zerochaos@gentoo.org> powertop-2.1-r1.ebuild,
+  powertop-9999.ebuild:
+  quiet a few useless warnings and fix live ebuild
 
   17 Sep 2012; Rick Farina <zerochaos@gentoo.org> powertop-2.1-r1.ebuild:
   reorder a few things, hopefully this is safer and avoids env pollution
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index 1ea93e3084ec..884bb41a5db2 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -13,25 +13,25 @@ DIST powertop-2.1.tar.gz 960274 SHA256 3dd4816cca4167063b78d2d7772aff8dc58377d0e
 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 3553 SHA256 e2d5ac40f82d239ceb4a9519fa3097a74a70859f07262dde612c29133ed3e46d SHA512 bc4de5eebf81a7fdd020f08b8f9aa3608eca93f1c64719fd14e6525ae1e7ff902213f43770267a1fa7434db826fdf6b4af281401a488df01f2bc89ee7dc8f054 WHIRLPOOL b47cbce904069c977e324d0185280b4d6e40e83707e4b3eeca7cb957b18cffd128bf5105b7d7230e1b0f2ebbfbd16f62ec78daaef70ab8236fea6521f957d994
+EBUILD powertop-2.1-r1.ebuild 3313 SHA256 90626d617dc165778d2112fe201ab955642a4120cdf96ee1cbae15f188627b8c SHA512 39f8ed87d246f2bcc99ae193a55d74cdc9d4c3784d07cf458283776ffe30451fc9573cd9bc4f00276300df5512ccc9c4a8100efab28223cd328e2bcbd79bf20c WHIRLPOOL 572049d68e12d8bb2c01345f166a705b1c8d985e6581e87effeabe8286e6050089d4ca8c68adba22a266535e176cebac61457581df41d52f6aa28c13adde6648
 EBUILD powertop-2.1.ebuild 1382 SHA256 1fd1be405ed17d56a51908673fc9822cf47da62ef404f9e7812aae8a76afee48 SHA512 7be332a56b7bf9ded309a87af6ea924efa5bac56cdd55bac26b7b4d88d36cc2e79b2ebf36a935fdaf60814be5c7cf96b653fc540fcfce27827e9fe8f90b642d6 WHIRLPOOL 4d02d000442929fde535676f29c23c1b34cef10235d9e593fadcc5f331018ef535c8eed63e62e5b0917702477da37889dd6d44fd32b78792d8e7d4495a6bc409
-EBUILD powertop-9999.ebuild 1196 SHA256 0fb0a70b93f3098caf350a4f9af1c82dcdb711e1fb9c1d1523a3c47910b9e1eb SHA512 5babc7b0de1837d57efb6e8d6055fdc090fcb75c57dfcb0439c48b6b9092b0109ac34596f0cc75cbd9392f60ae73ef27d6bac758f659205dac3116525325ef60 WHIRLPOOL 7521184b41474fc7032290aca98326f69b1ab2eccdaa7478c466ff1cd036cd3570b4aa1dd9ad1eaff301955641ae74fd64bf40331142b53303a7a20c694e72e7
-MISC ChangeLog 9708 SHA256 3cb85caa9ee0fe398391a9b7ed635884ec7861f392ef4c0451bbf3b7b64b245d SHA512 8b09a999f88dc04dac117229861327a557131c68c2402056bbc120a7201e5d17e1bae0c10b511b85cb6ca0ed4f684d7bf5961007707507caa0be53557e0f6daa WHIRLPOOL 05630f28578b50ddeaacfb906b21e2ecc88cb6f3225d6dee4a47b570781adcd02648880fc3ead826a4626d6cf3db035183c4abcd8b0a5d84ed13f7171dcace19
+EBUILD powertop-9999.ebuild 3276 SHA256 860e2664e7e0997e78acec527adbd63757bf95e98baba441d5ed2acbbf3571bd SHA512 ee9cce5430576c75710217cd684186ded1df7b23a058ff2e2a3d75062492afe78029e3b6e37b8a8042a5c2242de47d4992c181c5b1528cc0a39691dd1b9e4e80 WHIRLPOOL 6e95403adb811736e271931d6bf5d52eb7617be9213637b110260b4157f85a48cbc079f205459e32bbae6ad320d20fcd3946b3d40f3fdff1723a3879ed4a74cf
+MISC ChangeLog 9858 SHA256 f924f090229c515b54e00b2ce7655614bd0a0e647862e6145332b5a5ab8ac040 SHA512 6d79d3cb539a222fd949fe7104e1af4a0a67247fdffd9609d645a7c5b1dc6127292f05fe82c1785d20a910a66e331cc956241da0c9473b46f9e53b559ca41f5f WHIRLPOOL e71a65f046ed7dd7ae3ecdb7176a8cfe9ca32fd0781ebd9087d7a9db8ffa225118a8bf712d98eecf6beed4f77c85bffbe844aa0ffac0f56a79d0d64bffd4ac13
 MISC metadata.xml 261 SHA256 4ffd266d42190f1f60b017cc02a7ee055dd4f0ab4c37c5414646e7e611b92ae3 SHA512 7fa0076e4992194802f5fb093b4e43f7a4f268278c665f8e701cb259cecdb8d916c62c9161f6b360116fde5da208c25bf6fb0f7b526ebfa463b515e4363bffa1 WHIRLPOOL f765d033e0bc9c652823d60e1786712de559641c28067e69741bb0c64091b3334be75a6e81457762b3148457452b1214760a99b10d15c79b951511da5ac07c53
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJQVrHkAAoJEKXdFCfdEflK9/gP/0SMab04bnIeS8v4LFE5dvY8
-SsfT5zI2zScpZJOgCZ4H6lm+VWCDgm8ATbfsp62BGSW0TpiSaRGYQ3ygcqyeSyTh
-+Cw5FPPZ9SM9mH5nFQJeZakGFYHFx8NBRoymKarctR/CIvp5EQVtNdz1DnJw/mPQ
-WET+/X9lrtz1CnjOR8cdMAMc+AawITE2zd0gGVPr2+DtxQDQDD5v+Z/C/7+Xtcv8
-N6/l8vp2TiC9RtUe2HXXA38VHFRpyT2HhLN+PMiOypNl+K0NbfNxemdhefoejEY0
-1zscr9OZ6ncolbtmZr8K08pGiiXPxD4QPwqYqpUAgrEt1DviYpJuSVtZA+vAU2o2
-Y2WlGmz0Feh1cN5psc10Et2AfJyHySenqrTufb91KGXjJvwR8NZ/I+xMeQAiXXWm
-PMRarCCt6ttPWB/I/c2TuVEniX7iBhlKaeGJhCpP8lIpV1wstUfEpWqc/zeT9RGi
-GdPoUtbTJU8XlBu4WeHCRnkIfcmbhPlNitae0YB4qD/ruHtJ3gd5tCjbwY8YJrkQ
-8rUJiz+w5Cnvk4/QbLyDVRVwiN+IlTkoXg/ZLQPeK9uu6zEvtHUgRoBnUl6/L2DB
-i/pq079QZhzKMzMdwmgGxXEndXglyN8kCM8wLllSJBMW1nlbAzfla9tnNf1iNah/
-eb7lwxLFL/XcQyFuWEns
-=RTUS
+iQIcBAEBCgAGBQJQWQWdAAoJEKXdFCfdEflKSoYQAIJJQAk4DUwYy/1DqSWnM0CX
+7RW+s9dO3uXpxTYpiXMXccE4msbilDsPq/gksNQ2fj3YEZ1VPOUFwkmyufXNtjDY
+e9AsZYGrwxkDi3cB1pUXG2eegVKUAV+N3OiYI+BjLRYbwxQZrj26EjIACnxDoG3K
+YQmkRuLQpXMIsO22bXNGncV1Eu9JvA6B3A6WYYhT+IKa4YJGCifC1LhuBVNmoqNU
+4GMy4nn46FkANK5QYTljdozwUQsy3hiwy0Zugw9v2wGaC7sR0+/z4mV0eenC68U3
+UurXFOV2xY82DOZyya+zPm7K7O45bJ9BEAk4aY/6lMww+KgeZK65eIZiurU5+rkg
+j45Bl2k79G0JzbmPU5wuYiCQozD3yULlDdLFsNoQnu3flHV8HKWoALHfZje0QOPC
+AJEBU79Zk5UrImOTK6qZTKyTBCaJhfhkyy252JLTHrdAKEwyDH8c1xaUUFt2Eqsq
+FBGpmA7U48cwi9j23oAcTE+zxz0tp4nhju+XWMU4AdKAWq8rY5j3r13rjylE5Ur5
+hAl66rTMzWw3IVp6FpIzWIhjuicq+h2s1+HFk9b73mMQqIGeJASjk/zAMwhg7p+4
+eDZaqrTjMjMnBqg8uDhDD0yvF2STimZ4yGLlRm5Bn7h1CAfjFnxufkEkYaK3WY0m
+pwj818GyTAOssf4VaqJf
+=KIvE
 -----END PGP SIGNATURE-----
diff --git a/sys-power/powertop/powertop-2.1-r1.ebuild b/sys-power/powertop/powertop-2.1-r1.ebuild
index 28ff2f3b4c10..09941db161d7 100644
--- a/sys-power/powertop/powertop-2.1-r1.ebuild
+++ b/sys-power/powertop/powertop-2.1-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.1-r1.ebuild,v 1.6 2012/09/17 05:14:49 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-2.1-r1.ebuild,v 1.7 2012/09/18 23:36:31 zerochaos Exp $
 
 EAPI="4"
 
@@ -39,7 +39,6 @@ RDEPEND="
 DOCS=( TODO README )
 
 pkg_setup() {
-	einfo "Warning: enabling all suggested kconfig params may have performance impacts"
 	linux_config_exists
 	CONFIG_CHECK="
 		~X86_MSR
@@ -59,10 +58,8 @@ pkg_setup() {
 		~TRACING
 	"
 	linux_chkconfig_present SND_HDA_INTEL && CONFIG_CHECK+="~SND_HDA_POWER_SAVE"
-	einfo "Below are likely critical failures:"
 	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"
-	einfo "Below are warnings only, however bugs may be ignored if you don't enable full support in the kernel:"
 	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"
diff --git a/sys-power/powertop/powertop-9999.ebuild b/sys-power/powertop/powertop-9999.ebuild
index 0fba0114984a..214545827d10 100644
--- a/sys-power/powertop/powertop-9999.ebuild
+++ b/sys-power/powertop/powertop-9999.ebuild
@@ -1,16 +1,16 @@
 # 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.12 2012/06/01 17:42:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-9999.ebuild,v 1.13 2012/09/18 23:36:31 zerochaos Exp $
 
 EAPI="4"
 
-inherit eutils
+inherit eutils linux-info
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://github.com/fenrus75/powertop.git"
-	inherit git-2
+	inherit git-2 autotools
 	SRC_URI=""
 else
-	SRC_URI="https://01.org/powertop/sites/default/files/downloads/${P}.tar.bz2"
+	SRC_URI="https://01.org/powertop/sites/default/files/downloads/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
@@ -19,24 +19,73 @@ HOMEPAGE="https://01.org/powertop/ http://www.lesswatts.org/projects/powertop/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="unicode"
+IUSE="unicode X"
 
-DEPEND="
-	dev-libs/libnl
+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="
-	${DEPEND}
-	x11-apps/xset
+	${COMMON_DEPEND}
+	X? ( x11-apps/xset )
 "
 
 DOCS=( TODO README )
 
+pkg_setup() {
+	linux_config_exists
+	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
+	"
+	linux_chkconfig_present SND_HDA_INTEL && CONFIG_CHECK+="~SND_HDA_POWER_SAVE"
+	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"
+	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"
+	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
+}
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		eautoreconf
+	fi
+}
+
+
 src_configure() {
-	export ac_cv_search_delwin=$(usex unicode -lncursesw no)
+	export ac_cv_search_delwin=$(usex unicode -lncursesw -lncurses)
 	default
 }
 
@@ -44,10 +93,3 @@ 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
-}