Move install sed into a real patch and make sure failures in subdirs are caught #156980.

(Portage version: 2.1.2_rc3-r5)
 (Signed Manifest commit)

1 files changed, 28 insertions, 20 deletions

diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index cc771ace6c63..b052b1b6f2f6 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -77,17 +77,25 @@ AUX 3.12.3/etc.patch 3710 RMD160 c20497fd4f137cfecb3962610bfcc2c57f62c890 SHA1 e
 MD5 ceb8a56c8234598dad868dcf3b366e9f files/3.12.3/etc.patch 3710
 RMD160 c20497fd4f137cfecb3962610bfcc2c57f62c890 files/3.12.3/etc.patch 3710
 SHA256 046cca492d0ff932c9c5b5cf2e36d48d5cdb8a0a6cbac19791d3be72ba92813f files/3.12.3/etc.patch 3710
-AUX 3.12.4/apcupsd.in.patch 315 RMD160 65ad8ff91d1280cdfc817aa15428dc3f3ecff250 SHA1 f62f104f790a60ae84e6570b9f181b838a4868ca SHA256 230e8e436fffef7c2bac52dfe522a160fdf6c27f1a15215ba8acdc2c73665e78
-MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.12.4/apcupsd.in.patch 315
-RMD160 65ad8ff91d1280cdfc817aa15428dc3f3ecff250 files/3.12.4/apcupsd.in.patch 315
-SHA256 230e8e436fffef7c2bac52dfe522a160fdf6c27f1a15215ba8acdc2c73665e78 files/3.12.4/apcupsd.in.patch 315
-AUX 3.12.4/etc.patch 3710 RMD160 c20497fd4f137cfecb3962610bfcc2c57f62c890 SHA1 ed4127a156151296be54e92fe328cdc4744daea9 SHA256 046cca492d0ff932c9c5b5cf2e36d48d5cdb8a0a6cbac19791d3be72ba92813f
-MD5 ceb8a56c8234598dad868dcf3b366e9f files/3.12.4/etc.patch 3710
-RMD160 c20497fd4f137cfecb3962610bfcc2c57f62c890 files/3.12.4/etc.patch 3710
-SHA256 046cca492d0ff932c9c5b5cf2e36d48d5cdb8a0a6cbac19791d3be72ba92813f files/3.12.4/etc.patch 3710
+AUX 3.12.4/apcupsd.in.patch 273 RMD160 46efa88a7716a0e26f905528335e8d4994a9b704 SHA1 8e976c8f3316b8b7a056a9a5a3a432be66131854 SHA256 c07f3085f5b39d319f220898b84a8ffe27c872cb6d70d90bd7211af11c3b2c08
+MD5 b16ab90b6b83806a03c27aef26c4d0f0 files/3.12.4/apcupsd.in.patch 273
+RMD160 46efa88a7716a0e26f905528335e8d4994a9b704 files/3.12.4/apcupsd.in.patch 273
+SHA256 c07f3085f5b39d319f220898b84a8ffe27c872cb6d70d90bd7211af11c3b2c08 files/3.12.4/apcupsd.in.patch 273
+AUX 3.12.4/etc.patch 3500 RMD160 650857be571e1304b42d277e50447346e392e9eb SHA1 b4601ef7000560bc1446cb0686cde73edf92ccbe SHA256 ee4fc73d658e44183b68e0281dfcb24d30eb265b635cf0aa87e5fe9e15330f45
+MD5 26480cbe6d33e888c1c6e062c273b1d4 files/3.12.4/etc.patch 3500
+RMD160 650857be571e1304b42d277e50447346e392e9eb files/3.12.4/etc.patch 3500
+SHA256 ee4fc73d658e44183b68e0281dfcb24d30eb265b635cf0aa87e5fe9e15330f45 files/3.12.4/etc.patch 3500
+AUX 3.12.4/exit-status-build.patch 356 RMD160 6f50bd1b8dc3a1cfc3739beea21a2ff2caafb6b3 SHA1 64606aae1a36761fef50672ad4a781ba16c49529 SHA256 a1d03e2ef099e8bb89be6edf0f5370460cc12aa732b609528a4851b50d93357e
+MD5 455eb7bf5aec1780794aca89643f4069 files/3.12.4/exit-status-build.patch 356
+RMD160 6f50bd1b8dc3a1cfc3739beea21a2ff2caafb6b3 files/3.12.4/exit-status-build.patch 356
+SHA256 a1d03e2ef099e8bb89be6edf0f5370460cc12aa732b609528a4851b50d93357e files/3.12.4/exit-status-build.patch 356
+AUX 3.12.4/no-strip.patch 2181 RMD160 aa2d852fa223e2c5b18426a5334a1e3ee05b9cdc SHA1 b7952c4102fd810cb325c3cd6ab58592aa3cf527 SHA256 d45668c87581c1f5dd3a235578b291af157678480536d501c7f60b1cdfb0edab
+MD5 c5bc045a431ba29cf985dd90d9555d27 files/3.12.4/no-strip.patch 2181
+RMD160 aa2d852fa223e2c5b18426a5334a1e3ee05b9cdc files/3.12.4/no-strip.patch 2181
+SHA256 d45668c87581c1f5dd3a235578b291af157678480536d501c7f60b1cdfb0edab files/3.12.4/no-strip.patch 2181
 DIST apcupsd-3.10.15.tar.gz 3858266 RMD160 a8f0b69a5622057ccf8ff97c1f1f56ef1305d9c1 SHA256 04179f7369a3a24816e94605b973ba739a2b22e80e2765159f457515a6c96e5a
 DIST apcupsd-3.10.16.tar.gz 5037822 RMD160 e0db09c40c9ae103ac7fce66280050d0fa328688 SHA256 2d9f280fde4b9e64cc8bba8e79d1f0e153a35dfe4aaec02cfc00cf7bc0bec31e
