gentoo resync : 10.02.2019

3 files changed, 107 insertions, 4 deletions

diff --git a/sci-chemistry/votca-csg/Manifest b/sci-chemistry/votca-csg/Manifest
index 2c8806e1dad9..581f3e6230ae 100644
--- a/sci-chemistry/votca-csg/Manifest
+++ b/sci-chemistry/votca-csg/Manifest
@@ -1,10 +1,14 @@
 DIST votca-csg-1.4.1.tar.gz 347702 BLAKE2B 8c98804bafd75148fa72a9e119d4448ab9b04fb6f305e1e162a18013871d03778873a50670ce06bb218fc063f51ad67efc4a182c2d7bb46f91b59e30181b71d6 SHA512 87f2798c9b5f2d82ae1c158238f7a3b7007c7ceb7ce82503f0b002f605f2cc0b5ca4c8ef24fab571efae63a81e7a60bc476b5433962c239de4f5d42bae3c10ea
 DIST votca-csg-1.4.tar.gz 346527 BLAKE2B 8f0a41f9aa9fd865e2e544d5fd587d93d631edc2dabab8edfc3461582da2e0401a266a42be1c0f1e6647502cdcccee55b5bba891aa156394012b8b5e1b06f7e8 SHA512 26318644c7af2dfa1b81242b27ffac98f2180c3a1f05581bc50a00f644cec4b19ffbaf41c9d941a4714171b56ae93fe41f1a663cd0593ae2b0be2da379119d9b
+DIST votca-csg-1.5.tar.gz 429164 BLAKE2B da04bd9ce8e879e9a961006256e03d160fa49fe77aa2f1eff0986b338296b04137bb087ecfabb7f2fc855b0ccd83dc4ddddfd65c43303bf5f2eef0519d27b0ec SHA512 c5a77ded3c9b2582494bea55b464689d566d4155713af823dccc6999f98438444d51fae3948144f82c2aaf3914eee740fe21e8828af689d37ab0b5ffea0605fa
 DIST votca-csg-manual-1.4.1.pdf 1282641 BLAKE2B 370b7c8997649555fd2360b999cf381c340a74c3747afda23d0e9d346367cc6d14d4e9a0e9ac82184945427d30050dd623dd1b6d8218c6ff3d2f17331987aaae SHA512 e89f41af05eaeb9ea499e8625cc98e2632ec647ec2d8c9c9052dcd4d2935d082b29b51495514e3e06e73ce42b8cda7017fc523a013569378e2bc86bf88ad32d4
 DIST votca-csg-manual-1.4.pdf 1281983 BLAKE2B 5659c2e327ba7bb00fac15adfb578288d546b509366863f593776a62dd3064662535d4fd525f1063f5ccaf47446822f13fefd7f66aa9d68cd1a4a7c99d66a790 SHA512 2e1f4a4375d83df9bd357d4d17e79d26a3a31c9177f008de86721427ffc6f43a5000ec840691108b52a8aecf962321ba6363cd975c7445d7230ee5b0b151b3fa
+DIST votca-csg-manual-1.5.pdf 1273566 BLAKE2B edfa2adb942d968cf79499e89342b7aaab64edfbfb6e02f76a66201df0920a58acc17bf4e2e4846d104519df163223c27f283cc5798ec7b64d9317a7728ff8c4 SHA512 da298ab0c27000ccf7fb5793c4252c4e17a969709db2649a5acb56af6208b954312c46a2ea8399cdb879b699e72a0ded0b2fe1bcd26431c6625f36b09c0267a5
 DIST votca-csg-tutorials-1.4.1.tar.gz 6339417 BLAKE2B e9acf8e421f6fce4d97be2d51fb559979c6fd3e6b042525cedf32cadeab1dddc5b1aaf80bbbfd387da3bce71672759c2e84d317c789f616dc71834c72a581fff SHA512 896ec9d6b2537a06301046a74c1957708eb96d9854b3ec855fe3457208c142f6fb26a03e323a2644862a1efd0030fcceb1189f73655b984462f0f7127a02de90
 DIST votca-csg-tutorials-1.4.tar.gz 6348417 BLAKE2B 612fcbc4457a57be74e5306bf86d6e031ea8cd55ebe3f4d246c0876e272e6e6dd535c8dd2f24f7593cb1ef31fbc18111269d29cb69120368ddef7b1b7d25825c SHA512 f3eb28a133ebc04eed07f84d5962943cb9c547c1099638127f15e0015dfdf3f0b25aab4c97d009d6040bf1d69d408cc178edd6e803d33bf1d831e12dca0671c7
