Parallel install fails when no gdk-pixbuf is already installed, bug #481372

This was originally applied to 2.28, but also occurs with 2.26. Change approved by pacho2 on irc

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

3 files changed, 13 insertions, 17 deletions

diff --git a/x11-libs/gdk-pixbuf/ChangeLog b/x11-libs/gdk-pixbuf/ChangeLog
index 96746b56cd24..034afbfb406d 100644
--- a/x11-libs/gdk-pixbuf/ChangeLog
+++ b/x11-libs/gdk-pixbuf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gdk-pixbuf
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.95 2013/12/23 23:16:00 eva Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.96 2014/01/04 20:46:23 steev Exp $
+
+  04 Jan 2014; Steev Klimaszewski <steev@gentoo.org> gdk-pixbuf-2.26.5.ebuild:
+  Parallel install fails when no gdk-pixbuf is already installed, bug #481372
+
+  (Change approved by pacho2 on irc)
 
 *gdk-pixbuf-2.30.1 (23 Dec 2013)
 
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 4918cb81786e..8b29391df9a9 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,21 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gdk-pixbuf-2.28.0-string_h.patch 748 SHA256 3077d260fe15c0b9888ca31e47461d35ca6d7d33350f7b5721dc06d88a7dc2a6 SHA512 54e7248076cdb1d446b5bb5ee09474461c775a0e51372602f10b0096f5c4779f01c739c75461d2c134565dacc03a38f298486ce814df8318410c8ab77ca5a8a7 WHIRLPOOL be4193a8e83733c031629d3a67e690b740180c9ac20eaac424119a3381a558c2b233524c599536276fe97b541f2d9d824dafa1642099b246a87df5deea497083
 DIST gdk-pixbuf-2.26.4.tar.xz 1181640 SHA256 a91458645f078debf204fef8bb06b30f356fcb5d48f65395132a5dba2b3510be SHA512 a85d9fb8a206b6986abc8bc8caa079f5ddbd1c83226f80896439a06a7644d27fa1e9d80cc0a34ba82ce0877cdfaeaee8bc2548b016d25d314bcbbab44091ef76 WHIRLPOOL f452673a3d4b9e894d7e92a24ecca9c4551353d38c242ad7ddcde812ce55dd56b68d80b297957c3f3cd7a649837cd47412995b842082ae5abec81a02ec486b07
 DIST gdk-pixbuf-2.26.5.tar.xz 1181336 SHA256 77696fd163bca95a130a1883dbd78d0ae4d782de2fc85a9a38556d13681f5c84 SHA512 2988dd550aac92c2633c5443c712be8e3c06d852190251d6436ef2457c43ccce48ef795f7b187ef975b643a0bc4fc407f8b539fd627dc05a69d7ee4b210244ee WHIRLPOOL 2a05fb5501a72fcb4acb502c542509a845406b1905e7750097de2c555dc5222b903bb7f1d4e953fdf19e4d6dd1b7acae6f6bceadcd26687d3b628f8c4cc654da
 DIST gdk-pixbuf-2.28.2.tar.xz 1192936 SHA256 183113c2eb2232963e88864a6a54fd963dbfeb1a3679fb0d3456f9e0b79e4617 SHA512 2082e6f44aa8e986586da8f5797b7e9aae23c60021c5183ed6e1e2e99cef338ec1b20cf2baef19a337ac557eb585399377e92534d2f90222a68943b914d86656 WHIRLPOOL 7060b0b591d47b1eec43b01a29cde5903ee78f458a4623a66d66d6b0d83f32d08ae2c5aa9da9dfc328990168c477a879b501c34d6f24b3d93f38cd7cdb4b8a66
 DIST gdk-pixbuf-2.30.1.tar.xz 1294392 SHA256 a3263b1e15668c009313bf04ab67420bec9f2b167c402a71a486307cadee8d30 SHA512 70b1ce4bb67dc4dad73c610fd00e2f6050c411b702f58478045608114e5a1613f6373862ee0a6a47f9259f722ba64dd33a2d5fc7660f0af59bf53f261b5dac08 WHIRLPOOL 0e0ce99334ee12ea634b8f3557281e603a04534d5df78d35549d709d11f32b927d6cc69d253e706ad5a0e130270d186729fda0a682790329fe709d36ab50dc07
 EBUILD gdk-pixbuf-2.26.4.ebuild 2610 SHA256 ee12fe249e0578741f439dab431f07a506a55fe3a2b2ed8b2d8d4ef111a29792 SHA512 b9828c7c90e4ce82551c486c214270d62d3e57e1224ac63f3c9996a5dfbacae77868ad5df44847afa43cfc3e98942df3f74849dfb4ada08f0202312abfb8fbbe WHIRLPOOL 02c80fd00dfe18850264d1829962b0f7cc979937c00029d5bae50d7ab062a5300f11261696c3e30e98d0c621bc0e804c6ca91e001d64b4efe60f3ffc0e9f82cc
