Force non-parallel install to avoid triggering automake bugs, bug #491398.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 33 insertions, 19 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index b54045534f7f..e2ad4432452b 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.197 2013/11/13 04:16:45 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.198 2013/11/16 13:40:35 mgorny Exp $
+
+  16 Nov 2013; Michał Górny <mgorny@gentoo.org> systemd-208-r2.ebuild,
+  systemd-9999.ebuild:
+  Force non-parallel install to avoid triggering automake bugs, bug #491398.
 
   13 Nov 2013; Matt Turner <mattst88@gentoo.org> systemd-208-r2.ebuild:
   Added ~alpha, bug 478076.
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index fb19dfbcc39d..c9fa57f4f8f6 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -22,24 +22,26 @@ EBUILD systemd-204-r2.ebuild 10312 SHA256 f1c472ddf6697bca4004221eded9b803fd35ca
 EBUILD systemd-204-r3.ebuild 11783 SHA256 0e6dd86ac27a0e822fc5107565980517c0e5b093955ba1589742536a1ecefdcf SHA512 aee68ea6dccc9f22f2db718ee1dd423b1b6e2ca5ed61ee1391c46841d02aebd0a22282edfa0ba0feb80dc2a9a5fab868b2d4658df12aa950468aa9e41caf7dfb WHIRLPOOL 54c4da945cf961ee12784c7669eb6a1b0d326898a45bab7317449d20134efd6b4508827a57404c17508fabbed052aac25e6ba9e4067b1b3bf922c8a1bfe6c209
 EBUILD systemd-207-r2.ebuild 10609 SHA256 ad703ece01ce7fd1d4833bedcaa2dfa95e4a525a1a16645011773d2983b0859f SHA512 35cca3a8dfd82958f0d1ea9edb7085d432b7033b330a65e221cd3fa0d3fe3c14bb3917bab70eba6e924aa641295dd6e5263ecc8a823f0a1fe6018f4b0a00286c WHIRLPOOL 989cdf9e69bdbc51b140f6cb8e65db6584ff6d235777dd8d24c85f34b1ef57eaecc47f11db1d5dd32844ee01a08ce0df7b8675763d9cafcc20138b9ef85c7060
 EBUILD systemd-208-r1.ebuild 10244 SHA256 d74518178b4e7c5a9b731e94391c4d62da708985e9573775f6a5425cc729a2e8 SHA512 e3647a98e400378d79104cf2594ff5acb345e89f0b262c5f2367d9bf028ebaf739bff7a50fd52d8b3f66c078cd13293dbc80d53434a900309851125c45142d2b WHIRLPOOL f2a24e52bd1701ebde3d8dab52674f73c19077706c442af04328d871ed493ba98e46ae4ea6d87565d73b6d58831566bd031f34315f5c3b9841f15071c9794bf3
