gentoo resync : 15.06.2021

22 files changed, 259 insertions, 239 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 0e21ebc82370..251227cb7887 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/bullet/Manifest b/sci-physics/bullet/Manifest
index 85527b3d1f0a..ffb2fc29d972 100644
--- a/sci-physics/bullet/Manifest
+++ b/sci-physics/bullet/Manifest
@@ -1,6 +1,8 @@
 AUX bullet-2.85-soversion.patch 1094 BLAKE2B 8dc035b80d812b3c2382067796f1626a932ce887246b34a8b5e08fddf45d330078a970eb6c2147259285a45974b8aaa26a2494ad4aa4824d89bf58aa7af3ac37 SHA512 f437d553c51c6cc6646a4a3bf0ffe02e2691a3b2109ea560c986f69c602055c409028a5a3711597aca757d3e3b33cab14d60e03fc120f0975f35c6e16be6362d
 DIST bullet-3.07.tar.gz 148413637 BLAKE2B 776cd7651d11d865095ea000d353860bea09c6ff4ec8dd8e43282a78373e2830f6ce1ce2b87ed25a67be7bded297b3a6320b2872a71dfd3849e7b197c6d2c936 SHA512 31fc7cb4ed8b939abc9eeb0a8f6fff3a454ea4ebcffd797fd35a2320fe3ab222fcd315569809ea148d0efff47267f5eec9f4bf7aaf07730a06aa9babd2abc9a6
 DIST bullet-3.08.tar.gz 129282084 BLAKE2B daa5b6719575af28c6f6359ef51c7a9b8ca9cde2e5b4ea1b00c2991fc4d6b13175d034c7a694eaf36e8ff3ab343457027f57bb511639b3701341ad4551f1a6ca SHA512 4177c2b2f3b007691102973e7a3d4337b8de559d20058db75a2d25eab35b9be62fa14e3362435ef6f7ea2f6b8cf02a78770cc49c17e979adf3a2b41f19ee702a
+DIST bullet-3.17.tar.gz 131995187 BLAKE2B 38996c299eb900f867367966c90c7511d4f5c727671249665a073f86390a4514f7c8193577fd73502b49d467eaeb6e7b195426089065ce3bda3238ee76e237b3 SHA512 a5105bf5f1dd365a64a350755c7d2c97942f74897a18dcdb3651e6732fd55cc1030a096f5808cf50575281f05e3ac09aa50a48d271a47b94cd61f5167a72b7cc
 EBUILD bullet-3.07.ebuild 1929 BLAKE2B c0a1c9c8c2f92c7e7493164eca8f4d27d83944eff2bd5dbffe6705b6c6bd69705b275eff2074de76ac6747702e792e6ff1110247d9fb18b4713efc8d07a7b2a4 SHA512 df6585dc25557f961177d89b340eed84c28a23e2bb8174540ad833e06bf1ec735e3135535348c79323eb2fafa504643eea9a8d386b56ede968344092321c7408
 EBUILD bullet-3.08.ebuild 1931 BLAKE2B 975648f912744474bf610c45ab06f786698b677a0633c7b71dfd514e7b0ec8f138048e13a04aa04c0aa0cfa1d21cccd020255aba23aa5b1dfcacb90be5f31b0b SHA512 3176b2563d9ee11de1d75ad0d51427d761df548699f98772c6337440ba3593a0e83fb19428acb9cf55a6160dd2de8491910bb9db04901698775bec24c93dcfa1
