Stop using -pm-utils-1.4.0.patch and install file containing HOOK_BLACKLIST="00powersave" to /etc/pm/config.d instead wrt #327443 and #396703 by Ondrej Grover. Install 99-laptop-mode.rules to /lib/udev/rules.d instead of /etc/udev/rules.d.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 104 insertions, 16 deletions

diff --git a/app-laptop/laptop-mode-tools/ChangeLog b/app-laptop/laptop-mode-tools/ChangeLog
index 8d58b71dd276..0b1bbacc0741 100644
--- a/app-laptop/laptop-mode-tools/ChangeLog
+++ b/app-laptop/laptop-mode-tools/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-laptop/laptop-mode-tools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.57 2012/01/01 16:04:34 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.58 2012/01/16 19:14:16 ssuominen Exp $
+
+*laptop-mode-tools-1.60-r1 (16 Jan 2012)
+
+  16 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +laptop-mode-tools-1.60-r1.ebuild:
+  Stop using -pm-utils-1.4.0.patch and install file containing
+  HOOK_BLACKLIST="00powersave" to /etc/pm/config.d instead wrt #327443 and
+  #396703 by Ondrej Grover. Install 99-laptop-mode.rules to /lib/udev/rules.d
+  instead of /etc/udev/rules.d.
 
 *laptop-mode-tools-1.60 (01 Jan 2012)
 
diff --git a/app-laptop/laptop-mode-tools/Manifest b/app-laptop/laptop-mode-tools/Manifest
index a2d0806898a2..03ae810066d4 100644
--- a/app-laptop/laptop-mode-tools/Manifest
+++ b/app-laptop/laptop-mode-tools/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX laptop-mode-tools-1.55-linux3-support.patch 2026 RMD160 d99e1f38b8793ef4bebf64f5bb5372a237fe7f78 SHA1 dee19f1b0bab06e80112f8038794267834fb0f9b SHA256 65c8ade2ea8691d6384ff03f39bf06d96499ef3dde9960d70747882242249720
 AUX laptop-mode-tools-1.55-pm-utils-1.4.0.patch 698 RMD160 f63a8b4fe7a485b5c9f2581a960029f95c43f2ea SHA1 739243fdbe9fc49d9402b6522bce0b21f82ab443 SHA256 369cc448d84565704b48c046f0c0d96a305b1f920a6714f41cfbb4f90b045d16
@@ -11,23 +11,18 @@ DIST laptop-mode-tools_1.60.tar.gz 104415 RMD160 09b58d3ea889b43c5383a319d077e4b
 EBUILD laptop-mode-tools-1.55-r3.ebuild 1872 RMD160 2d947b6e84f3e8e9efb9131b658d114ab38d8066 SHA1 190c12f6ef94ac8471c81b42d02540dbd1e72c45 SHA256 44504dc9043475955695d0f8ed1a9be8b9a354ef11d1edf5f5de08c885f4f5e4
 EBUILD laptop-mode-tools-1.55-r4.ebuild 1949 RMD160 05157846ddb393103aacbb2662d8f8acfd63128b SHA1 30e869792cea605fdf845416f69fffa29a6f716e SHA256 26038d736685e570513698cfc506751f04e6098d3e077621eee55af8953fc0f7
 EBUILD laptop-mode-tools-1.55-r5.ebuild 1915 RMD160 195b0347b015d282855a4428b18c7001b4b94be9 SHA1 8b0be8bc317aaad98b70498297d659edc102f3bd SHA256 6a0d298b1ffa809181341d7b423bdee322799519c0d5999fdf92d7ff1933bdb3
+EBUILD laptop-mode-tools-1.60-r1.ebuild 2312 RMD160 c6c48c4c0de59312f2640c1f824a604b9c1ee874 SHA1 23e94eeaa1b222d35362ecbb43c1e688e3eb35a6 SHA256 1f78c26bf5f4cb2db6d9ffc52ad95b39069e0072f37969a62c24e37b17f23a79
 EBUILD laptop-mode-tools-1.60.ebuild 2264 RMD160 6ef626cdb73a9839fd74c57f9aacdcd09653c98e SHA1 da5e7a96f23a526f0e9fe0f4ce09ab9e2a6a1208 SHA256 66e5db0699565c25749ee25f923fd65aa5819d4090f7c5fb5f83391dfaea951a
