Cleanup

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)

10 files changed, 12 insertions, 551 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/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
-}