Cleanup

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

11 files changed, 17 insertions, 570 deletions

diff --git a/app-laptop/laptop-mode-tools/ChangeLog b/app-laptop/laptop-mode-tools/ChangeLog
index b0e0676ce506..4dd991c56c67 100644
--- a/app-laptop/laptop-mode-tools/ChangeLog
+++ b/app-laptop/laptop-mode-tools/ChangeLog
@@ -1,6 +1,17 @@
 # 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.92 2014/07/14 15:01:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.93 2014/07/14 16:37:16 alonbl Exp $
+
+  14 Jul 2014; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/laptop-mode-tools-1.63-conf.patch,
+  -files/laptop-mode-tools-1.63-killall.patch,
+  -files/laptop-mode-tools-1.63-pcie-aspm-silencing-stderr.patch,
+  -files/laptop-mode-tools-1.63-udevadm.patch,
+  -files/laptop-mode-tools-1.64-ethernet-power.patch,
+  -files/laptop-mode-tools-1.64-wireless-sysfsattr.patch,
+  -laptop-mode-tools-1.63-r2.ebuild, -laptop-mode-tools-1.63-r3.ebuild,
+  -laptop-mode-tools-1.64-r2.ebuild:
+  Cleanup
 
   14 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
   laptop-mode-tools-1.64.ebuild:
diff --git a/app-laptop/laptop-mode-tools/Manifest b/app-laptop/laptop-mode-tools/Manifest
index caf3e3445901..906e56bd6bdb 100644
--- a/app-laptop/laptop-mode-tools/Manifest
+++ b/app-laptop/laptop-mode-tools/Manifest
@@ -1,31 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX laptop-mode-tools-1.63-conf.patch 897 SHA256 14015701ccb746cce4f58ba65b91991fc9618149cd5c799b4d4225e045ad0dfd SHA512 f30a85411bdf486337b08ebb3b945ec96b24e1f9c45a4b38d5cabf027813735fe2c281c1de52ecd23828dfb230cc74b3ca67ed1243a5ed3c34ebbf8ef3338662 WHIRLPOOL 4dbddba26d69900565891e74cb1768a4dda0c01c706144f31e0c028c7b86323a0952ffb2737d2afd25099a4cc9aaa8c264f46a5ac79fda29b377d76c476fac60
-AUX laptop-mode-tools-1.63-killall.patch 1306 SHA256 5d72130167c5d2156e86ba34e5faa2ac6f686d27406faa620175c5949ee092fb SHA512 4b2cf85d083e0afdf67221ef3d18f1e084456add387c4e3bdefc88ee26ec1b7fb648c52668798dc3765494c423809c2b421af5a966579bd722fc65a897ae63d8 WHIRLPOOL 3611c604c594d20611b8fac96f7907613101877dcb23e6e16b59b6864138b1b307970a1805b20486fccfea53fda869ff743bf9743ebb57e21b03d04562d3e27a
-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
 DIST laptop-mode-tools_1.65.tar.gz 111023 SHA256 b0a365758e7bc4f258e5af98bf16ad720cb4fdbd025760ceac994987babd446a SHA512 8d5c91631b783b6e3207bd5f8277d5d1b85e189b162ada8e4706555b8159e233e63dc1e3f92d12b38c101249114a7eb4f85b5370b2cd4a1a21773fdd34af3a33 WHIRLPOOL 680d54253c91fc2c3392930e7871dbccc470db4c45f96fae41877a22023edcf1ccdae15115f9658e3e20a4922fc99eee751b9bdd1f62caf8ce4f74068f83b65b