-MISC ChangeLog 10659 RMD160 0952c9ea8a7517e46c36f5f130f36c3f6dafb0ed SHA1 d0d03b882843798afdf0044fa7c8920f53d08083 SHA256 556f20e2a502c21e07bcbbfa823de52841770c0b66bcaffa93083aa9e9a05491
+MISC ChangeLog 11042 RMD160 20c9c52cab16af505a71e5a5807dcb6f05d709b6 SHA1 d607cc56f8288a9ef884dd7aaa847c37f57d7481 SHA256 8e95c4f92e6bad29e0f75b88b19961df54a6ff76e5119960448e32bcad0901ef
 MISC metadata.xml 258 RMD160 d5cfed30adbe41387b0e7f435ce781dc90044c9e SHA1 4b1b83d58d1410fdb64efbc4792abd7053fdbdfe SHA256 a0dfbea03e2ef7978a9fd258493d8d50af7520a99400eba9a44be12d7bbce192
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPAIPoAAoJEPqDWhW0r/LCw3sP/3Wh8Sw3OtJnEy+tchkxCEGW
-5Zl7aAqAVtp3aQouwK6CaH0+QC+Yx3iikc+rXn6T/18Z+CinD8e0q7C+B1LUvmlS
-5/i8zh6MahsIns6zlCinfF/xpM+3ATXtzG8wupHx5EVxbnavYyuYOioYT/7Axriu
-YkTETxeyvkkZEV+ALRFTch/2KDScmSLHFuzVa6r0P0VZVdcvVt0Sv1j8w+BDxY27
-71LY1m6nWRit5oNrYyTk3G9+v6GpuPcK6UrJTZP9X6mm83YlkDnWGNInWyO4ajx7
-ANA4LhGsjo6WmIAwTd1JMgGZrq1pN2fvfaN8gAQMIZQCEH1zhUo9lreE6K6hKTF/
-Z3CEoInW3gZ5xQbJ7tG59Wk/ATStEGAokVdoPoozKldBlttCd77HOG1C1lcYnmlU
-ef/Ub0tMOpdpUg+avuWH+vG6ZZjDnVHcq1+e/lghIa9a3gCp7omm1PUj4pzOYqUe
-bAmCmPl/xpIGWF3yioZhahSI6Oh5Ar9mDp+B6DXGHxijto1wYSBZ8egZhblzsk+Q
-HIWYvTgwDoZR5uWYXFJZTGB/JNEIwPJjwl1CcyMjWj5IDBiYvDB9lZ89Kzt92l5c
-PXXjVLTbwbjyXErCfloKuYJXiYfHol2xmNw3qlC2fZYkd/BoYG9wW3EAx8PRxrqt
-XKPgiAX4Eu87yXfrurdl
-=Rq7X
+iQEcBAEBAgAGBQJPFHafAAoJEEdUh39IaPFN+OkIAIu6g7bbqCyv73bKkg/luYEG
+kD666Vy/pEf0ayNKDZ1L8yIA3bmBDHmIbAqdxSC0R4HajGyiJWYIPPb/vgNxxLWz
+F91qavbiM50QxNde0vzT6TlSW0AjzOWOCFdEFuSWmlkFPyd7EtN1eTS07Yur4nM3
+eOfL7abutdM1sdFLUKCwftBCxDp3X+cyTArZ0GUJqYQrAJ4hAhflKpy3+nU+r+mM
+9whItb6B2GbkVUBfd/C49eynWqy6xXaR89wHMhRpEXeCfCwqUftus6Bn6SB+jBUd
+X+dImXRIGVdfUxinnMGM9pTLqEGYeqQNwiRuQmOHQqZBspgeDgXIMK2JGOIjfiw=
+=mVfX
 -----END PGP SIGNATURE-----
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.60-r1.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.60-r1.ebuild
new file mode 100644
index 000000000000..a47344d4bf09
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.60-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2012 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.60-r1.ebuild,v 1.1 2012/01/16 19:14:16 ssuominen Exp $
+
+EAPI=4
+
+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="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() {
+	# Install 99-laptop-mode.rules to rules.d directory in /lib instead of /etc
+	sed -i -e '/udev/s:/etc:/lib:' install.sh || die
+
+	# 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" \
+		ACPI="$(use acpi && echo force || echo disabled)" \
+		PMU="$(false && echo force || echo disabled)" \
+		APM="$(use apm && echo force || echo disabled)" \
+		./install.sh || die
+
+	dodoc Documentation/*.txt README || die
+	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
+		ewarn
+		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"
+		ewarn "must be added to a runlevel,"
+		ewarn "		rc-update add laptop_mode default"
+		ewarn "		rc-update add ${daemon_name} default"
+		ewarn
+	else
+		ewarn
+		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
+}