Avoid depending on OpenRC for the old versions, .9 will be the one openrc-only, the older ones will have to work with baselayout 1 as well, for people not updating right now.

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

5 files changed, 55 insertions, 13 deletions

diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index 773751bdcddf..c5951000871e 100644
--- a/sys-power/apcupsd/ChangeLog
+++ b/sys-power/apcupsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/apcupsd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.73 2011/08/26 10:53:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.74 2011/08/29 13:38:55 flameeyes Exp $
+
+  29 Aug 2011; Diego E. Pettenò <flameeyes@gentoo.org> apcupsd-3.14.7.ebuild,
+  apcupsd-3.14.8-r1.ebuild, +files/apcupsd.init.2a:
+  Avoid depending on OpenRC for the old versions, .9 will be the one
+  openrc-only, the older ones will have to work with baselayout 1 as well, for
+  people not updating right now.
 
 *apcupsd-3.14.9-r1 (26 Aug 2011)
 
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index e7c39da01e8a..eef090ae2aad 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -4,19 +4,20 @@ Hash: SHA1
 AUX apcupsd-3.14.9-aliasing.patch 2108 RMD160 c906bdab1976ca3bda05ea55e0f3135dfbc8da9f SHA1 c03d48a0c3a7beb884143fda01d48e526fd634fb SHA256 21343f4798121a828a89eee49ca9fe7574b2fb45a5aad35fbfd5aabec7740761
 AUX apcupsd-udev.rules 328 RMD160 359a2b9e275cdf16b9177224599791c786f93c98 SHA1 c681daa68f6b84ba96522ef4ecff583d1acdc82a SHA256 0865097a99b321301ec5b0bb51d0560a01df0a21cca0ee0df61f8d33f888b86a
 AUX apcupsd.init.2 859 RMD160 81cd9edda39ec6f9cf048811df80d4f9dcd7055d SHA1 25c8134f09c362d6e82c5aa32e77a5f89c5eea1a SHA256 7007a2484547e46da2264d9f817a96387885e91a38407ec30e122ba4b637a030
+AUX apcupsd.init.2a 844 RMD160 13d0f7862c2a1d93a2349e7099f90216f8fe1056 SHA1 70e90bb3e3c1c3dd599a457efc0549627388322d SHA256 86be1bafb0cf72db61def444361c659e5c36d0e44b1a007772b3f49aa0e95bcb
 AUX apcupsd.powerfail.init 520 RMD160 24f766871652220523a18885f41f6608f29ab670 SHA1 0c5f97e556504904ffd6d72ff27ef792ac70e18c SHA256 eee773aa07175674085cb0ab7ed2c071fcc04fc05383d368f38d056e7327ff35
 DIST apcupsd-3.14.7.tar.gz 4272089 RMD160 cb3db3e6e123f39666eef3c5ccfdec65c57a1571 SHA1 9561eb5cf8e0c627215b987dbb97d026a2b2e9b8 SHA256 7e3df3b5552394206f4b8aaac2bd85ac69df540495557676a3df63f84972823c
 DIST apcupsd-3.14.8.tar.gz 1317601 RMD160 f642582e01506ebb986c16df01429e6bb08c7e8b SHA1 cb7a7b401797e129c92a6b8dc2bf7b193b1d6c72 SHA256 8e7f2574d3abaf6637da3e790860c3f9ba64fab1ec7e50bb080de4439441c5a7
 DIST apcupsd-3.14.9.tar.gz 1334762 RMD160 be1a33b85c790fc3bc62bab370a62d014dbf0a57 SHA1 1e9e8a054f17c554c047ec1d7b363d35553058bc SHA256 0041f00b2e628056e668db7298d0af0ad501fe127e0c5c344eec9873a0988a92
-EBUILD apcupsd-3.14.7.ebuild 4070 RMD160 074b343c8df890a20ea2e6cb513a1c2c5eb20c3a SHA1 3c9312ef721028415e2df32d38ecb743f53d1665 SHA256 4a16b9cc4e1948d3849362bdc817b4bf0668f9de1a792c2f5c1da6aa86f93939
-EBUILD apcupsd-3.14.8-r1.ebuild 3883 RMD160 b36a6599059712cbec48610c9876c22e596ee254 SHA1 f71f2c9c267b13a98cda9be75955cdbfcdffb72d SHA256 2b48d3475b1d4c454cfabd4afac69e9db69271a02df1bfa43102cd75dab1da9e
+EBUILD apcupsd-3.14.7.ebuild 4054 RMD160 95babcf8551ca20746ac11ce3a77d32164c264d0 SHA1 11b79f99dd5e3549eaf2f208489db433d1acd2da SHA256 2271394fd3be4da222814cb4432824c94893139b888d23415642e08b8a99ae78
+EBUILD apcupsd-3.14.8-r1.ebuild 3867 RMD160 14e28cbf5f7fd5e22d67bcada9b8782bcc23c3c8 SHA1 6cd0248ce91c11ce9c2bc745e334b50b668ab5cc SHA256 6793b388e1fa30f52938caf4f37e326daa61790de3afe33bc402b325671b3dea
 EBUILD apcupsd-3.14.9-r1.ebuild 4064 RMD160 2a8a4819781c85ce821a0dce9a5a724ac0e21ceb SHA1 a9914ebae05b47899a56756e69b595ef58857ae1 SHA256 ac4d9701ea5eddf422f6771a8ece4f37966eb8db66fb60b14de01861a4bfb771
