gentoo resync : 10.02.2019

3 files changed, 88 insertions, 9 deletions

diff --git a/sci-chemistry/votca-xtp/Manifest b/sci-chemistry/votca-xtp/Manifest
index 077f76c40cab..f6dea503a50a 100644
--- a/sci-chemistry/votca-xtp/Manifest
+++ b/sci-chemistry/votca-xtp/Manifest
@@ -1,8 +1,11 @@
 DIST votca-xtp-1.4.1.tar.gz 15214413 BLAKE2B 0f6e67179e2ee1fa8ab79ca0c2d810f9867dab474b50d49316aaed33a01b5cf93a129558792fff2851b8f1b7794ab423c25e4b6f6bce6809520ff40234b14e93 SHA512 1a3f5df3dc9a7f532464ef84ff4f4f8e60b9495529f349ab5e496595e73fff8f4678b8276b2c5733dd3f692ca03220e7d0bc4a82163017572428c0d1dd5f91fd
 DIST votca-xtp-1.4.tar.gz 15214266 BLAKE2B 435ba1603495d904ccce20b4fa665d3a1c62fc04005ea89cf83b431240fb78f8a44f09ad619af331802e43ca3d05b20a4c6bbbb0c75360940d4f786c0030fd7a SHA512 ffc32260331862393e199f7ab643b1008ee4f800cd017f175550a079afaa20e5c929cb8599bc0c2a2328253051895de7b979f5fec044243abc680a0dc87a69b9
+DIST votca-xtp-1.5.tar.gz 14637712 BLAKE2B af04de706f0d100968928459a03b6a94a94a211b3f5bd056d123756d40760fb0ada70add429ed5b86e211dbdd3b91aa4cf12e51a260638766d04158e7b5a1201 SHA512 693f34004749edfbabcd0a19dc23b3de3c09858c7c0dfe1e420b92632397971e3687489c1074a489d4d2fd337ddc5749c419869db104c65736e7c01bf12cd140
 DIST votca-xtp-manual-1.4.1.pdf 1066873 BLAKE2B 8cbd4b55b013794a19a8b5867b929b8e2d9084e6780d777b2a2bbaea23006f4f4ec5b26bd4a07c59e1c6726f23471eb1756b668636e0c4e656a0807e64197586 SHA512 fdf1147f24785524f5e96020fcd29c32bbeef520eebf6afba32b59d7e777d586c452919478d2734c3f021e558b1147b945cdbc0833402be2b16e5af3a8e37f5f
 DIST votca-xtp-manual-1.4.pdf 1064006 BLAKE2B e4f0c20c6d40a5f58b863258cc122e5a7cf376b7138927c0a6bdd400841c330fc013287513258f6f68609e39f0bf39b965fd099171594c5e2730fba82a2488d4 SHA512 96d7f59dbcc3a6efdc297237025217d5a56d2c81e491d90680786ea4769a5ebbea379df3b06c4847307ee30accd7415e316dee4730361262f5aff73d2f5d387e
+DIST votca-xtp-manual-1.5.pdf 923211 BLAKE2B 5d2c78260365c6339753e1663d707d642dea870183386f799e8fb34517fdb69680293b77356ae00c3ee6b66053c614b7174503e2e752790a56e7dd2976b3cb0a SHA512 86079339de1cb6e3d0487ad816e86deebe6a1bddcac1f06801e3f94eca2e19b30ec61b286f13429e257aa152129f5dbb4bbbc88ac9d58bf1a9aeb1c3f430d3e0
 EBUILD votca-xtp-1.4.1.ebuild 1622 BLAKE2B 1358e16a21b653584fefdf8eb673744f18ba75ef59ae5410c609857ca0b6d73676b5f7ca101dd24d2d58ca1547ca062941c71296ca57e45cdfed29052dfc7cb2 SHA512 bee48dc7a8c0caba3a9a7ed546ad690fb9fc22310f512bc613aa76b35f72b39f4a2b620ab2789237465ce07a0be7b8fbb444eccd45e795b0c1cc3667b046f978
 EBUILD votca-xtp-1.4.ebuild 1618 BLAKE2B bab1c2d4cd442bc2208f87ff16ed1218aaf6c34ccb229c63d9de14086055684ee9440102b0c9a5bf807ddad69d22ee1b680120f493f18891e8719211509a418f SHA512 affe412a6c4cb8139530d559ae4c12d519eb6b9190075743ed7806c2975a4647f48282893d71b4bef3477b0d35ee07815e416c33095be819967d235c9623a48a