-MISC metadata.xml 1149 BLAKE2B bb8b9b5036dcb4375898afd34e5d6f65fcb82ee89f658f0e9b33e651499d06841cb663134ff17bcdba95e407499f80fc90146b26aea925a0817e413e5d294df6 SHA512 fbe4aec8e02a532751bc5283c5c7efbb795cffbe5edd2b65e3d8b564c049181534ddf197833f27f92947e99f13889c18f95ed307d9e8aaf569a47f65aa47e7a7
+EBUILD bullet-3.17.ebuild 2033 BLAKE2B 3c761d9108ca17304d3da731a27be50545f5325573499fa3199fddb02809eec91f3f04d45ee5ff435baf6c9b22e641a98464816e30f914c1d796f71633602395 SHA512 aa2001729bdf57df2d99627d6ae1a78431d6a8099ba10004f54fe456686f6f74f669fb4b7745b4867bfaaad150b597eb7b4e4e6561074e640545e97ff2cb579b
+MISC metadata.xml 1161 BLAKE2B 5e308d9e4bcd802e4dae22eaf07ed2fe622769e31da919929fdc483c55624a4bf856c2ceba66a4c5e107dae4030ab8a831ce687ad393f6fef569bcb6aa16e140 SHA512 7531dfb626d9a18e61a7ef538a4440ad38b43794d37325d4d1bab9422f7d14f3c4599453d418262b8ce27d7a7a51a8c1f3b82b40a9f3ffc348987b6e9b9fc94e
diff --git a/sci-physics/bullet/bullet-3.17.ebuild b/sci-physics/bullet/bullet-3.17.ebuild
new file mode 100644
index 000000000000..4e1e291757d7
--- /dev/null
+++ b/sci-physics/bullet/bullet-3.17.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 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="https://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 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="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 )
+
+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
+		-DBUILD_BULLET3=ON
+		-DBUILD_BULLET_ROBOTICS_GUI_EXTRA=OFF	# This module depends on example libraries
+		-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/*/linux*/libopenvr_api.so || die
+		DOCS+=( examples )
+	fi
+}
diff --git a/sci-physics/bullet/metadata.xml b/sci-physics/bullet/metadata.xml
index e05652c8f5a3..24b481850009 100644
--- a/sci-physics/bullet/metadata.xml
+++ b/sci-physics/bullet/metadata.xml
@@ -19,8 +19,9 @@
   for games and animation.
 </longdescription>
   <use>
-    <flag restrict="&lt;=sci-physics/bullet-2.89" name="double-precision">Build libraries in double precision</flag>
-    <flag restrict="=sci-physics/bullet-2.89" name="tbb">Enable multithreading with the Intel Threads Building Block dev-cpp/tbb</flag>
+    <flag restrict="&lt;=sci-physics/bullet-3.17" name="extras">Build the extras</flag>
+    <flag name="double-precision">Build libraries in double precision</flag>
+    <flag 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/clhep/Manifest b/sci-physics/clhep/Manifest
index 530955554c96..cceeb57dc08a 100644
--- a/sci-physics/clhep/Manifest
+++ b/sci-physics/clhep/Manifest
@@ -2,6 +2,6 @@ AUX clhep-fix-testThreaded.patch 3044 BLAKE2B 7465888366bcb5d8dcec5dcbe9b81ec2e8
 AUX clhep-modulemap.patch 883 BLAKE2B 174bd4827da32982b77052ab09f36d84e3035c7a0916add4fc8aebde819468c36e7f2e6236fdf1109d2a7fab3349c3e6deb17302c8593e9a3666afc7648ce33e SHA512 d616d25c187baeb19f46419698e92760e762454f85f50248f93aecb02b059ec2bee336e160f0f9519a0e4920a89fb54511272699bea8731cb0f8d073ebaa382a
 DIST clhep-2.4.1.3.tgz 1537908 BLAKE2B 92fd1fcc415b01d8efa44be67c3bf9e58af2b4d18b6e7ee2161fbc20312428a6f17eacc09150ccff7fefb1686161518042f5c2f7558ff00b4d5696d002432ece SHA512 f7a52b353dc2c6d30cb7d307af71a028838ec674af2a50fe0199335d0b0f7fb4b84489ccfd12f21ecb7b1327acbc87065e7e87363308fd0caad5748a657aac13
 DIST clhep-2.4.4.0.tgz 1541722 BLAKE2B 077048ea3ce94de88f08a1ae51ab9af892385d6747ed9f875e13b5aacc725e85f723031d42f526ca53050c07dad621053008c71d0f255f32893724f3e8189e52 SHA512 3ae88c8f31877c6e2cac7f7612946e9989186876c66015e6bfeab19260814c8a8bfb21fa28dd251cd2c43e4e3f63f336249c430c984f84810441603e949ecb5d
