vapier 14/11/21 09:54:27
Modified: openfoam-2.2.1.ebuild openfoam-2.2.2.ebuild
openfoam-2.3.0.ebuild ChangeLog
Log:
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)
Revision Changes Path
1.2 sci-libs/openfoam/openfoam-2.2.1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/openfoam/openfoam-2.2.1.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/openfoam/openfoam-2.2.1.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/openfoam/openfoam-2.2.1.ebuild?r1=1.1&r2=1.2
Index: openfoam-2.2.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/openfoam/openfoam-2.2.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openfoam-2.2.1.ebuild 29 Jul 2013 08:10:39 -0000 1.1
+++ openfoam-2.2.1.ebuild 21 Nov 2014 09:54:26 -0000 1.2
@@ -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_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"
1.2 sci-libs/openfoam/openfoam-2.2.2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/openfoam/openfoam-2.2.2.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/openfoam/openfoam-2.2.2.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/openfoam/openfoam-2.2.2.ebuild?r1=1.1&r2=1.2
Index: openfoam-2.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/openfoam/openfoam-2.2.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openfoam-2.2.2.ebuild 1 Nov 2013 05:17:08 -0000 1.1
+++ openfoam-2.2.2.ebuild 21 Nov 2014 09:54:26 -0000 1.2
@@ -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_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"
1.2 sci-libs/openfoam/openfoam-2.3.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/openfoam/openfoam-2.3.0.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/openfoam/openfoam-2.3.0.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/openfoam/openfoam-2.3.0.ebuild?r1=1.1&r2=1.2
Index: openfoam-2.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/openfoam/openfoam-2.3.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openfoam-2.3.0.ebuild 27 Feb 2014 06:19:14 -0000 1.1
+++ openfoam-2.3.0.ebuild 21 Nov 2014 09:54:26 -0000 1.2
@@ -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_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
1.19 sci-libs/openfoam/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/openfoam/ChangeLog?rev=1.19&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/openfoam/ChangeLog?rev=1.19&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/openfoam/ChangeLog?r1=1.18&r2=1.19
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/openfoam/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ChangeLog 27 Feb 2014 06:19:14 -0000 1.18
+++ ChangeLog 21 Nov 2014 09:54:26 -0000 1.19
@@ -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 <[email protected]> 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)
