Improve init.d script detection of baselayout-1 wrt #270646#c52.

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

4 files changed, 24 insertions, 16 deletions

diff --git a/sys-power/acpid/ChangeLog b/sys-power/acpid/ChangeLog
index 989ca02ce732..20f424c683e1 100644
--- a/sys-power/acpid/ChangeLog
+++ b/sys-power/acpid/ChangeLog
@@ -1,10 +1,14 @@
 # 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.70 2011/08/04 18:01:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.71 2011/08/05 08:47:40 ssuominen Exp $
+
+  05 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> acpid-2.0.11.ebuild,
+  files/acpid-2.0.11-init.d:
+  Improve init.d script detection of baselayout-1 wrt #270646#c52.
 
   04 Aug 2011; Samuli Suominen <ssuominen@gentoo.org>
   files/acpid-2.0.11-init.d:
-  Improve init.d script more for baselayout-2.
+  Improve init.d script 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 a5bcfe848a24..49ffeb1ae1bc 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -4,20 +4,20 @@ 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 752 RMD160 d84b00a74310a833cf594dab067b2b9e3e250ac0 SHA1 ff32cfa6c16bc3b1b8e46015fa7482dd37b58417 SHA256 2bb2d894e273eae0d602ac54fd2359a715712458fe37bbe27708ef8754e65d47
+AUX acpid-2.0.11-init.d 705 RMD160 4be48a2621d676b5a3e0d224f453f2ca76e1239a SHA1 26c0bf6cf54eb7f1722a7d3bda4d2e1231b0323b SHA256 f1f818f7e085ecd8b46992a89ff0471558bb8ddbebbaa677089dcabb993c286d
 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
 DIST acpid-2.0.11.tar.gz 76308 RMD160 c7c40795f8556ceb63fc25891680dfccabd0814f SHA1 f136038ffecb0f9195708df0b04524f0b993b669 SHA256 2fcd7da9c439dfd6dca3f4bfab2ae39d4210bf61d72050632c2933fef96c281d
 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.11.ebuild 1319 RMD160 622deed56e0e3b31d70da9a728e1078914593f29 SHA1 8da39758a65ee1546f53dbd06946ef6df27aae4a SHA256 5dd0ead368a7cb7085e7c8ab1ff4c0f1369326b5c0542fef47852a142b3af2c1
 EBUILD acpid-2.0.9.ebuild 1214 RMD160 e6cc05c528bb6c4b7ddfa6dfc05e3ff0b5398519 SHA1 d89b836ae420746465f258206a3c6d0f90410f13 SHA256 262f50be888f11155eaaf1b3bdd6a551da0e80ef543390f21b2812ad2adfa5ea
-MISC ChangeLog 13513 RMD160 889792d19891530fc765452146f6fe385acec46e SHA1 f7645c77a0db8728bf5307262ba7f2c53b07dad1 SHA256 ac2c1759cd8d544428dc8e3fc69de2dcf111f364a78f0dc85ea6012f603dcc60
+MISC ChangeLog 13680 RMD160 eb2fded0098d0d79666461d3aef229e1a1d9e753 SHA1 67f30198d4b63ee24b79123ae059b1994b80db0a SHA256 c020d03861d233c6e5514f0dadcc5a875fdbc4a65f9536456b3336ef4a54fb37
 MISC metadata.xml 161 RMD160 a5e1f234c4886ff31d39f229a0cf30d0bfcea869 SHA1 3876fd42cd9e63a7edb04c5025d53d773aa80bc3 SHA256 838bd208a7f948ea9b4e2b8869464622bc64a2f02468de4c3d7f6c2530e28e89
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk463l8ACgkQXkR9YqOcLPHHoQD/V/F0+P7YTEe81XxBH4NCxGXL
-DLYKLLUKPwB1/n9g9IoA/i1p+L2ih5AdGQirnQ2lZmJXIbTLnevQde+nslW4yiiL
-=JYzu
+iF4EAREIAAYFAk47rXYACgkQXkR9YqOcLPGS2QD6A6uLA1vmdRUGf32HI8WB7Jc+
+GkWWWF1rvEJuQELj5zwA/3RXVpO2hIbQa5N8/aeSzYGF4HKTx7HoOn+/S4DF4N0B
+=XZtE
 -----END PGP SIGNATURE-----
diff --git a/sys-power/acpid/acpid-2.0.11.ebuild b/sys-power/acpid/acpid-2.0.11.ebuild
index 281fc1e2640a..2f3d5c2f1e6b 100644
--- a/sys-power/acpid/acpid-2.0.11.ebuild
+++ b/sys-power/acpid/acpid-2.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-2.0.11.ebuild,v 1.1 2011/08/04 17:01:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-2.0.11.ebuild,v 1.2 2011/08/05 08:47:40 ssuominen Exp $
 
 EAPI=4
 inherit eutils systemd toolchain-funcs
@@ -14,6 +14,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~ia64 -ppc ~x86"
 IUSE=""
 
+RDEPEND="!<sys-apps/openrc-0.6.0"
+DEPEND=""
+
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.0.3.patch
 }
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 444f914dc28e..f7f8139f07fd 100644
--- a/sys-power/acpid/files/acpid-2.0.11-init.d
+++ b/sys-power/acpid/files/acpid-2.0.11-init.d
@@ -1,7 +1,7 @@
 #!/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.5 2011/08/04 18:04:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/files/acpid-2.0.11-init.d,v 1.6 2011/08/05 08:47:40 ssuominen Exp $
 
 extra_commands="reload"
 command="/usr/sbin/acpid"
@@ -10,16 +10,17 @@ 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
 }
 
+if [ "${RC_VERSION:-0}" = "0" ]; then
+	start() {
+		eerror "This script cannot be used for baselayout-1."
+		return 1
+	}
+fi
+
 reload() {
 	ebegin "Reloading acpid configuration"
 	start-stop-daemon --exec $command --signal HUP