-EBUILD clhep-2.4.1.3-r2.ebuild 1271 BLAKE2B d070515ebe0baa80f4e9c4d190b937d325edf7cc48dcdc8cf3c2accad7b4e179ed49a92cc31903fe4e210242bb3570b3e853f96eeccb4f78cec80e2ab80e7a7b SHA512 834fd313a28ebd154edf8a75e091a32971370f7ad3e4edc1a04872802701d87d5ee4224754740870607da8f53ff6943ffedba380ad173a613c555e4043c19481
-EBUILD clhep-2.4.4.0.ebuild 1311 BLAKE2B 4586f30adbfcf26f05b29d69db5b0001100d6a94b4a2c935311819b153f4d3daa37487d0e167447bb26227bac5629a3d35d7d98d69884e45d54e776e34789ef8 SHA512 506a79ed3e549a857e037f60fbe4b2e8ab5e4364f642e1c736c3882fafb4108f2d7c30f92d3f597662a563e5e1b9dc2d3b5063b12549e5308cfe020aaf994651
+EBUILD clhep-2.4.1.3-r2.ebuild 1255 BLAKE2B 3a0fa1d273defe2175fbb959b86b0ad9412c249a99eab148305c80e6385c7120166ef9e1d3e62f0f92626ec1127ac74da05e2904d57fdc8499457b18152ac113 SHA512 2dd80b6afd922e83f4cdaf3813aded58347d91e50e21480d727cb0d6e22b271357ae18d083a85a9a80b2f413bf6056a3045853e928bbdd95aa93475b97a4392a
+EBUILD clhep-2.4.4.0.ebuild 1293 BLAKE2B bd9ecf7d692afd6dde230d5dc93f5eeecfd987c6c1f5f5dfa049d577ef6d694618f77d4b2b7f0c439142bb2443ffbeae1b1a8894e3dd4785d903d4fe5590c985 SHA512 d19bca83b3567dc009482c819d27930f2fc66e3ec776e79c10f6a136bd0242c6b08922d99b5632ddeaa5446677fbf1e62fff1a13485085a28e63af518362deb1
 MISC metadata.xml 496 BLAKE2B 60254470fbb21294249dd75b34aebb0d29d090aba3a41f75e02950ccd77fe1ca0043eec460844f2de4b2a9b4bd4e34f2faa6c00b81daf8e615b78d92f503ade3 SHA512 768aeefc23a2ea89eb63b0eb6fd084c253243b6d67b822702dffc8f49a7170d30e55ebc08875ff238e618639882f93fe6e1390e3d8456f3850d75d5a98bf3b96
diff --git a/sci-physics/clhep/clhep-2.4.1.3-r2.ebuild b/sci-physics/clhep/clhep-2.4.1.3-r2.ebuild
index d2ec26241032..ea1591ede033 100644
--- a/sci-physics/clhep/clhep-2.4.1.3-r2.ebuild
+++ b/sci-physics/clhep/clhep-2.4.1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -53,5 +53,5 @@ src_configure() {
 		-DCLHEP_BUILD_DOCS=$(usex doc)
 		-DCLHEP_SINGLE_THREAD=$(usex threads no yes)
 	)
-	DESTDIR="${ED}" cmake_src_configure
+	cmake_src_configure
 }
diff --git a/sci-physics/clhep/clhep-2.4.4.0.ebuild b/sci-physics/clhep/clhep-2.4.4.0.ebuild
index 1938b34ce53a..770db67ea689 100644
--- a/sci-physics/clhep/clhep-2.4.4.0.ebuild
+++ b/sci-physics/clhep/clhep-2.4.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="http://proj-clhep.web.cern.ch/proj-clhep/"
 SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/dist1/${P}.tgz"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 IUSE="doc test threads"
 RESTRICT="!test? ( test )"
@@ -56,5 +56,5 @@ src_configure() {
 		-DCLHEP_BUILD_DOCS=$(usex doc)
 		-DCLHEP_SINGLE_THREAD=$(usex threads no yes)
 	)
-	DESTDIR="${ED}" cmake_src_configure
+	cmake_src_configure
 }
diff --git a/sci-physics/geant-data/Manifest b/sci-physics/geant-data/Manifest
index 642e860c04ae..7930ffd63db4 100644
--- a/sci-physics/geant-data/Manifest
+++ b/sci-physics/geant-data/Manifest
@@ -1,23 +1,16 @@
 DIST G4ABLA.3.1.tar.gz 107286 BLAKE2B ff60665b01dcdb85a76028af472e6f71068b8132187701c46e5c4e8509125d34853d3c574561be22f34cc5f35503ec0808f2964888cd19259392de8054f19647 SHA512 4178870783ca015dade0b07006afc27fed095ff195251c672a0812f9c8e13908b5dfa9a127e8f3ec473f242bf7faf6d49a3371a75e669a06245722924b7c4278
 DIST G4EMLOW.7.13.tar.gz 298636910 BLAKE2B ee9c83410183a6fef3a2d44e866818a765f85aecb637879a6f96b2958e0c3675acb0a2891b6dd07c81fffabcb95dcc541f23f076b4aa1cbb2131e72b2b869b93 SHA512 8789ee0cae6d62c6e6af5f8c5f49706f37230df609cad375bef9568d13d5cd62fa1bded616385fd4790d047bb305090ba08957980fe7881d169a2a0e31693879
