my attempt to clarify kconfig requirements, and adjust SND_HDA stuff based on complain in bug 434824

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

3 files changed, 44 insertions, 20 deletions

diff --git a/sys-power/powertop/ChangeLog b/sys-power/powertop/ChangeLog
index cdebf934cc84..595aff631754 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.64 2012/09/14 14:24:15 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.65 2012/09/14 18:07:07 zerochaos Exp $
+
+  14 Sep 2012; Rick Farina <zerochaos@gentoo.org> powertop-2.1-r1.ebuild:
+  my attempt to clarify kconfig requirements, and adjust SND_HDA stuff based on
+  complain in bug 434824
 
   14 Sep 2012; Rick Farina <zerochaos@gentoo.org> powertop-2.1-r1.ebuild:
   make kconfig checks non-fatal to accomodate builders who don't use powertop
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index 8bd527c89a7c..ce288b5db148 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 1733 SHA256 db288f88e776da6878eea2520e8d470fce0ff4a2af29b29ebf64dcc11c23a35b SHA512 fab746e6b1c029ce1918bfed507239151ef6cde64cb63d92641366e373b62323aff265b19b0cf9d729b4130426a63bc6874298115baf8b33d36850e81d99cfb0 WHIRLPOOL c06093ed8a5e3d21bc45bf917042ae097db21d6cd880c4d91345a8aef441bfcde74797d3f3d5a136c779d34c0ca79f0ddf79abc52d3495f81a1f143c39f28254
+EBUILD powertop-2.1-r1.ebuild 3575 SHA256 fb8f2ff7d0cab5e26f16f278832b83105619986c28cfad04c5ced2f0beaf2202 SHA512 f09a5d505cf338ecc239a284dd2326922fa66fe1679ff6c53908f2a472777db18e894d4ee58b65cf0d25ec4941908e531bb300148f1a52e780d16c349932925a WHIRLPOOL 3e51709704618e5d9756474827e903da632fb0d4b8201f5d3c9a18f2249aa78f07a760e34d43fbd0406f5e5b3ec9b8da80235fc9037075bebbd992e60cf50bfa
 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 9380 SHA256 fce55a6e7c2f7bdf39b2f8901a1c6d3750e4695e1036ca1e1a317e225c394b4c SHA512 bfa3a17464ca47d2249d887c80b478b02174ca4d344ef2977126c3850006bc118f50a2f01016f5eb18ce681e08c5aa684570cb96e6a2bd88e6e6c3fd40a5fe44 WHIRLPOOL 9db6ab957125ec14d7941cd6b2ffd8c89db716198c89b30c14464627d18d2a612472e3c866c820a537cd7a9261e6f2e8e5dc9f05f27e77605ed90584e6ff8286
