SND_HDA_POWER_SAVE deprecated in kernel 3.7.0 so we conditionalize the check

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

4 files changed, 32 insertions, 14 deletions

diff --git a/sys-power/powertop/ChangeLog b/sys-power/powertop/ChangeLog
index ea2f1c91642f..87140e3c1a73 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.69 2012/11/18 11:44:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.70 2012/11/22 15:00:37 zerochaos Exp $
+
+  22 Nov 2012; Rick Farina <zerochaos@gentoo.org> powertop-2.1-r1.ebuild,
+  powertop-9999.ebuild:
+  SND_HDA_POWER_SAVE deprecated in kernel 3.7.0 so we conditionalize the check
 
   18 Nov 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop mobile herd as talked in gentoo-dev ML
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index e748703d0632..7228626d1292 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
@@ -13,15 +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 3503 SHA256 f96a592c7509c817c60782d005c26b57c211bf3a36ced7f22245981910dd061d SHA512 b67e8e5298a5400bc38be6ce2f57fd6a33d7f55f46a589aa916f9c041024f38bd8eb188bcddf21b99927c5f2aff6981d3c2a590a1a72e75d5444918c1ea1d006 WHIRLPOOL c09f3b6e8cebb1feb03f8b86e9fb09d69a2530dbad936d9611c75e9cbac9f60b6dd027fb98d5c4481282cbc0cf83feb1dac95a5ce7339c46561c8d0c0ec127ca
+EBUILD powertop-2.1-r1.ebuild 3541 SHA256 188e7d91e664413ed68cac99b4325a5d94af42c8ab9706ef25db0a47a33a900f SHA512 d333df3ec062749a1b34b6019c94da3e892854166061ce244c6a1b8c5f662ac3badac2bc38ba80e4ddd0ccda7522d9a05c6253f1a0911a8ceb8c368ac78626c3 WHIRLPOOL 18e6354409785505e670faf1a5fdbcaa99fa987885c6e710fc500f7191bb217514a1a57b61b63c9267f94003609441ebe6a5ba8ddd9713fb827b8fa50565ce97
 EBUILD powertop-2.1.ebuild 1382 SHA256 1fd1be405ed17d56a51908673fc9822cf47da62ef404f9e7812aae8a76afee48 SHA512 7be332a56b7bf9ded309a87af6ea924efa5bac56cdd55bac26b7b4d88d36cc2e79b2ebf36a935fdaf60814be5c7cf96b653fc540fcfce27827e9fe8f90b642d6 WHIRLPOOL 4d02d000442929fde535676f29c23c1b34cef10235d9e593fadcc5f331018ef535c8eed63e62e5b0917702477da37889dd6d44fd32b78792d8e7d4495a6bc409
-EBUILD powertop-9999.ebuild 3385 SHA256 8fba30345f2ecadee9483f9c2d3e741abf22368864cdb5879d7aaf690c5e4ec1 SHA512 72fd37accb3341304b6ee1c1e4c1addc160a96efa222a39a24be047a7c29f7526bdcd802573f46873453b2380ef21b5b17609d65837738e732642c52adb3e624 WHIRLPOOL d4c307bd640031822dc5e4993169cf824e8aba6aff5da80e30c16589fc725931f0f33e2b4c69cc47dc0d2c33f300e2f622030c6df6f6d78d47c07562c7049260
-MISC ChangeLog 10141 SHA256 5e2d90c1ec5785ade1cc8c824de930b35b42f2c8077d0bb6a39a8f8052809e9d SHA512 3416661024d41278cd042ea1c0717a607127d371e8f8c8b2459bc219399852f3976089a4bc8fa862abab75a8359279c1464499b20518da22d2438a1d3c244425 WHIRLPOOL f4ec61da813a85f300096e8e8682e49f49a42aba298288173f5294b527c0fd4d63bedee738bb98f4c6da2e4de4868e3d88bbaf15347b67f0c054e08092335786
+EBUILD powertop-9999.ebuild 3423 SHA256 daa3420ab6ef011b084486dd9e1ec6aea837b8ef9c5cd6c331d881ad4a30d1fc SHA512 e2075b5c8f8465c59fbeacf7517991c8ece4325ae7afbce9c612b992084d70a81d33d865e3145f5407239b4fbfbd8d583a94d5c21ba10d743cb0a6d4b6fc9df4 WHIRLPOOL d000d6c661171660a4bc9683b3a8db493d918bf500ffc0b39e914c6fceb6eef880fa4e4c76ca3a3902abf5b1e193020ad95c1ea766e4b1606b5499b20741ccbe
+MISC ChangeLog 10323 SHA256 831c9603f163b79df03424328045bdc94da51100ac8d18b59dd9deb3e189fc4b SHA512 8d830b2d0776e6abcd938d0be8f5aa32fdbfafba27b5bdaa7fbc47c54f030c02a1ece85a1808798768f56e3bc5af85814c180561f572faaf98e0160fd7e9b140 WHIRLPOOL 96207644fc23c30fd02b57b0c40dc971a331960a90d5225e331ff6eb12e66df90671b08cef832edbfddca01eb8d8f2a3b07496db48adf650a4cf4cbc9840ce1e
 MISC metadata.xml 239 SHA256 24d3268dbe675a5446456b139438c1bd59bd6190077399a4a715805ef28da3cc SHA512 2fa025f3394a125b4a92ee5fdb579bcfe74755f4e4306d90979bbb04c5239adfd2fdf9242ee7623642909597100ca88a6f6b7578a24512d976930fad186e10f9 WHIRLPOOL ab1b126e1a8170eba68412f8704d38ac7a479cb80a461cb2466ad87966ab8f78ddc04ce66341e5056df8c3aa21e3cf2c530a1f3236461bb502b91842089b49bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCoygoACgkQCaWpQKGI+9QUSACfRSo/6Il/L4IG/Af/mfEFwAQW
