gentoo resync : 23.09.2020

28 files changed, 243 insertions, 219 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index a45057afd938..06da38f9d1e3 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/bullet/Manifest b/sci-physics/bullet/Manifest
index e7f27f575947..ed3e09f17775 100644
--- a/sci-physics/bullet/Manifest
+++ b/sci-physics/bullet/Manifest
@@ -1,4 +1,7 @@
 AUX bullet-2.85-soversion.patch 1094 BLAKE2B 8dc035b80d812b3c2382067796f1626a932ce887246b34a8b5e08fddf45d330078a970eb6c2147259285a45974b8aaa26a2494ad4aa4824d89bf58aa7af3ac37 SHA512 f437d553c51c6cc6646a4a3bf0ffe02e2691a3b2109ea560c986f69c602055c409028a5a3711597aca757d3e3b33cab14d60e03fc120f0975f35c6e16be6362d
+AUX bullet-2.89-no-dangling-pointer.patch 842 BLAKE2B 5d66875b52f696b839daccfbfea4a238ea32c6fc31fc6cd441cf5d053569bced474b6c8b7620a1b3eb67d69b73ced3d0d1a2beb8ec5479e64f581d66f630d5fc SHA512 a463da3288d21b3d6b0dad1bc81fcc3b95ce1bd2e53c107b597d3a6beed0b0fbafffab9d38c2394ed125802e0fb073c74f125bed9fac7898f3a3dd23930a6dfd
 DIST bullet-2.86.tar.gz 25806558 BLAKE2B a8576d8dacd67b9789d32d7b1acc6c4025df3c15427c60d66f98b1906eee8b2b94e5b0108b9a8c00ca6261510ccaf57ba5c02c72fee8f528d4f723b304166731 SHA512 af8a6b282ab606437d7975a59cd8a9c2bf273c83b0e79f0c4c1de6fa51695ba6d5f3c853dce2fdba9cb55e7572214e15089e54db51afc465ca26f502cbd5a4f9
+DIST bullet-2.89.tar.gz 135742506 BLAKE2B 3725533bb50f3cf4783e21c57a5e3596f280d9aa3caa5b7a44925d4785206cc86514ff89c2cc1e33f8a14af7c8a5165190bb0515a6931fc4c7ec2e2b9aef3dd8 SHA512 3c4ba6a3b3623ef44dd4a23e0bc2e90dec1f2b7af463edcb886e110feac1dfb4a91945f0ed640052cac228318539e275976d37238102fb10a0f78aef065a730b
 EBUILD bullet-2.86.ebuild 1565 BLAKE2B 2bcb10a03caa592484f69870e951796f56b8a771e39fe023ec3fa1b517cb6e381e1a35cc4c951ded82aa9d5b5c8fea2cab3c034c26fddff62a962f5b2db512ad SHA512 41f68eaf06d5d300f8f6fb6b2a89cb0d3273c27dc9c7b397aaafd7cef9fd6a6f39a4bbef67ef42f0cf89754c1aa8006ce9e542f2c624e2ae7c9d0b570023817e
