Fix from Martin von Gagern for parallel build problems #202019.

Package-Manager: portage-2.1.4_rc9

4 files changed, 63 insertions, 13 deletions

diff --git a/media-gfx/fontforge/ChangeLog b/media-gfx/fontforge/ChangeLog
index 34d625e2fd9e..b685713b99ac 100644
--- a/media-gfx/fontforge/ChangeLog
+++ b/media-gfx/fontforge/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/fontforge
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.63 2007/12/12 05:12:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.64 2007/12/13 07:15:09 vapier Exp $
+
+  13 Dec 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/fontforge-20071210-parallel-build.patch, fontforge-20071210.ebuild:
+  Fix from Martin von Gagern for parallel build problems #202019.
 
 *fontforge-20071210 (12 Dec 2007)
 
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 43dab9fb8fdd..f94e53d36bb7 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX fontforge-20071210-parallel-build.patch 678 RMD160 aa05d9514a07ee339648ed1abd0ab4257e07f64f SHA1 9f55e4df6bbc0101f411be6dc364cbd525abc656 SHA256 0ecfd51f3c2f8b1677f484f0f67d350b59798026f92d678043a403f72a235af8
+MD5 31b6af54de7c35c7949d71fd5204b4b5 files/fontforge-20071210-parallel-build.patch 678
+RMD160 aa05d9514a07ee339648ed1abd0ab4257e07f64f files/fontforge-20071210-parallel-build.patch 678
+SHA256 0ecfd51f3c2f8b1677f484f0f67d350b59798026f92d678043a403f72a235af8 files/fontforge-20071210-parallel-build.patch 678
 DIST cidmaps-20041222.tgz 313755 RMD160 c25b1a4f0d8ed0634402d2ce2b36ba47e0c2ef1b SHA1 d111db1f6d9a05cf6cb1387c2fb2eeb21ba0279a SHA256 e0c16072d4c0fea3614073306ba243aa974a00130c5201651892950d855641f3
 DIST fontforge_full-20070312.tar.bz2 3778147 RMD160 8acfaeecb31d1bf2644427e27b540fefddecb27c SHA1 310c29b1905893c9dd48a7d78bd0b8c9067fafd8 SHA256 0ed279bbe2ca83bac76c6f9ae5cf49cb99ae9d0221e9dbc2f16ad41785cc1f79
 DIST fontforge_full-20070501.tar.bz2 3892086 RMD160 030804a4bbdd9153943db946b43ad1db46fee177 SHA1 dbfd7dcde744e6b84f2c0f65928cb2040ae04de1 SHA256 5ee94f939439fc4e6b666aa8f172c9f7b2d44c700d97620699425134e08bf31e
@@ -48,14 +52,14 @@ EBUILD fontforge-20071110.ebuild 1638 RMD160 b3259d4aa84c0c02045afc2e468374ab5fc
 MD5 880aa9f6b0a237ef18bcb8c46b11cef6 fontforge-20071110.ebuild 1638
 RMD160 b3259d4aa84c0c02045afc2e468374ab5fcd0db7 fontforge-20071110.ebuild 1638
 SHA256 5b87080f6ac2f5f82492635ceea3857816f4fa70ea4eb08a69a42813c911ab41 fontforge-20071110.ebuild 1638
