Fix parallel build for bug #194720.

Package-Manager: portage-2.1.3.11

4 files changed, 35 insertions, 14 deletions

diff --git a/media-libs/t1lib/ChangeLog b/media-libs/t1lib/ChangeLog
index 5bc67c766730..733b9d6c752e 100644
--- a/media-libs/t1lib/ChangeLog
+++ b/media-libs/t1lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/t1lib
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/ChangeLog,v 1.65 2007/09/27 23:37:56 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/ChangeLog,v 1.66 2007/10/05 23:15:27 dirtyepic Exp $
+
+  05 Oct 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/t1lib-5.1.1-parallel.patch, t1lib-5.1.1.ebuild:
+  Fix parallel build for bug #194720.
 
   27 Sep 2007; Hanno Boeck <hanno@gentoo.org> +files/t1lib-5.1.1-qa.diff,
   t1lib-5.1.1.ebuild:
diff --git a/media-libs/t1lib/Manifest b/media-libs/t1lib/Manifest
index 127e8d1e0a14..a8351b0ae743 100644
--- a/media-libs/t1lib/Manifest
+++ b/media-libs/t1lib/Manifest
@@ -17,6 +17,10 @@ AUX t1lib-5.0.2-gentoo.diff 2619 RMD160 15c0f89f625c0433ee05af1e5c08ce06904b1235
 MD5 564c11663ec99286c576cedef39a854e files/t1lib-5.0.2-gentoo.diff 2619
 RMD160 15c0f89f625c0433ee05af1e5c08ce06904b1235 files/t1lib-5.0.2-gentoo.diff 2619
 SHA256 a336bc4b305b1635d665a746f47e77cbc8e79a836dbf784ec58d1c339df38c5b files/t1lib-5.0.2-gentoo.diff 2619
+AUX t1lib-5.1.1-parallel.patch 472 RMD160 719d9e024af72588d3b6adac1a97bd8026985dd5 SHA1 f32a051f0ed4c0fd2294cfecf993316e37ee4e26 SHA256 ce21f6c0a24e7d59de2d41a517a0c5410b35e42d9677c494fc70701a3c3e8a24
+MD5 b80217d687b1365a96bfa714d1d0cad4 files/t1lib-5.1.1-parallel.patch 472
+RMD160 719d9e024af72588d3b6adac1a97bd8026985dd5 files/t1lib-5.1.1-parallel.patch 472
+SHA256 ce21f6c0a24e7d59de2d41a517a0c5410b35e42d9677c494fc70701a3c3e8a24 files/t1lib-5.1.1-parallel.patch 472
 AUX t1lib-5.1.1-qa.diff 415 RMD160 ccd65ef7a06c8d1d5faa15af611904ac88b3cbf9 SHA1 9760158352db717e0fe06da27eb432c5808e072c SHA256 e0eb742b21ac898c5027174c14da75e22edbfd69b744003dfb2aa62c2f0b3107
 MD5 42d9cda965f211825a9cd44488a45919 files/t1lib-5.1.1-qa.diff 415
 RMD160 ccd65ef7a06c8d1d5faa15af611904ac88b3cbf9 files/t1lib-5.1.1-qa.diff 415
@@ -36,14 +40,14 @@ EBUILD t1lib-5.0.2.ebuild 1653 RMD160 8ad58243a88992c9a6536793aa6ace837da031a4 S
 MD5 a6a008b204bb3b4f5c6d530a9792c324 t1lib-5.0.2.ebuild 1653
 RMD160 8ad58243a88992c9a6536793aa6ace837da031a4 t1lib-5.0.2.ebuild 1653
 SHA256 abdf8647a3acc215cdb75d53fe67c11d76092fceabcf3c085470e7dc66259791 t1lib-5.0.2.ebuild 1653
