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

(Portage version: 2.1.5_rc7)
 (Signed Manifest commit)

6 files changed, 150 insertions, 8 deletions

diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index d72c5c8bfc61..820205c1ebdf 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -40,6 +40,11 @@ AUX 3.14.2/apcupsd.in.patch 273 RMD160 46efa88a7716a0e26f905528335e8d4994a9b704
 AUX 3.14.2/apcupsd.initd 804 RMD160 f3da3f83784617e8e4089531bc9d83aea16e7da0 SHA1 603da439b34d23a0269341b1c75f15b7bfbc8ef7 SHA256 c471d9f9ffadcd65ea56bfe9e0e22fdc543e8f82b90158411cd0d95192ef0a38
 AUX 3.14.2/etc.patch 1476 RMD160 0e93c67b37637fb6913d771c3c10cf49a85478ad SHA1 4a1dc295661edc8f8283c20bf689012d6419d917 SHA256 cf6372fe37625f5418fcca42b41d6c3b9424ad1a8b66c8ad5ca64fc39731c295
 AUX 3.14.2/no-parallel.patch 339 RMD160 c6e50aa5b22438e02e17df4fda41c7cae371217f SHA1 4d20db0882272b9c472b1ea994d115310bcab6d3 SHA256 3bcd10a6f7c623496a75d8cc321becbc24162372936dab4e696b0322c46e4c62
+AUX 3.14.3/apcupsd.in.patch 273 RMD160 46efa88a7716a0e26f905528335e8d4994a9b704 SHA1 8e976c8f3316b8b7a056a9a5a3a432be66131854 SHA256 c07f3085f5b39d319f220898b84a8ffe27c872cb6d70d90bd7211af11c3b2c08
+AUX 3.14.3/apcupsd.initd 804 RMD160 f3da3f83784617e8e4089531bc9d83aea16e7da0 SHA1 603da439b34d23a0269341b1c75f15b7bfbc8ef7 SHA256 c471d9f9ffadcd65ea56bfe9e0e22fdc543e8f82b90158411cd0d95192ef0a38
+AUX 3.14.3/etc.patch 1476 RMD160 0e93c67b37637fb6913d771c3c10cf49a85478ad SHA1 4a1dc295661edc8f8283c20bf689012d6419d917 SHA256 cf6372fe37625f5418fcca42b41d6c3b9424ad1a8b66c8ad5ca64fc39731c295
+AUX 3.14.3/hal-ups-policy.patch 637 RMD160 8574fa8537c52709d2ac718a45a8d09a0e2f26b7 SHA1 16fd035d0019a45d03d02615af6bd9ca1ab6cf9d SHA256 98baaebc1c82fb75438b3e32bf0a0fa9dea5421563c9eedf3be53cf8c1942258
+AUX 3.14.3/no-parallel.patch 339 RMD160 c6e50aa5b22438e02e17df4fda41c7cae371217f SHA1 4d20db0882272b9c472b1ea994d115310bcab6d3 SHA256 3bcd10a6f7c623496a75d8cc321becbc24162372936dab4e696b0322c46e4c62
 AUX 3.14/apcupsd.in.patch 273 RMD160 46efa88a7716a0e26f905528335e8d4994a9b704 SHA1 8e976c8f3316b8b7a056a9a5a3a432be66131854 SHA256 c07f3085f5b39d319f220898b84a8ffe27c872cb6d70d90bd7211af11c3b2c08
 AUX 3.14/etc.patch 1476 RMD160 0e93c67b37637fb6913d771c3c10cf49a85478ad SHA1 4a1dc295661edc8f8283c20bf689012d6419d917 SHA256 cf6372fe37625f5418fcca42b41d6c3b9424ad1a8b66c8ad5ca64fc39731c295
 DIST apcupsd-3.10.15.tar.gz 3858266 RMD160 a8f0b69a5622057ccf8ff97c1f1f56ef1305d9c1 SHA1 538465f21986b4736a846bf2fbd1d9bc26f2e14c SHA256 04179f7369a3a24816e94605b973ba739a2b22e80e2765159f457515a6c96e5a
