11 files changed, 168 insertions, 320 deletions
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index e2119f3b9c5a..69310e1aea1c 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/geant-data/Manifest b/sci-physics/geant-data/Manifest
index 75c51ce5fc0c..642e860c04ae 100644
--- a/sci-physics/geant-data/Manifest
+++ b/sci-physics/geant-data/Manifest
@@ -6,6 +6,7 @@ DIST G4ENSDFSTATE.2.3.tar.gz 290745 BLAKE2B 89c642a43ebcb979b233cfb1af1bde9b2f4f
 DIST G4INCL.1.0.tar.gz 95840 BLAKE2B 2c264b7563620cdbdb8a5e529f21766a5b5ea3e2e51047362518714d01854de8d9ca2ca2a0183ab672cc2f8a4d951327b0e1a7298799695fd48233fa5e529686 SHA512 9d769566d1728674bd6d1e59fc05882943cd240d2f0a9e47dff37fa64fe27720b20b66f6dea6d300c3c9082a22f7f71bb416df8c7d2b5bae87251c4a0113f49b
 DIST G4NDL.4.6.tar.gz 599862135 BLAKE2B 78e30dd0f02f3b7d7fce12a3a4dcb83e1405ba45f19ed2a743ee7e72be426e09a31cedb521a62a116a8a580a39c83987d4e39ab621b73e0d7a41e7dab8f36d41 SHA512 29b7d933d3e691b03cf45db0c4a9335c03f34ce57149a37b66a0f85e41d500d985f86bc8becc206d85202f129f60ea9fb1ef16bc4a9eef48cde593ffd5a85f24
 DIST G4PARTICLEXS.2.1.tar.gz 4600435 BLAKE2B 7132411824d9d3f47b5a4b1fced0a4099baed6a91596661d74ba540b91b5d12e475eb5bb364b8be7457592136fe2c629c98a9f8015a7b6fbd380c8c720078cd5 SHA512 b96c62a4cfd654381cf57eddcff10902ce42327a500eee007dc01ce4fbda6da44905d00ed9731740f6ff2ad2177194d7098b675bb7b72deba16394add81028c1
+DIST G4PARTICLEXS.3.1.1.tar.gz 8613102 BLAKE2B ec515e090a847021d184ff63957a252f3b2329531f20b63baf64ee94550b1e97f300ba817c8830e7597fa03af46a8593f9ecb072a3e63487de4855e2ab0def28 SHA512 afc38e0815462a9ec2ee969bd730dee86922d6eb03bddee7a031fcb5cd1e474cc316a2c81b8d8f3e17659bb1a1373bf623ca33c8b03fd934d8cc178d0b3a25b4
 DIST G4PARTICLEXS.3.1.tar.gz 8598195 BLAKE2B 2c45ca634991c5def3781c3c9eb801bd5e5475d46817147d3be59d4b6abdfd7f2c4fbeeb64bb0152fa45f68b82a73f2bc590a30d4d0fb0e3651fe34e3ea87121 SHA512 a4e134e15a0a6582da56bee84ae525d1e8cf126517da9bd3dea01d5149e6b0b4dd223825e851a932899e73fab8733cb9c2e7da90e09f15fb1ae792d8a6f7c18b
 DIST G4PII.1.3.tar.gz 4293607 BLAKE2B 1ddf90c0e49ea51129b08bf6eb3cdf62f88abe19325e8aec76f156da32602c0498ddee36d1598035fa21df95f9d86b99137f9a6f49d7c9ef2b8eb6081db233b1 SHA512 dc458f5845948f54315477886d28fd51ea2d45f3675f45d42e8352cc5961705d920d200097dc9b55ad826ff426a655258b970ddd5a96867f706eb14e9ebbfd1a
 DIST G4PhotonEvaporation.5.5.tar.gz 10087354 BLAKE2B c336b015c0fe8471e899b95d66c3feb3a1b9aeac01010bd840a9d9bf88b7e91924c9f2d17e5626451be8841f5b95ddf10540e05305269a97608b339d6cd5cf78 SHA512 50c27edbcc271e5af353addc08132470df9b5efdeeece8c980d8d449adea6996109b880cd9cac0abab6e0a65e8c3f5c32ac7dc998a7760196bc862ccfc87f0bd
