Version bumped. Ebuild based on #86143. Closes #86143 and #83649.

(Portage version: 2.0.51.19)

7 files changed, 258 insertions, 18 deletions

diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index 94d1591109a8..f926c2ff9273 100644
--- a/sys-power/apcupsd/ChangeLog
+++ b/sys-power/apcupsd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-power/apcupsd
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.2 2005/03/15 16:31:34 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.3 2005/03/28 18:31:43 tantive Exp $
+
+*apcupsd-3.10.17 (28 Mar 2005)
+
+  28 Mar 2005; Michael Imhof <tantive@gentoo.org> +files/3.10.17/apache.conf,
+  +files/3.10.17/apcupsd.in.patch, +files/3.10.17/smtp.patch,
+  +apcupsd-3.10.17.ebuild:
+  Version bumped. Ebuild based on #86143.
+  Closes #86143 and #83649.
 
 *apcupsd-3.10.16-r3 (14 Mar 2005)
 *apcupsd-3.10.15-r1 (14 Mar 2005)
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index 67d013347f6a..e6713a275a4b 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -1,22 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0509bd921593dc1b57efc30501492fb0 apcupsd-3.10.16-r3.ebuild 2598
+MD5 766696b05e6b6411114678e427897bea apcupsd-3.10.17.ebuild 2604
+MD5 27ae5add10fc42e77804f1ecd768df87 metadata.xml 226
 MD5 35e63883c8d2d78acee1bdffdaf68fb4 apcupsd-3.10.15-r1.ebuild 2392
 MD5 c6fef311984fdcd75d7ab73e644ddbd8 ChangeLog 10612
-MD5 27ae5add10fc42e77804f1ecd768df87 metadata.xml 226
-MD5 ec48a12c6d8b56aeffbeaa629f8835ad files/digest-apcupsd-3.10.15-r1 68
+MD5 0509bd921593dc1b57efc30501492fb0 apcupsd-3.10.16-r3.ebuild 2598
 MD5 ed12d329ca566b8f2632d425828ea5d7 files/digest-apcupsd-3.10.16-r3 68
-MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.15/apache.conf 157
-MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.15/apcupsd.in.patch 315
-MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.15/smtp.patch 2663
+MD5 659d5670233b274842418c62ef15aafb files/digest-apcupsd-3.10.17 68
+MD5 ec48a12c6d8b56aeffbeaa629f8835ad files/digest-apcupsd-3.10.15-r1 68
+MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.17/smtp.patch 2663
+MD5 27ad4b6b56ea3aef2a89dded4c19b656 files/3.10.17/apache.conf 163
+MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.17/apcupsd.in.patch 315
+MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.16/smtp.patch 2663
 MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.16/apache.conf 157
 MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.16/apcupsd.in.patch 315
-MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.16/smtp.patch 2663
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCNw4II1lqEGTUzyQRAv1VAKCXzOD/wOybleA+OpmpQIOASZOOXgCfYYyP
-DljP37YQVmBsSxoPJ8pZ1vU=
-=224y
------END PGP SIGNATURE-----
+MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.15/smtp.patch 2663
+MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.15/apache.conf 157
+MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.15/apcupsd.in.patch 315
diff --git a/sys-power/apcupsd/apcupsd-3.10.17.ebuild b/sys-power/apcupsd/apcupsd-3.10.17.ebuild
new file mode 100644
index 000000000000..becf929136ce
--- /dev/null
+++ b/sys-power/apcupsd/apcupsd-3.10.17.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.10.17.ebuild,v 1.1 2005/03/28 18:31:43 tantive Exp $
+
+inherit eutils depend.apache
+
+need_apache
+
+DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
+HOMEPAGE="http://www.sibbald.com/apcupsd/"
+SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
+IUSE="doc snmp usb apache2 cgi threads ncurses nls"
+
+DEPEND="virtual/libc
+	virtual/mta
+	snmp? ( net-analyzer/net-snmp )
+	cgi? ( >=media-libs/gd-1.8.4
+		net-www/apache )
+	ncurses? ( sys-libs/ncurses )
+	nls? ( sys-devel/gettext )"
+RDEPEND="${DEPEND}
+	usb? ( sys-apps/hotplug )"
+
+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
+}
+
+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"
+
+	if use cgi; then
+		insinto ${APACHE_MODULEDIR}
+		newins ${FILEDIR}/${PV}/apache.conf 60_apcupsd.conf
+	fi
+
+	insinto /etc/apcupsd
+	newins examples/safe.apccontrol safe.apccontrol
+
+	cd ${D}/etc/apcupsd
+	epatch ${FILESDIR}/${PV}/smtp.patch
+
+	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.10.17/apache.conf b/sys-power/apcupsd/files/3.10.17/apache.conf
new file mode 100644
index 000000000000..3156ab7976de
--- /dev/null
+++ b/sys-power/apcupsd/files/3.10.17/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.10.17/apcupsd.in.patch b/sys-power/apcupsd/files/3.10.17/apcupsd.in.patch
new file mode 100644
index 000000000000..7bcb0f41c086
--- /dev/null
+++ b/sys-power/apcupsd/files/3.10.17/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.10.17/smtp.patch b/sys-power/apcupsd/files/3.10.17/smtp.patch
new file mode 100644
index 000000000000..d0c6bbcbdd48
--- /dev/null
+++ b/sys-power/apcupsd/files/3.10.17/smtp.patch
@@ -0,0 +1,112 @@
+diff -u old/changeme new/changeme
+--- old/changeme	2003-11-01 11:31:10.000000000 -0500
++++ new/changeme	2003-11-01 11:27:09.000000000 -0500
+@@ -13,9 +13,10 @@
+ #
+ (
+    echo "Subject: $MSG"
+-   echo " "
++   echo "To: $SYSADMIN"
++   echo
+    echo "$MSG"
+    echo " "
+    /usr/sbin/apcaccess status
+-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
++) | $APCUPSD_MAIL $SYSADMIN
+ exit 0
+diff -u old/commfailure new/commfailure
+--- old/commfailure	2003-11-01 11:31:26.000000000 -0500
++++ new/commfailure	2003-11-01 11:27:13.000000000 -0500
+@@ -13,9 +13,10 @@
+ #
+ (
+    echo "Subject: $MSG"
+-   echo " "
++   echo "To: $SYSADMIN"
++   echo
+    echo "$MSG"
+    echo " "
+    /usr/sbin/apcaccess status
+-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
++) | $APCUPSD_MAIL $SYSADMIN
+ exit 0
+diff -u old/commok new/commok
+--- old/commok	2003-11-01 11:31:33.000000000 -0500
++++ new/commok	2003-11-01 11:27:16.000000000 -0500
+@@ -13,9 +13,10 @@
+ #
+ (
+    echo "Subject: $MSG"
+-   echo " "
++   echo "To: $SYSADMIN"
++   echo
+    echo "$MSG"
+    echo " "
+    /usr/sbin/apcaccess status
+-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
++) | $APCUPSD_MAIL $SYSADMIN
+ exit 0
+diff -u old/mainsback new/mainsback
+--- old/mainsback	2003-11-01 11:30:55.000000000 -0500
++++ new/mainsback	2003-11-01 11:27:21.000000000 -0500
+@@ -13,9 +13,10 @@
+ #
+ (
+    echo "Subject: $MSG"
+-   echo " "
++   echo "To: $SYSADMIN"
++   echo
+    echo "$MSG"
+    echo " "
+    /usr/sbin/apcaccess status
+-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
++) | $APCUPSD_MAIL $SYSADMIN
+ exit 0
+diff -u old/masterconnect new/masterconnect
+--- old/masterconnect	2003-11-01 11:31:43.000000000 -0500
++++ new/masterconnect	2003-11-01 11:27:30.000000000 -0500
+@@ -13,9 +13,10 @@
+ #
+ (
+    echo "Subject: $MSG"
+-   echo " "
++   echo "To: $SYSADMIN"
++   echo
+    echo "$MSG"
+    echo " "
+    /usr/sbin/apcaccess status
+-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
++) | $APCUPSD_MAIL $SYSADMIN
+ exit 0
+diff -u old/mastertimeout new/mastertimeout
+--- old/mastertimeout	2003-11-01 11:31:52.000000000 -0500
++++ new/mastertimeout	2003-11-01 11:27:33.000000000 -0500
+@@ -13,9 +13,10 @@
+ #
+ (
+    echo "Subject: $MSG"
+-   echo " "
++   echo "To: $SYSADMIN"
++   echo
+    echo "$MSG"
+    echo " "
+    /usr/sbin/apcaccess status
+-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
++) | $APCUPSD_MAIL $SYSADMIN
+ exit 0
+diff -u old/onbattery new/onbattery
+--- old/onbattery	2003-11-01 11:32:03.000000000 -0500
++++ new/onbattery	2003-11-01 11:27:35.000000000 -0500
+@@ -13,9 +13,10 @@
+ #
+ (
+    echo "Subject: $MSG"
+-   echo " "
++   echo "To: $SYSADMIN"
++   echo
+    echo "$MSG"
+    echo " "
+    /usr/sbin/apcaccess status
+-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
++) | $APCUPSD_MAIL $SYSADMIN
+ exit 0
diff --git a/sys-power/apcupsd/files/digest-apcupsd-3.10.17 b/sys-power/apcupsd/files/digest-apcupsd-3.10.17
new file mode 100644
index 000000000000..8b197365bdc5
--- /dev/null
+++ b/sys-power/apcupsd/files/digest-apcupsd-3.10.17
@@ -0,0 +1 @@
+MD5 2a7dab7bebac0912d683f5a14fb4e291 apcupsd-3.10.17.tar.gz 5662277