Add fix from upstream for parallel build issues #214127 by Michael Haubenwallner.

Package-Manager: portage-2.2_pre5

4 files changed, 35 insertions, 7 deletions

diff --git a/sys-apps/texinfo/ChangeLog b/sys-apps/texinfo/ChangeLog
index a64ca6f94272..139c211f7cb6 100644
--- a/sys-apps/texinfo/ChangeLog
+++ b/sys-apps/texinfo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/texinfo
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.97 2008/04/19 06:53:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.98 2008/04/19 06:57:14 vapier Exp $
+
+  19 Apr 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/texinfo-4.11-parallel-build.patch, texinfo-4.11-r1.ebuild:
+  Add fix from upstream for parallel build issues #214127 by Michael
+  Haubenwallner.
 
   19 Apr 2008; Mike Frysinger <vapier@gentoo.org> texinfo-4.11-r1.ebuild:
   Mark amd64 stable #214428.
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index fba47d3766a1..a9bbf3009e0d 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX makeinfo.patch 790 RMD160 7e55e2d176ce5b39a949df4927eb16208e3d6240 SHA1 2098b57f37d3277b3ee1abfdf95a3f400479d28f SHA256 638d84a5fe68c98801e2be0b70dd1b71241399da87139bc5826ead6c431f7ce2
 AUX mkinfodir 7318 RMD160 57fb7f4524acf84be5e805b9df6f4c435aa2e5b9 SHA1 31b41b7935f8c813536abb6e90b04e97ca10583e SHA256 2361ed35848aba949fa9af03e16f2c83ab28f1ae11d1dd97f2c58fe619406e69
 AUX texinfo-4.11-dir-entry.patch 757 RMD160 50ba502f701c7e96ed91883e925e0e45e82ebec4 SHA1 6473b3ba35d6ca642899758183a87b6866c056ce SHA256 6a71f2938779d0f1c0531a49d7b97cde814b8352c29ae94dbfcb809da531ef3d
+AUX texinfo-4.11-parallel-build.patch 904 RMD160 d03f93320593aafbd634078f3317da66e31c6da2 SHA1 fe5a202fa73dd66c0b02418e56b0dbee3282636b SHA256 cf6b023d92346c7edfcee46f5071e3fedd3b4b1eea6d216a072ba297fc9d3d11
 AUX texinfo-4.11-test-tex.patch 591 RMD160 28e2f2e8ed876b46adde21f2bc3d83c982d7062c SHA1 ad69eac850571b4a81729d05c79d11843070aadd SHA256 42d66fee204ece5fe18aa01d030a9798fe60e7578e59ff58fc8019e4817d7ce8
 AUX texinfo-4.11-test.patch 374 RMD160 af89aa92bf1c2f118e9e7e5fce6d23982f2eff1e SHA1 8e1f924015986c193e8ee728294dbfe067e670f1 SHA256 59cf6043b5476065bb35b775240b6ed05b706d364895fe9c6c780eb8320e8020
 AUX texinfo-4.8-bounds-check.patch 1163 RMD160 329f5f612248550ec1e3c6cc9400df2b9180ded4 SHA1 52dff66b2779b0a673fe8c4d7a15d058e7fbba06 SHA256 774e785f01b0a2976b9c050b9d55abbc9c002e2784ab42dd1061cfea13b33289
@@ -13,15 +14,15 @@ AUX texinfo-4.8-tempfile-owl.patch 2565 RMD160 8b54cc3942b09c8fe0eb82523be57002b
 AUX texinfo-4.8-tempfile.patch 708 RMD160 5214ae3b96e2714bba8e61c141dd32b6c0c31b66 SHA1 f0d5135123b09973fe1af8d645924bd8c5fa3efa SHA256 356935c23212eec139885d0217568c35e834a1abdd3b7fe062af0bb2da9fcd01
 DIST texinfo-4.11.tar.bz2 1659601 RMD160 d07dbc50f98dd8f9f4088b58781abdebfb7f5781 SHA1 915a42e1278860b0fa64e4ef9d5ad4488d3b23a0 SHA256 61033d48778ac7a6c80ac7cee66ca962fc4a1565fad13759618916f7f292f5f7
 DIST texinfo-4.8.tar.bz2 1521822 RMD160 5cb82cd240d1f22da813c7142df8828b4f6f1ea4 SHA1 b19e906f7220294c1e8b087d583c50f5c4d7c420 SHA256 f6bb61fb9c1d6a65523c786a4a74ab61e455420469e09a86929f2d403d9a21bb
