gentoo resync : 10.02.2020

16 files changed, 83 insertions, 45 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 23478bdd4620..30ecb7fee497 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index 050ce77ec3cc..1ad9e687ef01 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -2,7 +2,7 @@ AUX 1056.patch 8628 BLAKE2B 435bd4f01c44142f91978603de0f276f6c16819325e48bda9a23
 AUX 2277.patch 645 BLAKE2B 0314dce1d9ec6b95e3ebfecb6253494e52b732fb27446f146b73bcc8a14ecdc767f434069563b6c6275dc25c591ac4ed422ff693669a28b3ddada29f88efffbc SHA512 f8502c83f05d6328e669e9e0d7d05e1216f59667829432ef4c558398ec39d0ee888479fc8e6387934604ca53477829a9f709565fa10a7aaadd4d455ca35b12c7
 DIST espresso-4.0.0.tar.gz 25767191 BLAKE2B 995678496fe35b957c4a5775f79f6656efbb5f717a43e90f8c5fa406aba7847cd34b00db3f313e5a7b0a11a96b521e8182bdd58129ad68ea4881c9496e3977e5 SHA512 53eb311e8bb7db5aed32dcd3adfd5e1c63e6ae42a22cea41844edfa857fee03ffd717c0739dd46a6cdf8ca7a4c4b0952a036b208fccc4e61de3f383910e7d019
 DIST espresso-4.0_pre20170228.tar.gz 23621395 BLAKE2B 6381e519c59986e50ff74fb3d81cd157f4761e1c46ea96b384487fd079b9c6f881dfa70df8f62e275fdd57bda6a4c714002630cebb02c232029186c3adbb692f SHA512 7d35648d447af3282a76d9d68cfe681734ec18794a38b09e0ae9233f63b62450c643643bcec999ea9c7d4ba070d4fc6f8dc64db8145f536ae017a67ff2d0e0e2
-EBUILD espresso-4.0.0-r1.ebuild 2792 BLAKE2B 4ce1927c1da0740e37a2e4992ec5ab01f683fc8e87b3cf6cebbea4cc3c60498a34f149a1d93e7f446db8693a6d87aca482ed3f323b83a4f4d098f7bac5bda958 SHA512 11446cf5570fa6aa738c7f86768a964b5bf9554fe60eb58e43849bd1e4dc87970898ae03e72daa0c85acf3ba011ad0bee4f5357ffd68f7dbe4237c8310dddb25
-EBUILD espresso-4.0_pre20170228.ebuild 2856 BLAKE2B 4c146accee8c9294a52c0134eaf2c196ab1bf5cc54ebc89ebdac5a0bd80b04e66945b3f012812a56ab6ff07fb7ee59571766d38e692659e24fd6e70760701aa6 SHA512 7a78281dc85426e1e927e3ae3a4f9f9c2589596be2bd2981f0f5e260e3fb69d546bf776823872c74737c79346c426e1effabbac26b8803aa110331dd768920cf
-EBUILD espresso-9999.ebuild 2754 BLAKE2B 02b157a5e4d5838b0ae963d30ecb08dd3a30138596d20af0949ec6d17e5ee0afe88c639fd346cdd9b101c25a443290fb9aa16cbb49e4927bb1b6e25f067bc85f SHA512 f5397912c5335dbc66cb505d4d683aa0c5451deea324e7c1ddc1bbd73043bf439e7e6888b0095ffa9bf8d3fb0468e82670fa1352f1bd39d60c01455c76a7c287
+EBUILD espresso-4.0.0-r2.ebuild 2835 BLAKE2B 744290f292afd7e793d339a2380a0ca8accadf7c0a7f23567dc663f415ac3af1e460669ebab60a9c8c2244696199126ef153d69ec476a081b32f3b45dc947a4c SHA512 17ba5ce4623325fdfe1aaa56c0cdacfca7500cf3b9bcfe5648eb1bccbc928452198388f685b669b40bb75d5af7468ef159751d63013af1f3dbffab237e560a2f
+EBUILD espresso-4.0_pre20170228.ebuild 2899 BLAKE2B dbc0f3fa8481c0de53ea6eb020f396900fa4804953b4daa26b8b5f91ed915597ee6b5065d8267c9b676f8acec98fab95f73d5d83cf0c2c59428e166ef95b3433 SHA512 ef9fecaa51bdcbd034aadf61a2fe560ebccb38836978f289589130f510236dcfd5dd414ae91197e8e1ba1cab2050b2336891d5cea51071b249c5af25d877084c
+EBUILD espresso-9999.ebuild 2797 BLAKE2B fb87dbadf9448fd86afd94625cedcd32583b484f1686ce51b2271afd456bdb76354dbf00a62b8b54a49dfcb19f6b7bf1b74bc71b65bd4a7b1e45036dcc683cdb SHA512 d56dbb297f095e7445312196396554fd2722b768abe8334ba177701a6f7f138e16497746d9db8d14635903cf003ea4d567532c6f4bb7bc4d3f5fa49b15b5bbad
 MISC metadata.xml 596 BLAKE2B e0c4b7e3c44d88c1487f6c88f68f696e3edd174427f525e3ef769c26b4a2333c9c1c128e00e786a12cf671b821d633a73537fe667543dbdfcad5f7fe0bfef2da SHA512 c87e4c2401fd1600e80b5a493d68a222bdaabca448bb81940273e23a2607b5631ab24d05e1b265dcdaacc6e4e4756f713165a45ab072e9880551e5d2b034a4a5
diff --git a/sci-physics/espresso/espresso-4.0.0-r1.ebuild b/sci-physics/espresso/espresso-4.0.0-r2.ebuild
index 00b53caa2efc..0afbf393e9a9 100644
--- a/sci-physics/espresso/espresso-4.0.0-r1.ebuild
+++ b/sci-physics/espresso/espresso-4.0.0-r2.ebuild
@@ -31,8 +31,10 @@ REQUIRED_USE="
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/cython-0.26.1[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/cython-0.26.1[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	')
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
 	fftw? ( sci-libs/fftw:3.0 )
 	dev-libs/boost:=[mpi]
diff --git a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
index 5755eba6cdf1..e7c540b16298 100644
--- a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
+++ b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
@@ -33,8 +33,10 @@ REQUIRED_USE="
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>dev-python/cython-0.22[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>dev-python/cython-0.22[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	')
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
 	fftw? ( sci-libs/fftw:3.0 )
 	dev-libs/boost:=[mpi]
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index b9d14d3937e5..fcc6fbc9926e 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -31,8 +31,10 @@ REQUIRED_USE="
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/cython-0.26.1[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/cython-0.26.1[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	')
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
 	fftw? ( sci-libs/fftw:3.0 )
 	dev-libs/boost:=[mpi]
diff --git a/sci-physics/rivet/Manifest b/sci-physics/rivet/Manifest
index 0c317b894a54..41fb872759c2 100644
--- a/sci-physics/rivet/Manifest
+++ b/sci-physics/rivet/Manifest
@@ -1,4 +1,4 @@
 DIST Rivet-2.6.0.tar.bz2 3527799 BLAKE2B a0ffe7a73ed1120cd3944d3c845ed9387528e7645554c589fda0bfcac694e36f24ee78914e916c51f3a978659933b4e8934e0373f26e4a3ba7597714fc9a939f SHA512 49c381d88075715e23942bb02066b189305077581cd64b708ccaf79436202fe1c9d7989fc1f35dfeffdc643adb39283710fdf33fc87407cfb7ddd3e9d2297feb
 DIST refs.bib 16907 BLAKE2B 70c11f86c8ebf6386615b3e900280d1a2677dc82d99f944ac670f52320e05355352dd4017a48ae2af52dfd6f46a92a0d2d65bde4c271589ba4e66b3e7b68982c SHA512 64755e6aeaa1f0b3fb76a33ffdf226bcd42ee597a78a8d458b728f0e6f576d4dafbb276a0498c3b573d23054ccbf54ada6f6c12faf52dbfbeef2372094d01181
-EBUILD rivet-2.6.0-r1.ebuild 1877 BLAKE2B a3a47ef6e45b7a3a5b7c3edaee37799004fe6d3f74f162d338153f7adc12a102d39e7b0fb8b0bcfb47422870810f64899145ca55e1cbf2a400e781c2425d1f46 SHA512 40b14de834c15f61e79a66fcf0748284311645c5c0dc60e3261a3ac2b0804cdfc1482e6e7980c016d9562b622e0037272096e5224636aa38fd62273e6e47125c
+EBUILD rivet-2.6.0-r2.ebuild 1915 BLAKE2B 421b0a50ab8eb5afa679c16681e47a016777b59e87427c8ea9c5f59621a1cf4ebebb8f778e10192b8fd84b49753a036bba2beb3260977813d275d080612df31b SHA512 84da572b0d375392571ade8b1548f64e0865ad444879548d36080093113107a59111d8389a26c80a804ca4301ec883f78e2b1166aa38c6ae4a83b7483b93aaa7
 MISC metadata.xml 836 BLAKE2B ab971f916f23c3c3d70e54440e8f2303918084d25ba5a5ca7ed50142606f88e25019dac7781f20df717e4a552fc3ca642439bf0c37476aa378969f82abbab1c3 SHA512 21245268e114d41e0fe10cf6d265b3db7a0e220e1f6d545df4782839f6f5f284c9ddd6f89d20c74497e394e23bf93c96013dcde5c3685e4f1c112c73156f8db0
diff --git a/sci-physics/rivet/rivet-2.6.0-r1.ebuild b/sci-physics/rivet/rivet-2.6.0-r2.ebuild
index 273705fb73d0..551de2ab59ee 100644
--- a/sci-physics/rivet/rivet-2.6.0-r1.ebuild
+++ b/sci-physics/rivet/rivet-2.6.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,11 @@ RDEPEND="
 	python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[latex,dot] )
-	python? ( dev-python/cython[${PYTHON_USEDEP}] )"
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
 
 S="${WORKDIR}/${P^}"
 
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 418dcc53c936..e34d44b094c1 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -9,9 +9,9 @@ DIST root_v6.12.06.source.tar.gz 162284452 BLAKE2B 944b5e899677bab40842d7ec969ff
 DIST root_v6.14.08.source.tar.gz 162474562 BLAKE2B f8bfdabb4d91bbdfbab0b17626fff1f8aa265292996d857025cbd1543306f3ec540a1afb080788bfc7149ea835932b59d7c54dcd802354e31294ba2e5e9d2366 SHA512 827e39efbf3c69429a0a256127ca9f87550d9084c34c715bddccbf87a8c111c367b9a0ac6882aac747c9b48f4a3effb3747b4df567429910c93ee64dfe35df5b
 DIST root_v6.16.00.source.tar.gz 164836293 BLAKE2B 9d8f02631bdc1fa1775cbdaf50dd1feacd9b3c86b81d679ba6f0ca3c5787cd1d22ef7c33358b608361a01ad4f0aff3e8c749649d24773a35c52ce87f808d08f5 SHA512 17e5b9815973773e30ff83c2f4028e9e93691c1ecb824c162c8b3e02d1f6666fb8e0b72a5d0652a90032af146d92d271cbffcd634fb6fe6a63bdf46d672789bf
 DIST root_v6.18.04.source.tar.gz 165938450 BLAKE2B d6545dfa95817940f2bb6b5b49252eca1958df518a4bc05c4857df60a015a39d0df09ea077465533e6ebc815d04e1742da19d18b7af02b5446f9e73dc92e3c16 SHA512 cfcbdd2db4edf55845a7cd1e6ec0cdf714a7ceacb039fa6fb627d7300d6f849b3b462bab724e33b1d6b08eb22ba42c43b7d64c0c6c47dc8a3bb652f86979f2c6
-EBUILD root-6.12.06-r11.ebuild 7902 BLAKE2B e565b7faa90db1fdedd4a7a92d172a41fd58589d1c573c8dfa904af57be8d4f10ca373d043e04bf2dd54ed49fa8d4c05ce85252f6ce922dcacd1a16d278d257a SHA512 22d29350968a6ecd0b46dec881de811684e81af3519dc48933fccb5bfacf4adfc2ee9b905a9867a25a249a633390199b2ec3d21078ddb59d2ce9d0f39d5ce3c4
-EBUILD root-6.14.08-r4.ebuild 8144 BLAKE2B e70731a73b17b773ecf75226cdf144d654bf97d5be8ce1e5695b1fc3fcb4bbcb7b9e41e912b124c59d53ace0ced036e98cbff013e02e8809ce0cb4e865dafa8b SHA512 cc721eb131f3476bc5db3a3b104aeed51f89520e1a2a49f722ff600034a1b68b6d89aa8320860e7a7b1a030314de0bf3c5931919bea289df9c7d192c9bbc5530
-EBUILD root-6.16.00-r4.ebuild 8120 BLAKE2B fb9c1becf92f3af1f3a1bcd2734e19436a9638fcc4ffa0d150e483dac68755f88235ce3507e6138c66e7e9cd05fde893e231718a670721092d26d1ab22da548f SHA512 0fead6530038e5ec5da30a9ba19ed06c56eca8bed2c75817bfae806eddac3897ea05a8e4467f5868d70dc1c3233a9077f5b30960411de4b2290729c2bd3b0efb
-EBUILD root-6.18.04.ebuild 7538 BLAKE2B 1c7741bd556444952e5cdbb0d5855857d3e35ced5d443d1ecc5efcfa16921d48b712b355495f89d8d0d6f4a100c42922d555f9daa204e1283ede00144cdca905 SHA512 75e3b8788a68827e297293079ec4e0e4057da9fb2d148aeb1315918a18981255e4e0d76650f12da5eb6f41a1afedb0d0e8c89a8a5a92a2130551521384f3efe2
-EBUILD root-9999.ebuild 7514 BLAKE2B d5151116cc0c3674bc34d265e8a0e58dd366ff384ab3d7e9b3cfce98c713ac2bbdbe9152388fc0967bcec8820621fe357a59a516a2ee8aa2133ba6d0a89f575c SHA512 2efaccfee22a23daa9e60814f187c5db64d920285a934ef913da4b77070e97b312760454481cb6319895d4a6a7a0d54d0f5386cf56c592b56801af0808b74bdd
+EBUILD root-6.12.06-r11.ebuild 7937 BLAKE2B c714478a834736759af8b45ecaecf25935a8f0c39611b8f444c3620a9ab5d6616496b465b2a4f090b969a224f6bee19f3771164fb8942772ffbb29feb6a97a78 SHA512 d54b1783df85f19843831e254ffaef65f774fe5694864f8afb7446950ead97626037b250b03bb1ae128a3032bc1d13f79e2f3562fea3c1a05185ac40686763bf
+EBUILD root-6.14.08-r4.ebuild 8179 BLAKE2B aa0d28a4289a32c44032abc5a8a8916458c3291b547fe117efa7505af69fef580f1c1125b1c7a5a80d7622fcb6d5398787bb0e8d2350a110968581cc428547ab SHA512 215d5ca967f6a97f99a333eebc3f3ad909ecfdfeadf930b9ed4491eb626c7cb93ba7990cab74152a58c173e9c8f8e4e302c535788609e97dd6b38d7fe9698392
+EBUILD root-6.16.00-r4.ebuild 8155 BLAKE2B cf9596fd9e1b00be23ca6381494940536f08b3e685c87f3e0df8c2ddd01b716caecd8a53920037a70d2beea3e366619428d074ea6b5c81da6bd2dd1fb8a9911f SHA512 20a0a8c0a7e9029a9f6bf3a77ccfe3044c609a9370fad28225c8d2bc512b3e055d4f2a693730525d0bf35dfd4932cf38f5552a8d4661207f9c380597c65344fc
+EBUILD root-6.18.04-r1.ebuild 7573 BLAKE2B dcdc80a9aa32512cdea024b353bb883ec725a66a061f773eec51c3cf9c573e081d973f8f1d075d14cd7b6589be7c81968534f736cc510c7bb4ad89e49ab6335d SHA512 cb79923444573ea40bc56c14973d627eb14bab6b0ca1f07d123436bc96e2a10186441dc9491c9fb1571bb62d12ee85ece7ce728c01e77048a149154b962397c3
+EBUILD root-9999.ebuild 7549 BLAKE2B 7924fb2eabefc21bbc59d102f058cd71dfd279cca3b7fa06480b35a99d6149debb436230960251f070e19e6e5938b84411f54c9a1f789884deee378f912d97e3 SHA512 21e39143f3ff1898c64c75a8e3aa625132e490398e8b706b853b94370c3abb32013f62a6cddf9864f3d2234243a78628db99beba27b7d9b11b9c5fa0050491ac
 MISC metadata.xml 3218 BLAKE2B f23175b1a5998bbecdcdb6e5f42d08bd8e16aaeee79f43d30e0906977f389e18a19ddceeba24009360c2f717c29162c8e30b807bda993492f27429802dc62883 SHA512 d3bdc5bce1d1ac904e5a7a9f21bca65deb480ecbd1362a3251c93e09ab07fdcdd6dfd8900e62df3853b7e200880850d9010122500a081fdedb6b43adae25a6bd
diff --git a/sci-physics/root/root-6.12.06-r11.ebuild b/sci-physics/root/root-6.12.06-r11.ebuild
index 2cf1a95ecc94..d49c467555c2 100644
--- a/sci-physics/root/root-6.12.06-r11.ebuild
+++ b/sci-physics/root/root-6.12.06-r11.ebuild
@@ -90,7 +90,11 @@ CDEPEND="
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( dev-libs/openssl:0= )
 	tbb? ( dev-cpp/tbb )
-	tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	tmva? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	vc? ( dev-libs/vc )
 	xml? ( dev-libs/libxml2:2= )
 	xrootd? ( net-libs/xrootd:0= )
@@ -149,8 +153,8 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_C_FLAGS="${CFLAGS}"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
 		-DCMAKE_INSTALL_LIBDIR="lib"
 		-DDEFAULT_SYSROOT="${EPREFIX}"
 		-Dexplicitlink=ON
@@ -273,7 +277,7 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
-	ROOTSYS=${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)
+	ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)
 	ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)
 
 	cat > ${ROOTENV} <<- EOF || die
diff --git a/sci-physics/root/root-6.14.08-r4.ebuild b/sci-physics/root/root-6.14.08-r4.ebuild
index 7839ad943f5b..86b2044fd24f 100644
--- a/sci-physics/root/root-6.14.08-r4.ebuild
+++ b/sci-physics/root/root-6.14.08-r4.ebuild
@@ -95,7 +95,11 @@ CDEPEND="
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( dev-libs/openssl:0= )
 	tbb? ( >=dev-cpp/tbb-2018 )
-	tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	tmva? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	vc? ( dev-libs/vc:= )
 	xml? ( dev-libs/libxml2:2= )
 	xrootd? ( net-libs/xrootd:0= )
@@ -149,8 +153,8 @@ src_configure() {
 		-DCMAKE_C_FLAGS="${CFLAGS}"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
 		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
 		-DCMAKE_INSTALL_LIBDIR="lib"
 		-DDEFAULT_SYSROOT="${EPREFIX}"
 		-DCLING_BUILD_PLUGINS=OFF
@@ -286,7 +290,7 @@ src_compile() {
 src_install() {
 	cmake-utils_src_install
 
-	ROOTSYS=${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)
+	ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)
 	ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)
 
 	cat > ${ROOTENV} <<- EOF || die
diff --git a/sci-physics/root/root-6.16.00-r4.ebuild b/sci-physics/root/root-6.16.00-r4.ebuild
index 54a957e14266..aa5745011f80 100644
--- a/sci-physics/root/root-6.16.00-r4.ebuild
+++ b/sci-physics/root/root-6.16.00-r4.ebuild
@@ -95,7 +95,11 @@ CDEPEND="
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( dev-libs/openssl:0= )
 	tbb? ( >=dev-cpp/tbb-2018 )
-	tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	tmva? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	vc? ( dev-libs/vc:= )
 	xml? ( dev-libs/libxml2:2= )
 	xrootd? ( net-libs/xrootd:0= )
@@ -148,8 +152,8 @@ src_configure() {
 		-DCMAKE_C_FLAGS="${CFLAGS}"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
 		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
 		-DCMAKE_INSTALL_LIBDIR="lib"
 		-DDEFAULT_SYSROOT="${EPREFIX}"
 		-DCLING_BUILD_PLUGINS=OFF
@@ -285,7 +289,7 @@ src_compile() {
 src_install() {
 	cmake-utils_src_install
 
-	ROOTSYS=${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)
+	ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)
 	ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)
 
 	cat > ${ROOTENV} <<- EOF || die
diff --git a/sci-physics/root/root-6.18.04.ebuild b/sci-physics/root/root-6.18.04-r1.ebuild
index 852491a3c7d7..89beda36d2b8 100644
--- a/sci-physics/root/root-6.18.04.ebuild
+++ b/sci-physics/root/root-6.18.04-r1.ebuild
@@ -91,7 +91,11 @@ CDEPEND="
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( dev-libs/openssl:0= )
 	tbb? ( >=dev-cpp/tbb-2018 )
-	tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	tmva? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	vc? ( dev-libs/vc:= )
 	xml? ( dev-libs/libxml2:2= )
 	xrootd? ( net-libs/xrootd:0= )
@@ -141,8 +145,8 @@ src_configure() {
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
 		-DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
 		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
 		-DCMAKE_INSTALL_LIBDIR="lib"
 		-DDEFAULT_SYSROOT="${EPREFIX}"
 		-DCLING_BUILD_PLUGINS=OFF
@@ -262,7 +266,7 @@ src_compile() {
 src_install() {
 	cmake-utils_src_install
 
-	ROOTSYS=${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)
+	ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)
 	ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)
 
 	cat > ${ROOTENV} <<- EOF || die
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 27603b4ccc6f..53b2390393ae 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -103,7 +103,11 @@ CDEPEND="
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( dev-libs/openssl:0= )
 	tbb? ( >=dev-cpp/tbb-2018 )
-	tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	tmva? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	vc? ( dev-libs/vc:= )
 	xml? ( dev-libs/libxml2:2= )
 	xrootd? ( net-libs/xrootd:0= )
@@ -149,8 +153,8 @@ src_configure() {
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
 		-DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
 		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
 		-DCMAKE_INSTALL_LIBDIR="lib"
 		-DDEFAULT_SYSROOT="${EPREFIX}"
 		-DCLING_BUILD_PLUGINS=OFF
@@ -262,7 +266,7 @@ src_compile() {
 src_install() {
 	cmake-utils_src_install
 
-	ROOTSYS=${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)
+	ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)
 
 	if [[ ${PV} == "9999" ]]; then
 		ROOTENV="9900${PN}-git"
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.ebuild b/sci-physics/yoda/yoda-1.7.0-r1.ebuild
index 9f53d934f26e..a29234715ba0 100644
--- a/sci-physics/yoda/yoda-1.7.0.ebuild
+++ b/sci-physics/yoda/yoda-1.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,9 +19,13 @@ IUSE="python root static-libs"
 
 RDEPEND="
 	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} )"