Disable usb-autosuspend per default, use newer runtime-pm withi udev, bug#520124, thanks to Ted Tanberry

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

3 files changed, 123 insertions, 1 deletions

diff --git a/app-laptop/laptop-mode-tools/ChangeLog b/app-laptop/laptop-mode-tools/ChangeLog
index 4dd991c56c67..66d2f42a8956 100644
--- a/app-laptop/laptop-mode-tools/ChangeLog
+++ b/app-laptop/laptop-mode-tools/ChangeLog
@@ -1,6 +1,14 @@
 # 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.93 2014/07/14 16:37:16 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.94 2014/08/30 19:05:46 alonbl Exp $
+
+*laptop-mode-tools-1.65-r1 (30 Aug 2014)
+
+  30 Aug 2014; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/laptop-mode-tools-1.65-usb-autosuspend.patch,
+  +laptop-mode-tools-1.65-r1.ebuild:
+  Disable usb-autosuspend per default, use newer runtime-pm withi udev,
+  bug#520124, thanks to  Ted Tanberry
 
   14 Jul 2014; Alon Bar-Lev <alonbl@gentoo.org>
   -files/laptop-mode-tools-1.63-conf.patch,
diff --git a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.65-usb-autosuspend.patch b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.65-usb-autosuspend.patch
new file mode 100644
index 000000000000..aebf403cd83b
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.65-usb-autosuspend.patch
@@ -0,0 +1,19 @@
+--- laptop-mode-tools_1.65.org/etc/rules/99-laptop-mode.rules
++++ laptop-mode-tools_1.65.org/etc/rules/99-laptop-mode.rules
+@@ -1,3 +1,3 @@
+ ACTION=="change", SUBSYSTEM=="power_supply", RUN+="lmt-udev auto"
+ ACTION=="add|remove", SUBSYSTEM=="machinecheck", RUN+="lmt-udev auto force"
+-ACTION=="add|remove", SUBSYSTEM=="usb", RUN+="lmt-udev force modules=usb-autosuspend devices=%k"
++ACTION=="add|remove", SUBSYSTEM=="usb", RUN+="lmt-udev force modules=runtime-pm devices=%k"
+diff -urNp laptop-mode-tools_1.65.org/etc/laptop-mode/conf.d/usb-autosuspend.conf laptop-mode-tools_1.65/etc/laptop-mode/conf.d/usb-autosuspend.conf
+--- laptop-mode-tools_1.65.org/etc/laptop-mode/conf.d/usb-autosuspend.conf	2014-06-18 16:58:58.000000000 +0300
++++ laptop-mode-tools_1.65/etc/laptop-mode/conf.d/usb-autosuspend.conf	2014-08-30 22:00:12.725396259 +0300
+@@ -25,7 +25,7 @@ DEBUG=0
+ 
+ # Enable USB autosuspend feature?
+ # Set to 0 to disable
+-CONTROL_USB_AUTOSUSPEND="auto"
++CONTROL_USB_AUTOSUSPEND="0"
+ 
+ # Set this to use opt-in/whitelist instead of opt-out/blacklist for deciding
+ # which USB devices should be autosuspended.
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.65-r1.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.65-r1.ebuild
new file mode 100644
index 000000000000..4987e0e657f9
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.65-r1.ebuild
@@ -0,0 +1,95 @@
+# 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.65-r1.ebuild,v 1.1 2014/08/30 19:05:46 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}-usb-autosuspend.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
+}