-DIST G4EMLOW.7.9.1.tar.gz 119756769 BLAKE2B 67be0b7ac34beb995ad4132883927fb99a78f93e7c99390c93fe897b4208a94a3ea5faaab1d04def5c248151c82d46431b411cb22303ffe941c6fe8a57d30423 SHA512 7f52ad5a3935323b60e5ea5196a64a2209337ca3d208109bceb648b95a5a3b0aa33f9a46f878884cb398e49302733c6f5b6316254261d350d038af8ec412952f
-DIST G4ENSDFSTATE.2.2.tar.gz 290632 BLAKE2B aff44d0b6512e4a227fa61a33045023652699843f80d1e90e236d491afd90be828a7bb393a4bb5b224b296d6e3f899a11027340b9e1ebffe705d08708af283fa SHA512 4feaa4229ac520d0e81ab0e31691ee899fa1f10b1a57f66b986fbe19729f7548000b8bac3519d09e91a1f7e116aa7a5bfeae5a3f5b6c3364168b51f4b5bb88c3
 DIST G4ENSDFSTATE.2.3.tar.gz 290745 BLAKE2B 89c642a43ebcb979b233cfb1af1bde9b2f4fd5a5ff2f282f8975aae9514c3579d67e66b1b3559e75a633b13d272c0f54fc41aef415463583a6920fc6e3f66b78 SHA512 0f92d1871f532a979829406a150e263ac13141e594acca6728edd1dbe0a181c03d0be23f7cbb6a6e73550dc71bf1337edb799c9845dff6df991b44ea8cb8ceec
 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
 DIST G4PhotonEvaporation.5.7.tar.gz 10089240 BLAKE2B 5a82697f3f5f94e98ab7f6fbc033cab251d0f18d885fe3f124a0a1f8dd73ff8bf12db45ec748bc1baf24945407fdedadc0e10b237ceb587852e8fa6340dd7ac2 SHA512 5a03921c5974f329637ce74f03cad444b989c3affa22bf40b68103a6a668ac6425e85da3d0b72ce3d81c2e4360e7202cd26cbb9e20ccc355f2243cd92031496f
-DIST G4RadioactiveDecay.5.4.tar.gz 1059968 BLAKE2B 5093ca0c7e529c1f1ddb732f6d2ddb24b7533d266a325601271a73fff23fe05b57a591a5ca229e1c479c5d85dfe3a40aa00869231976e9ecf2976679030a8027 SHA512 2462c8f1503a4dde96c62d9644155a5c7de4430251c06f76b8e3dd35df98d96e34687c77cc11a9be198b918ad64585a10a81a0fef4ff26d63f0737b5b1254f17
 DIST G4RadioactiveDecay.5.6.tar.gz 1059792 BLAKE2B 610761030c01445ecd3159df0193814f96fc011e677bc9306788c93cd3089f2623aab96c1ad94edf22b0e9aed701288de465c898e3dce59540e2619947ea8f75 SHA512 825b04f79097c39aac7152484e322f87e69046ee5a8bb25b6e2d337026ae0eb0f77faed83e870816571c42c83120eda085dbbf2bd2f891f2b2932fad9078334d
-DIST G4RealSurface.2.1.1.tar.gz 133386050 BLAKE2B 68fb3ebadabe0c04a34279c9ff3a15545cfcf05ea18324d0fa776f4616feaeea2cd26af61d0078204c95c819d247963b416326433fda1e96a2918f23d4b2ff02 SHA512 f7755b41e30f8728710cf878d8783df9ac07d5394d0cf3358d9f4f6f4f73b9563c22657bdd9cf4ee7bebb9823fa530d86a64d2e0acbca77a80a411786c6b7202
 DIST G4RealSurface.2.2.tar.gz 132506346 BLAKE2B 8b725cdd4ed5739692e3c07627661921e8d7e08bd448cb70f1d9cdd7ca8e2e090f4c65ac3b4fc3fbceb96cca22bef3ac9000075df490b3ac520b515a40b2cf6e SHA512 360fc0cd829f9daa21300b4df8da294982d13659a9fe77cbdf1f5c411eace0153d8202c658525d4b82b7925524baf8e138a51ae71bdbd1f91f674fc80958ffed
 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
