commit: 1d5ff96f4e9214493f79ec1c759f75aee4995ab1
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 02:17:09 2016 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 02:17:09 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=1d5ff96f
sci-chemistry/gromacs: fied EAPI=6 build
Package-Manager: portage-2.2.26
sci-chemistry/gromacs/gromacs-4.6.9999.ebuild | 14 +++++++-------
sci-chemistry/gromacs/gromacs-5.0.9999.ebuild | 20 ++++++++++----------
sci-chemistry/gromacs/gromacs-5.1.9999.ebuild | 18 +++++++++---------
sci-chemistry/gromacs/gromacs-9999.ebuild | 18 +++++++++---------
4 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild
b/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild
index b21624d..e00c4f9 100644
--- a/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild
@@ -154,12 +154,12 @@ src_configure() {
mycmakeargs_pre+=(
"${fft_opts[@]}"
- $(cmake-utils_use X GMX_X11)
- $(cmake-utils_use blas GMX_EXTERNAL_BLAS)
- $(cmake-utils_use gsl GMX_GSL)
- $(cmake-utils_use lapack GMX_EXTERNAL_LAPACK)
- $(cmake-utils_use openmp GMX_OPENMP)
- $(cmake-utils_use offensive GMX_COOL_QUOTES)
+ -DGMX_X11=$(usex X)
+ -DGMX_EXTERNAL_BLAS=$(usex blas)
+ -DGMX_GSL=$(usex gsl)
+ -DGMX_EXTERNAL_LAPACK=$(usex lapack)
+ -DGMX_OPENMP=$(usex openmp)
+ -DGMX_COOL_QUOTES=$(usex offensive)
-DGMX_DEFAULT_SUFFIX=off
-DGMX_ACCELERATION="$acce"
-DGMXLIB="$(get_libdir)"
@@ -182,7 +182,7 @@ src_configure() {
[[ ${x} = "float" ]] && use cuda && \
cuda=( -DGMX_GPU=ON )
mycmakeargs=( ${mycmakeargs_pre[@]} ${p} -DGMX_MPI=OFF
- $(cmake-utils_use threads GMX_THREAD_MPI) "${cuda[@]}"
-DGMX_OPENMM=OFF
+ -DGMX_THREAD_MPI=$(usex threads) "${cuda[@]}"
-DGMX_OPENMM=OFF
"$(use test && echo
-DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-DGMX_BINARY_SUFFIX="${suffix}"
-DGMX_LIBS_SUFFIX="${suffix}" )
BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
diff --git a/sci-chemistry/gromacs/gromacs-5.0.9999.ebuild
b/sci-chemistry/gromacs/gromacs-5.0.9999.ebuild
index e7548ff..5d1717e 100644
--- a/sci-chemistry/gromacs/gromacs-5.0.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-5.0.9999.ebuild
@@ -145,15 +145,15 @@ src_configure() {
mycmakeargs_pre+=(
"${fft_opts[@]}"
- $(cmake-utils_use X GMX_X11)
- $(cmake-utils_use blas GMX_EXTERNAL_BLAS)
- $(cmake-utils_use lapack GMX_EXTERNAL_LAPACK)
- $(cmake-utils_use openmp GMX_OPENMP)
- $(cmake-utils_use offensive GMX_COOL_QUOTES)
- $(cmake-utils_use boost GMX_EXTERNAL_BOOST)
- $(cmake-utils_use tng GMX_USE_TNG)
- $(cmake-utils_use doc GMX_BUILD_MANUAL)
- $(cmake-utils_use make-symlinks GMX_SYMLINK_OLD_BINARY_NAMES)
+ -DGMX_X11=$(usex X)
+ -DGMX_EXTERNAL_BLAS=$(usex blas)
+ -DGMX_EXTERNAL_LAPACK=$(usex lapack)
+ -DGMX_OPENMP=$(usex openmp)
+ -DGMX_COOL_QUOTES=$(usex offensive)
+ -DGMX_EXTERNAL_BOOST=$(usex boost)
+ -DGMX_USE_TNG=$(usex tng)
+ -DGMX_BUILD_MANUAL=$(usex doc)
+ -DGMX_SYMLINK_OLD_BINARY_NAMES=$(usex make-symlinks)
-DGMX_DEFAULT_SUFFIX=off
-DGMX_SIMD="$acce"
-DGMX_LIB_INSTALL_DIR="$(get_libdir)"
@@ -179,7 +179,7 @@ src_configure() {
mycmakeargs=(
${mycmakeargs_pre[@]} ${p}
-DGMX_MPI=OFF
- $(cmake-utils_use threads GMX_THREAD_MPI)
+ -DGMX_THREAD_MPI=$(usex threads)
"${cuda[@]}"
-DGMX_OPENMM=OFF
"$(use test && echo
-DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
diff --git a/sci-chemistry/gromacs/gromacs-5.1.9999.ebuild
b/sci-chemistry/gromacs/gromacs-5.1.9999.ebuild
index 4fb8aae..9711c22 100644
--- a/sci-chemistry/gromacs/gromacs-5.1.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-5.1.9999.ebuild
@@ -145,14 +145,14 @@ src_configure() {
mycmakeargs_pre+=(
"${fft_opts[@]}"
- $(cmake-utils_use X GMX_X11)
- $(cmake-utils_use blas GMX_EXTERNAL_BLAS)
- $(cmake-utils_use lapack GMX_EXTERNAL_LAPACK)
- $(cmake-utils_use openmp GMX_OPENMP)
- $(cmake-utils_use offensive GMX_COOL_QUOTES)
- $(cmake-utils_use boost GMX_EXTERNAL_BOOST)
- $(cmake-utils_use tng GMX_USE_TNG)
- $(cmake-utils_use doc GMX_BUILD_MANUAL)
+ -DGMX_X11=$(usex X)
+ -DGMX_EXTERNAL_BLAS=$(usex blas)
+ -DGMX_EXTERNAL_LAPACK=$(usex lapack)
+ -DGMX_OPENMP=$(usex openmp)
+ -DGMX_COOL_QUOTES=$(usex offensive)
+ -DGMX_EXTERNAL_BOOST=$(usex boost)
+ -DGMX_USE_TNG=$(usex tng)
+ -DGMX_BUILD_MANUAL=$(usex doc)
-DGMX_DEFAULT_SUFFIX=off
-DGMX_SIMD="$acce"
-DGMX_LIB_INSTALL_DIR="$(get_libdir)"
@@ -178,7 +178,7 @@ src_configure() {
mycmakeargs=(
${mycmakeargs_pre[@]} ${p}
-DGMX_MPI=OFF
- $(cmake-utils_use threads GMX_THREAD_MPI)
+ -DGMX_THREAD_MPI=$(usex threads)
"${cuda[@]}"
-DGMX_OPENMM=OFF
"$(use test && echo
-DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
diff --git a/sci-chemistry/gromacs/gromacs-9999.ebuild
b/sci-chemistry/gromacs/gromacs-9999.ebuild
index 4fb8aae..9711c22 100644
--- a/sci-chemistry/gromacs/gromacs-9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-9999.ebuild
@@ -145,14 +145,14 @@ src_configure() {
mycmakeargs_pre+=(
"${fft_opts[@]}"
- $(cmake-utils_use X GMX_X11)
- $(cmake-utils_use blas GMX_EXTERNAL_BLAS)
- $(cmake-utils_use lapack GMX_EXTERNAL_LAPACK)
- $(cmake-utils_use openmp GMX_OPENMP)
- $(cmake-utils_use offensive GMX_COOL_QUOTES)
- $(cmake-utils_use boost GMX_EXTERNAL_BOOST)
- $(cmake-utils_use tng GMX_USE_TNG)
- $(cmake-utils_use doc GMX_BUILD_MANUAL)
+ -DGMX_X11=$(usex X)
+ -DGMX_EXTERNAL_BLAS=$(usex blas)
+ -DGMX_EXTERNAL_LAPACK=$(usex lapack)
+ -DGMX_OPENMP=$(usex openmp)
+ -DGMX_COOL_QUOTES=$(usex offensive)
+ -DGMX_EXTERNAL_BOOST=$(usex boost)
+ -DGMX_USE_TNG=$(usex tng)
+ -DGMX_BUILD_MANUAL=$(usex doc)
-DGMX_DEFAULT_SUFFIX=off
-DGMX_SIMD="$acce"
-DGMX_LIB_INSTALL_DIR="$(get_libdir)"
@@ -178,7 +178,7 @@ src_configure() {
mycmakeargs=(
${mycmakeargs_pre[@]} ${p}
-DGMX_MPI=OFF
- $(cmake-utils_use threads GMX_THREAD_MPI)
+ -DGMX_THREAD_MPI=$(usex threads)
"${cuda[@]}"
-DGMX_OPENMM=OFF
"$(use test && echo
-DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
