Improve init.d script more for baselayout-2.

Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64

3 files changed, 19 insertions, 21 deletions

diff --git a/sys-power/acpid/ChangeLog b/sys-power/acpid/ChangeLog
index 228899cb881b..989ca02ce732 100644
--- a/sys-power/acpid/ChangeLog
+++ b/sys-power/acpid/ChangeLog
@@ -1,10 +1,10 @@
 # ChangeLog for sys-power/acpid
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.69 2011/08/04 17:30:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.70 2011/08/04 18:01:50 ssuominen Exp $
 
   04 Aug 2011; Samuli Suominen <ssuominen@gentoo.org>
   files/acpid-2.0.11-init.d:
-  Rename opts="reload" as extra_commands="reload" for baselayout-2.
+  Improve init.d script more for baselayout-2.
 
   04 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> -acpid-2.0.6.ebuild,
   -acpid-2.0.10.ebuild:
diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index 6afe324b7318..0f7452ff8392 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -4,7 +4,7 @@ Hash: SHA256
 AUX acpid-1.0.4-default 663 RMD160 5e40661ec9112c3cc675a0d283e96311d2d159f1 SHA1 e74b2f7388c303fc3d3e33c0500d4b8185474dce SHA256 2b18111978043d68848983a54dfc946dd9b9b15592d0f4dc33491599dbe24b23
 AUX acpid-1.0.6-conf.d 156 RMD160 a7c8822a88b51f185c8740b075c968d0c045791d SHA1 497f35e98f1f499d2223c52f4491218b3def489a SHA256 5dfc6dbf687a47e853b0a9f9ed491cb1778b0d99195df5e7a5de849d269ca28c
 AUX acpid-1.0.6-default.sh 1214 RMD160 1d656cee490664931062cb6a8f6ee968b48f28d1 SHA1 52b7a36da5915dfb72636cf554d5b0aa99779ecc SHA256 9d95f204b39129758de47bd0b003ff47501759db98a8641034e1203130ea1f52
-AUX acpid-2.0.11-init.d 650 RMD160 025922e099bfb3abd6e9f7c16766f7afb2bf91fc SHA1 4c9f347a8b42b734fe5fdf3e8dce30f3c61c8223 SHA256 be7f9e2e816bbfc0d77539d4cbee012a642d3bb352e0fbd7a23624bae156db70
+AUX acpid-2.0.11-init.d 759 RMD160 50000bb06b3ff743e430520bc5411944a129cdac SHA1 7031c6dc384301cb03e6d1ca0f0d1da228550c21 SHA256 134c2850d592150aa90ca71e022c7671b0909964434fcab4f4048e5e59c9ca69
 AUX acpid-2.0.3-init.d 668 RMD160 66d460850e02e8e817c3dbabef120a0d0e53758f SHA1 f4fc04c345215eb4c1ec971d284cb18a9405a0e8 SHA256 70d0ffc4cc11046e4445619784e187c009a97273b9826e7f62a0b7c92aa330d0
 AUX acpid-2.0.3.patch 881 RMD160 81a32d23d72e3104d67c37863f14aa88fe8b5b39 SHA1 ea9c629cbfed5f2e3e34c4d242fcff2b69fda51d SHA256 d313d9645e705221ef9f4610a0b127ee38240125d5e2f39554537bde38a7a813
 AUX acpid.service 135 RMD160 dee559a0c4e8ae4372002851e518f1477ff1d1eb SHA1 47f40dee8d2e341b9c96f70a61439b6a1837dd52 SHA256 c01b8cc2532c4a130c020f042ab9e9be9a9ff075ad7c2e9c9f971a57b40b5cc6