+EBUILD geant-data-4.10.7.1.ebuild 1523 BLAKE2B 1191449beb2f1ca99c936808e6e1e71ff33b5d08f23b813cbe998375134900c7d8aa252c1a5c144ed168856082078ee57e942fe84cf6042ffad21385726a6db6 SHA512 1cb9a0005d2c036134711bd16f33f4e2080ca7701c6be0924caabefaa1875f93575b5fe629cc85c3780273487b29a5529a463918cc6fa0be23a41518ad6db009
+EBUILD geant-data-4.10.7.ebuild 1521 BLAKE2B 6ac2749e5a4ffba48c69576e03199dced1c3f7ecb6952815894e4a2c356a227d74cb7e97c16ee991cf2b531348f2acf517c03e3cd5ad7625fb25be84283f96d3 SHA512 44ce523719a85a5be9a0c7778e37acc21d7317503eaf53421e1497bc9f3e7cbace0581709b669ad3362a43bcc06b918cb34f5c708755c1d0eff409f89b2d263d
 MISC metadata.xml 424 BLAKE2B fefbe83e24edd2e695371c66a3037b8f8896a53ce94ecc7a9bec2f589884a15894d7bd168a0053bbc1849a2c6f520ecf9123fd3b5288addb2d27270da6ece3c8 SHA512 b4643f858ad9bf4c4ec6c8167639ceb2f5013fbd6f1db49a014c446146a7e61f59d811e10f87a6956bb84a2cb93de0fe1c0f8a72fe9e0c76eaf2fb1d4bdc9169
diff --git a/sci-physics/geant-data/geant-data-4.10.6.3.ebuild b/sci-physics/geant-data/geant-data-4.10.6.3.ebuild
deleted file mode 100644
index ae7c1d2b919d..000000000000
--- a/sci-physics/geant-data/geant-data-4.10.6.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 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.9.1 G4LEDATA"
-	[PhotonEvaporation]="G4PhotonEvaporation 5.5 G4LEVELGAMMADATA"
-	[RadioactiveDecay]="G4RadioactiveDecay 5.4 G4RADIOACTIVEDATA"
-	[G4PARTICLEXS]="G4PARTICLEXS 2.1 G4PARTICLEXSDATA"
-	[G4PII]="G4PII 1.3 G4PIIDATA"
-	[RealSurface]="G4RealSurface 2.1.1 G4REALSURFACEDATA"
-	[G4SAIDDATA]="G4SAIDDATA 2.0 G4SAIDXSDATA"
-	[G4ABLA]="G4ABLA 3.1 G4ABLADATA"
-	[G4INCL]="G4INCL 1.0 G4INCLDATA"
-	[G4ENSDFSTATE]="G4ENSDFSTATE 2.2 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/geant-data-4.10.7.1.ebuild b/sci-physics/geant-data/geant-data-4.10.7.1.ebuild
index 4924802c541f..54035d16d183 100644
--- a/sci-physics/geant-data/geant-data-4.10.7.1.ebuild
+++ b/sci-physics/geant-data/geant-data-4.10.7.1.ebuild
@@ -32,7 +32,7 @@ unset DATASET FILENAME VERSION ENVVAR
 
 LICENSE="geant4"
 SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/sci-physics/geant-data/geant-data-4.10.7.ebuild b/sci-physics/geant-data/geant-data-4.10.7.ebuild
index 43db6debe2ed..fef29d79d14b 100644
--- a/sci-physics/geant-data/geant-data-4.10.7.ebuild
+++ b/sci-physics/geant-data/geant-data-4.10.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,7 +32,7 @@ unset DATASET FILENAME VERSION ENVVAR
 
 LICENSE="geant4"
 SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index cf4c581d71dc..b73e8a217504 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -1,5 +1,7 @@
 DIST geant4.10.07.p01.tar.gz 36217226 BLAKE2B 3bc5868db1328ac08582fef4a5246e2f3fc1b2d34bca668d27c6c272af3de230f680cff02c3a8b53ab5abc4186645935b042b456cdff3cba01bc180e0646a50d SHA512 d314d649bf349a4fc5dd09229897d3e4ca3bfba071daeb67ab4d4bde187ec59c120b2478d2b28d1c88615189bd38097666bf4a0c25ce5cb4bc3cf0d9815bea5d
+DIST geant4.10.07.p02.tar.gz 35729676 BLAKE2B 1727ab4e35f4dafe0b406bb189a008955c660922a4fc855a765a269ec8837242ba2372b346c189de6bd6d36c434e0636c483c292f90573726fa6d3b4cc67eb12 SHA512 fe5a387880218782570ff2b28cf8f6abc1457437652f349b8b81ac1045bdec7ee51fa2930451c1271708c02914ac60effd0ee8933d42c29d05819fe320356092
 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
