Remove older versions, leave current stable and stable target.

(Portage version: 2.2_rc55/cvs/Linux x86_64)

7 files changed, 7 insertions, 379 deletions

diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index 7cf059f59416..59917e5f8664 100644
--- a/sys-power/apcupsd/ChangeLog
+++ b/sys-power/apcupsd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.57 2009/11/18 18:36:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.58 2009/12/03 19:32:48 flameeyes Exp $
+
+  03 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/3.10.18/apache.conf, -apcupsd-3.10.18-r1.ebuild,
+  -files/3.10.18/apcupsd.in.patch, -apcupsd-3.14.5-r2.ebuild,
+  -files/3.10.18/apcupsd-lighttpd.conf, -files/3.10.18/smtp.patch:
+  Remove older versions, leave current stable and stable target.
 
   18 Nov 2009; Raúl Porcel <armin76@gentoo.org> apcupsd-3.14.6.ebuild:
   sparc stable wrt #280300
diff --git a/sys-power/apcupsd/apcupsd-3.10.18-r1.ebuild b/sys-power/apcupsd/apcupsd-3.10.18-r1.ebuild
deleted file mode 100644
index 52823d15c6f7..000000000000
--- a/sys-power/apcupsd/apcupsd-3.10.18-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.18-r1.ebuild,v 1.8 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.14.5-r2.ebuild b/sys-power/apcupsd/apcupsd-3.14.5-r2.ebuild
deleted file mode 100644
index 1570e461843f..000000000000
--- a/sys-power/apcupsd/apcupsd-3.14.5-r2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# 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-r2.ebuild,v 1.4 2009/05/23 12:03:34 maekke Exp $
-
-WEBAPP_MANUAL_SLOT="yes"
-WEBAPP_OPTIONAL="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 nls gnome"
-
-DEPEND="doc? ( virtual/latex-base
-		dev-tex/latex2html
-		app-text/dvipdfm )
-	cgi? ( >=media-libs/gd-1.8.4
-		${WEBAPP_DEPEND} )
-	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/mailx"
-
-pkg_setup() {
-	use cgi && webapp_pkg_setup
-}
-
-src_compile() {
-	local myconf
-	use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=${MY_CGIBINDIR}"
-	if use usb; then
-		myconf="${myconf} --with-upstype=usb --with-upscable=usb --enable-usb --with-dev= "
-	else
-		myconf="${myconf} --with-upstype=apcsmart --with-upscable=smart --disable-usb"
-	fi
-
-	# We force the DISTNAME to gentoo so it will use gentoo's layout also
-	# when installed on non-linux systems.
-	econf \
-		--sbindir=/sbin \
-		--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 --enable-pcnet \
-		--with-distname=gentoo \
-		$(use_enable snmp net-snmp) \
-		$(use_enable gnome gapcmon) \
-		${myconf} \
-		APCUPSD_MAIL=/bin/mail \
-		|| die "econf failed"
-	emake || die "emake failed"
-
-	if use doc; then
-		einfo "Building full documentation..."
-		cd "${S}"/doc/latex
-		emake -j1 texcheck tex web pdf || die "doc build failed"
-	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
-	newman doc/apctest.man apctest.8 || die "newman failed"
-
-	if use doc; then
-		einfo "Installing full documentation..."
-		newdoc doc/latex/apcupsd.pdf manual.pdf || die "pdf doc failed"
-		dohtml -r doc/latex/apcupsd/* || die "doc install failed"
-	fi
-
-	use cgi && webapp_src_install
-
-	rm "${D}"/etc/init.d/apcupsd
-	newinitd "${FILESDIR}/${PN}.init.2" "${PN}" || die "newinitd failed"
-	newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail || die "newinitd failed"
-}
-
-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 ""
-
-	if [ -d "${ROOT}"/etc/runlevels/shutdown -a \
-			! -e "${ROOT}"/etc/runlevels/shutdown/"${PN}".powerfail ] ; then
-		elog 'If you want apcupsd to power off your UPS when it'
-		elog 'shuts down your system in a power failure, you must'
-		elog 'add apcupsd.powerfail to your shutdown runlevel:'
-		elog ''
-		elog ' \e[01m rc-update add apcupsd.powerfail shutdown \e[0m'
-		elog ''
-	fi
-}
-
-pkg_prerm() {
-	use cgi && webapp_pkg_prerm
-}
diff --git a/sys-power/apcupsd/files/3.10.18/apache.conf b/sys-power/apcupsd/files/3.10.18/apache.conf
deleted file mode 100644
index 3156ab7976de..000000000000
--- a/sys-power/apcupsd/files/3.10.18/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.18/apcupsd-lighttpd.conf b/sys-power/apcupsd/files/3.10.18/apcupsd-lighttpd.conf
deleted file mode 100644
index 31c7aec4bdb0..000000000000
--- a/sys-power/apcupsd/files/3.10.18/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.10.18/apcupsd-lighttpd.conf,v 1.1 2005/11/20 17:46:42 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.10.18/apcupsd.in.patch b/sys-power/apcupsd/files/3.10.18/apcupsd.in.patch
deleted file mode 100644
index 7bcb0f41c086..000000000000
--- a/sys-power/apcupsd/files/3.10.18/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.18/smtp.patch b/sys-power/apcupsd/files/3.10.18/smtp.patch
deleted file mode 100644
index d0c6bbcbdd48..000000000000
--- a/sys-power/apcupsd/files/3.10.18/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