-EBUILD texinfo-4.11-r1.ebuild 1392 RMD160 010940db1b9cd034a7883a2f829c25faadcd3224 SHA1 ffebc5362941e8e168bffa4dc256277c40e20778 SHA256 23e8a8a015c589069be1f426b6887c5b7af4ffc3b8b092b0bb8434aae43a6659
+EBUILD texinfo-4.11-r1.ebuild 1448 RMD160 6db585c61979fdad17217a4fc7840676d42c283d SHA1 637f0b7c26829dced561619604d056e86a932139 SHA256 3693abfe28f2877d91400e46162080aa6974eab3a9a9a72b765012b7d90c499e
 EBUILD texinfo-4.11.ebuild 1200 RMD160 515e8404e36883893f8d4db97b94208536eaf50e SHA1 50b1baab491b8c6ea2d64bcd2ec312dbb7e97f6e SHA256 283352115635d60248b684e94ed9ae96928325201a69bea0ce80abbeb2e7c83a
 EBUILD texinfo-4.8-r5.ebuild 2264 RMD160 a7f72c42a76925628c82da89e8a73e9934f5b47d SHA1 fd9ec02bc532789fa033875af4ee178f439add15 SHA256 6b5a9d6e35d07466094eda9fa273ad8695a49bba0d9b242ef5300823d14437ce
-MISC ChangeLog 11308 RMD160 b3846fb5c7c7bf4254c77c59e1c1d9e5b6dd6003 SHA1 e3e78e5d3d8b26e15ce2d60459a9a710aaa13bf6 SHA256 ebf8461720c8bd3721bab4b570bb7bb43653deee143d0dde37c2ff08df424e26
+MISC ChangeLog 11513 RMD160 1dc123b3b4de4938dfa105c2dddadedcddf29c49 SHA1 f57d67edf453f20a65b2c383e09c76d351099577 SHA256 0bd8aff44ae8692159212c99c4551328f46b782af18ddcd18bd5cc08311666b6
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFICZcIj9hvisErhMIRAusVAKCPh55G2JrmWZ7QHynNB2OZ65L5mwCfbxW8
-wBOkb2Uffr97sac7KstbmvY=
-=Z6Gf
+iD8DBQFICZfQj9hvisErhMIRAtNfAKC0bm4zhrKZpri/56GoNAu5kYIMpACeNkpZ
++4elQKok18rMfj6g7YCCVx0=
+=8qJ8
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/texinfo/files/texinfo-4.11-parallel-build.patch b/sys-apps/texinfo/files/texinfo-4.11-parallel-build.patch
new file mode 100644
index 000000000000..ef8ad7deeb97
--- /dev/null
+++ b/sys-apps/texinfo/files/texinfo-4.11-parallel-build.patch
@@ -0,0 +1,21 @@
+Index: info/Makefile.am
+===================================================================
+RCS file: /cvsroot/texinfo/texinfo/info/Makefile.am,v
+retrieving revision 1.14
+retrieving revision 1.15
+diff -u -p -r1.14 -r1.15
+--- info/Makefile.in	15 Dec 2007 14:32:51 -0000	1.14
++++ info/Makefile.in	28 Mar 2008 23:39:20 -0000	1.15
+@@ -70,8 +70,10 @@ cmd_sources = $(srcdir)/session.c $(srcd
+   $(srcdir)/m-x.c $(srcdir)/indices.c $(srcdir)/nodemenu.c \
+   $(srcdir)/footnotes.c $(srcdir)/variables.c
+ 
+-# The $(EXEEXT) should be added by Automake, but isn't. Fine.
+-$(generated_sources): makedoc$(EXEEXT) $(cmd_sources)
++# Make the target only funs.h even though we create all the
++# $(generated_sources) so that parallel makes won't do the rm && makedoc
++# more than once.
++funs.h: makedoc$(EXEEXT) $(cmd_sources)
+ 	rm -f $(generated_sources)
+ 	$(top_builddir)/$(native_tools)/info/makedoc $(cmd_sources)
+ 
diff --git a/sys-apps/texinfo/texinfo-4.11-r1.ebuild b/sys-apps/texinfo/texinfo-4.11-r1.ebuild
index 1e8c25722b09..5049bf27c9fa 100644
--- a/sys-apps/texinfo/texinfo-4.11-r1.ebuild
+++ b/sys-apps/texinfo/texinfo-4.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.11-r1.ebuild,v 1.11 2008/04/19 06:53:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.11-r1.ebuild,v 1.12 2008/04/19 06:57:14 vapier Exp $
 
 inherit flag-o-matic
 
@@ -27,6 +27,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-dir-entry.patch #198545
 	epatch "${FILESDIR}"/${P}-test-tex.patch #195313
 	epatch "${FILESDIR}"/${P}-test.patch #215359
+	epatch "${FILESDIR}"/${P}-parallel-build.patch #214127
 
 	# FreeBSD requires install-sh, but usptream don't have it marked
 	# exec, #195076