-PyQAn04WYTph8OPjZo9pIJSHFwPyIi1t
-=xuuS
+iQIcBAEBCgAGBQJQrj44AAoJEKXdFCfdEflKe7MP/A0jzAGQGCzbkA66HQqezthv
++COS2StoH52xO7/JXuHATUNu8wGwk56tXYZu+S57B5HhUPpNCg9pKi6IgJ+0S1cW
+uDwXocA3r0ltKXgZzW0sBm4O974Sbuvsl/oo6eu6moTJzMK/S6CQ/zdTKQomgYWL
+7bHLZ5WmbIy0jJ8s+rCT4kuyCj2diGg1WBFGYF3k89oXamnmxbLSfxUk5PMnJ9Xf
+dYHQi6wAO32FXkywhLHH4L9mCfqMPtZ+M9UfQTGZJwNIlG0rwCO2mriqtPVL7tx5
+5OLXgUrFG+03QkmLZme/NNDH9KodBOScHYT0b50d+fH3KMkAXKU9QBLQ91EAb2GO
+uCV8OxqY40JxAm6Gjd2DdXGtFbebrLnjJP7Vvmv3fK4d4JDJav4gq5yk2QP0YHfc
+e5GrSVXDomECEOAVh/diMcxIJOSx/zLgaZknta5DfcrtTjlO9dcGIJCDA7PEAwSm
+Gjp5LOLKb8l9ikIrWh3/MQvffGHdtuPkj+YIAW33YEzNmTCS3ID/QuPbiCO71jez
+sLYSs+2yysCNlAqY0OtzmHX/1OQQ2OqY37RpVOasbRb+QnuaLyNL+mPAM9j/CSdx
+l4v6IwIqwgyjkykt8+uGTy454oYOvu1UO5+zxidoqDEkyIBuVwN46i2fLBEj45p8
+vdD6Lu3ItX81Iz3sPP8k
+=ede2
 -----END PGP SIGNATURE-----
diff --git a/sys-power/powertop/powertop-2.1-r1.ebuild b/sys-power/powertop/powertop-2.1-r1.ebuild
index eef7d68a79cf..e51421791703 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.8 2012/09/20 03:26:51 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-2.1-r1.ebuild,v 1.9 2012/11/22 15:00:37 zerochaos Exp $
 
 EAPI="4"
 
@@ -57,7 +57,10 @@ pkg_setup() {
 			~EVENT_POWER_TRACING_DEPRECATED
 			~TRACING
 		"
-		linux_chkconfig_present SND_HDA_INTEL && CONFIG_CHECK+="~SND_HDA_POWER_SAVE"
+		if kernel_is -lt 3 7 0; then
+			linux_chkconfig_present SND_HDA_INTEL && CONFIG_CHECK+="~SND_HDA_POWER_SAVE"
+			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"
+		fi
 		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"
@@ -67,7 +70,6 @@ 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"
-		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"
diff --git a/sys-power/powertop/powertop-9999.ebuild b/sys-power/powertop/powertop-9999.ebuild
index 97e2a60b83e2..ba7570238b3e 100644
--- a/sys-power/powertop/powertop-9999.ebuild
+++ b/sys-power/powertop/powertop-9999.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-9999.ebuild,v 1.15 2012/09/20 03:26:51 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-9999.ebuild,v 1.16 2012/11/22 15:00:37 zerochaos Exp $
 
 EAPI="4"
 
@@ -57,7 +57,10 @@ pkg_setup() {
 			~EVENT_POWER_TRACING_DEPRECATED
 			~TRACING
 		"
-		linux_chkconfig_present SND_HDA_INTEL && CONFIG_CHECK+="~SND_HDA_POWER_SAVE"
+		if kernel_is -lt 3 7 0; then
+			linux_chkconfig_present SND_HDA_INTEL && CONFIG_CHECK+="~SND_HDA_POWER_SAVE"
+			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"
+		fi
 		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"
@@ -67,7 +70,6 @@ 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"
-		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"