commit: 962f54f78411b7a39f8ee63f84699d1cc1453fb0 Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> AuthorDate: Thu Jul 9 14:54:53 2020 +0000 Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> CommitDate: Thu Jul 9 14:54:53 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=962f54f7
sci-chemistry/gromacs: Migrate cmake-utils -> cmake Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org> sci-chemistry/gromacs/gromacs-2018.8.ebuild | 18 +++++++++--------- sci-chemistry/gromacs/gromacs-2019.5-r1.ebuild | 18 +++++++++--------- sci-chemistry/gromacs/gromacs-2019.6.ebuild | 18 +++++++++--------- sci-chemistry/gromacs/gromacs-2020.1-r1.ebuild | 24 ++++++++++++------------ sci-chemistry/gromacs/gromacs-2020.2.ebuild | 24 ++++++++++++------------ sci-chemistry/gromacs/gromacs-2020.3.ebuild | 24 ++++++++++++------------ sci-chemistry/gromacs/gromacs-2020.9999.ebuild | 24 ++++++++++++------------ sci-chemistry/gromacs/gromacs-9999.ebuild | 24 ++++++++++++------------ 8 files changed, 87 insertions(+), 87 deletions(-) diff --git a/sci-chemistry/gromacs/gromacs-2018.8.ebuild b/sci-chemistry/gromacs/gromacs-2018.8.ebuild index feaa75c10bf..f124a0eac16 100644 --- a/sci-chemistry/gromacs/gromacs-2018.8.ebuild +++ b/sci-chemistry/gromacs/gromacs-2018.8.ebuild @@ -5,7 +5,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="ninja" -inherit bash-completion-r1 cmake-utils cuda eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils +inherit bash-completion-r1 cmake cuda eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz doc? ( ftp://ftp.gromacs.org/pub/manual/manual-${PV/_/-}.pdf ) @@ -68,7 +68,7 @@ src_prepare() { xdg_environment_reset #591952 - cmake-utils_src_prepare + cmake_src_prepare use cuda && cuda_src_prepare @@ -158,7 +158,7 @@ src_configure() { -DGMX_BINARY_SUFFIX="${suffix}" -DGMX_LIBS_SUFFIX="${suffix}" ) - BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure + BUILD_DIR="${WORKDIR}/${P}_${x}" cmake_src_configure [[ ${CHOST} != *-darwin* ]] || \ sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die use mpi || continue @@ -176,7 +176,7 @@ src_configure() { -DGMX_BINARY_SUFFIX="_mpi${suffix}" -DGMX_LIBS_SUFFIX="_mpi${suffix}" ) - BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure + BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake_src_configure [[ ${CHOST} != *-darwin* ]] || \ sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die done @@ -186,31 +186,31 @@ src_compile() { for x in ${GMX_DIRS}; do einfo "Compiling for ${x} precision" BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake-utils_src_compile + cmake_src_compile use mpi || continue einfo "Compiling for ${x} precision with mpi" BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\ - cmake-utils_src_compile + cmake_src_compile done } src_test() { for x in ${GMX_DIRS}; do BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake-utils_src_make check + cmake_src_make check done } src_install() { for x in ${GMX_DIRS}; do BUILD_DIR="${WORKDIR}/${P}_${x}" \ - cmake-utils_src_install + cmake_src_install if use doc; then newdoc "${DISTDIR}/manual-${PV/_/-}.pdf" "${PN}-manual-${PV}.pdf" fi use mpi || continue BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \ - cmake-utils_src_install + cmake_src_install done if use tng; then diff --git a/sci-chemistry/gromacs/gromacs-2019.5-r1.ebuild b/sci-chemistry/gromacs/gromacs-2019.5-r1.ebuild index d5258ab6f23..7ea93b91af9 100644 --- a/sci-chemistry/gromacs/gromacs-2019.5-r1.ebuild +++ b/sci-chemistry/gromacs/gromacs-2019.5-r1.ebuild @@ -5,7 +5,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="ninja" -inherit bash-completion-r1 cmake-utils cuda eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils +inherit bash-completion-r1 cmake cuda eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz doc? ( ftp://ftp.gromacs.org/pub/manual/manual-${PV/_/-}.pdf ) @@ -71,7 +71,7 @@ src_prepare() { xdg_environment_reset #591952 - cmake-utils_src_prepare + cmake_src_prepare use cuda && cuda_src_prepare @@ -170,7 +170,7 @@ src_configure() { -DGMX_BINARY_SUFFIX="${suffix}" -DGMX_LIBS_SUFFIX="${suffix}" ) - BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure + BUILD_DIR="${WORKDIR}/${P}_${x}" cmake_src_configure [[ ${CHOST} != *-darwin* ]] || \ sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die use mpi || continue @@ -189,7 +189,7 @@ src_configure() { -DGMX_BINARY_SUFFIX="_mpi${suffix}" -DGMX_LIBS_SUFFIX="_mpi${suffix}" ) - BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure + BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake_src_configure [[ ${CHOST} != *-darwin* ]] || \ sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die done @@ -199,31 +199,31 @@ src_compile() { for x in ${GMX_DIRS}; do einfo "Compiling for ${x} precision" BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake-utils_src_compile + cmake_src_compile use mpi || continue einfo "Compiling for ${x} precision with mpi" BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\ - cmake-utils_src_compile + cmake_src_compile done } src_test() { for x in ${GMX_DIRS}; do BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake-utils_src_make check + cmake_src_make check done } src_install() { for x in ${GMX_DIRS}; do BUILD_DIR="${WORKDIR}/${P}_${x}" \ - cmake-utils_src_install + cmake_src_install if use doc; then newdoc "${DISTDIR}/manual-${PV/_/-}.pdf" "${PN}-manual-${PV}.pdf" fi use mpi || continue BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \ - cmake-utils_src_install + cmake_src_install done if use tng; then diff --git a/sci-chemistry/gromacs/gromacs-2019.6.ebuild b/sci-chemistry/gromacs/gromacs-2019.6.ebuild index e8541e9964e..85004d2644a 100644 --- a/sci-chemistry/gromacs/gromacs-2019.6.ebuild +++ b/sci-chemistry/gromacs/gromacs-2019.6.ebuild @@ -5,7 +5,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="ninja" -inherit bash-completion-r1 cmake-utils cuda eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils +inherit bash-completion-r1 cmake cuda eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz doc? ( ftp://ftp.gromacs.org/pub/manual/manual-${PV/_/-}.pdf ) @@ -71,7 +71,7 @@ src_prepare() { xdg_environment_reset #591952 - cmake-utils_src_prepare + cmake_src_prepare use cuda && cuda_src_prepare @@ -170,7 +170,7 @@ src_configure() { -DGMX_BINARY_SUFFIX="${suffix}" -DGMX_LIBS_SUFFIX="${suffix}" ) - BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure + BUILD_DIR="${WORKDIR}/${P}_${x}" cmake_src_configure [[ ${CHOST} != *-darwin* ]] || \ sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die use mpi || continue @@ -189,7 +189,7 @@ src_configure() { -DGMX_BINARY_SUFFIX="_mpi${suffix}" -DGMX_LIBS_SUFFIX="_mpi${suffix}" ) - BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure + BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake_src_configure [[ ${CHOST} != *-darwin* ]] || \ sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die done @@ -199,31 +199,31 @@ src_compile() { for x in ${GMX_DIRS}; do einfo "Compiling for ${x} precision" BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake-utils_src_compile + cmake_src_compile use mpi || continue einfo "Compiling for ${x} precision with mpi" BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\ - cmake-utils_src_compile + cmake_src_compile done } src_test() { for x in ${GMX_DIRS}; do BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake-utils_src_make check + cmake_src_make check done } src_install() { for x in ${GMX_DIRS}; do BUILD_DIR="${WORKDIR}/${P}_${x}" \ - cmake-utils_src_install + cmake_src_install if use doc; then newdoc "${DISTDIR}/manual-${PV/_/-}.pdf" "${PN}-manual-${PV}.pdf" fi use mpi || continue BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \ - cmake-utils_src_install + cmake_src_install done if use tng; then diff --git a/sci-chemistry/gromacs/gromacs-2020.1-r1.ebuild b/sci-chemistry/gromacs/gromacs-2020.1-r1.ebuild index 9d71d0f7335..ba456196edd 100644 --- a/sci-chemistry/gromacs/gromacs-2020.1-r1.ebuild +++ b/sci-chemistry/gromacs/gromacs-2020.1-r1.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{6,7,8} ) DISTUTILS_SINGLE_IMPL=1 -inherit bash-completion-r1 cmake-utils cuda distutils-r1 eutils flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils +inherit bash-completion-r1 cmake cuda distutils-r1 eutils flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils if [[ $PV = *9999* ]]; then EGIT_REPO_URI="git://git.gromacs.org/gromacs.git @@ -116,7 +116,7 @@ src_prepare() { xdg_environment_reset #591952 - cmake-utils_src_prepare + cmake_src_prepare use cuda && cuda_src_prepare @@ -244,7 +244,7 @@ src_configure() { -DGMX_LIBS_SUFFIX="${suffix}" -DGMX_PYTHON_PACKAGE=$(usex python) ) - BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure + BUILD_DIR="${WORKDIR}/${P}_${x}" cmake_src_configure [[ ${CHOST} != *-darwin* ]] || \ sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die use mpi || continue @@ -263,7 +263,7 @@ src_configure() { -DGMX_BINARY_SUFFIX="_mpi${suffix}" -DGMX_LIBS_SUFFIX="_mpi${suffix}" ) - BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure + BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake_src_configure [[ ${CHOST} != *-darwin* ]] || \ sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die done @@ -273,46 +273,46 @@ src_compile() { for x in ${GMX_DIRS}; do einfo "Compiling for ${x} precision" BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake-utils_src_compile + cmake_src_compile if use python; then BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake-utils_src_compile python_packaging/all + cmake_src_compile python_packaging/all BUILD_DIR="${WORKDIR}/${P}" \ distutils-r1_src_compile fi # not 100% necessary for rel ebuilds as available from website if use doc; then BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake-utils_src_compile manual + cmake_src_compile manual fi use mpi || continue einfo "Compiling for ${x} precision with mpi" BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\ - cmake-utils_src_compile + cmake_src_compile done } src_test() { for x in ${GMX_DIRS}; do BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake-utils_src_make check + cmake_src_make check done } src_install() { for x in ${GMX_DIRS}; do BUILD_DIR="${WORKDIR}/${P}_${x}" \ - cmake-utils_src_install + cmake_src_install if use python; then BUILD_DIR="${WORKDIR}/${P}_${x}" \ - cmake-utils_src_install python_packaging/install + cmake_src_install python_packaging/install fi if use doc; then newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf" fi use mpi || continue BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \ - cmake-utils_src_install + cmake_src_install done if use tng; then diff --git a/sci-chemistry/gromacs/gromacs-2020.2.ebuild b/sci-chemistry/gromacs/gromacs-2020.2.ebuild index 9d71d0f7335..ba456196edd 100644 --- a/sci-chemistry/gromacs/gromacs-2020.2.ebuild +++ b/sci-chemistry/gromacs/gromacs-2020.2.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{6,7,8} ) DISTUTILS_SINGLE_IMPL=1 -inherit bash-completion-r1 cmake-utils cuda distutils-r1 eutils flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils +inherit bash-completion-r1 cmake cuda distutils-r1 eutils flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils if [[ $PV = *9999* ]]; then EGIT_REPO_URI="git://git.gromacs.org/gromacs.git @@ -116,7 +116,7 @@ src_prepare() { xdg_environment_reset #591952 - cmake-utils_src_prepare + cmake_src_prepare use cuda && cuda_src_prepare @@ -244,7 +244,7 @@ src_configure() { -DGMX_LIBS_SUFFIX="${suffix}" -DGMX_PYTHON_PACKAGE=$(usex python) ) - BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure + BUILD_DIR="${WORKDIR}/${P}_${x}" cmake_src_configure [[ ${CHOST} != *-darwin* ]] || \ sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die use mpi || continue @@ -263,7 +263,7 @@ src_configure() { -DGMX_BINARY_SUFFIX="_mpi${suffix}" -DGMX_LIBS_SUFFIX="_mpi${suffix}" ) - BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure + BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake_src_configure [[ ${CHOST} != *-darwin* ]] || \ sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die done @@ -273,46 +273,46 @@ src_compile() { for x in ${GMX_DIRS}; do einfo "Compiling for ${x} precision" BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake-utils_src_compile + cmake_src_compile if use python; then BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake-utils_src_compile python_packaging/all + cmake_src_compile python_packaging/all BUILD_DIR="${WORKDIR}/${P}" \ distutils-r1_src_compile fi # not 100% necessary for rel ebuilds as available from website if use doc; then BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake-utils_src_compile manual + cmake_src_compile manual fi use mpi || continue einfo "Compiling for ${x} precision with mpi" BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\ - cmake-utils_src_compile + cmake_src_compile done } src_test() { for x in ${GMX_DIRS}; do BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake-utils_src_make check + cmake_src_make check done } src_install() { for x in ${GMX_DIRS}; do BUILD_DIR="${WORKDIR}/${P}_${x}" \ - cmake-utils_src_install + cmake_src_install if use python; then BUILD_DIR="${WORKDIR}/${P}_${x}" \ - cmake-utils_src_install python_packaging/install + cmake_src_install python_packaging/install fi if use doc; then newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf" fi use mpi || continue BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \ - cmake-utils_src_install + cmake_src_install done if use tng; then diff --git a/sci-chemistry/gromacs/gromacs-2020.3.ebuild b/sci-chemistry/gromacs/gromacs-2020.3.ebuild index 9d71d0f7335..ba456196edd 100644 --- a/sci-chemistry/gromacs/gromacs-2020.3.ebuild +++ b/sci-chemistry/gromacs/gromacs-2020.3.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{6,7,8} ) DISTUTILS_SINGLE_IMPL=1 -inherit bash-completion-r1 cmake-utils cuda distutils-r1 eutils flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils +inherit bash-completion-r1 cmake cuda distutils-r1 eutils flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils if [[ $PV = *9999* ]]; then EGIT_REPO_URI="git://git.gromacs.org/gromacs.git @@ -116,7 +116,7 @@ src_prepare() { xdg_environment_reset #591952 - cmake-utils_src_prepare + cmake_src_prepare use cuda && cuda_src_prepare @@ -244,7 +244,7 @@ src_configure() { -DGMX_LIBS_SUFFIX="${suffix}" -DGMX_PYTHON_PACKAGE=$(usex python) ) - BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure + BUILD_DIR="${WORKDIR}/${P}_${x}" cmake_src_configure [[ ${CHOST} != *-darwin* ]] || \ sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die use mpi || continue @@ -263,7 +263,7 @@ src_configure() { -DGMX_BINARY_SUFFIX="_mpi${suffix}" -DGMX_LIBS_SUFFIX="_mpi${suffix}" ) - BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure + BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake_src_configure [[ ${CHOST} != *-darwin* ]] || \ sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die done @@ -273,46 +273,46 @@ src_compile() { for x in ${GMX_DIRS}; do einfo "Compiling for ${x} precision" BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake-utils_src_compile + cmake_src_compile if use python; then BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake-utils_src_compile python_packaging/all + cmake_src_compile python_packaging/all BUILD_DIR="${WORKDIR}/${P}" \ distutils-r1_src_compile fi # not 100% necessary for rel ebuilds as available from website if use doc; then BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake-utils_src_compile manual + cmake_src_compile manual fi use mpi || continue einfo "Compiling for ${x} precision with mpi" BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\ - cmake-utils_src_compile + cmake_src_compile done } src_test() { for x in ${GMX_DIRS}; do BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake-utils_src_make check + cmake_src_make check done } src_install() { for x in ${GMX_DIRS}; do BUILD_DIR="${WORKDIR}/${P}_${x}" \ - cmake-utils_src_install + cmake_src_install if use python; then BUILD_DIR="${WORKDIR}/${P}_${x}" \ - cmake-utils_src_install python_packaging/install + cmake_src_install python_packaging/install fi if use doc; then newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf" fi use mpi || continue BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \ - cmake-utils_src_install + cmake_src_install done if use tng; then diff --git a/sci-chemistry/gromacs/gromacs-2020.9999.ebuild b/sci-chemistry/gromacs/gromacs-2020.9999.ebuild index a2dcda755c8..92600477ee9 100644 --- a/sci-chemistry/gromacs/gromacs-2020.9999.ebuild +++ b/sci-chemistry/gromacs/gromacs-2020.9999.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{6,7} ) DISTUTILS_SINGLE_IMPL=1 -inherit bash-completion-r1 cmake-utils cuda distutils-r1 eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils +inherit bash-completion-r1 cmake cuda distutils-r1 eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils if [[ $PV = *9999* ]]; then EGIT_REPO_URI="git://git.gromacs.org/gromacs.git @@ -116,7 +116,7 @@ src_prepare() { xdg_environment_reset #591952 - cmake-utils_src_prepare + cmake_src_prepare use cuda && cuda_src_prepare @@ -240,7 +240,7 @@ src_configure() { -DGMX_LIBS_SUFFIX="${suffix}" -DGMX_PYTHON_PACKAGE=$(usex python) ) - BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure + BUILD_DIR="${WORKDIR}/${P}_${x}" cmake_src_configure [[ ${CHOST} != *-darwin* ]] || \ sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die use mpi || continue @@ -259,7 +259,7 @@ src_configure() { -DGMX_BINARY_SUFFIX="_mpi${suffix}" -DGMX_LIBS_SUFFIX="_mpi${suffix}" ) - BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure + BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake_src_configure [[ ${CHOST} != *-darwin* ]] || \ sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die done @@ -269,46 +269,46 @@ src_compile() { for x in ${GMX_DIRS}; do einfo "Compiling for ${x} precision" BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake-utils_src_compile + cmake_src_compile if use python; then BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake-utils_src_compile python_packaging/all + cmake_src_compile python_packaging/all BUILD_DIR="${WORKDIR}/${P}" \ distutils-r1_src_compile fi # not 100% necessary for rel ebuilds as available from website if use doc; then BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake-utils_src_compile manual + cmake_src_compile manual fi use mpi || continue einfo "Compiling for ${x} precision with mpi" BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\ - cmake-utils_src_compile + cmake_src_compile done } src_test() { for x in ${GMX_DIRS}; do BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake-utils_src_make check + cmake_src_make check done } src_install() { for x in ${GMX_DIRS}; do BUILD_DIR="${WORKDIR}/${P}_${x}" \ - cmake-utils_src_install + cmake_src_install if use python; then BUILD_DIR="${WORKDIR}/${P}_${x}" \ - cmake-utils_src_install python_packaging/install + cmake_src_install python_packaging/install fi if use doc; then newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf" fi use mpi || continue BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \ - cmake-utils_src_install + cmake_src_install done if use tng; then diff --git a/sci-chemistry/gromacs/gromacs-9999.ebuild b/sci-chemistry/gromacs/gromacs-9999.ebuild index 11c545362c6..203a0f716f5 100644 --- a/sci-chemistry/gromacs/gromacs-9999.ebuild +++ b/sci-chemistry/gromacs/gromacs-9999.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{6,7} ) DISTUTILS_SINGLE_IMPL=1 -inherit bash-completion-r1 cmake-utils cuda distutils-r1 eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils +inherit bash-completion-r1 cmake cuda distutils-r1 eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils if [[ $PV = *9999* ]]; then EGIT_REPO_URI="git://git.gromacs.org/gromacs.git @@ -116,7 +116,7 @@ src_prepare() { xdg_environment_reset #591952 - cmake-utils_src_prepare + cmake_src_prepare use cuda && cuda_src_prepare @@ -240,7 +240,7 @@ src_configure() { -DGMX_LIBS_SUFFIX="${suffix}" -DGMX_PYTHON_PACKAGE=$(usex python) ) - BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure + BUILD_DIR="${WORKDIR}/${P}_${x}" cmake_src_configure [[ ${CHOST} != *-darwin* ]] || \ sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die use mpi || continue @@ -259,7 +259,7 @@ src_configure() { -DGMX_BINARY_SUFFIX="_mpi${suffix}" -DGMX_LIBS_SUFFIX="_mpi${suffix}" ) - BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure + BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake_src_configure [[ ${CHOST} != *-darwin* ]] || \ sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die done @@ -269,46 +269,46 @@ src_compile() { for x in ${GMX_DIRS}; do einfo "Compiling for ${x} precision" BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake-utils_src_compile + cmake_src_compile if use python; then BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake-utils_src_compile python_packaging/all + cmake_src_compile python_packaging/all BUILD_DIR="${WORKDIR}/${P}" \ distutils-r1_src_compile fi # not 100% necessary for rel ebuilds as available from website if use doc; then BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake-utils_src_compile manual + cmake_src_compile manual fi use mpi || continue einfo "Compiling for ${x} precision with mpi" BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\ - cmake-utils_src_compile + cmake_src_compile done } src_test() { for x in ${GMX_DIRS}; do BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake-utils_src_make check + cmake_src_make check done } src_install() { for x in ${GMX_DIRS}; do BUILD_DIR="${WORKDIR}/${P}_${x}" \ - cmake-utils_src_install + cmake_src_install if use python; then BUILD_DIR="${WORKDIR}/${P}_${x}" \ - cmake-utils_src_install python_packaging/install + cmake_src_install python_packaging/install fi if use doc; then newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf" fi use mpi || continue BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \ - cmake-utils_src_install + cmake_src_install done if use tng; then
