Fix parallel make failure (bug #549570, thanks to Kobboi).

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

4 files changed, 67 insertions, 9 deletions

diff --git a/gnome-extra/gnome-documents/ChangeLog b/gnome-extra/gnome-documents/ChangeLog
index dc3690ff49ed..4586ee07eb93 100644
--- a/gnome-extra/gnome-documents/ChangeLog
+++ b/gnome-extra/gnome-documents/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gnome-documents
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-documents/ChangeLog,v 1.43 2015/06/09 16:16:11 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-documents/ChangeLog,v 1.44 2015/06/13 18:30:42 tetromino Exp $
+
+  13 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-documents-3.16.2.ebuild,
+  +files/gnome-documents-3.16.2-parallel-make.patch:
+  Fix parallel make failure (bug #549570, thanks to Kobboi).
 
 *gnome-documents-3.16.2 (09 Jun 2015)
 
diff --git a/gnome-extra/gnome-documents/Manifest b/gnome-extra/gnome-documents/Manifest
index 50261343951a..bcf9f095b872 100644
--- a/gnome-extra/gnome-documents/Manifest
+++ b/gnome-extra/gnome-documents/Manifest
@@ -1,18 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gnome-documents-3.16.2-parallel-make.patch 736 SHA256 f7e0e7d38cadfdf2d17aa968eeb67b1bc7262f5adfc88bfb38786877a0af72b9 SHA512 992227142d01fd94ad5d2dbf08a4b335d13da3efb83c4d97b83794bfec0b93da29f40c5e15a33a0b9461bcb2b2068311e86fcabe3705235ec827cc9ca75d9e86 WHIRLPOOL 04d08d59d74d610d571d370ab62778686b137d5bff4935d23375f576dcbcac7af6f718daa70258155648a062999075b6abd06a040485f394ab461d94397999b3
 DIST gnome-documents-3.14.2.tar.xz 716320 SHA256 08115ae7cb1b427ed78c7d94c7a41d4396249f1d267bb4b9119655f61b898038 SHA512 15e469983745cee49d1245d9ac979eb7b5dd0a2b70ee3f869735436d7592393c05e210a8e1dc75605b2765e9bce66f9dad4012f45641346d0b33cd3df7df1f2d WHIRLPOOL 46bf7525d2273897874caf8fd04222967b9617e50f624b584b0f6cdd364709343231e139a65ba34f65eef34bc41e89b7ab32e5a50c47a7e1f0783aa1920ff02c
 DIST gnome-documents-3.14.3.tar.xz 718680 SHA256 478faba571fb8924043a74c04efa76f9beeed93618383f8771a78d53687ed5cf SHA512 41afb559a2aff1d5f8cc6b123dcfa0bacd16cee3ab7d133ca67b0109cab350ac20f69f84ec57c380ec42a0f9533a26b73240b04b308f39ab5c7dc8e18be14ac0 WHIRLPOOL ef6471e461052b76644f0324068460d3e738f5e1c9fc0f3aaa59feab0e9689e057c8f5ba5df758340539a47f40c5566334834ea39e137b2c9453f6669ac25202
 DIST gnome-documents-3.16.2.tar.xz 2276600 SHA256 ba7230f0f7bd83932e03b1c06c6b67a46f9bc2dd2a93d0193c402d60323ff4a3 SHA512 bb2b9a92a3ed62408227c6213fc68d1c7a1d953d30758dbc88814ce37c50dd870306f901671d2f43417f533527011d93bec6615cbae8de662d806c154c7b837a WHIRLPOOL 319beaa931ca2cbdd257c710f4d37e943fe838b9451200e43155a88fc58237f47d6c5da81338e3e9c6c8b1bfd0ade3dca42beb999dbf15a76a17af22daa2c743
 EBUILD gnome-documents-3.14.2.ebuild 1386 SHA256 a618b22d33eee19506d922b1a47a02f3bc3617d819a045c8d06af6d46e47e763 SHA512 3620b7e9b0698cb2073cb2df57a7fa3ef99cede84b551896159d858de28c2d2c147f644093efe7e7a34d4881c2d6e819c63c5a7091c6dc96a6952c77def129ec WHIRLPOOL 30a40ca004937ec3218f5232e822d04d7288cb96143c7c02719002af42274cb5b1f980ca5bec02a051c938374bebfcff76e0d26c05a591e43cd57480cb5c2052
 EBUILD gnome-documents-3.14.3.ebuild 1388 SHA256 6a5824227d8127b92de2cd2b407ffd954494e8db5e95cb1e5ff5b81ac7be180a SHA512 2c418bdf18dc6d523df5f51b2e757f876dc4fc31cc3fda8974d723fcc24688dd2b046e79029fb4d1de53746581ec91cb5f5586e97df504c743e9f7111483a3c4 WHIRLPOOL 996acf1f88798ddc47599233107e89db1247a6a38498148f2d2443251c9aa4d86441fe8a682065ebb0bccc1d25e47107854d3fc915eda15ac40645c021c96be0
-EBUILD gnome-documents-3.16.2.ebuild 1383 SHA256 44ab53a1ef531db725ed17913ad48f1d48f848638af68eeef13ad17adc9890dc SHA512 1a0d44647a9bb3aee008f5aa678b242251d2743a91aaa920e82828fe18194086a255dc7add86e043ed50a4122429d4a36ffeaf815ec1c5092c83f4f87690b765 WHIRLPOOL 5f92138d30178f8236493710b5c98d5fc5b4a103eb18061039139e8fc7d399240ddd68f5abb062b19470afd17564b13fdd451ad0e5d74ba586c2e81f55d41dba
-MISC ChangeLog 6389 SHA256 07c54b5f4c06c96401edbee013723153bd9137c30730574123a62a5e4c169470 SHA512 2e94fd4039004567bfb80e6a7de1991b6c4b325e210fe15a5da0451d45851b44f9f5584b16e2eae1b2b4a455b361d82dd7767798d8e5379ac317a3a8997b3823 WHIRLPOOL b21622d697af992f489a2f03dcebeabac7139d3537f524a7afed3d2a2c5f4ee781e787c9012e6422ecfd25fe71e4ba0fcec4c34c8514169ef467d3aa048cfdbc
+EBUILD gnome-documents-3.16.2.ebuild 1622 SHA256 81e501a75e0f346b8afc679de6bf7c1e7bc6ea6dc74c793419dc6c79c23f0ca5 SHA512 211f7a0dd46ef6e7b26f5ccd57d9d7fd204f1418a6bc07cc19a5dcfab1d54f6aef5bc34407908946ae430c271f68cb4a69526bde287ea09b941c855116073307 WHIRLPOOL ce5cbdc5adde6994e8456205787f1db8e0619db2ae3c21d3467d29abb153ad3f7b310ad79c6d77b138665741a72576816f33440eab08c6111cedb69c6f5a623e
+MISC ChangeLog 6602 SHA256 5fd1d71875d8a843046dc22a505c94bbd5c9dc0cfd041eee39bc26e316ecc8a5 SHA512 3e287b748d694a9ecf4fec3781e592d88d4727ff8f732919fcd6dfc249b6532dcec5cc8c18b383f09cb723cd83c04a56f987cf02ff4f9830cee2a24e756dfb34 WHIRLPOOL 53ec96af8d6610511382a4dd6681ce62995e476d45f44b7a87a2f3604f5c6b298441022f28e2ff48e2de551dd90d3a52b8dce33d1df82fe4ad37da8ceba99c65
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlV3EUwACgkQ1fmVwcYIWAaKdgCfZjEBKf2YApm7vbywtOPASfK+
-0lkAnRrQwpTJDLhX3HjQ8pzRy+8OGs27
-=s1vo
+iQJ8BAEBCABmBQJVfHbTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNF9UP/A7TS5Gxi0p2zLKRgNZkbz7r
+uvNSkOIVQu/Teu3A8TTzs4S8c6NOfmpw4KA/6NtxU47b7AySk0KC2ous0nrZ+Ioh
+BHoMesnJ+txIOuB6wrLPIwMjNG/O+nOafp5qNqgp7bLBup/sl9oZpFEmmrADoHnX
+PP23kpv0xqGZw/GzyMdI5lYJGC+nezEszM4uagBZdyKXKKxBr6eQnHTz19jlRCTG
+D5FcMKAxVS5pUVT5HM9m2R2/J2laKtjtZ8kO9JpGwlHr5LP3fiwfmTA8647Mhuh7
+StqhW22n4EJNFVZF9dZeb8Ebx+lSIdri6RrcKURxWUQNpVrYl3RqwT/uIP2YsADn
+6TLju80QgATFGe91qZmx3m0o70QLBrpb6D9+alb1jM5t6+jKctQB4owffFvJxX1z
+ek4U27E2Lvq3/KbSevv+bnw62Oo8HdHw7O1Oj/fG6XLlhB/0c8v1aFVOa75APM6v
+Klt712VbtT6BIZu+HYZgzLrkEW6zuI4V6snqlLbnz5HHPQ9vvirDJnLDjYd2wgpH
+09Posf2QDHr1bcqRAxvkat22ao0r4m1TUrAXMSqHZtU5XmI8taE/3V0gdIR40lCS
+JjinMClC0MiO9I/Qp24FqpMmxulSgvhC8hWnHx9UZo0Pjrf81d6tZWa+o7BARBG7
+MQiAcpy+R9gjjfAjaFh5
+=W+Pt
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-documents/files/gnome-documents-3.16.2-parallel-make.patch b/gnome-extra/gnome-documents/files/gnome-documents-3.16.2-parallel-make.patch
new file mode 100644
index 000000000000..d3208d57101e
--- /dev/null
+++ b/gnome-extra/gnome-documents/files/gnome-documents-3.16.2-parallel-make.patch
@@ -0,0 +1,30 @@
+From d692f7ce6e18fa65e04be397627ae4eceab63f2d Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 13 Jun 2015 14:16:03 -0400
+Subject: [PATCH] build: path.js should not be in both nodist_js_DATA and
+ dist_js_DATA
+
+Causes a parallel install failure
+
+https://bugzilla.gnome.org/show_bug.cgi?id=750334
+---
+ src/Makefile-js.am | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/Makefile-js.am b/src/Makefile-js.am
+index 7e1ef60..97bbd93 100644
+--- a/src/Makefile-js.am
++++ b/src/Makefile-js.am
+@@ -28,8 +28,7 @@ dist_js_DATA = \
+     trackerUtils.js \
+     utils.js \
+     view.js \
+-    windowMode.js \
+-    path.js
++    windowMode.js
+ 
+ BUILT_SOURCES += \
+     path.js \
+-- 
+2.4.3
+
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.16.2.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.16.2.ebuild
index a4bd154e4ae4..d05173b64642 100644
--- a/gnome-extra/gnome-documents/gnome-documents-3.16.2.ebuild
+++ b/gnome-extra/gnome-documents/gnome-documents-3.16.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-documents/gnome-documents-3.16.2.ebuild,v 1.1 2015/06/09 16:16:11 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-documents/gnome-documents-3.16.2.ebuild,v 1.2 2015/06/13 18:30:42 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="A document manager application for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
@@ -44,7 +44,17 @@ DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	>=dev-util/intltool-0.50.1
 	virtual/pkgconfig
+
+	app-text/yelp-tools
 "
+# eautoreconf requires yelp-tools
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=750334
+	epatch "${FILESDIR}"/${PN}-3.16.2-parallel-make.patch
+	eautoreconf
+	gnome2_src_prepare
+}
 
 src_configure() {
 	gnome2_src_configure ITSTOOL="$(type -P true)"