Remove old 3.12.4 version and its files.

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

8 files changed, 8 insertions, 408 deletions

diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index 2f7f819c1cb8..70e311639bfc 100644
--- a/sys-power/apcupsd/ChangeLog
+++ b/sys-power/apcupsd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.50 2009/08/04 11:36:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.51 2009/08/04 11:39:08 flameeyes Exp $
+
+  04 Aug 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/3.12.4/apcupsd.in.patch, -files/3.12.4/apcupsd-snmp.patch,
+  -files/3.12.4/etc.patch, -files/3.12.4/exit-status-build.patch,
+  -files/3.12.4/no-parallel.patch, -apcupsd-3.12.4.ebuild,
+  -files/3.12.4/no-strip.patch:
+  Remove old 3.12.4 version and its files.
 
 *apcupsd-3.14.7 (04 Aug 2009)
 
diff --git a/sys-power/apcupsd/apcupsd-3.12.4.ebuild b/sys-power/apcupsd/apcupsd-3.12.4.ebuild
deleted file mode 100644
index 248158c69d63..000000000000
--- a/sys-power/apcupsd/apcupsd-3.12.4.ebuild
+++ /dev/null
@@ -1,112 +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.4.ebuild,v 1.9 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"
-
-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}"
-	epatch "${FILESDIR}"/${PV}/apcupsd.in.patch
-	epatch "${FILESDIR}"/${PV}/etc.patch
-	epatch "${FILESDIR}"/${PV}/exit-status-build.patch
-	epatch "${FILESDIR}"/${PV}/no-strip.patch
-	epatch "${FILESDIR}"/${PV}/no-parallel.patch
-	epatch "${FILESDIR}"/${PV}/${PN}-snmp.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-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
-
-	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
-}
-
-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/files/3.12.4/apcupsd-snmp.patch b/sys-power/apcupsd/files/3.12.4/apcupsd-snmp.patch
deleted file mode 100644
index 7e0bc5474936..000000000000
--- a/sys-power/apcupsd/files/3.12.4/apcupsd-snmp.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- apcupsd-3.12.4-old/src/drivers/snmp/snmp.h	2007-03-23 13:58:21.000000000 -0500
-+++ apcupsd-3.12.4/src/drivers/snmp/snmp.h	2007-03-23 13:59:24.000000000 -0500
-@@ -39,6 +39,7 @@
- #else
- 
- # ifdef HAVE_NET_SNMP
-+#  include <net-snmp/net-snmp-config.h>
- #  include <net-snmp/library/asn1.h>
- #  include <net-snmp/library/snmp.h>
- #  include <net-snmp/library/snmp_api.h>
diff --git a/sys-power/apcupsd/files/3.12.4/apcupsd.in.patch b/sys-power/apcupsd/files/3.12.4/apcupsd.in.patch
deleted file mode 100644
index 69dad9d74d1c..000000000000
--- a/sys-power/apcupsd/files/3.12.4/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.12.4/etc.patch b/sys-power/apcupsd/files/3.12.4/etc.patch
deleted file mode 100644
index a4951f8dae43..000000000000
--- a/sys-power/apcupsd/files/3.12.4/etc.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-*** platforms/etc.bak/changeme.in	Sun Mar 19 01:39:52 2006
---- platforms/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
-*** platforms/etc.bak/commfailure.in	Sun Mar 19 01:39:52 2006
---- platforms/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
-*** platforms/etc.bak/commok.in	Sun Mar 19 01:39:52 2006
---- platforms/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
-*** platforms/etc.bak/masterconnect.in	Sun Mar 19 01:39:52 2006
---- platforms/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
-*** platforms/etc.bak/mastertimeout.in	Sun Mar 19 01:39:52 2006
---- platforms/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
-*** platforms/etc.bak/offbattery.in	Sun Mar 19 01:39:52 2006
---- platforms/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
-*** platforms/etc.bak/onbattery.in	Sun Mar 19 01:39:52 2006
---- platforms/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.4/exit-status-build.patch b/sys-power/apcupsd/files/3.12.4/exit-status-build.patch
deleted file mode 100644
index c397d9cc3bad..000000000000
--- a/sys-power/apcupsd/files/3.12.4/exit-status-build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-if a subdir fails, we need to abort
-
-Index: autoconf/targets.mak
-===================================================================
-RCS file: /cvsroot/apcupsd/apcupsd/autoconf/targets.mak,v
-retrieving revision 1.21
-retrieving revision 1.22
-diff -u -p -r1.21 -r1.22
---- autoconf/targets.mak	21 Sep 2006 00:07:35 -0000	1.21
-+++ autoconf/targets.mak	20 Dec 2006 01:46:11 -0000	1.22
-@@ -22,10 +22,11 @@ all-subdirs:
- 	@if test ! x"$(subdirs)" = x; then \
- 	    for file in . ${subdirs}; \
- 	    do \
--		(cd $$file && if test "$$file" != "."; then $(MAKE) DESTDIR=$(DESTDIR) all; fi); \
--		  if test "$$?" != "0"; then \
--		     break; \
--		  fi; \
-+		(cd $$file; \
-+		 if test "$$file" != "."; then \
-+		     $(MAKE) DESTDIR=$(DESTDIR) all || exit $$?; \
-+		 fi; \
-+		) || exit $$?; \
- 	    done; \
- 	fi
- 
diff --git a/sys-power/apcupsd/files/3.12.4/no-parallel.patch b/sys-power/apcupsd/files/3.12.4/no-parallel.patch
deleted file mode 100644
index a2aa4c398d1c..000000000000
--- a/sys-power/apcupsd/files/3.12.4/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.12.4/no-strip.patch b/sys-power/apcupsd/files/3.12.4/no-strip.patch
deleted file mode 100644
index 494ba37f5478..000000000000
--- a/sys-power/apcupsd/files/3.12.4/no-strip.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-let portage handle stripping
-
---- src/Makefile.in
-+++ src/Makefile.in
-@@ -56,9 +56,9 @@
- install-binary: $(allexe)
- 	@$(ECHO) "Installing daemons ..."
- 	@$(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
--	@$(INSTALL_PROGRAM) -s -m 700 apcupsd@EXEEXT@ \
-+	@$(INSTALL_PROGRAM) -m 700 apcupsd@EXEEXT@ \
- 		$(DESTDIR)$(sbindir)/apcupsd@EXEEXT@
--	@$(INSTALL_PROGRAM) -s -m 700 apctest@EXEEXT@ \
-+	@$(INSTALL_PROGRAM) -m 700 apctest@EXEEXT@ \
- 		$(DESTDIR)$(sbindir)/apctest@EXEEXT@
- 	@$(MAKE) DESTDIR=$(DESTDIR) install-@APCACCESS@
- 	@$(MAKE) DESTDIR=$(DESTDIR) install-@SMTP@
-@@ -66,15 +66,15 @@
- 	@$(MAKE) DESTDIR=$(DESTDIR) install-@CGI@
- 
- install-apcaccess:
--	@$(INSTALL_PROGRAM) -s -m 755 apcaccess@EXEEXT@ \
-+	@$(INSTALL_PROGRAM) -m 755 apcaccess@EXEEXT@ \
- 		$(DESTDIR)$(sbindir)/apcaccess@EXEEXT@
- 
- install-smtp:
--	@$(INSTALL_PROGRAM) -s -m 755 smtp@EXEEXT@ \
-+	@$(INSTALL_PROGRAM) -m 755 smtp@EXEEXT@ \
- 		$(DESTDIR)$(sbindir)/smtp@EXEEXT@
- 
- install-powerflute:
--	@$(INSTALL_PROGRAM) -s -m 755 powerflute@EXEEXT@ \
-+	@$(INSTALL_PROGRAM) -m 755 powerflute@EXEEXT@ \
- 		$(DESTDIR)$(sbindir)/powerflute@EXEEXT@
- install-cgi:
- 	(cd cgi/; $(MAKE) DESTDIR=$(DESTDIR) install)
---- src/win32/Makefile.in
-+++ src/win32/Makefile.in
-@@ -63,9 +63,9 @@
- 
- install:
- 	@echo "Installing executables ..."
--	@$(INSTALL_PROGRAM) -s -m 755 popup.exe $(sbindir)/popup.exe
--	@$(INSTALL_PROGRAM) -s -m 755 shutdown.exe $(sbindir)/shutdown.exe
--	@$(INSTALL_PROGRAM) -s -m 755 email.exe $(sbindir)/email.exe
-+	@$(INSTALL_PROGRAM) -m 755 popup.exe $(sbindir)/popup.exe
-+	@$(INSTALL_PROGRAM) -m 755 shutdown.exe $(sbindir)/shutdown.exe
-+	@$(INSTALL_PROGRAM) -m 755 email.exe $(sbindir)/email.exe
- 
- # Make a Win32 binary release 
- binary-release:
---- src/cgi/Makefile.in
-+++ src/cgi/Makefile.in
-@@ -54,8 +54,8 @@
- 
- install: all-targets
- 	@for p in $(allexe) ; do \
--	    echo $(INSTALL_PROGRAM) -s $$p $(DESTDIR)$(cgibin); \
--	    $(INSTALL_PROGRAM) -s $$p $(DESTDIR)$(cgibin); \
-+	    echo $(INSTALL_PROGRAM) $$p $(DESTDIR)$(cgibin); \
-+	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(cgibin); \
- 	done
- 	# don't overwrite any existing config file
- 	@if test ! -f $(DESTDIR)$(sysconfdir)/apcupsd.css; then \