-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-r2.ebuild 2828 SHA256 9b7fd786ce303d6af56fd782a506124cce34ae44adc84f10d5200c50c23c241e SHA512 4ea249b0af52a9a495c97f001e6b1c7117103fd72668aa8c223d6cf476fc84283844b6e3145fe77bcd67cec7912666f5762d849623e422200dccca4a5b012bb9 WHIRLPOOL 5b244373ede082c86cc873932c8568f2c3e0e914e1f7cbea9c8bce6ddf304a8c5bf715c3204950ef47c58b203a55c47130b798fd924876fe8916190b90d3b6ea
 EBUILD laptop-mode-tools-1.64.ebuild 2705 SHA256 bc5db7a7d5aec75d95ea2e24cac3dd15cc584bdb81e1733499615a675a956e09 SHA512 4afbd81c18deef673f7c29be84cd4962e2d1ec220c4d3f2c89ed5dd773e785b4f7ba8457dde78a13380aedb8cb7b9e407babf6b72ff621972b5c6050d27f3122 WHIRLPOOL 085497d51dbda9599fbee90f96808d1394786a73e8e29c4dfefabc184c1d50cefa5b1705ee2690038fbd582ae3e70ca53baa5f0b6d6dff3637652e40d1b4374b
 EBUILD laptop-mode-tools-1.65.ebuild 2724 SHA256 838a0525e69e2cd92a055137cb204a925b599b31b3c88d3786586b2db9745b5c SHA512 9ef88f32059e393d11b7d6b571105b39bf0af652df5f6c134780e0da3e781f5f7251814e7418448bf74f3299c999b627ee6ccbe0c304cdeab91968f453acf9fd WHIRLPOOL 63eaa02ec2281436c1e1b82fa9e4a6ec3593632ffc88ea99b4a8392ec1844f1abb50375857daa935b66df2194d4fd6e006dc613b9b6179ecf42ec8e22ab3e60c
-MISC ChangeLog 18444 SHA256 80fbe0f523df95022291e094f02f18f2499301a12d4ee1218e7713c74b7a708b SHA512 6888d5a533263c7c750b115fccd923bc8806c8398867ab86d86725b162bcbaac5b33c4d67ff70584001ef99c4d1f3598c77bc2a599c231f4ed40f14776c44357 WHIRLPOOL fb37c5d87ad2721f752736ddc89a20ba2b91e74d352f7864aad655be0bcaa7938f68011278d3f6ff751992a96ab9da3581661fb035133c020a2df4532d3fbcf1
+MISC ChangeLog 18925 SHA256 f887fb46bfa8e752174f6b53dd9bb827d32c89b333d888ab685de7d405de29f9 SHA512 f82e0b07b910c9d063f339004598b84cf85c3032c235943355fb7867c0b970c4fc7dbf81d41dfa7bf7eca645cb2c4d29444563349c5b209c21bed3d10e190bfa WHIRLPOOL 55f354383096fa70d5f3d4dab7871da9cad318493ac9d719b31abd5d007fcc478262b84800f704e7072973331e3a0fbb7713f9311e57cdddd2b03de5cba1164b
 MISC metadata.xml 420 SHA256 2008caffae78c8d0c6a04f0b4b4768d2a9d2b9f62d96409141cd2e579f622749 SHA512 5bd05a4b5ce71343b10a46b57cd73b071c399062bb9813bcb9d9e329e1a4804a6b1f5489e6004626a9daa84e9b0ca399b0209d844dd0adb0c185a18adc535946 WHIRLPOOL ea091eb7cc936602de9e1179231f9fd8bb78ab447abd72b505be870b79acf50056a4610a56c4ab7c1585957ee44d2f85d47248eeee47f10cf860b8ac6b8535b4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTw+96AAoJEEdUh39IaPFNzBwH/A078wxpoUdN5b3mir3NihTG
-oj4leIxQEG53VClXM1B26ZMSEa2LRNwqWtgfheS2YTGtAY8l9ug0iPmublbOFuNB
-yYtc7SDoTMX9OjsLwaJxHy/HeuKj+8ZwD2o6nTd8PpbQlQ3vQAAxduynDza+Prm2
-9ti07bO/C9W36ajjwBvrrbpGROLLo3yjLca8MWcGWFyqOexV92oUxLfTEr626Enr
-4frC3uABF0atK6iGDo/BacslAwzvvAwqnLapNXYuiZa1WBS0wTAzE1zHaMxnm2zU
-7azsFiGsWm5wnaZzVv8TUTxwQs3DwGLsNsLI4L7qH99ThJg6a4MM0fqfSZiDr/Q=
-=9hFD
+iF0EAREIAAYFAlPEB08ACgkQXYk9GL8g3FHwZgD/S4tjkBoW0lNuqn9L2+Qp1q+q
+chafZZYt5wVhmgQv7gMA9RHVTpcq4kmGwBbT5PwWEZ1kES/doPHexEbsFdlMHCI=
+=G5Ga
 -----END PGP SIGNATURE-----