+EBUILD geant-4.10.7.1.ebuild 2957 BLAKE2B 7cc36acf8b2a32e9a947b38286fd0ef9532bad0edca4a762477b5c5de196ce794e2abdce81d9823c2e795531957eea7331a5d4d6748c2cf5262417ed40c50dbb SHA512 bedc36c9109d96fabee2b87d9eb9fed7baac744c26f8a87c4aef9e3c945755aed38613b77aea779cd51589ad420d0cf22ae7ab3a4e5282be22f4e7d1a5161410
+EBUILD geant-4.10.7.2.ebuild 2962 BLAKE2B 2c7e068def5fc29dc636d50ce87db516d396bb2179eade5a3209bb9713c574d798e7e8d10d4084eea87763091b90a75e5c6032a0ed7455ac3b5f568c51466f31 SHA512 c9d1a02b886de540f5207c763036f74875f8b3213d174105f6030a78f6b6fff90a7fd6342f0dcffb21a19e2fb95d0a493510f14e7104414d51fe81f36442ebd1
+EBUILD geant-4.10.7.ebuild 2957 BLAKE2B 7cc36acf8b2a32e9a947b38286fd0ef9532bad0edca4a762477b5c5de196ce794e2abdce81d9823c2e795531957eea7331a5d4d6748c2cf5262417ed40c50dbb SHA512 bedc36c9109d96fabee2b87d9eb9fed7baac744c26f8a87c4aef9e3c945755aed38613b77aea779cd51589ad420d0cf22ae7ab3a4e5282be22f4e7d1a5161410
 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
index aeba779ff7b5..4876bb60e54c 100644
--- a/sci-physics/geant/geant-4.10.7.1.ebuild
+++ b/sci-physics/geant/geant-4.10.7.1.ebuild
@@ -27,7 +27,7 @@ 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"
+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"
 
diff --git a/sci-physics/geant/geant-4.10.7.2.ebuild b/sci-physics/geant/geant-4.10.7.2.ebuild
new file mode 100644
index 000000000000..9687486dde6f
--- /dev/null
+++ b/sci-physics/geant/geant-4.10.7.2.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-4.10.7.1 )
+	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/geant-4.10.7.ebuild b/sci-physics/geant/geant-4.10.7.ebuild
index d286262db573..4876bb60e54c 100644
--- a/sci-physics/geant/geant-4.10.7.ebuild
+++ b/sci-physics/geant/geant-4.10.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,7 +27,7 @@ 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"
+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"
 
