Use makeopts_jobs instead of parsing MAKEOPTS by hand & note this needs converting to escons.

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

5 files changed, 46 insertions, 23 deletions

diff --git a/net-p2p/linuxdcpp/ChangeLog b/net-p2p/linuxdcpp/ChangeLog
index 0cd79c7e5c34..b58620979bec 100644
--- a/net-p2p/linuxdcpp/ChangeLog
+++ b/net-p2p/linuxdcpp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/linuxdcpp
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/linuxdcpp/ChangeLog,v 1.44 2012/05/04 06:33:34 jdhore Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/linuxdcpp/ChangeLog,v 1.45 2014/11/21 09:48:26 vapier Exp $
+
+  21 Nov 2014; Mike Frysinger <vapier@gentoo.org> linuxdcpp-1.0.3-r1.ebuild,
+  linuxdcpp-1.0.3.ebuild, linuxdcpp-9999.ebuild:
+  Use makeopts_jobs instead of parsing MAKEOPTS by hand & note this needs
+  converting to escons.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> linuxdcpp-1.0.3.ebuild,
   linuxdcpp-1.0.3-r1.ebuild, linuxdcpp-9999.ebuild:
@@ -199,4 +204,3 @@
   17 Jan 2007; Raúl Porcel <armin76@gentoo.org> +metadata.xml,
   +linuxdcpp-20070117.ebuild:
   New ebuild, bug 102733
