Version bumped. Closes #208188. Added -j1 to emake, should fix #176339.

Package-Manager: portage-2.1.5_rc7

5 files changed, 135 insertions, 0 deletions

diff --git a/sys-power/apcupsd/files/3.14.3/apcupsd.in.patch b/sys-power/apcupsd/files/3.14.3/apcupsd.in.patch
new file mode 100644
index 000000000000..69dad9d74d1c
--- /dev/null
+++ b/sys-power/apcupsd/files/3.14.3/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.3/apcupsd.initd b/sys-power/apcupsd/files/3.14.3/apcupsd.initd
new file mode 100644
index 000000000000..035b529707fc
--- /dev/null
+++ b/sys-power/apcupsd/files/3.14.3/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.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
new file mode 100644
index 000000000000..cc8370b7618b
--- /dev/null
+++ b/sys-power/apcupsd/files/3.14.3/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.3/hal-ups-policy.patch b/sys-power/apcupsd/files/3.14.3/hal-ups-policy.patch
new file mode 100644
index 000000000000..bee4ca44a377
--- /dev/null
+++ b/sys-power/apcupsd/files/3.14.3/hal-ups-policy.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..a2aa4c398d1c
--- /dev/null
+++ b/sys-power/apcupsd/files/3.14.3/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: