gentoo resync : 25.08.2020

23 files changed, 189 insertions, 187 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 2845f5c808b7..5033a8006da8 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/bullet/Manifest b/sci-physics/bullet/Manifest
index df11f50e1222..e7f27f575947 100644
--- a/sci-physics/bullet/Manifest
+++ b/sci-physics/bullet/Manifest
@@ -1,4 +1,4 @@
-AUX bullet-2.85-soversion.patch 1480 BLAKE2B 101b86e112b3966e850e80030a7b1290bedf639eb1ac303b3171b70d94f67c6697a560ecb50175063e7b35b136a19073d8308f7aac9453bddc204d37310c9b2c SHA512 7679a0e91c06c664c8677f5947d523999eaa496444045c652356f5b49c4f0023488673988a3d8ff84dda4cdbe172d80e95b635773bf74b18b0a1524153f8e6bf
+AUX bullet-2.85-soversion.patch 1094 BLAKE2B 8dc035b80d812b3c2382067796f1626a932ce887246b34a8b5e08fddf45d330078a970eb6c2147259285a45974b8aaa26a2494ad4aa4824d89bf58aa7af3ac37 SHA512 f437d553c51c6cc6646a4a3bf0ffe02e2691a3b2109ea560c986f69c602055c409028a5a3711597aca757d3e3b33cab14d60e03fc120f0975f35c6e16be6362d
 DIST bullet-2.86.tar.gz 25806558 BLAKE2B a8576d8dacd67b9789d32d7b1acc6c4025df3c15427c60d66f98b1906eee8b2b94e5b0108b9a8c00ca6261510ccaf57ba5c02c72fee8f528d4f723b304166731 SHA512 af8a6b282ab606437d7975a59cd8a9c2bf273c83b0e79f0c4c1de6fa51695ba6d5f3c853dce2fdba9cb55e7572214e15089e54db51afc465ca26f502cbd5a4f9
-EBUILD bullet-2.86.ebuild 1563 BLAKE2B 5a0b9af54f968d61f47d98604f6a5ec9a36f3fae61cc1d68674f489ec49bafbb9375b914ad3f23decb97c1667a5d38261c864734fb8af68481818456c2d49a64 SHA512 fc8e5d85fb6a82ecbf8842396f60a8e5aa40188899f3c516ad4f32ce901fdf1e834749fae5ebec6258429822e0ecd1a86764fb274464557a0ae542b7fe472fe3
-MISC metadata.xml 797 BLAKE2B 93cd685b55738775206eb8cf47c0c5d76152faf6c3e535f60d2f38251cbc33c9657ef39f1c9276384d569ab4bba393070f6c52c00ed83cbea5ebc4b7708ef674 SHA512 812a02f3145a9a4b7f73f4549b358af86e698efb9fe17c11aafcdb2fa066171d95cf0eb2992150cf0d1a6b919d8ddba22f483623d3dfb5fbd23d42e8ec39f689
+EBUILD bullet-2.86.ebuild 1565 BLAKE2B 2bcb10a03caa592484f69870e951796f56b8a771e39fe023ec3fa1b517cb6e381e1a35cc4c951ded82aa9d5b5c8fea2cab3c034c26fddff62a962f5b2db512ad SHA512 41f68eaf06d5d300f8f6fb6b2a89cb0d3273c27dc9c7b397aaafd7cef9fd6a6f39a4bbef67ef42f0cf89754c1aa8006ce9e542f2c624e2ae7c9d0b570023817e
+MISC metadata.xml 1048 BLAKE2B 1f807672df77ab19e1b31e4d01424d9741f4b53705f33f1647e73e72c0a056bb7a7dee700b4e11b490a1d78f9b6a5b790759ab1950ac10ce10cdd2c7df23d9da SHA512 e214b323a3242b169e2332660f07bf9b7a7b5298c0831037b3d541c6b16c0ae104291a588619e0757f5136b5977c1f053ca07bb09d1f75d2d022d934e43175fe
diff --git a/sci-physics/bullet/bullet-2.86.ebuild b/sci-physics/bullet/bullet-2.86.ebuild
index b0238f5c9d49..f983c772bb62 100644
--- a/sci-physics/bullet/bullet-2.86.ebuild
+++ b/sci-physics/bullet/bullet-2.86.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Continuous Collision Detection and Physics Library"
 HOMEPAGE="http://www.bulletphysics.com/"
@@ -17,10 +17,8 @@ IUSE="+bullet3 doc double-precision examples extras test"
 RDEPEND="
 	virtual/opengl
 	media-libs/freeglut"
-
-DEPEND="
-	${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.85-soversion.patch )
 
@@ -32,7 +30,7 @@ RESTRICT="test"
 S="${WORKDIR}/${PN}3-${PV}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# allow to generate docs
 	sed -i -e 's/GENERATE_HTMLHELP.*//g' Doxyfile || die
@@ -40,7 +38,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
 		-DBUILD_CPU_DEMOS=OFF
 		-DBUILD_OPENGL3_DEMOS=OFF
 		-DBUILD_BULLET2_DEMOS=OFF
