Version bump, finally closing bug #228011 (thanks to all for the patience). Also fix bug #240694 (thanks to Billy DeVincentis for the init script), #254242 (thanks to Gordon Pritchard for reporting), #243070 (thanks to Ryan Tandy for the patch).

Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.28-gentoo x86_64

4 files changed, 176 insertions, 6 deletions

diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index 31f39c1454ed..569a7cd1f0b3 100644
--- a/sys-power/apcupsd/ChangeLog
+++ b/sys-power/apcupsd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-power/apcupsd
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.37 2008/09/03 07:25:44 opfer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.38 2009/01/15 15:21:11 flameeyes Exp $
+
+*apcupsd-3.14.5 (15 Jan 2009)
+
+  15 Jan 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/apcupsd.init.2, +apcupsd-3.14.5.ebuild:
+  Version bump, finally closing bug #228011 (thanks to all for the
+  patience). Also fix bug #240694 (thanks to Billy DeVincentis for the init
+  script), #254242 (thanks to Gordon Pritchard for reporting), #243070
+  (thanks to Ryan Tandy for the patch).
 
   03 Sep 2008; Christian Faulhammer <opfer@gentoo.org>
   apcupsd-3.12.3.ebuild, apcupsd-3.12.4.ebuild, apcupsd-3.14.0.ebuild,
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index e3fdf1de37f1..18a58c80bc07 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -47,6 +47,7 @@ AUX 3.14.3/hal-ups-policy.patch 637 RMD160 8574fa8537c52709d2ac718a45a8d09a0e2f2
 AUX 3.14.3/no-parallel.patch 339 RMD160 c6e50aa5b22438e02e17df4fda41c7cae371217f SHA1 4d20db0882272b9c472b1ea994d115310bcab6d3 SHA256 3bcd10a6f7c623496a75d8cc321becbc24162372936dab4e696b0322c46e4c62
 AUX 3.14/apcupsd.in.patch 273 RMD160 46efa88a7716a0e26f905528335e8d4994a9b704 SHA1 8e976c8f3316b8b7a056a9a5a3a432be66131854 SHA256 c07f3085f5b39d319f220898b84a8ffe27c872cb6d70d90bd7211af11c3b2c08
 AUX 3.14/etc.patch 1476 RMD160 0e93c67b37637fb6913d771c3c10cf49a85478ad SHA1 4a1dc295661edc8f8283c20bf689012d6419d917 SHA256 cf6372fe37625f5418fcca42b41d6c3b9424ad1a8b66c8ad5ca64fc39731c295
+AUX apcupsd.init.2 838 RMD160 fdca4e15d5f475c43147ce65624a4355e6ed9279 SHA1 b34596c601f368ed5028d661f7dd79630bfef4a9 SHA256 9c60e920d5946ff581b38c33087ec6a1ed7d8885bc2c9c5621932f5e7c8571d3
 DIST apcupsd-3.10.15.tar.gz 3858266 RMD160 a8f0b69a5622057ccf8ff97c1f1f56ef1305d9c1 SHA1 538465f21986b4736a846bf2fbd1d9bc26f2e14c SHA256 04179f7369a3a24816e94605b973ba739a2b22e80e2765159f457515a6c96e5a
 DIST apcupsd-3.10.16.tar.gz 5037822 RMD160 e0db09c40c9ae103ac7fce66280050d0fa328688 SHA1 81da5a239f609f918c22a418d02646d157f463e4 SHA256 2d9f280fde4b9e64cc8bba8e79d1f0e153a35dfe4aaec02cfc00cf7bc0bec31e
 DIST apcupsd-3.10.17.tar.gz 5662277 RMD160 6d1766a8f957d0a08811371d0473e8bf6bd854ef SHA1 b3c236cb12986b27b55b213eabe7c0b501697d33 SHA256 8eb6d0dd5fb8973356dd4e335de4e5df3fc559bff4713a87fd29798a46d5e78c