-DIST apcupsd-3.10.17.tar.gz 5662277 RMD160 6d1766a8f957d0a08811371d0473e8bf6bd854ef SHA256 8eb6d0dd5fb8973356dd4e335de4e5df3fc559bff4713a87fd29798a46d5e78c
+DIST apcupsd-3.10.17.tar.gz 5662277 RMD160 6d1766a8f957d0a08811371d0473e8bf6bd854ef SHA1 b3c236cb12986b27b55b213eabe7c0b501697d33 SHA256 8eb6d0dd5fb8973356dd4e335de4e5df3fc559bff4713a87fd29798a46d5e78c
 DIST apcupsd-3.10.18.tar.gz 5698299 RMD160 ebaf99e097d836ff8858cf653a825928058f54dd SHA1 a4e0f968be13c833ec25869f686e44c5a34e7964 SHA256 ae42d64e5cb29c8ce291f634139b5c81e888c95686f5c70ac9c250a1d8c02a38
 DIST apcupsd-3.12.2.tar.gz 4219660 RMD160 0076affa09d1dcd5efda36d30a22161c797b9bde SHA1 fc15bf94be00dfaf255a2f4a0bced717525670e9 SHA256 755cd2bffc4090c58979a87ed3f9135afd1846153feb8a39fad95f745adbd347
 DIST apcupsd-3.12.3.tar.gz 4222539 RMD160 0f801e9405f79af6d70e56868d222f80f8bb1583 SHA1 cd5b342ad7766af72999bb6f97447e9144ee3544 SHA256 871dc9957998f9f23a92d3e2bfd38a28aad0a7972a9bd6652c1d045f3db45132
@@ -124,14 +132,14 @@ EBUILD apcupsd-3.12.3.ebuild 3031 RMD160 c18145b871006ee73b4681ea4ad63a11e1f2313
 MD5 762856dea9f3da3eb8c78da2c6cd2725 apcupsd-3.12.3.ebuild 3031
 RMD160 c18145b871006ee73b4681ea4ad63a11e1f2313c apcupsd-3.12.3.ebuild 3031
 SHA256 df9c5dbe920a0a4be9e4f1385990096d970941af4424ac3c6b235eccbf3a65fc apcupsd-3.12.3.ebuild 3031
