Backport unit files to allow faster stabilization

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 141 insertions, 5 deletions

diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index be01850af50f..c4ad1fd49fc2 100644
--- a/sys-power/apcupsd/ChangeLog
+++ b/sys-power/apcupsd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-power/apcupsd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.83 2013/08/31 12:46:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.84 2013/09/28 10:13:42 pacho Exp $
+
+*apcupsd-3.14.8-r2 (28 Sep 2013)
+
+  28 Sep 2013; Pacho Ramos <pacho@gentoo.org> +apcupsd-3.14.8-r2.ebuild:
+  Backport unit files to allow faster stabilization
 
 *apcupsd-3.14.10-r2 (31 Aug 2013)
 
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index 89c92dd3f2c8..0c36d507314a 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -13,12 +13,13 @@ DIST apcupsd-3.14.8.tar.gz 1317601 SHA256 8e7f2574d3abaf6637da3e790860c3f9ba64fa
 EBUILD apcupsd-3.14.10-r1.ebuild 4060 SHA256 8bd603ca14f6e42a573559d8588354240f74a4eff4b4cab7d62f460320e06fd8 SHA512 6b37efe12be278bce4b6bf7a17c88641bfe13c8304c383112a3309fca33609ca9d02ede3b6c23ed325064878da6e4c8f441ad39e92e68d791fd6348c228f0ca3 WHIRLPOOL 470e178eff2d7e1dcdc19e1860396dd9ca494f10d6e15ab60a9635b763b0f60192a883bec5a5c60ccc00fc3f48aa0035117804384d03d17b8e1cc23be949d579
 EBUILD apcupsd-3.14.10-r2.ebuild 4177 SHA256 3ee47fde9a2f7be55208b2f2bbe88fe1cdf57c21783486195e7a904d476bf680 SHA512 af68e532b23719323a88e61e222eb48b5502d022d6d1ea21d56352edbe5cfeeb844b483d77c451940b6eb01c713bcc206b4365369bda7082794cdc327b2e3d0e WHIRLPOOL 54c92f7dffea8841af85867173c36cd361732a0e4ef90f3020c5e2ed7a8078eb2e1157441c2510b234cb7fdb04ee4b36b29dfb296d9227ebe8aa1bc968015599
 EBUILD apcupsd-3.14.8-r1.ebuild 3863 SHA256 f5d984daecd4a0af67bdd5c44abeea7a4f47ed6ee94623e64e89116ff77e83b5 SHA512 5abc26eb6a258f39d7b4a617e87ee00a51c23aaeff76edd9fbc5a7b898552c5e1a270acd941d7e4d5818184d807e986da0593c239f6945c8d652867966197220 WHIRLPOOL 6ef00f538fdd0da2ac2639ece9e3209ba87190032c650cb003e7358e9f8e66f5255f58bacd0a59a7a16f17f2c393af4fb23eba14af403289444fc18d5b0140d4
-MISC ChangeLog 26842 SHA256 194461f90ade0728c0bd2bc77685f4d8c19b009f8a5fa14aecbbefa5e7af3431 SHA512 d607d09cb31e6b593beb082f18e929c663d06c899527a23e2693d763b83dad89733cda7d075a31e3e39c3f1a505640423936f542dd969b4a5def494b74ea0229 WHIRLPOOL efc3489780f3ce8a37a2275668f2899ce0c3bc3f6bb2633e6c0ab337a23905b0c6c00a7fb01f357bf310806cd947fbfb0d489ffeddb579cf38f204157c752032
+EBUILD apcupsd-3.14.8-r2.ebuild 3972 SHA256 07518df91623ac0c1ce6de2f1cc5e152d890b0ac31b6ee20349b887d6456a272 SHA512 25b703ac0626173e8b8b933b6142d594acd24939fa08df58483c62b084dd57230240ccecb853e48b1491bced1cae8e78f8b1024c2842484fe642eb47712201f4 WHIRLPOOL 899c9f698a8be7b42f21b627e0828e71d8a3a0c33c297d4189b485e51e3bb2b923a11ef929acb932d029989576056543f546f4a2e8efddb6af1157879c200795
+MISC ChangeLog 27002 SHA256 b110393c806f42452a7724b37055e328ea37b4924294aceebb7ce4bef8794f25 SHA512 91efedfe711f50fc75a24c6bd0a39ebcabdfed2726c4b1841a5512f1ba35ec249df661e8cd6648b520b7ce9e1de1160332dea18347ffacbd964169989fab1c17 WHIRLPOOL 699c5e8c6feb91effd6226f7d716e6f228dc10b8641692a0112dad548696f1051f8d2f4c4cd0389eca8ca8ae6e846c646f4c2ed19dc06873938b5ac1f64379d8
 MISC metadata.xml 854 SHA256 ed821e0f70dad05d8ec1475d40654bb39a4d4ce0e9afb3901282dd05a3662cc5 SHA512 b3d9dbbb217711502dc36e1aca3c6efb18eb31a1f375241ed12a5e1312e19fd74e3659bb9bab3afd9eeff41de7f643a367a406bab09a1bce9d7f41b5e28da988 WHIRLPOOL 7ed63a7e8f4560fccc24d664e6d43c0a9b726b7c41cb1504753869633611968d3d4d29403b07dd0c17e40c8e368b01450d36cf44215906843ff70d505bd0fb7c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIh5Z4ACgkQCaWpQKGI+9R2swCeMPNEE2kL1+l5si5GBKc7arCM
