remove old versions; mark 3.10.15 stable on x86

diff --git a/sys-apps/apcupsd/ChangeLog b/sys-apps/apcupsd/ChangeLog
index 732b9700de9aef1627726ffad8b1c0256b891a11..873243c60c1bd9c886521292ea92f9a389ae561d 100644 (file)
--- a/sys-apps/apcupsd/ChangeLog
+++ b/sys-apps/apcupsd/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-apps/apcupsd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.44 2004/10/03 10:20:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.45 2004/10/23 23:14:32 lanius Exp $
+
+  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:

diff --git a/sys-apps/apcupsd/Manifest b/sys-apps/apcupsd/Manifest
index a2f45183f25dc59bad321ec055c5c4bb1539fa79..a87cf3aecd2de102fef0ece28e2418d7840b8f52 100644 (file)
--- a/sys-apps/apcupsd/Manifest
+++ b/sys-apps/apcupsd/Manifest
@@ -1,47 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 cf529b70f0ab88d9bfbe5a5b67566d1f ChangeLog 7757
-MD5 c753e254f6a1309067cb4818fad9f252 apcupsd-3.10.9.ebuild 2506
-MD5 75aabfa81bcbc6f11075686a60f496d1 apcupsd-3.10.10.ebuild 2507
-MD5 abe963c7a8ded2e71901565743cfbf89 apcupsd-3.10.10-r1.ebuild 2552
+MD5 4285d140be0761f9f5cb2850871bf299 apcupsd-3.10.15-r1.ebuild 2493
+MD5 d94fe03812a6cee09b726180d1c834a6 ChangeLog 8414
 MD5 27ae5add10fc42e77804f1ecd768df87 metadata.xml 226
-MD5 cc3d878af983ec3f02b91c470ca46041 apcupsd-3.10.8.ebuild 2506
-MD5 068f5a1ef86a7730a50988b9cdbd69b6 apcupsd-3.10.10-r2.ebuild 2684
 MD5 2efa2a59694894eafd70880618ae6d1a apcupsd-3.10.13.ebuild 2510
-MD5 198d5cfdb2e92631f036a89bc1bef40e apcupsd-3.10.15-r1.ebuild 2497
-MD5 ab17d3fa671f63d263570aebe6f611b1 files/digest-apcupsd-3.10.9 123
-MD5 41859fb08df1a1b50385b2e4a187a5cc files/digest-apcupsd-3.10.10-r1 124
-MD5 c5a0f1d4de26b7e7e76641d5c722cd9f files/digest-apcupsd-3.10.8 123
-MD5 41859fb08df1a1b50385b2e4a187a5cc files/digest-apcupsd-3.10.10 124
-MD5 41859fb08df1a1b50385b2e4a187a5cc files/digest-apcupsd-3.10.10-r2 124
 MD5 706952fc576fc75365b88542aada9702 files/digest-apcupsd-3.10.13 124
 MD5 ec48a12c6d8b56aeffbeaa629f8835ad files/digest-apcupsd-3.10.15-r1 68
-MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.9/apache.conf 157
-MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.9/apcupsd.in.patch 315
-MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.9/smtp.patch 2663
-MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.9/ucd-snmp.patch 425
-MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.10/apache.conf 157
-MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.10/apcupsd.in.patch 315
-MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.10/smtp.patch 2663
-MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.10/ucd-snmp.patch 425
-MD5 a587dd06ee42560a7ece7a73ed769f04 files/3.10.10/apccontrol.diff 340
 MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.13/apache.conf 157
+MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.13/ucd-snmp.patch 425
 MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.13/apcupsd.in.patch 315
 MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.13/smtp.patch 2663
-MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.13/ucd-snmp.patch 425
-MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.8/apache.conf 157
-MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.8/apcupsd.in.patch 315
-MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.8/smtp.patch 2663
-MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.8/ucd-snmp.patch 425
 MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.15/apache.conf 157
+MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.15/ucd-snmp.patch 425
 MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.15/apcupsd.in.patch 315
 MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.15/smtp.patch 2663
-MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.15/ucd-snmp.patch 425
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBaNB9HTu7gpaalycRAjBTAJ92tv5j1zXwzC0mCTjOHCnI4LxImgCeMVvb
-oCIYkkgbIIkLw+lilYWeOd4=
-=+azk
------END PGP SIGNATURE-----

diff --git a/sys-apps/apcupsd/apcupsd-3.10.10-r1.ebuild b/sys-apps/apcupsd/apcupsd-3.10.10-r1.ebuild
deleted file mode 100644 (file)
index 7800b33..0000000
--- a/sys-apps/apcupsd/apcupsd-3.10.10-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.10-r1.ebuild,v 1.7 2004/09/03 21:03:23 pvdabeel 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
-       ftp://ftp.apcupsd.com/pub/apcupsd/contrib/gd1.2.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc ~amd64"
-IUSE="doc snmp usb apache2"
-
-DEPEND=">=sys-apps/baselayout-1.8.4
-       virtual/libc
-       virtual/mta
-       snmp? ( net-analyzer/ucd-snmp )
-       sys-libs/ncurses"
-RDEPEND="${DEPEND}
-       usb? ( sys-apps/hotplug )"
-
-XPIDDIR=/var/run
-XLOGDIR=/var/log
-XLOCKDIR=/var/lock
-XSYSCONFDIR=/etc/apcupsd
-XPWRFAILDIR=${XSYSCONFDIR}
-
-src_unpack() {
-       unpack ${A}
-       cp -a ${WORKDIR}/gd1.2 ${S}/src/
-       cd ${S}/platforms/gentoo
-       epatch ${FILESDIR}/${PV}/apcupsd.in.patch
-       cd ${S}
-       epatch ${FILESDIR}/${PV}/ucd-snmp.patch
-       epatch ${FILESDIR}/${PV}/apccontrol.diff
-}
-
-src_compile() {
-       local myconf
-       use snmp && myconf="--enable-snmp"
-       APCUPSD_MAIL=/usr/sbin/sendmail ./configure \
-               --prefix=/usr \
-               --sbindir=/usr/sbin \
-               --sysconfdir=${XSYSCONFDIR} \
-               --with-pwrfail-dir=${XPWRFAILDIR} \
-               --with-lock-dir=${XLOCKDIR} \
-               --with-pid-dir=${XPIDDIR} \
-               --with-log-dir=${XLOGDIR} \
-               --with-upstype=usb \
-               --with-upscable=usb \
-               --with-serial-dev=/dev/usb/hid/hiddev[0-9] \
-               --with-net-port=6666 \
-               --with-nis-port=3551 \
-               --enable-usb \
-               --enable-net \
-               --enable-oldnet \
-               --enable-master-slave \
-               --enable-powerflute \
-               --enable-pthreads \
-               --with-css-dir=/var/www/apcupsd \
-               --with-cgi-bin=/var/www/apcupsd \
-               --enable-cgi \
-               ${myconf} \
-               || die
-       make || die
-}
-
-src_install () {
-       make DESTDIR=${D} install || die "installed failed"
-
-       use apache2 || insinto /etc/apache/conf/addon-modules
-       use apache2 || newins  ${FILESDIR}/${PV}/apache.conf apcupsd.conf
-
-       use apache2 && insinto /etc/apache2/conf/modules.d
-       use apache2 && newins ${FILESDIR}/${PV}/apache.conf 60_apcupsd.conf
-
-       insinto /etc/apcupsd
-       newins examples/safe.apccontrol safe.apccontrol
-
-       cd ${D}/etc/apcupsd
-       epatch ${FILESDIR}/${PV}/smtp.patch
-
-       ln -s onbattery powerout
-
-       if use doc
-       then
-               einfo "Installing full documentation into /usr/share/doc/${P}..."
-               cd ${S}/doc
-               dodoc README.*
-               docinto developers_manual
-               dodoc developers_manual/*
-               docinto logo
-               dodoc logo/*
-               docinto manual
-               dodoc manual/*
-               docinto old_documents
-               dodoc old_documents/*
-               docinto vim
-               dodoc vim/*
-       fi
-}

diff --git a/sys-apps/apcupsd/apcupsd-3.10.10-r2.ebuild b/sys-apps/apcupsd/apcupsd-3.10.10-r2.ebuild
deleted file mode 100644 (file)
index e3e7602..0000000
--- a/sys-apps/apcupsd/apcupsd-3.10.10-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.10-r2.ebuild,v 1.5 2004/09/03 21:03:23 pvdabeel 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
-       ftp://ftp.apcupsd.com/pub/apcupsd/contrib/gd1.2.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~amd64 ppc ~sparc"
-IUSE="doc snmp usb apache2"
-
-DEPEND=">=sys-apps/baselayout-1.8.4
-       virtual/libc
-       virtual/mta
-       snmp? ( net-analyzer/ucd-snmp )
-       sys-libs/ncurses"
-RDEPEND="${DEPEND}
-       usb? ( sys-apps/hotplug )"
-
-XPIDDIR=/var/run
-XLOGDIR=/var/log
-XLOCKDIR=/var/lock
-XSYSCONFDIR=/etc/apcupsd
-XPWRFAILDIR=${XSYSCONFDIR}
-
-src_unpack() {
-       unpack ${A}
-       cp -a ${WORKDIR}/gd1.2 ${S}/src/
-       cd ${S}/platforms/gentoo
-       epatch ${FILESDIR}/${PV}/apcupsd.in.patch
-       cd ${S}
-       epatch ${FILESDIR}/${PV}/ucd-snmp.patch
-       epatch ${FILESDIR}/${PV}/apccontrol.diff
-       # fix path to stylesheet
-       sed -i -e 's:^#define CSS_DIR "/css/multimon.css":#define CSS_DIR "multimon.css":' src/cgi/multimoncss.c
-}
-
-src_compile() {
-       local myconf
-       use snmp && myconf="--enable-snmp"
-       APCUPSD_MAIL=/usr/sbin/sendmail ./configure \
-               --prefix=/usr \
-               --sbindir=/usr/sbin \
-               --sysconfdir=${XSYSCONFDIR} \
-               --with-pwrfail-dir=${XPWRFAILDIR} \
-               --with-lock-dir=${XLOCKDIR} \
-               --with-pid-dir=${XPIDDIR} \
-               --with-log-dir=${XLOGDIR} \
-               --with-upstype=usb \
-               --with-upscable=usb \
-               --with-serial-dev=/dev/usb/hid/hiddev[0-9] \
-               --with-net-port=6666 \
-               --with-nis-port=3551 \
-               --enable-usb \
-               --enable-net \
-               --enable-oldnet \
-               --enable-master-slave \
-               --enable-powerflute \
-               --enable-pthreads \
-               --with-css-dir=/var/www/apcupsd \
-               --with-cgi-bin=/var/www/apcupsd \
-               --enable-cgi \
-               ${myconf} \
-               || die
-       make || die
-}
-
-src_install () {
-       make DESTDIR=${D} install || die "installed failed"
-
-       use apache2 || insinto /etc/apache/conf/addon-modules
-       use apache2 || newins  ${FILESDIR}/${PV}/apache.conf apcupsd.conf
-
-       use apache2 && insinto /etc/apache2/conf/modules.d
-       use apache2 && newins ${FILESDIR}/${PV}/apache.conf 60_apcupsd.conf
-
-       insinto /etc/apcupsd
-       newins examples/safe.apccontrol safe.apccontrol
-
-       cd ${D}/etc/apcupsd
-       epatch ${FILESDIR}/${PV}/smtp.patch
-
-       ln -s onbattery powerout
-
-       if use doc
-       then
-               einfo "Installing full documentation into /usr/share/doc/${P}..."
-               cd ${S}/doc
-               dodoc README.*
-               docinto developers_manual
-               dodoc developers_manual/*
-               docinto logo
-               dodoc logo/*
-               docinto manual
-               dodoc manual/*
-               docinto old_documents
-               dodoc old_documents/*
-               docinto vim
-               dodoc vim/*
-       fi
-}

diff --git a/sys-apps/apcupsd/apcupsd-3.10.10.ebuild b/sys-apps/apcupsd/apcupsd-3.10.10.ebuild
deleted file mode 100644 (file)
index a6a2339..0000000
--- a/sys-apps/apcupsd/apcupsd-3.10.10.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.10.ebuild,v 1.6 2004/09/03 21:03:23 pvdabeel 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
-       ftp://ftp.apcupsd.com/pub/apcupsd/contrib/gd1.2.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~amd64 ppc ~sparc"
-IUSE="doc snmp usb apache2"
-
-DEPEND=">=sys-apps/baselayout-1.8.4
-       virtual/libc
-       virtual/mta
-       snmp? ( net-analyzer/ucd-snmp )
-       sys-libs/ncurses"
-RDEPEND="${DEPEND}
-       usb? ( sys-apps/hotplug )"
-
-XPIDDIR=/var/run
-XLOGDIR=/var/log
-XLOCKDIR=/var/lock
-XSYSCONFDIR=/etc/apcupsd
-XPWRFAILDIR=${XSYSCONFDIR}
-
-src_unpack() {
-       unpack ${A}
-       cp -a ${WORKDIR}/gd1.2 ${S}/src/
-       cd ${S}/platforms/gentoo
-       epatch ${FILESDIR}/${PV}/apcupsd.in.patch
-       cd ${S}
-       epatch ${FILESDIR}/${PV}/ucd-snmp.patch
-}
-
-src_compile() {
-       local myconf
-       use snmp && myconf="--enable-snmp"
-       APCUPSD_MAIL=/usr/sbin/sendmail ./configure \
-               --prefix=/usr \
-               --sbindir=/usr/sbin \
-               --sysconfdir=${XSYSCONFDIR} \
-               --with-pwrfail-dir=${XPWRFAILDIR} \
-               --with-lock-dir=${XLOCKDIR} \
-               --with-pid-dir=${XPIDDIR} \
-               --with-log-dir=${XLOGDIR} \
-               --with-upstype=usb \
-               --with-upscable=usb \
-               --with-serial-dev=/dev/usb/hid/hiddev[0-9] \
-               --with-net-port=6666 \
-               --with-nis-port=3551 \
-               --enable-usb \
-               --enable-net \
-               --enable-oldnet \
-               --enable-master-slave \
-               --enable-powerflute \
-               --enable-pthreads \
-               --with-css-dir=/var/www/apcupsd \
-               --with-cgi-bin=/var/www/apcupsd \
-               --enable-cgi \
-               ${myconf} \
-               || die
-       make || die
-}
-
-src_install () {
-       make DESTDIR=${D} install || die "installed failed"
-
-       use apache2 || insinto /etc/apache/conf/addon-modules
-       use apache2 || newins  ${FILESDIR}/${PV}/apache.conf apcupsd.conf
-
-       use apache2 && insinto /etc/apache2/conf/modules.d
-       use apache2 && newins ${FILESDIR}/${PV}/apache.conf 60_apcupsd.conf
-
-       insinto /etc/apcupsd
-       newins examples/safe.apccontrol safe.apccontrol
-
-       cd ${D}/etc/apcupsd
-       epatch ${FILESDIR}/${PV}/smtp.patch
-
-       ln -s onbattery powerout
-
-       if use doc
-       then
-               einfo "Installing full documentation into /usr/share/doc/${P}..."
-               cd ${S}/doc
-               dodoc README.*
-               docinto developers_manual
-               dodoc developers_manual/*
-               docinto logo
-               dodoc logo/*
-               docinto manual
-               dodoc manual/*
-               docinto old_documents
-               dodoc old_documents/*
-               docinto vim
-               dodoc vim/*
-       fi
-}

diff --git a/sys-apps/apcupsd/apcupsd-3.10.15-r1.ebuild b/sys-apps/apcupsd/apcupsd-3.10.15-r1.ebuild
index 02f3031b1fc039acb24a145ba51e4056fa01640e..489ab6cde0527c6a4ddc8d42ef92e58509311d6b 100644 (file)
--- a/sys-apps/apcupsd/apcupsd-3.10.15-r1.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.10.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.15-r1.ebuild,v 1.3 2004/09/01 20:14:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.15-r1.ebuild,v 1.4 2004/10/23 23:14:32 lanius Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
+KEYWORDS="x86 ~amd64 ~ppc ~sparc"
 IUSE="doc snmp usb apache2"
 
 DEPEND=">=sys-apps/baselayout-1.8.4

diff --git a/sys-apps/apcupsd/apcupsd-3.10.8.ebuild b/sys-apps/apcupsd/apcupsd-3.10.8.ebuild
deleted file mode 100644 (file)
index 2aa4ecd..0000000
--- a/sys-apps/apcupsd/apcupsd-3.10.8.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.8.ebuild,v 1.8 2004/09/03 21:03:23 pvdabeel 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
-       ftp://ftp.apcupsd.com/pub/apcupsd/contrib/gd1.2.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~amd64 ppc ~sparc"
-IUSE="doc snmp usb apache2"
-
-DEPEND=">=sys-apps/baselayout-1.8.4
-       virtual/libc
-       virtual/mta
-       snmp? ( net-analyzer/ucd-snmp )
-       sys-libs/ncurses"
-RDEPEND="${DEPEND}
-       usb? ( sys-apps/hotplug )"
-
-XPIDDIR=/var/run
-XLOGDIR=/var/log
-XLOCKDIR=/var/lock
-XSYSCONFDIR=/etc/apcupsd
-XPWRFAILDIR=${XSYSCONFDIR}
-
-src_unpack() {
-       unpack ${A}
-       cp -a ${WORKDIR}/gd1.2 ${S}/src/
-       cd ${S}/platforms/gentoo
-       epatch ${FILESDIR}/${PV}/apcupsd.in.patch
-       cd ${S}
-       epatch ${FILESDIR}/${PV}/ucd-snmp.patch
-}
-
-src_compile() {
-       local myconf
-       use snmp && myconf="--enable-snmp"
-       APCUPSD_MAIL=/usr/sbin/sendmail ./configure \
-               --prefix=/usr \
-               --sbindir=/usr/sbin \
-               --sysconfdir=${XSYSCONFDIR} \
-               --with-pwrfail-dir=${XPWRFAILDIR} \
-               --with-lock-dir=${XLOCKDIR} \
-               --with-pid-dir=${XPIDDIR} \
-               --with-log-dir=${XLOGDIR} \
-               --with-upstype=usb \
-               --with-upscable=usb \
-               --with-serial-dev=/dev/usb/hid/hiddev[0-9] \
-               --with-net-port=6666 \
-               --with-nis-port=3551 \
-               --enable-usb \
-               --enable-net \
-               --enable-oldnet \
-               --enable-master-slave \
-               --enable-powerflute \
-               --enable-pthreads \
-               --with-css-dir=/var/www/apcupsd \
-               --with-cgi-bin=/var/www/apcupsd \
-               --enable-cgi \
-               ${myconf} \
-               || die
-       make || die
-}
-
-src_install () {
-       make DESTDIR=${D} install || die "installed failed"
-
-       use apache2 || insinto /etc/apache/conf/addon-modules
-       use apache2 || newins  ${FILESDIR}/${PV}/apache.conf apcupsd.conf
-
-       use apache2 && insinto /etc/apache2/conf/modules.d
-       use apache2 && newins ${FILESDIR}/${PV}/apache.conf 60_apcupsd.conf
-
-       insinto /etc/apcupsd
-       newins examples/safe.apccontrol safe.apccontrol
-
-       cd ${D}/etc/apcupsd
-       epatch ${FILESDIR}/${PV}/smtp.patch
-
-       ln -s onbattery powerout
-
-       if use doc
-       then
-               einfo "Installing full documentation into /usr/share/doc/${P}..."
-               cd ${S}/doc
-               dodoc README.*
-               docinto developers_manual
-               dodoc developers_manual/*
-               docinto logo
-               dodoc logo/*
-               docinto manual
-               dodoc manual/*
-               docinto old_documents
-               dodoc old_documents/*
-               docinto vim
-               dodoc vim/*
-       fi
-}

diff --git a/sys-apps/apcupsd/apcupsd-3.10.9.ebuild b/sys-apps/apcupsd/apcupsd-3.10.9.ebuild
deleted file mode 100644 (file)
index 66dae4c..0000000
--- a/sys-apps/apcupsd/apcupsd-3.10.9.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.9.ebuild,v 1.8 2004/09/03 21:03:23 pvdabeel 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
-       ftp://ftp.apcupsd.com/pub/apcupsd/contrib/gd1.2.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~amd64 ppc ~sparc"
-IUSE="doc snmp usb apache2"
-
-DEPEND=">=sys-apps/baselayout-1.8.4
-       virtual/libc
-       virtual/mta
-       snmp? ( net-analyzer/ucd-snmp )
-       sys-libs/ncurses"
-RDEPEND="${DEPEND}
-       usb? ( sys-apps/hotplug )"
-
-XPIDDIR=/var/run
-XLOGDIR=/var/log
-XLOCKDIR=/var/lock
-XSYSCONFDIR=/etc/apcupsd
-XPWRFAILDIR=${XSYSCONFDIR}
-
-src_unpack() {
-       unpack ${A}
-       cp -a ${WORKDIR}/gd1.2 ${S}/src/
-       cd ${S}/platforms/gentoo
-       epatch ${FILESDIR}/${PV}/apcupsd.in.patch
-       cd ${S}
-       epatch ${FILESDIR}/${PV}/ucd-snmp.patch
-}
-
-src_compile() {
-       local myconf
-       use snmp && myconf="--enable-snmp"
-       APCUPSD_MAIL=/usr/sbin/sendmail ./configure \
-               --prefix=/usr \
-               --sbindir=/usr/sbin \
-               --sysconfdir=${XSYSCONFDIR} \
-               --with-pwrfail-dir=${XPWRFAILDIR} \
-               --with-lock-dir=${XLOCKDIR} \
-               --with-pid-dir=${XPIDDIR} \
-               --with-log-dir=${XLOGDIR} \
-               --with-upstype=usb \
-               --with-upscable=usb \
-               --with-serial-dev=/dev/usb/hid/hiddev[0-9] \
-               --with-net-port=6666 \
-               --with-nis-port=3551 \
-               --enable-usb \
-               --enable-net \
-               --enable-oldnet \
-               --enable-master-slave \
-               --enable-powerflute \
-               --enable-pthreads \
-               --with-css-dir=/var/www/apcupsd \
-               --with-cgi-bin=/var/www/apcupsd \
-               --enable-cgi \
-               ${myconf} \
-               || die
-       make || die
-}
-
-src_install () {
-       make DESTDIR=${D} install || die "installed failed"
-
-       use apache2 || insinto /etc/apache/conf/addon-modules
-       use apache2 || newins  ${FILESDIR}/${PV}/apache.conf apcupsd.conf
-
-       use apache2 && insinto /etc/apache2/conf/modules.d
-       use apache2 && newins ${FILESDIR}/${PV}/apache.conf 60_apcupsd.conf
-
-       insinto /etc/apcupsd
-       newins examples/safe.apccontrol safe.apccontrol
-
-       cd ${D}/etc/apcupsd
-       epatch ${FILESDIR}/${PV}/smtp.patch
-
-       ln -s onbattery powerout
-
-       if use doc
-       then
-               einfo "Installing full documentation into /usr/share/doc/${P}..."
-               cd ${S}/doc
-               dodoc README.*
-               docinto developers_manual
-               dodoc developers_manual/*
-               docinto logo
-               dodoc logo/*
-               docinto manual
-               dodoc manual/*
-               docinto old_documents
-               dodoc old_documents/*
-               docinto vim
-               dodoc vim/*
-       fi
-}

diff --git a/sys-apps/apcupsd/files/3.10.10/apache.conf b/sys-apps/apcupsd/files/3.10.10/apache.conf
deleted file mode 100644 (file)
index 21305d2..0000000
--- a/sys-apps/apcupsd/files/3.10.10/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-apps/apcupsd/files/3.10.10/apccontrol.diff b/sys-apps/apcupsd/files/3.10.10/apccontrol.diff
deleted file mode 100644 (file)
index 03ea362..0000000
--- a/sys-apps/apcupsd/files/3.10.10/apccontrol.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- platforms/apccontrol.in.org        2004-04-21 23:03:00.000000000 +0200
-+++ platforms/apccontrol.in    2004-04-21 23:03:07.000000000 +0200
-@@ -85,7 +85,6 @@
-       if [ -f @PWRFAILDIR@/powerfail ] ; then
-          printf "Continuing with shutdown."  | wall
-       fi
--      ;;
-     ;;
-     failing)
-       echo "Battery power exhaused on UPS ${2}. Doing shutdown." | wall

diff --git a/sys-apps/apcupsd/files/3.10.10/apcupsd.in.patch b/sys-apps/apcupsd/files/3.10.10/apcupsd.in.patch
deleted file mode 100644 (file)
index 7bcb0f4..0000000
--- a/sys-apps/apcupsd/files/3.10.10/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-apps/apcupsd/files/3.10.10/smtp.patch b/sys-apps/apcupsd/files/3.10.10/smtp.patch
deleted file mode 100644 (file)
index d0c6bbc..0000000
--- a/sys-apps/apcupsd/files/3.10.10/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-apps/apcupsd/files/3.10.10/ucd-snmp.patch b/sys-apps/apcupsd/files/3.10.10/ucd-snmp.patch
deleted file mode 100644 (file)
index af9c363..0000000
--- a/sys-apps/apcupsd/files/3.10.10/ucd-snmp.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/drivers/snmp/snmp.c 2003-04-05 14:58:00.000000000 +0200
-+++ src/drivers/snmp/snmp.c 2003-08-21 14:25:11.000000000 +0200
-@@ -245,7 +245,10 @@
-     return ret;
- }
-
--int snmp_ups_program_eeprom(UPSINFO *ups, int command, char *data)
-+/*int snmp_ups_program_eeprom(UPSINFO *ups, int command, char *data)
-+ * Modified for debian
-+*/
-+int snmp_ups_program_eeprom(UPSINFO *ups, int command, void *data)
- {
-     return 0;
- }

diff --git a/sys-apps/apcupsd/files/3.10.8/apache.conf b/sys-apps/apcupsd/files/3.10.8/apache.conf
deleted file mode 100644 (file)
index 21305d2..0000000
--- a/sys-apps/apcupsd/files/3.10.8/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-apps/apcupsd/files/3.10.8/apcupsd.in.patch b/sys-apps/apcupsd/files/3.10.8/apcupsd.in.patch
deleted file mode 100644 (file)
index 7bcb0f4..0000000
--- a/sys-apps/apcupsd/files/3.10.8/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-apps/apcupsd/files/3.10.8/smtp.patch b/sys-apps/apcupsd/files/3.10.8/smtp.patch
deleted file mode 100644 (file)
index d0c6bbc..0000000
--- a/sys-apps/apcupsd/files/3.10.8/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-apps/apcupsd/files/3.10.8/ucd-snmp.patch b/sys-apps/apcupsd/files/3.10.8/ucd-snmp.patch
deleted file mode 100644 (file)
index af9c363..0000000
--- a/sys-apps/apcupsd/files/3.10.8/ucd-snmp.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/drivers/snmp/snmp.c 2003-04-05 14:58:00.000000000 +0200
-+++ src/drivers/snmp/snmp.c 2003-08-21 14:25:11.000000000 +0200
-@@ -245,7 +245,10 @@
-     return ret;
- }
-
--int snmp_ups_program_eeprom(UPSINFO *ups, int command, char *data)
-+/*int snmp_ups_program_eeprom(UPSINFO *ups, int command, char *data)
-+ * Modified for debian
-+*/
-+int snmp_ups_program_eeprom(UPSINFO *ups, int command, void *data)
- {
-     return 0;
- }

