Moved from sys-apps/apcupsd to sys-power/apcupsd.

13 files changed, 780 insertions, 0 deletions

diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
new file mode 100644
index 000000000000..fc325e3023da
--- /dev/null
+++ b/sys-power/apcupsd/ChangeLog
@@ -0,0 +1,279 @@
+# ChangeLog for sys-apps/apcupsd
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.1 2005/03/14 23:27:27 ciaranm Exp $
+
+*apcupsd-3.10.16-r3 (14 Mar 2005)
+*apcupsd-3.10.15-r1 (14 Mar 2005)
+
+  14 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org>
+  +files/3.10.15/apache.conf, +files/3.10.15/apcupsd.in.patch,
+  +files/3.10.15/smtp.patch, +files/3.10.16/apache.conf,
+  +files/3.10.16/apcupsd.in.patch, +files/3.10.16/smtp.patch, +metadata.xml,
+  +apcupsd-3.10.15-r1.ebuild, +apcupsd-3.10.16-r3.ebuild:
+  Moved from sys-apps/apcupsd to sys-power/apcupsd.
+
+  21 Feb 2005; Daniel Black <dragonheart@gentoo.org>
+  -files/3.10.15/ucd-snmp.patch, -files/3.10.16/ucd-snmp.patch,
+  apcupsd-3.10.15-r1.ebuild, apcupsd-3.10.16-r3.ebuild:
+  removing ucd-snmp as per bug #69451
+
+*apcupsd-3.10.16-r3 (20 Dec 2004)
+
+  20 Dec 2004; Michael Imhof <tantive@gentoo.org> -apcupsd-3.10.16-r1.ebuild,
+  -apcupsd-3.10.16-r2.ebuild, +apcupsd-3.10.16-r3.ebuild:
+  Ebuild wasn't handling $myconf correct. Fixes #73604.
+
+*apcupsd-3.10.16-r2 (02 Dec 2004)
+
+  02 Dec 2004; Michael Imhof <tantive@gentoo.org> +apcupsd-3.10.16-r2.ebuild:
+  Proper use of the usb use flag. Closes #54925.
+
+  23 Nov 2004; Scott W Taylor <swtaylor@gentoo.org>
+  apcupsd-3.10.16-r1.ebuild:
+  missing trailing backslash on line 63
+
+*apcupsd-3.10.16-r1 (23 Nov 2004)
+
+  23 Nov 2004; Michael Imhof <tantive@gentoo.org> +apcupsd-3.10.16-r1.ebuild,
+  -apcupsd-3.10.16.ebuild:
+  New revision. Added support for the gd USE-flag. Closes #68935.
+
+*apcupsd-3.10.16 (12 Nov 2004)
+
+  12 Nov 2004; Michael Imhof <tantive@gentoo.org> +files/3.10.16/apache.conf,
+  +files/3.10.16/apcupsd.in.patch, +files/3.10.16/smtp.patch,
+  +files/3.10.16/ucd-snmp.patch, +apcupsd-3.10.16.ebuild:
+  Version bumped.
+
+  30 Oct 2004; Michael Imhof <tantive@gentoo.org> -files/3.10.13/apache.conf,
+  -files/3.10.13/apcupsd.in.patch, -files/3.10.13/smtp.patch,
+  -files/3.10.13/ucd-snmp.patch, -apcupsd-3.10.13.ebuild:
+  Cleaned out old version. Closes #69451.
+
+  30 Oct 2004; Lars Weiler <pylon@gentoo.org> apcupsd-3.10.15-r1.ebuild:
+  Compiles and should work according to users.
+
+  29 Oct 2004; Michael Imhof <tantive@gentoo.org> apcupsd-3.10.15-r1.ebuild:
+  Stable on AMD64.
+
+  27 Oct 2004; Michael Imhof <tantive@gentoo.org> apcupsd-3.10.15-r1.ebuild:
+  Fixed path to the hid devices. Closes #36162.
+
+  24 Oct 2004; Heinrich Wendel <lanius@gentoo.org> -files/3.10.10/apache.conf,
+  -files/3.10.10/apccontrol.diff, -files/3.10.10/apcupsd.in.patch,
+  -files/3.10.10/smtp.patch, -files/3.10.10/ucd-snmp.patch,
+  -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,
+  -files/3.10.9/apache.conf, -files/3.10.9/apcupsd.in.patch,
+  -files/3.10.9/smtp.patch, -files/3.10.9/ucd-snmp.patch,
+  -apcupsd-3.10.10-r1.ebuild, -apcupsd-3.10.10-r2.ebuild,
+  -apcupsd-3.10.10.ebuild, apcupsd-3.10.15-r1.ebuild, -apcupsd-3.10.8.ebuild,
+  -apcupsd-3.10.9.ebuild:
+  remove old versions; mark 3.10.15 stable on x86
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  apcupsd-3.10.10-r1.ebuild:
+  Masked apcupsd-3.10.10-r1.ebuild stable for ppc
+
+  01 Sep 2004; Michael Imhof <tantive@gentoo.org> apcupsd-3.10.15-r1.ebuild:
+  Missed the snmp USE-flag. Fixed now.
+
+*apcupsd-3.10.15-r1 (31 Aug 2004)
+
+  31 Aug 2004; Michael Imhof <tantive@gentoo.org> +apcupsd-3.10.15-r1.ebuild,
+  -apcupsd-3.10.15.ebuild:
+  Now depends on virtual/snmp and applies the ucd patch only if has_version
+  ucd-snmp. Closes #53210.
+
+  26 Aug 2004; Michael Imhof <tantive@gentoo.org> +files/3.10.15/apache.conf,
+  +files/3.10.15/apcupsd.in.patch, +files/3.10.15/smtp.patch,
+  +files/3.10.15/ucd-snmp.patch:
+  Forgot to add some files. Closes #61714.
+
+*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.
+
+  23 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  apcupsd-3.10.13.ebuild:
+  Stable amd64.
+
+  14 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  apcupsd-3.10.10-r1.ebuild, apcupsd-3.10.10-r2.ebuild,
+  apcupsd-3.10.10.ebuild, apcupsd-3.10.13.ebuild, apcupsd-3.10.8.ebuild,
+  apcupsd-3.10.9.ebuild:
+  don't assign default to S
+
+  27 May 2004; Michael <tantive@gentoo.org> apcupsd-3.10.13.ebuild:
+  Adjusted config option.
+
+*apcupsd-3.10.13 (26 May 2004)
+
+  26 May 2004; Michael Imhof <tantive@gentoo.org> apcupsd-3.10.13.ebuild,
+  files/3.10.13/apache.conf, files/3.10.13/apcupsd.in.patch,
+  files/3.10.13/smtp.patch, files/3.10.13/ucd-snmp.patch,
+  files/3.10.5/apache.conf, files/3.10.6/apache.conf,
+  files/3.10.6/apcupsd.in.patch, files/3.10.6/smtp.patch,
+  files/3.10.6/ucd-snmp.patch:
+  Version bumped. Cleaned out old files.
+
+*apcupsd-3.10.10-r2 (25 May 2004)
+
+  25 May 2004; Michael Imhof <tantive@gentoo.org> apcupsd-3.10.10-r2.ebuild:
+  Fixed path to stylesheet. Closes 51452.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> apcupsd-3.10.10-r1.ebuild,
+  apcupsd-3.10.10.ebuild, apcupsd-3.10.8.ebuild, apcupsd-3.10.9.ebuild:
+  Add inherit eutils
+
+*apcupsd-3.10.10-r1 (21 Apr 2004)
+
+  21 Apr 2004; Martin Holzer <mholzer@gentoo.org> apcupsd-3.10.10-r1.ebuild,
+  files/3.10.10/apccontrol.diff:
+  fixing bug in apccontrol. closes 46075
+
+*apcupsd-3.10.10 (24 Feb 2004)
+
+  24 Feb 2004; Michael Imhof <tantive@gentoo.org> apcupsd-3.10.10.ebuild,
+  files/3.10.10/apache.conf, files/3.10.10/apcupsd.in.patch,
+  files/3.10.10/smtp.patch, files/3.10.10/ucd-snmp.patch:
+  Version bumped.
+
+  27 Jan 2004; Michael Imhof <tantive@gentoo.org> apcupsd-3.10.9.ebuild:
+  Marked x86.
+
+*apcupsd-3.10.9 (14 Jan 2004)
+
+  14 Jan 2004; Michael Imhof <tantive@gentoo.org> apcupsd-3.10.5-r4.ebuild,
+  apcupsd-3.10.9.ebuild, files/3.10.9/apache.conf,
+  files/3.10.9/apcupsd.in.patch, files/3.10.9/smtp.patch,
+  files/3.10.9/ucd-snmp.patch:
+  Added new version.
+
+  14 Jan 2004; Michael Imhof <tantive@gentoo.org> apcupsd-3.10.5-r4.ebuild,
+  files/3.10.9/apache.conf, files/3.10.9/apcupsd.in.patch,
+  files/3.10.9/smtp.patch, files/3.10.9/ucd-snmp.patch:
+  More cleanups.
+
+  14 Jan 2004; Michael Imhof <tantive@gentoo.org> apcupsd-3.10.5-r2.ebuild,
+  apcupsd-3.10.5-r3.ebuild, apcupsd-3.10.8.ebuild:
+  Marked stable and removed old ebuilds.
+
+*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:
+  removed unused files
+
+  04 Dec 2003; Heinrich Wendel <lanius@gentoo.org> apcupsd-3.10.6.ebuild,
+  files/3.10.6/ucd-snmp.patch:
+  added patch to compile with ucd-snmp
+
+  06 Nov 2003; Michael Imhof <tantive@gentoo.org> apcupsd-3.10.6.ebuild:
+  Added a patch for the init-script. Makes sure apcupsd is started after
+  hotplug, usb  and net. Closes #32769.
+
+  01 Nov 2003; Michael Imhof <tantive@gentoo.org> apcupsd-3.10.6.ebuild:
+  Changed various things. Corrected paths for apache2, added a patch for 
+  the scripts in /etc/apcupsd. Linked onbattery to powerout.
+  Closes #25379 and #32471.
+
+*apcupsd-3.10.6 (01 Nov 2003)
+
+  01 Nov 2003; Michael Imhof <tantive@gentoo.org> apcupsd-3.10.6.ebuild:
+  Version bumped.
+
+  17 Oct 2003; Jason Wever <weeve@gentoo.org> apcupsd-3.10.5-r4.ebuild:
+  Added ~sparc keyword.
+
+  04 Sep 2003; Martin Holzer <mholzer@gentoo.org> apcupsd-3.10.5-r4.ebuild,
+  files/apcupsd:
+  adding usb support
+
+*apcupsd-3.10.5-r4 (04 Sep 2003)
+
+  04 Sep 2003; Martin Holzer <mholzer@gentoo.org> apcupsd-3.10.5-r4.ebuild:
+  Added snmp support. Submitted by Anders Bruun Olsen <anders@bruun-olsen.net>
+  in #23946.
+
+  03 Sep 2003; Martin Holzer <mholzer@gentoo.org> apcupsd-3.10.5-r3.ebuild:
+  Adding safe.apccontrol
+
+  30 Jun 2003; Martin Holzer <mholzer@gentoo.org> files/apcupsd:
+  Added depend into initscript. Closes #20771.
+
+*apcupsd-3.10.5-r3 (27 Feb 2003)
+
+  27 Feb 2003; Zach Welch <zwelch@gentoo.org> apcupsd-3.10.5-r3.ebuild:
+  fix bug 16476
+
+*apcupsd-3.10.5-r2 (27 Feb 2003)
+
+  27 Feb 2003; Zach Welch <zwelch@gentoo.org> apcupsd-3.10.5-r2.ebuild:
+  fix mail delivery
+
+*apcupsd-3.10.5-r1 (26 Feb 2003)
+
+  26 Feb 2003; Zach Welch <zwelch@gentoo.org> apcupsd-3.10.5-r1.ebuild,
+  files/3.10.5/apache.conf, files/3.10.5/init.patch,
+  files/3.10.5/restart.patch:
+  Add --enable-oldnet, fix restart race, add init script depend, add
+  apache add-on configuration file; fixes bugs 9942 and 16392
+
+*apcupsd-3.10.5 (23 Feb 2003)
+
+  24 Feb 2003; Zach Welch <zwelch@gentoo.org> apcupsd-3.10.5.ebuild :
+  Mark stable for arm
+
+  23 Feb 2003; Zach Welch <zwelch@gentoo.org> :
+  Update to latest version to address GLSA (see bug 16002)
+ 
+*apcupsd-3.10.1 (20 Oct 2002)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+  15 Nov 2002; Zach Welch <zwelch@gentoo.org> :
+  Update ebuild to patch powerflute for gcc 3.2 compatibliity
+
+  25 Oct 2002; Zach Welch <zwelch@gentoo.org> :
+  Update ebuild to patch configure to use correct system version.
+  Sucessfully merged on ppc, added ~ppc
+
+  20 Oct 2002; Zach Welch <zwelch@gentoo.org> :
+  New version incorporating changes made by Superlucidity Services, LLC, to
+  support Gentoo without additional patching.  
+  First version (in portage) that supports USB UPSes, and the defaults for the
+  configuration file use these (as examples for serial are shown in comments).
+  This version also installs all the add ons for the package which were 
+  previously disabeld.  This includes multimon cgi support.
+  See bug 7778 for more information.
+
+*apcupsd-3.8.5 (14 Jul 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> apcupsd-3.8.1.ebuild, files/digest-apcupsd-3.8.1 :
+  Bumped to new version. 
+  Thanks to tantive <tantive@tantive.de> for the contribution.
+
+*apcupsd-3.8.1 (1 Feb 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> apcupsd-3.8.1.ebuild :
+  Added KEYWORDS, SLOT.
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way. This changelog is targetted to users. This means that the
+  comments should well explained and written in clean English. The details about
+  writing correct changelogs are explained in the skel.ChangeLog file which you
+  can find in the root directory of the portage repository.
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
new file mode 100644
index 000000000000..6e4ad83638c5
--- /dev/null
+++ b/sys-power/apcupsd/Manifest
@@ -0,0 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4282157341327ebdc6e83199da5fc876 ChangeLog 10185
+MD5 ae53e7849e679480cbfaac218b82819a apcupsd-3.10.16-r3.ebuild 2601
+MD5 27ae5add10fc42e77804f1ecd768df87 metadata.xml 226
+MD5 3326f948227834f39ad2c23bb3e0a7ef apcupsd-3.10.15-r1.ebuild 2395
+MD5 ed12d329ca566b8f2632d425828ea5d7 files/digest-apcupsd-3.10.16-r3 68
+MD5 ec48a12c6d8b56aeffbeaa629f8835ad files/digest-apcupsd-3.10.15-r1 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 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)
+
+iD8DBQFCGUk9mdTrptrqvGERAvl1AJ9Z8hqNLvOwKGzPJHL1OUnJUKPOogCfcV0M
+N9a6++JKNk5+HJG2+a9qhRk=
+=Ysx0
+-----END PGP SIGNATURE-----
diff --git a/sys-power/apcupsd/apcupsd-3.10.15-r1.ebuild b/sys-power/apcupsd/apcupsd-3.10.15-r1.ebuild
new file mode 100644
index 000000000000..c7ddaa039ee3
--- /dev/null
+++ b/sys-power/apcupsd/apcupsd-3.10.15-r1.ebuild
@@ -0,0 +1,100 @@
+# 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.15-r1.ebuild,v 1.1 2005/03/14 23:27:27 ciaranm 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/net-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
+}
+
+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/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-power/apcupsd/apcupsd-3.10.16-r3.ebuild b/sys-power/apcupsd/apcupsd-3.10.16-r3.ebuild
new file mode 100644
index 000000000000..fb132c1c0b2b
--- /dev/null
+++ b/sys-power/apcupsd/apcupsd-3.10.16-r3.ebuild
@@ -0,0 +1,99 @@
+# 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.16-r3.ebuild,v 1.1 2005/03/14 23:27:27 ciaranm 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 gd"
+
+DEPEND=">=sys-apps/baselayout-1.8.4
+	virtual/libc
+	virtual/mta
+	snmp? ( net-analyzer/net-snmp )
+	gd? ( >=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
+}
+
+src_compile() {
+	local myconf
+	use snmp && myconf="${myconf} --enable-net-snmp"
+	use gd && 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 --with-serial-dev=/dev/usb/hiddev[0-9] --enable-usb"
+	use !usb && myconf="${myconf} --with-upstype=apcsmart --with-upscable=apcsmart --with-serial-dev=/dev/ttyS0 --disable-usb"
+	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 \
+		--enable-powerflute \
+		--enable-pthreads \
+		${myconf} \
+		|| die
+	make || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die "installed failed"
+
+	if use gd
+	then
+		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
+	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.15/apache.conf b/sys-power/apcupsd/files/3.10.15/apache.conf
new file mode 100644
index 000000000000..21305d257846
--- /dev/null
+++ b/sys-power/apcupsd/files/3.10.15/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-power/apcupsd/files/3.10.15/apcupsd.in.patch b/sys-power/apcupsd/files/3.10.15/apcupsd.in.patch
new file mode 100644
index 000000000000..7bcb0f41c086
--- /dev/null
+++ b/sys-power/apcupsd/files/3.10.15/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.15/smtp.patch b/sys-power/apcupsd/files/3.10.15/smtp.patch
new file mode 100644
index 000000000000..d0c6bbcbdd48
--- /dev/null
+++ b/sys-power/apcupsd/files/3.10.15/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/3.10.16/apache.conf b/sys-power/apcupsd/files/3.10.16/apache.conf
new file mode 100644
index 000000000000..21305d257846
--- /dev/null
+++ b/sys-power/apcupsd/files/3.10.16/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-power/apcupsd/files/3.10.16/apcupsd.in.patch b/sys-power/apcupsd/files/3.10.16/apcupsd.in.patch
new file mode 100644
index 000000000000..7bcb0f41c086
--- /dev/null
+++ b/sys-power/apcupsd/files/3.10.16/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.16/smtp.patch b/sys-power/apcupsd/files/3.10.16/smtp.patch
new file mode 100644
index 000000000000..d0c6bbcbdd48
--- /dev/null
+++ b/sys-power/apcupsd/files/3.10.16/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.15-r1 b/sys-power/apcupsd/files/digest-apcupsd-3.10.15-r1
new file mode 100644
index 000000000000..453c30357b37
--- /dev/null
+++ b/sys-power/apcupsd/files/digest-apcupsd-3.10.15-r1
@@ -0,0 +1 @@
+MD5 21b2b744ebcaa0010367a403a9c5e66c apcupsd-3.10.15.tar.gz 3858266
diff --git a/sys-power/apcupsd/files/digest-apcupsd-3.10.16-r3 b/sys-power/apcupsd/files/digest-apcupsd-3.10.16-r3
new file mode 100644
index 000000000000..c76addf36fa3
--- /dev/null
+++ b/sys-power/apcupsd/files/digest-apcupsd-3.10.16-r3
@@ -0,0 +1 @@
+MD5 07de8f7d7488b6ef91f128f51713f4ea apcupsd-3.10.16.tar.gz 5037822
diff --git a/sys-power/apcupsd/metadata.xml b/sys-power/apcupsd/metadata.xml
new file mode 100644
index 000000000000..3586e99b4226
--- /dev/null
+++ b/sys-power/apcupsd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>base-system</herd>
+<maintainer>
+ <email>tantive@gentoo.org</email>
+</maintainer>
+</pkgmetadata>