Fix parallel build failure with docs #249153 by Stefaan De Roeck.

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.8 x86_64

4 files changed, 55 insertions, 4 deletions

diff --git a/dev-libs/zziplib/ChangeLog b/dev-libs/zziplib/ChangeLog
index 15f2e9df7de5..8bf72de7c026 100644
--- a/dev-libs/zziplib/ChangeLog
+++ b/dev-libs/zziplib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/zziplib
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/ChangeLog,v 1.51 2008/11/17 22:34:49 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/ChangeLog,v 1.52 2008/12/08 05:24:48 vapier Exp $
+
+  08 Dec 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/zziplib-0.13.49-parallel-docs.patch, zziplib-0.13.49-r1.ebuild:
+  Fix parallel build failure with docs #249153 by Stefaan De Roeck.
 
   17 Nov 2008; Friedrich Oslage <bluebird@gentoo.org>
   +files/zziplib-0.13.49-sparc-aligned-access.patch,
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 0084c0ffa926..366e871a07fe 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX zziplib-0.13.49-SDL-test.patch 392 RMD160 07322bd7d56a58f3aa603d728e2f41a34dd5e43d SHA1 acdb46dc6146c870dcf3b1e7d6088c7fc9cb380e SHA256 88554ed81a8d07677ac27caddb4b622b00ac0bfe199e42d82ccfc6ca83815078
 AUX zziplib-0.13.49-configure-sed.patch 533 RMD160 cd6f0f54198ef9cb84ef857ab141c508d055b62a SHA1 684f2e7cd3559413094f8e94dd9d01b83c4b9d66 SHA256 b3cbc83d5eec056168a96d70be46f5da4c0cd3013868e7263189181a547b9882
+AUX zziplib-0.13.49-parallel-docs.patch 1757 RMD160 ab782781fc97039cb6800a8aeddbb3dc4a0c9017 SHA1 c0eec0c1262eb2b66d189dab0b62dc72b88fd461 SHA256 c6c647c99a4dcff0a21dc94dd52a8f6a7a636ea99136fcce71e837f5274528e0
 AUX zziplib-0.13.49-python.patch 366 RMD160 329f98dd9a40ed1f8976b56a1eca7f815c924a3b SHA1 5653de26626bb3752a22e2f69b078f410c87f68e SHA256 ce5acf47b2186c59f8080892542bd00034770297160ba00a0d30af47795e3a2b
 AUX zziplib-0.13.49-sparc-aligned-access.patch 1919 RMD160 3e85143e4f2362dc5384bcd13ac689050d072b0d SHA1 f7b18aaff02b275895c191719abe9a6bf63c5aef SHA256 31e229f13d95321c8792f2c08906fb7c473b8c14996be76c8a39744df20f658a
 DIST zziplib-0.13.49.tar.bz2 654842 RMD160 3ba64880298edaf192a9a773262810ff08d710e4 SHA1 72825fcbab93377d7866a8e6a9dfdef53f0343fa SHA256 f57c4e33eb2cdd87a6c2f01bfa4794340fbe61ea1a1cfc7dac3b6671e1dd22af
-EBUILD zziplib-0.13.49-r1.ebuild 1556 RMD160 86e27eb80306175ebe1d3219373619025942f04e SHA1 74d2c024e1b41908f00f6b4a98c5c0ec5fb97335 SHA256 88aba5dc939bca81f21ee726860c5e459a95110ea8d299fa727dcbcb33fdf357
+EBUILD zziplib-0.13.49-r1.ebuild 1609 RMD160 9922e95f265e0f9a4408cb4767859f233f692f79 SHA1 1a16b703c26861b92f2e9b7c9a920577f6064c52 SHA256 2fd88db9981d6abd96c678de9f0a496ea6da92062da108f68e08e2860fa9269c
 EBUILD zziplib-0.13.49.ebuild 1284 RMD160 c271d0d690ea1a39636b224482f626025b364ded SHA1 6fbf5d40fe519fd2088f0674a243e9613161b2c5 SHA256 4e5c1d9a3ba89e1688b1029f83b3fb43a5caa44f0ad10501b387609bd2f77a81
