sci-chemistry/votca-csg: version bump

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Christoph Junghans <junghans@gentoo.org>

3 files changed, 98 insertions, 11 deletions

diff --git a/sci-chemistry/votca-csg/Manifest b/sci-chemistry/votca-csg/Manifest
index 4b83a0a57abe..1a8fa87be356 100644
--- a/sci-chemistry/votca-csg/Manifest
+++ b/sci-chemistry/votca-csg/Manifest
@@ -2,11 +2,14 @@ DIST votca-csg-1.4.1.tar.gz 347702 BLAKE2B 8c98804bafd75148fa72a9e119d4448ab9b04
 DIST votca-csg-1.4.tar.gz 346527 BLAKE2B 8f0a41f9aa9fd865e2e544d5fd587d93d631edc2dabab8edfc3461582da2e0401a266a42be1c0f1e6647502cdcccee55b5bba891aa156394012b8b5e1b06f7e8 SHA512 26318644c7af2dfa1b81242b27ffac98f2180c3a1f05581bc50a00f644cec4b19ffbaf41c9d941a4714171b56ae93fe41f1a663cd0593ae2b0be2da379119d9b
 DIST votca-csg-1.5.1.tar.gz 708319 BLAKE2B 2ea75cf08dc3005bd08ebe85113d95743fe85bae4b7ac3c2e2d9b64be64a7103ecf30b9edf45cffa86b7588d5c57a0256aef02f4590fa6031cb63881480bd0fd SHA512 3559452182c325d5df72918ec6e12122c8214df9733d779c123ff199597fe47fc493fd75adf1f5dbc6b55016373863378ba3cc69fb6b61bc1531c6e591d8131c
 DIST votca-csg-1.5.tar.gz 429164 BLAKE2B da04bd9ce8e879e9a961006256e03d160fa49fe77aa2f1eff0986b338296b04137bb087ecfabb7f2fc855b0ccd83dc4ddddfd65c43303bf5f2eef0519d27b0ec SHA512 c5a77ded3c9b2582494bea55b464689d566d4155713af823dccc6999f98438444d51fae3948144f82c2aaf3914eee740fe21e8828af689d37ab0b5ffea0605fa
+DIST votca-csg-1.6_rc1.tar.gz 479265 BLAKE2B c4ba3c81eefd375eea6f8c0b1cd60f9cc80898fb7e8e811ecc286f06d94bd4316edfca277649ec3f7f8b751b2f2928ca2dfe61cc3b1c3060a324ea783c62003f SHA512 6622648ddc3308ca2f8e98d6dbcd28e33a4e0fb44d96ef94ebcaa2e87e5ba3ca2ab83dcc1de4fd0803dbc20ba7192f5fdd2c935b364ed4e2122b5948c10d4936
 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.1.pdf 1263719 BLAKE2B 29e2ce27215787a1121e45ec1e88ce7c61ba81709a2519aa0959eede505498b9aaf4f38666bb1a4f97837c98b862e7ed02405da07294a7ec76cc80390fe72e0d SHA512 7d9fb4c635383e1b9c9547691f8729e19f273fcafc4dab2a6b438b3ce98ea05bd31887d09bc4edc86ceb0b04d71a4371aed7aadc3ba6864f7be2ef3328ede642
 DIST votca-csg-manual-1.5.pdf 1273566 BLAKE2B edfa2adb942d968cf79499e89342b7aaab64edfbfb6e02f76a66201df0920a58acc17bf4e2e4846d104519df163223c27f283cc5798ec7b64d9317a7728ff8c4 SHA512 da298ab0c27000ccf7fb5793c4252c4e17a969709db2649a5acb56af6208b954312c46a2ea8399cdb879b699e72a0ded0b2fe1bcd26431c6625f36b09c0267a5
+DIST votca-csg-manual-1.6_rc1.pdf 1248403 BLAKE2B b702eff4a36d27d592147f115f4e9080cbf580b6401141a14865395f0cb927c35f60035f92724e71e5edadbbe3e317f93989eb6f2e0a0e7b9f685e56851546d2 SHA512 2514bd2fee4bae787a3f8c07d1f1d90061a2b503255efe0730ed164bb002c7e7ad7309ccd3b5b931994f70b7ed99afde28955d9ea1b34c86df21bfcb8bfb39bb
 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.1.tar.gz 5949467 BLAKE2B c6de6084fbb1d2c4ac2ce75d01a1153eabc63386063de800ff2dc6b483b0568191e7f06ddcb8be46123224ccfd3a97f5fb4e7cd603c0ee99a8636d7143f6c701 SHA512 f2e709ae31d914fe12a4ce37b5019deb878b15ade14972f2a8204bec8970ba2c8946b71b94a5bfd6f7569e41173bfbc75275ea09cbee4358ad1de0e84751049c
 DIST votca-csg-tutorials-1.5.tar.gz 5947774 BLAKE2B d497f1e9282c4cacc070d09d901ad8f5d3042ab3a279aa4d1c3bcd3184dc22231d1f2a75ba0ffe245e6f6300fb740e562b24c8039594ec01307491a6068b55f6 SHA512 00447380fa887178ad02cc4e1425a04fc2fd2babdd4790d387fcd4aa2734dc14dacf4b4444d420937aa0a5b53e90741b44f9a4bca31bdcdae10fbfb8323e9848
+DIST votca-csg-tutorials-1.6_rc1.tar.gz 5946622 BLAKE2B 7bf0c7083ca7b148d16f7b77b9f785c11b16a8124a5435522e8c065859f4c2ae560c622f04021918b2683c9955d5a1b674c84fad179319f5fedb86616bbe24e7 SHA512 1c89f95944f8277a995d9d6d7dacfae2ae1be54a9a7b19c53d3464a4bdf5da0556e862033ba0a5f442b1ee5bd79bafd478655856fe266f4285c98e14512ce259
diff --git a/sci-chemistry/votca-csg/votca-csg-1.6_rc1.ebuild b/sci-chemistry/votca-csg/votca-csg-1.6_rc1.ebuild
new file mode 100644
index 000000000000..0e02baa215a8
--- /dev/null
+++ b/sci-chemistry/votca-csg/votca-csg-1.6_rc1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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}
+	>=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 "${ED}"/usr/share/votca/rc/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"
+	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 7aad54413e78..0e02baa215a8 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
@@ -37,12 +37,6 @@ RDEPEND="
 	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"
 
@@ -73,15 +67,13 @@ src_configure() {
 
 src_install() {
 	cmake-utils_src_install
-	newbashcomp scripts/csg-completion.bash csg_call
+	newbashcomp "${ED}"/usr/share/votca/rc/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"