Use makeopts_jobs for more robust MAKEOPTS parsing. Bug 449106 by jannis.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 12 insertions, 12 deletions

diff --git a/media-gfx/argyllcms/ChangeLog b/media-gfx/argyllcms/ChangeLog
index 64944ed04762..3aaeb0053050 100644
--- a/media-gfx/argyllcms/ChangeLog
+++ b/media-gfx/argyllcms/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/argyllcms
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/ChangeLog,v 1.32 2012/12/14 08:54:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/ChangeLog,v 1.33 2012/12/29 16:15:03 floppym Exp $
+
+  29 Dec 2012; Mike Gilbert <floppym@gentoo.org> argyllcms-1.4.0-r2.ebuild:
+  Use makeopts_jobs for more robust MAKEOPTS parsing. Bug 449106 by jannis.
 
 *argyllcms-1.4.0-r2 (14 Dec 2012)
 
diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index f6dd1e1ac9a0..9abe29d96ba7 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -5,13 +5,13 @@ AUX argyllcms-1.4.0-CVE-2012-4405.patch 583 SHA256 1a161b912a192e6a0a2d16d74a173
 AUX argyllcms-1.4.0-jpeg.patch 1111 SHA256 15403ab2480d43f8d2247d0ba6a535e1761c15e286d5eb144470f694b70194e3 SHA512 6f8f55f02f37118e3cec928c8b3d7bdef2b2049a05b217492b9606121f8596a4810f59d7c24ebd97215ad0bc06ab3ada968630772727bc1c02db2a00c3d8aed0 WHIRLPOOL 5a20a27e465a77c2e10303ace389f98bad519ca436c1b661cc96f9ad583547f29c63cb515c2fa7deab7eb056fdf773fbe39c2ba924bdeb02bb71764c6c40e5e5
 DIST Argyll_V1.4.0_src.zip 15242860 SHA256 d33134704d2964db69f9e61eb73188632fe2058cdf57aeaa56e64a264e02b1a8 SHA512 edb9ff1b0a965e79a26c0138afe16472fd18236b55b7262135d70bfc7405001a55d2ada4251111fcbaa0b6f73a3fa2faa2cfe07b3413c8a5ecea04c87e5646ae WHIRLPOOL 7b777f43c9a34966d3fee8ab67010d7253da4054e107749ffe67c4f834c3977a2889c3d0d5035b7e1d186d669c4ead69e2a912682631598630f12056d45acd6b
 EBUILD argyllcms-1.4.0-r1.ebuild 2153 SHA256 c7262ca199a31c372a42a0a9168629136e1de714ef2eb2d98dd0a72ffee8a306 SHA512 e0cc0d5ca2a3ecec6e9622d6dd49607323f1e1ad35d4687b7f75c6bd502976f98dcd9825c7654edf0e9314d5b7f0ab12dca2e11367691624924e7331f5dae1f1 WHIRLPOOL cda8bdc335e3c2fe1cb49e7b6a6e8984328a9c4e848492d5cf147efaba47df432410d8657fbb662d2e2ef7d92496cf514a35ad38ecf8aa2f645a4d8742b2616c