diff --git a/sci-physics/jaxodraw/Manifest b/sci-physics/jaxodraw/Manifest
deleted file mode 100644
index 1e41a54b457c..000000000000
--- a/sci-physics/jaxodraw/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST axodraw4j_2008_11_19.tar.gz 20930 BLAKE2B f2478df46f47c931bba71b1f43717d2d01a1a8282acc54582ed1ba5596dec8f03600e01f93a61ef4949f95a274a00b8ec62d2dffb283353de244950c4763531e SHA512 81bfcbd1b121104e0058654ac5520d0f570f9a915e9f6dfb8c52c11e9cf92f1e01c800182c2dc34e503a6eceafdff462b4f57dfa5bb5db979101a106c10d88c8
-DIST jaxodraw-2.0-1_src.tar.gz 3740719 BLAKE2B 0e5915e6a7d4214b272ec8f558ca8d2ed8607a646110f64993da9fc38f26299f67dc45cb6b6e0b0efe2abd6c22099711393683f8deff6874f4b1fd211d9580ca SHA512 ec5866ba03b6f3ecb01ce92f95aa90959153b92eb571f10764d4d10f2fb7a7a0d02a325eb221600526c94faadd53466cf894e4dcba7201e3494555a6330dba02
-EBUILD jaxodraw-2.0.1-r1.ebuild 1391 BLAKE2B 70a13896fb6722d36029fb20f3b608c4d185fc817487ab8672da4ee7f471c0d3b46c2a602a78523f87fd4f7b47656d2eb20d402b03a90201a34c573ea6325997 SHA512 2bc48162da541e335265d9a2c9fb7b9a3d1a64e0a588c5bdb10f006a03e13eb55a082c5af14b8c8c55952f5e1a7785605e404205ab78c0b2701a9b8b46ecb891
-MISC metadata.xml 314 BLAKE2B de15ff9538f435d67aff206e41111c7f1fb9ec23b79666476d82212c4cbee07f304b46d78efda392ca5740e0c54e3bc1cc16e7578cf626eeee53de147a4f98b6 SHA512 1f40f324bf0a347ef9bcd3345a6ae23890a29b7b436fc8508d0bfeb4df8bddfa3754807e63fa40f8978cd7109755ae5b056462beae202ba577ca588d29a30f8c
diff --git a/sci-physics/jaxodraw/jaxodraw-2.0.1-r1.ebuild b/sci-physics/jaxodraw/jaxodraw-2.0.1-r1.ebuild
deleted file mode 100644
index 4e03b5e6e0a3..000000000000
--- a/sci-physics/jaxodraw/jaxodraw-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 versionator eutils
-
-MY_PV="$(replace_version_separator 2 -)"
-
-DESCRIPTION="Java program for drawing Feynman diagrams"
-HOMEPAGE="http://jaxodraw.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}_src.tar.gz
-	http://downloads.sourceforge.net/jaxodraw/axodraw4j_2008_11_19.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="latex"
-
-DEPEND=">=virtual/jdk-1.4
-	latex? ( dev-texlive/texlive-pstricks:0 )"
-
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/JaxoDraw-${MY_PV}"
-
-src_install() {
-	java-pkg_newjar build/${PN}-${MY_PV}.jar ${PN}.jar
-
-	newicon src/site/xdocs/images/favicon.ico jaxodraw.ico
-	make_desktop_entry jaxodraw JaxoDraw jaxodraw.ico
-
-	use source && java-pkg_dosrc src/main/java/net
-
-	dodoc src/doc/BUGS src/doc/CHANGELOG src/doc/README src/doc/TODO
-	use doc && java-pkg_dojavadoc build/javadoc
-
-	java-pkg_dolauncher "${PN}"
-
-	if use latex; then
-		dodir /usr/share/texmf/tex/latex/misc/
-		insinto /usr/share/texmf/tex/latex/misc/
-		doins "${S}/../axodraw4j.sty"
-	fi
-}
-
-tex_regen() {
-	if use latex; then
-		einfo "Regenerating TeX database..."
-		/usr/bin/mktexlsr /usr/share/texmf /var/spool/texmf > /dev/null
-		eend $?
-	fi
-}
-
-pkg_postinst() {
-	tex_regen
-}
-
-pkg_postrm() {
-	tex_regen
-}
diff --git a/sci-physics/jaxodraw/metadata.xml b/sci-physics/jaxodraw/metadata.xml
deleted file mode 100644
index 5a55b59119c9..000000000000
--- a/sci-physics/jaxodraw/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">jaxodraw</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sci-physics/lhapdf/Manifest b/sci-physics/lhapdf/Manifest
index ee456641d198..70be89394153 100644
--- a/sci-physics/lhapdf/Manifest
+++ b/sci-physics/lhapdf/Manifest
@@ -1,5 +1,3 @@
-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 1669 BLAKE2B be1f0297a71ffbcdd70c785f767d58b9dcd7088296d825b44696e76815b8b9467138e6331318f4ea52e98690eeb3fcd8084b136a444e31a47bc93d37285dd66c SHA512 9dfce70a4f3f713b9fb31cea0123d130b229967a97af9aad63d92c2de879904c12ec2a02d14470d4d8d5de8490d229c9c1d3e79335af7c1ca495b17476233508
 EBUILD lhapdf-6.3.0.ebuild 1667 BLAKE2B f748bfde189ae9ecf3aaee97fd076a4cd11b351d2fe932192d84e89077c7ff051a7c73628d9573f71c78923d0311c81164f2ca7461dfc4f277225ec0e0bead5f SHA512 7f4becdb5d801bfbe6f6fcc246a3ab122e849a78fcf1b7e164d72ad7727a479afa157be0a87e8488fdf483c3420ca6267ae0caa8080d3962fc8b0eef50032f65
 MISC metadata.xml 996 BLAKE2B 97df1e778a0e4fdd20faeffcc992c5c76d203c35f9916a15c823bd10d8914cea7b2b6c7b58cca1e6af50ff4a134db8c5cf40db345520cd6f4d16a58d02fda822 SHA512 0c5f089f8428dfbf3e6151f2d9052409dbf7dc64af40fe28664df3e6ba014c8ec4c3e6ae2958c0f0b13ee7edc59f038dab14272622119cc5cb5d6f7fc43637cc