-MISC ChangeLog 6880 RMD160 a04d552f799835f76107e6e69c9000f8c1e27262 SHA1 4552a092839474b46da12087cd302ed35dbb2a72 SHA256 10393ce39c1eb87abcbfe00e682ed23e354fc887ac676f176a1fca85c14a4429
+MISC ChangeLog 7070 RMD160 4909c53c8900449a902830ebb728e66cb78b6742 SHA1 8ab75b334283e47d6778cc111c835c296fd339a7 SHA256 b35898f4f7e87215e4f4c6799d02aafe08ae59afc7fd3d41ea1dc890ab70a05d
 MISC metadata.xml 285 RMD160 3faddc79f99fd2e176331b7691ab303d68afff1f SHA1 bf0a1e4c233011a630921773d4968d1e5fe96265 SHA256 aabbb33ddce6a4c9c25c0e405250095050964ba66593fdeef74ac0023bdb301c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkk8r6YACgkQ67wieSYcaxelgACfbp5d6JX3NSrjrU4vfaSfdBYE
+M+8An24dwRKEqjWrGyAD0P4iqRbDtS1a
+=lTJN
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/zziplib/files/zziplib-0.13.49-parallel-docs.patch b/dev-libs/zziplib/files/zziplib-0.13.49-parallel-docs.patch
new file mode 100644
index 000000000000..5582985f5086
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.49-parallel-docs.patch
@@ -0,0 +1,35 @@
+fix parallel build with docs
+
+http://bugs.gentoo.org/249153
+http://sourceforge.net/tracker/index.php?func=detail&aid=2405440&group_id=6389&atid=306389
+
+--- zziplib-0.13.49/docs/Makefile.in
++++ zziplib-0.13.49/docs/Makefile.in
+@@ -447,21 +447,24 @@ docu :
+ 	- rm zziplib2.html zzipmmapped.html zzipfseeko.html
+ 	$(MAKE) manpages.ar htmpages.ar DELETE=exit
+ 
+-zziplib.html zziplib.xml : zziplib.spec $(srcdir)/Makefile.am \
++zziplib.xml: zziplib.html
++zziplib.html: zziplib.spec $(srcdir)/Makefile.am \
+                  $(srcdir)/zzipdoc/*.py \
+                  $(srcdir)/makedocs.py @top_srcdir@/zzip/*.c
+ 	$(PYRUN) $(srcdir)/makedocs.py @top_srcdir@/zzip/*.c $(zziplib) \
+                    "--package=$(PACKAGE)" "--version=$(VERSION)" \
+                    "--onlymainheader=zzip/lib.h" "--output=zziplib"
+ 	test -s zziplib.docbook && mv zziplib.docbook zziplib.xml
+-zzipmmapped.html zzipmmapped.xml : zziplib.spec $(srcdir)/Makefile.am \
++zzipmmapped.xml: zzipmmapped.html
++zzipmmapped.html: zziplib.spec $(srcdir)/Makefile.am \
+                  $(srcdir)/zzipdoc/*.py \
+                  $(srcdir)/makedocs.py @top_srcdir@/zzip/*.c
+ 	$(PYRUN) $(srcdir)/makedocs.py @top_srcdir@/zzip/*.c $(zziplib) \
+                    "--package=$(PACKAGE)" "--version=$(VERSION)" \
+                    "--onlymainheader=zzip/mmapped.h" "--output=zzipmmapped"
+ 	test -s zzipmmapped.docbook && mv zzipmmapped.docbook zzipmmapped.xml
+-zzipfseeko.html zzipfseeko.xml : zziplib.spec $(srcdir)/Makefile.am \
++zzipfseeko.xml: zzipfseeko.html
++zzipfseeko.html: zziplib.spec $(srcdir)/Makefile.am \
+                  $(srcdir)/zzipdoc/*.py \
+                  $(srcdir)/makedocs.py @top_srcdir@/zzip/*.c
+ 	$(PYRUN) $(srcdir)/makedocs.py @top_srcdir@/zzip/*.c $(zziplib) \
diff --git a/dev-libs/zziplib/zziplib-0.13.49-r1.ebuild b/dev-libs/zziplib/zziplib-0.13.49-r1.ebuild
index be1e74b0a7b0..497253c2c6bc 100644
--- a/dev-libs/zziplib/zziplib-0.13.49-r1.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.49-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/dev-libs/zziplib/zziplib-0.13.49-r1.ebuild,v 1.5 2008/11/17 22:34:49 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/zziplib-0.13.49-r1.ebuild,v 1.6 2008/12/08 05:24:48 vapier Exp $
 
 inherit libtool fixheadtails eutils
 
@@ -23,6 +23,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-parallel-docs.patch #249153
 	epatch "${FILESDIR}"/${P}-python.patch
 	epatch "${FILESDIR}"/${P}-configure-sed.patch #240556
 	epatch "${FILESDIR}"/${P}-SDL-test.patch