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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

7 files changed, 52 insertions, 139 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/Manifest b/app-laptop/laptop-mode-tools/Manifest
index a6a9e515b71b..5dc328c379ca 100644
--- a/app-laptop/laptop-mode-tools/Manifest
+++ b/app-laptop/laptop-mode-tools/Manifest
@@ -1,14 +1,11 @@
 AUX laptop-mode-tools-1.47-install.patch 734 RMD160 645af96007c662ea58bc9ef571aef6a56e22c317 SHA1 1fc7865f970ce61cdf5dbe515bf1716cea0b14a5 SHA256 505bed580e45929636cc91ee04f1fc428bff8d30878e2836722260880ce454d4
-AUX laptop_mode.init 970 RMD160 36e4f0ac62ca43f25689fe7c1eec6e0f8594dcd9 SHA1 d26a227b7eb9be3c78af91c78c5cc743ff846897 SHA256 aa8ee3b3f89c95c154243bae2c5b99a0db3915f0d50807637c271acddbbdcfad
+AUX laptop-mode-tools-1.55-pm-utils-1.4.0.patch 698 RMD160 f63a8b4fe7a485b5c9f2581a960029f95c43f2ea SHA1 739243fdbe9fc49d9402b6522bce0b21f82ab443 SHA256 369cc448d84565704b48c046f0c0d96a305b1f920a6714f41cfbb4f90b045d16
 AUX laptop_mode.init-1.4 1062 RMD160 953efd488b4aadb530fe10e4038612c2a523c229 SHA1 41e7e279663904c70471d1a4f6713c25f103e64f SHA256 d48711562527aa670e57e1bec83a06089db50771da742d0155a7b12086770ce0
 AUX laptop_mode_tools.pmutils 38 RMD160 fc746f824625d0ae2eb3c63d9474423bcadf8eb3 SHA1 ab72851ce8351f002bd8db9d23d7dbd4bcff6fb9 SHA256 1d5ae9a7045d0c0ec0d56ec8ff153ea80b27cf52cab82db8fcc49b1f835f5cfe
 DIST laptop-mode-tools_1.47.tar.gz 85195 RMD160 58d15ee73e9177a94bc8d773d1bf02dbbd145157 SHA1 e38745b17b7259289190b0630c15c5e9e77ff891 SHA256 47844f7cf824b28343494bf9b4f69ca8b9b6fd446e80a7576a8c5186342e2e29
-DIST laptop-mode-tools_1.52.tar.gz 92566 RMD160 807898b6853b7b1a5afe7e4b519e5ccdea6e6fbd SHA1 80fcb3600315ec6f60cad52c6c7166cccc4ca4fc SHA256 d258e610da5105869fefb9364f0a4fbd65896fe30ee50256f4716be62953a6fa
-DIST laptop-mode-tools_1.54.tar.gz 95104 RMD160 a37465c945df8cec2e3ece54f201ab2c0dae4d53 SHA1 228ea4ca3d5170825fc498b1b3879e437b430380 SHA256 b3b58e771be3fc8700ebab790a57002327f760b9dd88b250467626c880fefeaa
 DIST laptop-mode-tools_1.55.tar.gz 97675 RMD160 af1476c4ff4c08c2a077eb592ca2c3369c57b8e9 SHA1 e2dcec04f4c1152bce07dd621ad8a63f70b013ef SHA256 4fc8420253bc053a643c736238a6dcde6f8e32b48674cad6d42cc90a5ff727b5
 EBUILD laptop-mode-tools-1.47-r1.ebuild 1780 RMD160 1be1f52739dbbbd5482ac102f7b266cef6a308cb SHA1 513f4adb996c0b48169968710bfd50bc342704fa SHA256 ebe52e3fba15917e1854622d3e8ff27813d620c52354c80b85856ad58a79d41d
-EBUILD laptop-mode-tools-1.52.ebuild 1729 RMD160 9215f7edba5861020846b9f5f653793f2fa1f9aa SHA1 3a6de377dbb6866c43924eb921f2823c2b0216ed SHA256 29bd1d6461c4030e00b040216e90a7f3b8b8656221781e59a1b51b8c0850b155
-EBUILD laptop-mode-tools-1.54.ebuild 1730 RMD160 afef977ebb606bbe87e89a9e16079b01637f3937 SHA1 01528725273f20a48056ad5f50617cb0522b6197 SHA256 6e287375fb8826e891d8a6dce17113e6768f43d6c91c1002d6e5f0f3a794a20d
-EBUILD laptop-mode-tools-1.55.ebuild 1741 RMD160 684e06fc82589e7cdf2a229895196e111a00b4e3 SHA1 50efd55e671b1b1499046b8f5cc4a89e5a513c5f SHA256 bc3e25e67a0c53e0d6ee55b82c932274dd09b8e83b0e1021b2b7272b67cc1905
-MISC ChangeLog 8873 RMD160 9fafdf7403e4e66a2ecc82f221c1d6d871a6db94 SHA1 e8937f9c44eec0f6d33206a3cc4c0639f93213b4 SHA256 1b24a58668712e2dff21a9c8af2378ef623cc6bd21f6958d83b3a1c5304d6b78
+EBUILD laptop-mode-tools-1.55-r1.ebuild 1658 RMD160 d843d06ddbbab959e4fc3682e8d9f73e3bce0d28 SHA1 81f2ce1b53270b96d3abfd8caa1be0006767bd20 SHA256 d91fec7c5e4fd945ec266f58019d4abd34843ae217dc0374a5ac19e897df2ba1
+EBUILD laptop-mode-tools-1.55.ebuild 1697 RMD160 9abfe717a8df25eaca2c9dfdc2911c6cacab1add SHA1 98ed4e9fddaf8e11494c6e1561f43b89b198417c SHA256 8cf1ad772251a2e275ede049e9732a0b4133d2da5c36a5e26f9b7117ba349e80
+MISC ChangeLog 9117 RMD160 bfbef6c3c8a4b04a7fdcaf63d14f0a8bf4c226da SHA1 3f0c20b75e9d3247bad064af643c5d52635f22ae SHA256 3e3c68cd0f54901b155884eaf902050c7b0a47b3ef1d5d3c041a76a700d14aa1
 MISC metadata.xml 258 RMD160 d5cfed30adbe41387b0e7f435ce781dc90044c9e SHA1 4b1b83d58d1410fdb64efbc4792abd7053fdbdfe SHA256 a0dfbea03e2ef7978a9fd258493d8d50af7520a99400eba9a44be12d7bbce192
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