Version bumped. Closes #36892. Changed copyright to 2004.

12 files changed, 281 insertions, 15 deletions

diff --git a/sys-apps/apcupsd/ChangeLog b/sys-apps/apcupsd/ChangeLog
index 83a43e9883eb..5f532af3aae1 100644
--- a/sys-apps/apcupsd/ChangeLog
+++ b/sys-apps/apcupsd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/apcupsd
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.24 2003/12/04 22:39:26 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.25 2004/01/03 00:54:46 tantive Exp $
+
+*apcupsd-3.10.8 (03 Jan 2004)
+
+  03 Jan 2004; Michael Imhof <tantive@gentoo.org> apcupsd-3.10.5-r2.ebuild,
+  apcupsd-3.10.5-r3.ebuild, apcupsd-3.10.5-r4.ebuild, apcupsd-3.10.6.ebuild,
+  apcupsd-3.10.8.ebuild, files/3.10.8/apache.conf,
+  files/3.10.8/apcupsd.in.patch, files/3.10.8/smtp.patch,
+  files/3.10.8/ucd-snmp.patch:
+  Version bumped, closes #36892. Changed copyright to 2004.
 
   04 Dec 2003; Heinrich Wendel <lanius@gentoo.org> files/apccontrol,
   files/apcupsd, files/halt:
diff --git a/sys-apps/apcupsd/Manifest b/sys-apps/apcupsd/Manifest
index bb8c264d6cbf..b63bae6794b8 100644
--- a/sys-apps/apcupsd/Manifest
+++ b/sys-apps/apcupsd/Manifest
@@ -1,10 +1,10 @@
-MD5 37a17ef92e0fa96f32d68b794be5e396 apcupsd-3.10.5-r2.ebuild 1896
+MD5 264cce7d28888a89ff8c4624701857b1 apcupsd-3.10.5-r2.ebuild 1896
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 51d33fa0d6b6fec4502f239d89f112b1 apcupsd-3.10.5-r3.ebuild 1993
-MD5 f845e362702469e414daf5d4866c95d6 ChangeLog 4111
-MD5 090ee030df26c309286f279952a730b6 apcupsd-3.10.8.ebuild 2530
-MD5 95fbe0b2c22a6ac60e34a6449c2a90d6 apcupsd-3.10.5-r4.ebuild 2180
-MD5 090ee030df26c309286f279952a730b6 apcupsd-3.10.6.ebuild 2530
+MD5 b409c8c339062ebbd81b26741497ea6a apcupsd-3.10.5-r3.ebuild 1993
+MD5 3fde2a1939759e6fd16d27bb00baa7af ChangeLog 4497
+MD5 d0e06b95dea2db0b3a0d26d1ec2eb7e7 apcupsd-3.10.8.ebuild 2540
+MD5 7a523b5d29637d319f2e38bc94947289 apcupsd-3.10.5-r4.ebuild 2182
+MD5 2f6ea2e245c6a5aeeabf554390867389 apcupsd-3.10.6.ebuild 2531
 MD5 f7092406e32869eb0535d85b4c09be0d files/digest-apcupsd-3.10.5-r4 123
 MD5 f66859d42d0af37659622f78b276a8bc files/digest-apcupsd-3.10.6 123
 MD5 f7092406e32869eb0535d85b4c09be0d files/digest-apcupsd-3.10.5-r3 123
@@ -15,3 +15,7 @@ MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.6/smtp.patch 2663
 MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.6/ucd-snmp.patch 425
 MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.6/apache.conf 157
 MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.6/apcupsd.in.patch 315
+MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.8/smtp.patch 2663
+MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.8/ucd-snmp.patch 425
+MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.8/apache.conf 157
+MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.8/apcupsd.in.patch 315
diff --git a/sys-apps/apcupsd/apcupsd-3.10.5-r2.ebuild b/sys-apps/apcupsd/apcupsd-3.10.5-r2.ebuild
index dddbc72e1ebf..1a89c9189edf 100644
--- a/sys-apps/apcupsd/apcupsd-3.10.5-r2.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.10.5-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.5-r2.ebuild,v 1.4 2003/09/03 19:38:08 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.5-r2.ebuild,v 1.5 2004/01/03 00:54:46 tantive Exp $
 
 IUSE="doc"
 
diff --git a/sys-apps/apcupsd/apcupsd-3.10.5-r3.ebuild b/sys-apps/apcupsd/apcupsd-3.10.5-r3.ebuild
index 38a291d713f4..2edb537abecb 100644
--- a/sys-apps/apcupsd/apcupsd-3.10.5-r3.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.10.5-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.5-r3.ebuild,v 1.5 2003/09/03 19:38:08 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.5-r3.ebuild,v 1.6 2004/01/03 00:54:46 tantive Exp $
 
 IUSE="doc"
 
diff --git a/sys-apps/apcupsd/apcupsd-3.10.5-r4.ebuild b/sys-apps/apcupsd/apcupsd-3.10.5-r4.ebuild
index 7775ab3c4674..c6e366611224 100644
--- a/sys-apps/apcupsd/apcupsd-3.10.5-r4.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.10.5-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.5-r4.ebuild,v 1.3 2003/10/17 12:34:30 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.5-r4.ebuild,v 1.4 2004/01/03 00:54:46 tantive Exp $
 
 IUSE="doc snmp usb"
 
diff --git a/sys-apps/apcupsd/apcupsd-3.10.6.ebuild b/sys-apps/apcupsd/apcupsd-3.10.6.ebuild
index d1f03875249e..3e657e2cfc4c 100644
--- a/sys-apps/apcupsd/apcupsd-3.10.6.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.10.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.6.ebuild,v 1.12 2003/12/04 22:20:14 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.6.ebuild,v 1.13 2004/01/03 00:54:46 tantive Exp $
 
 IUSE="doc snmp usb apache2"
 
