Add wireless kernel compatibility, bug#511110, thanks to Stefan Huber

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

4 files changed, 57 insertions, 7 deletions

diff --git a/app-laptop/laptop-mode-tools/ChangeLog b/app-laptop/laptop-mode-tools/ChangeLog
index d7296eed02e2..7bc970948f9e 100644
--- a/app-laptop/laptop-mode-tools/ChangeLog
+++ b/app-laptop/laptop-mode-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-laptop/laptop-mode-tools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.89 2014/06/07 17:13:16 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.90 2014/06/11 22:29:13 alonbl Exp $
+
+*laptop-mode-tools-1.64-r2 (11 Jun 2014)
+
+  11 Jun 2014; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/laptop-mode-tools-1.64-wireless-sysfsattr.patch,
+  +laptop-mode-tools-1.64-r2.ebuild, -laptop-mode-tools-1.64-r1.ebuild:
+  Add wireless kernel compatibility, bug#511110, thanks to Stefan Huber
 
   07 Jun 2014; Alon Bar-Lev <alonbl@gentoo.org>
   laptop-mode-tools-1.64-r1.ebuild:
diff --git a/app-laptop/laptop-mode-tools/Manifest b/app-laptop/laptop-mode-tools/Manifest
index e411296485bf..59c327ecf93f 100644
--- a/app-laptop/laptop-mode-tools/Manifest
+++ b/app-laptop/laptop-mode-tools/Manifest
@@ -6,19 +6,20 @@ AUX laptop-mode-tools-1.63-killall.patch 1306 SHA256 5d72130167c5d2156e86ba34e5f
 AUX laptop-mode-tools-1.63-pcie-aspm-silencing-stderr.patch 1604 SHA256 a9d14760c0ee0bde93f04fb369da00c35ac61e04393f1697a9fb7bf7030dc818 SHA512 c1d6fefb486d9ceb47f19f1b173d76c2a7244f4ed6da2c3752b3a4cbd4064964c34365aa62f114efd21d572986551cb4f74c7990cf78bbb70d845f8e0c59a94c WHIRLPOOL d739756d45cac564237a544df19491df2cce4cc121e50407f703a8dc3c3845c96abdd41cd080edf23b9f988fc148297e2afcee7eaa5e42967afbb17e97995617
 AUX laptop-mode-tools-1.63-udevadm.patch 982 SHA256 1064eb82ca18cc5af894c95e93da9b26576d47c741b0c40b7c94de6c1f305566 SHA512 9864cefb6b56f1f08084e65925aa6932e3af0157de9013b812cbbea22715399089de7863e0a716500f7eb146e18452c81534de247836d2a366dee8a7418868ee WHIRLPOOL 357872197e92a0e5e62114ba0000dfc5a07e523401531d7bb311121fd6b667e27f37687bce250ab30951ffeb3f7275cd6baa632e6551c0562c7afec35c1b3bfe
 AUX laptop-mode-tools-1.64-ethernet-power.patch 3767 SHA256 7341a4e10d9aeb6e9c6e6120c8bdb9e8e0c050254ca7ae6c3d8e82c0f33bfb7f SHA512 a829026181c44646df3c6472fb5aa86117b1ab8226696d70a95fca1e10834477a9cff1798bfb3d7fa36232944d3bba556a7062ea5ac964751df15a52564de7f3 WHIRLPOOL e9aa7a5747b8eaac5347390f36f965c158ad6ead4642142fc651ecd328799be0ff9ab09235f31cf37ec63a4d448be09ce9168d20e3c6f484d8df0e91fea39a45
