Version bumped. Ebuild based on #86143. Closes #123877. Ebuild submitted by Kris

(Portage version: 2.1_pre6-r4)

8 files changed, 363 insertions, 11 deletions

diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index c508651a8f6b..d5507ba4022e 100644
--- a/sys-power/apcupsd/ChangeLog
+++ b/sys-power/apcupsd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-power/apcupsd
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.13 2006/03/09 00:05:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.14 2006/03/19 22:49:08 tantive Exp $
+
+*apcupsd-3.12.2 (19 Mar 2006)
+
+  19 Mar 2006; Michael Imhof <tantive@gentoo.org> +files/3.12.2/apache.conf,
+  +files/3.12.2/apcupsd.in.patch, +files/3.12.2/apcupsd-lighttpd.conf,
+  +files/3.12.2/etc.patch, +apcupsd-3.12.2.ebuild:
+  Version bumped. Ebuild based on #86143. Closes #123877.
+  Ebuild submitted by Kristin Galway <kristing@linuxchix.ca>.
 
   09 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
   apcupsd-3.10.18-r2.ebuild:
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index 14dcdd53ea9c..4d2b55b9c34d 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 b23c22a1e82966ae5ff62957c67fba09 ChangeLog 12552
 RMD160 08cb381ad5632042dae302060ee947980ce91d2f ChangeLog 12552
 SHA256 5109c032296f82ac5d3801c979ef5c11d6627afda419958e664f8d0c7a19f521 ChangeLog 12552
@@ -19,6 +16,9 @@ SHA256 552711e51eddebe17358abe62e6939bc785eb54bd27a0d28910d4b17d25b84f8 apcupsd-
 MD5 379cc7a11341db7b6186cb42376596c7 apcupsd-3.10.18-r2.ebuild 3172
 RMD160 7aa3bb8eedeb783fe7112c9099743c170c088ebf apcupsd-3.10.18-r2.ebuild 3172
 SHA256 42c944661a74a7fe566c0e9c3d24f0e7dc10d562f5eea60faa7046b01092cead apcupsd-3.10.18-r2.ebuild 3172
+MD5 d5aaf4659eab5e78bda9d59d84d71350 apcupsd-3.12.2.ebuild 3183
+RMD160 4f5c29c0408f288269337b9e4a3916917d5a8242 apcupsd-3.12.2.ebuild 3183
+SHA256 038e15412546d36a97291718326850ac3287d69715e3315b752f933426db1aec apcupsd-3.12.2.ebuild 3183
 MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.15/apache.conf 157
 RMD160 3cbd37e49916ee5bf6cfc21d3734430e0bff9f8c files/3.10.15/apache.conf 157
 SHA256 c56dea432abd46f89365780f76928bebaf7e2f72b58a24915da530e535e71b4a files/3.10.15/apache.conf 157
@@ -58,6 +58,18 @@ SHA256 230e8e436fffef7c2bac52dfe522a160fdf6c27f1a15215ba8acdc2c73665e78 files/3.
 MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.18/smtp.patch 2663
 RMD160 12ca2247aca7a5ce0d80297ac9b5d52eb68903f2 files/3.10.18/smtp.patch 2663
 SHA256 8e3e11f7e2bb3cc1486dfc2344df6f696913745bc64782f278c002bc32345025 files/3.10.18/smtp.patch 2663
+MD5 27ad4b6b56ea3aef2a89dded4c19b656 files/3.12.2/apache.conf 163
+RMD160 ae405a6eee544297ca91815f11c8d2c8efc47d51 files/3.12.2/apache.conf 163
+SHA256 b553fc359bf4d38b41a366818a007b333760b05d2e575be38001a45983234468 files/3.12.2/apache.conf 163
+MD5 ab2e819939b9aeaeff1d04b2f76d6b3d files/3.12.2/apcupsd-lighttpd.conf 623
+RMD160 80d60ee5710fed934b77e759d42ec39e9ed686ee files/3.12.2/apcupsd-lighttpd.conf 623
+SHA256 aa28424716548a4c4a80b80b77a015fba1b1a528a8792b89a3edc746cc4641ed files/3.12.2/apcupsd-lighttpd.conf 623
+MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.12.2/apcupsd.in.patch 315
+RMD160 65ad8ff91d1280cdfc817aa15428dc3f3ecff250 files/3.12.2/apcupsd.in.patch 315
+SHA256 230e8e436fffef7c2bac52dfe522a160fdf6c27f1a15215ba8acdc2c73665e78 files/3.12.2/apcupsd.in.patch 315
+MD5 ceb8a56c8234598dad868dcf3b366e9f files/3.12.2/etc.patch 3710
+RMD160 c20497fd4f137cfecb3962610bfcc2c57f62c890 files/3.12.2/etc.patch 3710
+SHA256 046cca492d0ff932c9c5b5cf2e36d48d5cdb8a0a6cbac19791d3be72ba92813f files/3.12.2/etc.patch 3710
 MD5 ec48a12c6d8b56aeffbeaa629f8835ad files/digest-apcupsd-3.10.15-r1 68
 RMD160 79901903c95f0bd33e14c418dc167fae5ddc6291 files/digest-apcupsd-3.10.15-r1 68
 SHA256 3d9e69340922e6fd02ffff17797ad29086d6c8668182d5eeff207e84e726423c files/digest-apcupsd-3.10.15-r1 68
