sci-physics/espresso: version bump
authorChristoph Junghans <junghans@gentoo.org>
Fri, 7 Sep 2018 15:27:06 +0000 (09:27 -0600)
committerChristoph Junghans <junghans@gentoo.org>
Fri, 7 Sep 2018 15:27:30 +0000 (09:27 -0600)
Package-Manager: Portage-2.3.40, Repoman-2.3.9

sci-physics/espresso/Manifest
sci-physics/espresso/espresso-4.0.0.ebuild [new file with mode: 0644]
sci-physics/espresso/espresso-9999.ebuild
sci-physics/espresso/metadata.xml

index d5d5ca9efc659ca0b155b7fc44c198d4e37ef27c..2b8aa0ed6e976f91ed708c9962e562627af5a489 100644 (file)
@@ -1 +1,2 @@
+DIST espresso-4.0.0.tar.gz 25767191 BLAKE2B 995678496fe35b957c4a5775f79f6656efbb5f717a43e90f8c5fa406aba7847cd34b00db3f313e5a7b0a11a96b521e8182bdd58129ad68ea4881c9496e3977e5 SHA512 53eb311e8bb7db5aed32dcd3adfd5e1c63e6ae42a22cea41844edfa857fee03ffd717c0739dd46a6cdf8ca7a4c4b0952a036b208fccc4e61de3f383910e7d019
 DIST espresso-4.0_pre20170228.tar.gz 23621395 BLAKE2B 6381e519c59986e50ff74fb3d81cd157f4761e1c46ea96b384487fd079b9c6f881dfa70df8f62e275fdd57bda6a4c714002630cebb02c232029186c3adbb692f SHA512 7d35648d447af3282a76d9d68cfe681734ec18794a38b09e0ae9233f63b62450c643643bcec999ea9c7d4ba070d4fc6f8dc64db8145f536ae017a67ff2d0e0e2
diff --git a/sci-physics/espresso/espresso-4.0.0.ebuild b/sci-physics/espresso/espresso-4.0.0.ebuild
new file mode 100644 (file)
index 0000000..953909c
--- /dev/null
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit cmake-utils 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"
+
+REQUIRED_USE="
+       ${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+       ${PYTHON_DEPS}
+       >=dev-python/cython-0.26.1[${PYTHON_USEDEP}]
+       dev-python/numpy[${PYTHON_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 )
+
+src_prepare() {
+       use cuda && cuda_src_prepare
+       cmake-utils_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
+               -DLIBDIR=$(get_libdir)
+       )
+       cmake-utils_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
+}
+
+src_install() {
+       local i docdir="${S}"
+
+       cmake-utils_src_install
+
+       insinto /usr/share/${PN}/
+       doins ${CMAKE_BUILD_DIR}/myconfig-sample.hpp
+
+       save_config ${CMAKE_BUILD_DIR}/src/core/myconfig-final.hpp
+
+       if use doc; then
+               [[ ${PV} = 9999 ]] && docdir="${CMAKE_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
+       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
+}
index b841b4d4bc56986a5256761d82aea0c98a229b7c..953909c3dd7d54b870f2a21d52e8ae1141d55a30 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,35 +13,29 @@ HOMEPAGE="http://espressomd.org"
 
 if [[ ${PV} = 9999 ]]; then
        EGIT_REPO_URI="https://github.com/${PN}md/${PN}.git"
-       EGIT_BRANCH="master"
+       EGIT_BRANCH="python"
        inherit git-r3
        KEYWORDS=""
 else
-       SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz"
+       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 packages +python tcl test"
+IUSE="cuda doc examples +fftw +hdf5 test"
 
 REQUIRED_USE="
-       packages? ( tcl )
-       || ( python tcl )
        ${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
        ${PYTHON_DEPS}
-       python? (
-               >dev-python/cython-0.22[${PYTHON_USEDEP}]
-               dev-python/numpy[${PYTHON_USEDEP}]
-       )
-       tcl? ( dev-lang/tcl:0= )
+       >=dev-python/cython-0.26.1[${PYTHON_USEDEP}]
+       dev-python/numpy[${PYTHON_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:= )
-       packages? ( dev-tcltk/tcllib )"
+       hdf5? ( sci-libs/hdf5:=[mpi] )"
 
 DEPEND="${RDEPEND}
        doc? (
@@ -60,12 +54,10 @@ src_configure() {
        mycmakeargs=(
                -DWITH_CUDA=$(usex cuda)
                -DPYTHON_EXECUTABLE="${PYTHON}"
-               -DWITH_PYTHON=$(usex python)
-               -DWITH_TCL=$(usex tcl)
                -DWITH_TESTS=$(usex test)
-               -DWITH_SCAFACOS=ON
                -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
                -DLIBDIR=$(get_libdir)
@@ -93,24 +85,15 @@ src_install() {
                [[ ${PV} = 9999 ]] && docdir="${CMAKE_BUILD_DIR}"
                newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf
                newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf
-               for j in $(usev python) $(usev tcl); do
-                       for i in "${docdir}/doc/tutorials/${j}"/*/[0-9]*.pdf; do
-                               newdoc "${i}" "${j}_tutorial_${i##*/}"
-                       done
+               for i in "${docdir}/doc/tutorials/python"/*/[0-9]*.pdf; do
+                       newdoc "${i}" "tutorial_${i##*/}"
                done
                dodoc -r ${CMAKE_BUILD_DIR}/doc/doxygen/html
        fi
 
        if use examples; then
-               for i in $(usev python) $(usev tcl); do
-                       insinto "/usr/share/${PN}/examples/${i}"
-                       doins -r samples/${i}/.
-               done
-       fi
-
-       if use packages; then
-               insinto /usr/share/${PN}/packages
-               doins -r packages/*
+               insinto "/usr/share/${PN}/examples/python"
+               doins -r samples/${i}/.
        fi
 }
 
index f162adc22dc183774859f79df02ed49f94d3cc56..87ef8dd6f089d728856b89e80c81816fbf9d4a37 100644 (file)
@@ -12,7 +12,6 @@
   <use>
     <flag name="cuda">Enable cuda support</flag>
     <flag name="examples">Installs the examples</flag>
-    <flag name="packages">Installs extra TCL subpackages</flag>
   </use>
   <upstream>
     <remote-id type="github">espressomd/espresso</remote-id>