@@ -17,5 +18,6 @@ DIST G4RealSurface.2.2.tar.gz 132506346 BLAKE2B 8b725cdd4ed5739692e3c07627661921
 DIST G4SAIDDATA.2.0.tar.gz 38502 BLAKE2B 349608f8f8f57b091579b4892f1547c25f0c730fe8b22de3a7355f45ea08232c3ab12af64583cf4d48528b54489d0c71c724066715592766a2a51a1a6d4eb745 SHA512 cb192c10cc9805ab8d57d5f6dca595f85ac628ccac5b975b5d8ff965ed3841b9b01071ffa76469c9a03f9ca564267f5c4a300f13d8df5056b43cd71c669bd35c
 DIST G4TENDL.1.3.2.tar.gz 585100935 BLAKE2B f58bc9e4f6741d7df84559bb41542ecd4de3891b3f79d8194d3f8174de6aed6e87f8d2d648315dac988b6daf6106780b6f88398da2040e67608da8614fb2cf42 SHA512 635707dc421354d8cd596398d69745b6038a80c44b7284951a3e0966829c08ac731bd42f7321adfab75d06d868f99e466c6f1425685770568f44ec6c1035903f
 EBUILD geant-data-4.10.6.3.ebuild 1524 BLAKE2B e218d267d9420738f133f5da9a0ad510b951caf7db1da87cb4d278376aa14d51a5b8cd9c41ec176a0e69d036bc358c189a7475561b1b12eb7fe9cd10ceb22a8f SHA512 e6f0331490693059dec660ae4eac07bc92fd4ff59f04f690a3d0d78b0edd24cbcc1e8a03830b441790d253d4b932eac1e869e2725fac9ccd5a9e39bd588b668a
+EBUILD geant-data-4.10.7.1.ebuild 1525 BLAKE2B 7c7450eb55e2fa451a8a47180ff2dee4aa6b4cf251b7ff7acccd13c4f1d12d2b75a82eab404f4cde71a86d6b5f8d9406ed8d4ae28cf293e0ecd54d856fa807fd SHA512 0d1516d331f5cb31116779c843be93e46a5d77d05e7ec24f57a82a73244d94090a028de4648b27cbe4253de34cfaaabb2a70ad7191a7223c97c77e1e6d26e023
 EBUILD geant-data-4.10.7.ebuild 1523 BLAKE2B 9c6f459b64198d767a7d29dc2745bebd8acd8a558d0db42d6795de00af8ab7c3dbde2cb3a34fcf44ca740e7e48091a07fc6e3ae9fb27844a87eefc7e0330dc6f SHA512 606c2eb9e10ed4324d5e5640e00d1a5c2463dd9c6124206d11f05cf0410a4bee9a7a887213ff31e55575ccd1a77585771a84af78c651297111e6cba5a8a38244
-MISC metadata.xml 552 BLAKE2B e4704390fb18f3e4fef4a5de5feb818eb195b649203b37589ab1f2c35b8aa05e25e619034678c90a99bac8155dbd30220407190cb2c25d4006de20807ecb4fe4 SHA512 6c954effed4acc545b110c202ed645930904fd179aa2fb0ef971c7bc38cc419ddc696e06f0d080f358890171467cf311919c2fe0143acadfec9cd77bf748c55e
+MISC metadata.xml 424 BLAKE2B fefbe83e24edd2e695371c66a3037b8f8896a53ce94ecc7a9bec2f589884a15894d7bd168a0053bbc1849a2c6f520ecf9123fd3b5288addb2d27270da6ece3c8 SHA512 b4643f858ad9bf4c4ec6c8167639ceb2f5013fbd6f1db49a014c446146a7e61f59d811e10f87a6956bb84a2cb93de0fe1c0f8a72fe9e0c76eaf2fb1d4bdc9169
diff --git a/sci-physics/geant-data/geant-data-4.10.7.1.ebuild b/sci-physics/geant-data/geant-data-4.10.7.1.ebuild
new file mode 100644
index 000000000000..4924802c541f
--- /dev/null
+++ b/sci-physics/geant-data/geant-data-4.10.7.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Data files for Geant4 physical processes"
+HOMEPAGE="https://geant4.web.cern.ch"
+SRC_DATA="https://geant4-data.web.cern.ch/geant4-data/datasets"
+
+declare -A DATASETS
+
+DATASETS=(
+	[G4NDL]="G4NDL 4.6 G4NEUTRONHPDATA"
+	[G4EMLOW]="G4EMLOW 7.13 G4LEDATA"
+	[PhotonEvaporation]="G4PhotonEvaporation 5.7 G4LEVELGAMMADATA"
+	[RadioactiveDecay]="G4RadioactiveDecay 5.6 G4RADIOACTIVEDATA"
+	[G4PARTICLEXS]="G4PARTICLEXS 3.1.1 G4PARTICLEXSDATA"
+	[G4PII]="G4PII 1.3 G4PIIDATA"
+	[RealSurface]="G4RealSurface 2.2 G4REALSURFACEDATA"
+	[G4SAIDDATA]="G4SAIDDATA 2.0 G4SAIDXSDATA"
+	[G4ABLA]="G4ABLA 3.1 G4ABLADATA"
+	[G4INCL]="G4INCL 1.0 G4INCLDATA"
+	[G4ENSDFSTATE]="G4ENSDFSTATE 2.3 G4ENSDFSTATEDATA"
+	[G4TENDL]="G4TENDL 1.3.2 G4PARTICLEHPDATA"
+)
+
+for DATASET in ${!DATASETS[@]}; do
+	read FILENAME VERSION ENVVAR <<< "${DATASETS[$DATASET]}"
+	SRC_URI+="${SRC_DATA}/${FILENAME}.${VERSION}.tar.gz "
+done
+unset DATASET FILENAME VERSION ENVVAR
+
+LICENSE="geant4"
+SLOT="4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_unpack() {
+	# unpack in destination only to avoid copy
+	return
+}
+
+src_install() {
+	for DATASET in ${!DATASETS[@]}; do
+		read FILENAME VERSION ENVVAR <<< "${DATASETS[$DATASET]}"
+		echo $ENVVAR=\"${EPREFIX}/usr/share/geant4/data/${DATASET}${VERSION}\";
+	done >| 99geant-data
+	doenvd 99geant-data
+	dodir /usr/share/geant4/data
+	cd "${ED}/usr/share/geant4/data" || die
+	unpack ${A}
+}
diff --git a/sci-physics/geant-data/metadata.xml b/sci-physics/geant-data/metadata.xml
index 9d7f4b218bef..f83e916e0ee2 100644
--- a/sci-physics/geant-data/metadata.xml
+++ b/sci-physics/geant-data/metadata.xml
@@ -5,10 +5,6 @@
     <email>amadio@gentoo.org</email>
     <name>Guilherme Amadio</name>
   </maintainer>
