Run 'laptop_mode auto' on initscript start-up, not 'laptop_mode start'. Fixes bug #86357 as spotted by Ben Ford.

Package-Manager: portage-2.0.51.19

5 files changed, 89 insertions, 5 deletions

diff --git a/app-laptop/laptop-mode-tools/ChangeLog b/app-laptop/laptop-mode-tools/ChangeLog
index 9ffedf9df8ad..51e2b24a501d 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.1 2005/03/22 18:52:40 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.2 2005/03/25 19:05:33 brix Exp $
+
+*laptop-mode-tools-1.04-r1 (25 Mar 2005)
+
+  25 Mar 2005; <brix@gentoo.org> files/laptop-mode-tools-1.04.init,
+  +laptop-mode-tools-1.04-r1.ebuild:
+  Run 'laptop_mode auto' on initscript start-up, not 'laptop_mode start'. Fixes
+  bug #86357 as spotted by Ben Ford.
 
 *laptop-mode-tools-1.04 (22 Mar 2005)
 
diff --git a/app-laptop/laptop-mode-tools/Manifest b/app-laptop/laptop-mode-tools/Manifest
index b025e61b253a..5dddab465642 100644
--- a/app-laptop/laptop-mode-tools/Manifest
+++ b/app-laptop/laptop-mode-tools/Manifest
@@ -1,5 +1,7 @@
+MD5 16f96b8a21d1c01493b9d3ee126d6e33 laptop-mode-tools-1.04-r1.ebuild 1883
 MD5 2a244615a7cc165f929c64f693076391 laptop-mode-tools-1.04.ebuild 1880
-MD5 d09878758f6e4ed4150841ee757ef50d ChangeLog 473
+MD5 881cddfa47481c35d7f6d49ce0681b8c ChangeLog 738
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
-MD5 01157e9eeb38f22cca5aaa8fc1a448c3 files/laptop-mode-tools-1.04.init 700
+MD5 142ca4fd50b03cccc557a89a2bafc022 files/digest-laptop-mode-tools-1.04-r1 73
+MD5 b23d6e2747012f603728b810eb223c63 files/laptop-mode-tools-1.04.init 699
 MD5 142ca4fd50b03cccc557a89a2bafc022 files/digest-laptop-mode-tools-1.04 73
diff --git a/app-laptop/laptop-mode-tools/files/digest-laptop-mode-tools-1.04-r1 b/app-laptop/laptop-mode-tools/files/digest-laptop-mode-tools-1.04-r1
new file mode 100644
index 000000000000..1dbed76c46c5
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/files/digest-laptop-mode-tools-1.04-r1
@@ -0,0 +1 @@
+MD5 b26fcc4df2b38da17e4f09872a1cfeda laptop-mode-tools_1.04.tar.gz 30908
diff --git a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.04.init b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.04.init
index d05d8e8c94c9..ba3a7b70488b 100644
--- a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.04.init
+++ b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.04.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 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-tools-1.04.init,v 1.1 2005/03/22 18:52:40 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.04.init,v 1.2 2005/03/25 19:05:33 brix Exp $
 
 checkconfig() {
     if [ ! -f /proc/sys/vm/laptop_mode ]; then
@@ -14,7 +14,7 @@ start() {
     checkconfig || return 1
 
     ebegin "Starting laptop_mode"
-    touch /var/run/laptop-mode-enabled && /usr/sbin/laptop_mode start &> /dev/null
+    touch /var/run/laptop-mode-enabled && /usr/sbin/laptop_mode auto &> /dev/null
     eend $?
 }
 
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.04-r1.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.04-r1.ebuild
new file mode 100644
index 000000000000..71acf0f71405
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.04-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2005 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.04-r1.ebuild,v 1.1 2005/03/25 19:05:33 brix Exp $
+
+inherit linux-info
+
+MY_P=${PN}_${PV}
+
+DESCRIPTION="Linux kernel laptop_mode user-space utilities"
+
+HOMEPAGE="http://www.xs4all.nl/~bsamwel/laptop_mode/tools/"
+SRC_URI="http://www.xs4all.nl/~bsamwel/laptop_mode/tools/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE="acpi apm"
+
+DEPEND="acpi? ( sys-power/acpid )
+		apm? ( sys-apps/apmd )"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if [ ${KV_MAJOR} -eq 2 -a ${KV_MINOR} -eq 6 -a ${KV_PATCH} -lt 6 ]; then
+		eerror "${P} requires kernel version 2.6.6 or newer."
+		die "${P} requires kernel version 2.6.6 or newer"
+	elif [ ${KV_MAJOR} -eq 2 -a ${KV_MINOR} -eq 4 -a ${KV_PATCH} -lt 23 ]; then
+		eerror "${P} requires kernel version 2.4.23 or newer."
+		die "${P} requires kernel version 2.4.23 or newer"
+	fi
+}
+
+src_install() {
+	dosbin usr/sbin/laptop_mode
+
+	insinto /etc/laptop-mode
+	doins etc/laptop-mode/laptop-mode.conf
+
+	newinitd ${FILESDIR}/${P}.init laptop_mode
+
+	doman man/*
+
+	dodoc Documentation/laptop-mode.txt README
+
+	if useq acpi; then
+		insinto /etc/acpi/events/
+		doins etc/acpi/events/*
+
+		exeinto /etc/acpi/actions/
+		doexe etc/acpi/actions/*
+	fi
+
+	if useq apm; then
+		exeinto /etc/apm/event.d/
+		doexe etc/apm/event.d/*
+	fi
+}
+
+pkg_postinst() {
+	if ! useq acpi && ! useq 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
+}