Take over package, remove all the old versions that are not latest-stable for any architecture, remove all the extra files (lots of duplicates too), remove the etc patch from 3.14.5 because with mailx it shouldn't matter.

(Portage version: 2.2_rc22/cvs/Linux 2.6.28-gentoo x86_64)

36 files changed, 0 insertions, 1455 deletions

diff --git a/sys-power/apcupsd/files/3.10.15/apache.conf b/sys-power/apcupsd/files/3.10.15/apache.conf
deleted file mode 100644
index 21305d257846..000000000000
--- a/sys-power/apcupsd/files/3.10.15/apache.conf
+++ /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-power/apcupsd/files/3.10.15/apcupsd.in.patch b/sys-power/apcupsd/files/3.10.15/apcupsd.in.patch
deleted file mode 100644
index 7bcb0f41c086..000000000000
--- a/sys-power/apcupsd/files/3.10.15/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.15/smtp.patch b/sys-power/apcupsd/files/3.10.15/smtp.patch
deleted file mode 100644
index d0c6bbcbdd48..000000000000
--- a/sys-power/apcupsd/files/3.10.15/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
diff --git a/sys-power/apcupsd/files/3.10.16/apache.conf b/sys-power/apcupsd/files/3.10.16/apache.conf
deleted file mode 100644
index 21305d257846..000000000000
--- a/sys-power/apcupsd/files/3.10.16/apache.conf
+++ /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-power/apcupsd/files/3.10.16/apcupsd.in.patch b/sys-power/apcupsd/files/3.10.16/apcupsd.in.patch
deleted file mode 100644
index 7bcb0f41c086..000000000000
--- a/sys-power/apcupsd/files/3.10.16/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.16/smtp.patch b/sys-power/apcupsd/files/3.10.16/smtp.patch
deleted file mode 100644
index d0c6bbcbdd48..000000000000
--- a/sys-power/apcupsd/files/3.10.16/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
diff --git a/sys-power/apcupsd/files/3.10.17/apache.conf b/sys-power/apcupsd/files/3.10.17/apache.conf
deleted file mode 100644
index 3156ab7976de..000000000000
--- a/sys-power/apcupsd/files/3.10.17/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.17/apcupsd.in.patch b/sys-power/apcupsd/files/3.10.17/apcupsd.in.patch
deleted file mode 100644
index 7bcb0f41c086..000000000000
--- a/sys-power/apcupsd/files/3.10.17/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.17/smtp.patch b/sys-power/apcupsd/files/3.10.17/smtp.patch
deleted file mode 100644
index d0c6bbcbdd48..000000000000
--- a/sys-power/apcupsd/files/3.10.17/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
diff --git a/sys-power/apcupsd/files/3.12.2/apache.conf b/sys-power/apcupsd/files/3.12.2/apache.conf
deleted file mode 100644
index 3156ab7976de..000000000000
--- a/sys-power/apcupsd/files/3.12.2/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.12.2/apcupsd-lighttpd.conf b/sys-power/apcupsd/files/3.12.2/apcupsd-lighttpd.conf
deleted file mode 100644
index a90f6310ea32..000000000000
--- a/sys-power/apcupsd/files/3.12.2/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.12.2/apcupsd-lighttpd.conf,v 1.1 2006/03/19 22:49:08 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.12.2/apcupsd.in.patch b/sys-power/apcupsd/files/3.12.2/apcupsd.in.patch
deleted file mode 100644
index 7bcb0f41c086..000000000000
--- a/sys-power/apcupsd/files/3.12.2/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.12.2/etc.patch b/sys-power/apcupsd/files/3.12.2/etc.patch
deleted file mode 100644
index a3acfdbd6fe4..000000000000
--- a/sys-power/apcupsd/files/3.12.2/etc.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-diff -cwb etc.bak/changeme.in etc/changeme.in
-*** etc.bak/changeme.in	Sun Mar 19 01:39:52 2006
---- 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
-diff -cwb etc.bak/commfailure.in etc/commfailure.in
-*** etc.bak/commfailure.in	Sun Mar 19 01:39:52 2006
---- 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
-diff -cwb etc.bak/commok.in etc/commok.in
-*** etc.bak/commok.in	Sun Mar 19 01:39:52 2006
---- 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
-diff -cwb etc.bak/masterconnect.in etc/masterconnect.in
-*** etc.bak/masterconnect.in	Sun Mar 19 01:39:52 2006
---- 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
-diff -cwb etc.bak/mastertimeout.in etc/mastertimeout.in
-*** etc.bak/mastertimeout.in	Sun Mar 19 01:39:52 2006
---- 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
-diff -cwb etc.bak/offbattery.in etc/offbattery.in
-*** etc.bak/offbattery.in	Sun Mar 19 01:39:52 2006
---- 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
-diff -cwb etc.bak/onbattery.in etc/onbattery.in
-*** etc.bak/onbattery.in	Sun Mar 19 01:39:52 2006
---- 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.3/apcupsd.in.patch b/sys-power/apcupsd/files/3.12.3/apcupsd.in.patch
deleted file mode 100644
index 7bcb0f41c086..000000000000
--- a/sys-power/apcupsd/files/3.12.3/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.12.3/etc.patch b/sys-power/apcupsd/files/3.12.3/etc.patch
deleted file mode 100644
index a3acfdbd6fe4..000000000000
--- a/sys-power/apcupsd/files/3.12.3/etc.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-diff -cwb etc.bak/changeme.in etc/changeme.in
-*** etc.bak/changeme.in	Sun Mar 19 01:39:52 2006
---- 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
-diff -cwb etc.bak/commfailure.in etc/commfailure.in
-*** etc.bak/commfailure.in	Sun Mar 19 01:39:52 2006
---- 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
-diff -cwb etc.bak/commok.in etc/commok.in
-*** etc.bak/commok.in	Sun Mar 19 01:39:52 2006
---- 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
-diff -cwb etc.bak/masterconnect.in etc/masterconnect.in
-*** etc.bak/masterconnect.in	Sun Mar 19 01:39:52 2006
---- 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
-diff -cwb etc.bak/mastertimeout.in etc/mastertimeout.in
-*** etc.bak/mastertimeout.in	Sun Mar 19 01:39:52 2006
---- 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
-diff -cwb etc.bak/offbattery.in etc/offbattery.in
-*** etc.bak/offbattery.in	Sun Mar 19 01:39:52 2006
---- 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
-diff -cwb etc.bak/onbattery.in etc/onbattery.in
-*** etc.bak/onbattery.in	Sun Mar 19 01:39:52 2006
---- 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.14.0/apcupsd-3.14.0-apccontrol-gentoo.patch b/sys-power/apcupsd/files/3.14.0/apcupsd-3.14.0-apccontrol-gentoo.patch
deleted file mode 100644
index 4162a73390bc..000000000000
--- a/sys-power/apcupsd/files/3.14.0/apcupsd-3.14.0-apccontrol-gentoo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: apcupsd-3.14.0/platforms/apccontrol.in
-===================================================================
---- apcupsd-3.14.0.orig/platforms/apccontrol.in
-+++ apcupsd-3.14.0/platforms/apccontrol.in
-@@ -18,7 +18,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- 
--APCPID=@PIDDIR@/apcupsd.pid
-+SERVICE=${SERVICE-apcupsd}
- APCUPSD=@sbindir@/apcupsd
- SHUTDOWN=@SHUTDOWN@
- SCRIPTSHELL=@SCRIPTSHELL@
-@@ -120,15 +120,7 @@ case "$1" in
- 	echo "Remote Shutdown. Beginning Shutdown Sequence." | ${WALL}
-     ;;
-     restartme)
--	echo -n "Restarting APCUPSD Power Management: "
--	THEPID=`cat ${APCPID}`
--	kill ${THEPID}
--	rm -f ${APCPID}
--	rm -f @PWRFAILDIR@/powerfail
--	rm -f @nologdir@/nologin
--	sleep 5
--	`${APCUPSD}`
--	echo "apcupsd"
-+	/etc/init.d/${SERVICE} restart
-     ;;
-     startselftest)
-     ;;
diff --git a/sys-power/apcupsd/files/3.14.0/apcupsd.in.patch b/sys-power/apcupsd/files/3.14.0/apcupsd.in.patch
deleted file mode 100644
index 69dad9d74d1c..000000000000
--- a/sys-power/apcupsd/files/3.14.0/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.14.0/apcupsd.initd b/sys-power/apcupsd/files/3.14.0/apcupsd.initd
deleted file mode 100644
index 7475a181a2bb..000000000000
--- a/sys-power/apcupsd/files/3.14.0/apcupsd.initd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/runscript
-# Copyright 2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/files/3.14.0/apcupsd.initd,v 1.1 2007/05/02 21:12:23 tantive Exp $
-
-INSTANCE="${SVCNAME#*.}"
-if [ -z "${INSTANCE}" ] || [ "${SVCNAME}" = "apcupsd" ]; then
-	INSTANCE="apcupsd"
-fi
-
-depend() {
-	use net
-}
-
-start() {
-	rm -f /etc/apcupsd/powerfail
-
-	export SERVICE="${SVCNAME}"
-
-	ebegin "Starting APC UPS daemon"
-	start-stop-daemon \
-		--start --pidfile "/var/run/${SVCNAME}.pid" \
-		--exec /sbin/apcupsd -- \
-		-f "/etc/apcupsd/${INSTANCE}.conf" \
-		-P "/var/run/${SVCNAME}.pid"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping APC UPS daemon"
-	start-stop-daemon \
-		--stop --pidfile "/var/run/${SVCNAME}.pid" \
-		--exec /sbin/apcupsd
-	eend $?
-}
diff --git a/sys-power/apcupsd/files/3.14.0/etc.patch b/sys-power/apcupsd/files/3.14.0/etc.patch
deleted file mode 100644
index cc8370b7618b..000000000000
--- a/sys-power/apcupsd/files/3.14.0/etc.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-*** platforms/etc.bak/changeme.in       2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/changeme.in   2007-02-18 15:01:36.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/commfailure.in    2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/commfailure.in        2007-02-18 15:01:56.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/commok.in 2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/commok.in     2007-02-18 15:02:24.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/offbattery.in     2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/offbattery.in 2007-02-18 15:04:43.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/onbattery.in      2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/onbattery.in  2007-02-18 15:04:47.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-
diff --git a/sys-power/apcupsd/files/3.14.0/no-parallel.patch b/sys-power/apcupsd/files/3.14.0/no-parallel.patch
deleted file mode 100644
index a2aa4c398d1c..000000000000
--- a/sys-power/apcupsd/files/3.14.0/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.14.1/apcupsd-3.14.1-apccontrol-gentoo.patch b/sys-power/apcupsd/files/3.14.1/apcupsd-3.14.1-apccontrol-gentoo.patch
deleted file mode 100644
index 4162a73390bc..000000000000
--- a/sys-power/apcupsd/files/3.14.1/apcupsd-3.14.1-apccontrol-gentoo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: apcupsd-3.14.0/platforms/apccontrol.in
-===================================================================
---- apcupsd-3.14.0.orig/platforms/apccontrol.in
-+++ apcupsd-3.14.0/platforms/apccontrol.in
-@@ -18,7 +18,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- 
--APCPID=@PIDDIR@/apcupsd.pid
-+SERVICE=${SERVICE-apcupsd}
- APCUPSD=@sbindir@/apcupsd
- SHUTDOWN=@SHUTDOWN@
- SCRIPTSHELL=@SCRIPTSHELL@
-@@ -120,15 +120,7 @@ case "$1" in
- 	echo "Remote Shutdown. Beginning Shutdown Sequence." | ${WALL}
-     ;;
-     restartme)
--	echo -n "Restarting APCUPSD Power Management: "
--	THEPID=`cat ${APCPID}`
--	kill ${THEPID}
--	rm -f ${APCPID}
--	rm -f @PWRFAILDIR@/powerfail
--	rm -f @nologdir@/nologin
--	sleep 5
--	`${APCUPSD}`
--	echo "apcupsd"
-+	/etc/init.d/${SERVICE} restart
-     ;;
-     startselftest)
-     ;;
diff --git a/sys-power/apcupsd/files/3.14.1/apcupsd.in.patch b/sys-power/apcupsd/files/3.14.1/apcupsd.in.patch
deleted file mode 100644
index 69dad9d74d1c..000000000000
--- a/sys-power/apcupsd/files/3.14.1/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.14.1/apcupsd.initd b/sys-power/apcupsd/files/3.14.1/apcupsd.initd
deleted file mode 100644
index c053628cf03b..000000000000
--- a/sys-power/apcupsd/files/3.14.1/apcupsd.initd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/runscript
-# Copyright 2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/files/3.14.1/apcupsd.initd,v 1.1 2007/07/01 20:58:00 tantive Exp $
-
-INSTANCE="${SVCNAME#*.}"
-if [ -z "${INSTANCE}" ] || [ "${SVCNAME}" = "apcupsd" ]; then
-	INSTANCE="apcupsd"
-fi
-
-depend() {
-	use net
-}
-
-start() {
-	rm -f /etc/apcupsd/powerfail
-
-	export SERVICE="${SVCNAME}"
-
-	ebegin "Starting APC UPS daemon"
-	start-stop-daemon \
-		--start --pidfile "/var/run/${SVCNAME}.pid" \
-		--exec /sbin/apcupsd -- \
-		-f "/etc/apcupsd/${INSTANCE}.conf" \
-		-P "/var/run/${SVCNAME}.pid"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping APC UPS daemon"
-	start-stop-daemon \
-		--stop --pidfile "/var/run/${SVCNAME}.pid" \
-		--exec /sbin/apcupsd
-	eend $?
-}
diff --git a/sys-power/apcupsd/files/3.14.1/etc.patch b/sys-power/apcupsd/files/3.14.1/etc.patch
deleted file mode 100644
index cc8370b7618b..000000000000
--- a/sys-power/apcupsd/files/3.14.1/etc.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-*** platforms/etc.bak/changeme.in       2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/changeme.in   2007-02-18 15:01:36.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/commfailure.in    2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/commfailure.in        2007-02-18 15:01:56.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/commok.in 2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/commok.in     2007-02-18 15:02:24.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/offbattery.in     2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/offbattery.in 2007-02-18 15:04:43.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/onbattery.in      2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/onbattery.in  2007-02-18 15:04:47.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-
diff --git a/sys-power/apcupsd/files/3.14.1/no-parallel.patch b/sys-power/apcupsd/files/3.14.1/no-parallel.patch
deleted file mode 100644
index a2aa4c398d1c..000000000000
--- a/sys-power/apcupsd/files/3.14.1/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.14.2/apcupsd.in.patch b/sys-power/apcupsd/files/3.14.2/apcupsd.in.patch
deleted file mode 100644
index 69dad9d74d1c..000000000000
--- a/sys-power/apcupsd/files/3.14.2/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.14.2/apcupsd.initd b/sys-power/apcupsd/files/3.14.2/apcupsd.initd
deleted file mode 100644
index 2fe0c76286f8..000000000000
--- a/sys-power/apcupsd/files/3.14.2/apcupsd.initd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/runscript
-# Copyright 2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/files/3.14.2/apcupsd.initd,v 1.1 2007/11/26 08:17:39 tantive Exp $
-
-INSTANCE="${SVCNAME#*.}"
-if [ -z "${INSTANCE}" ] || [ "${SVCNAME}" = "apcupsd" ]; then
-	INSTANCE="apcupsd"
-fi
-
-depend() {
-	use net
-}
-
-start() {
-	rm -f /etc/apcupsd/powerfail
-
-	export SERVICE="${SVCNAME}"
-
-	ebegin "Starting APC UPS daemon"
-	start-stop-daemon \
-		--start --pidfile "/var/run/${SVCNAME}.pid" \
-		--exec /sbin/apcupsd -- \
-		-f "/etc/apcupsd/${INSTANCE}.conf" \
-		-P "/var/run/${SVCNAME}.pid"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping APC UPS daemon"
-	start-stop-daemon \
-		--stop --pidfile "/var/run/${SVCNAME}.pid" \
-		--exec /sbin/apcupsd
-	eend $?
-}
diff --git a/sys-power/apcupsd/files/3.14.2/etc.patch b/sys-power/apcupsd/files/3.14.2/etc.patch
deleted file mode 100644
index cc8370b7618b..000000000000
--- a/sys-power/apcupsd/files/3.14.2/etc.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-*** platforms/etc.bak/changeme.in       2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/changeme.in   2007-02-18 15:01:36.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/commfailure.in    2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/commfailure.in        2007-02-18 15:01:56.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/commok.in 2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/commok.in     2007-02-18 15:02:24.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/offbattery.in     2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/offbattery.in 2007-02-18 15:04:43.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/onbattery.in      2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/onbattery.in  2007-02-18 15:04:47.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-
diff --git a/sys-power/apcupsd/files/3.14.2/no-parallel.patch b/sys-power/apcupsd/files/3.14.2/no-parallel.patch
deleted file mode 100644
index a2aa4c398d1c..000000000000
--- a/sys-power/apcupsd/files/3.14.2/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.14.3/apcupsd.in.patch b/sys-power/apcupsd/files/3.14.3/apcupsd.in.patch
deleted file mode 100644
index 69dad9d74d1c..000000000000
--- a/sys-power/apcupsd/files/3.14.3/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.14.3/apcupsd.initd b/sys-power/apcupsd/files/3.14.3/apcupsd.initd
deleted file mode 100644
index 035b529707fc..000000000000
--- a/sys-power/apcupsd/files/3.14.3/apcupsd.initd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/runscript
-# Copyright 2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/files/3.14.3/apcupsd.initd,v 1.1 2008/05/08 19:37:50 tantive Exp $
-
-INSTANCE="${SVCNAME#*.}"
-if [ -z "${INSTANCE}" ] || [ "${SVCNAME}" = "apcupsd" ]; then
-	INSTANCE="apcupsd"
-fi
-
-depend() {
-	use net
-}
-
-start() {
-	rm -f /etc/apcupsd/powerfail
-
-	export SERVICE="${SVCNAME}"
-
-	ebegin "Starting APC UPS daemon"
-	start-stop-daemon \
-		--start --pidfile "/var/run/${SVCNAME}.pid" \
-		--exec /sbin/apcupsd -- \
-		-f "/etc/apcupsd/${INSTANCE}.conf" \
-		-P "/var/run/${SVCNAME}.pid"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping APC UPS daemon"
-	start-stop-daemon \
-		--stop --pidfile "/var/run/${SVCNAME}.pid" \
-		--exec /sbin/apcupsd
-	eend $?
-}
diff --git a/sys-power/apcupsd/files/3.14.3/etc.patch b/sys-power/apcupsd/files/3.14.3/etc.patch
deleted file mode 100644
index cc8370b7618b..000000000000
--- a/sys-power/apcupsd/files/3.14.3/etc.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-*** platforms/etc.bak/changeme.in       2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/changeme.in   2007-02-18 15:01:36.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/commfailure.in    2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/commfailure.in        2007-02-18 15:01:56.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/commok.in 2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/commok.in     2007-02-18 15:02:24.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/offbattery.in     2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/offbattery.in 2007-02-18 15:04:43.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/onbattery.in      2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/onbattery.in  2007-02-18 15:04:47.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-
diff --git a/sys-power/apcupsd/files/3.14.3/hal-ups-policy.patch b/sys-power/apcupsd/files/3.14.3/hal-ups-policy.patch
deleted file mode 100644
index bee4ca44a377..000000000000
--- a/sys-power/apcupsd/files/3.14.3/hal-ups-policy.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- apcupsd-3.14.3.orig/platforms/80-apcupsd-ups-policy.fdi	2008-04-29 09:57:34.000000000 +0200
-+++ apcupsd-3.14.3/platforms/80-apcupsd-ups-policy.fdi	2008-04-29 09:58:51.000000000 +0200
-@@ -2,7 +2,7 @@
- <!-- Disable hald-addon-hid-ups for any APC UPS so Apcupsd can own the device -->
- <deviceinfo version="0.2">
-   <device>
--    <match key="info.addons" type="strlist">hald-addon-hid-ups</match>
-+    <match key="info.addons" contains="hald-addon-hid-ups">
-       <match key="@info.parent:info.bus" string="usb">
-         <match key="@info.parent:usb.vendor_id" int="1309">
-           <match key="@info.parent:usb.product_id" int="2">
diff --git a/sys-power/apcupsd/files/3.14.3/no-parallel.patch b/sys-power/apcupsd/files/3.14.3/no-parallel.patch
deleted file mode 100644
index a2aa4c398d1c..000000000000
--- a/sys-power/apcupsd/files/3.14.3/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.14/apcupsd.in.patch b/sys-power/apcupsd/files/3.14/apcupsd.in.patch
deleted file mode 100644
index 69dad9d74d1c..000000000000
--- a/sys-power/apcupsd/files/3.14/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.14/etc.patch b/sys-power/apcupsd/files/3.14/etc.patch
deleted file mode 100644
index cc8370b7618b..000000000000
--- a/sys-power/apcupsd/files/3.14/etc.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-*** platforms/etc.bak/changeme.in       2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/changeme.in   2007-02-18 15:01:36.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/commfailure.in    2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/commfailure.in        2007-02-18 15:01:56.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/commok.in 2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/commok.in     2007-02-18 15:02:24.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/offbattery.in     2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/offbattery.in 2007-02-18 15:04:43.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-*** platforms/etc.bak/onbattery.in      2007-02-18 14:58:16.000000000 +0100
---- platforms/etc/onbattery.in  2007-02-18 15:04:47.000000000 +0100
-***************
-*** 13,18 ****
---- 13,19 ----
-  #
-  (
-     echo "Subject: $MSG"
-+    echo "To: $SYSADMIN"
-     echo " "
-     echo "$MSG"
-     echo " "
-