Version bumped.

4 files changed, 112 insertions, 11 deletions

diff --git a/sys-apps/apcupsd/ChangeLog b/sys-apps/apcupsd/ChangeLog
index b57a5c4443ba..5663f5b48fcc 100644
--- a/sys-apps/apcupsd/ChangeLog
+++ b/sys-apps/apcupsd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/apcupsd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.38 2004/08/25 20:33:02 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.39 2004/08/25 21:28:33 tantive Exp $
+
+*apcupsd-3.10.15 (25 Aug 2004)
+
+  25 Aug 2004; Michael Imhof <tantive@gentoo.org> +apcupsd-3.10.15.ebuild:
+  Version bumped.
 
   25 Aug 2004; Michael Imhof <tantive@gentoo.org> apcupsd-3.10.13.ebuild:
   Stable on x86.
diff --git a/sys-apps/apcupsd/Manifest b/sys-apps/apcupsd/Manifest
index 402f03597580..b4e946f0e63c 100644
--- a/sys-apps/apcupsd/Manifest
+++ b/sys-apps/apcupsd/Manifest
@@ -1,14 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 4c382beba0178ba9c918681ec1c57299 apcupsd-3.10.13.ebuild 2510
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 4c382beba0178ba9c918681ec1c57299 apcupsd-3.10.15.ebuild 2510
 MD5 c7e7009608d846b75ae57616e5063db0 apcupsd-3.10.10.ebuild 2506
 MD5 79fbd20420f039a3ade2d1772723939b apcupsd-3.10.10-r1.ebuild 2551
 MD5 038be748c07588f19f00b7d50e189c7c ChangeLog 6915
 MD5 1edda758e443285ff65aaebcaf893f26 apcupsd-3.10.9.ebuild 2505
 MD5 3fe72118440066f4063e3040f7073726 apcupsd-3.10.8.ebuild 2505
 MD5 350594bbff4af6f9d84642680267a533 apcupsd-3.10.10-r2.ebuild 2683
+MD5 282949a8063bdbf22c87aa8872713815 files/digest-apcupsd-3.10.15 124
 MD5 41859fb08df1a1b50385b2e4a187a5cc files/digest-apcupsd-3.10.10-r2 124
 MD5 c5a0f1d4de26b7e7e76641d5c722cd9f files/digest-apcupsd-3.10.8 123
 MD5 41859fb08df1a1b50385b2e4a187a5cc files/digest-apcupsd-3.10.10-r1 124
@@ -32,10 +31,3 @@ MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.10/ucd-snmp.patch 425
 MD5 a587dd06ee42560a7ece7a73ed769f04 files/3.10.10/apccontrol.diff 340
 MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.10/apache.conf 157
 MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.10/apcupsd.in.patch 315
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBLPfUKtJO8LeSoosRAg4mAJ95cya/zP/dyK+wJxnnAEbOlj6A2wCeNbHm
-Tia+CpG/3DbPCQiclauHWWc=
-=/1ey
------END PGP SIGNATURE-----
diff --git a/sys-apps/apcupsd/apcupsd-3.10.15.ebuild b/sys-apps/apcupsd/apcupsd-3.10.15.ebuild
new file mode 100644
index 000000000000..42436cb9fd49
--- /dev/null
+++ b/sys-apps/apcupsd/apcupsd-3.10.15.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.15.ebuild,v 1.1 2004/08/25 21:28:33 tantive Exp $
+
+inherit eutils
+
+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"
+
+DEPEND=">=sys-apps/baselayout-1.8.4
+	virtual/libc
+	virtual/mta
+	snmp? ( net-analyzer/ucd-snmp )
+	>=media-libs/gd-1.8.4
+	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}
+	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-net-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
+	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/digest-apcupsd-3.10.15 b/sys-apps/apcupsd/files/digest-apcupsd-3.10.15
new file mode 100644
index 000000000000..231f48cba399
--- /dev/null
+++ b/sys-apps/apcupsd/files/digest-apcupsd-3.10.15
@@ -0,0 +1,2 @@
+MD5 21b2b744ebcaa0010367a403a9c5e66c apcupsd-3.10.15.tar.gz 3858266
+MD5 d9a0ddf7918c93ca28fa5832a4af54d8 gd1.2.tar.gz 64595