commit: 01d2250e0e1ae030ca8f51470e0c0d844452c963 Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> AuthorDate: Fri Jun 18 12:35:17 2021 +0000 Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> CommitDate: Fri Jun 18 12:35:26 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01d2250e
sci-chemistry/gromacs: Fix manual use Closes: https://bugs.gentoo.org/796497 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org> sci-chemistry/gromacs/gromacs-2020.4.ebuild | 6 ++- sci-chemistry/gromacs/gromacs-2020.6.ebuild | 6 ++- sci-chemistry/gromacs/gromacs-2021.2.ebuild | 6 ++- sci-chemistry/gromacs/gromacs-2021.9999.ebuild | 6 ++- sci-chemistry/gromacs/gromacs-9999.ebuild | 61 +++++++++++++++----------- 5 files changed, 52 insertions(+), 33 deletions(-) diff --git a/sci-chemistry/gromacs/gromacs-2020.4.ebuild b/sci-chemistry/gromacs/gromacs-2020.4.ebuild index 266941a81e3..4a9027a2d18 100644 --- a/sci-chemistry/gromacs/gromacs-2020.4.ebuild +++ b/sci-chemistry/gromacs/gromacs-2020.4.ebuild @@ -74,7 +74,7 @@ RDEPEND="${CDEPEND}" REQUIRED_USE=" || ( single-precision double-precision ) - || ( doc build-manual ) + doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) @@ -317,7 +317,9 @@ src_install() { fi if use doc; then - newdoc "${DISTDIR}/manual-${PV}.pdf" "${PN}-manual-${PV}.pdf" + if [[ ${PV} != *9999* ]]; then + newdoc "${DISTDIR}/manual-${PV}.pdf" "${PN}-manual-${PV}.pdf" + fi fi use mpi || continue diff --git a/sci-chemistry/gromacs/gromacs-2020.6.ebuild b/sci-chemistry/gromacs/gromacs-2020.6.ebuild index 41ac7771497..0e2baeb3b30 100644 --- a/sci-chemistry/gromacs/gromacs-2020.6.ebuild +++ b/sci-chemistry/gromacs/gromacs-2020.6.ebuild @@ -74,7 +74,7 @@ RDEPEND="${CDEPEND}" REQUIRED_USE=" || ( single-precision double-precision ) - || ( doc build-manual ) + doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) @@ -317,7 +317,9 @@ src_install() { fi if use doc; then - newdoc "${DISTDIR}/manual-${PV}.pdf" "${PN}-manual-${PV}.pdf" + if [[ ${PV} != *9999* ]]; then + newdoc "${DISTDIR}/manual-${PV}.pdf" "${PN}-manual-${PV}.pdf" + fi fi use mpi || continue diff --git a/sci-chemistry/gromacs/gromacs-2021.2.ebuild b/sci-chemistry/gromacs/gromacs-2021.2.ebuild index 7b257ee4f40..d3299c25bab 100644 --- a/sci-chemistry/gromacs/gromacs-2021.2.ebuild +++ b/sci-chemistry/gromacs/gromacs-2021.2.ebuild @@ -74,7 +74,7 @@ RDEPEND="${CDEPEND}" REQUIRED_USE=" || ( single-precision double-precision ) - || ( doc build-manual ) + doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) @@ -324,7 +324,9 @@ src_install() { fi if use doc; then - newdoc "${DISTDIR}/manual-${PV}.pdf" "${PN}-manual-${PV}.pdf" + if [[ ${PV} != *9999* ]]; then + newdoc "${DISTDIR}/manual-${PV}.pdf" "${PN}-manual-${PV}.pdf" + fi fi use mpi || continue diff --git a/sci-chemistry/gromacs/gromacs-2021.9999.ebuild b/sci-chemistry/gromacs/gromacs-2021.9999.ebuild index 16825937690..40f115d6a10 100644 --- a/sci-chemistry/gromacs/gromacs-2021.9999.ebuild +++ b/sci-chemistry/gromacs/gromacs-2021.9999.ebuild @@ -74,7 +74,7 @@ RDEPEND="${CDEPEND}" REQUIRED_USE=" || ( single-precision double-precision ) - || ( doc build-manual ) + doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) @@ -319,7 +319,9 @@ src_install() { fi if use doc; then - newdoc "${DISTDIR}/manual-${PV}.pdf" "${PN}-manual-${PV}.pdf" + if [[ ${PV} != *9999* ]]; then + newdoc "${DISTDIR}/manual-${PV}.pdf" "${PN}-manual-${PV}.pdf" + fi fi use mpi || continue diff --git a/sci-chemistry/gromacs/gromacs-9999.ebuild b/sci-chemistry/gromacs/gromacs-9999.ebuild index 19c3097b599..40f115d6a10 100644 --- a/sci-chemistry/gromacs/gromacs-9999.ebuild +++ b/sci-chemistry/gromacs/gromacs-9999.ebuild @@ -7,6 +7,7 @@ CMAKE_MAKEFILE_GENERATOR="ninja" PYTHON_COMPAT=( python3_{7,8,9} ) +DISTUTILS_USE_SETUPTOOLS=no DISTUTILS_SINGLE_IMPL=1 inherit bash-completion-r1 cmake cuda distutils-r1 flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils @@ -21,6 +22,7 @@ if [[ ${PV} = *9999* ]]; then else SRC_URI=" http://ftp.gromacs.org/gromacs/${PN}-${PV/_/-}.tar.gz + doc? ( https://ftp.gromacs.org/manual/manual-${PV/_/-}.pdf ) test? ( http://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )" KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos" fi @@ -35,7 +37,7 @@ HOMEPAGE="http://www.gromacs.org/"; # base, vmd plugins, fftpack from numpy, blas/lapck from netlib, memtestG80 library, mpi_thread lib LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )" SLOT="0/${PV}" -IUSE="X blas cuda +custom-cflags +doc double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng ${ACCE_IUSE}" +IUSE="X blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng ${ACCE_IUSE}" CDEPEND=" X? ( @@ -57,7 +59,7 @@ CDEPEND=" " BDEPEND="${CDEPEND} virtual/pkgconfig - doc? ( + build-manual? ( app-doc/doxygen $(python_gen_cond_dep ' dev-python/sphinx[${PYTHON_MULTI_USEDEP}] @@ -72,6 +74,7 @@ RDEPEND="${CDEPEND}" REQUIRED_USE=" || ( single-precision double-precision ) + doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) @@ -131,28 +134,29 @@ src_prepare() { fi DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats" - - # try to create policy for imagemagik - mkdir -p ${HOME}/.config/ImageMagick - cat >> ${HOME}/.config/ImageMagick/policy.xml <<- EOF - <?xml version="1.0" encoding="UTF-8"?> - <!DOCTYPE policymap [ - <!ELEMENT policymap (policy)+> - !ATTLIST policymap xmlns CDATA #FIXED ''> - <!ELEMENT policy EMPTY> - <!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED + if use build-manual; then + # try to create policy for imagemagik + mkdir -p ${HOME}/.config/ImageMagick + cat >> ${HOME}/.config/ImageMagick/policy.xml <<- EOF + <?xml version="1.0" encoding="UTF-8"?> + <!DOCTYPE policymap [ + <!ELEMENT policymap (policy)+> + !ATTLIST policymap xmlns CDATA #FIXED ''> + <!ELEMENT policy EMPTY> + <!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED stealth NMTOKEN #IMPLIED value CDATA #IMPLIED> - ]> - <policymap> - <policy domain="coder" rights="read | write" pattern="PS" /> - <policy domain="coder" rights="read | write" pattern="PS2" /> - <policy domain="coder" rights="read | write" pattern="PS3" /> - <policy domain="coder" rights="read | write" pattern="EPS" /> - <policy domain="coder" rights="read | write" pattern="PDF" /> - <policy domain="coder" rights="read | write" pattern="XPS" /> - </policymap> - EOF + ]> + <policymap> + <policy domain="coder" rights="read | write" pattern="PS" /> + <policy domain="coder" rights="read | write" pattern="PS2" /> + <policy domain="coder" rights="read | write" pattern="PS3" /> + <policy domain="coder" rights="read | write" pattern="EPS" /> + <policy domain="coder" rights="read | write" pattern="PDF" /> + <policy domain="coder" rights="read | write" pattern="XPS" /> + </policymap> + EOF + fi } src_configure() { @@ -213,7 +217,7 @@ src_configure() { -DGMX_OPENMP=$(usex openmp) -DGMX_COOL_QUOTES=$(usex offensive) -DGMX_USE_TNG=$(usex tng) - -DGMX_BUILD_MANUAL=$(usex doc) + -DGMX_BUILD_MANUAL=$(usex build-manual) -DGMX_HWLOC=$(usex hwloc) -DGMX_DEFAULT_SUFFIX=off -DGMX_SIMD="$acce" @@ -284,7 +288,7 @@ src_compile() { distutils-r1_src_compile fi # not 100% necessary for rel ebuilds as available from website - if use doc; then + if use build-manual; then BUILD_DIR="${WORKDIR}/${P}_${x}"\ cmake_src_compile manual fi @@ -310,9 +314,16 @@ src_install() { BUILD_DIR="${WORKDIR}/${P}_${x}" \ cmake_src_install python_packaging/install fi - if use doc; then + if use build-manual; then newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf" fi + + if use doc; then + if [[ ${PV} != *9999* ]]; then + newdoc "${DISTDIR}/manual-${PV}.pdf" "${PN}-manual-${PV}.pdf" + fi + fi + use mpi || continue BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \ cmake_src_install