diff --git a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-conf.patch b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-conf.patch
deleted file mode 100644
index 67002b91437a..000000000000
--- a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-conf.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6f81613ebd2ef7eba88ea2edd596f9441be2c294 Mon Sep 17 00:00:00 2001
-From: Ritesh Raj Sarraf <rrs@debian.org>
-Date: Thu, 13 Jun 2013 12:18:45 +0530
-Subject: [PATCH] Honor .conf files only
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Thanks: Sven Köhler
----
- usr/sbin/laptop_mode | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/usr/sbin/laptop_mode b/usr/sbin/laptop_mode
-index 71beab2..070f1de 100755
---- a/usr/sbin/laptop_mode
-+++ b/usr/sbin/laptop_mode
-@@ -234,7 +234,7 @@ lmt_load_config ()
-     test -d /etc/laptop-mode/conf.d/board-specific && CONF_DIR="$CONF_DIR /etc/laptop-mode/conf.d/board-specific"
- 
-     for PER_DIR in $CONF_DIR; do
--	    for CONF in $PER_DIR/*; do
-+	    for CONF in $PER_DIR/*.conf; do
- 		    if [ -r "$CONF" ] ; then
- 			    . "$CONF"
- 			    #Handle individual module debug settings
--- 
-1.8.1.6
-
diff --git a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-killall.patch b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-killall.patch
deleted file mode 100644
index 0dfdfc981a9b..000000000000
--- a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-killall.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From a68a8d051b476ceae87e0490001b7c60ac5ea942 Mon Sep 17 00:00:00 2001
-From: Ritesh Raj Sarraf <rrs@debian.org>
-Date: Wed, 17 Apr 2013 12:11:01 +0530
-Subject: [PATCH] Don't call killall with the -g argument.
-
-It kills the entire group of processes
-https://bugs.gentoo.org/show_bug.cgi?id=463944
-
-Thanks: Murray Campbell
----
- usr/sbin/laptop_mode | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/usr/sbin/laptop_mode b/usr/sbin/laptop_mode
-index 74a129c..cfd99c1 100755
---- a/usr/sbin/laptop_mode
-+++ b/usr/sbin/laptop_mode
-@@ -1130,7 +1130,7 @@ if [ x$ENABLE_BATTERY_LEVEL_POLLING = x1 ] && [ x$BLACKLIST_IN_FLOCK = x1 ]; the
- 		log "VERBOSE" "On AC, stopping the polling daemon."
- 
- 		# In AC mode we disable the polling daemon.
--		killall -g -q lm-polling-daemon
-+		killall -q lm-polling-daemon
- 	elif [ x$ON_AC = x0 ]; then
- 		exec 7>$LMT_BATTPOLL_LOCK;
- 		if $FLOCK -n -x -w 1 7; then
-@@ -1149,7 +1149,7 @@ if [ x$ENABLE_BATTERY_LEVEL_POLLING = x1 ] && [ x$BLACKLIST_IN_FLOCK = x1 ]; the
- 		# should be killed.
- 		if [ x$INITSCRIPT_STOP = x1 ]; then
- 			log "VERBOSE" "On Battery, but init script stop is called. Killing lm-polling-daemon"
--			killall -g -q lm-polling-daemon
-+			killall -q lm-polling-daemon
- 		fi
- 	else
- 		log "ERR" "Unknown ON_AC state: $ON_AC";
--- 
-1.8.1.6
-
diff --git a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-pcie-aspm-silencing-stderr.patch b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-pcie-aspm-silencing-stderr.patch
deleted file mode 100644
index 6d741738f1a1..000000000000
--- a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-pcie-aspm-silencing-stderr.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From f52e9afc8966d3804e6a432b0a98bfa2a758c416 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Manuel=20R=C3=BCger?= <mrueg@rueg.eu>
-Date: Thu, 28 Mar 2013 01:24:39 +0100
-Subject: [PATCH] pcie-aspm: Silencing stderr.
-
----
- usr/share/laptop-mode-tools/modules/pcie-aspm | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/usr/share/laptop-mode-tools/modules/pcie-aspm b/usr/share/laptop-mode-tools/modules/pcie-aspm
-index 1f6eec9..57fe31e 100755
---- a/usr/share/laptop-mode-tools/modules/pcie-aspm
-+++ b/usr/share/laptop-mode-tools/modules/pcie-aspm
-@@ -7,7 +7,7 @@ if [ x$CONTROL_PCIE_ASPM = x1 ] || [ x$ENABLE_AUTO_MODULES = x1 -a x$CONTROL_PCI
-     if [ $ON_AC -eq 1 ]; then
-         log "VERBOSE" "On AC power: setting pcie_aspm to default"
-         if [ -f /sys/module/pcie_aspm/parameters/policy ]; then
--            echo default > /sys/module/pcie_aspm/parameters/policy
-+            echo default > /sys/module/pcie_aspm/parameters/policy 2>/dev/null
-             if [ $? -eq 0 ]; then
-                 log "VERBOSE" "PCIe ASPM set to 'default'"
-             else
-@@ -19,7 +19,7 @@ if [ x$CONTROL_PCIE_ASPM = x1 ] || [ x$ENABLE_AUTO_MODULES = x1 -a x$CONTROL_PCI
-     else
-         log "VERBOSE" "On battery: setting pcie_aspm to powersave"
-         if [ -f /sys/module/pcie_aspm/parameters/policy ]; then
--            echo powersave > /sys/module/pcie_aspm/parameters/policy
-+            echo powersave > /sys/module/pcie_aspm/parameters/policy 2>/dev/null
-             if [ $? -eq 0 ]; then
-                 log "VERBOSE" "PCIe ASPM set to 'powersave'"
-             else
--- 
-1.8.1.5
-
diff --git a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-udevadm.patch b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-udevadm.patch
deleted file mode 100644
index 902d95284398..000000000000
--- a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-udevadm.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f52ccd0c2de1c2d22d8f351579cf2d89d8110933 Mon Sep 17 00:00:00 2001
-From: Alexander Mezin <mezin.alexander@gmail.com>
-Date: Wed, 24 Jul 2013 09:38:56 +0700
-Subject: [PATCH] Replace hardcoded path to udevadm with "which udevadm"
-
----
- usr/share/laptop-mode-tools/modules/hdparm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/usr/share/laptop-mode-tools/modules/hdparm b/usr/share/laptop-mode-tools/modules/hdparm
-index 0115422..ac4f9c0 100755
---- a/usr/share/laptop-mode-tools/modules/hdparm
-+++ b/usr/share/laptop-mode-tools/modules/hdparm
-@@ -41,7 +41,7 @@ is_capable() {
- 	# It assumes more or less recent udev (> 070)
- 	if [ $HAVE_UDEVINFO -ne 0 ] ; then
- 		log "VERBOSE" "Querying $1 media type using udevinfo: "
--		if [ -x /sbin/udevadm ]; then
-+		if [ -x "$(which udevadm 2> /dev/null)" ]; then
- 			eval "$(udevadm info -q env -n $1 | egrep '(ID_TYPE=|ID_BUS=)' )"
- 		else
- 			eval "$(udevinfo -q env -n $1 | egrep '(ID_TYPE=|ID_BUS=)' )"
--- 
-1.8.1.6
-
diff --git a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.64-ethernet-power.patch b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.64-ethernet-power.patch
deleted file mode 100644
index 315f10982f88..000000000000
--- a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.64-ethernet-power.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From c55b44f656c88aa1ef7307664f7040407d23e0de Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 27 May 2014 19:35:11 +0300
-Subject: [PATCH] ethernet: replace sysfs/enabled by 'ip link down'
-
-backport of 8fff5eb2bfdde0
----
- usr/share/laptop-mode-tools/modules/ethernet | 59 +++++++++++-----------------
- 1 file changed, 22 insertions(+), 37 deletions(-)
-
-diff --git a/usr/share/laptop-mode-tools/modules/ethernet b/usr/share/laptop-mode-tools/modules/ethernet
-index 6fd06e2..0c922e2 100755
---- a/usr/share/laptop-mode-tools/modules/ethernet
-+++ b/usr/share/laptop-mode-tools/modules/ethernet
-@@ -24,6 +24,13 @@ if [ x$CONTROL_ETHERNET = x1 ] || [ x$ENABLE_AUTO_MODULES = x1 -a x$CONTROL_ETHE
- 		MIITOOL=/bin/false
- 	fi
- 
-+	if [ -x /bin/ip ]; then
-+		IPTOOL=/bin/ip
-+	else
-+		log "VERBOSE" "ip is not installed"
-+		IPTOOL=/bin/false
-+	fi
-+
- 
- 	if [ $ON_AC -eq 1 ]; then
- 		if [ "$ACTIVATE" -eq 1 ]; then
-@@ -52,43 +59,7 @@ if [ x$CONTROL_ETHERNET = x1 ] || [ x$ENABLE_AUTO_MODULES = x1 -a x$CONTROL_ETHE
- 	fi
- 	
- 	for DEVICE in $ETHERNET_DEVICES ; do
--                DISABLED=0
--                path=`readlink -f /sys/class/net/$DEVICE`
--		dev_path=""
--                log "VERBOSE" "ethernet: $path"
--                if ! [ -z $path ]; then
--                        if [ -d $path/device ]; then
--                          dev_path=`readlink -f $path/device`
--                          log "VERBOSE" "ethernet: $dev_path"
--                        fi
--                fi
--
--                if ! [ -z $dev_path ] && [ -f $dev_path/enable ]; then
--                        if [ x$DISABLE_ETHERNET = x1 ]; then
--                                if [ -f $dev_path/enable ]; then
--                                        echo 0 > $dev_path/enable
--                                        log "VERBOSE" "ethernet: Disabling ethernet device $DEVICE"
--                                        DISABLED=1
--                                fi
--                        elif [ x$DISABLE_ETHERNET = x0 ]; then
--                                if [ -f $dev_path/enable ]; then
--                                        echo 1 > $dev_path/enable
--                                        log "VERBOSE" "ethernet: Re-enabling ethernet device $DEVICE"
--                                        DISABLED=0
--                                fi
--                        elif [ x$DISABLE_ETHERNET = x2 ]; then
--                                DISABLED=0 # Be safe. :-)
--                        else
--                                DISABLED=0 # Same here. Be safe. :-)
--                                           # For all other cases also, just disable it.
--                        fi
--                else
--                        log "VERBOSE" "$DEVICE does not seem to be supporting enable/disable"
--                fi
--
--               if [ x$DISABLED = x1 ]; then
--                       continue
--               fi
-+		log "VERBOSE" "ethernet: $DEVICE"
- 
- 		# Wakeup-on-LAN handling
- 		if [ x$DISABLE_WAKEUP_ON_LAN = x1 ] ; then
-@@ -152,6 +123,20 @@ if [ x$CONTROL_ETHERNET = x1 ] || [ x$ENABLE_AUTO_MODULES = x1 -a x$CONTROL_ETHE
- 				log "VERBOSE" "Could not restore speed for $DEVICE"
- 			fi
- 		fi
-+
-+		# Shut down interface
-+		if [ x$DISABLE_ETHERNET = x1 ]; then
-+			if $IPTOOL link show $DEVICE | grep -q NO-CARRIER; then
-+				log "VERBOSE" "ethernet: Disabling ethernet device $DEVICE"
-+				$IPTOOL link set dev $DEVICE down
-+			else
-+				log "VERBOSE" "ethernet: Not disabling ethernet device $DEVICE with active carrier."
-+			fi
-+		elif [ x$DISABLE_ETHERNET = x0 ]; then
-+			$IPTOOL link set dev $DEVICE up
-+			log "VERBOSE" "ethernet: Re-enabling ethernet device $DEVICE"
-+		fi
-+
- 	done
- else
- 	log "VERBOSE" "Ethernet module is disabled."
--- 
-1.8.5.5
-
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
deleted file mode 100644
index ba7b86251c16..000000000000
--- a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.64-wireless-sysfsattr.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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.63-r2.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r2.ebuild
deleted file mode 100644
index 910852b6ec67..000000000000
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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.63-r2.ebuild,v 1.5 2014/05/27 18:48:57 alonbl Exp $
-
-EAPI=5
-inherit eutils multilib systemd udev
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Linux kernel laptop_mode user-space utilities"
-HOMEPAGE="http://www.samwel.tk/laptop_mode/"
-SRC_URI="http://www.samwel.tk/laptop_mode/tools/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="+acpi apm bluetooth scsi"
-
-RDEPEND="net-wireless/wireless-tools
-	sys-apps/ethtool
-	sys-apps/hdparm
-	acpi? ( sys-power/acpid )
-	apm? ( sys-apps/apmd )
-	bluetooth? ( net-wireless/bluez:= )
-	scsi? ( sys-apps/sdparm )"
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-pcie-aspm-silencing-stderr.patch"
-	epatch "${FILESDIR}/${P}-killall.patch"
-
-	# This should avoid conflict with pm-powersave wrt #327443 and #396703
-	cat <<-EOF > "${T}"/${PN}
-	HOOK_BLACKLIST="00powersave"
-	EOF
-}
-
-src_compile() { :; }
-
-src_install() {
-	DESTDIR="${D}" \
-		INIT_D="none" \
-		MAN_D="/usr/share/man" \
-		LIB_D="/usr/$(get_libdir)" \
-		UDEV_D="$(get_udevdir)" \
-		SYSTEMD_UNIT_D="$(systemd_get_unitdir)" \
-		TMPFILES_D="/usr/$(get_libdir)/tmpfiles.d" \
-		ACPI="$(use acpi && echo force || echo disabled)" \
-		PMU="$(false && echo force || echo disabled)" \
-		APM="$(use apm && echo force || echo disabled)" \
-		SYSTEMD=yes \
-		sh ./install.sh || die
-
-	dodoc Documentation/*.txt README
-	newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
-
-	# See src_prepare()
-	insinto /etc/pm/config.d
-	doins "${T}"/${PN}
-}
-
-pkg_postinst() {
-	if use acpi || use apm; then
-		if use acpi; then
-			daemon_name="acpid"
-		elif use apm; then
-			deamon_name="apmd"
-		fi
-		if [ "$(rc-config list default | grep laptop_mode)" = "" ] || [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
-			ewarn "To enable automatic power state event handling,"
-			ewarn "e.g. enabling laptop_mode after unplugging the battery,"
-			ewarn "both laptop_mode and the ${daemon_name} daemon must be"
-			ewarn "added to default runlevel:"
-			if [ "$(rc-config list default | grep laptop_mode)" = "" ]; then
-				ewarn "# rc-update add laptop_mode default"
-			fi
-			if [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
-				ewarn "# rc-update add ${daemon_name} default"
-			fi
-		fi
-	else
-		ewarn "Without USE=\"acpi\" or USE=\"apm\" ${PN} can not"
-		ewarn "automatically disable laptop_mode on low battery."
-		ewarn
-		ewarn "This means you can lose up to 10 minutes of work if running"
-		ewarn "out of battery while laptop_mode is enabled."
-		ewarn
-		ewarn "Please see laptop-mode.txt in /usr/share/doc/${PF} for further"
-		ewarn "information."
-		ewarn
-	fi
-}
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r3.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r3.ebuild
deleted file mode 100644
index 81e01e0e68ac..000000000000
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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.63-r3.ebuild,v 1.3 2014/05/27 18:48:57 alonbl Exp $
-
-EAPI=5
-inherit eutils multilib systemd udev
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Linux kernel laptop_mode user-space utilities"
-HOMEPAGE="http://www.samwel.tk/laptop_mode/"
-SRC_URI="http://www.samwel.tk/laptop_mode/tools/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+acpi apm bluetooth scsi"
-
-RDEPEND="net-wireless/wireless-tools
-	sys-apps/ethtool
-	sys-apps/hdparm
-	acpi? ( sys-power/acpid )
-	apm? ( sys-apps/apmd )
-	bluetooth? ( net-wireless/bluez:= )
-	scsi? ( sys-apps/sdparm )"
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-pcie-aspm-silencing-stderr.patch"
-	epatch "${FILESDIR}/${P}-killall.patch"
-	epatch "${FILESDIR}/${P}-conf.patch"
-	epatch "${FILESDIR}/${P}-udevadm.patch"
-
-	# This should avoid conflict with pm-powersave wrt #327443 and #396703
-	cat <<-EOF > "${T}"/${PN}
-	HOOK_BLACKLIST="00powersave"
-	EOF
-}
-
-src_compile() { :; }
-
-src_install() {
-	DESTDIR="${D}" \
-		INIT_D="none" \
-		MAN_D="/usr/share/man" \
-		LIB_D="/usr/$(get_libdir)" \
-		UDEV_D="$(get_udevdir)" \
-		SYSTEMD_UNIT_D="$(systemd_get_unitdir)" \
-		TMPFILES_D="/usr/$(get_libdir)/tmpfiles.d" \
-		ACPI="$(use acpi && echo force || echo disabled)" \
-		PMU="$(false && echo force || echo disabled)" \
-		APM="$(use apm && echo force || echo disabled)" \
-		SYSTEMD=yes \
-		sh ./install.sh || die
-
-	dodoc Documentation/*.txt README
-	newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
-
-	# See src_prepare()
-	insinto /etc/pm/config.d
-	doins "${T}"/${PN}
-}
-
-pkg_postinst() {
-	if use acpi || use apm; then
-		if use acpi; then
-			daemon_name="acpid"
-		elif use apm; then
-			deamon_name="apmd"
-		fi
-		if [ "$(rc-config list default | grep laptop_mode)" = "" ] || [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
-			ewarn "To enable automatic power state event handling,"
-			ewarn "e.g. enabling laptop_mode after unplugging the battery,"
-			ewarn "both laptop_mode and the ${daemon_name} daemon must be"
-			ewarn "added to default runlevel:"
-			if [ "$(rc-config list default | grep laptop_mode)" = "" ]; then
-				ewarn "# rc-update add laptop_mode default"
-			fi
-			if [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
-				ewarn "# rc-update add ${daemon_name} default"
-			fi
-		fi
-	else
-		ewarn "Without USE=\"acpi\" or USE=\"apm\" ${PN} can not"
-		ewarn "automatically disable laptop_mode on low battery."
-		ewarn
-		ewarn "This means you can lose up to 10 minutes of work if running"
-		ewarn "out of battery while laptop_mode is enabled."
-		ewarn
-		ewarn "Please see laptop-mode.txt in /usr/share/doc/${PF} for further"
-		ewarn "information."
-		ewarn
-	fi
-}
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.64-r2.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.64-r2.ebuild
deleted file mode 100644
index 58673eba981e..000000000000
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.64-r2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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-r2.ebuild,v 1.1 2014/06/11 22:29:13 alonbl Exp $
-
-EAPI=5
-inherit eutils multilib systemd udev
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Linux kernel laptop_mode user-space utilities"
-HOMEPAGE="http://www.samwel.tk/laptop_mode/"
-SRC_URI="http://www.samwel.tk/laptop_mode/tools/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+acpi apm bluetooth scsi"
-
-RDEPEND="net-wireless/wireless-tools
-	sys-apps/iproute2
-	sys-apps/ethtool
-	sys-apps/hdparm
-	sys-apps/which
-	acpi? ( sys-power/acpid )
-	apm? ( sys-apps/apmd )
-	bluetooth? ( net-wireless/bluez:= )
-	scsi? ( sys-apps/sdparm )"
-DEPEND=""
-
-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}
-	HOOK_BLACKLIST="00powersave"
-	EOF
-}
-
-src_compile() { :; }
-
-src_install() {
-	DESTDIR="${D}" \
-		INIT_D="none" \
-		MAN_D="/usr/share/man" \
-		LIB_D="/usr/$(get_libdir)" \
-		UDEV_D="$(get_udevdir)" \
-		SYSTEMD_UNIT_D="$(systemd_get_unitdir)" \
-		TMPFILES_D="/usr/$(get_libdir)/tmpfiles.d" \
-		ACPI="$(use acpi && echo force || echo disabled)" \
-		PMU="$(false && echo force || echo disabled)" \
-		APM="$(use apm && echo force || echo disabled)" \
-		SYSTEMD=yes \
-		sh ./install.sh || die
-
-	dodoc Documentation/*.txt README.md
-	newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
-
-	# See src_prepare()
-	insinto /etc/pm/config.d
-	doins "${T}"/${PN}
-}
-
-pkg_postinst() {
-	if use acpi || use apm; then
-		if use acpi; then
-			daemon_name="acpid"
-		elif use apm; then
-			deamon_name="apmd"
-		fi
-		if [ "$(rc-config list default | grep laptop_mode)" = "" ] || [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
-			ewarn "To enable automatic power state event handling,"
-			ewarn "e.g. enabling laptop_mode after unplugging the battery,"
-			ewarn "both laptop_mode and the ${daemon_name} daemon must be"
-			ewarn "added to default runlevel:"
-			if [ "$(rc-config list default | grep laptop_mode)" = "" ]; then
-				ewarn "# rc-update add laptop_mode default"
-			fi
-			if [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
-				ewarn "# rc-update add ${daemon_name} default"
-			fi
-		fi
-	else
-		ewarn "Without USE=\"acpi\" or USE=\"apm\" ${PN} can not"
-		ewarn "automatically disable laptop_mode on low battery."
-		ewarn
-		ewarn "This means you can lose up to 10 minutes of work if running"
-		ewarn "out of battery while laptop_mode is enabled."
-		ewarn
-		ewarn "Please see laptop-mode.txt in /usr/share/doc/${PF} for further"
-		ewarn "information."
-		ewarn
-	fi
-}