-  <maintainer type="project">
-    <email>sci-physics@gentoo.org</email>
-    <name>Gentoo Physics Project</name>
-  </maintainer>
   <longdescription lang="en">
     For specific, optional physics processes, Geant4 uses extra data
     which are being installed with this package.
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index f7051c781a20..cf4c581d71dc 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -1,3 +1,5 @@
+DIST geant4.10.07.p01.tar.gz 36217226 BLAKE2B 3bc5868db1328ac08582fef4a5246e2f3fc1b2d34bca668d27c6c272af3de230f680cff02c3a8b53ab5abc4186645935b042b456cdff3cba01bc180e0646a50d SHA512 d314d649bf349a4fc5dd09229897d3e4ca3bfba071daeb67ab4d4bde187ec59c120b2478d2b28d1c88615189bd38097666bf4a0c25ce5cb4bc3cf0d9815bea5d
 DIST geant4.10.07.tar.gz 36422877 BLAKE2B d81a37e0968f3c13bb846efc252b1b31cb01a8642610b079bcf6ec1741e7f5da09d50f4abe4054b7a06433dc7d9b611110c4f9a1f971a5f1df27580d49b8906d SHA512 057ab2c6ee5d5ad7012bd889bf883faa3ef1fa72a93190d00d1320f250b7b52e21cbae552cbc35065ad5f5bd46cd91fd1536dd4d5e620afa0abb6b065bd7c86b
+EBUILD geant-4.10.7.1.ebuild 2959 BLAKE2B aa2df17852666ce5c94ac9b1036b96fd454f6356585ef336433998b22d1c7a01112e28a5bd8d571bcf8fc0570c36d860225e3e078630569bdbf3d7eabe45aeae SHA512 26bfc2ec3619d41bcc3e6f0c7e6418958e599ff17c79b2c1bdb27b3e7325ab1912dc93810a8f565a57039022b49428bda46e629f82e798d9bc56fff66e53d25a
 EBUILD geant-4.10.7.ebuild 2959 BLAKE2B d61150dfb0d0e2e5c3c5e2e7168b6808ce6f7acdb7fe62b2e2939bbd03b717a8c5bd7e875c85833cad97f7431d7f23e1a316495e741caa03626a22981688d395 SHA512 027ffcf842f0d4b4e439a5b9b61702d9830a6ddb7188b8af0d18801d48be16c017a94443238cf1d120ded2bd014ea0643f8254a93a874acf50e54d7afe202c2c
