Fix detection of parallel jobs from MAKEOPTS to handle all syntax variants. Fixes bug #337827 and #389791. Using syntax from waf-utils.eclass

Package-Manager: portage-2.2.0_alpha68/cvs/Linux x86_64

4 files changed, 23 insertions, 18 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 6880e7002c64..f9b70479e42c 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/icedtea
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.48 2011/11/18 11:01:45 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.49 2011/11/18 16:41:38 caster Exp $
+
+  18 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
+  icedtea-7.2.0-r1.ebuild:
+  Fix detection of parallel jobs from MAKEOPTS to handle all syntax variants.
+  Fixes bug #337827 and #389791. Using syntax from waf-utils.eclass
 
   18 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
   icedtea-7.2.0-r1.ebuild:
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 449596ab0d6b..9c6ebb93ac91 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -17,7 +17,7 @@ DIST jaxp144_01.zip 5964803 RMD160 6844ae747a7e7de289ce263ed06050a512416aec SHA1
 DIST jdk6-jaf-b20.zip 71243 RMD160 40b49d12c39b7010ee917eb671f3c38cd16f271c SHA1 69a54373e169bd7b04a45de6a310a199260424b9 SHA256 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
 DIST jdk6-jaxws-b20.zip 5513069 RMD160 47b2d4fe528d770391e8926299df45cc6f68e9b5 SHA1 08366a70c9e2baa516afc77bb69f9e108e906aa9 SHA256 0c460583898b968a58bf88eb53f90a0e34369e2562d65fb3a143512dfcaeb3eb
 DIST openjdk-6-src-b22-28_feb_2011.tar.gz 45279689 RMD160 2b8f92cdb4d7dd3eb3cbb800a73e1666ee4bf5b1 SHA1 65a60153adbc8bc47fb95bb2b588a9a0b8701c95 SHA256 14a097d45b8c040e984be164a8cefbf22040a9ad57474fe87dd8cf2d0b08328b
-EBUILD icedtea-6.1.10.4-r1.ebuild 11040 RMD160 70eb9dbd86411720d8a52f3e2319edd47e2c8019 SHA1 c2ce27ec75193422c96b05d9223d0298beece190 SHA256 be094c62a02f5b9191131bf3b5f542ca832aac75a9f8afdd171c33c3ab95ed50
-EBUILD icedtea-7.2.0-r1.ebuild 11836 RMD160 3ba41050fe7b6c363f66ccc948d2f1beb9d0e809 SHA1 8c934175f843b6ec2a0adc5349620a2b6d6940be SHA256 f1c85ed8e7eac556fee159dfb6137519c0134c57c536a3197710a530e7801ad1
-MISC ChangeLog 9225 RMD160 3a21205f5ae88e06b92c0b91aedb9048d2a93dc6 SHA1 d9ded03202e04e9833fdfdfdc02bd868326b5d3a SHA256 991eac1697a60ee53a934445bc3aef660531467076596e6aa7cfcf742e174df0
+EBUILD icedtea-6.1.10.4-r1.ebuild 11183 RMD160 c7b9482eda3e40c071ebb17d244319daf72104a7 SHA1 7efef2de78f2a35d2893d86d21f6197a65a4fafc SHA256 76d43131925a40d8b5e147fb7fa3dc6f0c78fc726e4669201bdd6dee3404bb81
+EBUILD icedtea-7.2.0-r1.ebuild 11979 RMD160 4a041f13403fe51333215750b53fa7160d457132 SHA1 1d9e74e5279ece223bfd531b8886a766b9607600 SHA256 e4a5f9b8724447c7f49c12a40f30e7f3646ac042d84e7848ff82ede3fcfc6dd6
+MISC ChangeLog 9480 RMD160 184829989dd48749f7267a3ea6f6e9be33fda612 SHA1 c32f26bfbe172d52f0017cdf2cf0987ec0c9b945 SHA256 3470bba7aacd8cb045f8a1d4f2e6cb64e9c16a4b0fb0b750195fd83c306e484b
 MISC metadata.xml 1567 RMD160 7cb547ff92d8896cdbb0dd53aa682fe31d027b4e SHA1 c42d533a391f98fa303b591a4ba1471e0de94b7c SHA256 596df17fd33825a2abb567685bda63f6ff56cbfa616911199855e3fac8bec5e4
diff --git a/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild b/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
index 57d65afb6ab9..e9cf0da6935d 100644
--- a/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.5 2011/11/18 11:01:47 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.6 2011/11/18 16:41:38 caster Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -189,12 +189,12 @@ src_configure() {
 		die "Install a GNU Classpath JDK (gcj-jdk, cacao)"
 	fi
 
-	# OpenJDK-specific parallelism support.
-	procs=$(echo ${MAKEOPTS} | sed -r 's/.*-j\W*([0-9]+).*/\1/')
-	if [[ -n ${procs} ]] ; then
-		config="${config} --with-parallel-jobs=${procs}";
-		einfo "Configuring using --with-parallel-jobs=${procs}"
-	fi
+	# OpenJDK-specific parallelism support. Bug #389791, #337827
+	# Implementation modified from waf-utils.eclass
+	# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
+	local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
+	config="${config} --with-parallel-jobs=${procs}";
+	einfo "Configuring using --with-parallel-jobs=${procs}"
 
 	if use_zero ; then
 		config="${config} --enable-zero"
diff --git a/dev-java/icedtea/icedtea-7.2.0-r1.ebuild b/dev-java/icedtea/icedtea-7.2.0-r1.ebuild
index 79a44cb2afd0..e4536d25f8db 100644
--- a/dev-java/icedtea/icedtea-7.2.0-r1.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.12 2011/11/18 11:01:45 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.13 2011/11/18 16:41:38 caster Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -204,12 +204,12 @@ src_configure() {
 		die "Install a GNU Classpath JDK (gcj-jdk, cacao)"
 	fi
 
-	# OpenJDK-specific parallelism support.
-	procs=$(echo ${MAKEOPTS} | sed -r 's/.*-j\W*([0-9]+).*/\1/')
-	if [[ -n ${procs} ]] ; then
-		config="${config} --with-parallel-jobs=${procs}";
-		einfo "Configuring using --with-parallel-jobs=${procs}"
-	fi
+	# OpenJDK-specific parallelism support. Bug #389791, #337827
+	# Implementation modified from waf-utils.eclass
+	# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
+	local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
+	config="${config} --with-parallel-jobs=${procs}";
+	einfo "Configuring using --with-parallel-jobs=${procs}"
 
 	if use_zero ; then
 		config="${config} --enable-zero"