Add -j1 to build, see bug #295724.

Package-Manager: portage-2.2_rc55/cvs/Linux x86_64

3 files changed, 31 insertions, 16 deletions

diff --git a/sci-libs/xgks-pmel/ChangeLog b/sci-libs/xgks-pmel/ChangeLog
index b08a9e2fb1d8..fa08a657b628 100644
--- a/sci-libs/xgks-pmel/ChangeLog
+++ b/sci-libs/xgks-pmel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/xgks-pmel
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/xgks-pmel/ChangeLog,v 1.3 2009/06/08 02:28:16 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/xgks-pmel/ChangeLog,v 1.4 2009/12/04 21:01:44 flameeyes Exp $
+
+  04 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  xgks-pmel-2.5.5.ebuild:
+  Add -j1 to build, see bug #295724.
 
   08 Jun 2009; Steve Arnold <nerdboy@gentoo.org> xgks-pmel-2.5.5.ebuild:
   Renamed package binaries to avoid conflicts; closes bug #272629.
diff --git a/sci-libs/xgks-pmel/Manifest b/sci-libs/xgks-pmel/Manifest
index 296920ef924a..51b617a48df2 100644
--- a/sci-libs/xgks-pmel/Manifest
+++ b/sci-libs/xgks-pmel/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX aclocal.patch 3851 RMD160 93313212e681430a5e0133a40ec3e456d4492aa6 SHA1 3a9bea440332fd4a2e720fb7fbb2116ed7a2a4be SHA256 88f8ed94483883af584167a0fb942ddd6b95062cc86020b425aa938cf93cdf24
 DIST xgks-pmel-2.5.5.tar.gz 1006581 RMD160 0741abd3521821969dc03a2c9960956470c929b4 SHA1 3acba765ffbe85d63e0f8fb1bbe2fce1b77cbb5f SHA256 43a198aaa4d9497597e9253be19afc60d9dedda63a1fbcd718f77454d27adbb4
-EBUILD xgks-pmel-2.5.5.ebuild 2049 RMD160 782a86e90cfb8b39a27332b279e71e3e7a5c6c21 SHA1 8d18897bf29b7a1b04b25422e17184715101a7e8 SHA256 f5f7783ae28169d4128e140cbb74ef6dc0127d5e325109ba4d0251cd784bfad5
-MISC ChangeLog 828 RMD160 1705ad15973115f4fd012ba3aae510c658e9a187 SHA1 fe0b5fddae89f68b16c276afef7469f90e7c1283 SHA256 ded12ff75ce51f7ee60a794e6410889e600ea8273f840bc23bd782c7a7319f6a
+EBUILD xgks-pmel-2.5.5.ebuild 2068 RMD160 71f52a27ad0e4c51fadb8efe29b8f27447b34026 SHA1 78bddfbdbb331a090b45555f0661cbda4fcd5e54 SHA256 1a40e31b1b762f1bba10315b5ad403d6252073cf46008c80205996eeb916bde9
+MISC ChangeLog 950 RMD160 0416e7121f059188db807473b462f43f4ad9d701 SHA1 7dfd0d0bd5009d1dceac29fdd3094af4c7482b55 SHA256 5fbd66d52667270557491920ed3f8526e56f4f81db3529d0a4fe9c69bc6aa2d0
 MISC metadata.xml 456 RMD160 50e3387bf66815aee586f47abbe91593cb0e2fb6 SHA1 c149a97cccc5591a90f28c8392cfb9b32a6e276b SHA256 b24e61c19afcd82da69364232e0281c6b3b0dfdd1eeb0d9eb17243b253c19329
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAksZeLIACgkQAiZjviIA2XhGsgCgp8BXAmuATkwys9XtrCBuEgWn
+YMUAmgKzdFCFbNdNC1FRPqQ0yjgEnRrS
+=DJWI
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild b/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild
index b1a0e7b26d9f..df74926de9b3 100644
--- a/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild
+++ b/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild,v 1.3 2009/06/08 02:28:16 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild,v 1.4 2009/12/04 21:01:44 flameeyes Exp $
 
 inherit eutils fortran toolchain-funcs multilib
 
@@ -26,20 +26,21 @@ src_unpack() {
 
 src_compile() {
 	sed -i -e "s:lib64:$(get_libdir):g" port/master.mk.in \
-	    fontdb/Makefile.in || die "sed 1 failed"
+		fontdb/Makefile.in || die "sed 1 failed"
 
 	CFLAGS=${CFLAGS} LD_X11='-L/usr/$(get_libdir) -lX11' \
-	    FC=${FORTRANC} CC=$(tc-getCC) OS=linux \
-	    ./configure --prefix=/usr --exec_prefix=/usr/bin \
-	    || die "configure failed"
+		FC=${FORTRANC} CC=$(tc-getCC) OS=linux \
+		./configure --prefix=/usr --exec_prefix=/usr/bin \
+		|| die "configure failed"
 
 	sed -i -e "s:port/all port/install:port/all:g" Makefile \
-	    || die "sed 2 failed"
+		|| die "sed 2 failed"
 
-	make || die "make failed"
+	# Fails parallel build, bug #295724
+	emake -j1 || die "make failed"
 
 	cd src/fortran
-	make || die "make fortran failed"
+	emake -j1 || die "make fortran failed"
 }
 
 src_install() {
@@ -56,10 +57,10 @@ src_install() {
 	dodoc COPYRIGHT HISTORY INSTALL README || die
 	doman doc/{xgks.3,xgks_synop.3} || die
 	if use doc; then
-	    newdoc doc/binding/cbinding.me cbinding || die
-	    newdoc doc/userdoc/userdoc.me userdoc || die
-	    insinto /usr/share/doc/${P}/examples
-	    doins progs/{hanoi.c,star.c} || die
+		newdoc doc/binding/cbinding.me cbinding || die
+		newdoc doc/userdoc/userdoc.me userdoc || die
+		insinto /usr/share/doc/${P}/examples
+		doins progs/{hanoi.c,star.c} || die
 	fi
 
 	insinto /usr/include/xgks
@@ -68,7 +69,7 @@ src_install() {
 	doins src/fortran/f*.h || die
 	doins src/lib/w*.h || die
 	doins src/lib/{input.h,metafile.h,polylines.h,polymarkers.h,text.h} \
-	    || die
+		|| die
 
 	insinto /usr/include
 	doins src/lib/xgks.h || die