Take over package, remove all the old versions that are not latest-stable for any architecture, remove all the extra files (lots of duplicates too), remove the etc patch from 3.14.5 because with mailx it shouldn't matter.

(Portage version: 2.2_rc22/cvs/Linux 2.6.28-gentoo x86_64)

50 files changed, 36 insertions, 2714 deletions

diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index 569a7cd1f0b3..066b205ce0ff 100644
--- a/sys-power/apcupsd/ChangeLog
+++ b/sys-power/apcupsd/ChangeLog
@@ -1,6 +1,36 @@
 # ChangeLog for sys-power/apcupsd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.38 2009/01/15 15:21:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.39 2009/01/15 15:37:07 flameeyes Exp $
+
+  15 Jan 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  -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, -files/3.10.17/apache.conf,
+  -files/3.10.17/apcupsd.in.patch, -files/3.10.17/smtp.patch,
+  -files/3.10.15/apache.conf, -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, -files/3.12.3/apcupsd.in.patch,
+  -files/3.12.3/etc.patch, -files/3.14/apcupsd.in.patch,
+  -files/3.14/etc.patch,
+  -files/3.14.0/apcupsd-3.14.0-apccontrol-gentoo.patch,
+  -files/3.14.0/apcupsd.in.patch, -files/3.14.0/apcupsd.initd,
+  -files/3.14.0/etc.patch, -files/3.14.0/no-parallel.patch,
+  -files/3.14.1/apcupsd-3.14.1-apccontrol-gentoo.patch,
+  -files/3.14.1/apcupsd.in.patch, -files/3.14.1/apcupsd.initd,
+  -files/3.14.1/etc.patch, -files/3.14.1/no-parallel.patch,
+  -files/3.14.2/apcupsd.in.patch, -files/3.14.2/apcupsd.initd,
+  -files/3.14.2/etc.patch, -files/3.14.2/no-parallel.patch,
+  -files/3.14.3/apcupsd.in.patch, -files/3.14.3/apcupsd.initd,
+  -files/3.14.3/etc.patch, -files/3.14.3/hal-ups-policy.patch,
+  -files/3.14.3/no-parallel.patch, metadata.xml, -apcupsd-3.10.15-r1.ebuild,
+  -apcupsd-3.10.16-r3.ebuild, -apcupsd-3.10.17-r1.ebuild,
+  -apcupsd-3.10.18-r2.ebuild, -apcupsd-3.12.2.ebuild,
+  -apcupsd-3.12.2-r1.ebuild, -apcupsd-3.12.3.ebuild, -apcupsd-3.14.0.ebuild,
+  -apcupsd-3.14.1.ebuild, -apcupsd-3.14.2.ebuild, -apcupsd-3.14.3.ebuild,
+  apcupsd-3.14.5.ebuild:
+  Take over package, remove all the old versions that are not latest-stable
+  for any architecture, remove all the extra files (lots of duplicates too),
+  remove the etc patch from 3.14.5 because with mailx it shouldn't matter.
 
 *apcupsd-3.14.5 (15 Jan 2009)
 
