summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2009-06-16 14:05:36 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2009-06-16 14:05:36 +0000
commitd523e13b7b1147e43cb8ac7f2728435bfc19a574 (patch)
tree750a6f0958d35df78156f84d3a8be27251557d48 /sys-power/apcupsd
parentMasked new alpha release. Pay particular attention to the fully rewritten ALS... (diff)
downloadhistorical-d523e13b7b1147e43cb8ac7f2728435bfc19a574.tar.gz
historical-d523e13b7b1147e43cb8ac7f2728435bfc19a574.tar.bz2
historical-d523e13b7b1147e43cb8ac7f2728435bfc19a574.zip
Only install the powerfail init script if openrc is installed; this way it's not polluting the installation for baselayout 1 users. Closes bug #271480.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'sys-power/apcupsd')
-rw-r--r--sys-power/apcupsd/ChangeLog8
-rw-r--r--sys-power/apcupsd/Manifest10
-rw-r--r--sys-power/apcupsd/apcupsd-3.14.6.ebuild7
3 files changed, 17 insertions, 8 deletions
diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index 5519fc56c709..cc5acbb28ba1 100644
--- a/sys-power/apcupsd/ChangeLog
+++ b/sys-power/apcupsd/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-power/apcupsd
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.48 2009/05/23 12:03:34 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.49 2009/06/16 14:05:36 flameeyes Exp $
+
+ 16 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+ apcupsd-3.14.6.ebuild:
+ Only install the powerfail init script if openrc is installed; this way
+ it's not polluting the installation for baselayout 1 users. Closes bug
+ #271480.
23 May 2009; Markus Meier <maekke@gentoo.org> apcupsd-3.14.5-r2.ebuild:
amd64 stable, bug #255048
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index 2330d73ebd7a..757b34d0d6ac 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -20,13 +20,13 @@ DIST apcupsd-3.14.6.tar.gz 4269348 RMD160 67ff929e10373661545c588a7fba630ffdfe3a
EBUILD apcupsd-3.10.18-r1.ebuild 2614 RMD160 4136189b375cdd5b50fa1e98bcff757406ea8e66 SHA1 de25eb0d627ca017c4f5d27119ffaba709125735 SHA256 f5004d36d0c5a41df6c4fa9fe5e2cc3c49894a7aef927e79cfb72a1cce04ee39
EBUILD apcupsd-3.12.4.ebuild 3028 RMD160 257a1dcc849ba616569693b7fb685c7be4a5d6f8 SHA1 41a0e20c82b02fe9158f3a45bd816fa66c4ac46a SHA256 86c0a2f5ffe869f5ea0db0220264d1109dcab7f4c395533e8dd5c87c478b59c9
EBUILD apcupsd-3.14.5-r2.ebuild 3617 RMD160 dc84a19b8477dcd42f27a8687c6cca09c012e057 SHA1 7bc8fb4ba7bd67fe7a19581dc7699c2508bf8467 SHA256 f4fff08cbab19b0006944258e5f57411c6117a3503791ecb060fc23421f269a3
-EBUILD apcupsd-3.14.6.ebuild 3247 RMD160 a1f11c4b65d743ed97181f00942257aa99b534a7 SHA1 6a7d48ce70e2699b18260af71cd0fffa47794a83 SHA256 a5cd152f29d3447b4600fd29e5c8db7bbe4f17d6d17c828bd2668652499003e2
-MISC ChangeLog 20849 RMD160 f14ed41b5c205f525a3c190902cecf2bdc51c562 SHA1 192af803aa70590c60105652bfa389d7d654e66c SHA256 f8024d5f3d4d3d533059d27b6fd27e2f3993083885bb100422c185d81dac395c
+EBUILD apcupsd-3.14.6.ebuild 3291 RMD160 d0ebc2f2e1013f30f076c2045a20119a11f198cb SHA1 76e466e9ceac0f7afaac5486061110314f6ac8f5 SHA256 6c1690b5317b12921dc7181fdd17aea12d4bf64a64782d51fe1a7c7b75b973e3
+MISC ChangeLog 21092 RMD160 180a6a8979d1f2331f760afab33008a5a2635baf SHA1 23cf3fc9b94a3c4705ed5455821940e4eb9a53ae SHA256 d6e28265d586dcf23f8c537fe4f131e9c8d6fc1254eaccf3c34f6cc38525c7fa
MISC metadata.xml 237 RMD160 2a4fab832a64fbdafe2cd6f59b141b2aa80797ac SHA1 75878fb1a17b8617882c9e02331a6643d647882b SHA256 368acc29aa9214adaa137c17b114b16c6a021c4dfc9efa5f3440e968db04a9b3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkoX5iYACgkQkKaRLQcq0GKORQCgoYErb6GF3KS9qOYJbH8RhVI6
-xhIAn21N5I5bkiieZuSup6wx1xFLMcC4
-=eFWX
+iEYEARECAAYFAko3prYACgkQAiZjviIA2Xh7PACfXQi8dKzuOGMWPvUwQaq0thtY
+CEIAoI6y1i0OHgexadxr6vZquvOg9+B0
+=k43G
-----END PGP SIGNATURE-----
diff --git a/sys-power/apcupsd/apcupsd-3.14.6.ebuild b/sys-power/apcupsd/apcupsd-3.14.6.ebuild
index 56e93859e753..d1c4d78f053c 100644
--- a/sys-power/apcupsd/apcupsd-3.14.6.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.6.ebuild,v 1.1 2009/05/16 20:50:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.6.ebuild,v 1.2 2009/06/16 14:05:36 flameeyes Exp $
WEBAPP_MANUAL_SLOT="yes"
WEBAPP_OPTIONAL="yes"
@@ -77,7 +77,10 @@ src_install() {
rm "${D}"/etc/init.d/apcupsd
newinitd "${FILESDIR}/${PN}.init.2" "${PN}" || die "newinitd failed"
- newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail || die "newinitd failed"
+
+ if has_version sys-apps/openrc; then
+ newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail || die "newinitd failed"
+ fi
}
pkg_postinst() {