jobserver fix, #304117

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

4 files changed, 31 insertions, 7 deletions

diff --git a/sci-biology/vienna-rna/ChangeLog b/sci-biology/vienna-rna/ChangeLog
index 5b7ecbc02eeb..06a83d769fdf 100644
--- a/sci-biology/vienna-rna/ChangeLog
+++ b/sci-biology/vienna-rna/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/vienna-rna
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/vienna-rna/ChangeLog,v 1.29 2010/02/09 11:10:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/vienna-rna/ChangeLog,v 1.30 2010/04/03 21:41:51 jlec Exp $
+
+  03 Apr 2010; Justin Lecher <jlec@gentoo.org> vienna-rna-1.8.4.ebuild,
+  +files/vienna-rna-1.8.4-jobserver-fix.patch:
+  jobserver fix, #304117, thanks Myckel
 
   09 Feb 2010; Pacho Ramos <pacho@gentoo.org> vienna-rna-1.8.4.ebuild:
   amd64 stable, bug 298769
diff --git a/sci-biology/vienna-rna/Manifest b/sci-biology/vienna-rna/Manifest
index ac84cad4b323..7ee08afff2cd 100644
--- a/sci-biology/vienna-rna/Manifest
+++ b/sci-biology/vienna-rna/Manifest
@@ -8,18 +8,19 @@ AUX vienna-rna-1.7.2-gcc4.3.patch 2738 RMD160 c559c768b8c4e9b92f9bdbd66f5e3ff12b
 AUX vienna-rna-1.7.2-gcc4.4.patch 8935 RMD160 134d76cd6fd3a5988b099dad902e65c49c5607bd SHA1 bc1b6d1012a6078fd641f135655ea1eb1e072b28 SHA256 70a9624a5ee0272fb3e558de0a55479f33307e0abca6532df1ca38c734055a82
 AUX vienna-rna-1.8.3-disable-gd.patch 655 RMD160 e918a233e1f1c8f3bee8c721ca793dcde60b2bcb SHA1 97a6f785187ffb9005696a8fa10207b66065b5b0 SHA256 f84d41142fd7368d809895b2feec057ed69d0022c6bfb2b521c7491295e56990
 AUX vienna-rna-1.8.3-gcc4.3.patch 2825 RMD160 564b0904d3442e1a835478c405771b288593668c SHA1 876fd2872300191131681d965b0b5f1a2c1cbe8d SHA256 1bea24f0fb851f8ec54973c14eaebbd0c27658b05c6a670557b45a883f0b1d57
+AUX vienna-rna-1.8.4-jobserver-fix.patch 681 RMD160 c72649a57ece3d511cc18f2cac47c7ab103c258d SHA1 0c5e67318c826f12553cf8cb807c3061c1e70574 SHA256 bec5248214ba303d85afda03e663f84061258cd06f2f50773011251299a42b84
 DIST ViennaRNA-1.7.2.tar.gz 1298982 RMD160 768f53ba9e0f784b066ae485451eb0abd6f6631c SHA1 36a4bfcf88599afc479be14bc324ef4ce9d629a3 SHA256 202887653033de9e50644acd5c3d8607f215d6c84eef9d68a936837edf71a00e
 DIST ViennaRNA-1.8.3.tar.gz 1706482 RMD160 988932b0b87ed708bd52fabca6fc42c21a9562b4 SHA1 ddbf130a9f0c1d28f1a2afcb4da16172c48628a9 SHA256 84feb86ebfc03c95ca82296cf255eee022da9733b38b452ce1b10084dc5f0108
 DIST ViennaRNA-1.8.4.tar.gz 1397733 RMD160 29939511e560d898164c21d2452316b0a3a6771e SHA1 6e3a0751849f1b43d4751ce64670a21a3718f040 SHA256 90a5408d05f7dd35031a527d1823607daa8fc8f394b438fb072be78afc7174b7
 EBUILD vienna-rna-1.7.2.ebuild 2278 RMD160 68d114c0f1305c08617bca9fe255f3c0c0b82ee8 SHA1 868dda0408447c202e29a5e4c302b01fe9109848 SHA256 291feae43b88b013158646c57cc021d61be3019eb2539341d01d3ee62c58a134
 EBUILD vienna-rna-1.8.3.ebuild 2353 RMD160 b4a0da4e43d0c49fba59436e718a2cfa2a6e303d SHA1 18d33c2e4b5414d170fc5e58315823b39fc037c4 SHA256 b4201dad5b60b862fc16ab69cc1655463bfd28bcbe153b3ec1d9f3a7f2d0fa0c