diff --git a/sys-apps/apcupsd/apcupsd-3.10.8.ebuild b/sys-apps/apcupsd/apcupsd-3.10.8.ebuild
new file mode 100644
index 000000000000..3bdab18c9704
--- /dev/null
+++ b/sys-apps/apcupsd/apcupsd-3.10.8.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.8.ebuild,v 1.1 2004/01/03 00:54:46 tantive Exp $
+
+IUSE="doc snmp usb apache2"
+
+S=${WORKDIR}/${P}
+DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
+SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz
+	ftp://ftp.apcupsd.com/pub/apcupsd/contrib/gd1.2.tar.gz"
+HOMEPAGE="http://www.sibbald.com/apcupsd/"
+KEYWORDS="~x86 ~amd64 ~ppc ~arm ~sparc"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND=">=sys-apps/baselayout-1.8.4
+	virtual/glibc
+	virtual/mta
+	snmp? ( net-analyzer/ucd-snmp )
+	sys-libs/ncurses"
+RDEPEND="${DEPEND}
+	usb? ( sys-apps/hotplug )"
+
+XPIDDIR=/var/run
+XLOGDIR=/var/log
+XLOCKDIR=/var/lock
+XSYSCONFDIR=/etc/apcupsd
+XPWRFAILDIR=${XSYSCONFDIR}
+
+src_unpack() {
+	unpack ${A}
+	cp -a ${WORKDIR}/gd1.2 ${S}/src/
+	cd ${S}/platforms/gentoo
+	epatch ${FILESDIR}/${PV}/apcupsd.in.patch
+	cd ${S}
+	epatch ${FILESDIR}/${PV}/ucd-snmp.patch
+}
+
+src_compile() {
+	local myconf
+	use snmp && myconf="--enable-snmp"
+	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-upstype=usb \
+		--with-upscable=usb \
+		--with-serial-dev=/dev/usb/hid/hiddev[0-9] \
+		--with-net-port=6666 \
+		--with-nis-port=3551 \
+		--enable-usb \
+		--enable-net \
+		--enable-oldnet \
+		--enable-master-slave \
+		--enable-powerflute \
+		--enable-pthreads \
+		--with-css-dir=/var/www/apcupsd \
+		--with-cgi-bin=/var/www/apcupsd \
+		--enable-cgi \
+		${myconf} \
+		|| die
+	make || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die "installed failed"
+
+	use apache2 || insinto /etc/apache/conf/addon-modules
+	use apache2 || newins  ${FILESDIR}/${PV}/apache.conf apcupsd.conf
+
+	use apache2 && insinto /etc/apache2/conf/modules.d
+	use apache2 && newins ${FILESDIR}/${PV}/apache.conf 60_apcupsd.conf
+
+	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`x" != "x" ]
+	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-apps/apcupsd/files/3.10.8/apache.conf b/sys-apps/apcupsd/files/3.10.8/apache.conf
new file mode 100644
index 000000000000..21305d257846
--- /dev/null
+++ b/sys-apps/apcupsd/files/3.10.8/apache.conf
@@ -0,0 +1,8 @@
+Alias /apcupsd/ /var/www/apcupsd/
+
+<Directory "/var/www/apcupsd/">
+	AllowOverride AuthConfig
+	Options ExecCGI
+	Order allow,deny
+	Allow from all
+</Directory>
diff --git a/sys-apps/apcupsd/files/3.10.8/apcupsd.in.patch b/sys-apps/apcupsd/files/3.10.8/apcupsd.in.patch
new file mode 100644
index 000000000000..7bcb0f41c086
--- /dev/null
+++ b/sys-apps/apcupsd/files/3.10.8/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-apps/apcupsd/files/3.10.8/smtp.patch b/sys-apps/apcupsd/files/3.10.8/smtp.patch
new file mode 100644
index 000000000000..d0c6bbcbdd48
--- /dev/null
+++ b/sys-apps/apcupsd/files/3.10.8/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-apps/apcupsd/files/3.10.8/ucd-snmp.patch b/sys-apps/apcupsd/files/3.10.8/ucd-snmp.patch
new file mode 100644
index 000000000000..af9c363b2328
--- /dev/null
+++ b/sys-apps/apcupsd/files/3.10.8/ucd-snmp.patch
@@ -0,0 +1,14 @@
+--- src/drivers/snmp/snmp.c 2003-04-05 14:58:00.000000000 +0200
++++ src/drivers/snmp/snmp.c 2003-08-21 14:25:11.000000000 +0200
+@@ -245,7 +245,10 @@
+     return ret;
+ }
+
+-int snmp_ups_program_eeprom(UPSINFO *ups, int command, char *data)
++/*int snmp_ups_program_eeprom(UPSINFO *ups, int command, char *data)
++ * Modified for debian
++*/
++int snmp_ups_program_eeprom(UPSINFO *ups, int command, void *data)
+ {
+     return 0;
+ }
diff --git a/sys-apps/apcupsd/files/digest-apcupsd-3.10.8 b/sys-apps/apcupsd/files/digest-apcupsd-3.10.8
new file mode 100644
index 000000000000..71383bf8676b
--- /dev/null
+++ b/sys-apps/apcupsd/files/digest-apcupsd-3.10.8
@@ -0,0 +1,2 @@
+MD5 b0482d125edac1c9ea340f2382da2ed9 apcupsd-3.10.8.tar.gz 3751893
+MD5 d9a0ddf7918c93ca28fa5832a4af54d8 gd1.2.tar.gz 64595