Use makeopts_jobs instead of parsing MAKEOPTS by hand and clean up find deletion logic.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

4 files changed, 23 insertions, 39 deletions

diff --git a/sci-libs/openfoam/ChangeLog b/sci-libs/openfoam/ChangeLog
index 74df9aec6487..a600c8dfcf44 100644
--- a/sci-libs/openfoam/ChangeLog
+++ b/sci-libs/openfoam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/openfoam
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam/ChangeLog,v 1.18 2014/02/27 06:19:14 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam/ChangeLog,v 1.19 2014/11/21 09:54:26 vapier Exp $
+
+  21 Nov 2014; Mike Frysinger <vapier@gentoo.org> openfoam-2.2.1.ebuild,
+  openfoam-2.2.2.ebuild, openfoam-2.3.0.ebuild:
+  Use makeopts_jobs instead of parsing MAKEOPTS by hand and clean up find
+  deletion logic.
 
 *openfoam-2.3.0 (27 Feb 2014)
 
diff --git a/sci-libs/openfoam/openfoam-2.2.1.ebuild b/sci-libs/openfoam/openfoam-2.2.1.ebuild
index a96d019fda70..bdd99aaeb2fd 100644
--- a/sci-libs/openfoam/openfoam-2.2.1.ebuild
+++ b/sci-libs/openfoam/openfoam-2.2.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam/openfoam-2.2.1.ebuild,v 1.1 2013/07/29 08:10:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam/openfoam-2.2.1.ebuild,v 1.2 2014/11/21 09:54:26 vapier Exp $
 
 EAPI="5"
 
-inherit eutils versionator multilib toolchain-funcs
+inherit eutils versionator multilib toolchain-funcs multiprocessing
 
 MY_PN="OpenFOAM"
 MY_PV=$(get_version_component_range 1-2)
@@ -70,20 +70,13 @@ src_configure() {
 }
 
 src_compile() {
-
-	WM_NCOMPPROCS=`echo $MAKEOPTS | sed 's/-j\([0-9][0-9]*\)/\1/'`
-	if [ -n "$WM_NCOMPPROCS" ] ; then
-		export WM_NCOMPPROCS
-	else
-		export WM_NCOMPPROCS=1
-	fi
-	elog "Building on $WM_NCOMPPROCS cores"
+	export WM_NCOMPPROCS=$(makeopts_jobs)
 
 	export FOAM_INST_DIR=${WORKDIR}
 	source etc/bashrc
 
-	find wmake -name dirToString | xargs rm -rf
-	find wmake -name wmkdep | xargs rm -rf
+	find wmake -name dirToString -exec rm -rf {} +
+	find wmake -name wmkdep -exec rm -rf {}+
 
 	if use doc ; then
 		./Allwmake doc || die "could not build"
diff --git a/sci-libs/openfoam/openfoam-2.2.2.ebuild b/sci-libs/openfoam/openfoam-2.2.2.ebuild
index 58cd59b84974..aea97673a1c1 100644
--- a/sci-libs/openfoam/openfoam-2.2.2.ebuild
+++ b/sci-libs/openfoam/openfoam-2.2.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam/openfoam-2.2.2.ebuild,v 1.1 2013/11/01 05:17:08 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam/openfoam-2.2.2.ebuild,v 1.2 2014/11/21 09:54:26 vapier Exp $
 
 EAPI="5"
 
-inherit eutils versionator multilib toolchain-funcs
+inherit eutils versionator multilib toolchain-funcs multiprocessing
 
 MY_PN="OpenFOAM"
 MY_PV=$(get_version_component_range 1-2)
@@ -70,20 +70,13 @@ src_configure() {
 }
 
 src_compile() {
-
-	WM_NCOMPPROCS=`echo $MAKEOPTS | sed 's/-j\([0-9][0-9]*\)/\1/'`
-	if [ -n "$WM_NCOMPPROCS" ] ; then
-		export WM_NCOMPPROCS
-	else
-		export WM_NCOMPPROCS=1
-	fi
-	elog "Building on $WM_NCOMPPROCS cores"
+	export WM_NCOMPPROCS=$(makeopts_jobs)
 
 	export FOAM_INST_DIR=${WORKDIR}
 	source etc/bashrc
 
-	find wmake -name dirToString | xargs rm -rf
-	find wmake -name wmkdep | xargs rm -rf
+	find wmake -name dirToString -exec rm -rf {} +
+	find wmake -name wmkdep -exec rm -rf {}+
 
 	if use doc ; then
 		./Allwmake doc || die "could not build"
diff --git a/sci-libs/openfoam/openfoam-2.3.0.ebuild b/sci-libs/openfoam/openfoam-2.3.0.ebuild
index e79d58e402e7..5683d024bfc8 100644
--- a/sci-libs/openfoam/openfoam-2.3.0.ebuild
+++ b/sci-libs/openfoam/openfoam-2.3.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam/openfoam-2.3.0.ebuild,v 1.1 2014/02/27 06:19:14 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam/openfoam-2.3.0.ebuild,v 1.2 2014/11/21 09:54:26 vapier Exp $
 
 EAPI="5"
 
-inherit eutils versionator multilib toolchain-funcs
+inherit eutils versionator multilib toolchain-funcs multiprocessing
 
 MY_PN="OpenFOAM"
 MY_PV=$(get_version_component_range 1-2)
@@ -74,20 +74,13 @@ src_configure() {
 }
 
 src_compile() {
-
-	WM_NCOMPPROCS=`echo $MAKEOPTS | sed 's/-j\([0-9][0-9]*\)/\1/'`
-	if [ -n "$WM_NCOMPPROCS" ] ; then
-		export WM_NCOMPPROCS
-	else
-		export WM_NCOMPPROCS=1
-	fi
-	elog "Building on $WM_NCOMPPROCS cores"
+	export WM_NCOMPPROCS=$(makeopts_jobs)
 
 	export FOAM_INST_DIR=${WORKDIR}
 	source etc/bashrc
 
-	find wmake -name dirToString | xargs rm -rf
-	find wmake -name wmkdep | xargs rm -rf
+	find wmake -name dirToString -exec rm -rf {} +
+	find wmake -name wmkdep -exec rm -rf {}+
 
 	./Allwmake || die "could not build"
 	if use doc ; then