diff --git a/sci-physics/lhapdf/lhapdf-6.2.3.ebuild b/sci-physics/lhapdf/lhapdf-6.2.3.ebuild
deleted file mode 100644
index 03e30f85b391..000000000000
--- a/sci-physics/lhapdf/lhapdf-6.2.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-MY_PV=$(ver_cut 1-3)
-MY_PF=LHAPDF-${MY_PV}
-
-DESCRIPTION="Les Houches Parton Density Function unified library"
-HOMEPAGE="http://lhapdf.hepforge.org/"
-SRC_URI="http://www.hepforge.org/archive/lhapdf/${MY_PF}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/boost:0=
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)"
-
-S="${WORKDIR}/${MY_PF}"
-
-src_configure() {
-	CONFIG_SHELL="${EPREFIX}/bin/bash" \
-	econf \
-		--disable-static \
-		$(use_enable python)
-
-	if use python; then
-		cd "${S}/wrappers/python" && distutils-r1_src_prepare
-	fi
-}
-
-src_compile() {
-	emake all $(use doc && echo doxy)
-
-	if use python; then
-	   cd "${S}/wrappers/python" && distutils-r1_src_compile
-	fi
-}
-
-src_test() {
-	emake -C tests
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use doc && dodoc -r doc/doxygen/*
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.cc
-	fi
-	if use python; then
-		cd "${S}/wrappers/python" && distutils-r1_src_install
-	fi
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "Download data files from:"
-	elog "http://www.hepforge.org/archive/${PN}/pdfsets/$(ver_cut 1-2)"
-	elog "and untar them into ${EPREFIX}/usr/share/LHAPDF"
-}
diff --git a/sci-physics/yoda/Manifest b/sci-physics/yoda/Manifest
index 336dd9fcc566..0760a9852944 100644
--- a/sci-physics/yoda/Manifest
+++ b/sci-physics/yoda/Manifest
@@ -1,3 +1,5 @@
 DIST YODA-1.8.5.tar.bz2 1057576 BLAKE2B 3c6abb680afcfb8250c3ae340a1b1307cb5498b726199ecf9afe593fc49c4099fd2b4ac881568c303abd10c22fcf91ffae4283021443fc6230456376617f0de1 SHA512 d1fffa55af069f894b3c88bcd105f77a3105095281febf9c06c0cea2fadea6c63d69df5bde4aa96646d2d560bd83cade6802d9ed19d5a30553cd003ace19dfc8
+DIST YODA-1.9.0.tar.bz2 1061105 BLAKE2B 70d68d31456747fcb14e27585aae245930061b5135b8a96c8ff3fe0375175d00a1c2d24a6c1ca3f18fc8464e610ef6287184f3990e12ff3fb108def600e34189 SHA512 eb82f1df832c2124dd81e07c06f165ddf13c4c4b70fcd0113f85045e22085d82751325bc57bfbd167649580980d98a15b666de56dada639160f24682b58b2f71
 EBUILD yoda-1.8.5.ebuild 841 BLAKE2B 451e469bbca5da56c96177719bb2766ddae3a7302f31dd7461df5a2190736bd2953e82e0da02730dd65568abb9748d781796460f78a029bd9cdb66251d6ec6fa SHA512 e50f47d5664dd5e5888bb40fa7355081ad04cea31ebcfcb0501e445239c19cf426aa996494fd64610eaada2bcc3d683dc642d546683b65c17661985215ecd30b
+EBUILD yoda-1.9.0.ebuild 843 BLAKE2B 94946e19f1b8f36dd4151592207d99ccf0c0d4a46e29323d3cce470dcfcb2f07fe050ce712726a12394f4388de43c5af1ccab56cbf8d4d2f861725d70c8c1634 SHA512 8aa5189d75b21b1d88b56952557c1be48ffa9b81e2ba0d292a99fbbab47f792bbcb89454c055d0c0319fe31b43243a369e6b0d88fdab792e36f15d401d49a0d5
 MISC metadata.xml 659 BLAKE2B 460df9dfdf485eb860ba7eb737ee9cc715e823b4961894a99e51e9bbdb98ce14a87639ddb0774aeed11d111ed21ddc4e1804f41fcb4cd72c5b0b456402588f6f SHA512 ad6899122310e6e4ecb0e72737362379cc180524dd7e60c6dbacbd7d2a0eab5c633eb5ecf8b6731ed40b12e0e186eba8ce6def539c1c0969974e75467250b7b7
diff --git a/sci-physics/yoda/yoda-1.9.0.ebuild b/sci-physics/yoda/yoda-1.9.0.ebuild
new file mode 100644
index 000000000000..eccb09af10af
--- /dev/null
+++ b/sci-physics/yoda/yoda-1.9.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1
+
+DESCRIPTION="Yet more Objects for (High Energy Physics) Data Analysis"
+HOMEPAGE="https://yoda.hepforge.org/"
+SRC_URI="https://yoda.hepforge.org/downloads?f=${P^^}.tar.bz2 -> ${P^^}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="root"
+
+RDEPEND="root? ( sci-physics/root:= )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P^^}"
+
+src_configure() {
+	econf \
+		--disable-pyext \
+		--disable-static \
+		$(use_enable root)
+}
+
+src_test() {
+	# PYTESTS and SHTESTS both require python tools
+	emake check PYTESTS= SHTESTS=
+}
+
+src_install() {
+	default
+
+	newbashcomp "${ED}"/etc/bash_completion.d/yoda-completion yoda
+	rm "${ED}"/etc/bash_completion.d/yoda-completion || die
+}