-
diff --git a/net-p2p/linuxdcpp/Manifest b/net-p2p/linuxdcpp/Manifest
index 2d51b46604f2..089b0acda181 100644
--- a/net-p2p/linuxdcpp/Manifest
+++ b/net-p2p/linuxdcpp/Manifest
@@ -1,6 +1,26 @@
-DIST linuxdcpp-1.0.3.tar.bz2 289891 RMD160 b44fe8fb540150786458aa85fbf4631bd9de16cd SHA1 383a55bbc2169280e982571aac92555a25dc05e4 SHA256 3b4eb6cf015f0fe8283508976b24dbb1cd4fb861116d4536f1055136c2442c71
-EBUILD linuxdcpp-1.0.3-r1.ebuild 1519 RMD160 337cff2bbc4b63dd51277baedf79f97f5f0d2e97 SHA1 9d646c3a1d5ce090584a46362b92ecdc447d22a9 SHA256 604ca5c540abc929c1b92d23919634f10922d0188a465ec67ae2bb3bdcb4924d
-EBUILD linuxdcpp-1.0.3.ebuild 1240 RMD160 4292f3e8e5d59eb3ffdacb7a6c3634368581b13f SHA1 e3f9be3c4a7a4ea0996434144497ed89b3281893 SHA256 3d3a5b04bae94fd70d08f047c15aeda452993b4f961450da070f16b181148b47
-EBUILD linuxdcpp-9999.ebuild 1313 RMD160 8f3c1626cbf6649f0ced2cbe1bde20c99d717aee SHA1 55751be729594964f319d6f2fb0330420d543ff5 SHA256 3539930ca87dd882999f8643cb18d8fc7eb67cd5d3c7f236dcb0e650b73ab72f
-MISC ChangeLog 6580 RMD160 b551659d7ed3c6b9e135da4da7ac8ad1fda3b9f7 SHA1 b535229a22ee13593241a0219da4b0cf9be0a313 SHA256 bf5a85a5b15a74a69a0578cded5f88e82414b38cceb553bf74e08ed03cd8e48a
-MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST linuxdcpp-1.0.3.tar.bz2 289891 SHA256 3b4eb6cf015f0fe8283508976b24dbb1cd4fb861116d4536f1055136c2442c71 SHA512 c0eb38b89b6a47a4a29ade90b3813e302b8c4dd8bea39770fce4e232ff17035ba355b36feb6b69195ba7c8448a69943ee61722e335ad514f426238fb8a089e79 WHIRLPOOL e6feb69c38020a13b2d37cc7dd51614946e2ba2642d7173e72d9d50af37cc510b8ac0f983c1bf68feab3e2d82027471ab8fc3beacbe96b680c87c889cdd88034
+EBUILD linuxdcpp-1.0.3-r1.ebuild 1486 SHA256 4e6bcc8bd91da3d6640a99bee66e3deec38e6e5c606f6c048735a3272782d567 SHA512 d3f7a608507f92b16fb14788678ba23bc0a1ece84689c22b626407d5101d0e068d1d79797694950dcf60750025beb603c48c2c8bf35ab47b2da8adcba640737d WHIRLPOOL 2df0c348199f9379bb48a18e86b5ceda543f150add4956dab0b6a7e9add58ac265429e72f4323c96cb16e23fe861f05a17add2978b760aef104e2eecb756b3ee
+EBUILD linuxdcpp-1.0.3.ebuild 1285 SHA256 6c33bd794e50120fbfa6ca57080bc4361c5c2b2a4f0ae9c38b64a0f77d71418d SHA512 1f4e83dce6b6f5727ce88aa036765d788df1cd00340cd21f24240e897eb1cff1c486fd07bba01cbb2f032fcf3c0a24caecc78ad8c8a698c511ee71e3d7025aaa WHIRLPOOL 9c413e58af83cbea47942c8edd789d41f0b8ba0e930f42920024957caf08f91a61b7b53022ed4fbddccf074c08e3895e419a0bbc289ed256ba683e2f5d115f48
+EBUILD linuxdcpp-9999.ebuild 1280 SHA256 4bef475509207d6ecbe6755919752a1e6e30a227697de2e9728c9f6a96e6e8a4 SHA512 173fe723ce0fdbf7437133e69e0f6e6ba4a4ac0e59af155601ba82c915f04ae40349c1ac369e4c5dd4bd17fbb53ad038f9079f883b18b311f4f6b1e96060b512 WHIRLPOOL 0369559b6b10dae83e58224989ce655dba575cd5c4b5e60e9caf68efaafa04f91e744ecfcd485b44f80845bcbe9ad758889a22451ae83c7f3261a994b044764e
+MISC ChangeLog 6804 SHA256 2154eefb7c826969786bd1516768ead5959452fdc11ddba087830a2c624b5400 SHA512 c7ade825949eca94e820b488b17bf38536a6e049226f858d3c9437f7d89d16cb8fdae96da63e555612b33e5e2622b6850f3a084f3a02a151cdb6fd5dfe95c62c WHIRLPOOL d21d1228b200b067bd7c8c6ce9a75bc8347cce7eb5767d862b487bdabde640dbffda6dda545b0b13ecdde8e34fe572efad114ff58323032f9fd0fb4c9269fec1
+MISC metadata.xml 160 SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f SHA512 2f1153c2abadf7a9f4133b1f9a379c67c6a2f24b4e226dc213f36ddd2f8d4fabcc893c094a586f8b53f7b652f4428a689eaf27899db6858767f7cdb984da17ef WHIRLPOOL a901e6830477c343d0f31f7aa0d46e867c4debc40e4db2c41df4a9b3c44a5879729a298f66b813836a47641d569738a5be5547e6d38bea11eb6a9f545db707ab
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJUbwprAAoJEPGu1DbS6WIACtEP/j837LxbJSsZX9KA0ZHu3yUG
+Re06n+IanseY270vNZxa/eI4AcT3/YqofOVWA1r+6DKBPhdlEn6X3V7t48DNgSbw
+DDldW8/Tm6cmftnscl38GIE3MDBIS/+aKhXs00GGE2V+3BCjcttfcoPbeFZ5OmYy
+ajPHZvXr2Wn/D/VQKApLeKU9ETnwMSe8SYlNR1km8LZMd4QvwWPAVbtoZR/g1atG
+fSCKzurr2OlZ9qlGbaDtuw/+wtbpsCM5gMrxxvY70UvXeG39jgFWwW3/GDB6U4pX
+zW/C2ZDuLwtxAKfKJiVXG4jNsO/HqTJR5jUkclALU2i29IqfwtDO+Fj0Y91gMY9R
+mIf+VoFpl9wi/msO2+6bEXdgU33z8tUnfKtPoIInuqHL69iDmskPye6DR3mL+1+V
+9yZ2oVHUTBDnLCGr9mWcdM2fsbqvKVcINT99JW4odxQwZFSPMh8jykV7GrDbV6b8
+k+P7YAiXBBr/kXSWvuMZ1ozU49uGimkC1OQNITq+JVcOI+V4H4XKke3QzMxsZfhL
+Viiy04TqsghzBMNb1+Giz9MIaBuw5HLF8DdM5YqXkYijKv2HIh0SrHB4ytQb88Oo
+r/8uReoVE5FDD8POjZt1W2T/fZxR46BDVbm4M9ZO7+j9J7cKc69iyn5R9Ic5PnAx
+c9InXVKjAtq53luzAVIi
+=MKkN
+-----END PGP SIGNATURE-----
diff --git a/net-p2p/linuxdcpp/linuxdcpp-1.0.3-r1.ebuild b/net-p2p/linuxdcpp/linuxdcpp-1.0.3-r1.ebuild
index 3821579aee00..6e2b66afb5ff 100644
--- a/net-p2p/linuxdcpp/linuxdcpp-1.0.3-r1.ebuild
+++ b/net-p2p/linuxdcpp/linuxdcpp-1.0.3-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/linuxdcpp/linuxdcpp-1.0.3-r1.ebuild,v 1.5 2012/05/04 06:33:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/linuxdcpp/linuxdcpp-1.0.3-r1.ebuild,v 1.6 2014/11/21 09:48:26 vapier Exp $
 
 EAPI=2
 