-MISC ChangeLog 25226 RMD160 4591088e3e8e27756b23e1228c91407390797d6f SHA1 98448a250e321f61ea54abc1b80487d2fb84c96f SHA256 a058c099a456cc0ce80187a449ed0605dc67b026468b020512c99755c529fb99
+MISC ChangeLog 25539 RMD160 7bef28e61f62086ed9efceeebf87615a4b16d6ea SHA1 c2748087804a36ea1c5ec0ef91602266ecb74360 SHA256 f4772aca44fc4b82fadd7b188f61504b106ae8460285df434be57d6c4f1a4ab6
 MISC metadata.xml 237 RMD160 2a4fab832a64fbdafe2cd6f59b141b2aa80797ac SHA1 75878fb1a17b8617882c9e02331a6643d647882b SHA256 368acc29aa9214adaa137c17b114b16c6a021c4dfc9efa5f3440e968db04a9b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5Xez8ACgkQAiZjviIA2XhyPACdGIUeiLGH5b5Yo+tJfckULYty
-EhwAnRD5oNF7EikZ+Ft8RlVoWTKHkjZu
-=G950
+iEYEARECAAYFAk5blmYACgkQAiZjviIA2XjINgCgnmW/gOSDZBKQFUblYDS3hDvD
+QG8An0pysQm6QCK0cHv+IbQeih2xJ98H
+=OtNK
 -----END PGP SIGNATURE-----
diff --git a/sys-power/apcupsd/apcupsd-3.14.7.ebuild b/sys-power/apcupsd/apcupsd-3.14.7.ebuild
index f9a46ee943d5..455909daad55 100644
--- a/sys-power/apcupsd/apcupsd-3.14.7.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.7.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/apcupsd/apcupsd-3.14.7.ebuild,v 1.10 2011/08/26 10:08:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.7.ebuild,v 1.11 2011/08/29 13:38:55 flameeyes Exp $
 
 WEBAPP_MANUAL_SLOT="yes"
 WEBAPP_OPTIONAL="yes"
@@ -24,7 +24,6 @@ DEPEND="
 		=dev-libs/glib-2*
 		>=gnome-base/gconf-2.0 )"
 RDEPEND="${DEPEND}
-	sys-apps/openrc
 	virtual/mailx"
 
 pkg_setup() {
@@ -92,7 +91,7 @@ src_install() {
 	use cgi && webapp_src_install
 
 	rm "${D}"/etc/init.d/apcupsd
-	newinitd "${FILESDIR}/${PN}.init.2" "${PN}" || die "newinitd failed"
+	newinitd "${FILESDIR}/${PN}.init.2a" "${PN}" || die "newinitd failed"
 
 	if has_version sys-apps/openrc; then
 		newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail || die "newinitd failed"
diff --git a/sys-power/apcupsd/apcupsd-3.14.8-r1.ebuild b/sys-power/apcupsd/apcupsd-3.14.8-r1.ebuild
index be11676f8bc5..f2b4b15f0de9 100644
--- a/sys-power/apcupsd/apcupsd-3.14.8-r1.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.8-r1.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/apcupsd/apcupsd-3.14.8-r1.ebuild,v 1.6 2011/08/26 10:08:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.8-r1.ebuild,v 1.7 2011/08/29 13:38:55 flameeyes Exp $
 
 EAPI=3
 
@@ -23,7 +23,6 @@ DEPEND="
 		dev-libs/glib:2
 		>=gnome-base/gconf-2.0 )"
 RDEPEND="${DEPEND}
-	sys-apps/openrc
 	virtual/mailx"
 
 CONFIG_CHECK="~USB_HIDDEV ~HIDRAW"
@@ -87,7 +86,7 @@ src_install() {
 	dohtml -r doc/manual/* || die "dodoc failed"
 
 	rm "${D}"/etc/init.d/apcupsd
-	newinitd "${FILESDIR}/${PN}.init.2" "${PN}" || die "newinitd failed"
+	newinitd "${FILESDIR}/${PN}.init.2a" "${PN}" || die "newinitd failed"
 
 	if has_version sys-apps/openrc; then
 		newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail || die "newinitd failed"
diff --git a/sys-power/apcupsd/files/apcupsd.init.2a b/sys-power/apcupsd/files/apcupsd.init.2a
new file mode 100644
index 000000000000..f82c9d123649
--- /dev/null
+++ b/sys-power/apcupsd/files/apcupsd.init.2a
@@ -0,0 +1,37 @@
+#!/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/apcupsd/files/apcupsd.init.2a,v 1.1 2011/08/29 13:38:55 flameeyes Exp $
+
+INSTANCE="${SVCNAME#*.}"
+if [ -z "${INSTANCE}" ] || [ "${SVCNAME}" = "apcupsd" ]; then
+	INSTANCE="apcupsd"
+fi
+
+depend() {
+	use net
+}
+
+start() {
+	rm -f /etc/apcupsd/powerfail
+
+	export SERVICE="${SVCNAME}"
+
+	ebegin "Starting APC UPS daemon"
+	start-stop-daemon \
+		--start --pidfile "/var/run/${SVCNAME}.pid" \
+		--exec /sbin/apcupsd -- \
+		-f "/etc/apcupsd/${INSTANCE}.conf" \
+		-P "/var/run/${SVCNAME}.pid"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping APC UPS daemon"
+	start-stop-daemon \
+		--stop --pidfile "/var/run/${SVCNAME}.pid" \
+            	--retry TERM/5/TERM/5 \
+		--exec /sbin/apcupsd
+	eend $?
+}
+