@@ -52,6 +57,7 @@ DIST apcupsd-3.12.4.tar.gz 4223158 RMD160 a54c2f6d71c902d7963a1c65a3850f657aabaa
 DIST apcupsd-3.14.0.tar.gz 4356614 RMD160 583527a79fdf3965676c310b801331e89e724d91 SHA1 1caba59ce56a445e7f09825d729770edd495a53b SHA256 3d30e5234115b466b97434d8c74f0cfc96c3735add7eb725066e5043ffbd66aa
 DIST apcupsd-3.14.1.tar.gz 4352400 RMD160 f6655123f7daa91966e9a2a4877e90b70babc670 SHA1 ee2a9ba074b688aba047d571098f44dc591e985c SHA256 3d68ce2c387194a8d6d2afae40dbaa0c02a87992ac1bdbd2495b1b610266c123
 DIST apcupsd-3.14.2.tar.gz 4345034 RMD160 e002bdb89b9391d6727d5fbc1395e5b5b4a99304 SHA1 5a028236a521c7ef6154a5fd7a14d4f8dcdbf64d SHA256 72605e54356ffe32dc24159b4094a5b7e5e978d2440edded8b01496af9caca50
+DIST apcupsd-3.14.3.tar.gz 4350109 RMD160 092726b2076e56368cdb7e3c790ee8d5e2a7d2f9 SHA1 b9f75732752cdee9792a5be526656c153c2d1274 SHA256 01b8f4219ff91044600afd78842ac93cb40f034cf00cd25144fe918db80eed88
 EBUILD apcupsd-3.10.15-r1.ebuild 2438 RMD160 42ab7e7b60f9e125d58a0265da0d5b9dcadf77f6 SHA1 04990d121dfbd23b3d33968646668b2231a5e191 SHA256 d42a593b25aa96f42e5889aa0d093758b1434872241ae6c1f9dfa144a6343c51
 EBUILD apcupsd-3.10.16-r3.ebuild 2643 RMD160 5dc0303b1a16485263c9f45e48c1e3b3a0fb1cd6 SHA1 6d18513a60ca927f1eb858ad2570358b53e49337 SHA256 ce37b53760492fddce6822a4a470f7fe0af67e0d6a40995a6ee775ca2c3ee4bc
 EBUILD apcupsd-3.10.17-r1.ebuild 2617 RMD160 9152e147f44204db75da4731ec55d70883cebcad SHA1 ee34d3ac8c35e468b7a615e8a84b479600a52763 SHA256 cdb0a2090025e128cbaea6351190ac3641214bdb4cee23bcd52f8fb8f782a8cf
@@ -61,15 +67,16 @@ EBUILD apcupsd-3.12.2-r1.ebuild 3204 RMD160 051a851740e9b93625c81a03e9c0aba4331c
 EBUILD apcupsd-3.12.2.ebuild 3195 RMD160 6cf876260faf861bdfc7279c7110f61187a417e2 SHA1 ac89daa9063afd2caae1327862f9e19e25091063 SHA256 5d38cd431f1c84e667e794a467b1da15ab0828de3a83028974f262253e30fa4f
 EBUILD apcupsd-3.12.3.ebuild 3031 RMD160 c18145b871006ee73b4681ea4ad63a11e1f2313c SHA1 90156873d459a943cb7425e53d25a2d323623da6 SHA256 df9c5dbe920a0a4be9e4f1385990096d970941af4424ac3c6b235eccbf3a65fc
 EBUILD apcupsd-3.12.4.ebuild 3025 RMD160 9d781e273dd12de98b57d41580b43db56f994e72 SHA1 ec6bb1b4069c262edfbedd10ed6675586ae78f37 SHA256 a8d1808ce308d8e9fda6b340f7e47e6c447f6fc8d46a4546bedd2bb83fc31828