-inherit eutils
+# TODO: This needs to use the escons eclass.
+inherit eutils multiprocessing
 
 DESCRIPTION="Direct connect client, looks and works like famous DC++"
 HOMEPAGE="https://launchpad.net/linuxdcpp"
@@ -29,12 +30,10 @@ src_prepare() {
 }
 
 src_compile() {
-	local sconsopts=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[[:space:]]*[0-9]\+\).*/\1/; p }")
-
 	local myconf=""
 	use debug && myconf="${myconf} debug=1"
 
-	scons ${myconf} ${sconsopts} CXXFLAGS="${CXXFLAGS}" PREFIX=/usr || die "scons failed"
+	scons ${myconf} -j$(makeopts_jobs) CXXFLAGS="${CXXFLAGS}" PREFIX=/usr || die "scons failed"
 }
 
 src_install() {
diff --git a/net-p2p/linuxdcpp/linuxdcpp-1.0.3.ebuild b/net-p2p/linuxdcpp/linuxdcpp-1.0.3.ebuild
index d0ee4354a0c9..f0f40808cbc1 100644
--- a/net-p2p/linuxdcpp/linuxdcpp-1.0.3.ebuild
+++ b/net-p2p/linuxdcpp/linuxdcpp-1.0.3.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/linuxdcpp/linuxdcpp-1.0.3.ebuild,v 1.6 2012/05/04 06:33:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/linuxdcpp/linuxdcpp-1.0.3.ebuild,v 1.7 2014/11/21 09:48:26 vapier Exp $
 
 EAPI="1"
 
+# TODO: This needs to use the escons eclass.
 inherit eutils
 
 DESCRIPTION="Direct connect client, looks and works like famous DC++"
diff --git a/net-p2p/linuxdcpp/linuxdcpp-9999.ebuild b/net-p2p/linuxdcpp/linuxdcpp-9999.ebuild
index 472a974da007..1162a8a88400 100644
--- a/net-p2p/linuxdcpp/linuxdcpp-9999.ebuild
+++ b/net-p2p/linuxdcpp/linuxdcpp-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/linuxdcpp/linuxdcpp-9999.ebuild,v 1.16 2012/05/04 06:33:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/linuxdcpp/linuxdcpp-9999.ebuild,v 1.17 2014/11/21 09:48:26 vapier Exp $
 
 EAPI="1"
 
-inherit bzr eutils
+# TODO: This needs to use the escons eclass.
+inherit bzr eutils multiprocessing
 
 DESCRIPTION="Direct connect client, looks and works like famous DC++"
 HOMEPAGE="https://launchpad.net/linuxdcpp"
@@ -29,12 +30,10 @@ DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.35.0-r2"
 
 src_compile() {
-	local sconsopts=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[[:space:]]*[0-9]\+\).*/\1/; p }")
-
 	local myconf=""
 	use debug && myconf="${myconf} debug=1"
 
-	scons ${myconf} ${sconsopts} CXXFLAGS="${CXXFLAGS}" PREFIX=/usr || die "scons failed"
+	scons ${myconf} -j$(makeopts_jobs) CXXFLAGS="${CXXFLAGS}" PREFIX=/usr || die "scons failed"
 }
 
 src_install() {