+MISC ChangeLog 9560 SHA256 a82f2720870fbcd45fa02af747f4b6525332267b883af669202c30997d8c144c SHA512 2f5b87ee7a3bebc4c5cf788e6d821ff212e17050493e70ac239fdf0173d1c85499dceb6c48b7aab57beafd1b11ced1e77b25aa69129e9b7b1eaabc87413f1f17 WHIRLPOOL 3be9d5021525fc3edc60f08a412eb039bdad18619a93f0e77b6302bc56e88408349065e71cc53d8b3a58e7bf5c8530f34b88619c939864bda07fad55e7384ce3
 MISC metadata.xml 261 SHA256 4ffd266d42190f1f60b017cc02a7ee055dd4f0ab4c37c5414646e7e611b92ae3 SHA512 7fa0076e4992194802f5fb093b4e43f7a4f268278c665f8e701cb259cecdb8d916c62c9161f6b360116fde5da208c25bf6fb0f7b526ebfa463b515e4363bffa1 WHIRLPOOL f765d033e0bc9c652823d60e1786712de559641c28067e69741bb0c64091b3334be75a6e81457762b3148457452b1214760a99b10d15c79b951511da5ac07c53
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJQUz4bAAoJEKXdFCfdEflKCGcP/0aWYeHVc9gF9Wt+s8jXig0L
-xtPr9+fvYdxh/lVH0y4Bh0yUOE3M06OTLCypSqyP9Uc6s7BTSL03uT3L2aEJ+rBv
-n7eVSKXGGsjqWinhUhGblBXL/5qaxskDzAma9lruKxadF8i37s+6yZIOmmmO3uvE
-/Fd+2HWQQWqC+gg/lEEpozzB3zrr7fYnQTCzs/GLBmXCjIScGMOTH/CaZu13O3EY
-flkUj6OVwHkFRa2mT0WQ77ETZEPLriXD6VeYWwYmmcQGVsaLsNcCE36S1jukT+ea
-GE0V4NzG6gRsStjqO5Ey4kMivV5Mkp1rFV6X/cxdEBK4oqK+c75vN0E9l9CJLPeB
-POhI+nu0qj6BKZCn1ZVM9SlTpmDm9bpP3LfBjrn93Emf9btvn09HavT0F4NIh6xj
-gnYZDFJBNNYuPOjOnGsv+Cz2w3J/m57X/RApb1YbVCDWIM9Vy6ZBMi1HVXmeyWE+
-aZf8NjB90Boe5bu9GpoZ/wdeaVgI+dxaFDTOhkfXPK25D6X0A4mJ5PNb6Ylpnin9
-FNQf3R9CHikS6hT6o9ekNo+nE9OD0Is/cbefXRbieN7INxrkzZVorn6rWAE/qHu6
-l28NLWxtqw2uD3nPuJbLR4jw73YYr68etZr0edNVkVApiZ21j2DMbsvbNPPE+BT1
-IrgFOn694GpnCKKn8E4N
-=AHKN
+iQIcBAEBCgAGBQJQU3JZAAoJEKXdFCfdEflKgIAQAITxM5et8YGTGs8Tt+zWVx+i
+xkTVNFBElM/udLkKfmtfPWvmfVcM54G447Ka4/Yr6B11PgGRuaFS1JyDRW6SgcFZ
+c313SSXqASOck9gRTqnSIEGdiIKNbyGyg9KiSUyf9EZop3/adhFPTfEym+T/G4P0
+kIzvO3pDpGzVhnkVtA1aPDqqHY55M7/WTLR7HGywTSsVxewT1FwUPjvtckpCakJM
++SyAlkjbBDjfu17BIen4F+xKeWz5Ez0jXpmrh1+AueL1qDcJ1AtlgZAB31ghO4Rs
+vMeZR6RH3lUI4H/EjcB5HY38780KZBUKQZlldifJ3lH8wsya8QbJ3m78nKSPY1Wd
+cz7IacFRQ2pR0EXqSh6aAKPhKw5cV9s8xVtoigZqXrbHN+kSfjBpy0klhe4aPISI
+FZi+5jy8yjkZNutvKtSDB93bz8oCrl2/sCaXWYoTv5Wub7aqOkhqr+vXRYaFvS5F
+dhd3/a5pBa/aNkmgd6XROZU64mdkzCOwece3glWJP21N96RyYBHDmWCtgTIS8IRn
+B+IWDqQK0TQzeKYmo6JdKPfRMWBa0M7mOUG9jXp0rP/gjctKZq58eG3nGGEHSbrw
+5k1mNZXogqTAkF3l46R2Lrb0c21fH7mZnO52dnrqugqth6KejXcWyPQef8T84fk9
+tEr6ncrYbl2ZS8wXmUD9
+=6ea+
 -----END PGP SIGNATURE-----
diff --git a/sys-power/powertop/powertop-2.1-r1.ebuild b/sys-power/powertop/powertop-2.1-r1.ebuild
index b9518d2e7b83..d8e32ff6bbfd 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.4 2012/09/14 14:24:15 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-2.1-r1.ebuild,v 1.5 2012/09/14 18:07:07 zerochaos Exp $
 
 EAPI="4"
 
@@ -40,7 +40,9 @@ DOCS=( TODO README )
 
 pkg_setup() {
 	einfo "Warning: enabling all suggested kconfig params may have performance impacts"
-	CONFIG_CHECK="
+	linux_config_exists
+	linux_chkconfig_present SND_HDA_INTEL && CONFIG_CHECK="~SND_HDA_POWER_SAVE"
+	CONFIG_CHECK+="
 		~X86_MSR
 		~DEBUG_FS
 		~PERF_EVENTS
@@ -52,12 +54,30 @@ pkg_setup() {
 		~CPU_FREQ_GOV_ONDEMAND
 		~SND_HDA_POWER_SAVE
 		~USB_SUSPEND
+		~FTRACE
+		~BLK_DEV_IO_TRACE
 		~TIMER_STATS
 		~EVENT_POWER_TRACING_DEPRECATED
 		~TRACING
 	"
-	ewarn "If you see any warning about missing kernel config options"
-	ewarn "your bug will most likely be ignored. Thanks in advance."
+	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"
+	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
 }