Fix parallel installation (#543812 by tman, Aaron U'Ren and many others)

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 43 insertions, 8 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 3a8d9694d776..3a5353087749 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.287 2015/03/19 11:42:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.288 2015/03/22 11:10:33 pacho Exp $
+
+  22 Mar 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/gvfs-1.22.4-fix-parallel.patch, gvfs-1.22.4.ebuild:
+  Fix parallel installation (#543812 by tman, Aaron U'Ren and many others)
 
 *gvfs-1.22.4 (19 Mar 2015)
 
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 1aa183e43212..29018d11d1dd 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gvfs-1.22.4-fix-parallel.patch 855 SHA256 08d35ee0b2370e678febbb3ebb4ddb2152dd2c77ee13e7c4b8e9551718f56b49 SHA512 ef41ee221eece8c1e8bf17d867508f7cac81dbb9feab0d75f695f584d40c9c1cd9553d7976556f2c67a26fd3a3b4e118b9c40d519cdbb0cb23a925b679b9cf57 WHIRLPOOL 9cd5a017077af235bfb693170d6b67fcde4d841f6f825a3f1af8b9d2f8be3a3a70ce2d65c3c10ced693744bf4ef35836be92b8c700d43f0bb296bff915cf250d
 DIST gvfs-1.20.3.tar.xz 1558028 SHA256 646b1906b1c85876fa07299246855f16836080466dde1826003bbbd4b9415cba SHA512 3a975b2014d7d82ec76062624343df4514d46a537cdcb3daf1cee2f77b7e0e06db123d3fb0de44987dc147c4023d2cfa9e46786378b1390d5957c16f4f14155e WHIRLPOOL 90285449626ffc284c798256f965188c3614efee6c1118bbaf1f8e178450e2bd8ddd9ec6d4f3e979ab6a789317848aae1afb3af9e3c3531af8865e99a90438f7
 DIST gvfs-1.22.3.tar.xz 1588072 SHA256 c778342e09a84d8c69b1b7ce7f943f6f2444a995bb0c0754ef1746afa8935182 SHA512 17e79047ce8f979ae15c99423ddc6d50a1d276151d4c0e1cc7e0c4958e0a9ed8bc4c0db8a38272eab50922bad6a51d915a2cd4cf41dfb0873faa49e1a3028ba7 WHIRLPOOL 2de23d3537683fcdb0af2fac42c98e05daf9cf4f5fb0d9e05dfa7b25e03852f2774ba1a1cfbebbd0602bbbbcbdbe36279dd9de6328fb3f495e2209c246b8a70a
 DIST gvfs-1.22.4.tar.xz 1598264 SHA256 57e33faad35aba72be3822099856aca847f391626cf3ec734b42e64ba31f6484 SHA512 5485a46284b62f19f6c289a5e341f4f0a48c3b8b42cdc5e8b4f9070b1b33e781ada8a4fbb718f5305cdeaa287d122718ea2826a52cc4ebae090cbbc519e758d8 WHIRLPOOL f0b6514241616e64ad45d8ce163d2ba2ca293d60a2ab65210cff4f9338f7f37e0d8beb3ae367c73ab2ed8d046dc4788535c00f973fa05df1e2dde8c294509e9c
 EBUILD gvfs-1.20.3.ebuild 3464 SHA256 d6073836bfcdac9b79f9ca18b2e5ddaf34786e78711c8972965cd029573c788f SHA512 be17f1d27299f638fbd457c921883720964332d462e68d42d0a6aac478f6442ea2d17b3b3f8eeb79b7459f3e696e988d235ea1f17e1ee83d8cf1f4a87f5a4702 WHIRLPOOL 0c892cc14fcfc70b36d5af5864b9deb6578995069c10cdba1bdbb9baf35df6631d92d508ad5c0624a54915a88babdb00290f861382fa10c5916bc9cf1e79dd1c
 EBUILD gvfs-1.22.3.ebuild 3485 SHA256 c6ae7c4bfa5fd084fbff43714214f061a360e5f57f84f913aefbe2ef72da14b4 SHA512 b1fdb0291d91640b9db75a22575e4f3e1e659c0833b7a8977deb94a9205c40fcfbdf2e8f32562f8edb4d06edf1da4e6da2841c61eddfd1ba8587c1066bd52a6c WHIRLPOOL bf75fe0ef4ebd9282eb18d5e64827a4cc7ef4a6d85a142c2a77fc510a850fb116c250ad079d28ecb63fa9d97ebf21e880ccfeb2629e50ae1806c719449f0923f
-EBUILD gvfs-1.22.4.ebuild 3489 SHA256 dbeb9d94a5de6d0b2af376ca6be109c8c03e3dd79e5fcad8474c951914311c0f SHA512 0aa5033ab3c566bcfce38b60c597d703b03ef1a13c0c4ab67a4b9c48ed8efa13b87cbfb1488db75b1b966c6b3cc9f8f54dc92852443e0af6fd01cd7018ef7937 WHIRLPOOL d240217a85d4daa9df4a92145500e220ec57ad8c7030412813c45f3a74d244d73bcd4f71b1a88b7c845ac75e27faee843a5670cc67b9664aab0f6ce576f685c4
-MISC ChangeLog 40060 SHA256 27c37a72221d69b6f442d8255198578ae56985140402b88af8ee601a77fd0f46 SHA512 33693df157ec7f18cb2ce19310ba435b93df3499b07a17040285a7203819d8a4787ba447342708e48f893e7d62f03cdbf1245f0861df26c7fbff8f9621c87dc1 WHIRLPOOL 453a7710b5802272872c37172e11866f430c11d07f831809ceb22d30ab040df228bc691a14f16d1d8b33dc255b417c5e1110b3fcdcba7e9a16d1f063cf95e07b
+EBUILD gvfs-1.22.4.ebuild 3673 SHA256 87f2bc5bc79578d3cbc2ec3dc2ce375014183613f9349333fca24188b6bcb86e SHA512 ddd55df8d9b17256e7d585af66fce84777b4879550376b59678c2b35d109f65e9c98d9b941731ccf86c70dc022565c58afef13de4dc3956b108300af8dfbdef7 WHIRLPOOL fce250ba496ed6dd8e21c938fe691cf8e0e6d54b72ce42343f3d21ffbbf06ad23353902c0620ebc01213b62e9ea95ae3a679928cfa4e91f80cb63a9a78a050e2
+MISC ChangeLog 40243 SHA256 624906cb2eec6d656ec5ca952e0a5b1a17bde8803c7eba3f297241d82897b39e SHA512 8485b5bbbc52754cc48ac5ba2db4644e0eedd261120d4b20dc371355ced17badf403854ba87ac4916e7207636d3063b40c3feef0ce140f92e06fdba5f803416c WHIRLPOOL b282de60b3e8c211aa4245df17bb5f931f03cd17def4291eb5b58205129ecd285ef746fd55ed9ef7a1bcff4620d42d50ecefb9677577e745ad6c4b45e4a1641a
 MISC metadata.xml 1371 SHA256 0d15d1c36cf3b9ba1e35e4ecb16542410edf0b1c1c83f74d76a9ddc3da40abc8 SHA512 008e52b6d717f465bb275d72fc8076c8e65362dd9e769305205693cf42d2b2bdcab66abdf15dfab89bcc97b938d7ce5248048d60d1bad1915dbd32106b411b98 WHIRLPOOL 0be1ef0c90e36b97103dd3d6938f23f4334eda971b55137db157efa02d2bc0a25e6e4b920ca9bba544ce40cd1e08772374264a7b5805c740c296d35fb77b228f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUKthsACgkQCaWpQKGI+9RufgCdHkVL64Phsjf0R5GIZTx1pEgC
-y/QAnR6/wClcNq2bgz45/hWNXDCAXWL6
-=K8cs
+iEYEAREIAAYFAlUOow8ACgkQCaWpQKGI+9RfgACePf5OTyKlf1wuLzSDGJuneiD5
+NiYAn1mewmr+m2mg4n9z/47C2wbLLTBx
+=Lmed
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gvfs/files/gvfs-1.22.4-fix-parallel.patch b/gnome-base/gvfs/files/gvfs-1.22.4-fix-parallel.patch
new file mode 100644
index 000000000000..9e2ed6612200
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.22.4-fix-parallel.patch
@@ -0,0 +1,25 @@
+From 62c4c2af399dba0566ae69353f127472fa3e3364 Mon Sep 17 00:00:00 2001
+From: Ross Lagerwall <rosslagerwall@gmail.com>
+Date: Mon, 16 Mar 2015 00:06:07 +0000
+Subject: completion: Fix parallel installation
+
+Use install-data-hook rather than install-data-local as
+install-data-hook runs after the other install rules have run.  This is
+important for a parallel install so that the destination directory
+already exists when the symlinks are created.
+
+diff --git a/programs/completion/Makefile.am b/programs/completion/Makefile.am
+index 06833e5..971e4ee 100644
+--- a/programs/completion/Makefile.am
++++ b/programs/completion/Makefile.am
+@@ -35,6 +35,6 @@ uninstall-symlinks:
+ 		rm -f $(DESTDIR)$(BASHCOMP_DIR)/$$file; \
+ 	done
+ 
+-install-data-local: install-symlinks
++install-data-hook: install-symlinks
+ 
+ uninstall-local: uninstall-symlinks
+-- 
+cgit v0.10.2
+
diff --git a/gnome-base/gvfs/gvfs-1.22.4.ebuild b/gnome-base/gvfs/gvfs-1.22.4.ebuild
index da552664794d..119b56dc3792 100644
--- a/gnome-base/gvfs/gvfs-1.22.4.ebuild
+++ b/gnome-base/gvfs/gvfs-1.22.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.22.4.ebuild,v 1.1 2015/03/19 11:42:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.22.4.ebuild,v 1.2 2015/03/22 11:10:33 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -81,9 +81,14 @@ src_prepare() {
 			-e 's/burn.mount/ /' \
 			-i daemon/Makefile.am || die
 
-		eautoreconf
+		# Uncomment when eautoreconf stops being needed always
+		#eautoreconf
 	fi
 
+	# Fix parallel installation, bug #543812 (from 'master')
+	epatch "${FILESDIR}/${PN}-1.22.4-fix-parallel.patch"
+
+	eautoreconf
 	gnome2_src_prepare
 }