@@ -12,12 +12,12 @@ DIST acpid-2.0.11.tar.gz 76308 RMD160 c7c40795f8556ceb63fc25891680dfccabd0814f S
 DIST acpid-2.0.9.tar.gz 75552 RMD160 45352e7e2a318c68e4464b29537b9f3b00a87155 SHA1 b64ed84c53997a33650205f1582bf60a68688d53 SHA256 f02a4931083ef52e6785c989d9d44720387c1d65a42bdcd364e3b06cd588ba65
 EBUILD acpid-2.0.11.ebuild 1274 RMD160 79629ca984242f0ba45011809407643d25ecbee8 SHA1 e295f90c6b792474b2df77fecba13628b9ba394c SHA256 5bd632317e182f162e31ff4432cc95275fc643759617d9b086aae47dbc5d6eb1
 EBUILD acpid-2.0.9.ebuild 1214 RMD160 e6cc05c528bb6c4b7ddfa6dfc05e3ff0b5398519 SHA1 d89b836ae420746465f258206a3c6d0f90410f13 SHA256 262f50be888f11155eaaf1b3bdd6a551da0e80ef543390f21b2812ad2adfa5ea
-MISC ChangeLog 13534 RMD160 df5d8c6fe343537cbf7038d35e42d98bd7830541 SHA1 7e8840208eba3442271ea4006c1db704181f79d3 SHA256 5e0709eb0ccb276a233d4d472d31619e3b64e976077bcf2b60f039adea05cbfe
+MISC ChangeLog 13513 RMD160 889792d19891530fc765452146f6fe385acec46e SHA1 f7645c77a0db8728bf5307262ba7f2c53b07dad1 SHA256 ac2c1759cd8d544428dc8e3fc69de2dcf111f364a78f0dc85ea6012f603dcc60
 MISC metadata.xml 161 RMD160 a5e1f234c4886ff31d39f229a0cf30d0bfcea869 SHA1 3876fd42cd9e63a7edb04c5025d53d773aa80bc3 SHA256 838bd208a7f948ea9b4e2b8869464622bc64a2f02468de4c3d7f6c2530e28e89
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk461mgACgkQXkR9YqOcLPHLuwD/bngPzwf+tk9aD/nxd8LA2BVt
-1Tw0zSkwWUWvoQxe3w8A/27vy04IRMtsJjU+JpnSArnXBUbwJh1bCE+40mbzxJtz
-=NAdZ
+iF4EAREIAAYFAk463dwACgkQXkR9YqOcLPElGAEAmHmAIGmoqBjgA1ZEpq1lk5ox
+kXZcGEEwqfU5tENpgkIA/i5U4T2OPKvGSkHYvo9TwACCKiQB+pBYXMB1yZYz//tH
+=2AKk
 -----END PGP SIGNATURE-----
diff --git a/sys-power/acpid/files/acpid-2.0.11-init.d b/sys-power/acpid/files/acpid-2.0.11-init.d
index 867e77a302a9..2fc73e353950 100644
--- a/sys-power/acpid/files/acpid-2.0.11-init.d
+++ b/sys-power/acpid/files/acpid-2.0.11-init.d
@@ -1,29 +1,27 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/files/acpid-2.0.11-init.d,v 1.3 2011/08/04 17:30:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/files/acpid-2.0.11-init.d,v 1.4 2011/08/04 18:01:50 ssuominen Exp $
 
 extra_commands="reload"
+command="/usr/sbin/acpid"
+command_args="${ACPID_OPTIONS}"
+start_stop_daemon_args="--quiet"
+description="Daemon for Advanced Configuration and Power Interface"
 
 depend() {
+	if [ ! -f /etc/init.d/sysfs ]; then
+		eerror "The $SVCNAME init-script is written for baselayout-2!"
+		eerror "Please do not use it with baselayout-1!".
+		return 1
+        fi
+
 	need localmount
 	use logger
 }
 
-start() {
-	ebegin "Starting acpid"
-	start-stop-daemon --start --quiet --exec /usr/sbin/acpid -- ${ACPID_OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping acpid"
-	start-stop-daemon --stop --exec /usr/sbin/acpid
-	eend $?
-}
-
 reload() {
 	ebegin "Reloading acpid configuration"
-	start-stop-daemon --exec /usr/sbin/acpid --signal HUP
+	start-stop-daemon --exec $command --signal HUP
 	eend $?
 }