Fix parallel build failure in pdfmark subdir.

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

6 files changed, 68 insertions, 13 deletions

diff --git a/sys-apps/groff/ChangeLog b/sys-apps/groff/ChangeLog
index d847f49adcc7..6f6b7a469128 100644
--- a/sys-apps/groff/ChangeLog
+++ b/sys-apps/groff/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/groff
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/ChangeLog,v 1.121 2011/10/23 19:42:35 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/ChangeLog,v 1.122 2011/12/21 19:33:24 vapier Exp $
+
+  21 Dec 2011; Mike Frysinger <vapier@gentoo.org> groff-1.20.1-r3.ebuild,
+  +files/groff-1.20.1-pdfmark-parallel.patch, groff-1.21.ebuild,
+  groff-1.21-r1.ebuild:
+  Fix parallel build failure in pdfmark subdir.
 
 *groff-1.21-r1 (23 Oct 2011)
 
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index 1d9033dadc6a..c2a25a137b08 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -1,9 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX groff-1.19.2-man-unicode-dashes.patch 574 RMD160 759b9822f6950eeaac78ac16cfc8ebf58a77be38 SHA1 a7859ebef38fc0e2d73c1bc500e716c77ce8dc47 SHA256 e8fa93d3536bb6053ec104b567444cec7da8f101e24923dc4003efc8b7bf5bbe
 AUX groff-1.20.1-Thtml-mem-leak.patch 1814 RMD160 e10f328091986ce4a9c3b6e3c7624a48befbecd6 SHA1 db01f9081d2dacf06476913fac3538f9dfa608fd SHA256 b0fc131d0deed47ebe6432fddf93ef8e2bca2dec8f460a39441fadd76361dc8f
 AUX groff-1.20.1-double-frees-mem-leaks.patch 2752 RMD160 4aedb3ced29c09120df170331c5fb439695c039c SHA1 627d3214018a161b29d217abb64874b04c5d5303 SHA256 f4e53e33fbb5ca53841b0984ea9281a5009243ac59b774373c1dd4a9b257dd75
+AUX groff-1.20.1-pdfmark-parallel.patch 1392 RMD160 c2e9d008ad9e03826a00b2cbc0c27d8dec265dd0 SHA1 6d8c2d5851f88f61c11aa79df102396abfa85559 SHA256 cf6f9328956d14e354632ad3ecfe740789a450b519125c6057affeadef05aa5e
 AUX groff-1.20.1-tmac-ec.patch 763 RMD160 ed2df5ee3287d109b1efa85751c6620553e4b251 SHA1 76516a1a0794f310b74875d80b6651fe19735108 SHA256 5d141c2389da50a689b1f7ac6b704c25b42041b96f6b1a28faa3080084d1fdb9
 AUX groff-1.21-gnulib.patch 3721 RMD160 d75e4924ae9a5dd14a1eb219323e5bb2392a8816 SHA1 8e77308a9e8ed2f6d7235a8ed018c4fa6dbd00be SHA256 2513d6f73728dddcbcc46209088e251d766f5f389660800428f0a952b40ba8dd
 AUX groff-1.21-makefile.patch 452 RMD160 0fca04263de44476b6d418a093511529b0ac874c SHA1 03ddc49a17dc4f5ddbdd855810e506d099d13875 SHA256 7d9828c9bf62ba6f41815a3a5fee26df85489fb47148d24ac98644a84279bc06
@@ -14,15 +15,15 @@ DIST groff-1.21-japanese.patch.bz2 53025 RMD160 5041e3b9edbd7470c7bc6d4e928e662e
 DIST groff-1.21.tar.gz 3863837 RMD160 d050f886291a53ea46875887e5641e510e1aecf6 SHA1 a513aca4a7530a6e63325addd6ba2d282c8f1608 SHA256 344e6af5480e7ab4ec51e2a2ed10acd69ba3e062d285b6d5f6d49fb5ed2f9f7a
 EBUILD groff-1.20.1-r1.ebuild 2215 RMD160 252a54bdbdd7c9e78491ab62c3204c0314ff0263 SHA1 e1cf868dea80e04ea426e66d4bffdb812a908ca3 SHA256 962cb04b7a4541daf659d5a38a1b6e6419ce3cc89d809ea3b796f42a320c0dd7
 EBUILD groff-1.20.1-r2.ebuild 2239 RMD160 3147f1e56e9a804259ff2c976ca52cb5ff2c1a9a SHA1 73d17692e6ecf00de28678b66e8b54bdd7410f47 SHA256 191b5f85bf885990a37928a62d0ff2317e4f1a6294743f57f4f7aee0b7b25050
