Add parallel build fix from bug #173676 thanks to Axel Dyks

Package-Manager: portage-2.1.3_rc8

4 files changed, 122 insertions, 10 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 980e4880f932..82b2b7137250 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/graphviz
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.123 2007/07/22 09:57:04 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.124 2007/07/24 22:05:22 jokey Exp $
+
+  24 Jul 2007; Markus Ullmann <jokey@gentoo.org>
+  +files/graphviz-2.12-parallel-build.patch, graphviz-2.12.ebuild:
+  Add parallel build fix from bug #173676 thanks to Axel Dyks
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   graphviz-2.6-r1.ebuild:
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 7e980ae3db91..f9e9bb86267a 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX graphviz-1.16-build.patch 6200 RMD160 63a72f5776f55321a677524cc9be59e278578366 SHA1 362a7f013a8aea313b0745b65689de43d351d447 SHA256 30e792d61416121692fd7cd1baa856ba2ab724dfe00bd56ff676bead07274e2d
 MD5 280fc858f990639d5d8fb7102b2636ac files/graphviz-1.16-build.patch 6200
 RMD160 63a72f5776f55321a677524cc9be59e278578366 files/graphviz-1.16-build.patch 6200
@@ -26,6 +29,10 @@ AUX graphviz-2.12-notcl.patch 642 RMD160 69410279e9349670cbc590f5796092dca49e067
 MD5 34a282256f96861fe9334ca122545e44 files/graphviz-2.12-notcl.patch 642
 RMD160 69410279e9349670cbc590f5796092dca49e067e files/graphviz-2.12-notcl.patch 642
 SHA256 708ad5531ca4342213728e609ab3c28b15912743c8faf412d102ffadc7d2f478 files/graphviz-2.12-notcl.patch 642
+AUX graphviz-2.12-parallel-build.patch 3050 RMD160 61e104de3f8a7823b6c9669a9e70c3f61b81ba2b SHA1 c2a7e53e0922daaa147134e6e76566e3fc495ba9 SHA256 8a5bba5cd9f158b3db962d0198e6138560dcc8ce198fdbfade8765d9a162fa9c
+MD5 d28226e3e7a6a84a260ae7bf8ad607ad files/graphviz-2.12-parallel-build.patch 3050
+RMD160 61e104de3f8a7823b6c9669a9e70c3f61b81ba2b files/graphviz-2.12-parallel-build.patch 3050
+SHA256 8a5bba5cd9f158b3db962d0198e6138560dcc8ce198fdbfade8765d9a162fa9c files/graphviz-2.12-parallel-build.patch 3050
 AUX graphviz-2.6-macos.patch 2074 RMD160 fe3f407fb45c00957dfa838ada2d8f9e54d6be63 SHA1 be35a5edd118bef2c9c54ac3d81e2a5871c32316 SHA256 038b4f20837661519f84eccfe7e6e66f8b5bb2afa48403347fa9ae7067933281
 MD5 ef70bc2df3a59b497609b809787e6ea3 files/graphviz-2.6-macos.patch 2074
 RMD160 fe3f407fb45c00957dfa838ada2d8f9e54d6be63 files/graphviz-2.6-macos.patch 2074
@@ -43,10 +50,10 @@ EBUILD graphviz-1.16-r1.ebuild 2132 RMD160 08a7f89728e5e305fa702792faeb7fa47255f
 MD5 f614fb57220fecfe100867a8ee3266a6 graphviz-1.16-r1.ebuild 2132
 RMD160 08a7f89728e5e305fa702792faeb7fa47255f103 graphviz-1.16-r1.ebuild 2132
 SHA256 617218762e255884a60f1f3c5ba2d66c928783639ae0eab3e32a78120d2c0d05 graphviz-1.16-r1.ebuild 2132