+DIST votca-csg-tutorials-1.5.tar.gz 5947774 BLAKE2B d497f1e9282c4cacc070d09d901ad8f5d3042ab3a279aa4d1c3bcd3184dc22231d1f2a75ba0ffe245e6f6300fb740e562b24c8039594ec01307491a6068b55f6 SHA512 00447380fa887178ad02cc4e1425a04fc2fd2babdd4790d387fcd4aa2734dc14dacf4b4444d420937aa0a5b53e90741b44f9a4bca31bdcdae10fbfb8323e9848
 EBUILD votca-csg-1.4.1.ebuild 3204 BLAKE2B e447a6859d7ee4d722701f96634667529bd183f10dd4affeb2713023edfe52ab73988df7ef912963bd154b893bd2d401d2fd110a729040a2a2c52ec5fd44985c SHA512 df94c127269df2a2eaa9643005eeeae6925b458fbb0cb4d1661757a49e5ab4926a613c532e4df4475b34768e904d2388270c868c9ad675cd110e2b1737153e3d
 EBUILD votca-csg-1.4.ebuild 3191 BLAKE2B 93981bf3302b4c0feaaf1e45005df343ab5e12011a461e0f9729a9e6d50f1268fb016ce2bbe397a2b673fb0172a9971bc9e67fb806fa9a56fb7ab4e05235bd56 SHA512 ddeed3f96f097e73ad3593daebab448ae992a3f0d4ba9d46b9027c79c9654457ba3611af51049741f8ff04c0f8425eb097a6115f75d1ec7704f48c46a71ea088
-EBUILD votca-csg-9999.ebuild 2540 BLAKE2B 605ea77ddd320c1e0af4c93468261e3a44ef49fa1073568d64521a1557f5cdbd18fbf66e82be235b2e221adddacbc731fde63233d2ecb05e37528d0ce16be79c SHA512 932e5be7cf66118e246a56fa4420d4a5df07fc1ebb82ce6a5331b3ca71eace4ac79a7a84bc5186515e7bbd6856de6c604bc8b1351020146d466f4bd229f7446c
+EBUILD votca-csg-1.5.ebuild 2540 BLAKE2B 7391ae1af857c92b688fab507417c875189725d8f121296aaefccecc903501cc6c50561b0a7a4f834d5713f2bdd75b2325594fbbc32e6d0a0d814cf5c7ca7b14 SHA512 fc36ac2de479e2766722b3eb64d8f4eb43233c9625c67124d2ec583e21e22f1c77d6bee2a71d9c3b35451eeb0c6ddc729f4726e8b56f7e45b2c64a9f45fd94ae
+EBUILD votca-csg-9999.ebuild 2540 BLAKE2B 7391ae1af857c92b688fab507417c875189725d8f121296aaefccecc903501cc6c50561b0a7a4f834d5713f2bdd75b2325594fbbc32e6d0a0d814cf5c7ca7b14 SHA512 fc36ac2de479e2766722b3eb64d8f4eb43233c9625c67124d2ec583e21e22f1c77d6bee2a71d9c3b35451eeb0c6ddc729f4726e8b56f7e45b2c64a9f45fd94ae
 MISC metadata.xml 676 BLAKE2B b3f2e43f5cb505876216b0a329410c9cef1b44a9bbd7e1c61faa4acd00dbe87ea0cebb00ed78dc00b9e1d2b08b95e3c40d25fecc0738c992a3f933e430f94e2b SHA512 14ecd498eeeed1576923d8da9bc5dc98e47c1d162173b7f2419ad367fa84e227555bd0365709be8a456dc5388ea6fa6734fa7df3c82fd4efcd1cf3460c7e12a1