-EBUILD systemd-208-r2.ebuild 10444 SHA256 ad57e08231f3c3e2b3c71889b2a9e10228b63705c0b2cd0aced3032f336da656 SHA512 0d716ecb0bd73c5b76ab2d54fa42610f01654493b2a2b41a1a159e9129a762278664126e3bff93321888fd400cff89ce36ac631a8079bbaad07df15430d39496 WHIRLPOOL f0439c4c60b6117d0d8da0150fad62ad5b9c7962998a3aa66223597312d2cceec2d6c4812ec50bf989d077dcbadefd78640fed0db63689bfe2b2c0353dc986eb
-EBUILD systemd-9999.ebuild 10576 SHA256 ecbae59c146acc05cb32fe2a98be2a5922d782cefae250531bb8dc997528900a SHA512 7d5c2c32d4aff39c26ef6908572015dfac72759c7f87b60b90dfdbc6c3a4e676872daf931cbcb00d974b1801c709fbd9124dceac873683869a82d7b10d877264 WHIRLPOOL c3d99726d5652dabf21e9c9782aa414847233f26c140d1554eb90c257834dab7d70970f24528414da9ea6da0bcaac0f23d43b4543b93d8f202ebcc61edeba1d8
-MISC ChangeLog 38072 SHA256 59b04c915794982a13fe04a6118385f4d6f2cd69b08dd66a4c7de3c8122d8d67 SHA512 9b3aab78d3f94a5fde5b7092cab4583d093e79957a88737207829a9d5af2ff7dd60a63fe69bc56b8676728ad842c590c4dcf56e88a991c89b2e671f394fc889c WHIRLPOOL f6c2d2a0f1f8e26741571f537b1d1c8a9c18d051c58566ee314c474f79d87c15579468199feeec3e75d3622908f21b56321f59590ee0c79bdf5e0dfac690b4a6
+EBUILD systemd-208-r2.ebuild 10551 SHA256 f8666533a4ef15b60f3dba43bbe3e133cd4a10037774f8c0d62589aab02b22f7 SHA512 7899901ff1075f52330f2f633e450100756847fd1678f79741e1d19ebe1b112a30847b2072e9dab1bf2cc29866c65c255fec5997c55cd2d7a361c53cd092f58a WHIRLPOOL c65f957f6411efbdcc5dbcce7c16d6c3072cd70bd94fe70fb4f592840bddb4afcdc0962e58c63a34ef8a0a585dcad94795882e9479ca10a9053cc8217c88c7f7
+EBUILD systemd-9999.ebuild 10685 SHA256 d685d7e20234d217110008b37055f25f29e4bf454b13cf1b103d044b966089d2 SHA512 c25fcbf25be7cac8d8efe2d967991ea6d1062f645633548c4935d968671807d63fff85c0ed9efa423fd04dec18798cdce40c8407f0217b924859161ec42b3dc2 WHIRLPOOL 2b57d1dd5db323a90f0636b5c810a19a24bd1d767070c9b80fb8cec659be9c931bcce42a42e6b82360b66a85ffe93d26f387d9eb61f091448c62f3aeabdc349f
+MISC ChangeLog 38244 SHA256 8969e498ad063d8699d67f3b8e74fc5d977b8a5d5d464930440bc8dc7490805a SHA512 b8ac851f48e46c237da794d6ee72d2af719e05973c75f84b9ca033a2c6e8b914285658d0d227e5ce6bc23be94299aa6bf7c444f62baa0add684f4def728e6d8f WHIRLPOOL 0e0ad123fccaeccbad29deb661ba28b88da4c58e1dd9b467d89b050a1090df7045eeac457cd4533a989ced19f775f10480a6260451ff18c3e19e98699720bfeb
 MISC metadata.xml 1108 SHA256 7555f673c5676c2efb2696cf49117e1198134e8c2d575052d817c50bbc4f5f45 SHA512 10b8a0dff66f163dc747e294ead1455fa0b84414eab9aa1950da08f92245eb725d77f04346276a4e727bf0d5b6adc5f6c744b770b1a47dc916ddef7d641affd9 WHIRLPOOL ae3413df80c029c8f84e092568d05e02e3c81695c741319be98ceadddbd680c589e68ec6250a653849eca6d0fe3aace7c2004f54cc2f7a9201b60af524edff28
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSgv0yAAoJEA/daC2XTKcqm78P/0TAENMMimfF4QbDr3Mv1Nwa
-ecScBrH1M9262A5Dx1Gt+2baHpFdi7nbneE9gexqFveXcEilCEFyGlzM+d8LUeiW
-DjRx0YA5vDrLMU1uSnehmD45FI63lK9kXmhQazS++4vVaHQ+cAnNZvG3I1GFe2Z7
-F0Dyj/kGZH17F+Mxu3Ku3oQZTJXaYl4CyJm/CeQ5dfhbz0awYVRSwEouIdv5QOwN
-2ch1Bb2n9B1iaS7GKHdikMyFybanwBBVVD/vsEBf5G9oLHyxDUApbrYKlFfO0Kgx
-QpzaB/fxK6+qLB7wdqi4Au5dYqxJ2awNKGkJzXUDqNQWHz7NODxNFr2NLQ0966c8
-XK8PI5xCMOqPL8XkgvrfOp1K2IgF8SouxWZsXWXwG66j1UdN21bNPHomRe6SGGnc
-ZVq/6Fm3t2FX0EWmpyXQ12FGYDDxX/hdWVf6xcH8XzT92MWpvxR+RLCbTWp2dtOf
-Ki/8SThHIY+8jLSaUS7uC4pv0kwnL2fKmfn4pat4FPP0L8Bx4T6WNuQgpQhB2ZjO
-uooP2vu0kgfkUVxZltoyzYtXgN3CDiaA2W83rODGnWEZrlgqDIfbRRzdHS86vtZV
-7K9dgnMYXEn3f5hIFNbo4F1O0ovLBPBhGKymkxw2WBNJ2J7GVE+XaUbR/2HuHK/p
-nfiPeDJOyLc7BvpjQ7f/
-=+l8L
+iQJ8BAEBCABmBQJSh3XXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOMRkP/18gPkpcmyRaL7qW2ihjNDyp
+ryzL+an6fzKHrguOYHQlWZNZ8tncVEZp3iiR40K9Zdyn5V/dZOiZV/ZL3BEVtpz6
+NXxx6Jaczf4/iLpCxpruxXYOrGVcvRS9JgacpWV2j+Tjtf15R8IfM82RM24B6GiP
+V8YP0hl/yQJ1/V1UqHzT7C4lLydGMBGsK65QhBVeIFVK6BJEuXpOfBnCQ0E5cYFn
+R4IefcF29gvgtQb0XEVw9tfrhPzd7MLchozLEq95Bv9y8l6gYPOasnVDQuPvNdEn
+Y71kvxOD2q4Rtn20b20jIGqTuGGAuOy1ARdbI+Dvsjb/Hx6S/mxBtJ+4c/bu8zBb
+rA6oiJt+/wEJsmXNB1m1FJbeixgY2xj275zY3CVF6HH/DiajrvRRAN+DhQ21WXIt
+Zjc7+qdvqw/6V8Tyr23+kFRiN1zHhcJwnOynoYzcocFsKEr0W1GYgWCXPSKo6EUc
+e10Aco9TE6KFhXnWe8wEROzQATlgcv37Yoj62585MAyGXtKzuzRFzP2PZU78y0md
+cdXUuVH9bNwJnAzRn04eo6+wfN7ukddP2dOgwCvdpEkPlUdqJgoUjGR4GTucNgFp
+WEmBlA1iUtHRZWVrrwPxXln7lDH+HZOwZjNMtLoIX9t+mMzEmfV99wmgQhNjnVEN
+b7ugllWbEnZo3WJM3aU+
+=EIgi
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-208-r2.ebuild b/sys-apps/systemd/systemd-208-r2.ebuild
index 36d967cb2af9..16455481ae9c 100644
--- a/sys-apps/systemd/systemd-208-r2.ebuild
+++ b/sys-apps/systemd/systemd-208-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-208-r2.ebuild,v 1.5 2013/11/13 04:16:45 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-208-r2.ebuild,v 1.6 2013/11/16 13:40:35 mgorny Exp $
 
 EAPI=5
 
@@ -232,6 +232,10 @@ multilib_src_test() {
 
 multilib_src_install() {
 	local mymakeopts=(
+		# automake fails with parallel libtool relinking
+		# https://bugs.gentoo.org/show_bug.cgi?id=491398
+		-j1
+
 		udevlibexecdir="${MY_UDEVDIR}"
 		dist_udevhwdb_DATA=
 		DESTDIR="${D}"
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index a4612ac40533..77165dc5ea78 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.71 2013/11/04 12:32:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.72 2013/11/16 13:40:35 mgorny Exp $
 
 EAPI=5
 
@@ -246,6 +246,10 @@ multilib_src_test() {
 
 multilib_src_install() {
 	local mymakeopts=(
+		# automake fails with parallel libtool relinking
+		# https://bugs.gentoo.org/show_bug.cgi?id=491398
+		-j1
+
 		udevlibexecdir="${MY_UDEVDIR}"
 		dist_udevhwdb_DATA=
 		DESTDIR="${D}"