Honor .conf files only, bug#482974, thanks to Steev Klimaszewski

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

4 files changed, 137 insertions, 5 deletions

diff --git a/app-laptop/laptop-mode-tools/ChangeLog b/app-laptop/laptop-mode-tools/ChangeLog
index e7cc272260a5..73f4f1500ea9 100644
--- a/app-laptop/laptop-mode-tools/ChangeLog
+++ b/app-laptop/laptop-mode-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-laptop/laptop-mode-tools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.79 2013/08/07 13:35:00 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.80 2013/08/30 18:16:23 alonbl Exp $
+
+*laptop-mode-tools-1.63-r3 (30 Aug 2013)
+
+  30 Aug 2013; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/laptop-mode-tools-1.63-conf.patch, +laptop-mode-tools-1.63-r3.ebuild:
+  Honor .conf files only, bug#482974, thanks to Steev Klimaszewski
 
   07 Aug 2013; Alon Bar-Lev <alonbl@gentoo.org>
   -files/1.62/0001-Do-not-ship-the-board-specific-folder-in-default-ins.patch,
diff --git a/app-laptop/laptop-mode-tools/Manifest b/app-laptop/laptop-mode-tools/Manifest
index 2a9726faf1e0..3bf49b69edf3 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.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.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
 EBUILD laptop-mode-tools-1.63-r2.ebuild 2790 SHA256 4ca62dc6a2ba4da239e1aba6d291f4cd5a8be301bba9dee6a75b7882f55b04e8 SHA512 55bd56508326541bacf149f393b7d415950dc95b37433474d00bd6f11f5cb27ac5a12fa09e02b91b455e5293e48e2d27b1fad8bac1088a605e75499b02111da6 WHIRLPOOL 572aba24e85060fbd365acd1e29547b7b5c9823eb48ef2808d77c86bd7d18f4ee0b25410c14aa60fb7a855e3cb51413f495fd18dd5b15220c03df83658a1a85a
-MISC ChangeLog 16228 SHA256 cc45457318f6c370c1eea14ec66e2da1e83fbaebd417085cb47c2e21afbccba9 SHA512 5097eed46172a1df0e0e494b437d5070d4ae157fbbd90622b0a521c1b7bf8adf09b2eb28218cf580f8e0a993defa90d335a68ebea4cfeda5c23181824b27ab7a WHIRLPOOL 8743a670025ff64511760c13c05f8a2a61fe8b5ec6e196c1abd7e1ecfae8091658aed596a19b6e60a78f7d24408d72d0ce07339fab81d9c1a7c98c6976555bf5
+EBUILD laptop-mode-tools-1.63-r3.ebuild 2834 SHA256 fdca6835ce2e3bde69d529f8e39a4bd85e7c3dca2e584273093cd7909c46fa6a SHA512 ce561a439741fcf600437dc26939efdee8b825aec226c8abe8280abfad05d1e7cc16c9e684373a11ac3fca6fd6067f2de1e74af82b5947955e8c05fce5c2d23a WHIRLPOOL 53ae7298cdd6aab78964991d4c41923b335896420eb4686f926d50132f3644f193a1f570c7023250c490e29491a69f1fa9ec9af6d21d4c642efe1203970f4d37
+MISC ChangeLog 16465 SHA256 1af602aa63fcf361daa38ed377961d27538c3aa2081da9b9d1c9ff020548ae69 SHA512 2cf2dbd6e649df51b9e0c799bd74e4bd5214ac1fcf4b1cd8999bdd116c304be6e74f0e792ebf16a12ca51d4436a8a4212a073f0e68523bf380812366ded6e88e WHIRLPOOL b6a4640b7420d0cd738bd826ce7bacecceb569974a9701236871c67d603a38415fb21dcf4e77c492bcb141265e7fe89f91e543cd85cf81eb2153d2862a86fdd4
 MISC metadata.xml 420 SHA256 2008caffae78c8d0c6a04f0b4b4768d2a9d2b9f62d96409141cd2e579f622749 SHA512 5bd05a4b5ce71343b10a46b57cd73b071c399062bb9813bcb9d9e329e1a4804a6b1f5489e6004626a9daa84e9b0ca399b0209d844dd0adb0c185a18adc535946 WHIRLPOOL ea091eb7cc936602de9e1179231f9fd8bb78ab447abd72b505be870b79acf50056a4610a56c4ab7c1585957ee44d2f85d47248eeee47f10cf860b8ac6b8535b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlICTQcACgkQXYk9GL8g3FH7cAD/ZLDPBDnn/rvj5XvAL2s4Dy4s
-i1GaGJJ1EJLfym9NXPIA/2rkAkoYHUCWpVK54UFQH4T7YfEiqu7ZsJ3QQ+rdWwur
-=1TSn
+iF4EAREIAAYFAlIg4YcACgkQXYk9GL8g3FGSrQD+KScnlAP7blmChcBOAbIbCKN3
+OYbyuiC1hH28mPdyJkoA/3Fc6Q7BgOa1ehAr/Hy6sXp1HMf8hV5hkIG0a5mShGWZ
+=Hk9k
 -----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
new file mode 100644
index 000000000000..67002b91437a
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-conf.patch
@@ -0,0 +1,29 @@
+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/laptop-mode-tools-1.63-r3.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r3.ebuild
new file mode 100644
index 000000000000..b839d2d46b3f
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2013 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.1 2013/08/30 18:16:23 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"
+
+	# 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="$(udev_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
+}