gentoo resync 08.09.2018

4 files changed, 129 insertions, 32 deletions

diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index 1509f468381a..91835c391aeb 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -1,5 +1,7 @@
 AUX 1056.patch 8628 BLAKE2B 435bd4f01c44142f91978603de0f276f6c16819325e48bda9a234b83d37fc926b56883ce4c3f480f3f27bdb6b2e240ba8e34bd3d0406cfda9a19a1869726c228 SHA512 7ecdb067e10cdb7c7c8568cdda5d9520844eeff44e8914beafc03a2f0cf90f178c872f0c126264952e6b9d8c62b79d0ddb38c1a5121b8beea5bc23da5dad16f2
+DIST espresso-4.0.0.tar.gz 25767191 BLAKE2B 995678496fe35b957c4a5775f79f6656efbb5f717a43e90f8c5fa406aba7847cd34b00db3f313e5a7b0a11a96b521e8182bdd58129ad68ea4881c9496e3977e5 SHA512 53eb311e8bb7db5aed32dcd3adfd5e1c63e6ae42a22cea41844edfa857fee03ffd717c0739dd46a6cdf8ca7a4c4b0952a036b208fccc4e61de3f383910e7d019
 DIST espresso-4.0_pre20170228.tar.gz 23621395 BLAKE2B 6381e519c59986e50ff74fb3d81cd157f4761e1c46ea96b384487fd079b9c6f881dfa70df8f62e275fdd57bda6a4c714002630cebb02c232029186c3adbb692f SHA512 7d35648d447af3282a76d9d68cfe681734ec18794a38b09e0ae9233f63b62450c643643bcec999ea9c7d4ba070d4fc6f8dc64db8145f536ae017a67ff2d0e0e2
+EBUILD espresso-4.0.0.ebuild 2744 BLAKE2B 23cd589aa2b4b1ad77ff9a388a62eac52d9be8546b26fb4a9383cfae9bd886439f10edb4fbc552372b454deb48ab4a898edc8db081970090f8e44783604e1400 SHA512 a2a94b1fe43e213448159ca5f706a1d06a1ff192462a78f4ab674418a23d1bdaf4746b6a274380ba3bc43c17202771b31751b648320de4c244d37109a0df486d
 EBUILD espresso-4.0_pre20170228.ebuild 2846 BLAKE2B 541302fb836ed788820fc7f39daf699237b0f22fe15a55dbd6f314f209abe9e34a3fd586d8061fc1e2c458cd0c1a7064d87e28098187a24f593495a85bf13f9d SHA512 0ee1f0c33564279084b8c86754252e8e1c1f319ddc3626f1a7fc8b18d77f0856da273c0047a28adabe9fd9f3118fe6635d3beabf2b24d5639be26d2bde0bd268
-EBUILD espresso-9999.ebuild 3078 BLAKE2B cabd83b1d27094a2848f477156996a4b51bb744a73c4137fe3fd35cde796631e0556fb07dec4471c145abce144ac8b8ade2371b455521be0980364adc2f12698 SHA512 9ddc487b93d53cbd2c8f023023188cd7b8ab4707bcaf6db2072924a9a71140bd551e2799d6014b14dfc9d6d386d1fc4c760342f50241a207ec40c660e9e90bee
-MISC metadata.xml 660 BLAKE2B 520675c80c271f8d2b26806c11d25f8692fb6f42ea9bce7e24dbea60ef4a38ce66548507ed8862276fe0e295f888e176973aff3837dd84c83837ed0753103985 SHA512 b5b17b0a3e228506ec545599e321c4ec12de4794653a750cfdab189c949abb0d9dde3fce3f35f7ac8e42050e4071764533eaf3254b0492bde4149c8b6f8192c8
+EBUILD espresso-9999.ebuild 2744 BLAKE2B 23cd589aa2b4b1ad77ff9a388a62eac52d9be8546b26fb4a9383cfae9bd886439f10edb4fbc552372b454deb48ab4a898edc8db081970090f8e44783604e1400 SHA512 a2a94b1fe43e213448159ca5f706a1d06a1ff192462a78f4ab674418a23d1bdaf4746b6a274380ba3bc43c17202771b31751b648320de4c244d37109a0df486d
+MISC metadata.xml 596 BLAKE2B e0c4b7e3c44d88c1487f6c88f68f696e3edd174427f525e3ef769c26b4a2333c9c1c128e00e786a12cf671b821d633a73537fe667543dbdfcad5f7fe0bfef2da SHA512 c87e4c2401fd1600e80b5a493d68a222bdaabca448bb81940273e23a2607b5631ab24d05e1b265dcdaacc6e4e4756f713165a45ab072e9880551e5d2b034a4a5
diff --git a/sci-physics/espresso/espresso-4.0.0.ebuild b/sci-physics/espresso/espresso-4.0.0.ebuild
new file mode 100644
index 000000000000..953909c3dd7d
--- /dev/null
+++ b/sci-physics/espresso/espresso-4.0.0.ebuild
@@ -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
+}
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index b841b4d4bc56..953909c3dd7d 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -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
 }
 
diff --git a/sci-physics/espresso/metadata.xml b/sci-physics/espresso/metadata.xml
index f162adc22dc1..87ef8dd6f089 100644
--- a/sci-physics/espresso/metadata.xml
+++ b/sci-physics/espresso/metadata.xml
@@ -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>