diff --git a/sys-power/apcupsd/apcupsd-3.10.15-r1.ebuild b/sys-power/apcupsd/apcupsd-3.10.15-r1.ebuild
deleted file mode 100644
index 6c31e3887adc..000000000000
--- a/sys-power/apcupsd/apcupsd-3.10.15-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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.10.15-r1.ebuild,v 1.3 2006/10/22 19:49:01 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/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
-	emake || die "emake failed"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die "installed failed"
-	rm -f "${D}"/etc/init.d/halt
-
-	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
deleted file mode 100644
index d978b0779c8e..000000000000
--- a/sys-power/apcupsd/apcupsd-3.10.16-r3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# 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.10.16-r3.ebuild,v 1.4 2006/10/22 19:49:01 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 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
-	emake || die "emake failed"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die "installed failed"
-	rm -f "${D}"/etc/init.d/halt
-
-	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/apcupsd-3.10.17-r1.ebuild b/sys-power/apcupsd/apcupsd-3.10.17-r1.ebuild
deleted file mode 100644
index dcb1a27e6445..000000000000
--- a/sys-power/apcupsd/apcupsd-3.10.17-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2008 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-r1.ebuild,v 1.5 2008/01/31 20:32:56 hollow 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="~amd64 ~ppc ~sparc x86"
-IUSE="doc snmp usb apache2 cgi threads ncurses nls"
-
-DEPEND="snmp? ( net-analyzer/net-snmp )
-	cgi? ( >=media-libs/gd-1.8.4
-		www-servers/apache )
-	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
-}
-
-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
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "installed failed"
-	rm -f "${D}"/etc/init.d/halt
-
-	if use cgi; then
-		insinto ${APACHE_MODULES_CONFDIR}
-		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/apcupsd-3.10.18-r2.ebuild b/sys-power/apcupsd/apcupsd-3.10.18-r2.ebuild
deleted file mode 100644
index 4cae177e52b1..000000000000
--- a/sys-power/apcupsd/apcupsd-3.10.18-r2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.10.18-r2.ebuild,v 1.5 2008/01/31 20:32:56 hollow Exp $
-
-inherit eutils depend.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="~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? ( >=www-servers/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
-
-	# 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
-	emake || die "emake failed"
-}
-
-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 ${APACHE_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
-	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.12.2-r1.ebuild b/sys-power/apcupsd/apcupsd-3.12.2-r1.ebuild
deleted file mode 100644
index 114df4c2a3a3..000000000000
--- a/sys-power/apcupsd/apcupsd-3.12.2-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2008 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-r1.ebuild,v 1.5 2008/01/31 20:32:56 hollow 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 ~x86-fbsd"
-IUSE="doc snmp usb apache2 cgi threads ncurses nls lighttpd"
-
-DEPEND="snmp? ( net-analyzer/net-snmp )
-	cgi? ( >=media-libs/gd-1.8.4
-		apache2? ( >=www-servers/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=/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
-	emake || die "emake failed"
-}
-
-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 ${APACHE_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/apcupsd-3.12.2.ebuild b/sys-power/apcupsd/apcupsd-3.12.2.ebuild
deleted file mode 100644
index 15091c8acdd6..000000000000
--- a/sys-power/apcupsd/apcupsd-3.12.2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2008 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.4 2008/01/31 20:32:56 hollow 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? ( >=www-servers/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
-	emake || die "emake failed"
-}
-
-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 ${APACHE_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/apcupsd-3.12.3.ebuild b/sys-power/apcupsd/apcupsd-3.12.3.ebuild
deleted file mode 100644
index 1211fe9f3d92..000000000000
--- a/sys-power/apcupsd/apcupsd-3.12.3.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.12.3.ebuild,v 1.3 2008/09/03 07:25:44 opfer Exp $
-
-inherit eutils webapp
-
-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"
-WEBAPP_MANUAL_SLOT="yes"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="doc snmp usb cgi threads ncurses nls"
-
-DEPEND="doc? ( virtual/latex-base
-		dev-tex/latex2html )
-	cgi? ( >=media-libs/gd-1.8.4 )
-	ncurses? ( sys-libs/ncurses )
-	nls? ( sys-devel/gettext )
-	snmp? ( net-analyzer/net-snmp )"
-RDEPEND="${DEPEND}
-	virtual/mta"
-
-pkg_setup() {
-	use cgi && webapp_pkg_setup
-}
-
-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-cgi-bin=${MY_CGIBINDIR}"
-	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=/sbin \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/apcupsd \
-		--with-pwrfail-dir=/etc/apcupsd \
-		--with-lock-dir=/var/lock \
-		--with-pid-dir=/var/run \
-		--with-log-dir=/var/log \
-		--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
-	emake || die "emake failed"
-
-	if use doc; then
-		einfo "Building full documentation..."
-		cd ${S}/doc/latex
-		make texcheck tex web pdf
-	fi
-}
-
-src_install() {
-	use cgi && webapp_src_preinst
-
-	make DESTDIR=${D} install || die "installed failed"
-	rm -f "${D}"/etc/init.d/halt
-
-	insinto /etc/apcupsd
-	newins examples/safe.apccontrol safe.apccontrol
-
-	dodoc ChangeLog* ReleaseNotes
-	mv doc/apctest.man doc/apctest.8; doman doc/apctest.8
-
-	if use doc; then
-		einfo "Installing full documentation..."
-		newdoc doc/latex/apcupsd.pdf manual.pdf
-		dohtml -r doc/latex/apcupsd/*
-	fi
-
-	if use cgi; then
-		mv ${D}/etc/apcupsd/apcupsd.css ${D}${MY_CGIBINDIR}
-		webapp_src_install
-	fi
-}
-
-pkg_postinst() {
-	if use cgi; then
-		einfo If you are upgrading from a previous version, please note
-		einfo that the CGI interface is now installed using webapp-config.
-		einfo /var/www/apcupsd is no longer present.
-		webapp_pkg_postinst
-	fi
-}
-
-pkg_prerm() {
-	use cgi && webapp_pkg_prerm
-}
diff --git a/sys-power/apcupsd/apcupsd-3.14.0.ebuild b/sys-power/apcupsd/apcupsd-3.14.0.ebuild
deleted file mode 100644
index 7bfbc5e6ac86..000000000000
--- a/sys-power/apcupsd/apcupsd-3.14.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.0.ebuild,v 1.5 2008/09/03 07:25:44 opfer Exp $
-
-WEBAPP_MANUAL_SLOT="yes"
-inherit eutils webapp
-
-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="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="doc snmp usb cgi threads ncurses nls gnome"
-
-DEPEND="doc? ( virtual/latex-base dev-tex/latex2html )
-	cgi? ( >=media-libs/gd-1.8.4 )
-	ncurses? ( sys-libs/ncurses )
-	nls? ( sys-devel/gettext )
-	snmp? ( net-analyzer/net-snmp )
-	gnome? ( >=x11-libs/gtk+-2.4.0
-		>=gnome-base/gconf-2.0 )"
-RDEPEND="${DEPEND}
-	virtual/mta"
-
-pkg_setup() {
-	use cgi && webapp_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PV}/apcupsd.in.patch
-	epatch "${FILESDIR}"/${PV}/etc.patch
-	epatch "${FILESDIR}"/${PV}/no-parallel.patch
-	epatch "${FILESDIR}"/${PV}/${P}-apccontrol-gentoo.patch
-}
-
-src_compile() {
-	local myconf
-	use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=${MY_CGIBINDIR}"
-	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=/sbin \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/apcupsd \
-		--with-pwrfail-dir=/etc/apcupsd \
-		--with-lock-dir=/var/lock \
-		--with-pid-dir=/var/run \
-		--with-log-dir=/var/log \
-		--with-nis-port=3551 \
-		--enable-net \
-		$(use_enable ncurses powerflute) \
-		$(use_enable threads pthreads) \
-		$(use_enable snmp net-snmp) \
-		$(use_enable nls) \
-		$(use_enable gnome gapcmon) \
-		${myconf} \
-		|| die
-	emake -j1 || die "emake failed"
-
-	if use doc; then
-		einfo "Building full documentation..."
-		cd "${S}"/doc/latex
-		make texcheck tex web pdf
-	fi
-}
-
-src_install() {
-	use cgi && webapp_src_preinst
-
-	emake DESTDIR="${D}" install || die "installed failed"
-	rm -f "${D}"/etc/init.d/halt
-
-	insinto /etc/apcupsd
-	newins examples/safe.apccontrol safe.apccontrol
-
-	dodoc ChangeLog* ReleaseNotes
-	mv doc/apctest.man doc/apctest.8; doman doc/apctest.8
-
-	if use doc; then
-		einfo "Installing full documentation..."
-		newdoc doc/latex/apcupsd.pdf manual.pdf
-		dohtml -r doc/latex/apcupsd/*
-	fi
-
-	if use cgi; then
-		mv "${D}"/etc/apcupsd/apcupsd.css "${D}""${MY_CGIBINDIR}"
-		webapp_src_install
-	fi
-
-	rm "${D}"/etc/init.d/apcupsd
-	newinitd "${FILESDIR}/${PV}/${PN}.initd" "${PN}"
-}
-
-pkg_postinst() {
-	if use cgi; then
-		elog If you are upgrading from a previous version, please note
-		elog that the CGI interface is now installed using webapp-config.
-		elog /var/www/apcupsd is no longer present.
-		webapp_pkg_postinst
-	fi
-
-	elog ""
-	elog "Since version 3.14.0 you can use multiple apcupsd instances to"
-	elog "control more than one UPS in a single box."
-	elog "To do this, create a link between /etc/init.d/apcupsd to a new"
-	elog "/etc/init.d/apcupsd.something, and it will then load the"
-	elog "configuration file at /etc/apcupsd/something.conf."
-	elog ""
-}
-
-pkg_prerm() {
-	use cgi && webapp_pkg_prerm
-}
diff --git a/sys-power/apcupsd/apcupsd-3.14.1.ebuild b/sys-power/apcupsd/apcupsd-3.14.1.ebuild
deleted file mode 100644
index 26e1139fa15b..000000000000
--- a/sys-power/apcupsd/apcupsd-3.14.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.1.ebuild,v 1.3 2008/09/03 07:25:44 opfer Exp $
-
-WEBAPP_MANUAL_SLOT="yes"
-inherit eutils webapp
-
-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="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="doc snmp usb cgi threads ncurses nls gnome"
-
-DEPEND="doc? ( virtual/latex-base dev-tex/latex2html )
-	cgi? ( >=media-libs/gd-1.8.4 )
-	ncurses? ( sys-libs/ncurses )
-	nls? ( sys-devel/gettext )
-	snmp? ( net-analyzer/net-snmp )
-	gnome? ( >=x11-libs/gtk+-2.4.0
-		>=gnome-base/gconf-2.0 )"
-RDEPEND="${DEPEND}
-	virtual/mta"
-
-pkg_setup() {
-	use cgi && webapp_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PV}/apcupsd.in.patch
-	epatch "${FILESDIR}"/${PV}/etc.patch
-	epatch "${FILESDIR}"/${PV}/no-parallel.patch
-	epatch "${FILESDIR}"/${PV}/${P}-apccontrol-gentoo.patch
-}
-
-src_compile() {
-	local myconf
-	use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=${MY_CGIBINDIR}"
-	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=/sbin \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/apcupsd \
-		--with-pwrfail-dir=/etc/apcupsd \
-		--with-lock-dir=/var/lock \
-		--with-pid-dir=/var/run \
-		--with-log-dir=/var/log \
-		--with-nis-port=3551 \
-		--enable-net \
-		$(use_enable ncurses powerflute) \
-		$(use_enable threads pthreads) \
-		$(use_enable snmp net-snmp) \
-		$(use_enable nls) \
-		$(use_enable gnome gapcmon) \
-		${myconf} \
-		|| die
-	emake -j1 || die "emake failed"
-
-	if use doc; then
-		einfo "Building full documentation..."
-		cd "${S}"/doc/latex
-		make texcheck tex web pdf
-	fi
-}
-
-src_install() {
-	use cgi && webapp_src_preinst
-
-	emake DESTDIR="${D}" install || die "installed failed"
-	rm -f "${D}"/etc/init.d/halt
-
-	insinto /etc/apcupsd
-	newins examples/safe.apccontrol safe.apccontrol
-
-	dodoc ChangeLog* ReleaseNotes
-	mv doc/apctest.man doc/apctest.8; doman doc/apctest.8
-
-	if use doc; then
-		einfo "Installing full documentation..."
-		newdoc doc/latex/apcupsd.pdf manual.pdf
-		dohtml -r doc/latex/apcupsd/*
-	fi
-
-	if use cgi; then
-		mv "${D}"/etc/apcupsd/apcupsd.css "${D}""${MY_CGIBINDIR}"
-		webapp_src_install
-	fi
-
-	rm "${D}"/etc/init.d/apcupsd
-	newinitd "${FILESDIR}/${PV}/${PN}.initd" "${PN}"
-}
-
-pkg_postinst() {
-	if use cgi; then
-		elog If you are upgrading from a previous version, please note
-		elog that the CGI interface is now installed using webapp-config.
-		elog /var/www/apcupsd is no longer present.
-		webapp_pkg_postinst
-	fi
-
-	elog ""
-	elog "Since version 3.14.0 you can use multiple apcupsd instances to"
-	elog "control more than one UPS in a single box."
-	elog "To do this, create a link between /etc/init.d/apcupsd to a new"
-	elog "/etc/init.d/apcupsd.something, and it will then load the"
-	elog "configuration file at /etc/apcupsd/something.conf."
-	elog ""
-}
-
-pkg_prerm() {
-	use cgi && webapp_pkg_prerm
-}
diff --git a/sys-power/apcupsd/apcupsd-3.14.2.ebuild b/sys-power/apcupsd/apcupsd-3.14.2.ebuild
deleted file mode 100644
index 49ca68d384ae..000000000000
--- a/sys-power/apcupsd/apcupsd-3.14.2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.2.ebuild,v 1.3 2008/09/03 07:25:44 opfer Exp $
-
-WEBAPP_MANUAL_SLOT="yes"
-inherit eutils webapp
-
-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="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="doc snmp usb cgi ncurses nls gnome"
-
-DEPEND="doc? ( virtual/latex-base dev-tex/latex2html )
-	cgi? ( >=media-libs/gd-1.8.4 )
-	ncurses? ( sys-libs/ncurses )
-	nls? ( sys-devel/gettext )
-	snmp? ( net-analyzer/net-snmp )
-	gnome? ( >=x11-libs/gtk+-2.4.0
-		>=dev-libs/glib-2.0
-		>=gnome-base/gconf-2.0 )"
-RDEPEND="${DEPEND}
-	virtual/mta"
-
-pkg_setup() {
-	use cgi && webapp_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PV}/apcupsd.in.patch
-	epatch "${FILESDIR}"/${PV}/etc.patch
-}
-
-src_compile() {
-	local myconf
-	use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=${MY_CGIBINDIR}"
-	use usb && myconf="${myconf} --with-upstype=usb --with-upscable=usb --enable-usb --without-dev"
-	use !usb && myconf="${myconf} --with-upstype=apcsmart --with-upscable=smart --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=/sbin \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/apcupsd \
-		--with-pwrfail-dir=/etc/apcupsd \
-		--with-lock-dir=/var/lock \
-		--with-pid-dir=/var/run \
-		--with-log-dir=/var/log \
-		--with-nis-port=3551 \
-		--enable-net \
-		$(use_enable ncurses powerflute) \
-		$(use_enable snmp net-snmp) \
-		$(use_enable nls) \
-		$(use_enable gnome gapcmon) \
-		${myconf} \
-		|| die
-	emake -j1 || die "emake failed"
-
-	if use doc; then
-		einfo "Building full documentation..."
-		cd "${S}"/doc/latex
-		make texcheck tex web pdf
-	fi
-}
-
-src_install() {
-	use cgi && webapp_src_preinst
-
-	emake DESTDIR="${D}" install || die "installed failed"
-	rm -f "${D}"/etc/init.d/halt
-
-	insinto /etc/apcupsd
-	newins examples/safe.apccontrol safe.apccontrol
-
-	dodoc ChangeLog* ReleaseNotes
-	mv doc/apctest.man doc/apctest.8; doman doc/apctest.8
-
-	if use doc; then
-		einfo "Installing full documentation..."
-		newdoc doc/latex/apcupsd.pdf manual.pdf
-		dohtml -r doc/latex/apcupsd/*
-	fi
-
-	if use cgi; then
-		mv "${D}"/etc/apcupsd/apcupsd.css "${D}""${MY_CGIBINDIR}"
-		webapp_src_install
-	fi
-
-	rm "${D}"/etc/init.d/apcupsd
-	newinitd "${FILESDIR}/${PV}/${PN}.initd" "${PN}"
-}
-
-pkg_postinst() {
-	if use cgi; then
-		elog If you are upgrading from a previous version, please note
-		elog that the CGI interface is now installed using webapp-config.
-		elog /var/www/apcupsd is no longer present.
-		webapp_pkg_postinst
-	fi
-
-	elog ""
-	elog "Since version 3.14.0 you can use multiple apcupsd instances to"
-	elog "control more than one UPS in a single box."
-	elog "To do this, create a link between /etc/init.d/apcupsd to a new"
-	elog "/etc/init.d/apcupsd.something, and it will then load the"
-	elog "configuration file at /etc/apcupsd/something.conf."
-	elog ""
-}
-
-pkg_prerm() {
-	use cgi && webapp_pkg_prerm
-}
diff --git a/sys-power/apcupsd/apcupsd-3.14.3.ebuild b/sys-power/apcupsd/apcupsd-3.14.3.ebuild
deleted file mode 100644
index ae89f03be2d3..000000000000
--- a/sys-power/apcupsd/apcupsd-3.14.3.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.3.ebuild,v 1.2 2008/09/03 07:25:44 opfer Exp $
-
-WEBAPP_MANUAL_SLOT="yes"
-inherit eutils webapp
-
-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="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="doc snmp usb cgi ncurses nls gnome"
-
-DEPEND="doc? ( virtual/latex-base dev-tex/latex2html )
-	cgi? ( >=media-libs/gd-1.8.4 )
-	ncurses? ( sys-libs/ncurses )
-	nls? ( sys-devel/gettext )
-	snmp? ( net-analyzer/net-snmp )
-	gnome? ( >=x11-libs/gtk+-2.4.0
-		>=dev-libs/glib-2.0
-		>=gnome-base/gconf-2.0 )"
-RDEPEND="${DEPEND}
-	virtual/mta"
-
-pkg_setup() {
-	use cgi && webapp_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PV}/apcupsd.in.patch
-	epatch "${FILESDIR}"/${PV}/etc.patch
-	epatch "${FILESDIR}"/${PV}/hal-ups-policy.patch
-}
-
-src_compile() {
-	local myconf
-	use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=${MY_CGIBINDIR}"
-	use usb && myconf="${myconf} --with-upstype=usb --with-upscable=usb --enable-usb --without-dev"
-	use !usb && myconf="${myconf} --with-upstype=apcsmart --with-upscable=smart --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=/sbin \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/apcupsd \
-		--with-pwrfail-dir=/etc/apcupsd \
-		--with-lock-dir=/var/lock \
-		--with-pid-dir=/var/run \
-		--with-log-dir=/var/log \
-		--with-nis-port=3551 \
-		--enable-net \
-		$(use_enable ncurses powerflute) \
-		$(use_enable snmp net-snmp) \
-		$(use_enable nls) \
-		$(use_enable gnome gapcmon) \
-		${myconf} \
-		|| die
-	emake -j1 || die "emake failed"
-
-	if use doc; then
-		einfo "Building full documentation..."
-		cd "${S}"/doc/latex
-		make texcheck tex web pdf
-	fi
-}
-
-src_install() {
-	use cgi && webapp_src_preinst
-
-	emake DESTDIR="${D}" install || die "installed failed"
-	rm -f "${D}"/etc/init.d/halt
-
-	insinto /etc/apcupsd
-	newins examples/safe.apccontrol safe.apccontrol
-
-	dodoc ChangeLog* ReleaseNotes
-	mv doc/apctest.man doc/apctest.8; doman doc/apctest.8
-
-	if use doc; then
-		einfo "Installing full documentation..."
-		newdoc doc/latex/apcupsd.pdf manual.pdf
-		dohtml -r doc/latex/apcupsd/*
-	fi
-
-	if use cgi; then
-		mv "${D}"/etc/apcupsd/apcupsd.css "${D}""${MY_CGIBINDIR}"
-		webapp_src_install
-	fi
-
-	rm "${D}"/etc/init.d/apcupsd
-	newinitd "${FILESDIR}/${PV}/${PN}.initd" "${PN}"
-}
-
-pkg_postinst() {
-	if use cgi; then
-		elog If you are upgrading from a previous version, please note
-		elog that the CGI interface is now installed using webapp-config.
-		elog /var/www/apcupsd is no longer present.
-		webapp_pkg_postinst
-	fi
-
-	elog ""
-	elog "Since version 3.14.0 you can use multiple apcupsd instances to"
-	elog "control more than one UPS in a single box."
-	elog "To do this, create a link between /etc/init.d/apcupsd to a new"
-	elog "/etc/init.d/apcupsd.something, and it will then load the"
-	elog "configuration file at /etc/apcupsd/something.conf."
-	elog ""
-}
-
-pkg_prerm() {
-	use cgi && webapp_pkg_prerm
-}
diff --git a/sys-power/apcupsd/apcupsd-3.14.5.ebuild b/sys-power/apcupsd/apcupsd-3.14.5.ebuild
index 376a5f490b3a..2099d5cb880d 100644
--- a/sys-power/apcupsd/apcupsd-3.14.5.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.5.ebuild,v 1.1 2009/01/15 15:21:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.5.ebuild,v 1.2 2009/01/15 15:37:07 flameeyes Exp $
 
 WEBAPP_MANUAL_SLOT="yes"
 WEBAPP_OPTIONAL="yes"
@@ -31,12 +31,6 @@ pkg_setup() {
 	use cgi && webapp_pkg_setup
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/3.14.3/etc.patch
-}
-
 src_compile() {
 	local myconf
 	use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=${MY_CGIBINDIR}"
diff --git a/sys-power/apcupsd/files/3.10.15/apache.conf b/sys-power/apcupsd/files/3.10.15/apache.conf
deleted file mode 100644
index 21305d257846..000000000000
--- a/sys-power/apcupsd/files/3.10.15/apache.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 7bcb0f41c086..000000000000
--- a/sys-power/apcupsd/files/3.10.15/apcupsd.in.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
deleted file mode 100644
index d0c6bbcbdd48..000000000000
--- a/sys-power/apcupsd/files/3.10.15/smtp.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-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
deleted file mode 100644
index 21305d257846..000000000000
--- a/sys-power/apcupsd/files/3.10.16/apache.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 7bcb0f41c086..000000000000
--- a/sys-power/apcupsd/files/3.10.16/apcupsd.in.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
deleted file mode 100644
index d0c6bbcbdd48..000000000000
--- a/sys-power/apcupsd/files/3.10.16/smtp.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-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.17/apache.conf b/sys-power/apcupsd/files/3.10.17/apache.conf
deleted file mode 100644
index 3156ab7976de..000000000000
--- a/sys-power/apcupsd/files/3.10.17/apache.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 7bcb0f41c086..000000000000
--- a/sys-power/apcupsd/files/3.10.17/apcupsd.in.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
deleted file mode 100644
index d0c6bbcbdd48..000000000000
--- a/sys-power/apcupsd/files/3.10.17/smtp.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-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.12.2/apache.conf b/sys-power/apcupsd/files/3.12.2/apache.conf
deleted file mode 100644
index 3156ab7976de..000000000000
--- a/sys-power/apcupsd/files/3.12.2/apache.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index a90f6310ea32..000000000000
--- a/sys-power/apcupsd/files/3.12.2/apcupsd-lighttpd.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# 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
deleted file mode 100644
index 7bcb0f41c086..000000000000
--- a/sys-power/apcupsd/files/3.12.2/apcupsd.in.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
deleted file mode 100644
index a3acfdbd6fe4..000000000000
--- a/sys-power/apcupsd/files/3.12.2/etc.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-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/3.12.3/apcupsd.in.patch b/sys-power/apcupsd/files/3.12.3/apcupsd.in.patch
deleted file mode 100644
index 7bcb0f41c086..000000000000
--- a/sys-power/apcupsd/files/3.12.3/apcupsd.in.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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.3/etc.patch b/sys-power/apcupsd/files/3.12.3/etc.patch
deleted file mode 100644
index a3acfdbd6fe4..000000000000
--- a/sys-power/apcupsd/files/3.12.3/etc.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-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/3.14.0/apcupsd-3.14.0-apccontrol-gentoo.patch b/sys-power/apcupsd/files/3.14.0/apcupsd-3.14.0-apccontrol-gentoo.patch
deleted file mode 100644
index 4162a73390bc..000000000000
--- a/sys-power/apcupsd/files/3.14.0/apcupsd-3.14.0-apccontrol-gentoo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: apcupsd-3.14.0/platforms/apccontrol.in
-===================================================================
---- apcupsd-3.14.0.orig/platforms/apccontrol.in
-+++ apcupsd-3.14.0/platforms/apccontrol.in
-@@ -18,7 +18,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- 
--APCPID=@PIDDIR@/apcupsd.pid
-+SERVICE=${SERVICE-apcupsd}
- APCUPSD=@sbindir@/apcupsd
- SHUTDOWN=@SHUTDOWN@
- SCRIPTSHELL=@SCRIPTSHELL@
-@@ -120,15 +120,7 @@ case "$1" in
- 	echo "Remote Shutdown. Beginning Shutdown Sequence." | ${WALL}
-     ;;
-     restartme)
--	echo -n "Restarting APCUPSD Power Management: "
--	THEPID=`cat ${APCPID}`
--	kill ${THEPID}
--	rm -f ${APCPID}
--	rm -f @PWRFAILDIR@/powerfail
--	rm -f @nologdir@/nologin
--	sleep 5
--	`${APCUPSD}`
--	echo "apcupsd"
-+	/etc/init.d/${SERVICE} restart
-     ;;
-     startselftest)
-     ;;
diff --git a/sys-power/apcupsd/files/3.14.0/apcupsd.in.patch b/sys-power/apcupsd/files/3.14.0/apcupsd.in.patch
deleted file mode 100644
index 69dad9d74d1c..000000000000
--- a/sys-power/apcupsd/files/3.14.0/apcupsd.in.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- platforms/gentoo/apcupsd.in
-+++ platforms/gentoo/apcupsd.in
-@@ -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.14.0/apcupsd.initd b/sys-power/apcupsd/files/3.14.0/apcupsd.initd
deleted file mode 100644
index 7475a181a2bb..000000000000
--- a/sys-power/apcupsd/files/3.14.0/apcupsd.initd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/runscript
-# Copyright 2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/files/3.14.0/apcupsd.initd,v 1.1 2007/05/02 21:12:23 tantive Exp $
-
-INSTANCE="${SVCNAME#*.}"
-if [ -z "${INSTANCE}" ] || [ "${SVCNAME}" = "apcupsd" ]; then
-	INSTANCE="apcupsd"
-fi
-
-depend() {
-	use net
-}
-
-start() {
-	rm -f /etc/apcupsd/powerfail
-
-	export SERVICE="${SVCNAME}"
-
-	ebegin "Starting APC UPS daemon"
-	start-stop-daemon \
-		--start --pidfile "/var/run/${SVCNAME}.pid" \
-		--exec /sbin/apcupsd -- \
-		-f "/etc/apcupsd/${INSTANCE}.conf" \
-		-P "/var/run/${SVCNAME}.pid"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping APC UPS daemon"
-	start-stop-daemon \
-		--stop --pidfile "/var/run/${SVCNAME}.pid" \
-		--exec /sbin/apcupsd
-	eend $?
-}
diff --git a/sys-power/apcupsd/files/3.14.0/etc.patch b/sys-power/apcupsd/files/3.14.0/etc.patch
deleted file mode 100644
index cc8370b7618b..000000000000
--- a/sys-power/apcupsd/files/3.14.0/etc.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-*** platforms/etc.bak/changeme.in       2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/changeme.in   2007-02-18 15:01:36.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/commfailure.in    2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/commfailure.in        2007-02-18 15:01:56.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/commok.in 2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/commok.in     2007-02-18 15:02:24.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/offbattery.in     2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/offbattery.in 2007-02-18 15:04:43.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/onbattery.in      2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/onbattery.in  2007-02-18 15:04:47.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-
diff --git a/sys-power/apcupsd/files/3.14.0/no-parallel.patch b/sys-power/apcupsd/files/3.14.0/no-parallel.patch
deleted file mode 100644
index a2aa4c398d1c..000000000000
--- a/sys-power/apcupsd/files/3.14.0/no-parallel.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-upstream forces this cruft
-
---- autoconf/targets.mak
-+++ autoconf/targets.mak
-@@ -5,6 +5,8 @@
- #
- # Copyright (C) 1999-2002 Riccardo Facchetti <riccardo@master.oasi.gpa.it>
- 
-+.NOTPARALLEL:
-+
- # Tell versions [3.59,3.63) of GNU make not to export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/sys-power/apcupsd/files/3.14.1/apcupsd-3.14.1-apccontrol-gentoo.patch b/sys-power/apcupsd/files/3.14.1/apcupsd-3.14.1-apccontrol-gentoo.patch
deleted file mode 100644
index 4162a73390bc..000000000000
--- a/sys-power/apcupsd/files/3.14.1/apcupsd-3.14.1-apccontrol-gentoo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: apcupsd-3.14.0/platforms/apccontrol.in
-===================================================================
---- apcupsd-3.14.0.orig/platforms/apccontrol.in
-+++ apcupsd-3.14.0/platforms/apccontrol.in
-@@ -18,7 +18,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- 
--APCPID=@PIDDIR@/apcupsd.pid
-+SERVICE=${SERVICE-apcupsd}
- APCUPSD=@sbindir@/apcupsd
- SHUTDOWN=@SHUTDOWN@
- SCRIPTSHELL=@SCRIPTSHELL@
-@@ -120,15 +120,7 @@ case "$1" in
- 	echo "Remote Shutdown. Beginning Shutdown Sequence." | ${WALL}
-     ;;
-     restartme)
--	echo -n "Restarting APCUPSD Power Management: "
--	THEPID=`cat ${APCPID}`
--	kill ${THEPID}
--	rm -f ${APCPID}
--	rm -f @PWRFAILDIR@/powerfail
--	rm -f @nologdir@/nologin
--	sleep 5
--	`${APCUPSD}`
--	echo "apcupsd"
-+	/etc/init.d/${SERVICE} restart
-     ;;
-     startselftest)
-     ;;
diff --git a/sys-power/apcupsd/files/3.14.1/apcupsd.in.patch b/sys-power/apcupsd/files/3.14.1/apcupsd.in.patch
deleted file mode 100644
index 69dad9d74d1c..000000000000
--- a/sys-power/apcupsd/files/3.14.1/apcupsd.in.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- platforms/gentoo/apcupsd.in
-+++ platforms/gentoo/apcupsd.in
-@@ -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.14.1/apcupsd.initd b/sys-power/apcupsd/files/3.14.1/apcupsd.initd
deleted file mode 100644
index c053628cf03b..000000000000
--- a/sys-power/apcupsd/files/3.14.1/apcupsd.initd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/runscript
-# Copyright 2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/files/3.14.1/apcupsd.initd,v 1.1 2007/07/01 20:58:00 tantive Exp $
-
-INSTANCE="${SVCNAME#*.}"
-if [ -z "${INSTANCE}" ] || [ "${SVCNAME}" = "apcupsd" ]; then
-	INSTANCE="apcupsd"
-fi
-
-depend() {
-	use net
-}
-
-start() {
-	rm -f /etc/apcupsd/powerfail
-
-	export SERVICE="${SVCNAME}"
-
-	ebegin "Starting APC UPS daemon"
-	start-stop-daemon \
-		--start --pidfile "/var/run/${SVCNAME}.pid" \
-		--exec /sbin/apcupsd -- \
-		-f "/etc/apcupsd/${INSTANCE}.conf" \
-		-P "/var/run/${SVCNAME}.pid"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping APC UPS daemon"
-	start-stop-daemon \
-		--stop --pidfile "/var/run/${SVCNAME}.pid" \
-		--exec /sbin/apcupsd
-	eend $?
-}
diff --git a/sys-power/apcupsd/files/3.14.1/etc.patch b/sys-power/apcupsd/files/3.14.1/etc.patch
deleted file mode 100644
index cc8370b7618b..000000000000
--- a/sys-power/apcupsd/files/3.14.1/etc.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-*** platforms/etc.bak/changeme.in       2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/changeme.in   2007-02-18 15:01:36.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/commfailure.in    2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/commfailure.in        2007-02-18 15:01:56.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/commok.in 2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/commok.in     2007-02-18 15:02:24.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/offbattery.in     2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/offbattery.in 2007-02-18 15:04:43.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/onbattery.in      2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/onbattery.in  2007-02-18 15:04:47.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-
diff --git a/sys-power/apcupsd/files/3.14.1/no-parallel.patch b/sys-power/apcupsd/files/3.14.1/no-parallel.patch
deleted file mode 100644
index a2aa4c398d1c..000000000000
--- a/sys-power/apcupsd/files/3.14.1/no-parallel.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-upstream forces this cruft
-
---- autoconf/targets.mak
-+++ autoconf/targets.mak
-@@ -5,6 +5,8 @@
- #
- # Copyright (C) 1999-2002 Riccardo Facchetti <riccardo@master.oasi.gpa.it>
- 
-+.NOTPARALLEL:
-+
- # Tell versions [3.59,3.63) of GNU make not to export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/sys-power/apcupsd/files/3.14.2/apcupsd.in.patch b/sys-power/apcupsd/files/3.14.2/apcupsd.in.patch
deleted file mode 100644
index 69dad9d74d1c..000000000000
--- a/sys-power/apcupsd/files/3.14.2/apcupsd.in.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- platforms/gentoo/apcupsd.in
-+++ platforms/gentoo/apcupsd.in
-@@ -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.14.2/apcupsd.initd b/sys-power/apcupsd/files/3.14.2/apcupsd.initd
deleted file mode 100644
index 2fe0c76286f8..000000000000
--- a/sys-power/apcupsd/files/3.14.2/apcupsd.initd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/runscript
-# Copyright 2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/files/3.14.2/apcupsd.initd,v 1.1 2007/11/26 08:17:39 tantive Exp $
-
-INSTANCE="${SVCNAME#*.}"
-if [ -z "${INSTANCE}" ] || [ "${SVCNAME}" = "apcupsd" ]; then
-	INSTANCE="apcupsd"
-fi
-
-depend() {
-	use net
-}
-
-start() {
-	rm -f /etc/apcupsd/powerfail
-
-	export SERVICE="${SVCNAME}"
-
-	ebegin "Starting APC UPS daemon"
-	start-stop-daemon \
-		--start --pidfile "/var/run/${SVCNAME}.pid" \
-		--exec /sbin/apcupsd -- \
-		-f "/etc/apcupsd/${INSTANCE}.conf" \
-		-P "/var/run/${SVCNAME}.pid"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping APC UPS daemon"
-	start-stop-daemon \
-		--stop --pidfile "/var/run/${SVCNAME}.pid" \
-		--exec /sbin/apcupsd
-	eend $?
-}
diff --git a/sys-power/apcupsd/files/3.14.2/etc.patch b/sys-power/apcupsd/files/3.14.2/etc.patch
deleted file mode 100644
index cc8370b7618b..000000000000
--- a/sys-power/apcupsd/files/3.14.2/etc.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-*** platforms/etc.bak/changeme.in       2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/changeme.in   2007-02-18 15:01:36.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/commfailure.in    2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/commfailure.in        2007-02-18 15:01:56.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/commok.in 2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/commok.in     2007-02-18 15:02:24.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/offbattery.in     2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/offbattery.in 2007-02-18 15:04:43.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/onbattery.in      2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/onbattery.in  2007-02-18 15:04:47.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-
diff --git a/sys-power/apcupsd/files/3.14.2/no-parallel.patch b/sys-power/apcupsd/files/3.14.2/no-parallel.patch
deleted file mode 100644
index a2aa4c398d1c..000000000000
--- a/sys-power/apcupsd/files/3.14.2/no-parallel.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-upstream forces this cruft
-
---- autoconf/targets.mak
-+++ autoconf/targets.mak
-@@ -5,6 +5,8 @@
- #
- # Copyright (C) 1999-2002 Riccardo Facchetti <riccardo@master.oasi.gpa.it>
- 
-+.NOTPARALLEL:
-+
- # Tell versions [3.59,3.63) of GNU make not to export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/sys-power/apcupsd/files/3.14.3/apcupsd.in.patch b/sys-power/apcupsd/files/3.14.3/apcupsd.in.patch
deleted file mode 100644
index 69dad9d74d1c..000000000000
--- a/sys-power/apcupsd/files/3.14.3/apcupsd.in.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- platforms/gentoo/apcupsd.in
-+++ platforms/gentoo/apcupsd.in
-@@ -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.14.3/apcupsd.initd b/sys-power/apcupsd/files/3.14.3/apcupsd.initd
deleted file mode 100644
index 035b529707fc..000000000000
--- a/sys-power/apcupsd/files/3.14.3/apcupsd.initd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/runscript
-# Copyright 2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/files/3.14.3/apcupsd.initd,v 1.1 2008/05/08 19:37:50 tantive Exp $
-
-INSTANCE="${SVCNAME#*.}"
-if [ -z "${INSTANCE}" ] || [ "${SVCNAME}" = "apcupsd" ]; then
-	INSTANCE="apcupsd"
-fi
-
-depend() {
-	use net
-}
-
-start() {
-	rm -f /etc/apcupsd/powerfail
-
-	export SERVICE="${SVCNAME}"
-
-	ebegin "Starting APC UPS daemon"
-	start-stop-daemon \
-		--start --pidfile "/var/run/${SVCNAME}.pid" \
-		--exec /sbin/apcupsd -- \
-		-f "/etc/apcupsd/${INSTANCE}.conf" \
-		-P "/var/run/${SVCNAME}.pid"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping APC UPS daemon"
-	start-stop-daemon \
-		--stop --pidfile "/var/run/${SVCNAME}.pid" \
-		--exec /sbin/apcupsd
-	eend $?
-}
diff --git a/sys-power/apcupsd/files/3.14.3/etc.patch b/sys-power/apcupsd/files/3.14.3/etc.patch
deleted file mode 100644
index cc8370b7618b..000000000000
--- a/sys-power/apcupsd/files/3.14.3/etc.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-*** platforms/etc.bak/changeme.in       2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/changeme.in   2007-02-18 15:01:36.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/commfailure.in    2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/commfailure.in        2007-02-18 15:01:56.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/commok.in 2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/commok.in     2007-02-18 15:02:24.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/offbattery.in     2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/offbattery.in 2007-02-18 15:04:43.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/onbattery.in      2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/onbattery.in  2007-02-18 15:04:47.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-
diff --git a/sys-power/apcupsd/files/3.14.3/hal-ups-policy.patch b/sys-power/apcupsd/files/3.14.3/hal-ups-policy.patch
deleted file mode 100644
index bee4ca44a377..000000000000
--- a/sys-power/apcupsd/files/3.14.3/hal-ups-policy.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- apcupsd-3.14.3.orig/platforms/80-apcupsd-ups-policy.fdi	2008-04-29 09:57:34.000000000 +0200
-+++ apcupsd-3.14.3/platforms/80-apcupsd-ups-policy.fdi	2008-04-29 09:58:51.000000000 +0200
-@@ -2,7 +2,7 @@
- <!-- Disable hald-addon-hid-ups for any APC UPS so Apcupsd can own the device -->
- <deviceinfo version="0.2">
-   <device>
--    <match key="info.addons" type="strlist">hald-addon-hid-ups</match>
-+    <match key="info.addons" contains="hald-addon-hid-ups">
-       <match key="@info.parent:info.bus" string="usb">
-         <match key="@info.parent:usb.vendor_id" int="1309">
-           <match key="@info.parent:usb.product_id" int="2">
diff --git a/sys-power/apcupsd/files/3.14.3/no-parallel.patch b/sys-power/apcupsd/files/3.14.3/no-parallel.patch
deleted file mode 100644
index a2aa4c398d1c..000000000000
--- a/sys-power/apcupsd/files/3.14.3/no-parallel.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-upstream forces this cruft
-
---- autoconf/targets.mak
-+++ autoconf/targets.mak
-@@ -5,6 +5,8 @@
- #
- # Copyright (C) 1999-2002 Riccardo Facchetti <riccardo@master.oasi.gpa.it>
- 
-+.NOTPARALLEL:
-+
- # Tell versions [3.59,3.63) of GNU make not to export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/sys-power/apcupsd/files/3.14/apcupsd.in.patch b/sys-power/apcupsd/files/3.14/apcupsd.in.patch
deleted file mode 100644
index 69dad9d74d1c..000000000000
--- a/sys-power/apcupsd/files/3.14/apcupsd.in.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- platforms/gentoo/apcupsd.in
-+++ platforms/gentoo/apcupsd.in
-@@ -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.14/etc.patch b/sys-power/apcupsd/files/3.14/etc.patch
deleted file mode 100644
index cc8370b7618b..000000000000
--- a/sys-power/apcupsd/files/3.14/etc.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-*** platforms/etc.bak/changeme.in       2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/changeme.in   2007-02-18 15:01:36.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/commfailure.in    2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/commfailure.in        2007-02-18 15:01:56.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/commok.in 2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/commok.in     2007-02-18 15:02:24.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/offbattery.in     2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/offbattery.in 2007-02-18 15:04:43.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/onbattery.in      2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/onbattery.in  2007-02-18 15:04:47.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-
diff --git a/sys-power/apcupsd/metadata.xml b/sys-power/apcupsd/metadata.xml
index c385edd79617..c1dd4db1d51d 100644
--- a/sys-power/apcupsd/metadata.xml
+++ b/sys-power/apcupsd/metadata.xml
@@ -1,12 +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>
-<use>
-	<flag name='lighttpd'>Enable support for
-		<pkg>www-servers/lighttpd</pkg></flag>
-</use>
+  <herd>base-system</herd>
+  <maintainer>
+    <email>flameeyes@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>