-EBUILD fontforge-20071210.ebuild 1476 RMD160 301d3eb613bd5f2f1fbc53aa7be82b36537a39db SHA1 312761a12838ab1357b8c18aa29ab99d9cd3d205 SHA256 479f2cb007badd10b34b8ef20e85e06362b3d99eb405af9c68780e74168767bf
-MD5 f8ad66825d396a724908c5af03190fc3 fontforge-20071210.ebuild 1476
-RMD160 301d3eb613bd5f2f1fbc53aa7be82b36537a39db fontforge-20071210.ebuild 1476
-SHA256 479f2cb007badd10b34b8ef20e85e06362b3d99eb405af9c68780e74168767bf fontforge-20071210.ebuild 1476
-MISC ChangeLog 9188 RMD160 803d8e695c6537ae525bc71ce45f57ed8cfdf62b SHA1 554c700918e6a43ce71ee5ae869bebe79a15b4ad SHA256 37dfc30e8cdf4c98d1518528c4ab0b721d451705d6d9586695fd3360741702f4
-MD5 2960fb6abf773f1f249abb080b1ee743 ChangeLog 9188
-RMD160 803d8e695c6537ae525bc71ce45f57ed8cfdf62b ChangeLog 9188
-SHA256 37dfc30e8cdf4c98d1518528c4ab0b721d451705d6d9586695fd3360741702f4 ChangeLog 9188
+EBUILD fontforge-20071210.ebuild 1590 RMD160 008222bda1d762c917c389e1cbdd528e4ce9f4c3 SHA1 1cd1a37be2f8000b60f3069f1805b2f1e788612a SHA256 8b497ba3047e17836d27697ac49c259f3958151103d3bf2e15b7ca25d82fbcc2
+MD5 593ae1ff62cf8b4c741c1d351ddec325 fontforge-20071210.ebuild 1590
+RMD160 008222bda1d762c917c389e1cbdd528e4ce9f4c3 fontforge-20071210.ebuild 1590
+SHA256 8b497ba3047e17836d27697ac49c259f3958151103d3bf2e15b7ca25d82fbcc2 fontforge-20071210.ebuild 1590
+MISC ChangeLog 9382 RMD160 3da355161d26779aaaaf770c75d8b7caaeb78f54 SHA1 34b81d2199cb44de3652c75346f8bc96f74faa08 SHA256 3b386f5f19f0bc74f92f24568f8bfe42c8c86083f3bbd9b1349edc402e6a964a
+MD5 1f783b71b9719f964ec47bbb22292ce9 ChangeLog 9382
+RMD160 3da355161d26779aaaaf770c75d8b7caaeb78f54 ChangeLog 9382
+SHA256 3b386f5f19f0bc74f92f24568f8bfe42c8c86083f3bbd9b1349edc402e6a964a ChangeLog 9382
 MISC metadata.xml 158 RMD160 e563fdca0707ee5927deab77f2e5ef79816384ca SHA1 8e4ca6d183e52cdbea8cfba08b7a7910e648fc84 SHA256 9a8722fb0b5a1992b3942e85f23df4e08f10cabc2d783ca887479abe115b3ea8
 MD5 295674d4bed87f5a7c2796e032ed561e metadata.xml 158
 RMD160 e563fdca0707ee5927deab77f2e5ef79816384ca metadata.xml 158
@@ -93,7 +97,7 @@ SHA256 8e6ca35aedecf6736a22c1a5a5f5b67f670f0961845012343b52b5f7b500e4c9 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHX22pp/wUKkr7RBoRArk9AKC+uNbekGQ2VqhIJKM9T8klbG63DACaAxrC
-Ah8nOkyi5oKTxTsiO6yauho=
-=LQrK
+iD8DBQFHYNwDp/wUKkr7RBoRAhW5AJ9LZ1x8pa4fJS2SP/cnbh87IG8pRwCguV4l
+KI1c7EQbss/RuEe4iMJx+Hs=
+=/rGP
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/fontforge/files/fontforge-20071210-parallel-build.patch b/media-gfx/fontforge/files/fontforge-20071210-parallel-build.patch
new file mode 100644
index 000000000000..be9eb97a7b06
--- /dev/null
+++ b/media-gfx/fontforge/files/fontforge-20071210-parallel-build.patch
@@ -0,0 +1,34 @@
+Fix parallel build issues in fontforge.
+http://bugs.gentoo.org/202019
+2007-12-12 Martin von Gagern
+
+--- fontforge-20071210/Makefile.dynamic.in
++++ fontforge-20071210/Makefile.dynamic.in
+@@ -26,10 +26,10 @@
+ libgunicode:
+ 	( cd Unicode ; $(MAKE) )
+ 
+-libgutils:
++libgutils: libgunicode
+ 	( cd gutils ; $(MAKE) )
+ 
+-libgdraw:
++libgdraw: libgunicode libgutils
+ 	( cd gdraw ; $(MAKE) )
+ 
+ pos:
+--- fontforge-20071210/Makefile.static.in
++++ fontforge-20071210/Makefile.static.in
+@@ -24,10 +24,10 @@
+ libgunicode:
+ 	( cd Unicode ; $(MAKE) )
+ 
+-libgutils:
++libgutils: libgunicode
+ 	( cd gutils ; $(MAKE) )
+ 
+-libgdraw:
++libgdraw: libgunicode libgutils
+ 	( cd gdraw ; $(MAKE) )
+ 
+ pos:
diff --git a/media-gfx/fontforge/fontforge-20071210.ebuild b/media-gfx/fontforge/fontforge-20071210.ebuild
index 04b95f69f07f..654cd7dbead3 100644
--- a/media-gfx/fontforge/fontforge-20071210.ebuild
+++ b/media-gfx/fontforge/fontforge-20071210.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20071210.ebuild,v 1.1 2007/12/12 05:12:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20071210.ebuild,v 1.2 2007/12/13 07:15:09 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="postscript font editor and converter"
 HOMEPAGE="http://fontforge.sourceforge.net/"
@@ -24,6 +26,12 @@ RDEPEND="gif? ( >=media-libs/giflib-4.1.0-r1 )
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-parallel-build.patch #202019
+}
+
 src_compile() {
 	# no real way of disabling gettext/nls ...
 	use nls || export ac_cv_header_libintl_h=no