Fix some potential quoting issues. Init script now checks if we are started before allowing a reload.

Package-Manager: portage-2.1.1_pre3-r1

6 files changed, 79 insertions, 11 deletions

diff --git a/app-laptop/laptop-mode-tools/ChangeLog b/app-laptop/laptop-mode-tools/ChangeLog
index a791027a7d72..bb44656b7e48 100644
--- a/app-laptop/laptop-mode-tools/ChangeLog
+++ b/app-laptop/laptop-mode-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-laptop/laptop-mode-tools
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.31 2006/05/28 12:08:22 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.32 2006/07/19 11:16:26 uberlord Exp $
+
+  19 Jul 2006; Roy Marples <uberlord@gentoo.org> +files/laptop_mode.init,
+  metadata.xml, laptop-mode-tools-1.31.ebuild:
+  Fix some potential quoting issues.
+  Init script now checks if we are started before allowing a reload.
 
   28 May 2006; Henrik Brix Andersen <brix@gentoo.org>
   -files/laptop-mode-tools-1.11-cpu-governor.patch,
diff --git a/app-laptop/laptop-mode-tools/Manifest b/app-laptop/laptop-mode-tools/Manifest
index 185816cf0efc..6e4d58b2835f 100644
--- a/app-laptop/laptop-mode-tools/Manifest
+++ b/app-laptop/laptop-mode-tools/Manifest
@@ -1,5 +1,24 @@
-MD5 7f8fd0703527d11bb6cb87774696fb65 ChangeLog 5643
-MD5 6e7da4b22b8209b27e4f991503c6eab8 files/digest-laptop-mode-tools-1.31 73
+AUX laptop-mode-tools-1.31-init.d 860 RMD160 e5f96f4d0272a1a064819a610363de0240645f79 SHA1 52ca263fc4ee679bbdeb9a592b8e9b99d6fa7b22 SHA256 82b20b32c5ff91f6edefd9ab2f643c373623ac002c744725cba9e01924a37095
 MD5 37fd300b2d6b8b4ffe40621172c4816a files/laptop-mode-tools-1.31-init.d 860
-MD5 b1f2c8212e1cb7b5ce5905295b61a428 laptop-mode-tools-1.31.ebuild 2310
-MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
+RMD160 e5f96f4d0272a1a064819a610363de0240645f79 files/laptop-mode-tools-1.31-init.d 860
+SHA256 82b20b32c5ff91f6edefd9ab2f643c373623ac002c744725cba9e01924a37095 files/laptop-mode-tools-1.31-init.d 860
+AUX laptop_mode.init 924 RMD160 7587e9725ca20164e0f5942eb16fbdf743d51ca8 SHA1 0f0170b16715ebe1519b3bb8ef0d027b8c1b3f7c SHA256 f645221a1790ae719405859e7be91076947a82ea938cf5d1a1e94c70ab70a694
+MD5 3203ed4af7ea39da501e1bf1dee1265b files/laptop_mode.init 924
+RMD160 7587e9725ca20164e0f5942eb16fbdf743d51ca8 files/laptop_mode.init 924
+SHA256 f645221a1790ae719405859e7be91076947a82ea938cf5d1a1e94c70ab70a694 files/laptop_mode.init 924
+DIST laptop-mode-tools_1.31.tar.gz 86554 RMD160 042b15337a365c6efd1d60ea74c4412fed7949df SHA1 4a2630818a3e30095d2339ab09aa2fb5a4213adf SHA256 cc2475a237c6d1b95667d464ebece1fbf5a518262fc9a74363ef820ba168d29e
+EBUILD laptop-mode-tools-1.31.ebuild 2325 RMD160 a1d9356686dc6125f83553ac57ee82e4e5f9e54a SHA1 e52c0853897859505bba0c2deafe76039915b934 SHA256 1370a0ba6b368948bbb6560b0f7e66ae37af34f303a6bdfc59e1565a59d96a7f
+MD5 08d6d21fa27263ae42262962f763bf09 laptop-mode-tools-1.31.ebuild 2325
+RMD160 a1d9356686dc6125f83553ac57ee82e4e5f9e54a laptop-mode-tools-1.31.ebuild 2325
+SHA256 1370a0ba6b368948bbb6560b0f7e66ae37af34f303a6bdfc59e1565a59d96a7f laptop-mode-tools-1.31.ebuild 2325
+MISC ChangeLog 5875 RMD160 fadec24861ebe8b24d68e630df17a4bcb44092ba SHA1 2edb0530ea1fba39e111cf26c573ba43a7b42b9d SHA256 e59cdc4a216f022832dee84195890b1bbf84ff948f92382917ef01b13193f14e
+MD5 4dc58f95872b8c2ebe5183370fd34608 ChangeLog 5875
+RMD160 fadec24861ebe8b24d68e630df17a4bcb44092ba ChangeLog 5875
+SHA256 e59cdc4a216f022832dee84195890b1bbf84ff948f92382917ef01b13193f14e ChangeLog 5875
+MISC metadata.xml 250 RMD160 876c64d1767e4bdd32723fa285a7dabf15f1e82e SHA1 60f90e59de723ec974b5e2d8c3a952c3ea378f6f SHA256 fd3c97233444ca2664cd393f484f4cba1ace7b76c686112b098ab45a4cebbe0e
+MD5 672d42771a5a69fdbc5ba1648d133812 metadata.xml 250
+RMD160 876c64d1767e4bdd32723fa285a7dabf15f1e82e metadata.xml 250
+SHA256 fd3c97233444ca2664cd393f484f4cba1ace7b76c686112b098ab45a4cebbe0e metadata.xml 250
+MD5 2e18e3322300b28d9c74f6834d2331c2 files/digest-laptop-mode-tools-1.31 265
+RMD160 cb42f46c45b157347f4f9943adf514e1b9de36c8 files/digest-laptop-mode-tools-1.31 265
+SHA256 744bbe53a3baea9d164005caac681a20b72789507aebeeb397df9796df504bb4 files/digest-laptop-mode-tools-1.31 265
diff --git a/app-laptop/laptop-mode-tools/files/digest-laptop-mode-tools-1.31 b/app-laptop/laptop-mode-tools/files/digest-laptop-mode-tools-1.31
index f041c68ad7fa..1ba9b9650669 100644
--- a/app-laptop/laptop-mode-tools/files/digest-laptop-mode-tools-1.31
+++ b/app-laptop/laptop-mode-tools/files/digest-laptop-mode-tools-1.31
@@ -1 +1,3 @@
 MD5 a332179ae046292b232234eb444b2122 laptop-mode-tools_1.31.tar.gz 86554