-EBUILD apcupsd-3.12.4.ebuild 3038 RMD160 104983f95a96683843a4ea58f82aa790c3fb3ebc SHA1 09fa11af7a9b251c1a1eaae021f996c9ef8ee17a SHA256 06d077bfc80c6521d9e52e5172ea83cc251363c645dca1d973f53872def64a59
-MD5 04d08a47e6e33fa8fc2a56ddef968cd6 apcupsd-3.12.4.ebuild 3038
-RMD160 104983f95a96683843a4ea58f82aa790c3fb3ebc apcupsd-3.12.4.ebuild 3038
-SHA256 06d077bfc80c6521d9e52e5172ea83cc251363c645dca1d973f53872def64a59 apcupsd-3.12.4.ebuild 3038
-MISC ChangeLog 14345 RMD160 c99bf1d4c6b63655b44e7ba78b02265cb52a7d42 SHA1 9ac774aa43748db523961cfa922c7b2009aba03f SHA256 35536c3e60cf41444beaf97ca42e8222ed10be081ab260692a79d0b1401f4ba4
-MD5 8b1c23dd122b45f4ffc68bd7bf753fbe ChangeLog 14345
-RMD160 c99bf1d4c6b63655b44e7ba78b02265cb52a7d42 ChangeLog 14345
-SHA256 35536c3e60cf41444beaf97ca42e8222ed10be081ab260692a79d0b1401f4ba4 ChangeLog 14345
+EBUILD apcupsd-3.12.4.ebuild 2929 RMD160 29416b5652ebd09fde41532c793a528f82685cb3 SHA1 3520e480cf67b36543655d13028a57f2407986ac SHA256 4f4da31db365c1e7d4cb97f4e6751f6a40c7255d818feb8e2dc283e0011625c6
+MD5 d94624455d62709b5b2c10a29711d418 apcupsd-3.12.4.ebuild 2929
+RMD160 29416b5652ebd09fde41532c793a528f82685cb3 apcupsd-3.12.4.ebuild 2929
+SHA256 4f4da31db365c1e7d4cb97f4e6751f6a40c7255d818feb8e2dc283e0011625c6 apcupsd-3.12.4.ebuild 2929
+MISC ChangeLog 14641 RMD160 a73914dc203ecedb87d293114e7a1a8caf704368 SHA1 ed8cdf5174efaf7bac069e56f8a99152a7a5a883 SHA256 e7801121a62140c8f306e680594daf90d3d10ad8dfa22405f7028e38e604ddc2
+MD5 c95662e2b42b32bc8bd20fce2830dbff ChangeLog 14641
+RMD160 a73914dc203ecedb87d293114e7a1a8caf704368 ChangeLog 14641
+SHA256 e7801121a62140c8f306e680594daf90d3d10ad8dfa22405f7028e38e604ddc2 ChangeLog 14641
 MISC metadata.xml 226 RMD160 e0ca1098a8ced8b212c797e8d3343fed766ba485 SHA1 360c056f345a7b50026e93de38b0167f4193904f SHA256 ab1d24920d852e21a852c10c1ec15d5d0cfe91752a67e9eca902177081d6e1c2
 MD5 27ae5add10fc42e77804f1ecd768df87 metadata.xml 226
 RMD160 e0ca1098a8ced8b212c797e8d3343fed766ba485 metadata.xml 226
@@ -166,7 +174,7 @@ SHA256 d5ada22441893d49204b66ed425a7b2b9081e985824ebb9a55b67b3001e98a42 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFO8uKKtJO8LeSoosRAsCVAJ4wYGxW2H05QVgZpfftl9Xz/2HviQCglQlV
-Yf97jcjgIVCp/SGHf8WcIiE=
-=Feq/
+iD8DBQFFiGWIK9sYciBdMQMRArtLAJ4gFVYWOgPkpx/ABsN6sWs5R69cVQCeMXMl
+28OTmhvkybRbcrXUDwAZUG8=
+=pqWM
 -----END PGP SIGNATURE-----