-EBUILD graphviz-2.12.ebuild 5456 RMD160 ec93fa97966aeea51b28fc29fd8cc8bcd33f9bd7 SHA1 95fee18d697ec826c691c4bad85e07687ec87fa2 SHA256 b0e5e604993eca97a596fb18e9db85ed0a29a5e71f15380dae9c9e203f25f980
-MD5 8c9c572aebc8a4c56ba03944b416fa07 graphviz-2.12.ebuild 5456
-RMD160 ec93fa97966aeea51b28fc29fd8cc8bcd33f9bd7 graphviz-2.12.ebuild 5456
-SHA256 b0e5e604993eca97a596fb18e9db85ed0a29a5e71f15380dae9c9e203f25f980 graphviz-2.12.ebuild 5456
+EBUILD graphviz-2.12.ebuild 5501 RMD160 2042dcaf8e193e9e35cf63a083e5fedc79a937e6 SHA1 8e7e7a251d79445cacba55eee46f09bb9563027b SHA256 6cb3ccac26eee173c2c6830f1db4c2eec3cbd5a59b6d8af9fc947ff105eb5da9
+MD5 16a46f7ee1a3035cee7928367f736288 graphviz-2.12.ebuild 5501
+RMD160 2042dcaf8e193e9e35cf63a083e5fedc79a937e6 graphviz-2.12.ebuild 5501
+SHA256 6cb3ccac26eee173c2c6830f1db4c2eec3cbd5a59b6d8af9fc947ff105eb5da9 graphviz-2.12.ebuild 5501
 EBUILD graphviz-2.6-r1.ebuild 1610 RMD160 8754f0492209dfe3ff78af099e39e5163b9df82a SHA1 0b8293a27416e06badb32a5dd0f534aeee99434a SHA256 23d0ee6c77f5ba7223ed2901151802261d8d7902d10e242cf0f93e6dd252cb9e
 MD5 e67442e3bf0b6786c463b0c5defe9b29 graphviz-2.6-r1.ebuild 1610
 RMD160 8754f0492209dfe3ff78af099e39e5163b9df82a graphviz-2.6-r1.ebuild 1610
@@ -55,10 +62,10 @@ EBUILD graphviz-2.8-r2.ebuild 2838 RMD160 2ae161ce0c1e4e235a1036ee41727e352ae047
 MD5 01387a6214d7bc28ec4d4e20676ccab3 graphviz-2.8-r2.ebuild 2838
 RMD160 2ae161ce0c1e4e235a1036ee41727e352ae047cf graphviz-2.8-r2.ebuild 2838
 SHA256 0c3dab4e083f839086daca2cc5e3493c4b3b689eb255c1071a0365870c4a7583 graphviz-2.8-r2.ebuild 2838
-MISC ChangeLog 18336 RMD160 e896d78a68ea380d29283262e829ae47d4cdf06e SHA1 6ce54646a3cc2dc8ac6ea41f64cd8b1b7dc47ca9 SHA256 2d172c1cc08e32f8690b14ddd514b86d7e4ad6eba0e55309ce38ceb378da08db
-MD5 e0c417661186dc73aa091190347b4293 ChangeLog 18336
-RMD160 e896d78a68ea380d29283262e829ae47d4cdf06e ChangeLog 18336
-SHA256 2d172c1cc08e32f8690b14ddd514b86d7e4ad6eba0e55309ce38ceb378da08db ChangeLog 18336
+MISC ChangeLog 18511 RMD160 dd59c6b63032f5edad29661f0ddd96f7ccfa114c SHA1 6b0ab557c62d3dfe7c1ba9ab6a625efd02022bbe SHA256 9a9c582314ab379f3b74b264e9a470883a52aa6b8c7414cac61fc0f06f04414f
+MD5 0b02c5409211cda684a4ab2a75bf7617 ChangeLog 18511
+RMD160 dd59c6b63032f5edad29661f0ddd96f7ccfa114c ChangeLog 18511
+SHA256 9a9c582314ab379f3b74b264e9a470883a52aa6b8c7414cac61fc0f06f04414f ChangeLog 18511
 MISC metadata.xml 1540 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 SHA1 b493bbaade7ae395c87ada0bbef0b0f0e7f7fb08 SHA256 c2a220f962a3048cc026e4c376b6555bfd0be7b401206d0ae3d265d628f231a1
 MD5 e98595ce89ff0da26058b1e6e0ce3d31 metadata.xml 1540
 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 metadata.xml 1540