+RMD160 042b15337a365c6efd1d60ea74c4412fed7949df laptop-mode-tools_1.31.tar.gz 86554
+SHA256 cc2475a237c6d1b95667d464ebece1fbf5a518262fc9a74363ef820ba168d29e laptop-mode-tools_1.31.tar.gz 86554
diff --git a/app-laptop/laptop-mode-tools/files/laptop_mode.init b/app-laptop/laptop-mode-tools/files/laptop_mode.init
new file mode 100644
index 000000000000..d02cdcc2e3af
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/files/laptop_mode.init
@@ -0,0 +1,42 @@
+#!/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.1 2006/07/19 11:16:26 uberlord Exp $
+
+opts="${opts} reload"
+
+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.31.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.31.ebuild
index d50e8627e189..4a260d3bacbb 100644
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.31.ebuild
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.31.ebuild
@@ -1,10 +1,10 @@
 # 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/laptop-mode-tools-1.31.ebuild,v 1.2 2006/05/26 12:10:59 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/laptop-mode-tools-1.31.ebuild,v 1.3 2006/07/19 11:16:26 uberlord Exp $
 
 inherit fixheadtails linux-info
 
-MY_P=${PN}_${PV}
+MY_P="${PN}_${PV}"
 
 DESCRIPTION="Linux kernel laptop_mode user-space utilities"
 HOMEPAGE="http://www.xs4all.nl/~bsamwel/laptop_mode/tools/"
@@ -38,7 +38,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
-	ht_fix_file ${S}/usr/sbin/lm-profiler
+	ht_fix_file "${S}"/usr/sbin/lm-profiler
 }
 
 src_install() {
@@ -50,7 +50,7 @@ src_install() {
 	doins etc/laptop-mode/laptop-mode.conf
 	doins etc/laptop-mode/lm-profiler.conf
 
-	newinitd ${FILESDIR}/${P}-init.d laptop_mode
+	newinitd "${FILESDIR}"/laptop_mode.init laptop_mode
 
 	keepdir /etc/laptop-mode/batt-start
 	keepdir /etc/laptop-mode/batt-stop
diff --git a/app-laptop/laptop-mode-tools/metadata.xml b/app-laptop/laptop-mode-tools/metadata.xml
index cfbdff13bd61..8cc674ef58f5 100644
--- a/app-laptop/laptop-mode-tools/metadata.xml
+++ b/app-laptop/laptop-mode-tools/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>mobile</herd>
 <maintainer>
-  <email>brix@gentoo.org</email>
-  <name>Henrik Brix Andersen</name>
+  <email>uberlord@gentoo.org</email>
+  <name>Roy Marples</name>
 </maintainer>
 </pkgmetadata>