diff --git a/sci-chemistry/votca-csg/votca-csg-1.5.ebuild b/sci-chemistry/votca-csg/votca-csg-1.5.ebuild
new file mode 100644
index 000000000000..7aad54413e78
--- /dev/null
+++ b/sci-chemistry/votca-csg/votca-csg-1.5.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit bash-completion-r1 cmake-utils multilib
+
+IUSE="doc examples extras +gromacs hdf5"
+PDEPEND="extras? ( ~sci-chemistry/${PN}apps-${PV} )"
+if [ "${PV}" != "9999" ]; then
+	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		doc? ( https://github.com/${PN/-//}-manual/releases/download/v${PV}/${PN}-manual-${PV}.pdf )
+		examples? (	https://github.com/${PN/-//}-tutorials/archive/v${PV}.tar.gz -> ${PN}-tutorials-${PV}.tar.gz )"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+	S="${WORKDIR}/${P#votca-}"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
+	KEYWORDS=""
+	PDEPEND="${PDEPEND} doc? ( ~app-doc/${PN}-manual-${PV} )"
+fi
+
+DESCRIPTION="Votca coarse-graining engine"
+HOMEPAGE="http://www.votca.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	~sci-libs/votca-tools-${PV}
+	>=dev-cpp/eigen-3.3
+	gromacs? ( sci-chemistry/gromacs:= )
+	hdf5? ( sci-libs/hdf5 )
+	dev-lang/perl
+	app-shells/bash:*"
+
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen[dot]
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+		dev-tex/pgf
+	)
+	>=app-text/txt2tags-2.5
+	virtual/pkgconfig"
+
+DOCS=( README.md NOTICE CHANGELOG.md )
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		default
+	else
+		git-r3_src_unpack
+		if use examples; then
+			EGIT_REPO_URI="https://github.com/${PN/-//}-tutorials.git"
+			EGIT_BRANCH="master"
+			EGIT_CHECKOUT_DIR="${WORKDIR}/${PN#votca-}-tutorials"\
+				git-r3_src_unpack
+		fi
+	fi
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_GMX=$(usex gromacs)
+		-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex '!hdf5')
+		-DWITH_RC_FILES=OFF
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	newbashcomp scripts/csg-completion.bash csg_call
+	for i in "${ED}"/usr/bin/csg_*; do
+		[[ ${i} = *csg_call ]] && continue
+		bashcomp_alias csg_call "${i##*/}"
+	done
+	if use doc; then
+		[[ ${PV} != *9999* ]] && dodoc "${DISTDIR}/${PN}-manual-${PV}.pdf"
+		cmake-utils_src_make -C "${CMAKE_BUILD_DIR}" html
+		dodoc -r "${CMAKE_BUILD_DIR}"/share/doc/html
+	fi
+	if use examples; then
+		insinto "/usr/share/doc/${PF}/tutorials"
+		docompress -x "/usr/share/doc/${PF}/tutorials"
+		rm -rf "${WORKDIR}/${PN#votca-}"-tutorials*/CMake*
+		doins -r "${WORKDIR}/${PN#votca-}"-tutorials*/*
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Please read and cite:"
+	einfo "VOTCA, J. Chem. Theory Comput. 5, 3211 (2009). "
+	einfo "https://dx.doi.org/10.1021/ct900369w"
+	einfo
+}
diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index b894aae404b1..7aad54413e78 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -65,9 +65,8 @@ src_unpack() {
 src_configure() {
 	mycmakeargs=(
 		-DWITH_GMX=$(usex gromacs)
-		-DWITH_H5MD=$(usex hdf5)
+		-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex '!hdf5')
 		-DWITH_RC_FILES=OFF
-		-DLIB=$(get_libdir)
 	)
 	cmake-utils_src_configure
 }