diff --git a/sys-apps/apcupsd/files/3.10.9/apache.conf b/sys-apps/apcupsd/files/3.10.9/apache.conf
deleted file mode 100644 (file)
index 21305d2..0000000
--- a/sys-apps/apcupsd/files/3.10.9/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-apps/apcupsd/files/3.10.9/apcupsd.in.patch b/sys-apps/apcupsd/files/3.10.9/apcupsd.in.patch
deleted file mode 100644 (file)
index 7bcb0f4..0000000
--- a/sys-apps/apcupsd/files/3.10.9/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-apps/apcupsd/files/3.10.9/smtp.patch b/sys-apps/apcupsd/files/3.10.9/smtp.patch
deleted file mode 100644 (file)
index d0c6bbc..0000000
--- a/sys-apps/apcupsd/files/3.10.9/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-apps/apcupsd/files/3.10.9/ucd-snmp.patch b/sys-apps/apcupsd/files/3.10.9/ucd-snmp.patch
deleted file mode 100644 (file)
index af9c363..0000000
--- a/sys-apps/apcupsd/files/3.10.9/ucd-snmp.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/drivers/snmp/snmp.c 2003-04-05 14:58:00.000000000 +0200
-+++ src/drivers/snmp/snmp.c 2003-08-21 14:25:11.000000000 +0200
-@@ -245,7 +245,10 @@
-     return ret;
- }
-
--int snmp_ups_program_eeprom(UPSINFO *ups, int command, char *data)
-+/*int snmp_ups_program_eeprom(UPSINFO *ups, int command, char *data)
-+ * Modified for debian
-+*/
-+int snmp_ups_program_eeprom(UPSINFO *ups, int command, void *data)
- {
-     return 0;
- }