-EBUILD groff-1.20.1-r3.ebuild 2404 RMD160 c17400b87d088817921a72da6c1a527f7959cf96 SHA1 5a901dff4a0092a6c0b42a5bc6508a5635d91ef8 SHA256 156e891fa65f7212513d86e6b13d92c09550b9d76906f8c7a92bb7741fdbd2df
-EBUILD groff-1.21-r1.ebuild 2652 RMD160 b8a23f1101ddf32f76659cf40ab7acb76ec6106e SHA1 e63d69ab83a0b7b1604429bbf6524a1831d942e5 SHA256 239106b380e23e78016710e3f94f6ce0b73cb9edce9715bc09e490f77e58436c
-EBUILD groff-1.21.ebuild 2029 RMD160 32ce25bde2218a76fcc3aa3a757d1cbc52468f7a SHA1 bbb7d89b086b4d6a7a1776a1cece15e3b069ef31 SHA256 4678098407ea5faba90e440af03d6e2ca40facb1699026c5519ca6c3feaf8627
-MISC ChangeLog 16641 RMD160 c49f9df69b42cc4343106bee5975dd7931ead10d SHA1 ed2addc660e25f287c0d1c91480b10a3690edff4 SHA256 ea4e38b30280e3a756a38d2692ca2d4846f4a867db2894e34d26a2620a4fcee5
+EBUILD groff-1.20.1-r3.ebuild 2459 RMD160 df4dbe3e46df6484958fd303498b250d2599bac8 SHA1 dcde6e0fa2837bcd3965952c19908e2b85dbc326 SHA256 9de4de19e29852c424767f99f80d52564e90009e0308ae8f25605797673264fb
+EBUILD groff-1.21-r1.ebuild 2709 RMD160 0c27259fd80b05c257195557cf9ca1854c5dd78e SHA1 9a6e72f12dd9126d5f8452712d524abd765382db SHA256 e5fcc208eabdf7291f0536811c4e2607424f2cb42833eff0c0d104787ff1dfd9
+EBUILD groff-1.21.ebuild 2086 RMD160 a20f8e254776575e72a22b359230422551853538 SHA1 b55be24f6b229dbda65d21643c64e6369f0a4345 SHA256 f5e18b2ab54606de3ea73295b388ebbf210287c900ea73f773c170f140b1a138
+MISC ChangeLog 16852 RMD160 06e5a705a1bae8ad755460ea819eb3f6a7149096 SHA1 b85325d4bf78e66302e79a776ade3ee4f5ac0c28 SHA256 654eca1063c678391e6b662044cd746bdbde3485092cffe0571e8beab001300f
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (Darwin)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6kbjEACgkQX3X2B8XHTok/OACePED0N3lGBLz3zT0g/LIkvfhr
-v/YAnRJ7GICqTLsnuq8/39Y6Na34lxib
-=2PEJ
+iF4EAREIAAYFAk7yNIsACgkQaC/OocHi7JaseAEAiafxJGJywrzAcAGtp6sXtDm3
+cgVBBI/bBKw/ycFGBaEBAJiEnuO/NRNXEcgW+fyXMT9+9BvhVPOERz8FGCBIjb/7
+=aBoz
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/groff/files/groff-1.20.1-pdfmark-parallel.patch b/sys-apps/groff/files/groff-1.20.1-pdfmark-parallel.patch
new file mode 100644
index 000000000000..05405a9b2e7e
--- /dev/null
+++ b/sys-apps/groff/files/groff-1.20.1-pdfmark-parallel.patch
@@ -0,0 +1,46 @@
+http://crosbug.com/24481
+https://savannah.gnu.org/bugs/index.php?35146
+
+From 324a699b3903bd7d9d248bc229ab8518fc47cbed Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 21 Dec 2011 14:15:50 -0500
+Subject: [PATCH] pdfmark: fix parallel build race failure
+
+Sometimes building in parallel will fail in the pdfmark directory:
+	make[2]: Entering directory '.../contrib/pdfmark'
+	rm -f pdfroff
+	rm -f pdfmark.pdf
+	sed -f ... ./pdfroff.sh >pdfroff
+	...; ./pdfroff ... pdfmark.ms >pdfmark.pdf
+	/bin/sh: ./pdfroff: Permission denied
+	chmod +x pdfroff
+	make[2]: *** [pdfmark.pdf] Error 126
+
+This is because the generated pdf files use the local generated pdfroff
+helper script, but they don't depend directly upon it, so make tries to
+create the two in parallel and randomly falls over.
+
+Have all the .pdf files explicitly depend on the pdfroff helper script.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ contrib/pdfmark/Makefile.sub |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/contrib/pdfmark/Makefile.sub b/contrib/pdfmark/Makefile.sub
+index 9eb2763..36c9e0f 100644
+--- a/contrib/pdfmark/Makefile.sub
++++ b/contrib/pdfmark/Makefile.sub
+@@ -66,6 +66,9 @@ PDFROFF=\
+ 
+ all: pdfroff $(make_pdfdoc)
+ 
++# The pdf files use the local script to generate.
++$(PDFDOCFILES): pdfroff
++
+ pdfdoc: gnu.eps $(PDFDOCFILES)
+ 
+ gnu.eps:
+-- 
+1.7.6.1
+
diff --git a/sys-apps/groff/groff-1.20.1-r3.ebuild b/sys-apps/groff/groff-1.20.1-r3.ebuild
index c8e2ba1edd17..0cbb9dfb05b9 100644
--- a/sys-apps/groff/groff-1.20.1-r3.ebuild
+++ b/sys-apps/groff/groff-1.20.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.20.1-r3.ebuild,v 1.9 2011/02/24 22:13:39 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.20.1-r3.ebuild,v 1.10 2011/12/21 19:33:24 vapier Exp $
 
 inherit autotools eutils toolchain-funcs
 
