From 71deace00d1a2b091313fe137ab7092418c6f87c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 10 Feb 2020 21:05:55 +0000
Subject: gentoo resync : 10.02.2020

---
 sci-physics/yoda/Manifest             |  4 +--
 sci-physics/yoda/yoda-1.6.5.ebuild    | 10 ++++---
 sci-physics/yoda/yoda-1.7.0-r1.ebuild | 49 +++++++++++++++++++++++++++++++++++
 sci-physics/yoda/yoda-1.7.0.ebuild    | 45 --------------------------------
 4 files changed, 58 insertions(+), 50 deletions(-)
 create mode 100644 sci-physics/yoda/yoda-1.7.0-r1.ebuild
 delete mode 100644 sci-physics/yoda/yoda-1.7.0.ebuild

(limited to 'sci-physics/yoda')

diff --git a/sci-physics/yoda/Manifest b/sci-physics/yoda/Manifest
index 665270839ac4..220244c60e35 100644
--- a/sci-physics/yoda/Manifest
+++ b/sci-physics/yoda/Manifest
@@ -1,5 +1,5 @@
 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 1042 BLAKE2B 1694ad20c68b6bb6c3d7bd37809ed8abead572ff83261d2feb7905a647af5585e0e9059049ec763eeefa6a74c9b7b1903829b08c76ee45505d28e188e8ae760d SHA512 0fe36248bd11c97839ff9a8ddcc2f0db306a16a906354289a8fca879d46b5eece81cbc2cb71334d5dd5ee3cb8a15dbea3efa5e6535183610279ea58711d45cbb
-EBUILD yoda-1.7.0.ebuild 1029 BLAKE2B 3fc334dfef8777f462014ba9c98803fed85e4f8fee380e4825f5802e80fbd80cfad92f1b33f295aa5530dad8525c9dc916cb0fca5e3ddf0c2b35bf1b39b923f3 SHA512 99e276ad69277b670a8b191c731b47ecf33df8f5e3fc498bdd8eed4dd62d83caf039aec737878119df49e8c728786881dd1bd49fe4716f10191378eb5a19c8fa
+EBUILD yoda-1.6.5.ebuild 1087 BLAKE2B 23eb82bd36bdf634227689614929bcc09d4823b4f3ee7493678c11996ff74cd5ad5f194e56696f1e14c9f995cea9921eadd6c0f38b776a2cac0add1cab4a7ab4 SHA512 022e2bd15062649c1f41d75ff30de9682846eddc4096fea0f0fe41a9ac5f8f7ef24001b7ae39cca2d9bba06a9f618c78c72bcbc76736a8d933f73c9bc94a0247
+EBUILD yoda-1.7.0-r1.ebuild 1074 BLAKE2B 134e690ea38324ab4e2f33606cd72f6625646b3a701fdcd106757ff9b5f5754f800bd297cc127e8fcdbff14afe1366511cc237de7ba0b767ea030be95c9a0ca5 SHA512 2e8358a6c2cfc3cd28e1d1e0f149a30e564735586e5a4e9ffc7404761dd91568d50d1aeff904604d7be4125ac31c52de97be8729f0f86d6ae23c0711d86bd3d1
 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
index 00d3f8949c26..82bf586a70b0 100644
--- a/sci-physics/yoda/yoda-1.6.5.ebuild
+++ b/sci-physics/yoda/yoda-1.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,9 +20,13 @@ IUSE="python root static-libs"
 RDEPEND="
 	dev-libs/boost:=
 	python? ( ${PYTHON_DEPS} )
-	root? ( sci-physics/root:=[python=,${PYTHON_USEDEP}] )"
+	root? ( sci-physics/root:=[python=,${PYTHON_SINGLE_USEDEP}] )"
 DEPEND="${RDEPEND}
-	python? ( dev-python/cython[${PYTHON_USEDEP}] )"
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sci-physics/yoda/yoda-1.7.0-r1.ebuild b/sci-physics/yoda/yoda-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..a29234715ba0
--- /dev/null
+++ b/sci-physics/yoda/yoda-1.7.0-r1.ebuild
@@ -0,0 +1,49 @@
+# 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.ebuild b/sci-physics/yoda/yoda-1.7.0.ebuild
deleted file mode 100644
index 9f53d934f26e..000000000000
--- a/sci-physics/yoda/yoda-1.7.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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_USEDEP}] )"
-DEPEND="${RDEPEND}
-	python? ( dev-python/cython[${PYTHON_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
-}
-- 
cgit v1.2.3