-MISC metadata.xml 1683 BLAKE2B a0eb481dd6e784064dce6265b9361b51c24fa845f7af7ec238a1ffef215ef16dba7c02b795d8ea50dddb255c513c1a3941761bb99f813664d3ef012377aca174 SHA512 7631f3f6fbc0a5a730fb260476c9d514b05c71c4967c5f0059523cbae99415e5e48a416a8a4b481de5c2c484484489b4260f8ceacdeca4b0ee0e670dc7293985
+MISC metadata.xml 1555 BLAKE2B 5fdad7ec54d498b37e5f693f7fefd1584e586b7ac91389de21f5b99f3c8a780d57dcca47692f6c46e85364e6d2d80be3031d910c831f2a818a12c8a8b3d3e10e SHA512 25fbb1e5791b7bf205501c1ddeee55d4e49a9554205d42abe170a13e5a718d35f4db98029f06aa8f849753095a0d5b04a283ab4dfb69e8a707ab8aa968063fc8
diff --git a/sci-physics/geant/geant-4.10.7.1.ebuild b/sci-physics/geant/geant-4.10.7.1.ebuild
new file mode 100644
index 000000000000..aeba779ff7b5
--- /dev/null
+++ b/sci-physics/geant/geant-4.10.7.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3))
+
+case ${PV} in
+*_beta*)
+	MY_P+=.b$(printf %02d $(ver_cut 5))
+	DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt"
+	;;
+*)
+	if [[ $(ver_cut 4) -gt 0 ]]; then
+		MY_P+=.p$(printf %02d $(ver_cut 4))
+		DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
+	fi
+	HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
+	;;
+esac
+
+DESCRIPTION="Toolkit for simulation of passage of particles through matter"
+HOMEPAGE="https://geant4.web.cern.ch/"
+SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
+
+LICENSE="geant4"
+SLOT="4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5
+	inventor motif opengl qt5 raytracerx static-libs threads vrml"
+
+REQUIRED_USE="
+	^^ ( c++11 c++14 c++17 )
+	inventor? ( opengl )
+	motif? ( opengl )
+	qt5? ( opengl )
+"
+
+RDEPEND="
+	dev-libs/expat
+	>=sci-physics/clhep-2.4.4.0:2=[threads?]
+	data? ( ~sci-physics/geant-data-${PV} )
+	dawn? ( media-gfx/dawn )
+	doc? ( =app-doc/geant-docs-$(ver_cut 1-3)* )
+	gdml? ( dev-libs/xerces-c )
+	hdf5? ( sci-libs/hdf5[threads?] )
+	inventor? ( media-libs/SoXt )
+	motif? ( x11-libs/motif:0 )
+	opengl? ( virtual/opengl )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raytracerx? (
+		x11-libs/libX11
+		x11-libs/libXmu
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
+		-DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
+		-DGEANT4_BUILD_MULTITHREADED=$(usex threads)
+		-DGEANT4_BUILD_STORE_TRAJECTORY=OFF
+		-DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec)
+		-DGEANT4_BUILD_VERBOSE_CODE=OFF
+		-DGEANT4_INSTALL_DATA=OFF
+		-DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
+		-DGEANT4_INSTALL_EXAMPLES=$(usex examples)
+		-DGEANT4_INSTALL_PACKAGE_CACHE=OFF
+		-DGEANT4_USE_FREETYPE=$(usex freetype)
+		-DGEANT4_USE_G3TOG4=$(usex geant3)
+		-DGEANT4_USE_GDML=$(usex gdml)
+		-DGEANT4_USE_HDF5=$(usex hdf5)
+		-DGEANT4_USE_INVENTOR=$(usex inventor)
+		-DGEANT4_USE_NETWORKDAWN=$(usex dawn)
+		-DGEANT4_USE_NETWORKVRML=$(usex vrml)
+		-DGEANT4_USE_OPENGL_X11=$(usex opengl)
+		-DGEANT4_USE_QT=$(usex qt5)
+		-DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
+		-DGEANT4_USE_SYSTEM_CLHEP=ON
+		-DGEANT4_USE_SYSTEM_EXPAT=ON
+		-DGEANT4_USE_SYSTEM_ZLIB=ON
+		-DGEANT4_USE_XM=$(usex motif)
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		${EXTRA_ECONF}
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	# adjust clhep linking flags for system clhep
+	# binmake.gmk is only useful for legacy build systems
+	sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
+	cmake_src_install
+	rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
+
+	einstalldocs
+}
diff --git a/sci-physics/geant/metadata.xml b/sci-physics/geant/metadata.xml
index e89993be5a39..b6e9a45b0397 100644
--- a/sci-physics/geant/metadata.xml
+++ b/sci-physics/geant/metadata.xml
@@ -5,10 +5,6 @@
     <email>amadio@gentoo.org</email>
     <name>Guilherme Amadio</name>
   </maintainer>