@@ -32,6 +32,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-tmac-ec.patch #263524
 	epatch "${FILESDIR}"/${P}-Thtml-mem-leak.patch #294045
 	epatch "${FILESDIR}"/${P}-double-frees-mem-leaks.patch #294045
+	epatch "${FILESDIR}"/${PN}-1.20.1-pdfmark-parallel.patch
 
 	# put the docs in the Gentoo-specific spot
 	sed -i \
diff --git a/sys-apps/groff/groff-1.21-r1.ebuild b/sys-apps/groff/groff-1.21-r1.ebuild
index a3c42f3603fe..9d88d0bb035f 100644
--- a/sys-apps/groff/groff-1.21-r1.ebuild
+++ b/sys-apps/groff/groff-1.21-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.21-r1.ebuild,v 1.1 2011/10/23 19:42:35 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.21-r1.ebuild,v 1.2 2011/12/21 19:33:24 vapier Exp $
 
 EAPI="3"
 
@@ -28,6 +28,7 @@ DEPEND=">=sys-apps/texinfo-4.7-r1
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.19.2-man-unicode-dashes.patch #16108 #17580 #121502
+	epatch "${FILESDIR}"/${PN}-1.20.1-pdfmark-parallel.patch
 
 	# Make sure we can cross-compile this puppy
 	if tc-is-cross-compiler ; then
diff --git a/sys-apps/groff/groff-1.21.ebuild b/sys-apps/groff/groff-1.21.ebuild
index aa13a363babc..e5e927e8ddfb 100644
--- a/sys-apps/groff/groff-1.21.ebuild
+++ b/sys-apps/groff/groff-1.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.21.ebuild,v 1.8 2011/05/07 18:02:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.21.ebuild,v 1.9 2011/12/21 19:33:24 vapier Exp $
 
 inherit autotools eutils toolchain-funcs
 
@@ -29,6 +29,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${PN}-1.19.2-man-unicode-dashes.patch #16108 #17580 #121502
+	epatch "${FILESDIR}"/${PN}-1.20.1-pdfmark-parallel.patch
 
 	# Make sure we can cross-compile this puppy
 	if tc-is-cross-compiler ; then