-EBUILD gdk-pixbuf-2.26.5.ebuild 2533 SHA256 1fe4c04cc9c92337076c6c4f84354afb32e486cad2f118b87439244b7c65215a SHA512 5ec82e7ab594119be6b51dfee2d8063313fa6dd11d379d34ede92c3ea1fb547d2f146fb5746938417570cffd99e5e51ef59f94af463689f6be48212230e8fb9e WHIRLPOOL 2f28abef036b0c42f0893ca848764a88dc7dff9009f192acd80756cc752c68876528b51d02e672a802ce4d837f419e7d66168770941ccaad17227972b0af0071
+EBUILD gdk-pixbuf-2.26.5.ebuild 2626 SHA256 405d00abacb8df5b8d0ef923c14d4e2a41a57525d2dbff21d3dd3af7fb1d6502 SHA512 b746538050f15fb3992c9eea30d421e10b29267034f83a4c65e9c29246afeb08b8d749de73e27248ccc89c5b95640445a4dc0c5dc51ee5452455b7a84e8e053a WHIRLPOOL 62131e77bc28013ab0f9a480fa6da1cc10d670275e59fd0b48c9cab7deb9d94a32ad3bc94028278e927609c5669b5b2a51451539bafe22c5fd0c5c186f87fcff
 EBUILD gdk-pixbuf-2.28.2.ebuild 2861 SHA256 4ba700059cf8c48e2f4c23690d48ddfcafcea0d2517a2697ec035269438ad378 SHA512 86ac174fe18e9c8be0041f674d4275bc219676feea84ce44e87100223f836204fb49a49fb8b6992a315100d4e5df7014334341fa49fc1a1f53aed2b4b338c195 WHIRLPOOL feb16403a6ade060117157f45b726d58945ded87aae7da5af092c5b85c37cd41cbc00a92f4cb44e1366fff5a12a4158ebe07df655b0d40c477549596237033a7
 EBUILD gdk-pixbuf-2.30.1.ebuild 3112 SHA256 f624f4f80aef03e3f9fd315f05745cb6a1ab69bd702721bfeb529b883fc7ec4d SHA512 12055b376801cf61de50344595d753cd8e958140c0476c18ba08fd6ee4054aa40f3168d8e9f7540fccf7cab0e8a546daa6fdb69efad98bca688e7f3ca70af1c7 WHIRLPOOL bd30a75eb66960be29772762386a13ce1cf16953d7302ecad77252118bf7408d061a6a4b74d6434f736f7f7618b1da6ca3436989dfe5e793e0cbf7ec77cac827
-MISC ChangeLog 14422 SHA256 00b08122d08d8a2bb5bc65783ae494fec8c99bcb21fe7c1b6a531d2abb451b4a SHA512 44b97c353e6e69a3e5b4640ffcb419063cad5ef8dc0e3cf23ed06aa4672045ec043d9744cc1f76352f02140f13228c794f82d94f034430877876165c56934d98 WHIRLPOOL d401fd7949db0f7823cf2021d09ed087e40cd07112e2b70bc63fc082851481f741f37b45f287184daeec994fa9f7907712f5fa4f2b7c57a3c734cfe77447f341
+MISC ChangeLog 14620 SHA256 0f3d2aa643f360797efe6f4eac0a88dea906fe301d06fa52a3815b0b9062e23c SHA512 c376198fbcbcd8b8762dcc6876e4325c26d259f81b638c2905cbd3bcfc03a4c37c2f7e76fd93a4b222c2f107c6b235a36ebae978a825782cad7e978f49eae7b5 WHIRLPOOL 6191d4fc3bbf07634530f89b9b810b0ff0651f1758c5269fec099d73c2dff55ef43ac3c873142ec86d638bd6e1f5a934e3fb2862eed1b6b5c184aaba76d8f2ae
 MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlK4xDEACgkQ1fmVwcYIWAbcLgCdEdDI2q6i9b4teu0y5fIgHlKe
-F8oAoLVUZ1/1zT7gW9BR6wrNaA18F1AZ
-=fe2A
------END PGP SIGNATURE-----
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild
index 19c3aabab569..8552c91a0ef8 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild,v 1.10 2013/11/14 05:46:07 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild,v 1.11 2014/01/04 20:46:23 steev Exp $
 
 EAPI="5"
 
@@ -56,7 +56,8 @@ src_configure() {
 }
 
 src_install() {
-	default
+	# Parallel install fails when no gdk-pixbuf is already installd, bug 	#481372
+	MAKEOPTS+=" -j1" default
 	dodoc AUTHORS NEWS* README*
 
 	# New library, remove .la files