-  <maintainer type="project">
-    <email>sci-physics@gentoo.org</email>
-    <name>Gentoo Physics Project</name>
-  </maintainer>
   <longdescription lang="en">
   Geant simulates the passage of subatomic particles through matter, for
   instance, particle detectors. Geant 3 simulations are performed by
diff --git a/sci-physics/lhapdf/Manifest b/sci-physics/lhapdf/Manifest
index 14dfaf043a93..51c3ae2391c6 100644
--- a/sci-physics/lhapdf/Manifest
+++ b/sci-physics/lhapdf/Manifest
@@ -1,5 +1,5 @@
 DIST LHAPDF-6.2.3.tar.gz 750659 BLAKE2B a16f67c69f41e96cdb5434cc53658c6b085b94c9ad06443fdfb49aa1de50eeb2a59aa41442a032c29b361bad4f749cef42499f3d16f2774efb0b399f889576e4 SHA512 167064a141f46e5c834d950690a989330b940acec62377b8b4c40e14665503cf7b4ddb79e05c71ebe1f801231192d951e294bec3944ec37b2bca484b2e5ce894
 DIST LHAPDF-6.3.0.tar.gz 770744 BLAKE2B 02b9fe3507b87c6f0c635ceb203304eb9b3ee8ac4d17c8b83578f8c05b78b17035b63b6d3d9a0b9fe3505a3daf8e9376fe25040b8826ea4976d2a717b1447eb9 SHA512 4a5aca6e2f06b59a44acc23ef76f1fae747f38e425803e7625cc68130da0c76d1e0d534b7b1867f09c86ee838d4f769d5097257170740db704c966d91c41f94b
 EBUILD lhapdf-6.2.3.ebuild 1631 BLAKE2B b986649bf0ddcb1935c27e41acc9c75f72495a712a91f4777c2d93da8c2389a7d6f969bc98dcdd07415e61133927733f749972b835ae3fb63a81360af23e36e5 SHA512 7b80b0a71f21bb3dc4cb9b5a36de573e5ed58dac0b55ee82d272912c78ea2dbc467cf625c4b805de268b1d9571368f505d91332c4bee2f159a7a8e63bd3c82f3
-EBUILD lhapdf-6.3.0.ebuild 1632 BLAKE2B ea77cd0a47e8bc892cea35cef98010683c0fd0febcb6b73e33264d45f449300bc38ae1d1a0bfd57a5e2ecf786bea4462bb42797f0cfbd3e57fc86aeb4e561943 SHA512 4db027732302448a0b87f70482306642ef381ef2aa58c74586f763096875f56d2035b9fa1af0c44b5a019ffed6bf4ef23377acac7dc843a79995b80aa6989343
+EBUILD lhapdf-6.3.0.ebuild 1631 BLAKE2B 3b0f5fdc06e578219750f5d87ad06fa16c43f00397e78b7a0dcc8360a742389f4f40b3df6f70285bb30b9aeadc85c5e4724c6adbca4ef6d5b2e7b358a4858560 SHA512 0643569f589b753aa2e4cd12edf58b57b751c57020486413593ccb5612305d7ffab0d7274a4a152133200684db265cbb23913367a2e34bad1ac1b1b3f17ac841
 MISC metadata.xml 996 BLAKE2B 97df1e778a0e4fdd20faeffcc992c5c76d203c35f9916a15c823bd10d8914cea7b2b6c7b58cca1e6af50ff4a134db8c5cf40db345520cd6f4d16a58d02fda822 SHA512 0c5f089f8428dfbf3e6151f2d9052409dbf7dc64af40fe28664df3e6ba014c8ec4c3e6ae2958c0f0b13ee7edc59f038dab14272622119cc5cb5d6f7fc43637cc
diff --git a/sci-physics/lhapdf/lhapdf-6.3.0.ebuild b/sci-physics/lhapdf/lhapdf-6.3.0.ebuild
index f28072c4f40d..6c93048a666b 100644
--- a/sci-physics/lhapdf/lhapdf-6.3.0.ebuild
+++ b/sci-physics/lhapdf/lhapdf-6.3.0.ebuild
@@ -66,7 +66,7 @@ src_install() {
 	use examples && doins examples/*.cc
 
 	if use python; then
-		cd "${S}"/wrappers/python || die 
+		cd "${S}"/wrappers/python || die
 		distutils-r1_src_install
 	fi
 
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index fc83f9cb46ed..9316c3fb9832 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,7 +1,5 @@
 AUX root-6.12.06_cling-runtime-sysroot.patch 989 BLAKE2B 8202cc8f2bf72cc25642d0a03ba26c3969069b291a6a22188879dbedbf0c3c496149f79f671d0eb51d81d0ee36565660d136b4741f5d018c2b05325ff08381f0 SHA512 c96dee9843da1051c54bd6870ef0a04714944ffe1f86800c9a51b8eb8ef84107d3315d3a708dcc0b651248af4bec362c7f31695514505045aeda9c793d40dc58
-DIST root_v6.20.08.source.tar.gz 168218062 BLAKE2B 79b1eb89f1003c140a60d47e9d447576ad215e66321a265ed047b069d05f008cf8f0d23df99ed35a8ee5a802e5de5a42122e8f1c075b01ef74eb11926a1b31d7 SHA512 205d5ae94a6c1b6e1a479a8631d5a9bab4a9f76c396cf3ed2c23a26c767a5a892a087b872a69853ada0f84e60a6015f732342c5f48acc696cb626528748f81fe
 DIST root_v6.22.06.source.tar.gz 173073959 BLAKE2B 3db5e5ff73509a87d00aaba5a394c96aaddebac210ce692d10b9174f0bdff5dc5862c25c9ff66e481b9fda96684cfca45ab49824166404f59ad76edb3fbdddde SHA512 39b330f0cd594f06e30e33dd4b0fc86cfd076b006e5287ff61e577deaf76e63f2e5780b72f53c0770b7d2e28e6f61133ff54b5d905ec2ad845c8f00b10be6fb7
-EBUILD root-6.20.08.ebuild 7562 BLAKE2B ef8e9a781cf8a46a90d97eeeb866d2d5e1467cef3b747c81e52be15d13794445228e9ec57d5e5702f79998276d599d2f9f5e82b492f12ec0126fe4c52947c9d5 SHA512 a52fc4c820b1763003ef7208e0ac52837f50a2cedcd65b2ad7f80458d6ac5ece961fa783eedc444045496b0d30b381d84edb1b1a399dbc576d73e6b4971f11c4
 EBUILD root-6.22.06.ebuild 7525 BLAKE2B ee3341e24f9970c9fbe2358b2859148ccac84cb67fa96b56e21741f10d43bb26cff200437509ef9d7a084594d0b22b0d0866441a31352f10600d77772cfb5e87 SHA512 4d5f483eb06144a1a52b905e8012abc2563db862c7b6fa78d6ea8c329749e179985d676226214a165f94a72e2533ac6bc776bd980157c7430a80ab4f0df7fb0a
 EBUILD root-9999.ebuild 7994 BLAKE2B c5cc6646627394518614ecc5b6c399fec63c89e69dc8e9cf8335b06be47bbb034806509580e9e57081e05da02523fe04932ff29d39754c709e954ef748fc589b SHA512 6b7cbbbe2395c8ff32ff0003d4b7d26d9e30bec26a1d5affe6ecb17e14c77ec427d923c469d733d2f41d302d6387ab3e8c777cc1b141e8efb3608857d0b2c66f
 MISC metadata.xml 3060 BLAKE2B a08c5d2c54daba2c05984d23d1a912929ab94e40e0b72b17a804b442f7c5b2a2a1039485d529d14953c25261c7a8179d67c6790dab733cc7cee6c1ce0fb0d509 SHA512 6ca7f1940a92053a2c12412882a6b4e478758af94fae422e1ace6cc55cc25dea8117cb042f034a98db6993afba3726d4f4d9d983513ada940c14bc9d988abc26
diff --git a/sci-physics/root/root-6.20.08.ebuild b/sci-physics/root/root-6.20.08.ebuild
deleted file mode 100644
index 49cc6a7cf6d6..000000000000
--- a/sci-physics/root/root-6.20.08.ebuild
+++ /dev/null
@@ -1,306 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ninja does not work due to fortran
-CMAKE_MAKEFILE_GENERATOR=emake
-FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit cmake cuda elisp-common fortran-2 prefix python-single-r1 toolchain-funcs
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="https://root.cern"
-SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz"
-
-IUSE="+X aqua +asimage +c++11 c++14 c++17 cuda cudnn +davix debug emacs
-	+examples fits fftw fortran +gdml graphviz +gsl http libcxx +minuit
-	mpi mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python
-	qt5 R +roofit root7 shadow sqlite +ssl +tbb test +tmva +unuran vc
-	vmc +xml xrootd"
-RESTRICT="!test? ( test )"
-
-SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
-LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="
-	^^ ( c++11 c++14 c++17 )
-	cuda? ( tmva )
-	cudnn? ( cuda )
-	!X? ( !asimage !opengl !qt5 )
-	davix? ( ssl xml )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	qt5? ( root7 )
-	root7? ( || ( c++14 c++17 ) )
-	tmva? ( gsl )
-"
-
-CDEPEND="
-	app-arch/lz4
-	app-arch/zstd
-	app-arch/xz-utils
-	fortran? ( dev-lang/cfortran )
-	dev-libs/libpcre:3
-	dev-libs/xxhash
-	media-fonts/dejavu
-	media-libs/freetype:2
-	media-libs/libpng:0=
-	sys-libs/ncurses:=
-	sys-libs/zlib
-	X? (
-		x11-libs/libX11:0
-		x11-libs/libXext:0
-		x11-libs/libXft:0
-		x11-libs/libXpm:0
-		opengl? (
-			media-libs/ftgl:0=
-			media-libs/glew:0=
-			virtual/opengl
-			virtual/glu
-			x11-libs/gl2ps:0=
-		)
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwebengine:5[widgets]
-		)
-	)
-	asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
-	cudnn? ( dev-libs/cudnn )
-	davix? ( net-libs/davix )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	fftw? ( sci-libs/fftw:3.0= )
-	fits? ( sci-libs/cfitsio:0= )
-	graphviz? ( media-gfx/graphviz )
-	gsl? ( sci-libs/gsl:= )
-	http? ( dev-libs/fcgi:0= )
-	libcxx? ( sys-libs/libcxx )
-	unuran? ( sci-mathematics/unuran:0= )
-	minuit? ( !sci-libs/minuit )
-	mpi? ( virtual/mpi )
-	mysql? ( dev-db/mysql-connector-c )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql:= )
-	pythia6? ( sci-physics/pythia:6 )
-	pythia8? ( sci-physics/pythia:8 )
-	python? ( ${PYTHON_DEPS} )
-	R? ( dev-lang/R )
-	shadow? ( sys-apps/shadow )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl:0= )
-	tbb? ( >=dev-cpp/tbb-2018 )
-	tmva? (
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	vc? ( dev-libs/vc:= )
-	xml? ( dev-libs/libxml2:2= )
-	xrootd? ( <net-libs/xrootd-5:0= )
-"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch
-)
-
-pkg_setup() {
-	use fortran && fortran-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-
-	elog "There are extra options on packages not available in Gentoo."
-	elog "You can use the environment variable EXTRA_ECONF to enable"
-	elog "these packages. For example, for Vdt you would set:"
-	elog "EXTRA_ECONF=\"-Dbuiltin_vdt=ON -Dvdt=ON\""
-}
-
-src_prepare() {
-	use cuda && cuda_src_prepare
-
-	cmake_src_prepare
-
-	sed -i "/CLING_BUILD_PLUGINS/d" interpreter/CMakeLists.txt || die
-
-	# CSS should use local images
-	sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
-
-	eapply_user
-}
-
-# Note: ROOT uses bundled clang because it is patched and API-incompatible
-#       with vanilla clang. The patches enable the C++ interpreter to work.
-#       Since ROOT installs many files into /etc (>100MB in total) that don't
-#       really belong there, we install it into another directory to avoid
-#       making /etc too big.
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_COMPILER=$(tc-getCC)
-		-DCMAKE_CXX_COMPILER=$(tc-getCXX)
-		-DCMAKE_CUDA_HOST_COMPILER=$(tc-getCXX)
-		-DCMAKE_C_FLAGS="${CFLAGS}"
-		-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_LIBDIR="lib"
-		-DDEFAULT_SYSROOT="${EPREFIX}"
-		-DCLING_BUILD_PLUGINS=OFF
-		-Dexceptions=ON
-		-Dfail-on-missing=ON
-		-Dgnuinstall=OFF
-		-Dshared=ON
-		-Dsoversion=ON
-		-Dbuiltin_llvm=ON
-		-Dbuiltin_clang=ON
-		-Dbuiltin_afterimage=OFF
-		-Dbuiltin_cfitsio=OFF
-		-Dbuiltin_davix=OFF
-		-Dbuiltin_fftw3=OFF
-		-Dbuiltin_freetype=OFF
-		-Dbuiltin_ftgl=OFF
-		-Dbuiltin_gl2ps=OFF
-		-Dbuiltin_glew=OFF
-		-Dbuiltin_gsl=OFF
-		-Dbuiltin_lz4=OFF
-		-Dbuiltin_lzma=OFF
-		-Dbuiltin_openssl=OFF
-		-Dbuiltin_pcre=OFF
-		-Dbuiltin_tbb=OFF
-		-Dbuiltin_unuran=OFF
-		-Dbuiltin_vc=OFF
-		-Dbuiltin_vdt=OFF
-		-Dbuiltin_veccore=OFF
-		-Dbuiltin_xrootd=OFF
-		-Dbuiltin_xxhash=OFF
-		-Dbuiltin_zlib=OFF
-		-Dbuiltin_zstd=OFF
-		-Dalien=OFF
-		-Darrow=OFF
-		-Dasimage=$(usex asimage)
-		-Dccache=OFF # use ccache via portage
-		-Dcefweb=OFF
-		-Dclad=OFF
-		-Dcocoa=$(usex aqua)
-		-Dcuda=$(usex cuda)
-		-Dcudnn=$(usex cudnn)
-		-Dcxxmodules=OFF # requires clang, unstable
-		-Ddataframe=ON
-		-Ddavix=$(usex davix)
-		-Ddcache=OFF
-		-Dfcgi=$(usex http)
-		-Dfftw3=$(usex fftw)
-		-Dfitsio=$(usex fits)
-		-Dfortran=$(usex fortran)
-		-Dgdml=$(usex gdml)
-		-Dgfal=OFF
-		-Dgminimal=OFF
-		-Dgsl_shared=$(usex gsl)
-		-Dgviz=$(usex graphviz)
-		-Dhttp=$(usex http)
-		-Dimt=$(usex tbb)
-		-Dlibcxx=$(usex libcxx)
-		-Dmathmore=$(usex gsl)
-		-Dmemstat=OFF # deprecated
-		-Dminimal=OFF
-		-Dminuit2=$(usex minuit)
-		-Dminuit=$(usex minuit)
-		-Dmlp=$(usex tmva)
-		-Dmonalisa=OFF
-		-Dmpi=$(usex mpi)
-		-Dmysql=$(usex mysql)
-		-Dodbc=$(usex odbc)
-		-Dopengl=$(usex opengl)
-		-Doracle=$(usex oracle)
-		-Dpgsql=$(usex postgres)
-		-Dpyroot=$(usex python) # python was renamed to pyroot
-		-Dpyroot_experimental=OFF # use standard PyROOT for now
-		-Dpythia6=$(usex pythia6)
-		-Dpythia8=$(usex pythia8)
-		-Dqt5web=$(usex qt5)
-		-Dr=$(usex R)
-		-Droofit=$(usex roofit)
-		-Droot7=$(usex root7)
-		-Drootbench=OFF
-		-Droottest=OFF
-		-Drpath=OFF
-		-Druntime_cxxmodules=OFF
-		-Dshadowpw=$(usex shadow)
-		-Dspectrum=ON
-		-Dsqlite=$(usex sqlite)
-		-Dssl=$(usex ssl)
-		-Dtcmalloc=OFF
-		-Dtesting=$(usex test)
-		-Dtmva=$(usex tmva)
-		-Dtmva-cpu=$(usex tmva)
-		-Dtmva-gpu=$(usex cuda)
-		-Dtmva-pymva=$(usex tmva)
-		-Dtmva-rmva=$(usex R)
-		-Dunuran=$(usex unuran)
-		-Dvc=$(usex vc)
-		-Dvdt=OFF
-		-Dveccore=OFF
-		-Dvecgeom=OFF
-		-Dvmc=$(usex vmc)
-		-Dx11=$(usex X)
-		-Dxml=$(usex xml)
-		-Dxrootd=$(usex xrootd)
-		${EXTRA_ECONF}
-	)
-
-	CMAKE_BUILD_TYPE=$(usex debug Debug Release) \
-	cmake_src_configure
-}
-
-src_compile() {
-	# needed for hsimple.root
-	addwrite /dev/random
-	cmake_src_compile
-}
-
-src_install() {
-	cmake_src_install
-
-	ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)
-	ROOTENV="$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)"
-
-	cat > ${ROOTENV} <<- EOF || die
-	MANPATH="${ROOTSYS}/share/man"
-	PATH="${ROOTSYS}/bin"
-	ROOTPATH="${ROOTSYS}/bin"
-	LDPATH="${ROOTSYS}/lib"
-	EOF
-
-	if use python; then
-		echo "PYTHONPATH=\"${ROOTSYS}/lib\"" >> ${ROOTENV} || die
-	fi
-
-	doenvd ${ROOTENV}
-
-	if use emacs; then
-		elisp-install ${PN}-$(ver_cut 1-2) "${BUILD_DIR}"/root-help.el
-	fi
-
-	pushd "${D}/${ROOTSYS}" > /dev/null
-
-	rm -r emacs bin/*.{csh,sh,fish} || die
-
-	if ! use examples; then
-		rm -r tutorials || die
-	fi
-
-	# create versioned symlinks for binaries
-	cd bin;
-	for exe in *; do
-		dosym "${exe}" "/usr/lib/${PN}/$(ver_cut 1-2)/bin/${exe}-$(ver_cut 1-2)"
-	done
-}