+AUX laptop-mode-tools-1.64-wireless-sysfsattr.patch 1921 SHA256 010e8f374475e617ce3344047fa0a3e336ee298126707d9661240e02ebf071cb SHA512 dad9b8617ff433f56aeb09ea385626d2b7dfdc3c41a4a02ea2a610963112688e7418ed07a632656e816b9d1f97d90cb4ee75f94376374f3ee27e9047b63f6aff WHIRLPOOL ffbe2f09f02de2e74ac4f06d63705b2c09695ec03785054236ff81d236c27741e04c6bfc8375b8b37cd47d20fcc8d1f36c655241af5b6cd2b33c0e4e8fcd24e4
 AUX laptop_mode.init-1.4 1190 SHA256 90a18e5c7e4d0b264bb51deb7b92ff25b508a3ddd75dd6c849fdc48c07ce4fda SHA512 47e67d54ed8005a864c017f4ef063c8a17286c6f8a260984fda96392e6461a3f0c5e4f17f8cf2272b072c1545b8f8e99fe45579a81b4d08a99e1eeb46f400fe5 WHIRLPOOL 7a87608d947be301400f2f1a0294a60f21e2cd1b6bed961788f7fc018bf4ac32d69a50e11e735db3cb6c000174ebd78e59f7ac0cd474bef3b803872b6a6665e5
 DIST laptop-mode-tools_1.63.tar.gz 107339 SHA256 04b9bf8cce4172a810ce4026e75e0e7bfd0e05e456bbf3f13b8e9b4178d2c65b SHA512 41e48483883556541e3c5882cff2b029395d1814902d979b36e3db66385dcb22821d99ab2d0720b24b48c23afe02c94692d6222afd268a38063a1bb2bfe4c87a WHIRLPOOL 4d2b26fbe66cfa706ad660800936f2d795e493234b9154e3267db81bd476e5cb0b2f9c528d0df895238ea1ce618e2a3d87739ec5ae5dec367a787feb9dcedf79
 DIST laptop-mode-tools_1.64.tar.gz 110165 SHA256 68b2016f51759285755a79a187a35466a4e46a7cfe4ef05bb1fcac7036c29605 SHA512 539388f5a86fc73a171aadafe8d3a04385cadedb41d3cb53822d4ad55b77262a82e717bfa910ec64c1ebba4d14cc02c9e1fab575c752ef8a77c2f67a023c8188 WHIRLPOOL 7201b1a69ea4265a1be9c659286a720cbfd66d840c43706a7f8099959b481fb1c018a2cb5f76c4bf7fdecbdcd3974da207e7af2b4439321b1961c87123a8900a
 EBUILD laptop-mode-tools-1.63-r2.ebuild 2788 SHA256 f2b49cf0080176987bbe5b265306f9994968adfc6c4b2ec24fcdbb0005ffc109 SHA512 aa0d3a793e08816673f6c4e26af47379a6c902467d24ba0c3c2e0aa0d4516ddc39bca465fa6ded954488bedfdeadc917b860147083484a00dfa1300b569bacc1 WHIRLPOOL d1e7321f2bf73723e8709afc333702307982aadb5ce7b7366fec42d89e2ecac1b00f93c56b42f93de18e3342fb8b3d2efa945319ce44ac6c39245acf1a0717bc
 EBUILD laptop-mode-tools-1.63-r3.ebuild 2870 SHA256 cc29d96a7aed7d7644ca5317e1ff1cff6781fdfbb542816d8523747b3c00bc95 SHA512 6e0813940319b3994b92888a5c05f3f311c41c2c0d3b1487d55aa5cace06da44d4cf7005ffd1dcd72bf538a0bd0a8d532dc8d7330b669d2e16272848aa1af34b WHIRLPOOL 73e2f61e719c2952c3b1178482781eb5d915b42f4ccafcc648f87ae0af3f9686064acac916556d166a6ef5e1d91e53aafc2b5fa8c34c64867662d053785dbd69
