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

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

3 files changed, 131 insertions, 1 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/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
+}