Marked stable and removed old ebuilds.

7 files changed, 10 insertions, 177 deletions

diff --git a/sys-apps/apcupsd/ChangeLog b/sys-apps/apcupsd/ChangeLog
index 5f532af3aae1..8f62d12ceab2 100644
--- a/sys-apps/apcupsd/ChangeLog
+++ b/sys-apps/apcupsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/apcupsd
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.25 2004/01/03 00:54:46 tantive Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.26 2004/01/14 16:05:42 tantive Exp $
+
+  14 Jan 2004; Michael Imhof <tantive@gentoo.org> apcupsd-3.10.5-r2.ebuild,
+  apcupsd-3.10.5-r3.ebuild, apcupsd-3.10.8.ebuild:
+  Marked stable and removed old ebuilds.
 
 *apcupsd-3.10.8 (03 Jan 2004)
 
diff --git a/sys-apps/apcupsd/Manifest b/sys-apps/apcupsd/Manifest
index b63bae6794b8..6e629301e6cd 100644
--- a/sys-apps/apcupsd/Manifest
+++ b/sys-apps/apcupsd/Manifest
@@ -1,15 +1,11 @@
-MD5 264cce7d28888a89ff8c4624701857b1 apcupsd-3.10.5-r2.ebuild 1896
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 b409c8c339062ebbd81b26741497ea6a apcupsd-3.10.5-r3.ebuild 1993
-MD5 3fde2a1939759e6fd16d27bb00baa7af ChangeLog 4497
-MD5 d0e06b95dea2db0b3a0d26d1ec2eb7e7 apcupsd-3.10.8.ebuild 2540
+MD5 1783406992be3bfcb32747d400c3493d ChangeLog 4666
+MD5 134ce42c69ee4501893d91a2fec897c5 apcupsd-3.10.8.ebuild 2539
 MD5 7a523b5d29637d319f2e38bc94947289 apcupsd-3.10.5-r4.ebuild 2182
 MD5 2f6ea2e245c6a5aeeabf554390867389 apcupsd-3.10.6.ebuild 2531
 MD5 f7092406e32869eb0535d85b4c09be0d files/digest-apcupsd-3.10.5-r4 123
 MD5 f66859d42d0af37659622f78b276a8bc files/digest-apcupsd-3.10.6 123
-MD5 f7092406e32869eb0535d85b4c09be0d files/digest-apcupsd-3.10.5-r3 123
 MD5 c5a0f1d4de26b7e7e76641d5c722cd9f files/digest-apcupsd-3.10.8 123
-MD5 f7092406e32869eb0535d85b4c09be0d files/digest-apcupsd-3.10.5-r2 123
 MD5 0a6d9da1e13f3a3a37fc77104eb8e2f2 files/3.10.5/apache.conf 163
 MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.6/smtp.patch 2663
 MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.6/ucd-snmp.patch 425
diff --git a/sys-apps/apcupsd/apcupsd-3.10.5-r2.ebuild b/sys-apps/apcupsd/apcupsd-3.10.5-r2.ebuild
deleted file mode 100644
index 1a89c9189edf..000000000000
--- a/sys-apps/apcupsd/apcupsd-3.10.5-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.5-r2.ebuild,v 1.5 2004/01/03 00:54:46 tantive Exp $
-
-IUSE="doc"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
-SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz
-	ftp://ftp.apcupsd.com/pub/apcupsd/contrib/gd1.2.tar.gz"
-HOMEPAGE="http://www.sibbald.com/apcupsd/"
-KEYWORDS="x86 amd64 ~ppc arm"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND=">=sys-apps/baselayout-1.8.4
-	virtual/glibc
-	virtual/mta
-	sys-libs/ncurses"
-
-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/
-}
-
-src_compile() {
-	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-powerflute \
-		--enable-pthreads \
-		--with-css-dir=/home/httpd/apcupsd \
-		--with-cgi-bin=/home/httpd/apcupsd \
-		--enable-cgi \
-		|| die
-	make || die
-}
-
-src_install () {
-	make DESTDIR=${D} install
-
-	insinto /etc/apache/conf/addon-modules
-	newins ${FILESDIR}/${PV}/apache.conf apcupsd.conf
-
-	if [ "`use doc`x" != "x" ]
-	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.5-r3.ebuild b/sys-apps/apcupsd/apcupsd-3.10.5-r3.ebuild
deleted file mode 100644
index 2edb537abecb..000000000000
--- a/sys-apps/apcupsd/apcupsd-3.10.5-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.5-r3.ebuild,v 1.6 2004/01/03 00:54:46 tantive Exp $
-
-IUSE="doc"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
-SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz
-	ftp://ftp.apcupsd.com/pub/apcupsd/contrib/gd1.2.tar.gz"
-HOMEPAGE="http://www.sibbald.com/apcupsd/"
-KEYWORDS="x86 amd64 ~ppc arm"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND=">=sys-apps/baselayout-1.8.4
-	virtual/glibc
-	virtual/mta
-	sys-libs/ncurses"
-
-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/
-}
-
-src_compile() {
-	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=/home/httpd/apcupsd \
-		--with-cgi-bin=/home/httpd/apcupsd \
-		--enable-cgi \
-		|| die
-	make || die
-}
-
-src_install () {
-	make DESTDIR=${D} install
-
-	insinto /etc/apache/conf/addon-modules
-	newins ${FILESDIR}/${PV}/apache.conf apcupsd.conf
-	insinto /etc/apcupsd
-	newins examples/safe.apccontrol safe.apccontrol
-
-	if [ "`use doc`x" != "x" ]
-	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.8.ebuild b/sys-apps/apcupsd/apcupsd-3.10.8.ebuild
index 3bdab18c9704..5e2c1a4a0199 100644
--- a/sys-apps/apcupsd/apcupsd-3.10.8.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.10.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.1 2004/01/03 00:54:46 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.8.ebuild,v 1.2 2004/01/14 16:05:42 tantive Exp $
 
 IUSE="doc snmp usb apache2"
 
@@ -9,7 +9,7 @@ DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
 SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz
 	ftp://ftp.apcupsd.com/pub/apcupsd/contrib/gd1.2.tar.gz"
 HOMEPAGE="http://www.sibbald.com/apcupsd/"
-KEYWORDS="~x86 ~amd64 ~ppc ~arm ~sparc"
+KEYWORDS="x86 ~amd64 ~ppc ~arm ~sparc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/apcupsd/files/digest-apcupsd-3.10.5-r2 b/sys-apps/apcupsd/files/digest-apcupsd-3.10.5-r2
deleted file mode 100644
index 7bb96a139a01..000000000000
--- a/sys-apps/apcupsd/files/digest-apcupsd-3.10.5-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f182db64c8acdae18f896ecdc064a239 apcupsd-3.10.5.tar.gz 2749777
-MD5 d9a0ddf7918c93ca28fa5832a4af54d8 gd1.2.tar.gz 64595
diff --git a/sys-apps/apcupsd/files/digest-apcupsd-3.10.5-r3 b/sys-apps/apcupsd/files/digest-apcupsd-3.10.5-r3
deleted file mode 100644
index 7bb96a139a01..000000000000
--- a/sys-apps/apcupsd/files/digest-apcupsd-3.10.5-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f182db64c8acdae18f896ecdc064a239 apcupsd-3.10.5.tar.gz 2749777
-MD5 d9a0ddf7918c93ca28fa5832a4af54d8 gd1.2.tar.gz 64595