-EBUILD apcupsd-3.14.0.ebuild 3378 RMD160 e9f251b77ee82b59429fb0ca6e6b6e70c802d8eb SHA1 9caa52a1c1d38a7a2f4435ea9d51829addf27132 SHA256 8c5d9a4fa8174b8dee69944831b7e7672c7a17e9e2f3ce3e22eb0f22b558bec2
-EBUILD apcupsd-3.14.1.ebuild 3379 RMD160 0efdff8a8aec3f5d3dc3d1f037f85ffa6d706a88 SHA1 e5aed4a407093f5b3be3ad6a565e2af5e6850f81 SHA256 c789ccc63af6c6e7dba47420376a1b05ed1306474eecd12a031cb9327f4c622a
-EBUILD apcupsd-3.14.2.ebuild 3265 RMD160 2ea488351c88e80a997c56ce4c13bf0578b6b300 SHA1 b340912bdd99a72fa0cce45402d9bb96d78161d3 SHA256 1e3c35a263764c43ab59041f84fb0e16a9dd27e6a967829a357415c59cc931e7
-MISC ChangeLog 16328 RMD160 580df28146211aa1c2754e39f99604676384b118 SHA1 439b44461bf09fc009541d10473bb3d894d3e572 SHA256 7c0a2eca4a3763280507231fe51c0381248b76dc3e1b360c9a2d1a9e21442301
+EBUILD apcupsd-3.14.0.ebuild 3390 RMD160 7052d271008f334e45a2fa9794f745103d391e4f SHA1 75bb89c6a19f4d23ef37727715656df2bdec752a SHA256 5140357870c0dac7fc711dec0a7dee8123a2706fb501b350e6a8dcb4bafecebd
+EBUILD apcupsd-3.14.1.ebuild 3390 RMD160 b675fa8dd45ceaee5cc7ee3046418a422830a3e7 SHA1 ef7f4cbcda24eefe57e9a43e1448a83d60be7384 SHA256 1ec4757baab86ad1272095b4c26f8ed79f955e2538500c1d3e3c131d2cd94c04
+EBUILD apcupsd-3.14.2.ebuild 3277 RMD160 1953101300bc925a1e548b25ba5f8b0e525de249 SHA1 a527fe0a79e6cce51ce554f46b080d789dc4ba54 SHA256 49db76d21587f86e33d276c97fb17f365aa05425a45e30e7ea4f660f440c4488
+EBUILD apcupsd-3.14.3.ebuild 3326 RMD160 2206633f73455f946401a83fc04423c6766c3548 SHA1 5abeade47ce050fff5a8f9fd788872109f42f922 SHA256 6c07cfa3f4c1553eefc76ee63fd45f466aee017c839b32ebc1b4982fed57255e
+MISC ChangeLog 16741 RMD160 77c77f6aa428097a6bab5261b0ff71ffe838a3dc SHA1 38e2e4511f4b7852a3ccd57d53bf2b6eb63b74f4 SHA256 175c92937cc85ab59afc78049072892ce770d3ce679967c893afb3fa70397d92
 MISC metadata.xml 226 RMD160 e0ca1098a8ced8b212c797e8d3343fed766ba485 SHA1 360c056f345a7b50026e93de38b0167f4193904f SHA256 ab1d24920d852e21a852c10c1ec15d5d0cfe91752a67e9eca902177081d6e1c2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH3VEpKtJO8LeSoosRAsydAKCRugyPIayvdjd5Wvcf81hAbI2/AgCeNyf3
-33wv/tkxhucKyefGuddjRQc=
-=fmQk
+iEYEARECAAYFAkgjWBIACgkQKtJO8LeSoovYYQCeIeh1y3M7gRm40TSVRhjYsSBR
+tGUAn0dQS8Y5f+7aoGgkPrVG0zSGFT8e
+=fTYM
 -----END PGP SIGNATURE-----
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: