gentoo resync : 23.09.2020

4 files changed, 40 insertions, 103 deletions

diff --git a/sci-physics/yoda/Manifest b/sci-physics/yoda/Manifest
index 220244c60e35..86793c5e6fb9 100644
--- a/sci-physics/yoda/Manifest
+++ b/sci-physics/yoda/Manifest
@@ -1,5 +1,3 @@
-DIST YODA-1.6.5.tar.bz2 818613 BLAKE2B 6a8762c4f8d4bbcacf11c1b9929cff4b00811d4e18c596122dce335782a741aa1c76fab4b2ed9897dc800af1a18dba809e4fa0956cb5eb6fc84cc98544c669d6 SHA512 bead0a3ada233c1fbafe66d25e65262c20d9a9dfa6265440320a0fc782e91b3ac6581698e2015d86f2b58dc305dedbc48ed648ff03ec9f6abc11a7fb27938b1a
 DIST YODA-1.7.0.tar.bz2 949964 BLAKE2B 44063500b95e6a089adac0a28eb0165c6d91f09642dcba7eae994a8b2dd9c4cc5cff40d63cbb481f41e023193632b9b2c17c4304bc03afa4ad2c6010b52c15da SHA512 de4eff3fdd7f8f031745152907eadfe4687c6c8597772d8aba628e58e7d6f203bbe55ba030a77990b2441a9b046a4d7e2bce1fb29ba9a631c1cff17acd95b1e5
-EBUILD yoda-1.6.5.ebuild 1087 BLAKE2B 23eb82bd36bdf634227689614929bcc09d4823b4f3ee7493678c11996ff74cd5ad5f194e56696f1e14c9f995cea9921eadd6c0f38b776a2cac0add1cab4a7ab4 SHA512 022e2bd15062649c1f41d75ff30de9682846eddc4096fea0f0fe41a9ac5f8f7ef24001b7ae39cca2d9bba06a9f618c78c72bcbc76736a8d933f73c9bc94a0247
-EBUILD yoda-1.7.0-r1.ebuild 1074 BLAKE2B 134e690ea38324ab4e2f33606cd72f6625646b3a701fdcd106757ff9b5f5754f800bd297cc127e8fcdbff14afe1366511cc237de7ba0b767ea030be95c9a0ca5 SHA512 2e8358a6c2cfc3cd28e1d1e0f149a30e564735586e5a4e9ffc7404761dd91568d50d1aeff904604d7be4125ac31c52de97be8729f0f86d6ae23c0711d86bd3d1
+EBUILD yoda-1.7.0-r2.ebuild 846 BLAKE2B f3dc73cb7ee52315ff40b6a4cb0162e50c01022e2e614aea217e9118aee9b02573b39493341b6fdc70780b5cd6673e3235c5c5bb9f70d2ce8ae4535055e7d034 SHA512 d3f31ca3a517874f43af46ab3b0c6908eb87b77a067c74c8c722839544b839088e03ca9684a18cd496bc170062ed7cd94c9b9543551e597b79623e13a3752278
 MISC metadata.xml 659 BLAKE2B 460df9dfdf485eb860ba7eb737ee9cc715e823b4961894a99e51e9bbdb98ce14a87639ddb0774aeed11d111ed21ddc4e1804f41fcb4cd72c5b0b456402588f6f SHA512 ad6899122310e6e4ecb0e72737362379cc180524dd7e60c6dbacbd7d2a0eab5c633eb5ecf8b6731ed40b12e0e186eba8ce6def539c1c0969974e75467250b7b7
diff --git a/sci-physics/yoda/yoda-1.6.5.ebuild b/sci-physics/yoda/yoda-1.6.5.ebuild
deleted file mode 100644
index 82bf586a70b0..000000000000
--- a/sci-physics/yoda/yoda-1.6.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit bash-completion-r1 python-single-r1
-
-DESCRIPTION="Yet more Objects for (High Energy Physics) Data Analysis"
-HOMEPAGE="http://yoda.hepforge.org/"
-
-SRC_URI="http://www.hepforge.org/archive/${PN}/${P^^}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="python root static-libs"
-
-RDEPEND="
-	dev-libs/boost:=
-	python? ( ${PYTHON_DEPS} )
-	root? ( sci-physics/root:=[python=,${PYTHON_SINGLE_USEDEP}] )"
-DEPEND="${RDEPEND}
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_USEDEP}]
-		')
-	)"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${P^^}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	econf \
-		$(use_enable python pyext) \
-		$(use_enable root) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	newbashcomp "${ED%/}"/usr/share/YODA/yoda-completion ${PN}
-	rm "${ED%/}"/usr/share/YODA/yoda-completion || die
-}
diff --git a/sci-physics/yoda/yoda-1.7.0-r1.ebuild b/sci-physics/yoda/yoda-1.7.0-r1.ebuild
deleted file mode 100644
index a29234715ba0..000000000000
--- a/sci-physics/yoda/yoda-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit bash-completion-r1 python-single-r1
-
-DESCRIPTION="Yet more Objects for (High Energy Physics) Data Analysis"
-HOMEPAGE="http://yoda.hepforge.org/"
-
-SRC_URI="http://www.hepforge.org/archive/${PN}/${P^^}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="python root static-libs"
-
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-	root? ( sci-physics/root:=[python=,${PYTHON_SINGLE_USEDEP}] )"
-DEPEND="${RDEPEND}
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_USEDEP}]
-		')
-	)"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${P^^}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	econf \
-		$(use_enable python pyext) \
-		$(use_enable root) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	newbashcomp "${ED%/}"/usr/share/YODA/yoda-completion ${PN}
-	rm "${ED%/}"/usr/share/YODA/yoda-completion || die
-}
diff --git a/sci-physics/yoda/yoda-1.7.0-r2.ebuild b/sci-physics/yoda/yoda-1.7.0-r2.ebuild
new file mode 100644
index 000000000000..a17c010c34b1
--- /dev/null
+++ b/sci-physics/yoda/yoda-1.7.0-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+DESCRIPTION="Yet more Objects for (High Energy Physics) Data Analysis"
+HOMEPAGE="https://yoda.hepforge.org/"
+SRC_URI="https://www.hepforge.org/archive/${PN}/${P^^}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="root static-libs"
+
+RDEPEND="
+	root? ( sci-physics/root:= )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P^^}"
+
+src_configure() {
+	econf \
+		--disable-pyext \
+		$(use_enable root) \
+		$(use_enable static-libs static)
+}
+
+src_test() {
+	# PYTESTS and SHTESTS both require python tools
+	emake check PYTESTS= SHTESTS=
+}
+
+src_install() {
+	default
+	newbashcomp "${ED%/}"/usr/share/YODA/yoda-completion ${PN}
+	rm "${ED%/}"/usr/share/YODA/yoda-completion || die
+}