@@ -73,13 +85,9 @@ SHA256 45730367d24563d1f23754b2c2ec072644958cef6b6f388ac846a33f92ad8542 files/di
 MD5 0477fe3f08b01a504eb26e6763f3982e files/digest-apcupsd-3.10.18-r2 68
 RMD160 19709a98d22fc81fb92e2965aabf7063af172e9f files/digest-apcupsd-3.10.18-r2 68
 SHA256 45730367d24563d1f23754b2c2ec072644958cef6b6f388ac846a33f92ad8542 files/digest-apcupsd-3.10.18-r2 68
+MD5 06d14a07f56b8e37942a35aca6775fb7 files/digest-apcupsd-3.12.2 247
+RMD160 a7659388f720f0d6baf34de057fcc2046e8b1ea9 files/digest-apcupsd-3.12.2 247
+SHA256 d5a28f7712874ee6af744bead8a58cbf5a74d9816070a924905badaf2a4a6649 files/digest-apcupsd-3.12.2 247
 MD5 27ae5add10fc42e77804f1ecd768df87 metadata.xml 226
 RMD160 e0ca1098a8ced8b212c797e8d3343fed766ba485 metadata.xml 226
 SHA256 ab1d24920d852e21a852c10c1ec15d5d0cfe91752a67e9eca902177081d6e1c2 metadata.xml 226
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFED3FSAiZjviIA2XgRAiM0AKCXCAMCz/c3FzqcX0oDW8JWIDaMpACeKI5P
-iksWgqBOjDacrIQhYsWPNFE=
-=Ch3o
------END PGP SIGNATURE-----
diff --git a/sys-power/apcupsd/apcupsd-3.12.2.ebuild b/sys-power/apcupsd/apcupsd-3.12.2.ebuild
new file mode 100644
index 000000000000..8a3cc880a05a
--- /dev/null
+++ b/sys-power/apcupsd/apcupsd-3.12.2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.12.2.ebuild,v 1.1 2006/03/19 22:49:08 tantive Exp $
+
+inherit eutils depend.apache
+
+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 ~sparc ~x86"
+IUSE="doc snmp usb apache2 cgi threads ncurses nls lighttpd"
+
+DEPEND="snmp? ( net-analyzer/net-snmp )
+	cgi? ( >=media-libs/gd-1.8.4
+		apache2? ( >=net-www/apache-2.0.54-r30 )
+		lighttpd? ( www-servers/lighttpd )
+		)
+	ncurses? ( sys-libs/ncurses )
+	nls? ( sys-devel/gettext )"
+RDEPEND="${DEPEND}
+	virtual/mta"
+
+XPIDDIR=/var/run
+XLOGDIR=/var/log
+XLOCKDIR=/var/lock
+XSYSCONFDIR=/etc/apcupsd
+XPWRFAILDIR=${XSYSCONFDIR}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/platforms/gentoo
+	epatch ${FILESDIR}/${PV}/apcupsd.in.patch
+
+	cd ${S}/platforms
+	epatch ${FILESDIR}/${PV}/etc.patch
+
+	# Avoid usage of install -s, leave to portage stripping binaries
+	sed -i -e 's:(INSTALL_PROGRAM) -s:(INSTALL_PROGRAM):g' \
+		${S}/src/Makefile.in ${S}/src/cgi/Makefile.in
+}
+
+src_compile() {
+	local myconf
+	use cgi && myconf="${myconf} --enable-cgi --with-css-dir=/var/www/apcupsd --with-cgi-bin=/var/www/apcupsd"
+	use usb && myconf="${myconf} --with-upstype=usb --with-upscable=usb --enable-usb"
+	use !usb && myconf="${myconf} --with-upstype=apcsmart --with-upscable=apcsmart --disable-usb"
+
+	# We force the DISTNAME to gentoo so it will use gentoo's layout also
+	# when installed on non-linux systems.
+	DISTNAME=gentoo APCUPSD_MAIL=/usr/sbin/sendmail ./configure \
+		--prefix=/usr \
+		--sbindir=/usr/sbin \
+		--sysconfdir=${XSYSCONFDIR} \
+		--with-pwrfail-dir=${XPWRFAILDIR} \
+		--with-lock-dir=${XLOCKDIR} \
+		--with-pid-dir=${XPIDDIR} \
+		--with-log-dir=${XLOGDIR} \
+		--with-net-port=6666 \
+		--with-nis-port=3551 \
+		--enable-net \
+		--enable-oldnet \
+		--enable-master-slave \
+		$(use_enable ncurses powerflute) \
+		$(use_enable threads pthreads) \
+		$(use_enable snmp net-snmp) \
+		$(use_enable nls) \
+		${myconf} \
+		|| die
+	make || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "installed failed"
+	rm -f "${D}"/etc/init.d/halt
+
+	if use cgi; then
+		if use apache2; then
+			insinto ${APACHE2_MODULES_CONFDIR}
+			newins ${FILESDIR}/${PV}/apache.conf 60_apcupsd.conf
+		fi
+
+		if use lighttpd; then
+			insinto /etc/lighttpd
+			newins ${FILESDIR}/${PV}/apcupsd-lighttpd.conf apcupsd.conf
+			einfo "The configuration file ${ROOT}/etc/lighttpd/apcupsd.conf should"
+			einfo "be included in lighttpd.conf configuration file to enable apcupsd"
+			einfo "alias and cgi execution."
+		fi
+	fi
+
+	insinto /etc/apcupsd
+	newins examples/safe.apccontrol safe.apccontrol
+
+	cd ${D}/etc/apcupsd
+
+	ln -s onbattery powerout
+
+	if use doc; then
+		einfo "Installing full documentation into /usr/share/doc/${P}..."
+		cd ${S}/doc
+		dodoc README.*
+		docinto developers_manual
+		dodoc developers_manual/*
+		docinto logo
+		dodoc logo/*
+		docinto manual
+		dodoc manual/*
+		docinto old_documents
+		dodoc old_documents/*
+		docinto vim
+		dodoc vim/*
+	fi
+}
diff --git a/sys-power/apcupsd/files/3.12.2/apache.conf b/sys-power/apcupsd/files/3.12.2/apache.conf
new file mode 100644
index 000000000000..3156ab7976de
--- /dev/null
+++ b/sys-power/apcupsd/files/3.12.2/apache.conf
@@ -0,0 +1,8 @@
+ScriptAlias /apcupsd/ /var/www/apcupsd/
+
+<Directory "/var/www/apcupsd/">
+	AllowOverride AuthConfig
+	Options ExecCGI
+	Order allow,deny
+	Allow from all
+</Directory>
diff --git a/sys-power/apcupsd/files/3.12.2/apcupsd-lighttpd.conf b/sys-power/apcupsd/files/3.12.2/apcupsd-lighttpd.conf
new file mode 100644
index 000000000000..a90f6310ea32
--- /dev/null
+++ b/sys-power/apcupsd/files/3.12.2/apcupsd-lighttpd.conf
@@ -0,0 +1,19 @@
+###############################################################################
+# apcupsd.conf - apcupsd cgi programs configuration
+# include'd by lighttpd.conf.
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/files/3.12.2/apcupsd-lighttpd.conf,v 1.1 2006/03/19 22:49:08 tantive Exp $
+###############################################################################
+
+# Uncomment this if you don'thave mod_cgi and mod_alias active already
+# server.modules += ("mod_cgi", "mod_alias")
+
+alias.url += (
+	"/apcupsd/"	=> "/var/www/apcupsd/"
+)
+
+$HTTP["url"] =~ "^/apcupsd/" {
+	cgi.assign = (
+		".cgi"	=> "/usr/bin/env"
+	)
+}
+
diff --git a/sys-power/apcupsd/files/3.12.2/apcupsd.in.patch b/sys-power/apcupsd/files/3.12.2/apcupsd.in.patch
new file mode 100644
index 000000000000..7bcb0f41c086
--- /dev/null
+++ b/sys-power/apcupsd/files/3.12.2/apcupsd.in.patch
@@ -0,0 +1,15 @@
+--- apcupsd.in	2002-09-14 14:03:18.000000000 +0200
++++ apcupsd.in.new	2003-11-06 16:34:28.000000000 +0100
+@@ -6,6 +6,12 @@
+ APCPID=@PIDDIR@/apcupsd.pid
+ APCUPSD=@sbindir@/apcupsd
+ 
++depend() {
++	after hotplug
++	after usb
++	after net
++}
++
+ start() {
+ 	rm -f /etc/apcupsd/powerfail
+ 	ebegin "Starting APC UPS daemon"
diff --git a/sys-power/apcupsd/files/3.12.2/etc.patch b/sys-power/apcupsd/files/3.12.2/etc.patch
new file mode 100644
index 000000000000..a3acfdbd6fe4
--- /dev/null
+++ b/sys-power/apcupsd/files/3.12.2/etc.patch
@@ -0,0 +1,175 @@
+diff -cwb etc.bak/changeme.in etc/changeme.in
+*** etc.bak/changeme.in	Sun Mar 19 01:39:52 2006
+--- etc/changeme.in	Sun Mar 19 01:41:31 2006
+***************
+*** 13,21 ****
+  #
+  (
+     echo "Subject: $MSG"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
+  exit 0
+--- 13,22 ----
+  #
+  (
+     echo "Subject: $MSG"
++    echo "To: $SYSADMIN"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL $SYSADMIN
+  exit 0
+diff -cwb etc.bak/commfailure.in etc/commfailure.in
+*** etc.bak/commfailure.in	Sun Mar 19 01:39:52 2006
+--- etc/commfailure.in	Sun Mar 19 01:41:51 2006
+***************
+*** 13,21 ****
+  #
+  (
+     echo "Subject: $MSG"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
+  exit 0
+--- 13,22 ----
+  #
+  (
+     echo "Subject: $MSG"
++    echo "To: $SYSADMIN"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL $SYSADMIN
+  exit 0
+diff -cwb etc.bak/commok.in etc/commok.in
+*** etc.bak/commok.in	Sun Mar 19 01:39:52 2006
+--- etc/commok.in	Sun Mar 19 01:42:05 2006
+***************
+*** 13,21 ****
+  #
+  (
+     echo "Subject: $MSG"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
+  exit 0
+--- 13,22 ----
+  #
+  (
+     echo "Subject: $MSG"
++    echo "To: $SYSADMIN"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL $SYSADMIN
+  exit 0
+diff -cwb etc.bak/masterconnect.in etc/masterconnect.in
+*** etc.bak/masterconnect.in	Sun Mar 19 01:39:52 2006
+--- etc/masterconnect.in	Sun Mar 19 01:42:22 2006
+***************
+*** 13,21 ****
+  #
+  (
+     echo "Subject: $MSG"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
+  exit 0
+--- 13,22 ----
+  #
+  (
+     echo "Subject: $MSG"
++    echo "To: $SYSADMIN"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL $SYSADMIN
+  exit 0
+diff -cwb etc.bak/mastertimeout.in etc/mastertimeout.in
+*** etc.bak/mastertimeout.in	Sun Mar 19 01:39:52 2006
+--- etc/mastertimeout.in	Sun Mar 19 01:42:35 2006
+***************
+*** 13,21 ****
+  #
+  (
+     echo "Subject: $MSG"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
+  exit 0
+--- 13,22 ----
+  #
+  (
+     echo "Subject: $MSG"
++    echo "To: $SYSADMIN"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL $SYSADMIN
+  exit 0
+diff -cwb etc.bak/offbattery.in etc/offbattery.in
+*** etc.bak/offbattery.in	Sun Mar 19 01:39:52 2006
+--- etc/offbattery.in	Sun Mar 19 01:42:53 2006
+***************
+*** 13,21 ****
+  #
+  (
+     echo "Subject: $MSG"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
+  exit 0
+--- 13,22 ----
+  #
+  (
+     echo "Subject: $MSG"
++    echo "To: $SYSADMIN"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL $SYSADMIN
+  exit 0
+diff -cwb etc.bak/onbattery.in etc/onbattery.in
+*** etc.bak/onbattery.in	Sun Mar 19 01:39:52 2006
+--- etc/onbattery.in	Sun Mar 19 01:43:10 2006
+***************
+*** 13,21 ****
+  #
+  (
+     echo "Subject: $MSG"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
+  exit 0
+--- 13,22 ----
+  #
+  (
+     echo "Subject: $MSG"
++    echo "To: $SYSADMIN"
+     echo " "
+     echo "$MSG"
+     echo " "
+     @sbindir@/apcaccess status
+! ) | $APCUPSD_MAIL $SYSADMIN
+  exit 0
diff --git a/sys-power/apcupsd/files/digest-apcupsd-3.12.2 b/sys-power/apcupsd/files/digest-apcupsd-3.12.2
new file mode 100644
index 000000000000..ba41a20289a5
--- /dev/null
+++ b/sys-power/apcupsd/files/digest-apcupsd-3.12.2
@@ -0,0 +1,3 @@
+MD5 f771fafbc06551e7820bd3d277b5cce3 apcupsd-3.12.2.tar.gz 4219660
+RMD160 0076affa09d1dcd5efda36d30a22161c797b9bde apcupsd-3.12.2.tar.gz 4219660
+SHA256 755cd2bffc4090c58979a87ed3f9135afd1846153feb8a39fad95f745adbd347 apcupsd-3.12.2.tar.gz 4219660