Cleaned out old version. Closes #69451.
authorMichael Imhof <tantive@gentoo.org>
Fri, 29 Oct 2004 22:34:35 +0000 (22:34 +0000)
committerMichael Imhof <tantive@gentoo.org>
Fri, 29 Oct 2004 22:34:35 +0000 (22:34 +0000)
sys-apps/apcupsd/ChangeLog
sys-apps/apcupsd/Manifest
sys-apps/apcupsd/apcupsd-3.10.13.ebuild [deleted file]
sys-apps/apcupsd/files/3.10.13/apache.conf [deleted file]
sys-apps/apcupsd/files/3.10.13/apcupsd.in.patch [deleted file]
sys-apps/apcupsd/files/3.10.13/smtp.patch [deleted file]
sys-apps/apcupsd/files/3.10.13/ucd-snmp.patch [deleted file]
sys-apps/apcupsd/files/digest-apcupsd-3.10.13 [deleted file]

index f8b6644030b3f8655a46c62d0f8d30888d045eb1..8373128397ce888694c5c1bde2e324ce3c4dc10b 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/apcupsd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.48 2004/10/29 22:25:47 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.49 2004/10/29 22:34:35 tantive Exp $
+
+  30 Oct 2004; Michael Imhof <tantive@gentoo.org> -files/3.10.13/apache.conf,
+  -files/3.10.13/apcupsd.in.patch, -files/3.10.13/smtp.patch,
+  -files/3.10.13/ucd-snmp.patch, -apcupsd-3.10.13.ebuild:
+  Cleaned out old version. Closes #69451.
 
   30 Oct 2004; Lars Weiler <pylon@gentoo.org> apcupsd-3.10.15-r1.ebuild:
   Compiles and should work according to users.
index 0f298cf0d8048c39e0fe6114cc741f399857bc64..6471a40c17695cd84267a4e821243f450e0507c8 100644 (file)
@@ -1,14 +1,18 @@
-MD5 b51e85173cc9e0e46ce19473a8fa552e ChangeLog 8757
-MD5 2efa2a59694894eafd70880618ae6d1a apcupsd-3.10.13.ebuild 2510
-MD5 74e598a06446374ea9bbc4c86d8501a7 apcupsd-3.10.15-r1.ebuild 2486
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 27ae5add10fc42e77804f1ecd768df87 metadata.xml 226
-MD5 706952fc576fc75365b88542aada9702 files/digest-apcupsd-3.10.13 124
+MD5 74e598a06446374ea9bbc4c86d8501a7 apcupsd-3.10.15-r1.ebuild 2486
+MD5 4055b4d3bce842c24a02b7b211794ca4 ChangeLog 9000
 MD5 ec48a12c6d8b56aeffbeaa629f8835ad files/digest-apcupsd-3.10.15-r1 68
-MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.13/apache.conf 157
-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.15/apache.conf 157
-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
+MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.15/apache.conf 157
+MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.15/apcupsd.in.patch 315
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBgsWGKtJO8LeSoosRAuKJAKCJ3eB6DMxb0bfHdNpGiSXUrnvNXgCeK2Au
+QD6QuM/Isb7t4xeKD5TWLVI=
+=ckKx
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/apcupsd/apcupsd-3.10.13.ebuild b/sys-apps/apcupsd/apcupsd-3.10.13.ebuild
deleted file mode 100644 (file)
index 6ed19b1..0000000
+++ /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.13.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-net-snmp"
-       APCUPSD_MAIL=/usr/sbin/sendmail ./configure \
-               --prefix=/usr \
-               --sbindir=/usr/sbin \
-               --sysconfdir=${XSYSCONFDIR} \
-               --with-pwrfail-dir=${XPWRFAILDIR} \
-               --with-lock-dir=${XLOCKDIR} \
-               --with-pid-dir=${XPIDDIR} \
-               --with-log-dir=${XLOGDIR} \
-               --with-upstype=usb \
-               --with-upscable=usb \
-               --with-serial-dev=/dev/usb/hid/hiddev[0-9] \
-               --with-net-port=6666 \
-               --with-nis-port=3551 \
-               --enable-usb \
-               --enable-net \
-               --enable-oldnet \
-               --enable-master-slave \
-               --enable-powerflute \
-               --enable-pthreads \
-               --with-css-dir=/var/www/apcupsd \
-               --with-cgi-bin=/var/www/apcupsd \
-               --enable-cgi \
-               ${myconf} \
-               || die
-       make || die
-}
-
-src_install () {
-       make DESTDIR=${D} install || die "installed failed"
-
-       use apache2 || insinto /etc/apache/conf/addon-modules
-       use apache2 || newins  ${FILESDIR}/${PV}/apache.conf apcupsd.conf
-
-       use apache2 && insinto /etc/apache2/conf/modules.d
-       use apache2 && newins ${FILESDIR}/${PV}/apache.conf 60_apcupsd.conf
-
-       insinto /etc/apcupsd
-       newins examples/safe.apccontrol safe.apccontrol
-
-       cd ${D}/etc/apcupsd
-       epatch ${FILESDIR}/${PV}/smtp.patch
-
-       ln -s onbattery powerout
-
-       if use doc
-       then
-               einfo "Installing full documentation into /usr/share/doc/${P}..."
-               cd ${S}/doc
-               dodoc README.*
-               docinto developers_manual
-               dodoc developers_manual/*
-               docinto logo
-               dodoc logo/*
-               docinto manual
-               dodoc manual/*
-               docinto old_documents
-               dodoc old_documents/*
-               docinto vim
-               dodoc vim/*
-       fi
-}
diff --git a/sys-apps/apcupsd/files/3.10.13/apache.conf b/sys-apps/apcupsd/files/3.10.13/apache.conf
deleted file mode 100644 (file)
index 21305d2..0000000
+++ /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.13/apcupsd.in.patch b/sys-apps/apcupsd/files/3.10.13/apcupsd.in.patch
deleted file mode 100644 (file)
index 7bcb0f4..0000000
+++ /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.13/smtp.patch b/sys-apps/apcupsd/files/3.10.13/smtp.patch
deleted file mode 100644 (file)
index d0c6bbc..0000000
+++ /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.13/ucd-snmp.patch b/sys-apps/apcupsd/files/3.10.13/ucd-snmp.patch
deleted file mode 100644 (file)
index af9c363..0000000
+++ /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.13 b/sys-apps/apcupsd/files/digest-apcupsd-3.10.13
deleted file mode 100644 (file)
index 17de2a2..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b201f70b0c066ff1bee86106e9ee5b6a apcupsd-3.10.13.tar.gz 3809317
-MD5 d9a0ddf7918c93ca28fa5832a4af54d8 gd1.2.tar.gz 64595