@@ -58,6 +59,7 @@ DIST apcupsd-3.14.0.tar.gz 4356614 RMD160 583527a79fdf3965676c310b801331e89e724d
 DIST apcupsd-3.14.1.tar.gz 4352400 RMD160 f6655123f7daa91966e9a2a4877e90b70babc670 SHA1 ee2a9ba074b688aba047d571098f44dc591e985c SHA256 3d68ce2c387194a8d6d2afae40dbaa0c02a87992ac1bdbd2495b1b610266c123
 DIST apcupsd-3.14.2.tar.gz 4345034 RMD160 e002bdb89b9391d6727d5fbc1395e5b5b4a99304 SHA1 5a028236a521c7ef6154a5fd7a14d4f8dcdbf64d SHA256 72605e54356ffe32dc24159b4094a5b7e5e978d2440edded8b01496af9caca50
 DIST apcupsd-3.14.3.tar.gz 4350109 RMD160 092726b2076e56368cdb7e3c790ee8d5e2a7d2f9 SHA1 b9f75732752cdee9792a5be526656c153c2d1274 SHA256 01b8f4219ff91044600afd78842ac93cb40f034cf00cd25144fe918db80eed88
+DIST apcupsd-3.14.5.tar.gz 4172931 RMD160 76dadfb241b69a9603cc6f06ef4549a1aa3ac55e SHA1 c28685a2ccd0565b4c5d9e972773b18a915562a9 SHA256 f48a75139d5701d13444128da6f9f6feea04da8524e8ba3bce2c21bdbedba49e
 EBUILD apcupsd-3.10.15-r1.ebuild 2438 RMD160 42ab7e7b60f9e125d58a0265da0d5b9dcadf77f6 SHA1 04990d121dfbd23b3d33968646668b2231a5e191 SHA256 d42a593b25aa96f42e5889aa0d093758b1434872241ae6c1f9dfa144a6343c51
 EBUILD apcupsd-3.10.16-r3.ebuild 2643 RMD160 5dc0303b1a16485263c9f45e48c1e3b3a0fb1cd6 SHA1 6d18513a60ca927f1eb858ad2570358b53e49337 SHA256 ce37b53760492fddce6822a4a470f7fe0af67e0d6a40995a6ee775ca2c3ee4bc
 EBUILD apcupsd-3.10.17-r1.ebuild 2617 RMD160 9152e147f44204db75da4731ec55d70883cebcad SHA1 ee34d3ac8c35e468b7a615e8a84b479600a52763 SHA256 cdb0a2090025e128cbaea6351190ac3641214bdb4cee23bcd52f8fb8f782a8cf
@@ -71,12 +73,13 @@ EBUILD apcupsd-3.14.0.ebuild 3393 RMD160 5ebd2491483b0cf3b310a7f8e502111174d6f79
 EBUILD apcupsd-3.14.1.ebuild 3393 RMD160 0176fb227673c0f82dbe2b327bf7820dc4dd9563 SHA1 43a40cf207e0f4fde4ee7a2d976f36dd268884d2 SHA256 9acc34ae35938fe81e49fc07f4afe5b8596953f07f3ec16594842c72a37079cf
 EBUILD apcupsd-3.14.2.ebuild 3280 RMD160 e423a915d9fc1c504c892fe1f58717d17426ae2e SHA1 d655a4b678675c60bb767c6d0d4acf0ac4e3e309 SHA256 cc1cc6c960d731aecac0efea192165dcae76d5ed75886698239a0f7fdcce2e9a
 EBUILD apcupsd-3.14.3.ebuild 3329 RMD160 90ca6704d762d0aba67a0f992989bd82b6c46416 SHA1 7c6d592321f64ee6cc721718ef904bab3c37e499 SHA256 16711dee640da8d01699c3cc68f3dab1dd705d313ae83068e2ae08345f75fba2
-MISC ChangeLog 17098 RMD160 f866c007b09a3ed29ef16e3c718207b49fba71b0 SHA1 80be9a51e26fd51929a394efa204017a2fd03bbe SHA256 bda292d4e5f3ad2ff5082c3d3d2cc345b04286b6ae6a597385d92fb8d9aa0c36
+EBUILD apcupsd-3.14.5.ebuild 3214 RMD160 310920721f581458e14eba92bc3c2e2dcc74ff4f SHA1 d328cfcc96b42d78cfe8df131fd897b038b32c12 SHA256 ac64ec3f69c9b1d4ff08ce83797b8cc4cc427a6a48403b20074bedf1954db3e8
+MISC ChangeLog 17493 RMD160 ba112b76fa9ce54410f9013ed475d237400bfcd1 SHA1 6dc4b6ac4d86350a4d06529c8f363ac1b41b70e7 SHA256 e932e1283afa51eb695d6316fec89549b090342c25fd3b922e84581a4f91b7f3
 MISC metadata.xml 322 RMD160 91086233b0bb68f964380bcc2492f7099d0821b4 SHA1 1e3a984ab41a9d3204251aa76521baa3b6823bdc SHA256 98d22a3848f3a086f63031d3595e8e42b54786d1b15b6c7146f537367aab5d56
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAki+PDAACgkQNQqtfCuFnePB0QCfdWb9WkQ4eD+8xMT7W7huONc2
-kjUAnRbAUxhL5bUjR/bPPprLuHM5YIZU
-=DhwH
+iEYEARECAAYFAklvVHMACgkQAiZjviIA2Xh/1QCgi4bdpByD6x5kTGDBO4D944Tt
+qakAnRCFYtqzVD2FwXaXXkiXV29ckTub
+=Gd2p
 -----END PGP SIGNATURE-----
