Version bumped. Closes #183340.

(Portage version: 2.1.3_rc5)

6 files changed, 157 insertions, 0 deletions

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
new file mode 100644
index 000000000000..4162a73390bc
--- /dev/null
+++ b/sys-power/apcupsd/files/3.14.1/apcupsd-3.14.1-apccontrol-gentoo.patch
@@ -0,0 +1,30 @@
+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
new file mode 100644
index 000000000000..69dad9d74d1c
--- /dev/null
+++ b/sys-power/apcupsd/files/3.14.1/apcupsd.in.patch
@@ -0,0 +1,15 @@
+--- 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
new file mode 100644
index 000000000000..c053628cf03b
--- /dev/null
+++ b/sys-power/apcupsd/files/3.14.1/apcupsd.initd
@@ -0,0 +1,35 @@
+#!/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
new file mode 100644
index 000000000000..cc8370b7618b
--- /dev/null
+++ b/sys-power/apcupsd/files/3.14.1/etc.patch
@@ -0,0 +1,61 @@
+*** 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
new file mode 100644
index 000000000000..a2aa4c398d1c
--- /dev/null
+++ b/sys-power/apcupsd/files/3.14.1/no-parallel.patch
@@ -0,0 +1,13 @@
+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/digest-apcupsd-3.14.1 b/sys-power/apcupsd/files/digest-apcupsd-3.14.1
new file mode 100644
index 000000000000..570f33f4f3af
--- /dev/null
+++ b/sys-power/apcupsd/files/digest-apcupsd-3.14.1
@@ -0,0 +1,3 @@
+MD5 258eb7515a12de493bb8952bc6d2f4e1 apcupsd-3.14.1.tar.gz 4352400
+RMD160 f6655123f7daa91966e9a2a4877e90b70babc670 apcupsd-3.14.1.tar.gz 4352400
+SHA256 3d68ce2c387194a8d6d2afae40dbaa0c02a87992ac1bdbd2495b1b610266c123 apcupsd-3.14.1.tar.gz 4352400