-EBUILD votca-xtp-9999.ebuild 1578 BLAKE2B 4bb4b3043c4005e87fa940c32beed2a11c6ede911d780136c78bda1606e107974bf06f4b62396f610d2a9c26a176739fa895ab3847c085f3158db99ecc4cdbfa SHA512 28d38840cec12742a274183926e1b05fba54bab9148fa1b3bb4ea435611e3aad7bb6d43ef68df6ec57c1234a1de2927fb327978ba8a130e6152368254d34119b
+EBUILD votca-xtp-1.5.ebuild 1622 BLAKE2B 0c99db3dbba224f0485838e5fddb8b857fd13d5e5d798bbaa4b64f89ffcbb1bbbb55a626ff601efd583bf32270c4a8be21a4f8357e6a67e1d8f3feac7c2eccdc SHA512 31a8520c2438ecd0407748b65d363c5ebf2027b71b19fd90810f75b25cf5ea90ed7eedde354fb17dbd0f087963b0b23923f29a9d028d899668fd90eda0806231
+EBUILD votca-xtp-9999.ebuild 1622 BLAKE2B 0c99db3dbba224f0485838e5fddb8b857fd13d5e5d798bbaa4b64f89ffcbb1bbbb55a626ff601efd583bf32270c4a8be21a4f8357e6a67e1d8f3feac7c2eccdc SHA512 31a8520c2438ecd0407748b65d363c5ebf2027b71b19fd90810f75b25cf5ea90ed7eedde354fb17dbd0f087963b0b23923f29a9d028d899668fd90eda0806231
 MISC metadata.xml 453 BLAKE2B 51ee11d9c55f15fd0382a7c422d1c12364901a5ac257f57d04b91b8ca77acf9c1eb709879bfc6042b577961352cbc4e31b01ece3a8c650eaffa9b4ebc6d385fb SHA512 892c8f84df6bd19e969b372def9a485be9121d8f7ab410b532529980298e57d0705f73fac409d8f251449cf2119dd3f28133e08d21d0e73b27d5ec0e9a3f205e
diff --git a/sci-chemistry/votca-xtp/votca-xtp-1.5.ebuild b/sci-chemistry/votca-xtp/votca-xtp-1.5.ebuild
new file mode 100644
index 000000000000..15a8759ad217
--- /dev/null
+++ b/sci-chemistry/votca-xtp/votca-xtp-1.5.ebuild
@@ -0,0 +1,73 @@
+# 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"
+if [ "${PV}" != "9999" ]; then
+	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		doc? ( https://github.com/${PN/-//}/releases/download/v${PV}/${PN}-manual-${PV}.pdf )"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+	S="${WORKDIR}/${P#votca-}"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="Votca excitation and charge properties module"
+HOMEPAGE="http://www.votca.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	~sci-libs/votca-tools-${PV}[sqlite]
+	>=dev-cpp/eigen-3.3
+	~sci-chemistry/votca-csg-${PV}
+	sci-libs/ceres-solver
+	sci-libs/libxc"
+
+DEPEND="${RDEPEND}
+	>=app-text/txt2tags-2.5
+	virtual/pkgconfig"
+
+if [ "${PV}" != "9999" ]; then
+	DEPEND="${DEPEND}
+	doc? (
+		app-doc/doxygen[dot]
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+		dev-tex/pgf
+	)"
+fi
+
+DOCS=( README.md NOTICE CHANGELOG.md )
+
+src_configure() {
+	[[ ${PV} = *9999* ]] && mycmakeargs=(
+		-DBUILD_XTP_MANUAL=$(usex doc)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	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
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Please read and cite:"
+	einfo "VOTCA-XTP, J. Chem. Theo. Comp. 14, 6353 (2018)"
+	einfo "https://doi.org/10.1021/acs.jctc.8b00617"
+	einfo
+}
diff --git a/sci-chemistry/votca-xtp/votca-xtp-9999.ebuild b/sci-chemistry/votca-xtp/votca-xtp-9999.ebuild
index 40eff61cae68..15a8759ad217 100644
--- a/sci-chemistry/votca-xtp/votca-xtp-9999.ebuild
+++ b/sci-chemistry/votca-xtp/votca-xtp-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
@@ -29,24 +29,27 @@ RDEPEND="
 	~sci-libs/votca-tools-${PV}[sqlite]
 	>=dev-cpp/eigen-3.3
 	~sci-chemistry/votca-csg-${PV}
-	~sci-chemistry/votca-ctp-${PV}
 	sci-libs/ceres-solver
 	sci-libs/libxc"
 
 DEPEND="${RDEPEND}
+	>=app-text/txt2tags-2.5
+	virtual/pkgconfig"
+
+if [ "${PV}" != "9999" ]; then
+	DEPEND="${DEPEND}
 	doc? (
 		app-doc/doxygen[dot]
 		dev-texlive/texlive-latexextra
 		virtual/latex-base
 		dev-tex/pgf
-	)
-	>=app-text/txt2tags-2.5
-	virtual/pkgconfig"
+	)"
+fi
 
 DOCS=( README.md NOTICE CHANGELOG.md )
 
 src_configure() {
-	mycmakeargs=(
+	[[ ${PV} = *9999* ]] && mycmakeargs=(
 		-DBUILD_XTP_MANUAL=$(usex doc)
 	)
 	cmake-utils_src_configure
@@ -64,7 +67,7 @@ src_install() {
 pkg_postinst() {
 	einfo
 	einfo "Please read and cite:"
-	einfo "VOTCA-CTP, J. Chem. Theo. Comp. 7, 3335-3345 (2011)"
-	einfo "https://dx.doi.org/10.1021/ct200388s"
+	einfo "VOTCA-XTP, J. Chem. Theo. Comp. 14, 6353 (2018)"
+	einfo "https://doi.org/10.1021/acs.jctc.8b00617"
 	einfo
 }