diff --git a/sys-power/apcupsd/apcupsd-3.14.5.ebuild b/sys-power/apcupsd/apcupsd-3.14.5.ebuild
new file mode 100644
index 000000000000..376a5f490b3a
--- /dev/null
+++ b/sys-power/apcupsd/apcupsd-3.14.5.ebuild
@@ -0,0 +1,121 @@
+# 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.5.ebuild,v 1.1 2009/01/15 15:21:11 flameeyes Exp $
+
+WEBAPP_MANUAL_SLOT="yes"
+WEBAPP_OPTIONAL="yes"
+inherit eutils webapp
+
+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="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="doc snmp usb cgi ncurses nls gnome"
+
+DEPEND="doc? ( virtual/latex-base dev-tex/latex2html )
+	cgi? ( >=media-libs/gd-1.8.4
+		${WEBAPP_DEPEND} )
+	ncurses? ( sys-libs/ncurses )
+	nls? ( sys-devel/gettext )
+	snmp? ( net-analyzer/net-snmp )
+	gnome? ( >=x11-libs/gtk+-2.4.0
+		>=dev-libs/glib-2.0
+		>=gnome-base/gconf-2.0 )"
+RDEPEND="${DEPEND}
+	virtual/mailx"
+
+pkg_setup() {
+	use cgi && webapp_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/3.14.3/etc.patch
+}
+
+src_compile() {
+	local myconf
+	use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=${MY_CGIBINDIR}"
+	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
+
+	# We force the DISTNAME to gentoo so it will use gentoo's layout also
+	# when installed on non-linux systems.
+	APCUPSD_MAIL=/bin/mail 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 \
+		--with-distname=gentoo \
+		$(use_enable ncurses powerflute) \
+		$(use_enable snmp net-snmp) \
+		$(use_enable gnome gapcmon) \
+		${myconf} \
+		|| die
+	emake || die "emake failed"
+
+	if use doc; then
+		einfo "Building full documentation..."
+		cd "${S}"/doc/latex
+		make texcheck tex web pdf
+	fi
+}
+
+src_install() {
+	use cgi && webapp_src_preinst
+
+	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
+	mv doc/apctest.man doc/apctest.8; doman doc/apctest.8
+
+	if use doc; then
+		einfo "Installing full documentation..."
+		newdoc doc/latex/apcupsd.pdf manual.pdf
+		dohtml -r doc/latex/apcupsd/*
+	fi
+
+	if use cgi; then
+		mv "${D}"/etc/apcupsd/apcupsd.css "${D}""${MY_CGIBINDIR}"
+		webapp_src_install
+	fi
+
+	rm "${D}"/etc/init.d/apcupsd
+	newinitd "${FILESDIR}/${PN}.init.2" "${PN}"
+}
+
+pkg_postinst() {
+	if use cgi; then
+		elog "If you are upgrading from a previous version, please note"
+		elog "that the CGI interface is now installed using webapp-config."
+		elog "/var/www/apcupsd is no longer present."
+		webapp_pkg_postinst
+	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 ""
+}
+
+pkg_prerm() {
+	use cgi && webapp_pkg_prerm
+}
diff --git a/sys-power/apcupsd/files/apcupsd.init.2 b/sys-power/apcupsd/files/apcupsd.init.2
new file mode 100644
index 000000000000..43868f75ddaf
--- /dev/null
+++ b/sys-power/apcupsd/files/apcupsd.init.2
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/files/apcupsd.init.2,v 1.1 2009/01/15 15:21:11 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 $?
+}
+