-EBUILD argyllcms-1.4.0-r2.ebuild 2325 SHA256 0fc258b593eba127c49fb884aff2d2440052f2b9ca05a4871462072e04f7c2aa SHA512 f617fa556afd7c36a3f079a3792080524684abbd62f58625e58dafe27c569193766bf1b3b3b209fc0d444d349841e82de3dead015fa09c536705dff9c09760d2 WHIRLPOOL 53dca49c372601e5bcd88b92a0190769efafe5e4264a020189a4f6aaf47439355ffc0b0b9bd5af68b1858bfdbc9ed7dd4851ef70f9c9750f9a97395dc1ea97a8
-MISC ChangeLog 6018 SHA256 49ac4830d8f8006640059e391293a61f25c98a1eecdbd209af83176a99026ad8 SHA512 93769d14bc0124a01e28c21c879deb29e5e4a54e76baa1adc7ad3e3bce33a4e2f19c2e00ec30cf8a0d55bc28128d74b84bd4931bc029ed85b5e57a8f8356b555 WHIRLPOOL 4412af662705122e70e073d6ecc98ca4cc3cf80096320740cdcc705a656e27783f1ba4c656a9108294571b902c87967d78e096e4b32150aaad7ca2338b4c321f
+EBUILD argyllcms-1.4.0-r2.ebuild 2217 SHA256 5d98cb423057060f154184119a9ec234fed844ab21f9275267a260d314e7eb7b SHA512 2c43cc4ae35d6a1708f72dfa2cd3f4605d822577ce01b4e9de0cc91dad6b0106180abecc295d39dc5223b5d5fbb23b4c6b896e8297b02e73d93d838455808888 WHIRLPOOL 65c2b60f722e3e240598eacaf8531ab800487a51ce64bfe190b4efd53d4155c1da459b8603be660134e5c1644565910c0266d43222da063b7ae0c426094bd3f9
+MISC ChangeLog 6174 SHA256 2b45e4a73c915611c6369d607914951b6d295d93cc7cc7be0714286469907ef2 SHA512 07a11e94eb3c3562debad535de2842d0d3ef75cb841ad105a47a2d70269529bcbe0d599b1e1b1bd076754e4401aa7be7de2988b08cff2f3e0b40f4acb45f31c0 WHIRLPOOL ef280adb313895721fd8d298deadb05c456a1aac1642d5cf6e80a95af151f4478cb982f166d7972bb5fcb3619511091a7e21a73497bbf24e800ce41d893e85ac
 MISC metadata.xml 218 SHA256 e124ad5b959f26606c176ee0a8cc3e59839b98e93c712fe4b699e7e4df11fd6b SHA512 d689950ba64adf80b0b7b667dfa81f230bc7ecf280eabba76ea3f4f0ecec3105d850cb24d34a88243debd08febe8bbd95e389fb8463f6aaeffe96a39a87d569b WHIRLPOOL 72aa8e8b9896ec82acedd6f4b4a1876861523430bc29bc96fcc03da4475e78ddb3802268b81d80d535d6942baad1508fe939a9a769b7635dfebbef7076962ee6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDK6TwACgkQgAnW8HDreRYSZwCeOO03FZqTo2mDI+VUQQUaGp9V
-/+cAoMVvm2FNf1ri7r2JUZVSKP3nNUPi
-=rEoi
+iF4EAREIAAYFAlDfFwwACgkQC77qH+pIQ6QbaQD/cV8kNMxpE8isXC6ZzJa6nM95
+bQukYHg6Kzp3yL7Ag+sA/35+UZZfN4Q30u5RFK2dTKLcg+U6MCEMrkoO5L/1sz+u
+=E95h
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/argyllcms/argyllcms-1.4.0-r2.ebuild b/media-gfx/argyllcms/argyllcms-1.4.0-r2.ebuild
index 1df7d16797a8..1fc9f7d39e1d 100644
--- a/media-gfx/argyllcms/argyllcms-1.4.0-r2.ebuild
+++ b/media-gfx/argyllcms/argyllcms-1.4.0-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/argyllcms-1.4.0-r2.ebuild,v 1.1 2012/12/14 08:54:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/argyllcms-1.4.0-r2.ebuild,v 1.2 2012/12/29 16:15:03 floppym Exp $
 
 EAPI=5
 
-inherit base flag-o-matic toolchain-funcs udev
+inherit base flag-o-matic multiprocessing toolchain-funcs udev
 
 MY_P="Argyll_V${PV}"
 
@@ -49,9 +49,6 @@ src_compile() {
 	# the shared libraries by default on the command line _before_ the object to be built...
 	echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop
 
-	local jobnumber=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[[:space:]]*[0-9]\+\).*/\1/; p }")
-	[ ${jobnumber} ] || jobnumber=-j1
-
 	append-cflags -DUNIX -D_THREAD_SAFE
 
 	sed \
@@ -61,7 +58,7 @@ src_compile() {
 
 	tc-export CC RANLIB
 
-	jam -dx -fJambase ${jobnumber} || die
+	jam -dx -fJambase "-j$(makeopts_jobs)" || die
 }
 
 src_install() {