Fix concurrent make (bug #230535).

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26 x86_64

4 files changed, 47 insertions, 8 deletions

diff --git a/sci-visualization/opendx/ChangeLog b/sci-visualization/opendx/ChangeLog
index b80cc2d6a3ee..73ea1155005c 100644
--- a/sci-visualization/opendx/ChangeLog
+++ b/sci-visualization/opendx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/opendx
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/ChangeLog,v 1.14 2008/08/06 18:55:22 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/ChangeLog,v 1.15 2008/09/14 11:25:38 spock Exp $
+
+  14 Sep 2008; Michał Januszewski <spock@gentoo.org>
+  +files/opendx-4.4.4-concurrent-make-fix.patch, opendx-4.4.4.ebuild:
+  Fix concurrent make (bug #230535).
 
   06 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/sci-visualization/opendx/Manifest b/sci-visualization/opendx/Manifest
index 9b54f20c0be1..4065e8918e9b 100644
--- a/sci-visualization/opendx/Manifest
+++ b/sci-visualization/opendx/Manifest
@@ -3,19 +3,20 @@ Hash: SHA1
 
 AUX 20-opendx-revdep 44 RMD160 9b68b96b8f513a78a51249c7705d93d665bb3d2b SHA1 9389ea70249fe8149a33944a07466dddc9c1ae8d SHA256 fa96c22f9e7870a60c27c02cceb6bb3782d40c07ac53f19d7be7941a12347a01
 AUX opendx-4.3.2-sys.h.patch 1200 RMD160 f3658ac7fd0582b69ab32df5cc23d77f8d5364c8 SHA1 b4eed91d8ad2df57241a74d4ef8452ad0d171296 SHA256 919299f0fbb6e9891a8792641ea58720ae6bb95d4ffc3f6a20cae7b8e2d1729b
+AUX opendx-4.4.4-concurrent-make-fix.patch 1191 RMD160 3baec5669230df96def294192eea372e59303537 SHA1 ec7b128b46bbf897ffbf0f08a12d36fb499f7241 SHA256 5c1cdc25105815a944cde02550aa7196155be6c07ac4fe697e7ff2ee7d4a6d14
 AUX opendx-4.4.4-gcc43.patch 4086 RMD160 27f18b5228d998e32033c2eff21fb56d53646386 SHA1 55a35cf83fab1828f0aadb0c27222be34ad50710 SHA256 8fdbf9e67f31671ca9e775f9bc22dd168ed981aaba43f9152b85b95592ca86af
 AUX opendx-4.4.4-libtool.patch 319 RMD160 2b501064b72e84f791ee3c3b3ac3bd83d6fd0de7 SHA1 6548dae81cb9fdf83f2a0a1095851ef40578de0e SHA256 1bde8364f7a40322f9812f0fbb0403ab8f52f946318bd548e7fa63dd887c291f
 AUX opendx-compressed-man.patch 496 RMD160 670de4ea728a3f9b5c02f7950ce88c58d1073a7b SHA1 56dd8a6d9710264ae3b45358ad2eb48ad00d6d98 SHA256 2877bd95b592548c1a0a532b49131b84f5ab1077714ef16d768f3e33f50d6aab
 DIST dx-4.3.2.tar.gz 9904514 RMD160 855c9ce1bdd953873178eb2840b68cd35cf2b0a2 SHA1 e05c28b8db33c9e647bede27d1cc3cfd4146d524 SHA256 e128562b952687e988b93e36a59af2aa5aaf6d491a88d583fce89d3979e96515
 DIST dx-4.4.4.tar.gz 9676049 RMD160 db4cff78c9712a6e1e19265b0f42fdb87ab5ff7b SHA1 c8e4d72d169675c66acd2135599b211d80810f76 SHA256 a9915e17d49c5499edd3df69ffeac0b7ba24f8b38ddf7509712b48eb3c21f1ff
 EBUILD opendx-4.3.2-r1.ebuild 3265 RMD160 82c61c6979175d1fd3f4f6090ceb9dd7e42fcc18 SHA1 6242c282c982e034ad24351c11188906d9bd5783 SHA256 4ab8258bfc54aa188ff6bb7e7d827caebd57597248d059d0c91c1a3755b828af
-EBUILD opendx-4.4.4.ebuild 3624 RMD160 5a05cb5bd11528528ec5770c1431d375a2444df4 SHA1 d993a276b45bff4e5e247f2c0bb6c2a7daccc81c SHA256 7c266331a5c03744b9863e095f9f7629d13e81fefbef73ee11c54025792b9a2e
-MISC ChangeLog 4339 RMD160 cc3c852c5d742553712fe721581e6de6b0929354 SHA1 1486c88d19ceef7ca115252b516802edf29cf57a SHA256 de65cb8340597bd7562346dcf8c63541d418f7396030017df62f089b9c2741db
+EBUILD opendx-4.4.4.ebuild 3674 RMD160 5869d1ec5aa2a0ddeef443c392648ed4bc8fb2a7 SHA1 48401bc6db94e0c05b5a49e736700ff0d71c3b76 SHA256 7780ca73f0ff53e973b281d7024ad6f48abab627a8bdd40d1417ccabd1ef209c
+MISC ChangeLog 4503 RMD160 a5936dedee47edec43a4c906bfeef5e45ed78321 SHA1 5ef4938b5ec0cb2583783a057d62144c8365f8f9 SHA256 78390e2c9e9e72dab493e7686355eef72cf03e65dafcf7d59e8b3f0c83464fa1
 MISC metadata.xml 361 RMD160 404d4eb0602277959498f65685d76eb4350a470d SHA1 f683e24f437dc6a5254d2d4c814c48cfd7d3740e SHA256 1be0f8158e35295c498714d8ad1b780a6fc749bee37bdbb13ad9eb163bbf38f0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiZ86sACgkQOeoy/oIi7uxAswCeLlRHynIv5/HcINROk6PfN85K
-I2MAoI6pU0/rVYh+c7WmmKemOHI7AzSZ
-=5rfy
+iEYEARECAAYFAkjM9I0ACgkQchej4aZK9/fImQCcCFjvVBu02CR/l2nzWs1D75h6
+8qoAn2gw3s6vjPlbIv3JQgveiohFkK/1
+=L1Rh
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-concurrent-make-fix.patch b/sci-visualization/opendx/files/opendx-4.4.4-concurrent-make-fix.patch
new file mode 100644
index 000000000000..816b72c104a7
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-concurrent-make-fix.patch
@@ -0,0 +1,33 @@
+diff -Nuarp dx-4.4.4-orig/src/exec/dxmods/local.mk dx-4.4.4/src/exec/dxmods/local.mk
+--- dx-4.4.4-orig/src/exec/dxmods/local.mk	2008-09-11 22:31:38.000000000 +0200
++++ dx-4.4.4/src/exec/dxmods/local.mk	2008-09-11 22:33:44.000000000 +0200
+@@ -14,15 +14,15 @@ user.c:  dx.mdf
+ 
+ dxcm.mdf:  ${srcdir}/dxmdf.src
+ 	-rm -f dxcm.mdf
+-	cp ${srcdir}/dxmdf.src tmp.c
+-	$(CPP) $(INCLUDES) $(MDF) $(DEFS) tmp.c > dxcm.mdf
+-	-rm -f tmp.c
++	cp ${srcdir}/dxmdf.src tmp-dxcm.c
++	$(CPP) $(INCLUDES) $(MDF) $(DEFS) tmp-dxcm.c > dxcm.mdf
++	-rm -f tmp-dxcm.c
+ 
+ dx.mdf:  ${srcdir}/dxmdf.src
+ 	echo MYINC: $(MYINC)
+ 	-rm -f dx.mdf
+-	cp ${srcdir}/dxmdf.src tmp.c
+-	$(CPP) $(INCLUDES) $(MYINC) $(MDF) $(DEFS) -DCPLUSPLUS_UI -DEXECUTIVE_MODS tmp.c > dx.mdf
++	cp ${srcdir}/dxmdf.src tmp-dx.c
++	$(CPP) $(INCLUDES) $(MYINC) $(MDF) $(DEFS) -DCPLUSPLUS_UI -DEXECUTIVE_MODS tmp-dx.c > dx.mdf
+ 	@echo '/^ *$$/{' > stripl.sed
+ 	@echo 'N' >> stripl.sed
+ 	@echo '/^ *\\n *$$/D' >> stripl.sed
+@@ -30,7 +30,7 @@ dx.mdf:  ${srcdir}/dxmdf.src
+ 	cat dx.mdf |sed '/^#/d' > tmp.mdf
+ 	cat tmp.mdf |sed -f stripl.sed > dx.mdf
+ 	@rm -f stripl.sed tmp.mdf
+-	-rm -f tmp.c
++	-rm -f tmp-dx.c
+ 
+ .y.h:
+ 	$(YACC) $(YFLAGS) -d ${srcdir}/$*.y
diff --git a/sci-visualization/opendx/opendx-4.4.4.ebuild b/sci-visualization/opendx/opendx-4.4.4.ebuild
index 0f9b0406d22a..a8f192da9e32 100644
--- a/sci-visualization/opendx/opendx-4.4.4.ebuild
+++ b/sci-visualization/opendx/opendx-4.4.4.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/sci-visualization/opendx/opendx-4.4.4.ebuild,v 1.6 2008/06/29 11:46:50 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/opendx-4.4.4.ebuild,v 1.7 2008/09/14 11:25:38 spock Exp $
 
 # Set SMP="no" to force disable of SMP compilation.
 # Set SMP="yes" to force enable of SMP compilation.
@@ -76,6 +76,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-compressed-man.patch
 	epatch "${FILESDIR}"/${PN}-4.4.4-gcc43.patch
 	epatch "${FILESDIR}"/${P}-libtool.patch
+	epatch "${FILESDIR}"/${P}-concurrent-make-fix.patch
 	eautoreconf || die "Failed running eautoreconf."
 }