Backport makeopts_jobs to older ebuilds to stop parsing MAKEOPTS directly.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

7 files changed, 41 insertions, 61 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index ca35528f7d87..8a25ed92c8c5 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/icedtea
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.129 2014/11/02 08:28:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.130 2014/11/21 09:52:17 vapier Exp $
+
+  21 Nov 2014; Mike Frysinger <vapier@gentoo.org> icedtea-6.1.12.7.ebuild,
+  icedtea-6.1.13.3.ebuild, icedtea-6.1.13.4.ebuild, icedtea-7.2.4.3.ebuild,
+  icedtea-7.2.4.7.ebuild, icedtea-7.2.4.8.ebuild, icedtea-7.2.5.3.ebuild:
+  Backport makeopts_jobs to older ebuilds to stop parsing MAKEOPTS directly.
 
   02 Nov 2014; Sven Vermeulen <swift@gentoo.org> icedtea-6.1.12.7.ebuild,
   icedtea-6.1.13.3.ebuild, icedtea-6.1.13.4.ebuild, icedtea-6.1.13.5-r1.ebuild,
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 6bfa67cf6f8e..f1b2d84487e8 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -53,31 +53,31 @@ DIST openjdk-6-src-b27-26_oct_2012.tar.gz 45789350 SHA256 044c3877b15940ff04f8aa
 DIST openjdk-6-src-b31-15_apr_2014.tar.xz 33245892 SHA256 362d9bf20e91393b52dd0513896d39831cf320c49bd4bf1e28124f21569b72eb SHA512 30156721f0dd111e2f70193ce093c64fb8c4e6ace966163067a77276143bc205a878d91cf60464b3203276ff2b5349b3c5542e86b35e4d61f23a785b1910e951 WHIRLPOOL bb4a6eb700aa06233cc753394afb750b597d65f6a83ce902d37bd72e8455d689f0a5551f2cb0c2b72b29eb04f68ef2aae4aabf7cf04cc2d339bf3111c2bae8ba
 DIST openjdk-6-src-b32-15_jul_2014.tar.xz 33267124 SHA256 9a5ad1b599953baac1b6b34189b9487ac5dcdb367aac5cc0aa5aa49700e73871 SHA512 dc565c31dd0320fc3fb9f051fe69ed078d2533311fb5d32d69b6cb081f872a08a704a88ce889382da1362c70db37ec90c1336ba901ae4a4461a0a13b560948f9 WHIRLPOOL 16feed91a6d629d1cf3c3adb07f1e384698e61dab9606846edee85a48a9fa93f8966b237fe9cb3267dd3ecec3a72ad3c57e756f368e40c3dd71be574e6fd7aad
 DIST openjdk-6-src-b33-14_oct_2014.tar.xz 33476800 SHA256 cabc35587a90fa81edd8ba8537c0454348c37456de27e407bbb66d52031a1293 SHA512 e3e195b069101c352ae8ed8f59558a464ba61c9966add815cb58c9151c8fefda721dd1650ebd335350af95cbebdd3fedb1b4ac2736fb2625bb83f13b94a85c8c WHIRLPOOL bcd51fe1ce52ec275ef24d03914f0d151a8765c432713a9bfef39618c01587dc7f9ff9a58b86785761c4b69130afa643964c6cf5caad13d7778baa0a346ea291
