From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- sci-physics/espresso/Manifest | 6 +- sci-physics/espresso/espresso-4.1.3.ebuild | 117 +++++++++++++++++++++++++++++ sci-physics/espresso/espresso-9999.ebuild | 31 ++++---- sci-physics/espresso/metadata.xml | 4 - 4 files changed, 137 insertions(+), 21 deletions(-) create mode 100644 sci-physics/espresso/espresso-4.1.3.ebuild (limited to 'sci-physics/espresso') diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest index 1ad9e687ef01..138f580b8e3c 100644 --- a/sci-physics/espresso/Manifest +++ b/sci-physics/espresso/Manifest @@ -2,7 +2,9 @@ AUX 1056.patch 8628 BLAKE2B 435bd4f01c44142f91978603de0f276f6c16819325e48bda9a23 AUX 2277.patch 645 BLAKE2B 0314dce1d9ec6b95e3ebfecb6253494e52b732fb27446f146b73bcc8a14ecdc767f434069563b6c6275dc25c591ac4ed422ff693669a28b3ddada29f88efffbc SHA512 f8502c83f05d6328e669e9e0d7d05e1216f59667829432ef4c558398ec39d0ee888479fc8e6387934604ca53477829a9f709565fa10a7aaadd4d455ca35b12c7 DIST espresso-4.0.0.tar.gz 25767191 BLAKE2B 995678496fe35b957c4a5775f79f6656efbb5f717a43e90f8c5fa406aba7847cd34b00db3f313e5a7b0a11a96b521e8182bdd58129ad68ea4881c9496e3977e5 SHA512 53eb311e8bb7db5aed32dcd3adfd5e1c63e6ae42a22cea41844edfa857fee03ffd717c0739dd46a6cdf8ca7a4c4b0952a036b208fccc4e61de3f383910e7d019 DIST espresso-4.0_pre20170228.tar.gz 23621395 BLAKE2B 6381e519c59986e50ff74fb3d81cd157f4761e1c46ea96b384487fd079b9c6f881dfa70df8f62e275fdd57bda6a4c714002630cebb02c232029186c3adbb692f SHA512 7d35648d447af3282a76d9d68cfe681734ec18794a38b09e0ae9233f63b62450c643643bcec999ea9c7d4ba070d4fc6f8dc64db8145f536ae017a67ff2d0e0e2 +DIST espresso-4.1.3.tar.gz 16947336 BLAKE2B 14d3513eda87f62a8473a0cac0c273b3590bf78ed48b96e76d10c106713f7bbd7d37de951bd3d9210062b34c02bd83a68f3aaf1ca8215ed1dcde590e4e99b113 SHA512 1fe82683eddb7bfd9bae6e446b0f42a50087d755995963905cd419473ad17b204f20049d0cf4af9264898dd6fee36f02744b38fa45cd0e33086374cf2aebd934 EBUILD espresso-4.0.0-r2.ebuild 2835 BLAKE2B 744290f292afd7e793d339a2380a0ca8accadf7c0a7f23567dc663f415ac3af1e460669ebab60a9c8c2244696199126ef153d69ec476a081b32f3b45dc947a4c SHA512 17ba5ce4623325fdfe1aaa56c0cdacfca7500cf3b9bcfe5648eb1bccbc928452198388f685b669b40bb75d5af7468ef159751d63013af1f3dbffab237e560a2f EBUILD espresso-4.0_pre20170228.ebuild 2899 BLAKE2B dbc0f3fa8481c0de53ea6eb020f396900fa4804953b4daa26b8b5f91ed915597ee6b5065d8267c9b676f8acec98fab95f73d5d83cf0c2c59428e166ef95b3433 SHA512 ef9fecaa51bdcbd034aadf61a2fe560ebccb38836978f289589130f510236dcfd5dd414ae91197e8e1ba1cab2050b2336891d5cea51071b249c5af25d877084c -EBUILD espresso-9999.ebuild 2797 BLAKE2B fb87dbadf9448fd86afd94625cedcd32583b484f1686ce51b2271afd456bdb76354dbf00a62b8b54a49dfcb19f6b7bf1b74bc71b65bd4a7b1e45036dcc683cdb SHA512 d56dbb297f095e7445312196396554fd2722b768abe8334ba177701a6f7f138e16497746d9db8d14635903cf003ea4d567532c6f4bb7bc4d3f5fa49b15b5bbad -MISC metadata.xml 596 BLAKE2B e0c4b7e3c44d88c1487f6c88f68f696e3edd174427f525e3ef769c26b4a2333c9c1c128e00e786a12cf671b821d633a73537fe667543dbdfcad5f7fe0bfef2da SHA512 c87e4c2401fd1600e80b5a493d68a222bdaabca448bb81940273e23a2607b5631ab24d05e1b265dcdaacc6e4e4756f713165a45ab072e9880551e5d2b034a4a5 +EBUILD espresso-4.1.3.ebuild 2738 BLAKE2B d2ed0248389ab77d108a57a00a6941051e3c4be5c1b01a5cec90e9851f1d87daa3ab4c1c67254693b971a40d1459009b70eb9df3ede962e75e05a25b8a600c8a SHA512 ef2f0852551ddfbf427379a71ebd2c1924b0fabce083d0f9130b9de47eeb1099da833cd28bd89efe301db7df0ac5d215dc4a0635757e9ba2e2914533c8df01f0 +EBUILD espresso-9999.ebuild 2738 BLAKE2B d2ed0248389ab77d108a57a00a6941051e3c4be5c1b01a5cec90e9851f1d87daa3ab4c1c67254693b971a40d1459009b70eb9df3ede962e75e05a25b8a600c8a SHA512 ef2f0852551ddfbf427379a71ebd2c1924b0fabce083d0f9130b9de47eeb1099da833cd28bd89efe301db7df0ac5d215dc4a0635757e9ba2e2914533c8df01f0 +MISC metadata.xml 476 BLAKE2B f76690b14e947d107cab9c5601cbdc62fc3160e03114ceeca6b45f6d29960691bbdf2d740694198d88cbb31311e5bf0ef0d2b225d276da71030e643188394cf8 SHA512 be0595e319ca81b2293857b6365e8ec9397548a8f30ff5b39f8b267c51dd0a1c08835b2880bdc0714ae7c6264066c88ee9f6ac053c54c4419cdabe5808678184 diff --git a/sci-physics/espresso/espresso-4.1.3.ebuild b/sci-physics/espresso/espresso-4.1.3.ebuild new file mode 100644 index 000000000000..ef5f6578edce --- /dev/null +++ b/sci-physics/espresso/espresso-4.1.3.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) +CMAKE_MAKEFILE_GENERATOR="emake" + +inherit cmake python-single-r1 savedconfig + +DESCRIPTION="Extensible Simulation Package for Research on Soft matter" +HOMEPAGE="http://espressomd.org" + +if [[ ${PV} = 9999 ]]; then + EGIT_REPO_URI="https://github.com/${PN}md/${PN}.git" + EGIT_BRANCH="python" + inherit git-r3 + KEYWORDS="" +else + SRC_URI="https://github.com/${PN}md/${PN}/releases/download/${PV}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos" +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="cuda doc examples +fftw +hdf5 test" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + >=dev-python/cython-0.26.1[${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + ') + cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) + fftw? ( sci-libs/fftw:3.0 ) + dev-libs/boost:=[mpi] + hdf5? ( sci-libs/hdf5:=[mpi] )" + +DEPEND="${RDEPEND} + doc? ( + app-doc/doxygen[dot] + dev-texlive/texlive-latexextra + virtual/latex-base )" + +DOCS=( AUTHORS NEWS README ChangeLog ) + +S="${WORKDIR}/${PN}" + +src_prepare() { + use cuda && cuda_src_prepare + cmake_src_prepare +} + +src_configure() { + mycmakeargs=( + -DWITH_CUDA=$(usex cuda) + -DPYTHON_EXECUTABLE="${PYTHON}" + -DWITH_TESTS=$(usex test) + -DINSTALL_PYPRESSO=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_FFTW3=$(usex !fftw) + -DWITH_HDF5=$(usex hdf5) + -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5) + -DCMAKE_SKIP_RPATH=YES + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use doc && cmake_build doxygen + [[ ${PV} = 9999 ]] && use doc && cmake_build ug dg tutorials +} + +src_install() { + local i docdir="${S}" + + cmake_src_install + + insinto /usr/share/${PN}/ + doins "${BUILD_DIR}/myconfig-sample.hpp" + + save_config "${BUILD_DIR}/src/config/myconfig-final.hpp" + + if use doc; then + [[ ${PV} = 9999 ]] && docdir="${BUILD_DIR}" + newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf + newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf + for i in "${docdir}/doc/tutorials/python"/*/[0-9]*.pdf; do + newdoc "${i}" "tutorial_${i##*/}" + done + dodoc -r "${BUILD_DIR}/doc/doxygen/html" + fi + + if use examples; then + insinto "/usr/share/${PN}/examples/python" + doins -r samples/${i}/. + fi +} + +pkg_postinst() { + echo + elog "Please read and cite:" + elog "ESPResSo, Comput. Phys. Commun. 174(9) ,704, 2006." + elog "https://dx.doi.org/10.1016/j.cpc.2005.10.005" + echo + elog "If you need more features, change" + elog "/etc/portage/savedconfig/${CATEGORY}/${PF}" + elog "and reemerge with USE=savedconfig" + echo + elog "For a full feature list see:" + elog "/usr/share/${PN}/myconfig-sample.hpp" + echo +} diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild index fcc6fbc9926e..ef5f6578edce 100644 --- a/sci-physics/espresso/espresso-9999.ebuild +++ b/sci-physics/espresso/espresso-9999.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python3_6 ) -CMAKE_MAKEFILE_GENERATOR="ninja" +PYTHON_COMPAT=( python3_{6,7,8,9} ) +CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake-utils python-single-r1 savedconfig +inherit cmake python-single-r1 savedconfig DESCRIPTION="Extensible Simulation Package for Research on Soft matter" HOMEPAGE="http://espressomd.org" @@ -48,9 +48,11 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS NEWS README ChangeLog ) +S="${WORKDIR}/${PN}" + src_prepare() { use cuda && cuda_src_prepare - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { @@ -63,35 +65,34 @@ src_configure() { -DWITH_HDF5=$(usex hdf5) -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5) -DCMAKE_SKIP_RPATH=YES - -DLIBDIR=$(get_libdir) ) - cmake-utils_src_configure + cmake_src_configure } src_compile() { - cmake-utils_src_compile - use doc && cmake-utils_src_make doxygen - [[ ${PV} = 9999 ]] && use doc && cmake-utils_src_make ug dg tutorials + cmake_src_compile + use doc && cmake_build doxygen + [[ ${PV} = 9999 ]] && use doc && cmake_build ug dg tutorials } src_install() { local i docdir="${S}" - cmake-utils_src_install + cmake_src_install insinto /usr/share/${PN}/ - doins ${CMAKE_BUILD_DIR}/myconfig-sample.hpp + doins "${BUILD_DIR}/myconfig-sample.hpp" - save_config ${CMAKE_BUILD_DIR}/src/core/myconfig-final.hpp + save_config "${BUILD_DIR}/src/config/myconfig-final.hpp" if use doc; then - [[ ${PV} = 9999 ]] && docdir="${CMAKE_BUILD_DIR}" + [[ ${PV} = 9999 ]] && docdir="${BUILD_DIR}" newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf for i in "${docdir}/doc/tutorials/python"/*/[0-9]*.pdf; do newdoc "${i}" "tutorial_${i##*/}" done - dodoc -r ${CMAKE_BUILD_DIR}/doc/doxygen/html + dodoc -r "${BUILD_DIR}/doc/doxygen/html" fi if use examples; then diff --git a/sci-physics/espresso/metadata.xml b/sci-physics/espresso/metadata.xml index 87ef8dd6f089..37615e72f9b7 100644 --- a/sci-physics/espresso/metadata.xml +++ b/sci-physics/espresso/metadata.xml @@ -1,10 +1,6 @@ - - junghans@gentoo.org - Christoph Junghans - sci-physics@gentoo.org Gentoo Physics Project -- cgit v1.2.3