commit: 1ae1f5832dab439c4a9ae8e50a2c16c24c672dc1
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 08:10:15 2017 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 08:10:15 2017 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=1ae1f583
sci-libs/gmsh: Call cmake-utils_src_compile
Move buildtime deps to DEPEND
Drop CVS leftovers
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-libs/gmsh/gmsh-2.16.0.ebuild | 8 ++++----
sci-libs/gmsh/gmsh-2.8.5.ebuild | 7 +++----
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/sci-libs/gmsh/gmsh-2.16.0.ebuild b/sci-libs/gmsh/gmsh-2.16.0.ebuild
index 242b31d03..ed7fc8be3 100644
--- a/sci-libs/gmsh/gmsh-2.16.0.ebuild
+++ b/sci-libs/gmsh/gmsh-2.16.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
@@ -30,7 +29,6 @@ RDEPEND="
opencascade? ( sci-libs/opencascade:* )
png? ( media-libs/libpng:0 )
petsc? ( sci-mathematics/petsc )
- python? ( dev-lang/python:2.7 dev-lang/swig:0 )
zlib? ( sys-libs/zlib )
mpi? ( virtual/mpi[cxx] )
taucs? ( sci-libs/taucs )"
@@ -41,8 +39,9 @@ REQUIRED_USE="
DEPEND="${RDEPEND}
virtual/pkgconfig
- dev-util/cmake
- doc? ( virtual/latex-base )"
+ doc? ( virtual/latex-base )
+ python? ( dev-lang/swig:0 )
+ "
S=${WORKDIR}/${P}-source
@@ -75,6 +74,7 @@ src_configure() {
}
src_compile() {
+ cmake-utils_src_compile
if use doc ; then
cd "${BUILD_DIR}" || die
emake pdf
diff --git a/sci-libs/gmsh/gmsh-2.8.5.ebuild b/sci-libs/gmsh/gmsh-2.8.5.ebuild
index 6010916f1..1decc3cda 100644
--- a/sci-libs/gmsh/gmsh-2.8.5.ebuild
+++ b/sci-libs/gmsh/gmsh-2.8.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
inherit cmake-utils flag-o-matic fortran-2 toolchain-funcs
@@ -37,7 +37,6 @@ REQUIRED_USE="
DEPEND="${RDEPEND}
virtual/pkgconfig
- dev-util/cmake
doc? ( virtual/latex-base )"
S=${WORKDIR}/${P}-source
@@ -67,7 +66,7 @@ src_configure() {
$(cmake-utils_use_enable tetgen TETGEN)
$(cmake-utils_use_enable opencascade OCC)
$(cmake-utils_use_enable petsc PETSC)"
-# $(cmake-utils_use_enable tetgen TETGEN_NEW)
+# $(cmake-utils_use_enable tetgen TETGEN_NEW)
cmake-utils_src_configure ${mycmakeargs}
}