-EBUILD icedtea-6.1.12.7.ebuild 9709 SHA256 53c329c2ee17f8e7961b83238e30ef9f29c56591dabfd5be572d1a7f5941ac98 SHA512 a89208ed172c4a87ce4237c14b3c5c4f76ebd5b42a19b1cfc466c2ac5530fc2e7c277754175ca29879f1e769c3349e9e0a401dae61129d1707d931bcd88a3e0e WHIRLPOOL dd3f70844a9d9566c77c9091b252ccd0b1a5a10b5b48873d3053bcfc393a769ac6f0753ec2b19918e8fe654e201acca3ce63c18255e3acb1a58b62a272b9d977
-EBUILD icedtea-6.1.13.3.ebuild 9977 SHA256 7e0d04645cc447485a45f0e239e5cdc941a5a82a9f5e27bc09615805f70da09c SHA512 642c65d1c66f00ba56fe85b7999d83a750956bc4f711d5e3b3da9fe3c0804e2305b99ddbaef078426293440a5416f7ad42ccd357126a5bff7f064852145f7de0 WHIRLPOOL 608d254f483bda8babfc8f2c5609efc8ccb131b43bf1357e7e3ddb9bde4c6274af50b784736ce76ece5512c207d79f347e8e93863c608f8eb3d2d0db5f8c8880
-EBUILD icedtea-6.1.13.4.ebuild 9993 SHA256 3f9f4e557d3f1f2138ed3b180a4c5e4c8ec1ca89eac7995b4bf59971f44873e5 SHA512 8ad9a95d279480757725fb28727392fa145d7283e0ce98079bebc9e14d35279a766ea8468b88e49726edb2cbdbb27dd18db08c821437de33b47e765cea3c0201 WHIRLPOOL 8951982bc44dd06b5f5c782b4c9b07688ef8ff5fc1095f4afb36084ab6b1494caf8a057ce7debd5353a792263e37e181683bb2ffc846aa44e6d18cd8f0a28f15
+EBUILD icedtea-6.1.12.7.ebuild 9389 SHA256 dc5594218d79682ccd5fba6b7e9562365ee64f09f6ab8a1707a855b9317c01b6 SHA512 754038b9536c0a9ed5974dcdb290ca6906c88fbb031fac8a56b545abded21ea8f5e3a135435d69548ec2b7500cafe2b7f9c0105583479e16199671102fb02a1d WHIRLPOOL e3d63b8f55cb8510e8617545d7d583613ea6d862e037b9f80e30c3e7ee882845cef1615836b167c3ccc19f8294df32b848feba6c41a125ccf27fc570195326c3
+EBUILD icedtea-6.1.13.3.ebuild 9657 SHA256 b10b767078fb67b044181f542e40ac173e81522fa48f63de7f11a6a991490cc9 SHA512 5e54883eacde36cdce2097f7ebb1b2996db960f5ea3de35f15a61ded640798a378e1a0f77414b898dd703abf14a8c5fa818ce988aabc15ac9c44854bf8a88460 WHIRLPOOL 4a3b740c5a7f0c3a74026b4d582937530c2c4aca7c29b2db60a8de78cb4a678226cf0ccb888e56ebadda9b90578180c7d955fd13446736774305e002ecfb8bfa
+EBUILD icedtea-6.1.13.4.ebuild 9673 SHA256 672cfa1cdefc4e4614e11c9a15fed5dc3809faebfbe2627bef1b9bdb22cd02ef SHA512 9e221bde5ee5e6b6c2b52673dcbe40e171889d3bf8edd979f577dfe655f9162d27ef56dc195457ee2f302f68f1bd2d86bb7d5f55f734e3b9b973a303947ae335 WHIRLPOOL 0d20e80766491661ab6e41a638829eb7f6dea1a89dc564b149e71cd156856884ec9e98cfd97bc3a8038725e1f068e53872917ccb230e67da644399ec98546d72
 EBUILD icedtea-6.1.13.5-r1.ebuild 10310 SHA256 630c0dc5cd38f896612b2c072880ca51e8449501fa3b0a7ecb9c56f169c30922 SHA512 b0f9dd8ba23400513432e008fdc43942faa715b7d4c3c2ae2cd6c45d12d49561429035aac382d2922c516d5a4e469fcf0272e996bfe7fe7917290ed883b9d67f WHIRLPOOL 9dd43d1938062bfac15899d7834c46819b8ab8a68e7d1ede21f53b162847e4d123fccb565c7890b053278f0e06240ef285fcb610e6216ba50e7ce9bff5d8b91a
 EBUILD icedtea-6.1.13.5.ebuild 9968 SHA256 dafefb268e7a799bb78edb82ed9e24aeeddea8fe8ba35a2b18e5adf8f3e67ea6 SHA512 73d88b83607c0e0403f5b0dce1aa0d56720583951212fccd9e3bfe07e8106b9cba108a748d167c92980bf2938b78ea0fd6e10399ebb80d980b021426ed1ee28e WHIRLPOOL 652b644722d088432ba7dabb971874f05a64f833ffd5ba57bf767a54e0e2d239d99e263f411970d1e1eaee1513efbf4a8c4fbe3aa530772870ccbfda063a8eb8
