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

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

4 files changed, 129 insertions, 5 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/Manifest b/app-laptop/laptop-mode-tools/Manifest
index 906e56bd6bdb..930d32c87a20 100644
--- a/app-laptop/laptop-mode-tools/Manifest
+++ b/app-laptop/laptop-mode-tools/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX laptop-mode-tools-1.65-usb-autosuspend.patch 1115 SHA256 2eb749aff2d7e2f01b569c8eaaf37018e1829917c54726b07a1189bc03dff5c9 SHA512 4f2510dd4682af00342377c87e9309a7e80f8b87b4d51dd677bdfe2d41db7d96856106702170e12c145cb894578b305aa28a3e747a8771e90ba475a443824fa3 WHIRLPOOL f8a0d8a1dc6f8b2de892c9b21aeec8ac495395e371d76eddfddb69d1c164827ae17e2d17e311fa9a2363aa2ae3cd4b6648f8e9fcf0ebadc72c89ba0eadc35f46
 AUX laptop_mode.init-1.4 1190 SHA256 90a18e5c7e4d0b264bb51deb7b92ff25b508a3ddd75dd6c849fdc48c07ce4fda SHA512 47e67d54ed8005a864c017f4ef063c8a17286c6f8a260984fda96392e6461a3f0c5e4f17f8cf2272b072c1545b8f8e99fe45579a81b4d08a99e1eeb46f400fe5 WHIRLPOOL 7a87608d947be301400f2f1a0294a60f21e2cd1b6bed961788f7fc018bf4ac32d69a50e11e735db3cb6c000174ebd78e59f7ac0cd474bef3b803872b6a6665e5
 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.64.ebuild 2705 SHA256 bc5db7a7d5aec75d95ea2e24cac3dd15cc584bdb81e1733499615a675a956e09 SHA512 4afbd81c18deef673f7c29be84cd4962e2d1ec220c4d3f2c89ed5dd773e785b4f7ba8457dde78a13380aedb8cb7b9e407babf6b72ff621972b5c6050d27f3122 WHIRLPOOL 085497d51dbda9599fbee90f96808d1394786a73e8e29c4dfefabc184c1d50cefa5b1705ee2690038fbd582ae3e70ca53baa5f0b6d6dff3637652e40d1b4374b
+EBUILD laptop-mode-tools-1.65-r1.ebuild 2777 SHA256 af81afebe94393314175dadd400f950ccc77d691aa83cbe33a4967ef3992abea SHA512 100bca7ea6bc8472381f112766d0808084bd8286a72f5bfd977514c392212bf168ea44f47eacbc1bbbe54649b46507e9b4eaf7dcfbe08a1b6b523d508a81247b WHIRLPOOL cdd3d1bc6a42593ceaf030d2415ed5236d83a2522bc7d3240c8084033b186582d017907c2d6e19e7fbea82a606576ba4230a6568d831ff07205424583e6a5979
 EBUILD laptop-mode-tools-1.65.ebuild 2724 SHA256 838a0525e69e2cd92a055137cb204a925b599b31b3c88d3786586b2db9745b5c SHA512 9ef88f32059e393d11b7d6b571105b39bf0af652df5f6c134780e0da3e781f5f7251814e7418448bf74f3299c999b627ee6ccbe0c304cdeab91968f453acf9fd WHIRLPOOL 63eaa02ec2281436c1e1b82fa9e4a6ec3593632ffc88ea99b4a8392ec1844f1abb50375857daa935b66df2194d4fd6e006dc613b9b6179ecf42ec8e22ab3e60c
-MISC ChangeLog 18925 SHA256 f887fb46bfa8e752174f6b53dd9bb827d32c89b333d888ab685de7d405de29f9 SHA512 f82e0b07b910c9d063f339004598b84cf85c3032c235943355fb7867c0b970c4fc7dbf81d41dfa7bf7eca645cb2c4d29444563349c5b209c21bed3d10e190bfa WHIRLPOOL 55f354383096fa70d5f3d4dab7871da9cad318493ac9d719b31abd5d007fcc478262b84800f704e7072973331e3a0fbb7713f9311e57cdddd2b03de5cba1164b
+MISC ChangeLog 19218 SHA256 2ab75ca9e176e84d0c71424dfe1e2c77a0320fedac1e2c2b864f97446fb1589d SHA512 e02a361aab7827c9ff9bc496c59bf449df361b7dcd436a98792d95c169fea027e50c08e33c39f156b7691e49de8ad527d154d68e0dde94f1c640f16161ebbc47 WHIRLPOOL e710a8715db1e720574ab0e0fff09f8c6fa8a8eba05085a0e967f47b61f2d6c196ef80944dd2274fdb9bd1e196cbf2ac9f2d012134e9c558d3cf8262cb51f595
 MISC metadata.xml 420 SHA256 2008caffae78c8d0c6a04f0b4b4768d2a9d2b9f62d96409141cd2e579f622749 SHA512 5bd05a4b5ce71343b10a46b57cd73b071c399062bb9813bcb9d9e329e1a4804a6b1f5489e6004626a9daa84e9b0ca399b0209d844dd0adb0c185a18adc535946 WHIRLPOOL ea091eb7cc936602de9e1179231f9fd8bb78ab447abd72b505be870b79acf50056a4610a56c4ab7c1585957ee44d2f85d47248eeee47f10cf860b8ac6b8535b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF0EAREIAAYFAlPEB08ACgkQXYk9GL8g3FHwZgD/S4tjkBoW0lNuqn9L2+Qp1q+q
-chafZZYt5wVhmgQv7gMA9RHVTpcq4kmGwBbT5PwWEZ1kES/doPHexEbsFdlMHCI=
-=G5Ga
+iF4EAREIAAYFAlQCII8ACgkQXYk9GL8g3FGXMwEAhLUNkbFO9CjlhwHPb3DaDzY6
+F04EHtjkkiuwuVpcY24A/2p7T2fjb2U5mzscsmDrcnSEjgN8Cn53Tr0TK2Rb3eRT
+=ahT2
 -----END PGP SIGNATURE-----
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
+}