diff --git a/sys-apps/apcupsd/files/digest-apcupsd-3.10.10 b/sys-apps/apcupsd/files/digest-apcupsd-3.10.10
deleted file mode 100644 (file)
index 881b15a..0000000
--- a/sys-apps/apcupsd/files/digest-apcupsd-3.10.10
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b69ccf4f4196582ab3e26bf6af937610 apcupsd-3.10.10.tar.gz 3767971
-MD5 d9a0ddf7918c93ca28fa5832a4af54d8 gd1.2.tar.gz 64595

diff --git a/sys-apps/apcupsd/files/digest-apcupsd-3.10.10-r1 b/sys-apps/apcupsd/files/digest-apcupsd-3.10.10-r1
deleted file mode 100644 (file)
index 881b15a..0000000
--- a/sys-apps/apcupsd/files/digest-apcupsd-3.10.10-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b69ccf4f4196582ab3e26bf6af937610 apcupsd-3.10.10.tar.gz 3767971
-MD5 d9a0ddf7918c93ca28fa5832a4af54d8 gd1.2.tar.gz 64595

diff --git a/sys-apps/apcupsd/files/digest-apcupsd-3.10.10-r2 b/sys-apps/apcupsd/files/digest-apcupsd-3.10.10-r2
deleted file mode 100644 (file)
index 881b15a..0000000
--- a/sys-apps/apcupsd/files/digest-apcupsd-3.10.10-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b69ccf4f4196582ab3e26bf6af937610 apcupsd-3.10.10.tar.gz 3767971
-MD5 d9a0ddf7918c93ca28fa5832a4af54d8 gd1.2.tar.gz 64595

diff --git a/sys-apps/apcupsd/files/digest-apcupsd-3.10.8 b/sys-apps/apcupsd/files/digest-apcupsd-3.10.8
deleted file mode 100644 (file)
index 71383bf..0000000
--- a/sys-apps/apcupsd/files/digest-apcupsd-3.10.8
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b0482d125edac1c9ea340f2382da2ed9 apcupsd-3.10.8.tar.gz 3751893
-MD5 d9a0ddf7918c93ca28fa5832a4af54d8 gd1.2.tar.gz 64595

diff --git a/sys-apps/apcupsd/files/digest-apcupsd-3.10.9 b/sys-apps/apcupsd/files/digest-apcupsd-3.10.9
deleted file mode 100644 (file)
index ca2f12c..0000000
--- a/sys-apps/apcupsd/files/digest-apcupsd-3.10.9
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 693a4ecfecf5ae777f3ef4000f58d6fe apcupsd-3.10.9.tar.gz 3754398
-MD5 d9a0ddf7918c93ca28fa5832a4af54d8 gd1.2.tar.gz 64595