Don't install conflicting pm-utils hooks wrt #327443.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

6 files changed, 48 insertions, 132 deletions

diff --git a/app-laptop/laptop-mode-tools/ChangeLog b/app-laptop/laptop-mode-tools/ChangeLog
index d722db87c08e..3a9536a3a66d 100644
--- a/app-laptop/laptop-mode-tools/ChangeLog
+++ b/app-laptop/laptop-mode-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-laptop/laptop-mode-tools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.49 2010/07/08 05:58:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.50 2010/07/08 10:06:14 ssuominen Exp $
+
+*laptop-mode-tools-1.55-r1 (08 Jul 2010)
+
+  08 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +laptop-mode-tools-1.55-r1.ebuild,
+  +files/laptop-mode-tools-1.55-pm-utils-1.4.0.patch:
+  Don't install conflicting pm-utils hooks wrt #327443.
 
 *laptop-mode-tools-1.55 (08 Jul 2010)
 
diff --git a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.55-pm-utils-1.4.0.patch b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.55-pm-utils-1.4.0.patch
new file mode 100644
index 000000000000..8569e4ecd49f
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.55-pm-utils-1.4.0.patch
@@ -0,0 +1,25 @@
+http://bugs.gentoo.org/327443
+
+--- install.sh
++++ install.sh
+@@ -179,20 +179,6 @@
+   exit 23
+ fi
+ 
+-
+-# Install pm-utils hook only if pm-utils config dir is present, or force the
+-# install if we have a DESTDIR.
+-if [ -n "$DESTDIR" -o -d "$DESTDIR/usr/lib/pm-utils/sleep.d" ] ; then
+-	if ( ! $INSTALL -D -m 755 usr/lib/pm-utils/sleep.d/01laptop-mode "$DESTDIR/usr/lib/pm-utils/sleep.d/01laptop-mode" ) ; then
+-		echo "$0: Failed to install 01-laptop-mode into /usr/lib/pm-utils/sleep.d. Installation failed."
+-		exit 36
+-	fi
+-fi
+-
+-if [ -f "$DESTDIR/usr/lib/pm-utils/sleep.d/99laptop-mode" ]; then
+-	rm -f $DESTDIR/usr/lib/pm-utils/sleep.d/99laptop-mode;
+-fi
+-
+ ACPI_DONE=0
+ APM_DONE=0
+ PMU_DONE=0
diff --git a/app-laptop/laptop-mode-tools/files/laptop_mode.init b/app-laptop/laptop-mode-tools/files/laptop_mode.init
deleted file mode 100644
index 566f020df604..000000000000
--- a/app-laptop/laptop-mode-tools/files/laptop_mode.init
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/files/laptop_mode.init,v 1.2 2006/11/14 08:05:50 uberlord Exp $
-
-opts="${opts} reload"
-
-depend() {
-	use localmount
-	after bootmisc
-}
-
-checkconfig() {
-	if [[ ! -f /proc/sys/vm/laptop_mode ]] ; then
-		eerror "Kernel does not support laptop_mode"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting laptop_mode"
-	touch /var/run/laptop-mode-enabled
-	/usr/sbin/laptop_mode auto init >/dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping laptop_mode"
-	rm -f /var/run/laptop-mode-enabled
-	/usr/sbin/laptop_mode stop init >/dev/null
-	eend $?
-}
-
-reload() {
-	if ! service_started "${SVCNAME}" ; then
-		eerror "${SVCNAME} has not yet been started"
-		return 1
-	fi
-
-	ebegin "Reloading laptop_mode"
-	/usr/sbin/laptop_mode auto init force >/dev/null
-	eend $?
-}
-
-# vim: set ts=4 :
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.52.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.52.ebuild
deleted file mode 100644
index 9e6435c866fc..000000000000
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.52.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2010 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.52.ebuild,v 1.2 2010/06/11 11:56:12 ssuominen Exp $
-
-EAPI="2"
-
-inherit eutils
-
-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 hal scsi"
-
-DEPEND=""
-
-RDEPEND="sys-apps/ethtool
-		acpi? ( sys-power/acpid )
-		apm? ( sys-apps/apmd )
-		bluetooth? ( net-wireless/bluez )
-		hal? ( sys-apps/hal )
-		scsi? ( sys-apps/sdparm )
-		sys-apps/hdparm"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir /etc/pm/sleep.d
-	DESTDIR="${D}" \
-		MAN_D="/usr/share/man" \
-		INIT_D="none" \
-		APM="$(use apm && echo force || echo disabled)" \
-		ACPI="$(use acpi && echo force || echo disabled)" \
-		PMU="$(false && echo force || echo disabled)" \
-		./install.sh || die "Install failed."
-
-	dodoc Documentation/laptop-mode.txt README
-	newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
-
-	exeinto /etc/pm/power.d
-	newexe "${FILESDIR}"/laptop_mode_tools.pmutils laptop_mode_tools
-}
-
-pkg_postinst() {
-	if ! use acpi && ! use apm; then
-		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 /usr/share/doc/${PF}/laptop-mode.txt.gz for further"
-		ewarn "information."
-		ewarn
-	fi
-}
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.54.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r1.ebuild
index 8c1466e6fc1f..485c289d387a 100644
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.54.ebuild
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.54.ebuild,v 1.2 2010/06/11 11:56:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r1.ebuild,v 1.1 2010/07/08 10:06:14 ssuominen Exp $
 
 EAPI=2
 inherit eutils
@@ -16,35 +16,34 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="acpi apm bluetooth scsi"
 
-DEPEND=""
-
 RDEPEND="sys-apps/ethtool
-		acpi? ( >=sys-power/acpid-2.0.4-r2 )
-		apm? ( sys-apps/apmd )
-		bluetooth? ( net-wireless/bluez )
-		scsi? ( sys-apps/sdparm )
-		sys-apps/hdparm"
+	acpi? ( sys-power/acpid )
+	apm? ( sys-apps/apmd )
+	bluetooth? ( net-wireless/bluez )
+	scsi? ( sys-apps/sdparm )
+	sys-apps/hdparm"
+DEPEND=""
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-pm-utils-1.4.0.patch
+}
+
 src_compile() { :; }
 
 src_install() {
-	dodir /etc/pm/sleep.d
 	DESTDIR="${D}" \
-		MAN_D="/usr/share/man" \
 		INIT_D="none" \
-		APM="$(use apm && echo force || echo disabled)" \
+		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/laptop-mode.txt README || die
+	dodoc Documentation/*.txt README || die
 	newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
 
-	exeinto /etc/pm/power.d
-	newexe "${FILESDIR}"/laptop_mode_tools.pmutils laptop_mode_tools
-
 	keepdir /var/run/laptop-mode-tools
 }
 
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55.ebuild
index eef80d578ac8..5d6bc9e9ec0a 100644
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55.ebuild
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.55.ebuild,v 1.1 2010/07/08 05:58:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55.ebuild,v 1.2 2010/07/08 10:06:14 ssuominen Exp $
 
 EAPI=2
 
@@ -41,7 +41,6 @@ src_install() {
 	dodoc Documentation/*.txt README || die
 	newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
 
-	# XXX: Figure this out with pm-utils-1.4.0
 	exeinto /etc/pm/power.d
 	newexe "${FILESDIR}"/laptop_mode_tools.pmutils laptop_mode_tools