-EBUILD icedtea-7.2.4.3.ebuild 12276 SHA256 b28c26295f8ceddcd9cf8df944b379a80d4a5e9241bb07b0ec27ab5815ee25c1 SHA512 89e3aea48e15952898a93ab337e24fbc20dada18c142f09ea2ae469ea21571bad9678b64796aef69948441eb9a8322139528cf26302e2a9cc394d4331026cdad WHIRLPOOL e4e680b6479f906710ccb230d00dd24712e1117bfcd1abbee329463891ed3084e4734c1f2167d20470c004c3471933e067d847453005f8a68c2c276702541385
-EBUILD icedtea-7.2.4.7.ebuild 12175 SHA256 aaa82cfef304c72558f75931914b1ef82866d3e203c3bda952eee1d8ea12d8c5 SHA512 b9cf4636effd4afb4b6a387346f51be38d695c057d31df292c0349276f8c5876f28551c0e6ad561c32e60acceafa4c66874d4e81bad5229ac048d4cf1e26b518 WHIRLPOOL 0d1d55eb5b1042f551cbcde8eb95d4dd55986254bb0a3a21fa3ebfeb1abf8271755eb32900c11d98c9b698e857147741d0a5a00d85630819f83305c9273052d7
+EBUILD icedtea-7.2.4.3.ebuild 11956 SHA256 a2d192287d4894ed6ad787606669ead58da4bc4f309fdafb3beffca99d3e576c SHA512 f50aeb1c6cf29ada67c9d4f596fc4cf00b89a8816b62c20a62be4a5a3c3aeba73ea5ce10bf3e66d3813427f10314cf6a82fd7c3551a82b9ed5012e65be322f91 WHIRLPOOL ce97a533ebf15dcfaae11ecf9fd2cb4ad8f8985970bcc4abbac1008d1c216c08c1c1e74836b8c0ade0d6e1ed16d324600d03a3a893152fb284d0ae07940bffb0
+EBUILD icedtea-7.2.4.7.ebuild 11855 SHA256 00584acc2675c36c65932fb2248e721d8075cbbe6c4e87b0a5b1b3503045052f SHA512 9a64e09f8205c15178b3d82087bd0f4dd15c2418ef85535bdf9da93edbc3e396162ecebb4082c60209e0425d7ac66e3596a0e8f4a088c850d0ddc3f7b263a86b WHIRLPOOL 8ee4719acfc97aad23ace1b3e400bff00be75cb51aa11aa0f08b95793254e6aa0596fb619cbd194efbe8af0b68599e2dc7eaa89386aa275961ea3604ec5d8805
 EBUILD icedtea-7.2.4.8.ebuild 12134 SHA256 f06bfe6d54a9c4336426a5494f72197fea72dbf4b2d9231fc67357b10e9dab64 SHA512 391a178490e49095691e50b53d8d451a6c81cf75ff93ac5c75cc294dcb070a3eab5f422557428c49846f697043a6f05f56b3521159b9d9f063e5159f50467ed9 WHIRLPOOL 9acaeaffd6915817c09c867ca509baa935d1d4914d3c5dd1ddc1c0cb20960f55baea6adfcf284e669751df06d8a2fe8f98fab5045ae277da4263dfa3e6937fe0
 EBUILD icedtea-7.2.5.3.ebuild 12294 SHA256 f47d6244b3ef4ecf9dd54e36295f1e49a048c49f59962df761b9c30a2cec6c60 SHA512 b9e4a7ec81a69ece5dd8d036feaf053522af07068ada31a7d2fb88b9a415f48811e05e8dca98ebdecfa70b37c2da8055f7c3d169ca315d206cd9692bc44cb561 WHIRLPOOL e67896ea7f8b497b50d68fa93da5744c4b5f6b504fe84b5ee91c6b08a8349428216945f12a205f82bb43b707d98939156e551b97cb59fae19d329d95c403e15f