-EBUILD t1lib-5.1.1.ebuild 1715 RMD160 14a6f09dcf22a6c87b71b0da0ca20417eb97459e SHA1 c40f398cce10302c8c158d826b198e985e8e85a2 SHA256 bee3b73d5514f5d4ec3a91fba9bbed54af8d0ff5bf21ba190c5d810fafd5ec73
-MD5 dbc45d4445d85458ae0846a2c29b6f76 t1lib-5.1.1.ebuild 1715
-RMD160 14a6f09dcf22a6c87b71b0da0ca20417eb97459e t1lib-5.1.1.ebuild 1715
-SHA256 bee3b73d5514f5d4ec3a91fba9bbed54af8d0ff5bf21ba190c5d810fafd5ec73 t1lib-5.1.1.ebuild 1715
-MISC ChangeLog 8978 RMD160 f1a60f86a852e7f8f5c93d91e2963c8ffc651942 SHA1 1d1f8f157d3ba4bc9670d9299a995f81a41bdd09 SHA256 ba802722f3aa0c2269ad5bf528f61a1e70c149616f50843b82c1d7fd1c24b625
-MD5 34e75f6737866bfd75409f50d04980b3 ChangeLog 8978
-RMD160 f1a60f86a852e7f8f5c93d91e2963c8ffc651942 ChangeLog 8978
-SHA256 ba802722f3aa0c2269ad5bf528f61a1e70c149616f50843b82c1d7fd1c24b625 ChangeLog 8978
+EBUILD t1lib-5.1.1.ebuild 1760 RMD160 6d8e4325c9a971787f7fe422e5d44da1a533156a SHA1 5ad14a3eab11b4f6c189d965ae978440975b562b SHA256 ad065ed208a877df3e17f0e73694b704dd149308f2a2dddc68f91f1d4a858f96
+MD5 15f8cb851fa88721d741a5d3c3ffc45d t1lib-5.1.1.ebuild 1760
+RMD160 6d8e4325c9a971787f7fe422e5d44da1a533156a t1lib-5.1.1.ebuild 1760
+SHA256 ad065ed208a877df3e17f0e73694b704dd149308f2a2dddc68f91f1d4a858f96 t1lib-5.1.1.ebuild 1760
+MISC ChangeLog 9126 RMD160 78ef1b174abb4d9db80b9f644ab5026d239f92ed SHA1 db370175652d845c33f6efb0aa6f7dce2e2b6ab5 SHA256 77a2c908e50def32e0f0b5c95378eef6929c57cf0bb6588c8dffccf53594858b
+MD5 a0d73b8f37653376f182633c4f57d902 ChangeLog 9126
+RMD160 78ef1b174abb4d9db80b9f644ab5026d239f92ed ChangeLog 9126
+SHA256 77a2c908e50def32e0f0b5c95378eef6929c57cf0bb6588c8dffccf53594858b ChangeLog 9126
 MISC metadata.xml 158 RMD160 e563fdca0707ee5927deab77f2e5ef79816384ca SHA1 8e4ca6d183e52cdbea8cfba08b7a7910e648fc84 SHA256 9a8722fb0b5a1992b3942e85f23df4e08f10cabc2d783ca887479abe115b3ea8
 MD5 295674d4bed87f5a7c2796e032ed561e metadata.xml 158
 RMD160 e563fdca0707ee5927deab77f2e5ef79816384ca metadata.xml 158
@@ -63,7 +67,7 @@ SHA256 e8068f61b7183c5b7df974483ea5bc2f737e1d8e624fb60c75804ff176f08f93 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG/D8fr2QksT29OyARAjeGAJ94qbIG2U7kcJgBqNs/c8vjsPmVPgCdGWL6
-QtjCiouw8s1nzK5ESje7RJ8=
-=Zun4
+iD8DBQFHBsWaiqiDRvmkBmIRAhHCAKCiLIJGapn99yeUtQzEL4lkN/qd4ACg5ikS
+r7czd2kduzlo3v2GF5H74q0=
+=F2pX
 -----END PGP SIGNATURE-----
diff --git a/media-libs/t1lib/files/t1lib-5.1.1-parallel.patch b/media-libs/t1lib/files/t1lib-5.1.1-parallel.patch
new file mode 100644
index 000000000000..d829c9ff1756
--- /dev/null
+++ b/media-libs/t1lib/files/t1lib-5.1.1-parallel.patch
@@ -0,0 +1,12 @@
+diff -Naur t1lib-5.1.1-orig/lib/Makefile.in t1lib-5.1.1/lib/Makefile.in
+--- t1lib-5.1.1-orig/lib/Makefile.in	2006-11-05 17:06:05.000000000 -0600
++++ t1lib-5.1.1/lib/Makefile.in	2007-10-04 21:21:20.000000000 -0600
+@@ -133,7 +133,7 @@
+ 	cp t1lib/t1lib.h .
+ 
+ 
+-libt1x.la: $(T1LIBX_OBJS)
++libt1x.la: $(T1LIBX_OBJS) libt1.la
+ 	$(LIBTOOL) --mode=link \
+ 		$(CC) $(LDFLAGS) -o $@ $(T1LIBX_OBJS) \
+ 	         -version-info @T1LIB_LT_CURRENT@:@T1LIB_LT_REVISION@:@T1LIB_LT_AGE@ \
diff --git a/media-libs/t1lib/t1lib-5.1.1.ebuild b/media-libs/t1lib/t1lib-5.1.1.ebuild
index 5fa3c58fabb3..e75a3bc3030a 100644
--- a/media-libs/t1lib/t1lib-5.1.1.ebuild
+++ b/media-libs/t1lib/t1lib-5.1.1.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-libs/t1lib/t1lib-5.1.1.ebuild,v 1.5 2007/09/27 23:37:56 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-5.1.1.ebuild,v 1.6 2007/10/05 23:15:27 dirtyepic Exp $
 
 inherit eutils flag-o-matic libtool toolchain-funcs
 
@@ -28,6 +28,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${PN}-5.0.2-SA26241_buffer_overflow.patch
 	epatch "${FILESDIR}/${P}-qa.diff"
+	epatch "${FILESDIR}"/${P}-parallel.patch
 
 	sed -i -e "s:dvips:#dvips:" "${S}"/doc/Makefile.in
 	sed -i -e "s:\./\(t1lib\.config\):/etc/t1lib/\1:" "${S}"/xglyph/xglyph.c
@@ -48,7 +49,7 @@ src_compile() {
 	econf \
 		--datadir=/etc \
 		$(use_with X x) \
-		 || die "econf failed."
+		|| die "econf failed."
 
 	emake ${myopt} || die "emake failed."
 }