-EBUILD laptop-mode-tools-1.64-r1.ebuild 2776 SHA256 d070abba3a1843f95b7de959471ee45bd77e21a2566c409557b72df533b20369 SHA512 0ba48bca493d411646c5381b70847b1bbd72c17dba720e859b481ae1e499dda563760cd0e12be23927d0e76d0028977c071fc0fa6dfdd7ce560dc72f849725bc WHIRLPOOL 0f3cd6c218a74d03fe58e782cc4164a293c25ac7dcd88db66d4634c3d58fd19db9f68174602e9355e6c208d4bd1525b6988d33b0201c896375cb4d9f670aa12e
+EBUILD laptop-mode-tools-1.64-r2.ebuild 2828 SHA256 9b7fd786ce303d6af56fd782a506124cce34ae44adc84f10d5200c50c23c241e SHA512 4ea249b0af52a9a495c97f001e6b1c7117103fd72668aa8c223d6cf476fc84283844b6e3145fe77bcd67cec7912666f5762d849623e422200dccca4a5b012bb9 WHIRLPOOL 5b244373ede082c86cc873932c8568f2c3e0e914e1f7cbea9c8bce6ddf304a8c5bf715c3204950ef47c58b203a55c47130b798fd924876fe8916190b90d3b6ea
 EBUILD laptop-mode-tools-1.64.ebuild 2703 SHA256 3de5cc097c5c653bc2cb726ed078cdbad2045c210499bc6bb12fb84a43b8d0c1 SHA512 a76aa4f86249d68bc93ceed4c816c07364f42a6c9314069824c445154bd0e5286e73e3c0eeb6455592b4d3d301ccf038e7277c3925d793c122a20f1fd725b655 WHIRLPOOL bffe18815d0ecbdc551f3c20da4e3e9ac26c9c1f4db88e00999aa5367b36fee32f6f280589c89ef099d3c57bde9593cfb5258e33da1c808d1985f057c849d5fb
-MISC ChangeLog 17900 SHA256 2803f7f39894d4b1ad5d39b5b614528480e84afac28f7b138e011b9296ff23a8 SHA512 61c3dd42d08f3ea05c5d04b6b91d78fd7aed9251031b29faa93cf28d050ac14d80f80f1189701c07fc1dc1110b26b5ebf9a03735cfa03aaa9c14e4de1593b758 WHIRLPOOL e88feddefd97b7a95c5df9a2c486ed8ef4ed7c871decc9d4cbe8447b3179605a7570ae4cc3a6b2a832b12a1ee8a63ebe520d8d2e926d45a0ac3569245f37de3d
+MISC ChangeLog 18193 SHA256 46ca779d4a535fde25b1798f678ffc033f12e23cd786ec249f218de602c60fbc SHA512 8117487c0af87e282e6e6888316eb0ae05b50c0e962eb3fae65617fd6bbcc8def4bcb8a70fab7760ea97d30b9ac977e06949bdf05178f8adb81054ff63c10d0f WHIRLPOOL 412eb5437d70e710167c984e36516587dee9d17ebcc7500e4d6a7939f1f4e0a518c4047d45e18473edbcb89a442fe459e9b53b7484309297f804239d2fcb71ab
 MISC metadata.xml 420 SHA256 2008caffae78c8d0c6a04f0b4b4768d2a9d2b9f62d96409141cd2e579f622749 SHA512 5bd05a4b5ce71343b10a46b57cd73b071c399062bb9813bcb9d9e329e1a4804a6b1f5489e6004626a9daa84e9b0ca399b0209d844dd0adb0c185a18adc535946 WHIRLPOOL ea091eb7cc936602de9e1179231f9fd8bb78ab447abd72b505be870b79acf50056a4610a56c4ab7c1585957ee44d2f85d47248eeee47f10cf860b8ac6b8535b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlOTSDAACgkQXYk9GL8g3FHbFAD7Bmp/147j2XKfM+RaKu6JTCsU
-uXueS1IPmJd1BwUluO0A/343QoUmLsEmu8uG6pYjGuK6f730xD0Z/k0/OQEZngfm
-=1BTz
+iF4EAREIAAYFAlOY2D4ACgkQXYk9GL8g3FGg3gD/dRqx2nEa9bukqRQ8gPEMdL3T
+Gra+MImeUGKZEjS3mksA/RAAtOhjLciISIopa6aVpiyv4GiZ412e1xgn4em5uKm5
+=YkHc
 -----END PGP SIGNATURE-----