-MISC ChangeLog 29176 SHA256 a6b5f7506e38cc15a1ba5241ee619251bf54ed03ac04638e6d2a5f06262e5e30 SHA512 f24077e699bdbb4a788201c1cf9cbfb609799a6be97952ec0c1d14dbe4251201433346508b0f0b14295a6ae1a4c2f11ba17dd85dac90c9a4021576c0ba38d493 WHIRLPOOL aca67c8c42906f3b100f5c5405f0b816705f035dce14bf4041e17f73e74289fbbefb373897eb9957a85f73316d5c30d67691e667a5ce9a22c2eced6b687090d7
+MISC ChangeLog 29480 SHA256 1295f2ea38bc8f2faa8d11eacd942fd62c03cab4109b1926c88a9056a6f94ff2 SHA512 6f6f37fa34dbc2eaee1133c09fc5d2e76cba2c3736e43615861a1d80e5d8357d85da2e2ec865db04d5e3a4713cbef212d976de9cc9637f3fdb254a61280d7959 WHIRLPOOL 54fa5384d82a06f6b08f90862f7acd28be2d3af017c51ec17d7cdc3c7a1a9f2cae4d6f9180b36446a7bb506681387ae701e58bf12531eba773c53adf508d3495
 MISC metadata.xml 1921 SHA256 442ec2cd0931b287f5a2b6365aaf8fcf9306fcb997dfed2c35a28afe2d98043c SHA512 fcc6baf97eea30453bfdf13408c5f7ba56e46a7eade90280a2f0f31c560e4a855a45d51590617744e1102ef430a68c2b8ea23bbc309c02c736f3d0e53b2398ca WHIRLPOOL 134a129060f1c5c5855c86f60bd5b8198c5d37ae985930900abb84f5f7512d3bf171699827a6b0e71dc00fd57c1be5bb74257f942e3a7ce2ec6d57464be952fb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUVeqyAAoJEC7dUkA7aK9H+1gP/1WpHSNtzUHxCkgzKoxXgQFh
-RaKX95cOu9KGCDf7uYcNFU9j9c1yPXRY20g6NWx4V1KQoYbMCqfTHS9IGJLDruau
-pvZEXM9a6emxxlM32bLut6sPWkf7672mh4iQdLp3Y/d4OLAQWc2e49SL+GkYLokf
-zHdKjD5g/9PQaSK1j/u38kZcRKyQJ7J50T6FbEJh/+olm5SBQhl4kHPvObphUghW
-7FMfAU2onegAuHfHPvRkrOV3m3d+Ms5ziMHO0i5itFR/eIR5Ta6GzwPLsTbfeJML
-WXMugKv2QG+ppNL8qR+tXV6XrtWJGOTnQDkcckeV0hpzjkWtWIJkkZU9iLu29M7h
-Yfg/HhTR+OwP3NQ8W4lZIZeERCoK1V5i3VNSMCxgIWjRH7mAz28iISo4T3nVe0jn
-7akGChTcaQ4HLBVxpdXoxEi/aMWkIzVhGRaBuxQL+wPv0uI4y6c3VD5iqaIfzMxE
-jwbpDPdNmzgmxcdz+Gn/wKneNm1fruy4qWHpsV9FPvbWASFw4+KBXfzqLMiby21x
-Zr302AlTxLnb7YqLDojxEvCyNBjJoD1trqCIg19/VEXFDjX8YrZqC3GfGetTxotW
-dJpxBEnJUQCz7TFYvtTE0o/JLfAzs3ybg2vwjVJ38pMj5/5NYfSlgRdODfa5z6uu
-tx4L7fwbeZ11UDN27kX1
-=0Ony
+iQIcBAEBCAAGBQJUbwtTAAoJEPGu1DbS6WIAg5IP/iCZ0TieFFgYUeICLCiuEjuu
+ikDCnzcjQtfbhEaDa0dI460IxECqsrHbcFCfhg/ZhSIMEmAObNjqODXmSRrdCRLD
+gIaGUSX3QWbOLydiJhPCJzYgomJcPCBhWDcOllV20ECIS8+c4IhSo62/H9Ih5fK6
+T4Q7anWWgMPVvo3HOu2l9YCBmQe9WY/l+D2CZtsnCgkRhjZguHDIOpouZ2tmXUIq
+hos56oUJ2+e0nWBmsBvRDzGhx+w/CsJ5LxP0vkGeeibEPwIcDrJUPYSp4Ahb++AE
+paCJyAneAFePQaecweXjFtMZcPrAkvYHN2zwyf3NZ7keAasSwynJql4nqVgu7pTC
+r+Y1koYzz+s+Oiaum3B2B/i3EDUUsyMkVJ0q7hS7klgE303nRBTdzUbdvaNJb2Wi
+PF/8xOidm1LfiRPeczlxhEQ/NvhuKYwsVi4NstKMFv78lvn/4Q0klvbN6QNLZVq1
+QS+/3mAXNokMVnID9EPhgyK87hX5vA8eYE6rX9o/5mn9HsQjYdUaONvheFFbOiim
+QgdY//9An2SKXS/hStmKxB19eowRJXekINOXr5PAYwlD/2EbGYoWf7/97R0z8bDp
+c5mcHTT2FtjTfEETGeXh+rRo13q/9H9cYNOluzpJmzzlIacm/W1ZyEroBkmaWha9
+CvmX/HGEpwVxEPaJZqWJ
+=WD6Z
 -----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea/icedtea-6.1.12.7.ebuild b/dev-java/icedtea/icedtea-6.1.12.7.ebuild