-NbIAn0a0367jQI6EPMzd3c5y5H9B7LcN
-=tH83
+iEYEAREIAAYFAlJGq9cACgkQCaWpQKGI+9TxMACdHiJD5PN+ryt4HZ1+QpTdQZ9w
+si0An0oltHxU9ks4Z67p5Wu3abNhO5sl
+=HrQs
 -----END PGP SIGNATURE-----
diff --git a/sys-power/apcupsd/apcupsd-3.14.8-r2.ebuild b/sys-power/apcupsd/apcupsd-3.14.8-r2.ebuild
new file mode 100644
index 000000000000..2a4897450bdc
--- /dev/null
+++ b/sys-power/apcupsd/apcupsd-3.14.8-r2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2013 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-r2.ebuild,v 1.1 2013/09/28 10:13:42 pacho Exp $
+
+EAPI=3
+
+inherit eutils linux-info flag-o-matic systemd
+
+DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
+HOMEPAGE="http://www.apcupsd.org/"
+SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="snmp +usb cgi nls gnome kernel_linux"
+
+DEPEND="
+	cgi? ( >=media-libs/gd-1.8.4 )
+	nls? ( sys-devel/gettext )
+	snmp? ( net-analyzer/net-snmp )
+	gnome? ( >=x11-libs/gtk+-2.4.0:2
+		dev-libs/glib:2
+		>=gnome-base/gconf-2.0 )"
+RDEPEND="${DEPEND}
+	virtual/mailx"
+
+CONFIG_CHECK="~USB_HIDDEV ~HIDRAW"
+ERROR_USB_HIDDEV="CONFIG_USB_HIDDEV:	needed to access USB-attached UPSes"
+ERROR_HIDRAW="CONFIG_HIDRAW:		needed to access USB-attached UPSes"
+
+pkg_setup() {
+	if use kernel_linux && use usb && linux_config_exists; then
+		check_extra_config
+	fi
+}
+
+src_configure() {
+	local myconf
+	use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=/usr/libexec/${PN}/cgi-bin"
+	if use usb; then
+		myconf="${myconf} --with-upstype=usb --with-upscable=usb --enable-usb --with-dev= "
+	else
+		myconf="${myconf} --with-upstype=apcsmart --with-upscable=smart --disable-usb"
+	fi
+
+	append-flags -fno-strict-aliasing
+
+	# We force the DISTNAME to gentoo so it will use gentoo's layout also
+	# when installed on non-linux systems.
+	econf \
+		--sbindir=/sbin \
+		--sysconfdir=/etc/apcupsd \
+		--with-pwrfail-dir=/etc/apcupsd \
+		--with-lock-dir=/var/lock \
+		--with-pid-dir=/var/run \
+		--with-log-dir=/var/log \
+		--with-nis-port=3551 \
+		--enable-net --enable-pcnet \
+		--with-distname=gentoo \
+		$(use_enable snmp net-snmp) \
+		$(use_enable gnome gapcmon) \
+		${myconf} \
+		APCUPSD_MAIL=/bin/mail \
+		|| die "econf failed"
+}
+
+src_compile() {
+	# Workaround for bug #280674; upstream should really just provide
+	# the text files in the distribution, but I wouldn't count on them
+	# doing that anytime soon.
+	MANPAGER=$(type -p cat) \
+		emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "installed failed"
+	rm -f "${D}"/etc/init.d/halt
+
+	insinto /etc/apcupsd
+	newins examples/safe.apccontrol safe.apccontrol
+
+	dodoc ChangeLog* ReleaseNotes
+	doman doc/*.8 doc/*.5 || die "doman failed"
+
+	dohtml -r doc/manual/* || die "dodoc failed"
+
+	rm "${D}"/etc/init.d/apcupsd
+	newinitd "${FILESDIR}/${PN}.init.2a" "${PN}" || die "newinitd failed"
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_dotmpfilesd "${FILESDIR}"/${PN}-tmpfiles.conf
+
+	if has_version sys-apps/openrc; then
+		newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail || die "newinitd failed"
+	fi
+
+	# remove hal settings, we don't really want to have it around still.
+	rm -r "${D}"/usr/share/hal
+
+	# Without this it'll crash at startup. When merging in ROOT= this
+	# won't be created by default, so we want to make sure we got it!
+	keepdir /var/lock
+	fowners root:uucp /var/lock
+	fperms 0775 /var/lock
+}
+
+pkg_postinst() {
+	if use cgi; then
+		elog "The cgi-bin directory for ${PN} is /usr/libexec/${PN}/cgi-bin."
+		elog "Set up your ScriptAlias or symbolic links accordingly."
+	fi
+
+	elog ""
+	elog "Since version 3.14.0 you can use multiple apcupsd instances to"
+	elog "control more than one UPS in a single box."
+	elog "To do this, create a link between /etc/init.d/apcupsd to a new"
+	elog "/etc/init.d/apcupsd.something, and it will then load the"
+	elog "configuration file at /etc/apcupsd/something.conf."
+	elog ""
+
+	if [ -d "${ROOT}"/etc/runlevels/shutdown -a \
+			! -e "${ROOT}"/etc/runlevels/shutdown/"${PN}".powerfail ] ; then
+		elog 'If you want apcupsd to power off your UPS when it'
+		elog 'shuts down your system in a power failure, you must'
+		elog 'add apcupsd.powerfail to your shutdown runlevel:'
+		elog ''
+		elog ' \e[01m rc-update add apcupsd.powerfail shutdown \e[0m'
+		elog ''
+	fi
+}