-MISC metadata.xml 1048 BLAKE2B 1f807672df77ab19e1b31e4d01424d9741f4b53705f33f1647e73e72c0a056bb7a7dee700b4e11b490a1d78f9b6a5b790759ab1950ac10ce10cdd2c7df23d9da SHA512 e214b323a3242b169e2332660f07bf9b7a7b5298c0831037b3d541c6b16c0ae104291a588619e0757f5136b5977c1f053ca07bb09d1f75d2d022d934e43175fe
+EBUILD bullet-2.89.ebuild 2043 BLAKE2B d9bd64202f20ade30a37d8d4329793575980dffaede59c47abd0e5b0f2e8dbf72a413fbaeb36a3fab32ca8a185e1b036493ff8f3532c09c1102567b148a6380a SHA512 86eda68cc5a65f91da014a8dd93cc4a77061a76989fb6acbd7067ccf16d3fff1fe88ffd915bfab26ec0b87dd55989d7b7ced55beca14a57388c34d5d846aab69
+MISC metadata.xml 1188 BLAKE2B 9234b2083390248796bc38581d85dedecc7befe06b1b3d15a11c46fe0b468a0e831d20ad411d3386bc0f1ae9fc8cb119d4fe6a0a229276627f6349f373d29993 SHA512 84301ff0c87edee5c6704adb6e3a2a7b7ec1594a178a95a680c27acd2e0244742741ad02c4505da788a0c160253433c72c3daafaca95021ecc4709bd0e8571e3
diff --git a/sci-physics/bullet/bullet-2.89.ebuild b/sci-physics/bullet/bullet-2.89.ebuild
new file mode 100644
index 000000000000..24626f66775a
--- /dev/null
+++ b/sci-physics/bullet/bullet-2.89.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="Continuous Collision Detection and Physics Library"
+HOMEPAGE="http://www.bulletphysics.com/"
+SRC_URI="https://github.com/bulletphysics/bullet3/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+bullet3 doc double-precision examples extras openmp tbb test threads"
+
+REQUIRED_USE="
+	openmp? ( threads )
+	tbb? ( threads )
+"
+
+RDEPEND="
+	virtual/opengl
+	media-libs/freeglut
+	tbb? ( dev-cpp/tbb )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.85-soversion.patch
+	"${FILESDIR}"/${PN}-2.89-no-dangling-pointer.patch
+)
+
+DOCS=( AUTHORS.txt LICENSE.txt README.md )
+
+# Building / linking of third Party library BussIK does not work out of the box
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}3-${PV}"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# allow to generate docs
+	sed -i -e 's/GENERATE_HTMLHELP.*//g' Doxyfile || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CPU_DEMOS=OFF
+		-DBUILD_OPENGL3_DEMOS=OFF
+		-DBUILD_BULLET2_DEMOS=OFF
+		-DUSE_GRAPHICAL_BENCHMARK=OFF
+		-DINSTALL_LIBS=ON
+		-DINSTALL_EXTRA_LIBS=ON
+		-DBUILD_BULLET3=$(usex bullet3)
+		-DBUILD_EXTRAS=$(usex extras)
+		-DUSE_DOUBLE_PRECISION=$(usex double-precision)
+		-DBUILD_UNIT_TESTS=$(usex test)
+		-DBULLET2_MULTITHREADING=$(usex threads)
+		-DBULLET2_USE_OPEN_MP_MULTITHREADING=$(usex openmp)
+		-DBULLET2_USE_TBB_MULTITHREADING=$(usex tbb)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		doxygen || die
+		HTML_DOCS+=( html/. )
+		DOCS+=( docs/*.pdf )
+	fi
+
+	if use examples; then
+		# throws QA warnings
+		rm examples/ThirdPartyLibs/openvr/*/linux64/libopenvr_api.so || die
+		DOCS+=( examples )
+	fi
+}
diff --git a/sci-physics/bullet/files/bullet-2.89-no-dangling-pointer.patch b/sci-physics/bullet/files/bullet-2.89-no-dangling-pointer.patch
new file mode 100644
index 000000000000..8eee0016ae28
--- /dev/null
+++ b/sci-physics/bullet/files/bullet-2.89-no-dangling-pointer.patch
@@ -0,0 +1,26 @@
+From 1c64add35ed4918222ceb4fe93b7bef0e2b4e41c Mon Sep 17 00:00:00 2001
+From: stolk <b.stolk@gmail.com>
+Date: Wed, 1 Apr 2020 10:59:16 -0700
+Subject: [PATCH] Do not return a dangling pointer!
+
+Signed-off-by: Ross Charles Campbell <rossbridger.cc@gmail.com>
+---
+ Extras/ConvexDecomposition/cd_wavefront.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Extras/ConvexDecomposition/cd_wavefront.cpp b/Extras/ConvexDecomposition/cd_wavefront.cpp
+index b33080964..53b5784df 100644
+--- a/Extras/ConvexDecomposition/cd_wavefront.cpp
++++ b/Extras/ConvexDecomposition/cd_wavefront.cpp
+@@ -437,7 +437,7 @@ const char **InPlaceParser::GetArglist(char *line, int &count)  // convert sourc
+ {
+ 	const char **ret = 0;
+ 
+-	const char *argv[MAXARGS];
++	static const char *argv[MAXARGS];
+ 	int argc = 0;
+ 
+ 	char *foo = line;
+-- 
+2.28.0
+
diff --git a/sci-physics/bullet/metadata.xml b/sci-physics/bullet/metadata.xml
index 3304e14d402a..8dc1b6e634b1 100644
--- a/sci-physics/bullet/metadata.xml
+++ b/sci-physics/bullet/metadata.xml
@@ -22,6 +22,7 @@
     <flag name="bullet3">Build Bullet 3</flag>
     <flag name="double-precision">Build libraries in double precision</flag>
     <flag name="extras">Build additional libraries</flag>
+    <flag restrict="&gt;=sci-physics/bullet-2.89" name="tbb">Enable multithreading with the Intel Threads Building Block dev-cpp/tbb</flag>
   </use>
   <upstream>
     <remote-id type="google-code">bullet</remote-id>
diff --git a/sci-physics/h2o-gtk/Manifest b/sci-physics/h2o-gtk/Manifest
index 809773906a8c..592877f99253 100644
--- a/sci-physics/h2o-gtk/Manifest
+++ b/sci-physics/h2o-gtk/Manifest
@@ -1,4 +1,3 @@
 DIST h2o-gtk-0.1.tar.bz2 69851 BLAKE2B f097b36e1c7950bae3fa058667a3f8597cd87f59de4c6035d155cdc43e6b089c9bcc5ae1e9805447d0c295f7af49f1f41d74e8bb8c25fc467ce1763f10ea9d86 SHA512 58f376f53fc108be620d5a792227ee65e7464581c45b68e94d7bb19b90862f3b008b172d3a2f2376fee5f30fd19f6bb0f5ec74cb49f1224245f8c6ae68cc9b04
 EBUILD h2o-gtk-0.1-r1.ebuild 524 BLAKE2B 89de50c34c1772eb35b707d843c312e0523385a2c52f3b7988dac2530419f4523d52cc212bb81166ee711e759433122fb802c3b3661db7ef3c92e0ca3b4aaa5f SHA512 5f9828b8c1325292ff312fa91d2b2c8735b9df85f9f710134c92179e1a452cd377d883f864b22189b0d60ecc34f0500d7c41f03bf4f356ae4924eb62359787ee
-EBUILD h2o-gtk-9999.ebuild 491 BLAKE2B c4d0b03111e3044979fa7186ee48000aeaf08585e716990fd6e85f46f10f5faaed546dbd7e457f90a8a2c5cf4a21d528fae84512555df4c891394a1493559499 SHA512 36213873dbefae08638e66bc4a3194479261b9f404ca3d30fc7e547c83d6ced9890a206c7033a7a9c890b5957b04f0dc356c850adffe2b6c75b51c13b9c6f487
 MISC metadata.xml 503 BLAKE2B b5d08a6d52f89bf89b14942cba4e4492e5c970788116d19cd4a891f84dda109914edb1d6f8c67690bf3d837c6142b5fa790c8d8666c68219ab5dc977c90d550b SHA512 a69f2ac7caa9022d4b91ec06b5e1479bc60d96a15a5f77f86545292abe816f2be16941a2e5525a5f978fca347fe4ce284de709c607948c429a6f32c0223a0a65
diff --git a/sci-physics/h2o-gtk/h2o-gtk-9999.ebuild b/sci-physics/h2o-gtk/h2o-gtk-9999.ebuild
deleted file mode 100644
index 1096a19fbbc2..000000000000
--- a/sci-physics/h2o-gtk/h2o-gtk-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools git-r3
-
-DESCRIPTION="GTK+ UI for libh2o -- water & steam properties"
-HOMEPAGE="https://github.com/mgorny/h2o-gtk/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/mgorny/h2o-gtk.git"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="dev-cpp/gtkmm:2.4=
-	sci-libs/libh2oxx:0=
-	sci-libs/plotmm:0="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/sci-physics/qmeq/Manifest b/sci-physics/qmeq/Manifest
index efbb72e1ce63..aa547c9ff78a 100644
--- a/sci-physics/qmeq/Manifest
+++ b/sci-physics/qmeq/Manifest
@@ -1,4 +1,6 @@
 DIST qmeq-1.0.tar.gz 590715 BLAKE2B 7f091be0651236f2dcb45825df541813e27b43b2b8ec9184a342c962363921e29462726ba23530d0b956bba45793ed2036cec6287696e5fa58f91204d9267933 SHA512 3589fe927740cac5130a5b936e7fb8f73ce20f280878a326cdf91fe6340e8853f5e055c7e07170433c0977130cbb31644b0d9f84d23cd467aaa82557c8541e6f
+DIST qmeq-1.0_p202004.tgz 98025 BLAKE2B fa0ad1bafca28a1c8a16db7b3f9c590bd12340bdd635616592cc75c2a448f719c16b266f960a17ab60de53b40489022ce4ee34548ff44aa997e4dfb6804885d8 SHA512 3001ebc7f8670269ac65bff3f3b96be900946a7991afcc76408e3bbfec5a39d603a67e27f88f48f30d2b576dbf91c0d1898fdbe43cfc194c408f2565abd12806
 DIST qmeq-examples-1.0.tgz 289316 BLAKE2B add7520b579023c8da91aff294dd5a8fd29ba3520c3b496f2a98c8159dab4ad6bcdd1d12070357d868a10bbf224511ab27da069b94951d2c8632064344d2e143 SHA512 4a7b78a200ab4fa407401ea89740cdbcfb82376d97e8146e20a1cdab154269a6b9ce8217fb7ce78af73677b544ab535c5eadd386655dbff9c4ebde6c8eda9e38
-EBUILD qmeq-1.0-r1.ebuild 938 BLAKE2B bbeeb67d14fdd94fe94a00d88b2a3ab8d7468517ba90d78e03a0e400529d3c8bf9cd15b75528035384858a02ad90159552a214729981fdc8541699da3f59f5bb SHA512 e7a7e778ef9a7d075788b8dfb703b0b973c96b87d71b1e8b5201603f0354302fbf6848cb995559639a3fca557fb7a64246e38022540a94cc1c1f142c478ba34d
+EBUILD qmeq-1.0-r1.ebuild 940 BLAKE2B 442cf3aaf269df78993f0d5117be16e49baee56f21f532c378f107a52a466c00ece867d3f5e586240b70fbb5a88585c2bc479c32718f50e968ed82a1ccfd743e SHA512 fe356e79687fe6f3ff0939fc6bff8bf38f5cc2a55dc214cfd96700900303d2374d31f082f7585ed62beee2a03590703e231e822198f60951cccb330be0cfb45d
+EBUILD qmeq-1.0_p202004.ebuild 1176 BLAKE2B 0e41a9842f0540355a566d9d0483384ac9640a4b2bb62660d5db838da2c90d7a63685d7251e0ead6ef10f01865b7e95a49aabfd33aa4c1b3072673c327655bc5 SHA512 052ef5a828257f4a4021cd878ac222b06ce1b7125f7ff72d2b5a995b34048b032cb84666106783155ff362ff5199f13364343532b1f2638bfbe1ddb5ab1400f2
 MISC metadata.xml 342 BLAKE2B 8bfc619eb36e81fb749932d8478b86b7ebce4e36378b3caf00b7d76b3a0d876debf3b42b1182fc68f5e1122974430a48b6977e69d9699f4eb04efe34b8be1ed1 SHA512 678efb4d82074368f3d07aa488049a79ccaa214c729b8de358e5f4eaeb3f49728a1019bf0ed5fb5bb6859f667b6d5ae2632a60d9af8b6cbd82c63c68b7624660
diff --git a/sci-physics/qmeq/qmeq-1.0-r1.ebuild b/sci-physics/qmeq/qmeq-1.0-r1.ebuild
index 9038c029f11b..7ae48a59361c 100644
--- a/sci-physics/qmeq/qmeq-1.0-r1.ebuild
+++ b/sci-physics/qmeq/qmeq-1.0-r1.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 
 COMMON_DEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 "
 RDEPEND="
 	${COMMON_DEPEND}
diff --git a/sci-physics/qmeq/qmeq-1.0_p202004.ebuild b/sci-physics/qmeq/qmeq-1.0_p202004.ebuild
new file mode 100644
index 000000000000..17bc19178ab1
--- /dev/null
+++ b/sci-physics/qmeq/qmeq-1.0_p202004.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 )
+
+inherit distutils-r1
+
+Pcommit="d3949bf812e1648892959a169a7ff849cd7b69d5"
+
+DESCRIPTION="Quantum master equation package for Quantum dot transport calculations"
+HOMEPAGE="https://github.com/gedaskir/qmeq"
+SRC_URI="
+	https://github.com/gedaskir/qmeq/archive/${Pcommit}.tar.gz -> ${PN}-${PV}.tgz
+	examples? ( https://github.com/gedaskir/${PN}-examples/archive/1.0.tar.gz -> ${PN}-examples-1.0.tgz )
+"
+
+KEYWORDS="~amd64"
+IUSE="examples"
+LICENSE="BSD-2"
+SLOT="0"
+
+COMMON_DEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	examples? ( dev-python/jupyter[${PYTHON_USEDEP}] )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+#PATCHES=( "${FILESDIR}/qmeq-1.0-py3.patch" )
+
+#mydistutilsargs=( --cython )
+
+src_unpack() {
+	default
+	mv -v "${PN}-${Pcommit}" "${PN}-${PV}" || die
+}
+
+src_install() {
+	distutils-r1_src_install
+	docompress -x "/usr/share/doc/${PF}"
+	use examples && dodoc -r "${WORKDIR}/${PN}-examples-${PV}"/*
+}
diff --git a/sci-physics/qutip/Manifest b/sci-physics/qutip/Manifest
deleted file mode 100644
index 88c76dec8353..000000000000
--- a/sci-physics/qutip/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST qutip-4.2.0.tar.gz 424805 BLAKE2B 8f85e12402681b57bd4a612a2d5d9023f4c27a35aa78b70ad00d238123b2863a9b728e5ed1c24d81faf6892ca2b0a5b70652403fbd7b5dc02629e328e92a7e2b SHA512 888e569b30a1085162ecfa768967526f5ce34b19e1a1b0f76f1331eb3978159ba321e126a1bc57e0936c5819218f07a336a57c80193b33af1009d1cd87fa95de
-EBUILD qutip-4.2.0.ebuild 1161 BLAKE2B 96f762f35519660b965e19e0fe905768a137accc10ac37d391224d6107def1a053e54fb3ccd8eedddc56c164d5217e48680310570041e6c986ae01296983272f SHA512 43841dfc5412a22d32a76e9f2e8f9d507020039849c4b57c99b64277557138587bf203cfe0889f25091e18e9f6a05e93cf8523726d4a05c48e527d126e473aa5
-MISC metadata.xml 921 BLAKE2B 2af496d40c3d246f2998bbc99f2a50b017c5f63e82ce0bc416a9a33354222c903afe71c665e2267257a146bc3a70f2772a9bac5b5044a5258f0206c3a80c45b1 SHA512 8a37b273e39902b78047da2df82154035a12055a06154b70ef829d6f94670f995d49278f4655075bc0f7f1f00e591a0e79dd0e6bcd584d93764634a3fcd62549
diff --git a/sci-physics/qutip/metadata.xml b/sci-physics/qutip/metadata.xml
deleted file mode 100644
index d20d38f47016..000000000000
--- a/sci-physics/qutip/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		QuTiP is open-source software for simulating the dynamics of open quantum systems. The QuTiP library depends on the excellent Numpy, Scipy, and Cython numerical packages. In addition, graphical output is provided by Matplotlib. QuTiP aims to provide user-friendly and efficient numerical simulations of a wide variety of Hamiltonians, including those with arbitrary time-dependence, commonly found in a wide range of physics applications such as quantum optics, trapped ions, superconducting circuits, and quantum nanomechanical resonators.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">qutip/qutip</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sci-physics/qutip/qutip-4.2.0.ebuild b/sci-physics/qutip/qutip-4.2.0.ebuild
deleted file mode 100644
index 9bbf6fe19d2b..000000000000
--- a/sci-physics/qutip/qutip-4.2.0.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=( python3_6 )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Simulating dynamics of open quantum systems in Python."
-HOMEPAGE="http://qutip.org"
-SRC_URI="https://github.com/qutip/qutip/archive/v$PV.tar.gz -> $P.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="openmp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-python_prepare_all() {
-	sed -i setup.py \
-		-e 's/_compiler_flags = .*$/_compiler_flags = []/' || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	use openmp && mydistutilsargs=( --with-openmp )
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib* || die
-	${EPYTHON} -c "import qutip.testing as qt ; qt.run()" || die
-}
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index cb80d1371739..28ee74d0677c 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -5,10 +5,10 @@ DIST root_v6.20.06.source.tar.gz 168216335 BLAKE2B a0a51f11e6dcc3a6ba657a8b94650
 DIST root_v6.20.08.source.tar.gz 168218062 BLAKE2B 79b1eb89f1003c140a60d47e9d447576ad215e66321a265ed047b069d05f008cf8f0d23df99ed35a8ee5a802e5de5a42122e8f1c075b01ef74eb11926a1b31d7 SHA512 205d5ae94a6c1b6e1a479a8631d5a9bab4a9f76c396cf3ed2c23a26c767a5a892a087b872a69853ada0f84e60a6015f732342c5f48acc696cb626528748f81fe
 DIST root_v6.22.00.source.tar.gz 173014392 BLAKE2B a59071ee5b13466505323fca30fe656668a243006239e7f9ebc71bb21a7fe244cafe6d33ff4579b67920c9102eb36344f20415079bb627834fb8a57d9117476d SHA512 9e3c54bbc146b0abb0a2d960af380255ec59d0b3a11a4a97a2a25cb7ac567b07280c4eb48dddf99c1fa2e692881f6396a842ce125d3a253037e52f719739f01e
 DIST root_v6.22.02.source.tar.gz 173033408 BLAKE2B c7e3719b612093386fddecbfd098c428345d3562537c2dc546e12b9da62fa6f2cc776a5314ae1257eeaaa498af29236520931ea3f6dd5ad3e03095bc117da125 SHA512 0a0ffbcee2ef971bebf32bc38a247ea981f56721314bc2eab69cfe66ae86eafb00568c475b41b2ae7db7ad25f0c8b0953e10f1841316a49cf62fbad664ccee17
-EBUILD root-6.18.04-r2.ebuild 7606 BLAKE2B 6a1f7b36bc8479538b1487b2125f7130632b64d319ac43728fb8be3a6ce63b6979f1ca32955b85d455e3df87685b9aa06480c55d095e0632c9c642f00e4246f9 SHA512 439bcb7daadbd796ca62d022c3c79832e149e0665da1e56e1e81d3ad3ae352dfa67f3685f965da97cd023252a3d9796c3749be218f969ca521704208a7f522dc
-EBUILD root-6.20.06.ebuild 7574 BLAKE2B 7e323a8ddedf4e10642f37aff96324483655ca8c4122883a6517114c6c845756d468e71a03a8da7d449e0deaa14dde4e885c8951c725c66920592eba18064bf7 SHA512 acb8ced616738df91f1dcf36d82c33e4a6054e13930a7e8ae107b29d123a2b918d76f30f11bd9489763b5311be74dbff7989fa389f1fae65880fde3131eba919
-EBUILD root-6.20.08.ebuild 7574 BLAKE2B 7e323a8ddedf4e10642f37aff96324483655ca8c4122883a6517114c6c845756d468e71a03a8da7d449e0deaa14dde4e885c8951c725c66920592eba18064bf7 SHA512 acb8ced616738df91f1dcf36d82c33e4a6054e13930a7e8ae107b29d123a2b918d76f30f11bd9489763b5311be74dbff7989fa389f1fae65880fde3131eba919
-EBUILD root-6.22.00.ebuild 7581 BLAKE2B 26be211c71848caafcafb3bdfd7c069b0417f9b89875b2de61304109426c5e6aeb41e80411bd5c35d162c9b1a815e3acae39942f3224b85b21788738a9a98237 SHA512 aa6486212e3a1dfdb8f080401fd5d276c0b3b6eb3bc914daca9834103696d306454f902c145f41c32d28f9da64e4f85bcb59110610e9b15f81aeb5854f587cde
-EBUILD root-6.22.02.ebuild 7538 BLAKE2B a60dc578fc47ab132bb7c7135473d03a40c240cea979a75ce58042dda06bf214560537e5c909d7cf4beb90dbe5b8ed997cfd335c2f524d9a24814cbd6b4286da SHA512 ae638d81e3c0c4b30a015538e6b594492a43f90888de7770c7cfabe37730b4fe02eb3c5e3dd24e6f29324e1fe6451754c14d7418520922375a38e69075c1058f
-EBUILD root-9999.ebuild 8019 BLAKE2B 5e872be0fd66e98c0bda4cdbe7892b42d24dc8676aa0e3748d162f1b194aad2ed792bb98cff3110942bafe680ea81cf8eb8f4cba064d20c6bdf52dc849900782 SHA512 cbf623074ef0024cbf8b781b000bb9e8a136e272d72e476bb5e755552f40e10acfa83ff7960cd9421cf9b88ca7493aa5310fbd4c726ea93d349880b783954d58
+EBUILD root-6.18.04-r3.ebuild 7596 BLAKE2B 5c3a2643421e56bf0db49961982433d9d9e7cd12f0c0f83cfedb814356db303ac64f2327de2ab0a665ac7ab2ad4afd0f9f0e7fcdbfabff41efea7209ddd960d8 SHA512 2491495d3508c51c39c4cec4796e98f24297195b162aa70ccb24a98ca59d67af50162179eaf3bba8e617bd9decf6bf2f29030b1777c3f0fe0bc4c77878b638b4
+EBUILD root-6.20.06.ebuild 7564 BLAKE2B 9d9a0358d7d460292a4f30252f3cbf52598d3d78d5cc7567511437e0a213648c064eff3c1efde7d3d165971aeae56a285185e9aa5fa4ef21a0da0df07cba0bdc SHA512 1300e869b64cd8d720bf5fb201c886e8c130f0237d9d5d3ec8db8649c6b56e259d0f6834043d39ac3f80f941a1536b622fdcc4b17bcd078a6ab8cb933bf08149
+EBUILD root-6.20.08.ebuild 7564 BLAKE2B 9d9a0358d7d460292a4f30252f3cbf52598d3d78d5cc7567511437e0a213648c064eff3c1efde7d3d165971aeae56a285185e9aa5fa4ef21a0da0df07cba0bdc SHA512 1300e869b64cd8d720bf5fb201c886e8c130f0237d9d5d3ec8db8649c6b56e259d0f6834043d39ac3f80f941a1536b622fdcc4b17bcd078a6ab8cb933bf08149
+EBUILD root-6.22.00.ebuild 7571 BLAKE2B 972aba34e3aafad50d826df54a7e41c5451d6acb26d2979693d71070def13db3156b9cf981c7a6a17951fdace0aa2873b5e940afc3fab5a162e79bd11bb795f5 SHA512 949cc22fe4243c165b7a90aae2a7b157f908f2e627dfe7f8848287be8dccb4679448819d36314910ea51d7bc6c198ac5cec29a409da4a06a5613f3a2354ca443
+EBUILD root-6.22.02-r1.ebuild 7528 BLAKE2B 5516e826268e67aeb5976fca05b9e40effef89b17bae140378894ee419010e0cd38e18597fc84b34cacfb05a08cfc45b6100d3daa9bbb9d7cd222ad8ce3c35a8 SHA512 dc6704bd78b962eef0d46cc6d7075bb83315e0d7f7766445bb33d93acee6eb32c76e0863884dc1f245393487b12d582c0820d65717f4557c92117195328a5533
+EBUILD root-9999.ebuild 8009 BLAKE2B 5088efe7a52842b5813d579d5b1337e9eb8e081e5454cc02a237ecf6a67bafcdda1c13a2ece53a1c1479a2fabc3469eae1722093c6a65d48abe511b57b8a00f5 SHA512 9bb8e99f069d4ba7151810486b54552a65435c41780f792387684ced10e794163f44a6baa1e29afe28cb7ff869f3561aed7da4ac900344ba8969f2d10548f35f
 MISC metadata.xml 3227 BLAKE2B d4c07ae082584a652a0f56735fa4d6556f0c917c949ade4663b3347e4ca371b2508e370f2040d70482ca5c1c128fc903412b9acba05014a7aca784fb65d0fbb3 SHA512 c7589407ef19ddf5c48b2d91a83c913862d1384fc2b125286d71097e698462849c720f10f57a5c5be7e026537e961dc3dab61c256438313e3d6cf73ea0108b79
diff --git a/sci-physics/root/root-6.18.04-r2.ebuild b/sci-physics/root/root-6.18.04-r3.ebuild
index 43c415eacfdb..45eb62c6d7da 100644
--- a/sci-physics/root/root-6.18.04-r2.ebuild
+++ b/sci-physics/root/root-6.18.04-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
 	prefix python-single-r1 toolchain-funcs
diff --git a/sci-physics/root/root-6.20.06.ebuild b/sci-physics/root/root-6.20.06.ebuild
index 4403d94be474..b87d8f13f490 100644
--- a/sci-physics/root/root-6.20.06.ebuild
+++ b/sci-physics/root/root-6.20.06.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake cuda elisp-common fortran-2 prefix python-single-r1 toolchain-funcs
 
diff --git a/sci-physics/root/root-6.20.08.ebuild b/sci-physics/root/root-6.20.08.ebuild
index 4403d94be474..b87d8f13f490 100644
--- a/sci-physics/root/root-6.20.08.ebuild
+++ b/sci-physics/root/root-6.20.08.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake cuda elisp-common fortran-2 prefix python-single-r1 toolchain-funcs
 
diff --git a/sci-physics/root/root-6.22.00.ebuild b/sci-physics/root/root-6.22.00.ebuild
index 004a33d9d3c7..6d38269415d8 100644
--- a/sci-physics/root/root-6.22.00.ebuild
+++ b/sci-physics/root/root-6.22.00.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake cuda elisp-common fortran-2 prefix python-single-r1 toolchain-funcs
 
diff --git a/sci-physics/root/root-6.22.02.ebuild b/sci-physics/root/root-6.22.02-r1.ebuild
index 24742a32e5e6..0e959e9f8eb6 100644
--- a/sci-physics/root/root-6.22.02.ebuild
+++ b/sci-physics/root/root-6.22.02-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake cuda elisp-common fortran-2 prefix python-single-r1 toolchain-funcs
 
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 54b3cc2715b1..ea179bf40fa0 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake cuda elisp-common fortran-2 prefix python-single-r1 toolchain-funcs
 
diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest
index db4b303e8d70..dffc86a4684d 100644
--- a/sci-physics/vgm/Manifest
+++ b/sci-physics/vgm/Manifest
@@ -1,7 +1,7 @@
 AUX vgm-fix-FindCLHEP.patch 2191 BLAKE2B 465bd6dfca5aaedaa85759092d4d66a65f5df8a3be9a78bfd5edf0630e5ea733f23d14a4d892e272d5062927ff2622560987f566d130324cbdb96c097d083800 SHA512 24d6cd832e496ebe573ee6b8a95ac7a777c16919626f9b7019d260295d12766f89f5832bb3d5ca794eb28dbd293828935a92627f11ca55381c6f7645f61893ac
 DIST vgm-4.5.tar.gz 3474063 BLAKE2B 70c4fe0bd5eb9bc94607553ad30ffb625e66ef4e6f8a965b1289c1c7ad6f71d7eba035d2825ba8cd94705a0c223aa56408d3285748b068045eee3a29f556e3b2 SHA512 541fde12e12cc51ba065900788dbceb8e5b9a4e4615a4e4e0bbd2ba199b8a203b6927dbe23ead7bc183bd61f6b641e3e954fe7b78451c2d423d3a2b737f00572
 DIST vgm-4.8.tar.gz 3661965 BLAKE2B 29f878fb6716e261c27d60b2c9081d66313591a053d80f78501973f131aff88bbcee743ff9767836883dcb28d3ce5aeee3759a5890d7c8811a6a61503417284f SHA512 8b7cabc5796649c4014ccbdf1c6d209d2e7c2b4b06258716a72cadd997a9f6f51c4f9cb5870fd10abfd1ee133766876523c84441a69c7242bc2002687ca0ce58
-EBUILD vgm-4.5.ebuild 1731 BLAKE2B a47f04930ae347ad16a5aeece529d38f5cb69bc527316c6979d55e0e90640a33802838a2f6a614d697d0055eae80ef26ffe1bfc69d7fb06d16a60d5c1e273433 SHA512 3850bae4ba6a413579e0d00cb8963b44e99558b01ef386adaf86b4d953a12293049e5bf23e71ba1ee79aee68036cbdf95f394a90e25fa1e50be136d5b2729599
-EBUILD vgm-4.8.ebuild 1723 BLAKE2B e245ba4e11697a0afde229b6ddb4ae5c815c38ac03d44ae026f4c643cbf5dde0a09816f80ab58751849f73fa48002971d652ae1aa815de55e203ad34ef023ade SHA512 8bddb92ff4a061e0d24cce45afe3d1361e5d76dd666358ad87ced6f5b58a94aa95b888a1d052acf90d2e1241972bf5f87c774172118091e8f94c521f58eef2ce
-EBUILD vgm-9999.ebuild 1723 BLAKE2B e245ba4e11697a0afde229b6ddb4ae5c815c38ac03d44ae026f4c643cbf5dde0a09816f80ab58751849f73fa48002971d652ae1aa815de55e203ad34ef023ade SHA512 8bddb92ff4a061e0d24cce45afe3d1361e5d76dd666358ad87ced6f5b58a94aa95b888a1d052acf90d2e1241972bf5f87c774172118091e8f94c521f58eef2ce
+EBUILD vgm-4.5.ebuild 1760 BLAKE2B 3d00a62d6c19f167956d06999e8633362da4cba056ee9716425aef025c366e23ed623b77f2ecffc9eebf34be27be2d4b5c81fdd6e5e8f6a52e709df6a04c7611 SHA512 26283fcbc9bdb0d8980734e3fbd2a35831aba214ad97d80b9e15aa2f137eba3e18d198797d5c479bba77a608a3220b17666ac355466335abb694ff1372fa6f34
+EBUILD vgm-4.8.ebuild 1752 BLAKE2B fc304e1dd772b40743cfa906668136e99eae34e1ea2ead012ea5bdceacf15495c0f02669b13c2617ea4c67952859dfd6bf9e4698298d76e461994c39b35f967d SHA512 82ad2b67ea5d703af84a1c8fbc338a6ffb582492758ff2560fdbf9109bb30424ac32f032db466fc3b08dc419d7a1b49c8d34f7daa127b5e335bfd104686aadb9
+EBUILD vgm-9999.ebuild 1752 BLAKE2B fc304e1dd772b40743cfa906668136e99eae34e1ea2ead012ea5bdceacf15495c0f02669b13c2617ea4c67952859dfd6bf9e4698298d76e461994c39b35f967d SHA512 82ad2b67ea5d703af84a1c8fbc338a6ffb582492758ff2560fdbf9109bb30424ac32f032db466fc3b08dc419d7a1b49c8d34f7daa127b5e335bfd104686aadb9
 MISC metadata.xml 971 BLAKE2B 76e1255814eea59a44c610d3fc9c2a304909610bfd77a847fa5fd05974b9d0d4db1081b5dd32db9e860213204c6272ea14c7dc6dc717472f5de7c5ab42211335 SHA512 30d69c4518b7a69bf458eaa2ba894b3690e2af8bb2b1a63ecb28b7e531c26843f688152f6f102faf2a033ab1424078047cbeb9bad4a0dba5e39c3d2456575259
diff --git a/sci-physics/vgm/vgm-4.5.ebuild b/sci-physics/vgm/vgm-4.5.ebuild
index 6d8a518fd73f..5020ac5b5500 100644
--- a/sci-physics/vgm/vgm-4.5.ebuild
+++ b/sci-physics/vgm/vgm-4.5.ebuild
@@ -29,7 +29,10 @@ RDEPEND="
 	geant4? ( >=sci-physics/geant-4.10.03 )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[dot] )
-	test? ( sci-physics/geant-vmc[g4root] )"
+	test? (
+		sci-physics/geant[gdml]
+		sci-physics/geant-vmc[g4root]
+	)"
 RESTRICT="
 	!geant4? ( test )
 	!root? ( test )
diff --git a/sci-physics/vgm/vgm-4.8.ebuild b/sci-physics/vgm/vgm-4.8.ebuild
index 5fba573e3f61..659728a149ea 100644
--- a/sci-physics/vgm/vgm-4.8.ebuild
+++ b/sci-physics/vgm/vgm-4.8.ebuild
@@ -31,7 +31,10 @@ RDEPEND="
 	root? ( >=sci-physics/root-6.14:=[c++11?,c++14?,c++17?] )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[dot] )
-	test? ( sci-physics/geant-vmc[g4root] )"
+	test? (
+		sci-physics/geant[gdml]
+		sci-physics/geant-vmc[g4root]
+	)"
 RESTRICT="
 	!geant4? ( test )
 	!root? ( test )
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index 5fba573e3f61..659728a149ea 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.ebuild
@@ -31,7 +31,10 @@ RDEPEND="
 	root? ( >=sci-physics/root-6.14:=[c++11?,c++14?,c++17?] )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[dot] )
-	test? ( sci-physics/geant-vmc[g4root] )"
+	test? (
+		sci-physics/geant[gdml]
+		sci-physics/geant-vmc[g4root]
+	)"
 RESTRICT="
 	!geant4? ( test )
 	!root? ( test )
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
+}