summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2009-08-04 11:39:08 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2009-08-04 11:39:08 +0000
commit035044d05cd83164f42b788e708bd41feebda2eb (patch)
treeafde6d0db995585f5efbb960cb852c244ffa345c /sys-power
parentVersion bump, add warnings for USB support on Linux (bug #278532). (diff)
downloadhistorical-035044d05cd83164f42b788e708bd41feebda2eb.tar.gz
historical-035044d05cd83164f42b788e708bd41feebda2eb.tar.bz2
historical-035044d05cd83164f42b788e708bd41feebda2eb.zip
Remove old 3.12.4 version and its files.
Package-Manager: portage-2.2_rc35/cvs/Linux x86_64
Diffstat (limited to 'sys-power')
-rw-r--r--sys-power/apcupsd/ChangeLog9
-rw-r--r--sys-power/apcupsd/Manifest16
-rw-r--r--sys-power/apcupsd/apcupsd-3.12.4.ebuild112
-rw-r--r--sys-power/apcupsd/files/3.12.4/apcupsd-snmp.patch10
-rw-r--r--sys-power/apcupsd/files/3.12.4/apcupsd.in.patch15
-rw-r--r--sys-power/apcupsd/files/3.12.4/etc.patch168
-rw-r--r--sys-power/apcupsd/files/3.12.4/exit-status-build.patch26
-rw-r--r--sys-power/apcupsd/files/3.12.4/no-parallel.patch13
-rw-r--r--sys-power/apcupsd/files/3.12.4/no-strip.patch63
9 files changed, 12 insertions, 420 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/Manifest b/sys-power/apcupsd/Manifest
index 7dbd128a1824..fd3c4e4839d1 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -5,30 +5,22 @@ AUX 3.10.18/apache.conf 163 RMD160 ae405a6eee544297ca91815f11c8d2c8efc47d51 SHA1
AUX 3.10.18/apcupsd-lighttpd.conf 623 RMD160 80d60ee5710fed934b77e759d42ec39e9ed686ee SHA1 e36263d390988931a38795adc1fd02202d889ecd SHA256 aa28424716548a4c4a80b80b77a015fba1b1a528a8792b89a3edc746cc4641ed
AUX 3.10.18/apcupsd.in.patch 315 RMD160 65ad8ff91d1280cdfc817aa15428dc3f3ecff250 SHA1 f62f104f790a60ae84e6570b9f181b838a4868ca SHA256 230e8e436fffef7c2bac52dfe522a160fdf6c27f1a15215ba8acdc2c73665e78
AUX 3.10.18/smtp.patch 2663 RMD160 12ca2247aca7a5ce0d80297ac9b5d52eb68903f2 SHA1 057f29cb73def6f8eecdfba10f14c711242bc455 SHA256 8e3e11f7e2bb3cc1486dfc2344df6f696913745bc64782f278c002bc32345025
-AUX 3.12.4/apcupsd-snmp.patch 371 RMD160 37ab765f0938b42aba7e7c2d83e3209bab73428a SHA1 b9d03a3b27cb1c656ab52df86e9bc1b38ed5e3ca SHA256 7a2ff13ed11140943e84c4ea933fd0475d594b624e38ac8f24c53f7531e0e907
-AUX 3.12.4/apcupsd.in.patch 273 RMD160 46efa88a7716a0e26f905528335e8d4994a9b704 SHA1 8e976c8f3316b8b7a056a9a5a3a432be66131854 SHA256 c07f3085f5b39d319f220898b84a8ffe27c872cb6d70d90bd7211af11c3b2c08
-AUX 3.12.4/etc.patch 3500 RMD160 650857be571e1304b42d277e50447346e392e9eb SHA1 b4601ef7000560bc1446cb0686cde73edf92ccbe SHA256 ee4fc73d658e44183b68e0281dfcb24d30eb265b635cf0aa87e5fe9e15330f45
-AUX 3.12.4/exit-status-build.patch 803 RMD160 c55fa78dbb454955135409eed3e0d737cd4cbc86 SHA1 d024e830f85e40df1b5b0df50dd3aa25a19d73fc SHA256 435e8a88593d447423fac086e5a040d8a1fe8b89fd3b9af5b6afe228ea6ec28d
-AUX 3.12.4/no-parallel.patch 339 RMD160 c6e50aa5b22438e02e17df4fda41c7cae371217f SHA1 4d20db0882272b9c472b1ea994d115310bcab6d3 SHA256 3bcd10a6f7c623496a75d8cc321becbc24162372936dab4e696b0322c46e4c62
-AUX 3.12.4/no-strip.patch 2181 RMD160 aa2d852fa223e2c5b18426a5334a1e3ee05b9cdc SHA1 b7952c4102fd810cb325c3cd6ab58592aa3cf527 SHA256 d45668c87581c1f5dd3a235578b291af157678480536d501c7f60b1cdfb0edab
AUX apcupsd.init.2 838 RMD160 fdca4e15d5f475c43147ce65624a4355e6ed9279 SHA1 b34596c601f368ed5028d661f7dd79630bfef4a9 SHA256 9c60e920d5946ff581b38c33087ec6a1ed7d8885bc2c9c5621932f5e7c8571d3
AUX apcupsd.powerfail.init 520 RMD160 24f766871652220523a18885f41f6608f29ab670 SHA1 0c5f97e556504904ffd6d72ff27ef792ac70e18c SHA256 eee773aa07175674085cb0ab7ed2c071fcc04fc05383d368f38d056e7327ff35
DIST apcupsd-3.10.18.tar.gz 5698299 RMD160 ebaf99e097d836ff8858cf653a825928058f54dd SHA1 a4e0f968be13c833ec25869f686e44c5a34e7964 SHA256 ae42d64e5cb29c8ce291f634139b5c81e888c95686f5c70ac9c250a1d8c02a38
-DIST apcupsd-3.12.4.tar.gz 4223158 RMD160 a54c2f6d71c902d7963a1c65a3850f657aabaa88 SHA1 a36212d9634d36beda2318d85b882209763f2473 SHA256 e2c789089a71f8bafc2812a5e20b73f5420e4c234961afb53a30f6ff891640ba
DIST apcupsd-3.14.5.tar.gz 4172931 RMD160 76dadfb241b69a9603cc6f06ef4549a1aa3ac55e SHA1 c28685a2ccd0565b4c5d9e972773b18a915562a9 SHA256 f48a75139d5701d13444128da6f9f6feea04da8524e8ba3bce2c21bdbedba49e
DIST apcupsd-3.14.6.tar.gz 4269348 RMD160 67ff929e10373661545c588a7fba630ffdfe3ab9 SHA1 19d33626a7002f86ede5d1784697b08dacb3fc6c SHA256 ddfeb4dd90a5c6d4cc8a487492efeb75f8c3ce1c955948bde97cebad51e8d1a3
DIST apcupsd-3.14.7.tar.gz 4272089 RMD160 cb3db3e6e123f39666eef3c5ccfdec65c57a1571 SHA1 9561eb5cf8e0c627215b987dbb97d026a2b2e9b8 SHA256 7e3df3b5552394206f4b8aaac2bd85ac69df540495557676a3df63f84972823c
EBUILD apcupsd-3.10.18-r1.ebuild 2614 RMD160 4136189b375cdd5b50fa1e98bcff757406ea8e66 SHA1 de25eb0d627ca017c4f5d27119ffaba709125735 SHA256 f5004d36d0c5a41df6c4fa9fe5e2cc3c49894a7aef927e79cfb72a1cce04ee39
-EBUILD apcupsd-3.12.4.ebuild 3028 RMD160 257a1dcc849ba616569693b7fb685c7be4a5d6f8 SHA1 41a0e20c82b02fe9158f3a45bd816fa66c4ac46a SHA256 86c0a2f5ffe869f5ea0db0220264d1109dcab7f4c395533e8dd5c87c478b59c9
EBUILD apcupsd-3.14.5-r2.ebuild 3617 RMD160 dc84a19b8477dcd42f27a8687c6cca09c012e057 SHA1 7bc8fb4ba7bd67fe7a19581dc7699c2508bf8467 SHA256 f4fff08cbab19b0006944258e5f57411c6117a3503791ecb060fc23421f269a3
EBUILD apcupsd-3.14.6.ebuild 3291 RMD160 d0ebc2f2e1013f30f076c2045a20119a11f198cb SHA1 76e466e9ceac0f7afaac5486061110314f6ac8f5 SHA256 6c1690b5317b12921dc7181fdd17aea12d4bf64a64782d51fe1a7c7b75b973e3
EBUILD apcupsd-3.14.7.ebuild 3677 RMD160 a49a156e1a9ae603ece9d206bf12c02269da0f85 SHA1 6b877c640ccdd3b3a3646111c4089913194d5b4b SHA256 8761011cdeb87fcbe3075e951a505563b2dc5028c7694186d2df501a95972ecf
-MISC ChangeLog 21275 RMD160 b78e853c7140950254982a7e3d29cd843ba0b971 SHA1 18abfb54b5c90b1d34bdeb2e0c5f866355253302 SHA256 4ff5d03e8bc463e7341cc0009234a191e4363b255f4b5d1e2d28f5b583019892
+MISC ChangeLog 21600 RMD160 76ed3150e20e5e3193ccbb51138fd3c3561fb099 SHA1 ae75d2d9a10288feb286f0fbd6bc379158c4ff0b SHA256 4bb1e635bc348f4e8a792931918a04d0a87dc3dae951287cb26b3bd77d549c93
MISC metadata.xml 237 RMD160 2a4fab832a64fbdafe2cd6f59b141b2aa80797ac SHA1 75878fb1a17b8617882c9e02331a6643d647882b SHA256 368acc29aa9214adaa137c17b114b16c6a021c4dfc9efa5f3440e968db04a9b3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkp4HSgACgkQAiZjviIA2XjPrwCdFkE7Aej4j/sy3IxNI2Ckgy3i
-pdsAoIYBWyuzagDQd31hj7v6SIh05Y/Y
-=CSZb
+iEYEARECAAYFAkp4HeEACgkQAiZjviIA2XhPegCeIvvqHXklE7Q+t4r66z3QfSL3
+YSYAn0FZqE9ZQXXA6ERWNPBRQNeLD6Z8
+=8jf8
-----END PGP SIGNATURE-----
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 \