sci-chemistry/gromacs: Fix some pkgchek warnings

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>

diff --git a/sci-chemistry/gromacs/gromacs-2018.7.ebuild b/sci-chemistry/gromacs/gromacs-2018.7.ebuild
index fd73db9a981197d5de96e7a525616dd09504b7a9..8e5e3827188be52d8f3eb768abb37a86e549c183 100644 (file)
--- a/sci-chemistry/gromacs/gromacs-2018.7.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2018.7.ebuild
@@ -65,6 +65,8 @@ REQUIRED_USE="
 
 DOCS=( AUTHORS README )
 
+RESTRICT="!test? ( test )"
+
 if [[ ${PV} != *9999 ]]; then
        S="${WORKDIR}/${PN}-${PV/_/-}"
 fi

diff --git a/sci-chemistry/gromacs/gromacs-2018.9999.ebuild b/sci-chemistry/gromacs/gromacs-2018.9999.ebuild
index 0c57c8b32c12deb0b059f0835bfa5022121ffeb1..0f1504ebd169ba34aab587130b72fad25854c649 100644 (file)
--- a/sci-chemistry/gromacs/gromacs-2018.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2018.9999.ebuild
@@ -65,6 +65,8 @@ REQUIRED_USE="
 
 DOCS=( AUTHORS README )
 
+RESTRICT="!test? ( test )"
+
 if [[ ${PV} != *9999 ]]; then
        S="${WORKDIR}/${PN}-${PV/_/-}"
 fi

diff --git a/sci-chemistry/gromacs/gromacs-2019.2.ebuild b/sci-chemistry/gromacs/gromacs-2019.2.ebuild
index 1e54e37089df8f9e2b39e4e34708f68923767e37..58d733d2c332da2fce6d887b3e867821d99a078d 100644 (file)
--- a/sci-chemistry/gromacs/gromacs-2019.2.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2019.2.ebuild
@@ -73,6 +73,8 @@ REQUIRED_USE="
 
 DOCS=( AUTHORS README )
 
+RESTRICT="!test? ( test )"
+
 if [[ ${PV} != *9999 ]]; then
        S="${WORKDIR}/${PN}-${PV/_/-}"
 fi

diff --git a/sci-chemistry/gromacs/gromacs-2019.3.ebuild b/sci-chemistry/gromacs/gromacs-2019.3.ebuild
index 67a1967e581f6859a9d690294c24ca9748654d0e..5254b1f3f38bac72a0743710d5497469369a8139 100644 (file)
--- a/sci-chemistry/gromacs/gromacs-2019.3.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2019.3.ebuild
@@ -73,6 +73,8 @@ REQUIRED_USE="
 
 DOCS=( AUTHORS README )
 
+RESTRICT="!test? ( test )"
+
 if [[ ${PV} != *9999 ]]; then
        S="${WORKDIR}/${PN}-${PV/_/-}"
 fi

diff --git a/sci-chemistry/gromacs/gromacs-2019.4.ebuild b/sci-chemistry/gromacs/gromacs-2019.4.ebuild
index 07847d417d66101fc41a9cc7cf5d9dc8b9638030..a08d3ecc90279d182527091e3e1f4168efa557e3 100644 (file)
--- a/sci-chemistry/gromacs/gromacs-2019.4.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2019.4.ebuild
@@ -73,6 +73,8 @@ REQUIRED_USE="
 
 DOCS=( AUTHORS README )
 
+RESTRICT="!test? ( test )"
+
 if [[ ${PV} != *9999 ]]; then
        S="${WORKDIR}/${PN}-${PV/_/-}"
 fi

diff --git a/sci-chemistry/gromacs/gromacs-2019.9999.ebuild b/sci-chemistry/gromacs/gromacs-2019.9999.ebuild
index f91506d7e52cdf62660765d86d8fbdd3619bb34b..a08d3ecc90279d182527091e3e1f4168efa557e3 100644 (file)
--- a/sci-chemistry/gromacs/gromacs-2019.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2019.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
@@ -51,7 +51,7 @@ CDEPEND="
        mpi? ( virtual/mpi )
        ${PYTHON_DEPS}
        "
-DEPEND="${CDEPEND}
+BDEPEND="${CDEPEND}
        virtual/pkgconfig
        doc? (
                app-doc/doxygen
@@ -73,6 +73,8 @@ REQUIRED_USE="
 
 DOCS=( AUTHORS README )
 
+RESTRICT="!test? ( test )"
+
 if [[ ${PV} != *9999 ]]; then
        S="${WORKDIR}/${PN}-${PV/_/-}"
 fi
@@ -233,9 +235,11 @@ src_configure() {
                mycmakeargs=(
                        ${mycmakeargs_pre[@]} ${p}
                        -DGMX_THREAD_MPI=OFF
-                       -DGMX_MPI=ON ${cuda}
+                       -DGMX_MPI=ON
                        -DGMX_OPENMM=OFF
                        -DGMXAPI=OFF
+                       "${opencl[@]}"
+                       "${cuda[@]}"
                        -DGMX_BUILD_MDRUN_ONLY=ON
                        -DBUILD_SHARED_LIBS=OFF
                        -DGMX_BUILD_MANUAL=OFF
@@ -289,14 +293,14 @@ src_install() {
                doins src/external/tng_io/include/tng/*h
        fi
        # drop unneeded stuff
-       rm "${ED}"usr/bin/GMXRC* || die
-       for x in "${ED}"usr/bin/gmx-completion-*.bash ; do
+       rm "${ED}"/usr/bin/GMXRC* || die
+       for x in "${ED}"/usr/bin/gmx-completion-*.bash ; do
                local n=${x##*/gmx-completion-}
                n="${n%.bash}"
-               cat "${ED}"usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
+               cat "${ED}"/usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
                newbashcomp "${T}"/"${n}" "${n}"
        done
-       rm "${ED}"usr/bin/gmx-completion*.bash || die
+       rm "${ED}"/usr/bin/gmx-completion*.bash || die
        readme.gentoo_create_doc
 }
 

diff --git a/sci-chemistry/gromacs/gromacs-9999.ebuild b/sci-chemistry/gromacs/gromacs-9999.ebuild
index 1fcf6ea170360cbba12411d8fc22802a37405882..f9d980d7c0f3db0a6171140523811196ccd3fdc1 100644 (file)
--- a/sci-chemistry/gromacs/gromacs-9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-9999.ebuild
@@ -68,6 +68,8 @@ REQUIRED_USE="
 
 DOCS=( AUTHORS README )
 
+RESTRICT="!test? ( test )"
+
 if [[ ${PV} != *9999 ]]; then
        S="${WORKDIR}/${PN}-${PV/_/-}"
 fi