-EBUILD vienna-rna-1.8.4.ebuild 2366 RMD160 c266eaa4338b105a1659d7e7392337df60171b7f SHA1 e860da16f4648b704936134900dc9ede09164f43 SHA256 d6b4ea413cce2172d1cc257d493be74bd7d8c9ed5c589288787c96b50d867a0d
-MISC ChangeLog 4380 RMD160 6c0434de7f86248c208a905dd9cb7871d6c8f811 SHA1 d02b9e11a91720eb9a48dd10cb4c8572fc52b70d SHA256 e4c48cbddff8ef5970163501b486e11e5ede4e749e04a176560b1440cc2ff022
+EBUILD vienna-rna-1.8.4.ebuild 2405 RMD160 e88691d4b23d2f8e6856022b692b74522fa5a78d SHA1 25cc55c648d39c0fce9cabd381ebe0603f1a3d14 SHA256 c78a85279314697f399e067da5138fffb279027feb80e3d8b504f8c64798f5ac
+MISC ChangeLog 4539 RMD160 a9a6a9f9047081fabe8d87666c36791d7baaeec9 SHA1 eadfc558936bb58d73cd212f80929367d78f86a1 SHA256 7912d34e10838b1e2096742d21afb94d7109ed4db792854d3b71e0953ab32c1a
 MISC metadata.xml 1210 RMD160 41d50f7af8428b196c4ef855b68dcb657588bb34 SHA1 08f8e1aa88086fd9a3f5fa03fa46c31e12a3f776 SHA256 9c8b3f60f6098accff7c67f26ea07cb5b57e9ed8eae5d3d03949f1718ab6517e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktxQpMACgkQCaWpQKGI+9Tp+ACfXpGbAW0D5ZnIZZwo/ANNJxPc
-UlwAn0toUSuluE+YTxSRDXywqGNshC97
-=fql0
+iEYEARECAAYFAku3tiUACgkQgAnW8HDreRZoXQCguwDWsdpDnlYWumBMDo+Q75Rv
+jUUAnRgflXrz7pcstNP2sn00JqMzi+QH
+=R9ZS
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/vienna-rna/files/vienna-rna-1.8.4-jobserver-fix.patch b/sci-biology/vienna-rna/files/vienna-rna-1.8.4-jobserver-fix.patch
new file mode 100644
index 000000000000..cfadc70bc6f6
--- /dev/null
+++ b/sci-biology/vienna-rna/files/vienna-rna-1.8.4-jobserver-fix.patch
@@ -0,0 +1,18 @@
+diff -ur ViennaRNA-1.8.4-orig/RNAforester/g2-0.70/Makefile.in ViennaRNA-1.8.4/RNAforester/g2-0.70/Makefile.in
+--- ViennaRNA-1.8.4-orig/RNAforester/g2-0.70/Makefile.in	2009-10-13 13:44:40.000000000 +0200
++++ ViennaRNA-1.8.4/RNAforester/g2-0.70/Makefile.in	2010-03-27 21:39:21.000000000 +0100
+@@ -116,12 +116,12 @@
+ 
+ 
+ clean:
+-	-(cd ./demo ; make clean)
++	-(cd ./demo ; $(MAKE) clean)
+ 	-rm -f $(OBJ)
+ 	-rm -f libg2.a config.cache config.log Makefile.bak config.status
+ 	-rm -f ./include/*.h
+ 	-$(FIND) . -name "*~" -exec rm -f {} \;
+-	-(cd ./g2_perl ; make clean)
++	-(cd ./g2_perl ; $(MAKE) clean)
+ 	-rm -f ./g2_perl/test.ps
+ 	-rm -f ./g2_perl/test.png
+ 	-rm -f ./g2_perl/test.jpg
diff --git a/sci-biology/vienna-rna/vienna-rna-1.8.4.ebuild b/sci-biology/vienna-rna/vienna-rna-1.8.4.ebuild
index f8ee792de913..c01e44f59139 100644
--- a/sci-biology/vienna-rna/vienna-rna-1.8.4.ebuild
+++ b/sci-biology/vienna-rna/vienna-rna-1.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/vienna-rna/vienna-rna-1.8.4.ebuild,v 1.3 2010/02/09 11:10:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/vienna-rna/vienna-rna-1.8.4.ebuild,v 1.4 2010/04/03 21:41:51 jlec Exp $
 
 EAPI="2"
 
@@ -26,6 +26,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.2-LDFLAGS.patch
 	"${FILESDIR}"/${PN}-1.8.3-gcc4.3.patch
 	"${FILESDIR}"/${PN}-1.8.3-disable-gd.patch
+	"${FILESDIR}"/${P}-jobserver-fix.patch
 )
 
 src_prepare() {