@@ -52,21 +49,21 @@ src_configure() {
 		-DUSE_DOUBLE_PRECISION=$(usex double-precision)
 		-DBUILD_UNIT_TESTS=$(usex test)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	if use doc; then
 		doxygen || die
 		HTML_DOCS+=( html/. )
 		DOCS+=( docs/*.pdf )
 	fi
-}
 
-src_install() {
-	cmake-utils_src_install
-	use examples && DOCS+=( examples )
-	einstalldocs
+	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.85-soversion.patch b/sci-physics/bullet/files/bullet-2.85-soversion.patch
index 74cfe4e8f8aa..342569355d87 100644
--- a/sci-physics/bullet/files/bullet-2.85-soversion.patch
+++ b/sci-physics/bullet/files/bullet-2.85-soversion.patch
@@ -1,31 +1,22 @@
- Extras/Serialize/BulletFileLoader/CMakeLists.txt   |    2 ++
- .../Serialize/BulletWorldImporter/CMakeLists.txt   |    2 ++
- Extras/glui/CMakeLists.txt                         |    2 ++
- 3 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/Extras/Serialize/BulletFileLoader/CMakeLists.txt b/Extras/Serialize/BulletFileLoader/CMakeLists.txt
-index 486cfdc..f1e0884 100644
 --- a/Extras/Serialize/BulletFileLoader/CMakeLists.txt
 +++ b/Extras/Serialize/BulletFileLoader/CMakeLists.txt
-@@ -16,6 +16,8 @@ btBulletFile.cpp
- btBulletFile.h 
- )
+@@ -20,6 +20,8 @@
+ 
+ ADD_LIBRARY(BulletFileLoader ${BulletFileLoader_SRCS} ${BulletFileLoader_HDRS})
  
 +SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES VERSION ${BULLET_VERSION})
 +SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES SOVERSION ${BULLET_VERSION})
  IF (BUILD_SHARED_LIBS)
-         TARGET_LINK_LIBRARIES(BulletFileLoader LinearMath)
+ 	TARGET_LINK_LIBRARIES(BulletFileLoader LinearMath)
  ENDIF (BUILD_SHARED_LIBS)
-diff --git a/Extras/Serialize/BulletWorldImporter/CMakeLists.txt b/Extras/Serialize/BulletWorldImporter/CMakeLists.txt
-index e620315..e04e8e9 100644
 --- a/Extras/Serialize/BulletWorldImporter/CMakeLists.txt
 +++ b/Extras/Serialize/BulletWorldImporter/CMakeLists.txt
-@@ -9,6 +9,8 @@ btBulletWorldImporter.cpp
- btBulletWorldImporter.h 
- )
+@@ -14,6 +14,8 @@
+ SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES VERSION ${BULLET_VERSION})
+ SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION})
  
 +SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES VERSION ${BULLET_VERSION})
 +SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION})
  IF (BUILD_SHARED_LIBS)
-         TARGET_LINK_LIBRARIES(BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath)
+ 	TARGET_LINK_LIBRARIES(BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath)
  ENDIF (BUILD_SHARED_LIBS)
diff --git a/sci-physics/bullet/metadata.xml b/sci-physics/bullet/metadata.xml
index 884f06af0bae..3304e14d402a 100644
--- a/sci-physics/bullet/metadata.xml
+++ b/sci-physics/bullet/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>rossbridger.cc@gmail.com</email>
+    <name>Ross Charles Campbell</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <maintainer type="project">
     <email>sci-physics@gentoo.org</email>
     <name>Gentoo Physics Project</name>
diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index 1ad9e687ef01..138f580b8e3c 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -2,7 +2,9 @@ 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
+DIST espresso-4.1.3.tar.gz 16947336 BLAKE2B 14d3513eda87f62a8473a0cac0c273b3590bf78ed48b96e76d10c106713f7bbd7d37de951bd3d9210062b34c02bd83a68f3aaf1ca8215ed1dcde590e4e99b113 SHA512 1fe82683eddb7bfd9bae6e446b0f42a50087d755995963905cd419473ad17b204f20049d0cf4af9264898dd6fee36f02744b38fa45cd0e33086374cf2aebd934
 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
+EBUILD espresso-4.1.3.ebuild 2738 BLAKE2B d2ed0248389ab77d108a57a00a6941051e3c4be5c1b01a5cec90e9851f1d87daa3ab4c1c67254693b971a40d1459009b70eb9df3ede962e75e05a25b8a600c8a SHA512 ef2f0852551ddfbf427379a71ebd2c1924b0fabce083d0f9130b9de47eeb1099da833cd28bd89efe301db7df0ac5d215dc4a0635757e9ba2e2914533c8df01f0
+EBUILD espresso-9999.ebuild 2738 BLAKE2B d2ed0248389ab77d108a57a00a6941051e3c4be5c1b01a5cec90e9851f1d87daa3ab4c1c67254693b971a40d1459009b70eb9df3ede962e75e05a25b8a600c8a SHA512 ef2f0852551ddfbf427379a71ebd2c1924b0fabce083d0f9130b9de47eeb1099da833cd28bd89efe301db7df0ac5d215dc4a0635757e9ba2e2914533c8df01f0
+MISC metadata.xml 476 BLAKE2B f76690b14e947d107cab9c5601cbdc62fc3160e03114ceeca6b45f6d29960691bbdf2d740694198d88cbb31311e5bf0ef0d2b225d276da71030e643188394cf8 SHA512 be0595e319ca81b2293857b6365e8ec9397548a8f30ff5b39f8b267c51dd0a1c08835b2880bdc0714ae7c6264066c88ee9f6ac053c54c4419cdabe5808678184
diff --git a/sci-physics/espresso/espresso-4.1.3.ebuild b/sci-physics/espresso/espresso-4.1.3.ebuild
new file mode 100644
index 000000000000..ef5f6578edce
--- /dev/null
+++ b/sci-physics/espresso/espresso-4.1.3.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake python-single-r1 savedconfig
+
+DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
+HOMEPAGE="http://espressomd.org"
+
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/${PN}md/${PN}.git"
+	EGIT_BRANCH="python"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/${PN}md/${PN}/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cuda doc examples +fftw +hdf5 test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(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]
+	hdf5? ( sci-libs/hdf5:=[mpi] )"
+
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen[dot]
+		dev-texlive/texlive-latexextra
+		virtual/latex-base )"
+
+DOCS=( AUTHORS NEWS README ChangeLog )
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	use cuda && cuda_src_prepare
+	cmake_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_CUDA=$(usex cuda)
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DWITH_TESTS=$(usex test)
+		-DINSTALL_PYPRESSO=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_FFTW3=$(usex !fftw)
+		-DWITH_HDF5=$(usex hdf5)
+		-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
+		-DCMAKE_SKIP_RPATH=YES
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_build doxygen
+	[[ ${PV} = 9999 ]] && use doc && cmake_build ug dg tutorials
+}
+
+src_install() {
+	local i docdir="${S}"
+
+	cmake_src_install
+
+	insinto /usr/share/${PN}/
+	doins "${BUILD_DIR}/myconfig-sample.hpp"
+
+	save_config "${BUILD_DIR}/src/config/myconfig-final.hpp"
+
+	if use doc; then
+		[[ ${PV} = 9999 ]] && docdir="${BUILD_DIR}"
+		newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf
+		newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf
+		for i in "${docdir}/doc/tutorials/python"/*/[0-9]*.pdf; do
+			newdoc "${i}" "tutorial_${i##*/}"
+		done
+		dodoc -r "${BUILD_DIR}/doc/doxygen/html"
+	fi
+
+	if use examples; then
+		insinto "/usr/share/${PN}/examples/python"
+		doins -r samples/${i}/.
+	fi
+}
+
+pkg_postinst() {
+	echo
+	elog "Please read and cite:"
+	elog "ESPResSo, Comput. Phys. Commun. 174(9) ,704, 2006."
+	elog "https://dx.doi.org/10.1016/j.cpc.2005.10.005"
+	echo
+	elog "If you need more features, change"
+	elog "/etc/portage/savedconfig/${CATEGORY}/${PF}"
+	elog "and reemerge with USE=savedconfig"
+	echo
+	elog "For a full feature list see:"
+	elog "/usr/share/${PN}/myconfig-sample.hpp"
+	echo
+}
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index fcc6fbc9926e..ef5f6578edce 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
-CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake-utils python-single-r1 savedconfig
+inherit cmake python-single-r1 savedconfig
 
 DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
 HOMEPAGE="http://espressomd.org"
@@ -48,9 +48,11 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS NEWS README ChangeLog )
 
+S="${WORKDIR}/${PN}"
+
 src_prepare() {
 	use cuda && cuda_src_prepare
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -63,35 +65,34 @@ src_configure() {
 		-DWITH_HDF5=$(usex hdf5)
 		-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
 		-DCMAKE_SKIP_RPATH=YES
-		-DLIBDIR=$(get_libdir)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_make doxygen
-	[[ ${PV} = 9999 ]] && use doc && cmake-utils_src_make ug dg tutorials
+	cmake_src_compile
+	use doc && cmake_build doxygen
+	[[ ${PV} = 9999 ]] && use doc && cmake_build ug dg tutorials
 }
 
 src_install() {
 	local i docdir="${S}"
 
-	cmake-utils_src_install
+	cmake_src_install
 
 	insinto /usr/share/${PN}/
-	doins ${CMAKE_BUILD_DIR}/myconfig-sample.hpp
+	doins "${BUILD_DIR}/myconfig-sample.hpp"
 
-	save_config ${CMAKE_BUILD_DIR}/src/core/myconfig-final.hpp
+	save_config "${BUILD_DIR}/src/config/myconfig-final.hpp"
 
 	if use doc; then
-		[[ ${PV} = 9999 ]] && docdir="${CMAKE_BUILD_DIR}"
+		[[ ${PV} = 9999 ]] && docdir="${BUILD_DIR}"
 		newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf
 		newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf
 		for i in "${docdir}/doc/tutorials/python"/*/[0-9]*.pdf; do
 			newdoc "${i}" "tutorial_${i##*/}"
 		done
-		dodoc -r ${CMAKE_BUILD_DIR}/doc/doxygen/html
+		dodoc -r "${BUILD_DIR}/doc/doxygen/html"
 	fi
 
 	if use examples; then
diff --git a/sci-physics/espresso/metadata.xml b/sci-physics/espresso/metadata.xml
index 87ef8dd6f089..37615e72f9b7 100644
--- a/sci-physics/espresso/metadata.xml
+++ b/sci-physics/espresso/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>junghans@gentoo.org</email>
-    <name>Christoph Junghans</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci-physics@gentoo.org</email>
     <name>Gentoo Physics Project</name>
diff --git a/sci-physics/hepmc/Manifest b/sci-physics/hepmc/Manifest
index 3d559c52cf37..ae9bf7a02edd 100644
--- a/sci-physics/hepmc/Manifest
+++ b/sci-physics/hepmc/Manifest
@@ -1,3 +1,3 @@
 DIST HepMC-2.06.09.tar.gz 4612637 BLAKE2B 6bbf1a6a8410b6717ddff29fc3643247582f7a61a05fd9e52a0b09f78bf75de587c1c55525f6a1367b306a26a4687ce55b64908c049d91bdb2db3d40467af62b SHA512 1030f31ad9d19d8ae184145a693c4a3092131f485e2ed89598b7172992a825ad9aa46fb44a9199a00c4a6bd7e163daead9452e9bc4fe32cb3b97351cf22906c4
-EBUILD hepmc-2.06.09-r1.ebuild 2010 BLAKE2B 396462f13488f51063145a3cd071870025937baff2ca06590c166c30fff83f098c737ddb29b327e7fdddf307acf81974488088ada959f57ef12f509df291eed3 SHA512 22ce27655b962e9ea0fba0cb1bcaa846c026d3127e669bc26c07edd13ab10530b39fe423301421978d835134328f31afcd49ad31db354aeee9d7e8eb0c2a0543
+EBUILD hepmc-2.06.09-r1.ebuild 2050 BLAKE2B d5cca53267e511861f5b085bf105cb7720fe2b46a83c756baf2b0d6039aa653752c5f1fce649f00cdfa44194c3adba066c7aa88aacbc0f2c225e73138b167cd5 SHA512 b0bcff52f6d8e1cca09e7c2bc83d726eb77b11c9daf68cf18b02e12715a4dfdafbe1c56a627f641e770fbdeaa71853f95f9a309ce9fc74fc985414a60a00ae92
 MISC metadata.xml 1386 BLAKE2B aafa21d2da77f67da6bb8f88ea88e96365f3575a4435614a010c4f8b7241a2f4837623ced2f86f781fa8f0dba72048fb22c9ab72677d7ff128e5c3ba4767f95e SHA512 b0ef90b6404b04d1d393e9e8bb04ff08a51f72938362f4ae1e2806bfe29c99d50089f15ddacb59b94d6d554d0ec8842ba7b89777434e0bab08c51627ab8bd9ce
diff --git a/sci-physics/hepmc/hepmc-2.06.09-r1.ebuild b/sci-physics/hepmc/hepmc-2.06.09-r1.ebuild
index 30a266d6d1e1..e8453c9991df 100644
--- a/sci-physics/hepmc/hepmc-2.06.09-r1.ebuild
+++ b/sci-physics/hepmc/hepmc-2.06.09-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,10 +21,9 @@ RDEPEND=""
 DEPEND="${RDEPEND}
 	doc? (
 		app-doc/doxygen
-		|| (
-			dev-texlive/texlive-latex
-			dev-tex/floatflt
-		)
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-latexrecommended
 	)"
 
 S="${WORKDIR}/${MYP}"
diff --git a/sci-physics/lammps/Manifest b/sci-physics/lammps/Manifest
index 7f1eebad353b..5662e6f87741 100644
--- a/sci-physics/lammps/Manifest
+++ b/sci-physics/lammps/Manifest
@@ -21,5 +21,5 @@ EBUILD lammps-20181212.ebuild 2977 BLAKE2B b5ea51f68299218d3d190f987786ec87b85be
 EBUILD lammps-20190605.ebuild 2977 BLAKE2B 345d85601ce372b0632e8fd59cdca0b5e5ba0570309e507416abf48f63c62cca8b0c34db227490ee9e372f4d8de69162a8e4c65de3eaa574fb6fc4143b23503a SHA512 66a5d8d7a39160100b67834d5dda9f2650338c5202f037ea744f1f8a543b4a9dfabce1dfec0ce8376c40b2231be637e61ba1b001fd7e7ebe70e01ebb38c96ac1
 EBUILD lammps-20190807-r1.ebuild 2981 BLAKE2B 596bbab3fd8f1fc2e9704ff4f8a1820f60315f14f5d6ef3789f73cdc65ffeb2940d65f31dea29b729cbf88a2287791ba05a3b89e6a66bc694f6f47b8958be9d6 SHA512 a0f4c13dc9522fd12b683aedf8b8b4ce4f3cf7a94db166f7958beaede73d43ba021abb0b2cb2155faf101832f101adec741cf6ee9edb84e3a52205bf1de6fee9
 EBUILD lammps-20190807.ebuild 2977 BLAKE2B a3744848fa52a8a760380bc63d96827bbff4da11f8d2a920d2564d62420373205c4e86b3fa6854a3d3b8954566a7b1b61c9a104ba0dc858b869879f3074cb9e4 SHA512 bebd28215512949a6c6f99ba187aac9ce720114272c03033cc87bb3386a40778e153da97780d57cf8ffc95bc208ad9df649f1e840b123ebb3484e87b0279bfcc
-EBUILD lammps-20200303.ebuild 3045 BLAKE2B 9689b14fda6cd7fedbb6f2fb7682863011bd790800cff8a82e8947a47e21813f6e2cf3f69542a579374560234ebe5f5b3de1fc8b955a4b93b86c6d9a09dad1f6 SHA512 8b57eb9562e265d1a3593a2819d326504e88b2617aa9f07c59b5af610d5b91e57a45452ea4dd1c3e6cb60923565f7d30b8d38c01dfa07f25d5a3c24e289aeb2c
+EBUILD lammps-20200303.ebuild 3043 BLAKE2B adc573dde316ae1b4e0f8730a998cb4fd4100ef7543f337d255034a2e2018428209d063977f4f1726a35b68ac46232a54b55e79ebada774d6dac106017e419b9 SHA512 65e11efe60e38b668a69a84922cb7130c7ce889b42e4a22c2c0ed1275d8b1a5df72e53da34102ff5e90f5507c36f4326c2dc0b8cd657703aa866990eb3799464
 MISC metadata.xml 1400 BLAKE2B 799d1c7a8a17a78af7de38cba5058ebe2b79eb577f8bcfa918459bccedecf151adc9442fe2031f16c6215b9126045a7472cb91fdf0d9a68c6f22271a5a2a5226 SHA512 8f864d325dfcbba719be7f7860485810a63a685739d0f2a0ec45989362b3eec28351d4ad34f579572f638291f2bad96ac04ca6eacd4c886ffbb77fb6d06dbe12
diff --git a/sci-physics/lammps/lammps-20200303.ebuild b/sci-physics/lammps/lammps-20200303.ebuild
index d27137f6fee6..aa161200f770 100644
--- a/sci-physics/lammps/lammps-20200303.ebuild
+++ b/sci-physics/lammps/lammps-20200303.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/lammps/lammps/archive/${MY_PV}.tar.gz -> ${MY_P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cuda examples gzip kokkos lammps-memalign mpi netcdf python test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-physics/lhapdf/Manifest b/sci-physics/lhapdf/Manifest
index 7d9e363909d7..61a1f0cdc80f 100644
--- a/sci-physics/lhapdf/Manifest
+++ b/sci-physics/lhapdf/Manifest
@@ -1,10 +1,3 @@
-DIST CT10.LHgrid 21081519 BLAKE2B 29d984a010405de5537d27eca81a306ea4dfc13b554d96031a087cdb9105ce65d736ef6e65f5a1ed3121ad22a6e0bc855ad5a16905b10e214405d9fcc8b39ae5 SHA512 4196b0899dc7f5803608d9328872b942393d5f5103e8d50a53b35af6f8bac509adbbe83c363ab33a5fbfab3c33156e8ae46131939ad5a8642c558ff209630820
 DIST LHAPDF-6.2.3.tar.gz 750659 BLAKE2B a16f67c69f41e96cdb5434cc53658c6b085b94c9ad06443fdfb49aa1de50eeb2a59aa41442a032c29b361bad4f749cef42499f3d16f2774efb0b399f889576e4 SHA512 167064a141f46e5c834d950690a989330b940acec62377b8b4c40e14665503cf7b4ddb79e05c71ebe1f801231192d951e294bec3944ec37b2bca484b2e5ce894
-DIST MRST2004nlo.LHgrid 288040 BLAKE2B b568b94905370faa30bbb8ad5ae9b8ee0938fb1373c19ca823662e6f7c930d251734d4afa72c8679b06356999b36bfd828749cbc9dc86a493a1764cb07cf0871 SHA512 b554454fa494c86a3ae56168c3d74c5e3c3bd80f10b393153c0adfbb39a3f3837ae2db80534d288784409154034187c9c5212dfc9c21ed1bf32ef89b9266e262
-DIST cteq5l.LHgrid 134797 BLAKE2B 1e222631ff00979abf64e95ffa3133d29eacd819325fcdf9d4065a1ce85db5704f0a43c646f9a9a3ee7b1905603e9060fc279405435d412bf06ee14ba9121f32 SHA512 1ba41fd773104a933af6f37745dcb6f8422e1aece74ba2b1e15a5fb69fdaf694336c0ec1dc6fbc964d2cf3fe363d17ca0c01a6c2ba6def0afa4389cb4083f34b
-DIST cteq61.LHgrid 8946864 BLAKE2B aa7d7d817082a70fb53cf9c9d367af3bca9b5f4d845ee6c8f8b77265541980cab6f6ffc74a2233ef2899c161f9171cb3e7ba9570a57c5ed048311622217f8e89 SHA512 ab35c058f1ece8b428d8664ba2e14068541279328b5eb9e13b020642cc804c21f7412414dd74bb3621a5136bfa7d9a60832604c944d1e3519c5a94d3dce2a063
-DIST cteq61.LHpdf 11860 BLAKE2B cde2c5f6493977f56207d86f0a439a192e32f4debe50b6399b10cf59982bf944950c53c05e97a56daa8eb8e2ebf91a38fe405b1d423be7839c41dab61150b2e2 SHA512 2769bcaed94aa4b47144cd2c3ce76e0b6ab4fa8af278db5cb3b612f2286200352e829eec3971c8da0b78144483f00bbbf1ae2aae8d1e75045d239fab40289bc0
-DIST lhapdf-5.9.1.tar.gz 1236188 BLAKE2B a70b0421f1eefb79e239beed362858f0a47f27eebb0bf30c8f71f0fd49e405370774a932388c56b9193d51be14d7ad8e00efb7ea947e92009f23868b28ced67f SHA512 8e0eafa202d7c486264c06ddac31a2d1fc17c71223cf5b75cd9dae7e434792e8b8f4002bc8a0d00491c0c3fc58513095cbf693dc883c3bf968473a4e6232586a
-EBUILD lhapdf-5.9.1.ebuild 2568 BLAKE2B b524737e97a5e885f367d6c401a5e959e0b866f6c115156d568d96250c2d620bb26df6a75140405882feeeaac5eefa87de4dd529e1fb74516e7e10bcdae640ec SHA512 f5dece0e617f2750e3c7e0db47fdfad9e2b5a1a490c285094835de1af7b9f62f5cada0a5ef4d46a9ced8de7342d137551de706b3b6ea1d88278dd29671157f69
-EBUILD lhapdf-6.2.3.ebuild 1605 BLAKE2B b6ef8f78ae33a595cf508030c2804aa7932ab57cef2c9cd791805df295a35c09b5ab348ca27214fdc9a39fa1dad9fbd824b7449cf1c666c6e761e9ed9b36df8c SHA512 60ad1fb4db61bfae6eacaadcc148bb405dfb65dc619b5224cc3132f4b552c151fb72f1e3c4b3906e1acd1bc27e79d762119db7cf91f62c4c90a936aa91798337
-MISC metadata.xml 1090 BLAKE2B e7faa55de10391c76cc33d1f66f9a715d163d396c5e74b4d2d55268424abb74dc70687287c900841e4a298ca5bc936b01cec7c570d2b14b86d251c4b3d485d26 SHA512 fe04ac08f3f0b7ed98369d16b2cdf053d980211f3d4bb9a17d3e3feb3cc3dc6e2999fd16cc533ba7250e47b258aa10bed90d7f62007faac064112c5f9b79fe4e
+EBUILD lhapdf-6.2.3.ebuild 1603 BLAKE2B a10b72c02b6f9ea491908d1520bebdf4a6073c7ed61c64e8379e1db7e042a42e00317060e70fbf7e529cb9c48374022eb15786fbd06a80124a055fdab7d1d701 SHA512 f9be54595fe9e98fcc2bcef349edf651e40b30f8ab6d0dce0422747a0154e77bcfe619619e10a8506a801936744268c64eea6d57db91c54f309262f7ab0ed127
+MISC metadata.xml 996 BLAKE2B 97df1e778a0e4fdd20faeffcc992c5c76d203c35f9916a15c823bd10d8914cea7b2b6c7b58cca1e6af50ff4a134db8c5cf40db345520cd6f4d16a58d02fda822 SHA512 0c5f089f8428dfbf3e6151f2d9052409dbf7dc64af40fe28664df3e6ba014c8ec4c3e6ae2958c0f0b13ee7edc59f038dab14272622119cc5cb5d6f7fc43637cc
diff --git a/sci-physics/lhapdf/lhapdf-5.9.1.ebuild b/sci-physics/lhapdf/lhapdf-5.9.1.ebuild
deleted file mode 100644
index dee35d6e6f2f..000000000000
--- a/sci-physics/lhapdf/lhapdf-5.9.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator
-
-MY_PV=$(get_version_component_range 1-3 ${PV})
-MY_PF=${PN}-${MY_PV}
-
-DESCRIPTION="Les Houches Parton Density Function unified library"
-HOMEPAGE="http://projects.hepforge.org/lhapdf/"
-SRC_URI="http://www.hepforge.org/archive/lhapdf/${MY_PF}.tar.gz
-	test? (
-		http://lhapdf.hepforge.org/svn/pdfsets/5/CT10.LHgrid
-		http://lhapdf.hepforge.org/svn/pdfsets/5/cteq61.LHgrid
-		http://lhapdf.hepforge.org/svn/pdfsets/5/MRST2004nlo.LHgrid
-		http://lhapdf.hepforge.org/svn/pdfsets/5/cteq61.LHpdf
-		octave? ( http://lhapdf.hepforge.org/svn/pdfsets/5/cteq5l.LHgrid ) )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cxx doc examples octave python test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="octave? ( sci-mathematics/octave )"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	python? ( dev-lang/swig )"
-
-S="${WORKDIR}/${MY_PF}"
-
-src_prepare() {
-	# do not create extra latex docs
-	sed -i \
-		-e 's/GENERATE_LATEX.*=YES/GENERATE_LATEX = NO/g' \
-		ccwrap/Doxyfile || die
-}
-
-src_configure() {
-	local myconf="--enable-ccwrap"
-	! use octave && ! use cxx && myconf="--disable-ccwrap"
-	econf \
-		$(use_enable cxx old-ccwrap ) \
-		$(use_enable octave) \
-		$(use_enable python pyext) \
-		$(use_enable doc doxygen) \
-		${myconf}
-}
-
-src_test() {
-	# need to make a bogus link for octave test
-	if use octave; then
-		# remove line that tries to read non-existent help file
-		sed -i -e '/help/d' octave/lhapdf-octave-example1.m \
-		|| die 'sed octave example failed'
-	fi
-	ln -s "${DISTDIR}" PDFsets
-	LHAPATH="${PWD}/PDFsets" \
-		LD_LIBRARY_PATH="${PWD}/lib/.libs:${LD_LIBRARY_PATH}" \
-		emake check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README TODO AUTHORS ChangeLog
-
-	# leftover
-	rm -rf "${D}"/usr/share/${PN}/doc || die
-	if use doc && use cxx; then
-		# default doc install buggy
-		insinto /usr/share/doc/${PF}
-		doins -r ccwrap/doxy/html
-	fi
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.{f,cc}
-	fi
-}
-
-pkg_postinst() {
-	elog "To install data files, you have to run as root:"
-	elog "${ROOT}usr/bin/lhapdf-getdata --dest=${ROOT}usr/share/lhapdf/PDFsets --all"
-}
-
-pkg_postrm() {
-	if [ -d "${ROOT}usr/share/lhapdf" ]; then
-		ewarn "The data directory has not been removed, probably because"
-		ewarn "you still have installed data files."
-	fi
-}
diff --git a/sci-physics/lhapdf/lhapdf-6.2.3.ebuild b/sci-physics/lhapdf/lhapdf-6.2.3.ebuild
index fd7abda37ad3..4b3de592bb3f 100644
--- a/sci-physics/lhapdf/lhapdf-6.2.3.ebuild
+++ b/sci-physics/lhapdf/lhapdf-6.2.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://www.hepforge.org/archive/lhapdf/${MY_PF}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc examples python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sci-physics/lhapdf/metadata.xml b/sci-physics/lhapdf/metadata.xml
index e1748d9c6923..8ce35ee2a26c 100644
--- a/sci-physics/lhapdf/metadata.xml
+++ b/sci-physics/lhapdf/metadata.xml
@@ -18,7 +18,4 @@
   version 4.1 onwards a configuration script facilitates the
   installation of LHAPDF.
 </longdescription>
-<use>
-  <flag name="octave">Add bindings for <pkg>sci-mathematics/octave</pkg></flag> 
-</use>
 </pkgmetadata>
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 0eabe84496f5..caa26f5f363f 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -6,10 +6,10 @@ DIST root_v6.18.04.source.tar.gz 165938450 BLAKE2B d6545dfa95817940f2bb6b5b49252
 DIST root_v6.20.04.source.tar.gz 168056076 BLAKE2B 814bf74f5a18adf2605954068962d3283504538118d221f55e030b224e09c9542a544c166a317ad981a84d4a1edc48bbfc76a57acd43aefb779d8e27270c4aeb SHA512 3cc214a4b160795c8aa53b6fdb01370c3aea628696d1668cbf47e6beac56f171674619a853a1219336d9b67ad06db1d9ecd13345bf1731f809da9e60b3d39a2c
 DIST root_v6.20.06.source.tar.gz 168216335 BLAKE2B a0a51f11e6dcc3a6ba657a8b946507bb857088bce3102f5330a0df455fec468ee4228f5394795f3e3b1ee3434b7ddda85f08039bf603a531154c28b335ff803c SHA512 232fd5253e83eb02ad33d03941c7c83d39d5f6b0162bd42594e44a0c1c08deade42ae5793e571db767ce4fa0a582aa332b9d1869e621b825d1eb1162819c98c6
 DIST root_v6.22.00.source.tar.gz 173014392 BLAKE2B a59071ee5b13466505323fca30fe656668a243006239e7f9ebc71bb21a7fe244cafe6d33ff4579b67920c9102eb36344f20415079bb627834fb8a57d9117476d SHA512 9e3c54bbc146b0abb0a2d960af380255ec59d0b3a11a4a97a2a25cb7ac567b07280c4eb48dddf99c1fa2e692881f6396a842ce125d3a253037e52f719739f01e
-EBUILD root-6.16.00-r5.ebuild 8185 BLAKE2B 37cfecd2895248be70e4f47bbb3ae87538e639232f17f2429b79c984860688d1e3681aaf8b5f157048d6bad266123d0acc6282f3ae28f7f3e91913b2eef972d0 SHA512 377f136cd55ccf1e21885fbd67c33bdf0afa4d100773c3a950662d8b14b7a6cf749057a2cd1017ab645d84cc26a358acd4f03210d30c8bdc09158c43c484fd79
-EBUILD root-6.18.04-r2.ebuild 7603 BLAKE2B 90431ca482d520ade23455a016227d876d48ae5a824eae8488883b1e652ba136f7728f0c2e93aba88d273dc9345d7836a928c21a2cf870083f4a76569a515550 SHA512 f0bdcd0e11a1c0826369e311064d72714b1ec973c98a937482a96b67b9787d5ec3b0f84e127eebc2fedd6da464f35be82581cdb5304baac931c6c9ac927c8f23
-EBUILD root-6.20.04.ebuild 7619 BLAKE2B 3956618c3f3bb23d3ff6599fc21d8b1ee7cec19a8b93cc5875bbb4ea10fa37e5d61840f1b156d9cb443c84560708211c1dfbabcb74561e1a6fbb4d05c4545143 SHA512 f0be0e1f492576954cf357033f843ebe1540f7c1002e97ec5666103cab36a95b2b6648179d3959c07598c43d4b70d65798abb84972f5a086895109bd6a3ee8f1
-EBUILD root-6.20.06.ebuild 7571 BLAKE2B a377f07847be57961baca90114f0e96d63442dd3e7b25561158e7fb5ac59c6d7a6bf7517b65f0178a160fe3dc724731ee937773f77106729277337de0a377a8c SHA512 aba076e740c93609670ef8274309e4b1c03dc9f157c3c613f799f79c903f75a8dcb6216c58d51d1e8ab22c83e3b093a590e477148c7619c381a7eb01999793fe
-EBUILD root-6.22.00.ebuild 7578 BLAKE2B 69f9b0c875d120b6c6425c591f4867158e2975d040ec9fd5a13192e4ec58d009e4f455bf2994902ca9fad549f50ddea14368d2c085e8ef66e50c6e81bbe29797 SHA512 54d0f1b072f5ac487a9aaf1eb4558a6765c119125a197e4f5f6d77a1cecb975fa251b6e9781c0f110f711cd6dc784756c4b1ecc50efd3f6bf00dc6a0274f49fe
+EBUILD root-6.16.00-r5.ebuild 8188 BLAKE2B ac2fb81f115d0a2a0bfd893ec3b113483550363167d42544b4784b448852831801537749abf24d0524bd8f150876e791231e09032de0ec8b3aef0b92b85b0372 SHA512 a0bbbfa5a6b9984ef0e599eb07a91e5b0bdb95fc46d4d1d7b09584b524aa34cdaf0d136cfbd5e665fda647370b59e6ef4ea254a46bfedffaa5b072b17ac228f6
+EBUILD root-6.18.04-r2.ebuild 7606 BLAKE2B 6a1f7b36bc8479538b1487b2125f7130632b64d319ac43728fb8be3a6ce63b6979f1ca32955b85d455e3df87685b9aa06480c55d095e0632c9c642f00e4246f9 SHA512 439bcb7daadbd796ca62d022c3c79832e149e0665da1e56e1e81d3ad3ae352dfa67f3685f965da97cd023252a3d9796c3749be218f969ca521704208a7f522dc
+EBUILD root-6.20.04.ebuild 7622 BLAKE2B befddc9eb89171f28f410067ffe4ef5fad17f0252da5b6c8391171719b71dde5f9eeae1b136b0883e4f4c9cf00852cd2e0d8c0714401cc53904e442473c09139 SHA512 365ab02df174eb50562e5d24f3ac1550b98bc27c4e70bf9f5bb93e07cef09a81fdd1a9ebdf2ca86ad79c2183a5f0fac5a4d253151c2dd98b2f782895f85ff8d3
+EBUILD root-6.20.06.ebuild 7574 BLAKE2B 7e323a8ddedf4e10642f37aff96324483655ca8c4122883a6517114c6c845756d468e71a03a8da7d449e0deaa14dde4e885c8951c725c66920592eba18064bf7 SHA512 acb8ced616738df91f1dcf36d82c33e4a6054e13930a7e8ae107b29d123a2b918d76f30f11bd9489763b5311be74dbff7989fa389f1fae65880fde3131eba919
+EBUILD root-6.22.00.ebuild 7581 BLAKE2B 26be211c71848caafcafb3bdfd7c069b0417f9b89875b2de61304109426c5e6aeb41e80411bd5c35d162c9b1a815e3acae39942f3224b85b21788738a9a98237 SHA512 aa6486212e3a1dfdb8f080401fd5d276c0b3b6eb3bc914daca9834103696d306454f902c145f41c32d28f9da64e4f85bcb59110610e9b15f81aeb5854f587cde
 EBUILD root-9999.ebuild 8019 BLAKE2B 5e872be0fd66e98c0bda4cdbe7892b42d24dc8676aa0e3748d162f1b194aad2ed792bb98cff3110942bafe680ea81cf8eb8f4cba064d20c6bdf52dc849900782 SHA512 cbf623074ef0024cbf8b781b000bb9e8a136e272d72e476bb5e755552f40e10acfa83ff7960cd9421cf9b88ca7493aa5310fbd4c726ea93d349880b783954d58
 MISC metadata.xml 3288 BLAKE2B e61573d67396a1c102c3f92036dbd0d1f601d383ec7e806ece97eb1ab026ee05e99f36acf98261455c8213868526bb3119c502bc837654787c663bfc9b205c84 SHA512 2f26ec7cde49879c23c56b8a860471e7c3da6b4cb0ee8c36f00d352547115fecc81cd2f1344a021e5d4895996e8744b7f6fcee3d478b901e149513fba50086c6
diff --git a/sci-physics/root/root-6.16.00-r5.ebuild b/sci-physics/root/root-6.16.00-r5.ebuild
index 5b4861dbe3ca..654e8431079f 100644
--- a/sci-physics/root/root-6.16.00-r5.ebuild
+++ b/sci-physics/root/root-6.16.00-r5.ebuild
@@ -102,7 +102,7 @@ CDEPEND="
 	)
 	vc? ( dev-libs/vc:= )
 	xml? ( dev-libs/libxml2:2= )
-	xrootd? ( net-libs/xrootd:0= )
+	xrootd? ( <net-libs/xrootd-5:0= )
 "
 
 DEPEND="${CDEPEND}
diff --git a/sci-physics/root/root-6.18.04-r2.ebuild b/sci-physics/root/root-6.18.04-r2.ebuild
index 043dfdd8ac3c..43c415eacfdb 100644
--- a/sci-physics/root/root-6.18.04-r2.ebuild
+++ b/sci-physics/root/root-6.18.04-r2.ebuild
@@ -98,7 +98,7 @@ CDEPEND="
 	)
 	vc? ( dev-libs/vc:= )
 	xml? ( dev-libs/libxml2:2= )
-	xrootd? ( net-libs/xrootd:0= )
+	xrootd? ( <net-libs/xrootd-5:0= )
 "
 
 DEPEND="${CDEPEND}
diff --git a/sci-physics/root/root-6.20.04.ebuild b/sci-physics/root/root-6.20.04.ebuild
index 71c51ffb3f90..4806caa94c9c 100644
--- a/sci-physics/root/root-6.20.04.ebuild
+++ b/sci-physics/root/root-6.20.04.ebuild
@@ -101,7 +101,7 @@ CDEPEND="
 	)
 	vc? ( dev-libs/vc:= )
 	xml? ( dev-libs/libxml2:2= )
-	xrootd? ( net-libs/xrootd:0= )
+	xrootd? ( <net-libs/xrootd-5:0= )
 "
 
 DEPEND="${CDEPEND}
diff --git a/sci-physics/root/root-6.20.06.ebuild b/sci-physics/root/root-6.20.06.ebuild
index d719ead370c7..4403d94be474 100644
--- a/sci-physics/root/root-6.20.06.ebuild
+++ b/sci-physics/root/root-6.20.06.ebuild
@@ -100,7 +100,7 @@ CDEPEND="
 	)
 	vc? ( dev-libs/vc:= )
 	xml? ( dev-libs/libxml2:2= )
-	xrootd? ( net-libs/xrootd:0= )
+	xrootd? ( <net-libs/xrootd-5:0= )
 "
 
 DEPEND="${CDEPEND}
diff --git a/sci-physics/root/root-6.22.00.ebuild b/sci-physics/root/root-6.22.00.ebuild
index f81b66760847..004a33d9d3c7 100644
--- a/sci-physics/root/root-6.22.00.ebuild
+++ b/sci-physics/root/root-6.22.00.ebuild
@@ -100,7 +100,7 @@ CDEPEND="
 	)
 	vc? ( dev-libs/vc:= )
 	xml? ( dev-libs/libxml2:2= )
-	xrootd? ( net-libs/xrootd:0= )
+	xrootd? ( <net-libs/xrootd-5:0= )
 "
 
 DEPEND="${CDEPEND}