@@ -75,3 +82,10 @@ SHA256 9302285aa30bde290629f8252cfa2a3a0f738c675d45c27182dbbcde12093ff8 files/di
 MD5 e3e4ae371fc2d864bfc0abf37ed6a8e7 files/digest-graphviz-2.8-r2 241
 RMD160 5fb21035102566ae43b15e15cfa41c26e5d1a195 files/digest-graphviz-2.8-r2 241
 SHA256 46c7992c928f975cf353d76bf16f2c1f95442c40aa8d95f9a6914d69f567e802 files/digest-graphviz-2.8-r2 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGpnetz974XjDVpbkRAqJ9AJ0S6bfTpZW6y9rwy/iVqwQyea5l9gCfTuPr
++oRZ3DsMTBLIH8jY4K+u3Xw=
+=mfCH
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/graphviz/files/graphviz-2.12-parallel-build.patch b/media-gfx/graphviz/files/graphviz-2.12-parallel-build.patch
new file mode 100644
index 000000000000..ab19b4f01f51
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.12-parallel-build.patch
@@ -0,0 +1,93 @@
+diff -ru graphviz-2.12.orig/tclpkg/gv/Makefile.am graphviz-2.12/tclpkg/gv/Makefile.am
+--- graphviz-2.12.orig/tclpkg/gv/Makefile.am	2006-09-12 19:34:43.000000000 +0200
++++ graphviz-2.12/tclpkg/gv/Makefile.am	2007-04-07 23:18:32.000000000 +0200
+@@ -20,7 +20,8 @@
+ libgv_sharp_la_SOURCES = $(BASESOURCES)
+ libgv_sharp_la_LIBADD = $(BASELIBS) @SHARP_LIBS@ 
+ libgv_sharp_la_LDFLAGS = 
+-gv_sharp.cpp $(SHARP_hdr): gv.i
++$(SHARP_hdr): gv_sharp.cpp
++gv_sharp.cpp: gv.i
+ 	$(SWIG) -c++ -csharp -namespace gv -o gv_sharp.cpp $(srcdir)/gv.i
+ 
+ pkgguiledir = $(pkglibdir)/guile
+@@ -29,7 +30,8 @@
+ libgv_guile_la_SOURCES = $(BASESOURCES)
+ libgv_guile_la_LIBADD = $(BASELIBS) @GUILE_LIBS@
+ libgv_guile_la_LDFLAGS = 
+-gv_guile.cpp $(GUILE_hdr): gv.i
++$(GUILE_hdr): gv_guile.cpp
++gv_guile.cpp: gv.i
+ 	$(SWIG) -c++ -guile -o gv_guile.cpp $(srcdir)/gv.i
+ 	$(SED) -e 's/SWIG_GUILE_INIT_STATIC void/void/' <gv_guile.cpp >t
+ 	mv -f t gv_guile.cpp
+@@ -49,7 +51,8 @@
+ libgv_java_la_SOURCES = $(BASESOURCES) 
+ libgv_java_la_LIBADD = $(BASELIBS) @JAVA_LIBS@
+ libgv_java_la_LDFLAGS = 
+-gv_java.cpp $(JAVA_hdr): gv.i
++$(JAVA_hdr): gv_java.cpp
++gv_java.cpp: gv.i
+ 	$(SWIG) -c++ -java -o gv_java.cpp $(srcdir)/gv.i
+ 
+ pkgluadir = $(pkglibdir)/lua
+@@ -67,7 +70,8 @@
+ libgv_ocaml_la_SOURCES = $(BASESOURCES)
+ libgv_ocaml_la_LIBADD = $(BASELIBS) @OCAML_LIBS@
+ libgv_ocaml_la_LDFLAGS = 
+-gv_ocaml.cpp $(OCAML_hdr): gv.i
++$(OCAML_hdr): gv_ocaml.cpp
++gv_ocaml.cpp: gv.i
+ 	$(SWIG) -c++ -ocaml -o gv_ocaml.cpp $(srcdir)/gv.i
+ 
+ pkgperldir = $(pkglibdir)/perl
+@@ -76,7 +80,8 @@
+ libgv_perl_la_SOURCES = $(BASESOURCES)
+ libgv_perl_la_LIBADD = $(BASELIBS) @PERL_LIBS@
+ libgv_perl_la_LDFLAGS = 
+-gv_perl.cpp $(PERL_hdr): gv.i
++$(PERL_hdr): gv_perl.cpp
++gv_perl.cpp: gv.i
+ 	$(SWIG) -c++ -perl -o gv_perl.cpp $(srcdir)/gv.i
+ 
+ pkgphpdir = $(pkglibdir)/php
+@@ -85,7 +90,8 @@
+ libgv_php_la_SOURCES = $(BASESOURCES)
+ libgv_php_la_LIBADD = $(BASELIBS) @PHP_LIBS@
+ libgv_php_la_LDFLAGS = 
+-gv_php.cpp $(PHP_hdr): gv.i
++$(PHP_hdr): gv_php.cpp
++gv_php.cpp: gv.i
+ 	$(SWIG) -c++ -php -o gv_php.cpp $(srcdir)/gv.i
+ 
+ pkgpythondir = $(pkglibdir)/python
+@@ -94,7 +100,8 @@
+ libgv_python_la_SOURCES = $(BASESOURCES)
+ libgv_python_la_LIBADD = $(BASELIBS) @PYTHON_LIBS@
+ libgv_python_la_LDFLAGS = 
+-gv_python.cpp $(PYTHON_hdr): gv.i
++$(PYTHON_hdr): gv_python.cpp
++gv_python.cpp: gv.i
+ 	$(SWIG) -c++ -python -o gv_python.cpp $(srcdir)/gv.i
+ 
+ pkgrubydir = $(pkglibdir)/ruby
+@@ -103,7 +110,8 @@
+ libgv_ruby_la_SOURCES = $(BASESOURCES)
+ libgv_ruby_la_LIBADD = $(BASELIBS) @RUBY_LIBS@
+ libgv_ruby_la_LDFLAGS = 
+-gv_ruby.cpp $(RUBY_hdr): gv.i
++$(RUBY_hdr): gv_ruby.cpp
++gv_ruby.cpp: gv.i
+ 	$(SWIG) -c++ -ruby -o gv_ruby.cpp $(srcdir)/gv.i
+ 
+ pkgtcldir = $(pkglibdir)/tcl
+@@ -112,7 +120,8 @@
+ libgv_tcl_la_SOURCES = $(BASESOURCES)
+ libgv_tcl_la_LIBADD = $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la $(BASELIBS) @TCL_LIBS@
+ libgv_tcl_la_LDFLAGS = 
+-gv_tcl.cpp $(TCL_hdr): gv.i
++$(TCL_hdr): gv_tcl.cpp
++gv_tcl.cpp: gv.i
+ 	$(SWIG) -c++ -tcl -namespace -o gv_tcl.cpp $(srcdir)/gv.i
+ 
+ pkginclude_DATA = gv.i gv.cpp
diff --git a/media-gfx/graphviz/graphviz-2.12.ebuild b/media-gfx/graphviz/graphviz-2.12.ebuild
index 802542c75db8..8a3110eb92bc 100644
--- a/media-gfx/graphviz/graphviz-2.12.ebuild
+++ b/media-gfx/graphviz/graphviz-2.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.12.ebuild,v 1.19 2007/07/12 16:06:09 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.12.ebuild,v 1.20 2007/07/24 22:05:22 jokey Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
@@ -91,6 +91,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-find-system-libgd.patch"
 	epatch "${FILESDIR}/${P}-configure.patch"
 	epatch "${FILESDIR}/${P}-bindings.patch"
+	epatch "${FILESDIR}/${P}-parallel-build.patch"
 
 	sed -i \
 		-e 's:LC_COLLATE=C:LC_ALL=C:g' \