gentoo resync : 03.03.2021

3 files changed, 46 insertions, 46 deletions

diff --git a/sci-chemistry/votca-csg/Manifest b/sci-chemistry/votca-csg/Manifest
index afad3b01e497..b1f031db5c08 100644
--- a/sci-chemistry/votca-csg/Manifest
+++ b/sci-chemistry/votca-csg/Manifest
@@ -8,7 +8,7 @@ DIST votca-csg-tutorials-1.5.1.tar.gz 5949467 BLAKE2B c6de6084fbb1d2c4ac2ce75d01
 DIST votca-csg-tutorials-1.6.4.tar.gz 5944389 BLAKE2B 66f1d4947bb28ec602250226ad2c08cc02278a90776acbcadca2df3078361435fb2353ee0fa299d0d19697d36682f20aab709d45539d5ac7e7070942601ebc3f SHA512 7e40037f2e70c861fd7f5c63806c17ad56672a340a8795fa745414940c55f593bef32b9f6b9050400131ed9e66aa927149e9d324a1c264364d8504baf1921e28
 DIST votca-csg-tutorials-1.6.tar.gz 5946764 BLAKE2B 018bd00c86c0a85baf35afd2ea4206c96dee8f948dcbf331b53e6f685b69bf2c909731b15ba3261c86cee9e1960ec5cfa7b2ee0c6dcfabbbbc110789840184ad SHA512 36d3a66c19d230f2002170851345da7063aeef1f29841945b8a182f73922617823815dde5d7289fb0f80e771ac03780adacdf95af4814235edbf69a4772b3696
 EBUILD votca-csg-1.5.1.ebuild 2522 BLAKE2B 0fe2b373307c76ebab320169b5ae837c463a734b029af1a328a87c2428b19484f138c75e7bb1e4ad91d0c099aa24c97c411c2f00308ebad051a81d0275e797be SHA512 2c6018212ae244e7387a2f63e186e970dd18825d77994f862c283131796ac93c6bb25a5233a41e306d8090ee75c82759025b74c3d1e0a0211adf67e0b3964449
-EBUILD votca-csg-1.6.4.ebuild 2316 BLAKE2B 85962d8038510596f0e4e11243001754460f6ea5c6990015de6304ccc61fe8b68a5eca73488220007f611a9445bb5918f664fcbf8c5f5b44551fc0c5d91069c8 SHA512 d42bba8403650ea5a877c462288a20ff49919bbcc07366d70520583b026ba80d112d1d54f55bcd95680a0ba1403f9854b0c82d2ebe19bfcb0f4ec2eb4c7de1e0
+EBUILD votca-csg-1.6.4.ebuild 2292 BLAKE2B 09218b100241e4025010215d975195b7d6f17343f4dce8d4a0e1c18b8c2c99d7fba8f0a8e8372ea8a543cd13b96514e2c2e3bec61ba23ce99031c107f30600fb SHA512 68d528d8b8496c65ec30ec8552baf9bd8b74d75ecafb3972c19e3b1d13214dc93215f5f50c96cd7ef0e86cdfce53d1a9da83514c5babc673dd6763a1657464b5
 EBUILD votca-csg-1.6.ebuild 2332 BLAKE2B 4241ebb2ab2c45fdd192eee0fc1ff111ddfa025ac5c1ff0fb98e551ff842ec91b3c299e8e662dedfbc5783707c107ac94df79d18747dba2f7a5e5853e7d4b38e SHA512 e821e4a31d4811abaa8fd05e225ab090c2d67d7bc2e3c399d544ae22fb14a4f6bb2e4f9ce94ecabd11b5c3fe0623523efc2d93fde3428bb6b5d492b366803216
-EBUILD votca-csg-9999.ebuild 2045 BLAKE2B 9513d3e265fab591e73a269c7f8aa1dabeaa5b3f043cccde4849d08a0e56c33ffb40589dbbbb1d8962a6824f830ae33b5b8cbd025c67009a98299ec31b8efb29 SHA512 3cee13e1b2b2d3ee7613c092899bf03a5f9a33c056e3209662605cadeec28731e7745910e3fc9dc68033501c091700133b0c6082e9b2e13c52e3725a5c0e98ec
+EBUILD votca-csg-9999.ebuild 2020 BLAKE2B 5c69ecca5b9a7dcb71c12282ab5e9bfd44afd2553afdf5dd455fa8333b0e5fc81f95edfa5b065054f0b3cafbc9b1abfeffea5e2f2b1c0b80483cedac6764f3b1 SHA512 9f98e49c8fc3767c5154122352ac2260c5acef45f971c7421720767089b7d5b4c611a828d2d220245f673d7e72f186740b4c6578249a479708cc9a6365afb063
 MISC metadata.xml 676 BLAKE2B b3f2e43f5cb505876216b0a329410c9cef1b44a9bbd7e1c61faa4acd00dbe87ea0cebb00ed78dc00b9e1d2b08b95e3c40d25fecc0738c992a3f933e430f94e2b SHA512 14ecd498eeeed1576923d8da9bc5dc98e47c1d162173b7f2419ad367fa84e227555bd0365709be8a456dc5388ea6fa6734fa7df3c82fd4efcd1cf3460c7e12a1
