Use new makeopts_jobs helper from eutils.eclass.

4 files changed, 14 insertions, 14 deletions

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 917c8d0e6a56..dbc2f7b20dde 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.210 2012/04/14 20:22:23 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.211 2012/04/15 20:15:39 vapier Exp $
+
+  15 Apr 2012; Mike Frysinger <vapier@gentoo.org> db.eclass perl-module.eclass
+  waf-utils.eclass:
+  Use new makeopts_jobs helper from eutils.eclass.
 
   14 Apr 2012; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass:
   move 'dev-haskell/cabal' santy check out from 'pkg_*' to 'src_*' function to
diff --git a/eclass/db.eclass b/eclass/db.eclass
index 9a179762a132..1bd076ef9ce1 100644
--- a/eclass/db.eclass
+++ b/eclass/db.eclass
@@ -1,10 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.44 2011/12/27 17:55:12 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.45 2012/04/15 20:15:39 vapier Exp $
 # This is a common location for functions used in the sys-libs/db ebuilds
 #
 # Bugs: pauldv@gentoo.org
 
+inherit eutils
+
 IUSE="doc test examples"
 
 EXPORT_FUNCTIONS src_test
@@ -175,13 +177,7 @@ db_src_test() {
 			[[ -f "${t}" ]] && testbase="${t}" && break
 		done
 		echo "source ${t}" > testrunner.tcl
-		testJobs=`echo "${MAKEOPTS}" | \
-				sed -e "s/.*-j\([0-9]\+\).*/\1/"`
-		if [[ ${testJobs} =~ [[:digit:]]+ ]]; then
-			echo "run_parallel ${testJobs} run_std" >> testrunner.tcl
-		else
-			echo 'run_std' >>testrunner.tcl
-		fi
+		echo "run_parallel $(makeopts_job) run_std" >> testrunner.tcl
 
 		tclsh testrunner.tcl
 		egrep -qs '^FAIL' ALL.OUT* && die "Some tests failed, please see ${S}/ALL.OUT*"
diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index 040207851857..eeb16cfd1f59 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -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/eclass/perl-module.eclass,v 1.131 2011/08/22 04:46:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.132 2012/04/15 20:15:39 vapier Exp $
 
 # @ECLASS: perl-module.eclass
 # @MAINTAINER:
@@ -197,8 +197,8 @@ perl-module_src_test() {
 	debug-print-function $FUNCNAME "$@"
 	if has 'do' ${SRC_TEST} || has 'parallel' ${SRC_TEST} ; then
 		if has "${TEST_VERBOSE:-0}" 0 && has 'parallel' ${SRC_TEST} ; then
-			export HARNESS_OPTIONS=j$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
-			einfo "Test::Harness Jobs=${HARNESS_OPTIONS}"
+			export HARNESS_OPTIONS=j$(makeopts_jobs)
+			einfo "Test::Harness Jobs=$(makeopts_jobs)"
 		fi
 		${perlinfo_done} || perl_set_version
 		if [[ -f Build ]] ; then
diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass
index d5b77a59a1a4..50cde0a1bea0 100644
--- a/eclass/waf-utils.eclass
+++ b/eclass/waf-utils.eclass
@@ -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/eclass/waf-utils.eclass,v 1.7 2011/08/22 04:46:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.8 2012/04/15 20:15:39 vapier Exp $
 
 # @ECLASS: waf-utils.eclass
 # @MAINTAINER:
@@ -49,7 +49,7 @@ waf-utils_src_configure() {
 waf-utils_src_compile() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	local jobs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/--jobs=\2/" )
+	local jobs=$(makeopts_jobs)
 	echo "\"${WAF_BINARY}\" build ${jobs}"
 	"${WAF_BINARY}" ${jobs} || die "build failed"
 }