index d17144434b31..88766f24911d 100644
--- a/dev-java/icedtea/icedtea-6.1.12.7.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.12.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.12.7.ebuild,v 1.5 2014/11/02 08:28:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.12.7.ebuild,v 1.6 2014/11/21 09:52:17 vapier Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -9,7 +9,7 @@
 
 EAPI="5"
 
-inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
+inherit java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
 
 ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
 ICEDTEA_BRANCH=$(get_version_component_range 2-3)
@@ -188,12 +188,7 @@ src_configure() {
 		config="${config} --enable-cacao"
 	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}"
+	config+=" --with-parallel-jobs=$(makeopts_jobs)"
 
 	if use javascript ; then
 		config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
diff --git a/dev-java/icedtea/icedtea-6.1.13.3.ebuild b/dev-java/icedtea/icedtea-6.1.13.3.ebuild
index feda6fd9aeb1..2156a9de8101 100644
--- a/dev-java/icedtea/icedtea-6.1.13.3.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.13.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.3.ebuild,v 1.6 2014/11/02 08:28:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.3.ebuild,v 1.7 2014/11/21 09:52:17 vapier Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -9,7 +9,7 @@
 
 EAPI="5"
 
-inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
+inherit java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
 
 ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
 ICEDTEA_BRANCH=$(get_version_component_range 1-3)
@@ -192,12 +192,7 @@ src_configure() {
 		config="${config} --enable-cacao"
 	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}"
+	config+=" --with-parallel-jobs=$(makeopts_jobs)"
 
 	if use javascript ; then
 		config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
diff --git a/dev-java/icedtea/icedtea-6.1.13.4.ebuild b/dev-java/icedtea/icedtea-6.1.13.4.ebuild
index 3fc73573a170..9ae5493d5bab 100644
--- a/dev-java/icedtea/icedtea-6.1.13.4.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.13.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.4.ebuild,v 1.2 2014/11/02 08:28:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.4.ebuild,v 1.3 2014/11/21 09:52:17 vapier Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -9,7 +9,7 @@
 
 EAPI="5"
 
-inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
+inherit java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
 
 ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
 ICEDTEA_BRANCH=$(get_version_component_range 1-3)
@@ -193,12 +193,7 @@ src_configure() {
 		config="${config} --enable-cacao"
 	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}"
+	config+=" --with-parallel-jobs=$(makeopts_jobs)"
 
 	if use javascript ; then
 		config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
diff --git a/dev-java/icedtea/icedtea-7.2.4.3.ebuild b/dev-java/icedtea/icedtea-7.2.4.3.ebuild
index cd561b6024fb..147dcf522e45 100644
--- a/dev-java/icedtea/icedtea-7.2.4.3.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.3.ebuild,v 1.8 2014/11/02 08:28:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.3.ebuild,v 1.9 2014/11/21 09:52:17 vapier Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -11,7 +11,7 @@ EAPI="5"
 
 CHECKREQS_DISK_BUILD="9G"
 
-inherit check-reqs java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx flag-o-matic
+inherit check-reqs java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx flag-o-matic
 
 ICEDTEA_VER=$(get_version_component_range 2-)
 ICEDTEA_BRANCH=$(get_version_component_range 2-3)
@@ -242,12 +242,7 @@ src_configure() {
 			;;
 	esac
 
-	# 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}"
+	config+=" --with-parallel-jobs=$(makeopts_jobs)"
 
 	if use javascript ; then
 		config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
diff --git a/dev-java/icedtea/icedtea-7.2.4.7.ebuild b/dev-java/icedtea/icedtea-7.2.4.7.ebuild
index 7cfb07d62d89..5efb5d93820f 100644
--- a/dev-java/icedtea/icedtea-7.2.4.7.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.7.ebuild,v 1.6 2014/11/02 08:28:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.7.ebuild,v 1.7 2014/11/21 09:52:17 vapier Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -9,7 +9,7 @@
 
 EAPI="5"
 
-inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
+inherit java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
 
 ICEDTEA_VER=$(get_version_component_range 2-)
 ICEDTEA_BRANCH=$(get_version_component_range 2-3)
@@ -233,12 +233,7 @@ src_configure() {
 		zero_config="--enable-zero";
 	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}"
+	config+=" --with-parallel-jobs=$(makeopts_jobs)"
 
 	if use javascript ; then
 		config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"