diff --git a/sci-chemistry/votca-csg/votca-csg-1.6.4.ebuild b/sci-chemistry/votca-csg/votca-csg-1.6.4.ebuild
index 758dcc378f91..4a22a2fb7665 100644
--- a/sci-chemistry/votca-csg/votca-csg-1.6.4.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-1.6.4.ebuild
@@ -3,62 +3,62 @@
 
 EAPI=7
 
-CMAKE_MAKEFILE_GENERATOR="ninja"
+inherit bash-completion-r1 cmake
 
-inherit bash-completion-r1 cmake multilib
-
-IUSE="doc examples extras +gromacs hdf5"
-PDEPEND="extras? ( ~sci-chemistry/${PN}apps-${PV} )"
-if [ "${PV}" != "9999" ]; then
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
+	PDEPEND="${PDEPEND} doc? ( ~app-doc/${PN}-manual-${PV} )"
+else
 	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"
 	S="${WORKDIR}/${P#votca-}"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-	PDEPEND="${PDEPEND} doc? ( ~app-doc/${PN}-manual-${PV} )"
+	PDEPEND="extras? ( ~sci-chemistry/${PN}apps-${PV} )"
 fi
 
 DESCRIPTION="Votca coarse-graining engine"
-HOMEPAGE="http://www.votca.org"
+HOMEPAGE="https://www.votca.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
+IUSE="doc examples extras +gromacs hdf5"
 
 RDEPEND="
-	~sci-libs/votca-tools-${PV}
+	app-shells/bash:*
 	>=dev-cpp/eigen-3.3
+	dev-lang/perl
+	~sci-libs/votca-tools-${PV}
 	gromacs? ( sci-chemistry/gromacs:= )
 	hdf5? ( sci-libs/hdf5 )
-	dev-lang/perl
-	app-shells/bash:*"
-
-DEPEND="${RDEPEND}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=app-text/txt2tags-2.5
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 DOCS=( README.md NOTICE CHANGELOG.md )
 
 src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
+	if [[ ${PV} == *9999 ]]; then
 		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"\
+			EGIT_CHECKOUT_DIR="${WORKDIR}/${PN#votca-}-tutorials" \
 				git-r3_src_unpack
 		fi
+	else
+		default
 	fi
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DWITH_GMX=$(usex gromacs)
-		-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex '!hdf5')
+		-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
 		-DWITH_RC_FILES=OFF
 	)
 	cmake_src_configure
diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index dd12065fadb1..358ce54951d8 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -3,59 +3,59 @@
 
 EAPI=7
 
-CMAKE_MAKEFILE_GENERATOR="ninja"
+inherit bash-completion-r1 cmake
 
-inherit bash-completion-r1 cmake multilib
-
-IUSE="doc examples extras +gromacs hdf5"
-if [ "${PV}" != "9999" ]; then
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
+else
 	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		examples? (	https://github.com/${PN/-//}-tutorials/archive/v${PV}.tar.gz -> ${PN}-tutorials-${PV}.tar.gz )"
 	KEYWORDS="~amd64 ~x86 ~amd64-linux"
 	S="${WORKDIR}/${P#votca-}"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
 fi
 
 DESCRIPTION="Votca coarse-graining engine"
-HOMEPAGE="http://www.votca.org"
+HOMEPAGE="https://www.votca.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
+IUSE="doc examples extras +gromacs hdf5"
 
 RDEPEND="
-	~sci-libs/votca-tools-${PV}
+	app-shells/bash:*
 	>=dev-cpp/eigen-3.3
+	dev-lang/perl
+	~sci-libs/votca-tools-${PV}
 	gromacs? ( sci-chemistry/gromacs:= )
 	hdf5? ( sci-libs/hdf5 )
-	dev-lang/perl
-	app-shells/bash:*"
-
-DEPEND="${RDEPEND}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=app-text/txt2tags-2.5
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 DOCS=( README.rst NOTICE.rst CHANGELOG.rst )
 
 src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
+	if [[ ${PV} == *9999 ]]; then
 		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"\
+			EGIT_CHECKOUT_DIR="${WORKDIR}/${PN#votca-}-tutorials" \
 				git-r3_src_unpack
 		fi
+	else
+		default
 	fi
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DWITH_GMX=$(usex gromacs)
-		-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex '!hdf5')
+		-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
 		-DWITH_RC_FILES=OFF
 		-DBUILD_CSGAPPS=ON
 	)