diff --git a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.64-wireless-sysfsattr.patch b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.64-wireless-sysfsattr.patch
new file mode 100644
index 000000000000..ba7b86251c16
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.64-wireless-sysfsattr.patch
@@ -0,0 +1,41 @@
+commit b340a340256c8fc97ec35a1df9e67ab033765480
+Author: Alon Bar-Lev <alon.barlev@gmail.com>
+Date:   Sat May 24 12:59:21 2014 +0300
+
+    wireless: support both sysfs attr enable/enabled
+    
+    backport of commit 8e8a88373079dffdf7196e2e622c5ade209b4439
+    
+    Starting with linux kernel 3.13, the sysfs attribute 'enable' for pci
+    devices was renambed to 'enabled'.
+    
+    Support the two notations to allow seamless migration.
+    
+    Signed-off-by: Stefan Huber <shuber@sthu.org>
+
+diff --git a/usr/share/laptop-mode-tools/modules/wireless-ipw-power b/usr/share/laptop-mode-tools/modules/wireless-ipw-power
+index 3fd93ec..1579c1f 100755
+--- a/usr/share/laptop-mode-tools/modules/wireless-ipw-power
++++ b/usr/share/laptop-mode-tools/modules/wireless-ipw-power
+@@ -71,7 +71,7 @@ if [ x$CONTROL_IPW_POWER = x1 ] || [ x$ENABLE_AUTO_MODULES = x1 -a x$CONTROL_IPW
+ 				# the driver.
+ 				LINK_TARGET=`readlink $DEVICE/device/driver`
+ 				LINK_TARGET=${LINK_TARGET##*/}
+-                                ENABLED=`cat $DEVICE/device/enable`
++				ENABLED=`[ -r $DEVICE/device/enabled ] && cat $DEVICE/device/enabled || cat $DEVICE/device/enable`
+ 
+ 				if [ $ENABLED -eq 1 -a "$LINK_TARGET" = "$1" ]; then
+ 					# add the interface name to the list
+diff --git a/usr/share/laptop-mode-tools/modules/wireless-iwl-power b/usr/share/laptop-mode-tools/modules/wireless-iwl-power
+index ffdedec..ce82e1d 100755
+--- a/usr/share/laptop-mode-tools/modules/wireless-iwl-power
++++ b/usr/share/laptop-mode-tools/modules/wireless-iwl-power
+@@ -24,7 +24,7 @@ findWifiIfsByDriver () {
+ 			# the driver.
+ 			LINK_TARGET=`readlink $DEVICE/device/driver`
+ 			LINK_TARGET=${LINK_TARGET##*/}
+-			ENABLED=`cat $DEVICE/device/enable` 
++			ENABLED=`[ -r $DEVICE/device/enabled ] && cat $DEVICE/device/enabled || cat $DEVICE/device/enable`
+ 			
+ 			if [ $ENABLED -eq 1 -a "$LINK_TARGET" = "$1" ] ; then
+ 				# add the interface name to the list
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.64-r1.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.64-r2.ebuild
index 40ab731ba3c3..58673eba981e 100644
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.64-r1.ebuild
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.64-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/laptop-mode-tools-1.64-r1.ebuild,v 1.3 2014/06/07 17:13:16 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/laptop-mode-tools-1.64-r2.ebuild,v 1.1 2014/06/11 22:29:13 alonbl Exp $
 
 EAPI=5
 inherit eutils multilib systemd udev
@@ -31,6 +31,7 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-ethernet-power.patch"
+	epatch "${FILESDIR}/${P}-wireless-sysfsattr.patch"
 
 	# This should avoid conflict with pm-powersave wrt #327443 and #396703
 	cat <<-EOF > "${T}"/${PN}