gentoo resync : 22.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
commit: abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree: eca3dd248b73b92013cba00a0fcc1edf2696e19a /sci-physics
parent: 24fd814c326e282c4321965c31f341dad77e270d (diff)
45 files changed, 63 insertions, 1905 deletions
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 47dc9d557e62..44fe91745e49 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/bullet/Manifest b/sci-physics/bullet/Manifest
index 99509b90993a..6992ef66595f 100644
--- a/sci-physics/bullet/Manifest
+++ b/sci-physics/bullet/Manifest
@@ -1,11 +1,4 @@
 AUX bullet-2.85-soversion.patch 1094 BLAKE2B 8dc035b80d812b3c2382067796f1626a932ce887246b34a8b5e08fddf45d330078a970eb6c2147259285a45974b8aaa26a2494ad4aa4824d89bf58aa7af3ac37 SHA512 f437d553c51c6cc6646a4a3bf0ffe02e2691a3b2109ea560c986f69c602055c409028a5a3711597aca757d3e3b33cab14d60e03fc120f0975f35c6e16be6362d
-AUX bullet-2.89-no-dangling-pointer.patch 842 BLAKE2B 5d66875b52f696b839daccfbfea4a238ea32c6fc31fc6cd441cf5d053569bced474b6c8b7620a1b3eb67d69b73ced3d0d1a2beb8ec5479e64f581d66f630d5fc SHA512 a463da3288d21b3d6b0dad1bc81fcc3b95ce1bd2e53c107b597d3a6beed0b0fbafffab9d38c2394ed125802e0fb073c74f125bed9fac7898f3a3dd23930a6dfd
-DIST bullet-2.86.tar.gz 25806558 BLAKE2B a8576d8dacd67b9789d32d7b1acc6c4025df3c15427c60d66f98b1906eee8b2b94e5b0108b9a8c00ca6261510ccaf57ba5c02c72fee8f528d4f723b304166731 SHA512 af8a6b282ab606437d7975a59cd8a9c2bf273c83b0e79f0c4c1de6fa51695ba6d5f3c853dce2fdba9cb55e7572214e15089e54db51afc465ca26f502cbd5a4f9
-DIST bullet-2.89.tar.gz 135742506 BLAKE2B 3725533bb50f3cf4783e21c57a5e3596f280d9aa3caa5b7a44925d4785206cc86514ff89c2cc1e33f8a14af7c8a5165190bb0515a6931fc4c7ec2e2b9aef3dd8 SHA512 3c4ba6a3b3623ef44dd4a23e0bc2e90dec1f2b7af463edcb886e110feac1dfb4a91945f0ed640052cac228318539e275976d37238102fb10a0f78aef065a730b
-DIST bullet-3.05.tar.gz 142858358 BLAKE2B d7ef2e68c0740e5bd2a728c576bcd3f07fff3680d8f604d7fd89bb6d7eb8c38f6205aea3bae300d70c2ec4e362c14e0567e3af3aabc893f8e33d979ffe8b3521 SHA512 4cb67547b466e01f6c2258b1f350fdfac0f2dc73a7962b6e196491e6722e1cd22cdfe80d7b2f4e1e92a90f91e277bff5cabfd0f55ef55010f9a4d7286843cecd
 DIST bullet-3.07.tar.gz 148413637 BLAKE2B 776cd7651d11d865095ea000d353860bea09c6ff4ec8dd8e43282a78373e2830f6ce1ce2b87ed25a67be7bded297b3a6320b2872a71dfd3849e7b197c6d2c936 SHA512 31fc7cb4ed8b939abc9eeb0a8f6fff3a454ea4ebcffd797fd35a2320fe3ab222fcd315569809ea148d0efff47267f5eec9f4bf7aaf07730a06aa9babd2abc9a6
-EBUILD bullet-2.86.ebuild 1565 BLAKE2B 2bcb10a03caa592484f69870e951796f56b8a771e39fe023ec3fa1b517cb6e381e1a35cc4c951ded82aa9d5b5c8fea2cab3c034c26fddff62a962f5b2db512ad SHA512 41f68eaf06d5d300f8f6fb6b2a89cb0d3273c27dc9c7b397aaafd7cef9fd6a6f39a4bbef67ef42f0cf89754c1aa8006ce9e542f2c624e2ae7c9d0b570023817e
-EBUILD bullet-2.89.ebuild 2050 BLAKE2B a9cb3d8cde1385146d1db5b5dfc46734ceb01d56c05e02db3b461d3b7b564ce9dcd34686c67bda7143622ca2fc05c5d6a04a50ddf3d8b74867148350f407ff32 SHA512 f778ac777ec9954c8a2ae56f3ad22d04ceff29e57ad119fed92daf535954e31ab5c7d68d49588dc4ed20f894ccdedd0f5099a366d80ae7bc2fa290b8d40ad620
-EBUILD bullet-3.05.ebuild 1931 BLAKE2B 9f61757bdd5679d8309590ef9a89365754a1186e6c0e0d38df54edd465ec4ad4f357da63fa60a7645b823c7c802bb8b5044d4582257e534b42aa089cdfa111f5 SHA512 a9903774f42726ce0f62442c07430c0dbeca5a8743c5e3e775c666b9027f001791c62d3437172d8a895bae066926b9c599c0844e40bca77fe5507556418c1f82
 EBUILD bullet-3.07.ebuild 1929 BLAKE2B c0a1c9c8c2f92c7e7493164eca8f4d27d83944eff2bd5dbffe6705b6c6bd69705b275eff2074de76ac6747702e792e6ff1110247d9fb18b4713efc8d07a7b2a4 SHA512 df6585dc25557f961177d89b340eed84c28a23e2bb8174540ad833e06bf1ec735e3135535348c79323eb2fafa504643eea9a8d386b56ede968344092321c7408
-MISC metadata.xml 1304 BLAKE2B 63dafd8147fbd42a491f15f9ea4db7cb79581925f438fb45465db642f1f915a88d630a45d2ce1111a98df615610d61b640ebfc389595573b26148c24d266f166 SHA512 4f914ed4e849fc29f506e9fa5359f7e6d470636ff2223b3aadbee88a93a037bc7a36a79d9ce37cbecc682854a4abc20d803e42e44805d5df384392f9d3abb280
+MISC metadata.xml 1119 BLAKE2B 0242add0b8c197137e448ac9a34cf4a1b543decd8e120e6673ac70e32f493b14531fac469dbfc2f44e49659977789fcc5b917a743354fc5cbb2b1d0d3a5780ad SHA512 8831dc59734db66ca01cc2901f1efe360cc8ad9f96cf4712df92d2975797002fbb193fe0f55a79f4ef71affc53be7a084c38f506c65f663759df3d40073ff59e
diff --git a/sci-physics/bullet/bullet-2.86.ebuild b/sci-physics/bullet/bullet-2.86.ebuild
deleted file mode 100644
index f983c772bb62..000000000000
--- a/sci-physics/bullet/bullet-2.86.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Continuous Collision Detection and Physics Library"
-HOMEPAGE="http://www.bulletphysics.com/"
-SRC_URI="https://github.com/bulletphysics/bullet3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+bullet3 doc double-precision examples extras test"
-
-RDEPEND="
-	virtual/opengl
-	media-libs/freeglut"
-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}"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# allow to generate docs
-	sed -i -e 's/GENERATE_HTMLHELP.*//g' Doxyfile || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CPU_DEMOS=OFF
-		-DBUILD_OPENGL3_DEMOS=OFF
-		-DBUILD_BULLET2_DEMOS=OFF
-		-DUSE_GRAPHICAL_BENCHMARK=OFF
-		-DINSTALL_LIBS=ON
-		-DINSTALL_EXTRA_LIBS=ON
-		-DBUILD_BULLET3=$(usex bullet3)
-		-DBUILD_EXTRAS=$(usex extras)
-		-DUSE_DOUBLE_PRECISION=$(usex double-precision)
-		-DBUILD_UNIT_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		doxygen || die
-		HTML_DOCS+=( html/. )
-		DOCS+=( docs/*.pdf )
-	fi
-
-	if use examples; then
-		# throws QA warnings
-		rm examples/ThirdPartyLibs/openvr/*/linux64/libopenvr_api.so || die
-		DOCS+=( examples )
-	fi
-}
diff --git a/sci-physics/bullet/bullet-2.89.ebuild b/sci-physics/bullet/bullet-2.89.ebuild
deleted file mode 100644
index 93b7355b91d8..000000000000
--- a/sci-physics/bullet/bullet-2.89.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs
-
-DESCRIPTION="Continuous Collision Detection and Physics Library"
-HOMEPAGE="http://www.bulletphysics.com/"
-SRC_URI="https://github.com/bulletphysics/bullet3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+bullet3 doc double-precision examples extras openmp tbb test threads"
-
-REQUIRED_USE="
-	openmp? ( threads )
-	tbb? ( threads )
-"
-
-RDEPEND="
-	virtual/opengl
-	media-libs/freeglut
-	tbb? ( dev-cpp/tbb )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-doc/doxygen[dot] )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.85-soversion.patch
-	"${FILESDIR}"/${PN}-2.89-no-dangling-pointer.patch
-)
-
-DOCS=( AUTHORS.txt LICENSE.txt README.md )
-
-# Building / linking of third Party library BussIK does not work out of the box
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}3-${PV}"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# allow to generate docs
-	sed -i -e 's/GENERATE_HTMLHELP.*//g' Doxyfile || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CPU_DEMOS=OFF
-		-DBUILD_OPENGL3_DEMOS=OFF
-		-DBUILD_BULLET2_DEMOS=OFF
-		-DUSE_GRAPHICAL_BENCHMARK=OFF
-		-DINSTALL_LIBS=ON
-		-DINSTALL_EXTRA_LIBS=ON
-		-DBUILD_BULLET3=$(usex bullet3)
-		-DBUILD_EXTRAS=$(usex extras)
-		-DUSE_DOUBLE_PRECISION=$(usex double-precision)
-		-DBUILD_UNIT_TESTS=$(usex test)
-		-DBULLET2_MULTITHREADING=$(usex threads)
-		-DBULLET2_USE_OPEN_MP_MULTITHREADING=$(usex openmp)
-		-DBULLET2_USE_TBB_MULTITHREADING=$(usex tbb)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		doxygen || die
-		HTML_DOCS+=( html/. )
-		DOCS+=( docs/*.pdf )
-	fi
-
-	if use examples; then
-		# throws QA warnings
-		rm examples/ThirdPartyLibs/openvr/*/linux64/libopenvr_api.so || die
-		DOCS+=( examples )
-	fi
-}
diff --git a/sci-physics/bullet/bullet-3.05.ebuild b/sci-physics/bullet/bullet-3.05.ebuild
deleted file mode 100644
index 0ba0a2d387cd..000000000000
--- a/sci-physics/bullet/bullet-3.05.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs
-
-DESCRIPTION="Continuous Collision Detection and Physics Library"
-HOMEPAGE="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 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_EXTRAS=OFF
-		-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/files/bullet-2.89-no-dangling-pointer.patch b/sci-physics/bullet/files/bullet-2.89-no-dangling-pointer.patch
deleted file mode 100644
index 8eee0016ae28..000000000000
--- a/sci-physics/bullet/files/bullet-2.89-no-dangling-pointer.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 1c64add35ed4918222ceb4fe93b7bef0e2b4e41c Mon Sep 17 00:00:00 2001
-From: stolk <b.stolk@gmail.com>
-Date: Wed, 1 Apr 2020 10:59:16 -0700
-Subject: [PATCH] Do not return a dangling pointer!
-
-Signed-off-by: Ross Charles Campbell <rossbridger.cc@gmail.com>
----
- Extras/ConvexDecomposition/cd_wavefront.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Extras/ConvexDecomposition/cd_wavefront.cpp b/Extras/ConvexDecomposition/cd_wavefront.cpp
-index b33080964..53b5784df 100644
---- a/Extras/ConvexDecomposition/cd_wavefront.cpp
-+++ b/Extras/ConvexDecomposition/cd_wavefront.cpp
-@@ -437,7 +437,7 @@ const char **InPlaceParser::GetArglist(char *line, int &count)  // convert sourc
- {
- 	const char **ret = 0;
- 
--	const char *argv[MAXARGS];
-+	static const char *argv[MAXARGS];
- 	int argc = 0;
- 
- 	char *foo = line;
--- 
-2.28.0
-
diff --git a/sci-physics/bullet/metadata.xml b/sci-physics/bullet/metadata.xml
index 3eb822b267c4..f7e1c944a877 100644
--- a/sci-physics/bullet/metadata.xml
+++ b/sci-physics/bullet/metadata.xml
@@ -19,9 +19,7 @@
   for games and animation.
 </longdescription>
   <use>
-    <flag restrict="&lt;=sci-physics/bullet-2.89" name="bullet3">Build Bullet 3</flag>
     <flag restrict="&lt;=sci-physics/bullet-2.89" name="double-precision">Build libraries in double precision</flag>
-    <flag restrict="&lt;=sci-physics/bullet-2.89" name="extras">Build additional libraries</flag>
     <flag restrict="=sci-physics/bullet-2.89" name="tbb">Enable multithreading with the Intel Threads Building Block dev-cpp/tbb</flag>
   </use>
   <upstream>
diff --git a/sci-physics/cernlib/Manifest b/sci-physics/cernlib/Manifest
index 0ad19151879c..da1beb2f77f5 100644
--- a/sci-physics/cernlib/Manifest
+++ b/sci-physics/cernlib/Manifest
@@ -2,10 +2,8 @@ AUX cernlib-2006-fgets.patch 759 BLAKE2B b5918c254fa39cbc09b7069a7d41fda6d0e420a
 AUX cernlib-2006-nogfortran.patch 1994 BLAKE2B 589c8d747ea5af3c2a2a75a16e5311e2facc7a03aa7e20395c64e4cddfe6a9ea6defd1613bd7919672ecc130c92807e10544260212bf633adcf126d7a3e9456f SHA512 9446e85f57c5cdc78468e738f2a5d7227a2a91d4d6591b063fbc0a976bdb1b1f34edceee92ed7fbac558b1f6ba2663d1b43c373e92da3f414df21c601a0f1f72
 AUX cernlib-2006-ypatchy-short-name.patch 331 BLAKE2B 62683907b710db6963d5146b5d6fc775ca469389a381eca2624d9816db5c0c96dd015382f487d993b32d8896b7c644dfc7bff752b90f920495bed9a2fa84bbd3 SHA512 dd97e328706c243b84c6464ee1db3c546280dba838766e6aefd8a5349e57a3b430c38d81909f5ad445af7c3a602e0a6e64110b7f8eb6e44a907a7311828142e9
 DIST cernlib_20061220+dfsg3-2.debian.tar.gz 257093 BLAKE2B 35ae90e38ddb935f252531cdf49dc038cdb7543b9168076f97458323a2458938cfa2f1768165d4cc59649021e2b268139dd53b3ef09d2a6601e1f68792c69af1 SHA512 43a2ca55d42b92bfb551b029c75728e80b4c83473397b52f746d9481c7503762bc5a281732908bfeb29a64f728fed4c127ed1cb9101c16e4fb2dd28c452730ea
-DIST cernlib_20061220+dfsg3-4.1.debian.tar.xz 170100 BLAKE2B 7bc206a246cc437babae6cdb38bd5831ccf4f665bbe65f2ebabf7df8a68c0b7c317f4a7ed283024bf70b6fe50fa8f01bd9a2882cfba174020a23f768f69c237c SHA512 d259ab304b040c6bab8535c0db60aaa466ef7bb9bbcce9b2d8931505a180c92935d428e0dd45bfa6199ec939f67580a6d3ac1035c0384bdcf9e6601a351ce90a
 DIST cernlib_20061220+dfsg3-4.3.debian.tar.xz 168928 BLAKE2B 15147d1d84d3e4abb06620154425a035e64d6e5254177f9647634fdf63e4a5aa42deba6c8f638f338cf85e8766732388cc6298813dd5b007d1ef97fddcef3d39 SHA512 8cb666d9ef62627e7e3e55bd1986b40ca9ddfcc882101b1a3597c1d60870e30649b5c7716687f7e4106b30ba0aa88a9ca7bc3a3651b0d1405f55a6f611dc308b
 DIST cernlib_20061220+dfsg3.orig.tar.gz 6434476 BLAKE2B 069eda316ffbc4873e79952283a0aa2693ed58a3cc369bca72e29a4feaef4840922b4f62ababba1476f2aa0309f68833a4a35a3b5c6ac015bdbd85b3b58b2efe SHA512 11fade45c5ae69c858f37a82e74ab1a69416314a23c12ec5205ee6b918590d66f26d3ae68afa466ae3109d736212968ece956a444270ddd189a27a24c0ccece8
 EBUILD cernlib-2006-r5.ebuild 2942 BLAKE2B c284963abf6ce801a52eb1100e77c38636851f8b7b5f7740301796b642fd3f9793fe15b3e85fd4ef639b0795d48ffc4daa14c0a6d610017b21875ad416e1a6a9 SHA512 fc3ce4fbe0e4b5b23fb54bdebae1981d1de53237795c929e84bd2753523b2bf911a3401c6b7bf27fc404d8fa7006a2dacbae916c438ba3f8020ff8d4ecf8420a
-EBUILD cernlib-2006-r6.ebuild 2996 BLAKE2B 02602426dab1d77f98a8f70997d7357715f47eddc87c4a80c39dcf10684617db230a613396754dae7884eaed7805d914738a72aa12f29094bdf89a3d681c1c84 SHA512 d2721cd22118e0ab7bcbdd39cc94c2c5620f99775c089f3918e128ee23e0d34ae96238c0c1e0b80d2fe062c12434085993f7d84cd5f90bb4781ad130ff2e62a6
 EBUILD cernlib-2006-r7.ebuild 3010 BLAKE2B 17f778cd95128e09252be544144aa732b9767f767f92096bdf6b3b76c81192fe330f999111e1569eceeeb5a400e58355701e701af1c995b12f5824bce3f24c9c SHA512 9dde5fc5814cf0ce917a0aab2a37c4d5a55b155cf98db3c29e285df87fb8527002541e98f3a5817a0614fa6be7cf7b2bf5d2665027ef9cf43e72a3f936b4093c
 MISC metadata.xml 759 BLAKE2B f01fad2a4cead94f4c422f4f2906bb26c9c960f4a85c07bb1cc900a058184fb2b0774251e93f3d92e105f9ff4675cf0c9035d4ffe0841c63d54e344bb0b0d149 SHA512 133dd51ec200866d1886a1c077dad4a1a7ec786d77b59e1da147a7e95a5b6e8c9f1ce41dfcfa35c406625ed4aa966891cc5247ef35d7a82791d9b42c91fc7477
diff --git a/sci-physics/cernlib/cernlib-2006-r6.ebuild b/sci-physics/cernlib/cernlib-2006-r6.ebuild
deleted file mode 100644
index abdee8792276..000000000000
--- a/sci-physics/cernlib/cernlib-2006-r6.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils fortran-2 multilib toolchain-funcs
-
-DEB_PN=cernlib
-DEB_PV=20061220+dfsg3
-DEB_PR=4.1
-DEB_P=${DEB_PN}_${DEB_PV}
-
-DESCRIPTION="CERN program library for High Energy Physics"
-HOMEPAGE="https://cernlib.web.cern.ch/cernlib/"
-SRC_URI="
-	mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}.orig.tar.gz
-	mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}-${DEB_PR}.debian.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-2 LGPL-2 BSD"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	x11-libs/motif:0
-	virtual/lapack
-	dev-lang/cfortran"
-DEPEND="${RDEPEND}
-	x11-misc/imake
-	x11-misc/makedepend
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${DEB_PN}-${DEB_PV}"
-
-src_prepare() {
-	mv ../debian . || die
-	epatch "${FILESDIR}"/${P}-nogfortran.patch
-	# set some default paths
-	sed -i \
-		-e "s:/usr/local:${EROOT}/usr:g" \
-		-e "s:prefix)/lib/\$(DEB_HOST_MULTIARCH):prefix)/$(get_libdir):" \
-		-e "s:\$(prefix)/etc:${EROOT}/etc:" \
-		-e 's:$(prefix)/man:$(prefix)/share/man:' \
-		debian/add-ons/cernlib.mk || die "sed failed"
-
-	# use system blas and lapack set by gentoo framework
-	sed -i \
-		-e "s:\$DEPS -lm:$($(tc-getPKG_CONFIG) --libs blas):" \
-		-e "s:\$DEPS -llapack -lm:$($(tc-getPKG_CONFIG) --libs lapack):" \
-		-e 's:`depend $d $a blas`::' \
-		-e 's:X11R6:X11:g' \
-		-e 's: /[^ ]*`dpkg-arch.*`::' \
-		debian/add-ons/bin/cernlib.in || die "sed failed"
-
-	cp debian/add-ons/Makefile .
-	export DEB_BUILD_OPTIONS="$(tc-getFC) nostrip nocheck"
-
-	einfo "Applying Debian patches"
-	emake -j1 patch
-
-	epatch "${FILESDIR}"/${P}-fgets.patch
-	epatch "${FILESDIR}"/${P}-ypatchy-short-name.patch
-	# since we depend on cfortran, do not use the one from cernlib
-	rm src/include/cfortran/cfortran.h || die
-
-	# respect users flags
-	sed -i \
-		-e 's/-O3/-O2/g' \
-		-e "s/-O2/${CFLAGS}/g" \
-		-e "s|\(CcCmd[[:space:]]*\)gcc|\1$(tc-getCC)|g" \
-		-e "s|\(CplusplusCmd[[:space:]]*\)g++|\1$(tc-getCXX)|g" \
-		-e "s|\(FortranCmd[[:space:]]*\)gfortran|\1$(tc-getFC)|g" \
-		src/config/linux.cf	\
-		|| die "sed linux.cf failed"
-	sed -i \
-		-e "s|\(ArCmdBase[[:space:]]*\)ar|\1$(tc-getAR)|g" \
-		-e "s|\(RanlibCmd[[:space:]]*\)ranlib|\1$(tc-getRANLIB)|g" \
-		src/config/Imake.tmpl	\
-		|| die "sed Imake.tmpl failed"
-
-	sed -i \
-		-e 's/\$(FCLINK)/\$(FCLINK) $(LDFLAGS)/' \
-		-e 's/\$(CCLINK)/\$(CCLINK) $(LDFLAGS)/' \
-		src/config/{biglib,fortran,Imake}.rules \
-		src/patchy/Imakefile \
-		|| die "sed for ldflags propagation failed"
-
-	# add missing headers for implicit
-	sed -i \
-		-e '0,/^#include/i#include <stdlib.h>' \
-		src/kernlib/kerngen/ccgen*/*.c || die
-}
-
-src_compile() {
-	# parallel make breaks and complex patched imake system, hard to debug
-	emake -j1 cernlib-indep cernlib-arch
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}"/shlib emake -j1 cernlib-test
-}
-
-src_install() {
-	default
-	cd debian
-	dodoc changelog README.* deadpool.txt NEWS copyright
-	newdoc add-ons/README README.add-ons
-}
diff --git a/sci-physics/fastjet/Manifest b/sci-physics/fastjet/Manifest
index 049bfd514a4a..765deb5cdd3a 100644
--- a/sci-physics/fastjet/Manifest
+++ b/sci-physics/fastjet/Manifest
@@ -1,4 +1,3 @@
-AUX fastjet-3.0.3-system-siscone.patch 4191 BLAKE2B 0de9757d64c735f49eabd836cd1edf0d6a33fe0e4e58a52794c3e5de2059276de68472f0426751984ce5547e8846ff77e8bb0f50f1807d68db83bb5183a9d781 SHA512 34ba5e61364f9fe090389edbeda4370b2707e89fab2a00e941cabe496f8e7cdd65fb1fccdb48f000247b0e6bb3abc79bb995931fd4a9709584eed8eaab42957c
 AUX fastjet-3.0.6-system-siscone.patch 3726 BLAKE2B b8fcd8b93631892b68b7d4584c3e456118fd66f80e12e39be3fc82f2f6dac3c52a3d2218c7e8f342166047aee385c9f12192777454be333b2a01b307bc67cdac SHA512 7522e3fd0fe789bc5b3172c2c26566136004b828a46a81fb0ec39bb6bedbf358efc0b51acab8cb19a40dd5b4138190f87655ddd2679cc91c819f5c7c9e9f4c57
 DIST fastjet-3.0.6.tar.gz 2216501 BLAKE2B 1aacab5c91cb70d66035deddc4929d60c51444f6f23396f947d704f607d5f2267ccc5e09ec633d6e0ec1255b3a6bc7e51e4ea49c4cb06d0e3b6953b601ab76ee SHA512 1f01b7ed0e07bd94c88faa123f72c2e3bcd81ad32ab4d03dc0a18dd18635f3b18ba8d339176b0ef1d6e58cecd9f37aaea30b4ad909d2782ce5be7c11e205c3a5
 EBUILD fastjet-3.0.6-r1.ebuild 1247 BLAKE2B 9df00a2006025aa82f6294ed5b7e0b921453c7e1c316d947ca40a3ea9e582d79beb9978ac1f82caf5f1514fa24354620de3b2550807491637293f694ff5d2428 SHA512 16ff337d0ef81f76028335f80d31b0eafdfde521dc11527f4e87624ebcda23caa3afc3d1ca49f2a264bbed588499e7cd439436956355bc063a833bc9430276ed
diff --git a/sci-physics/fastjet/files/fastjet-3.0.3-system-siscone.patch b/sci-physics/fastjet/files/fastjet-3.0.3-system-siscone.patch
deleted file mode 100644
index b74b8e4e9033..000000000000
--- a/sci-physics/fastjet/files/fastjet-3.0.3-system-siscone.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -Nur fastjet-3.0.3.orig/configure.ac fastjet-3.0.3/configure.ac
---- fastjet-3.0.3.orig/configure.ac	2012-06-25 15:15:32.000000000 +0100
-+++ fastjet-3.0.3/configure.ac	2012-07-24 18:39:11.000000000 +0100
-@@ -14,7 +14,7 @@
- dnl  - the first macro needs to place the files in the correct 
- dnl    dir in order to have the correct -I options for the remote build
- dnl  - see Makefile.am for distcleaning AX_PREFIX_CONFIG_H leftovers
--AM_CONFIG_HEADER(include/fastjet/config_raw.h:config.h.in)
-+AC_CONFIG_HEADERS(include/fastjet/config_raw.h:config.h.in)
- AX_PREFIX_CONFIG_H(include/fastjet/config_auto.h,FASTJET,include/fastjet/config_raw.h)
- 
- dnl check autoconf version
-@@ -252,6 +252,12 @@
- fi
- 
- dnl SISCone
-+AC_ARG_WITH(bundle-siscone,
-+	[  --with-bundle-siscone  Build the bundled SISCone library [default=no]],
-+	[bundle_siscone=$withval],
-+	[bundle_siscone=no])
-+AM_CONDITIONAL(BUNDLE_SISCONE, test x$bundle_siscone != xno)
-+
- ACX_CHECK_PLUGIN(SISCone, siscone, SISCONE, yes,
- 	         [CONFIG_LIBS_PLUGINS=${CONFIG_LIBS_PLUGINS}" -lsiscone_spherical -lsiscone"
-                   CONFIG_LIBS_PLUGINS_STATIC=${CONFIG_LIBS_PLUGINS_STATIC}" \${installationdir}/lib/libsiscone.a \${installationdir}/lib/libsiscone_spherical.a"])
-diff -Nur fastjet-3.0.3.orig/example/Makefile.am fastjet-3.0.3/example/Makefile.am
---- fastjet-3.0.3.orig/example/Makefile.am	2012-06-13 15:14:58.000000000 +0100
-+++ fastjet-3.0.3/example/Makefile.am	2012-07-24 18:26:15.000000000 +0100
-@@ -43,7 +43,7 @@
- 03_plugin_CXXFLAGS = $(AM_CXXFLAGS) $(CGAL_CPPFLAGS) -I$(srcdir)/../include
- 03_plugin_LDADD = ../src/libfastjet.la $(CGAL_LIBS)
- 03_plugin_CXXFLAGS += -I$(srcdir)/../plugins/SISCone -I$(srcdir)/../plugins/SISCone/siscone
--03_plugin_LDADD += ../plugins/SISCone/libSISConePlugin.la ../plugins/SISCone/siscone/siscone/libsiscone.la ../plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la
-+03_plugin_LDADD += ../plugins/SISCone/libSISConePlugin.la
- else
- EXTRA_DIST += 03-plugin.cc
- endif
-@@ -125,7 +125,7 @@
- fastjet_areas_LDADD = ../src/libfastjet.la $(CGAL_LIBS)
- if BUILD_PLUGIN_SISCONE
- fastjet_areas_CXXFLAGS += -I$(srcdir)/../plugins/SISCone -I$(srcdir)/../plugins/SISCone/siscone
--fastjet_areas_LDADD += ../plugins/SISCone/libSISConePlugin.la ../plugins/SISCone/siscone/siscone/libsiscone.la ../plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la
-+fastjet_areas_LDADD += ../plugins/SISCone/libSISConePlugin.la
- endif
- 
- fastjet_timing_plugins_SOURCES = fastjet_timing_plugins.cc CmdLine.cc
-@@ -135,7 +135,7 @@
- fastjet_timing_plugins_LDADD += ../tools/libfastjettools.la 
- if BUILD_PLUGIN_SISCONE
- fastjet_timing_plugins_CXXFLAGS += -I$(srcdir)/../plugins/SISCone -I$(srcdir)/../plugins/SISCone/siscone
--fastjet_timing_plugins_LDADD += ../plugins/SISCone/libSISConePlugin.la ../plugins/SISCone/siscone/siscone/libsiscone.la ../plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la
-+fastjet_timing_plugins_LDADD += ../plugins/SISCone/libSISConePlugin.la
- endif
- if BUILD_PLUGIN_CDFCONES
- fastjet_timing_plugins_CXXFLAGS += -I$(srcdir)/../plugins/CDFCones
-diff -Nur fastjet-3.0.3.orig/plugins/SISCone/Makefile.am fastjet-3.0.3/plugins/SISCone/Makefile.am
---- fastjet-3.0.3.orig/plugins/SISCone/Makefile.am	2012-06-13 15:14:51.000000000 +0100
-+++ fastjet-3.0.3/plugins/SISCone/Makefile.am	2012-07-24 18:36:56.000000000 +0100
-@@ -1,11 +1,22 @@
--SUBDIRS = siscone fastjet .
-+SUBDIRS = fastjet .
- 
- if MONOLITHIC_PLUGINS
- noinst_LTLIBRARIES = libSISConePlugin.la
- else
- lib_LTLIBRARIES = libSISConePlugin.la
- endif
--libSISConePlugin_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(srcdir) -I$(srcdir)/siscone -I$(srcdir)/../../include
-+libSISConePlugin_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(srcdir) -I$(srcdir)/../../include
-+
-+if BUNDLE_SISCONE
-+SUBDIRS += siscone
-+libSISConePlugin_la_CXXFLAGS += -I$(srcdir)/siscone
-+libSISConePlugin_la_LIBADD = \
-+	$(top_builddir)/plugins/SISCone/siscone/siscone/libsiscone.la \
-+	$(top_builddir)/plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la
-+else
-+libSISConePlugin_la_LIBADD = -lsiscone -lsiscone_spherical
-+endif
-+
- libSISConePlugin_la_SOURCES = SISConePlugin.cc SISConeSphericalPlugin.cc
- 
- EXTRA_DIST = makefile.static
diff --git a/sci-physics/geant-data/Manifest b/sci-physics/geant-data/Manifest
index dcd6b8c44722..75c51ce5fc0c 100644
--- a/sci-physics/geant-data/Manifest
+++ b/sci-physics/geant-data/Manifest
@@ -1,7 +1,6 @@
 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 G4EMLOW.7.9.tar.gz 118027817 BLAKE2B 3456d07a0d87accbdf90049626e653488bb592f113e898e364638924259ce889940a20b7c84e40f16e654ca3fbb9e892050ce7e66a62a9e267706c5750bcd313 SHA512 6c5ae214915b273d20bec1483267279d53a015a13ed30ba1de325d489b5b34e65b227f8fd6caeb5fef28c2a582b7285002338e866f32c7f151fb1508ee55c54d
 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
@@ -17,8 +16,6 @@ DIST G4RealSurface.2.1.1.tar.gz 133386050 BLAKE2B 68fb3ebadabe0c04a34279c9ff3a15
 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-r1.ebuild 1522 BLAKE2B 292a733b2260e761f860ff58be747322bc014633f697067ead497bdefdfa3276c3cdc0058c952a333a24608316872156f288e9b6e6a4684d1181d8bd0efc0dc0 SHA512 0faf4eaffd8932d4befd644ba6d9986e221132fdbc216944879732adb0b0156e46ad99818cd6cafad41b5c4c99412cf36d7c282a77e6f11967a21e55983f3a1e
 EBUILD geant-data-4.10.6.3.ebuild 1524 BLAKE2B e218d267d9420738f133f5da9a0ad510b951caf7db1da87cb4d278376aa14d51a5b8cd9c41ec176a0e69d036bc358c189a7475561b1b12eb7fe9cd10ceb22a8f SHA512 e6f0331490693059dec660ae4eac07bc92fd4ff59f04f690a3d0d78b0edd24cbcc1e8a03830b441790d253d4b932eac1e869e2725fac9ccd5a9e39bd588b668a
-EBUILD geant-data-4.10.6_p1-r1.ebuild 1524 BLAKE2B e218d267d9420738f133f5da9a0ad510b951caf7db1da87cb4d278376aa14d51a5b8cd9c41ec176a0e69d036bc358c189a7475561b1b12eb7fe9cd10ceb22a8f SHA512 e6f0331490693059dec660ae4eac07bc92fd4ff59f04f690a3d0d78b0edd24cbcc1e8a03830b441790d253d4b932eac1e869e2725fac9ccd5a9e39bd588b668a
 EBUILD geant-data-4.10.7.ebuild 1523 BLAKE2B 9c6f459b64198d767a7d29dc2745bebd8acd8a558d0db42d6795de00af8ab7c3dbde2cb3a34fcf44ca740e7e48091a07fc6e3ae9fb27844a87eefc7e0330dc6f SHA512 606c2eb9e10ed4324d5e5640e00d1a5c2463dd9c6124206d11f05cf0410a4bee9a7a887213ff31e55575ccd1a77585771a84af78c651297111e6cba5a8a38244
 MISC metadata.xml 552 BLAKE2B e4704390fb18f3e4fef4a5de5feb818eb195b649203b37589ab1f2c35b8aa05e25e619034678c90a99bac8155dbd30220407190cb2c25d4006de20807ecb4fe4 SHA512 6c954effed4acc545b110c202ed645930904fd179aa2fb0ef971c7bc38cc419ddc696e06f0d080f358890171467cf311919c2fe0143acadfec9cd77bf748c55e
diff --git a/sci-physics/geant-data/geant-data-4.10.6-r1.ebuild b/sci-physics/geant-data/geant-data-4.10.6-r1.ebuild
deleted file mode 100644
index 807a0dc104e8..000000000000
--- a/sci-physics/geant-data/geant-data-4.10.6-r1.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 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.6_p1-r1.ebuild b/sci-physics/geant-data/geant-data-4.10.6_p1-r1.ebuild
deleted file mode 100644
index ae7c1d2b919d..000000000000
--- a/sci-physics/geant-data/geant-data-4.10.6_p1-r1.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-vmc/Manifest b/sci-physics/geant-vmc/Manifest
index 60fee01a124d..502bfc8df380 100644
--- a/sci-physics/geant-vmc/Manifest
+++ b/sci-physics/geant-vmc/Manifest
@@ -1,7 +1,4 @@
-AUX geant-vmc-4.4.0-fix-cflags.patch 661 BLAKE2B 121054bdcf8dfae328334221cc85c7d117a8dd9b0b096499ea07938bb05f303759c6478c2187f36e7b4ba22f4e1f0935d980802ce5195c1d2d9b5202d240b683 SHA512 7c6b7c253088a780101c51ac9a055fe79f65d78996206fce77d9e70a558e2b5b222eee4ccba689e68effc429cb8b2d41c6021fe4bead7d44f52daa1820a308a2
-DIST geant-vmc-4.5.1_p1.tar.gz 7441504 BLAKE2B 2bcb844a8fc79c800eec50f914cd7238a68ba0c1ffa1e8d185adcded70583118e39efbac3330f7942a098fc64f990c1e9e0eeb1796f71ebd98f97d121aa6c121 SHA512 760611c1df481ea3d9f9069061678677ffc2bcf9edd7cfd44789a6359b945bc341f705da0ee85ecda7f8ac2b096cd5b7aa9ea2c44b464e3085c16eeb33ee1316
-DIST geant4_vmc.4.0.tar.gz 7118838 BLAKE2B 5edbd13adeeb560188deb54c1f5d52fda371dd5f3dc04d676bcaf7edad0bbf8eb573d6345e5c3626b5b64c229d49b7f02aafec77a2587e525cf3f407444391b5 SHA512 faf5fed17b317399b97f77ff1c2a1bf1cead8f0b02a3a89244f01f8ae04ce621763e52b40000e481b3826796bb4d94216368d2e3c98a62f02048c5979f4ee648
-EBUILD geant-vmc-4.4.0.ebuild 2442 BLAKE2B 60d7a84b777d2f87fde249a31b05a9a0e6fd90f1f9e5c7b74d0770e9dd6f2f40663316b39e68f56e9ccf9b4edf9d9a1aec2ae83f13435529992eb7fb88ca59ec SHA512 c533ceccfdeed7ecaa4596056a11f6fcec9828a7f3f82556dd24686d59313318b4982ac87f57ef20d44393cd9c7308904dd2f3dc4a0d155f7e304f280fe97d1c
-EBUILD geant-vmc-4.5.1_p1.ebuild 2145 BLAKE2B 27addb17a3e05d8d635e6f2e57b2cb106857776d31862003f242a5a5c180cb2b5ec2162ab9a3d0f4124aa86560352f732f22e512b5a6f09fd738a7f5b1c49daf SHA512 85f23a09ba6ce4ddc905807955f944491d6e2ebc1889a0eda979ea82c89770cb822dfbc48c718103ae42075ef7d53160194689e562b993d7523ccdb47ff7ba2c
-EBUILD geant-vmc-9999.ebuild 2145 BLAKE2B 27addb17a3e05d8d635e6f2e57b2cb106857776d31862003f242a5a5c180cb2b5ec2162ab9a3d0f4124aa86560352f732f22e512b5a6f09fd738a7f5b1c49daf SHA512 85f23a09ba6ce4ddc905807955f944491d6e2ebc1889a0eda979ea82c89770cb822dfbc48c718103ae42075ef7d53160194689e562b993d7523ccdb47ff7ba2c
+DIST geant-vmc-4.5.3.tar.gz 7411643 BLAKE2B 31a486aa32f879093753aab09798eabf1a936f0aa246bb97c7f055eefb789c9c5a5097c14ce47b05a99f3cc2b46bea6edeba2af80ee362bb8fee039ee711eddc SHA512 918ce3ca4a4fb329f00000fce00dae3d4a4c9f348553f31bf474f727c1e67242b5ff28fe7dc5d3ab12d1174663b1dd96b654b5baf7edfa662ab3f66687792e94
+EBUILD geant-vmc-4.5.3.ebuild 2132 BLAKE2B 2b06d32c99ff9053351ec20246d28eb4b8a2e6121a49f724ab36b787395517a846770c14282e013c3f4c5206513165fb22e89ae3a16f3a677b013a5c20c1e497 SHA512 ffe882863e92e60b896221e2d7b752e3a77d687ab947374b381ff023271adf5189cbfffc6d3b60839d442263c6a3dc912484fd62ef63fb3831accb45887d5f87
+EBUILD geant-vmc-9999.ebuild 2132 BLAKE2B 2b06d32c99ff9053351ec20246d28eb4b8a2e6121a49f724ab36b787395517a846770c14282e013c3f4c5206513165fb22e89ae3a16f3a677b013a5c20c1e497 SHA512 ffe882863e92e60b896221e2d7b752e3a77d687ab947374b381ff023271adf5189cbfffc6d3b60839d442263c6a3dc912484fd62ef63fb3831accb45887d5f87
 MISC metadata.xml 1272 BLAKE2B 341ef37e4e2262b40fa6161af831f886a9ef2deb7691555323a8b464f731c526eaa2dc118e050b6fdbcd6f6663830ed238c6dc227ac2013617981d06c56731e5 SHA512 9e871ddf520845ea33f6db1f608a0ddfbf29e8c2c2a51a2cb39a419a8de7c0297747fe2c5a9da335923a7ad01795bd37e930da7b3fa6fd042c97acfb09a10a27
diff --git a/sci-physics/geant-vmc/files/geant-vmc-4.4.0-fix-cflags.patch b/sci-physics/geant-vmc/files/geant-vmc-4.4.0-fix-cflags.patch
deleted file mode 100644
index d3bf0dfdd308..000000000000
--- a/sci-physics/geant-vmc/files/geant-vmc-4.4.0-fix-cflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/g4root/test/OpNovice/CMakeLists.txt b/g4root/test/OpNovice/CMakeLists.txt
-index 1a8f316c..a2e144b6 100644
---- a/g4root/test/OpNovice/CMakeLists.txt
-+++ b/g4root/test/OpNovice/CMakeLists.txt
-@@ -44,7 +44,9 @@ endif()
- #----------------------------------------------------------------------------
- # Setup Geant4 include directories and compile definitions
- #
--include(${Geant4_USE_FILE})
-+# Workaround for upstream bug: http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1663
-+#include(${Geant4_USE_FILE})
-+include(UseGeant4)
- 
- #----------------------------------------------------------------------------
- # Locate sources and headers for this project
diff --git a/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild b/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
deleted file mode 100644
index fb2e982ebfd8..000000000000
--- a/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vmc-project/geant4_vmc.git"
-else
-	DOWN_PV=$(ver_cut 2-)
-	SRC_URI="http://root.cern.ch/download/vmc/geant4_vmc.${DOWN_PV}.tar.gz"
-	SOURCE_PV=$(ver_rs 1- . ${DOWN_PV})
-	S="${WORKDIR}/geant4_vmc.${SOURCE_PV}"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Virtual Monte Carlo Geant4 implementation"
-HOMEPAGE="http://root.cern.ch/root/vmc/VirtualMC.html"
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="doc examples geant3 +g4root +mtroot vgm test"
-
-# sci-physics/root[c++11] required to match sci-physics/geant flags.
-RDEPEND="
-	>=sci-physics/geant-4.10.03:=[opengl,geant3?]
-	sci-physics/root:=[c++11,vmc]
-	vgm? ( >=sci-physics/vgm-4.4:= )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-RESTRICT="
-	!examples? ( test )
-	!geant3? ( test )
-	!g4root? ( test )
-	!mtroot? ( test )
-	!test? ( test )
-	!vgm? ( test )"
-
-DOCS=(
-	history
-	README.md
-)
-PATCHES=(
-	"${FILESDIR}"/"${PN}-${PV}"-fix-cflags.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DGeant4VMC_USE_VGM="$(usex vgm)"
-		-DGeant4VMC_USE_GEANT4_G3TOG4="$(usex geant3)"
-		-DGeant4VMC_USE_G4Root="$(usex g4root)"
-		-DGeant4VMC_BUILD_MTRoot="$(usex mtroot)"
-		-DGeant4VMC_BUILD_EXAMPLES="$(usex test)"
-		-DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc ; then
-		local dirs=(
-			source
-			$(usev g4root)
-			$(usev mtroot)
-			$(usev examples)
-		)
-		local d
-		for d in "${dirs[@]}"; do
-			pushd "${d}" > /dev/null || die
-			doxygen || die
-			popd > /dev/null || die
-		done
-	fi
-}
-
-src_test() {
-	# Required by sci-physics/root for pointer validity checking,
-	# see e.g. https://sft.its.cern.ch/jira/browse/ROOT-8146 .
-	addwrite /dev/random
-	cd examples || die
-	# Bug: Can not disable Garfield in test suite, fixed upstream.
-	sed -i 's/ExGarfield//' test_suite.sh || die
-	# Bug: Path for E03 sub-examples wrong, see https://github.com/vmc-project/geant4_vmc/pull/11 .
-	sed -i 's#only in E03 test#only in E03 test\nG4EXEDIR=${BUILDDIR}/examples/$EXAMPLE/$OPTION#' test_suite_exe.sh || die
-	./test_suite.sh --g3=off --builddir="${BUILD_DIR}" || die
-	./test_suite_exe.sh --g3=off --garfield=off --builddir="${BUILD_DIR}" || die
-}
-
-src_install() {
-	cmake_src_install
-	use doc && local HTML_DOCS=(doc/.)
-	einstalldocs
-}
diff --git a/sci-physics/geant-vmc/geant-vmc-4.5.1_p1.ebuild b/sci-physics/geant-vmc/geant-vmc-4.5.3.ebuild
index b28eff16cc8b..a4e3263f8afa 100644
--- a/sci-physics/geant-vmc/geant-vmc-4.5.1_p1.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-4.5.3.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
@@ -8,7 +8,6 @@ inherit cmake
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/vmc-project/geant4_vmc.git"
-	KEYWORDS=""
 else
 	MY_PV=$(ver_rs 1-2 - $(ver_cut 2-))
 	SRC_URI="https://github.com/vmc-project/geant4-vmc/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
@@ -17,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Virtual Monte Carlo Geant4 implementation"
-HOMEPAGE="http://root.cern.ch/root/vmc/VirtualMC.html"
+HOMEPAGE="https://github.com/vmc-project/vmc"
 
 LICENSE="GPL-3"
 SLOT="4"
@@ -37,8 +36,8 @@ RDEPEND="
 	>=sci-physics/geant-4.10.6[c++11?,c++14?,c++17?,opengl,geant3?]
 	>=sci-physics/root-6.18:=[c++11?,c++14?,c++17?]
 	vgm? ( >=sci-physics/vgm-4.8:=[c++11?,c++14?,c++17?] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 RESTRICT="
 	!examples? ( test )
 	!geant3? ( test )
diff --git a/sci-physics/geant-vmc/geant-vmc-9999.ebuild b/sci-physics/geant-vmc/geant-vmc-9999.ebuild
index b28eff16cc8b..a4e3263f8afa 100644
--- a/sci-physics/geant-vmc/geant-vmc-9999.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-9999.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
@@ -8,7 +8,6 @@ inherit cmake
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/vmc-project/geant4_vmc.git"
-	KEYWORDS=""
 else
 	MY_PV=$(ver_rs 1-2 - $(ver_cut 2-))
 	SRC_URI="https://github.com/vmc-project/geant4-vmc/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
@@ -17,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Virtual Monte Carlo Geant4 implementation"
-HOMEPAGE="http://root.cern.ch/root/vmc/VirtualMC.html"
+HOMEPAGE="https://github.com/vmc-project/vmc"
 
 LICENSE="GPL-3"
 SLOT="4"
@@ -37,8 +36,8 @@ RDEPEND="
 	>=sci-physics/geant-4.10.6[c++11?,c++14?,c++17?,opengl,geant3?]
 	>=sci-physics/root-6.18:=[c++11?,c++14?,c++17?]
 	vgm? ( >=sci-physics/vgm-4.8:=[c++11?,c++14?,c++17?] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 RESTRICT="
 	!examples? ( test )
 	!geant3? ( test )
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index 2242e38d71f5..f7051c781a20 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -1,12 +1,3 @@
-AUX geant-4.10.6-datadir.patch 6571 BLAKE2B 2047655af7cdbf4c63a077c22ccda9eb8f0042291d5afcaf0b67614c7797afed36645ffc6ecddd6797b614c7f412412c4ebcd33c064ef648175b40a3c7e46537 SHA512 48569a7ea8f285e4e261f8b24f2910b7022899f5276f61fa86b27e993e36cebbb8f96f14ba94c0d7174355ec15aa6e415d8ba28d54b2b0efa9366c85644f10d8
-DIST geant4.10.06.p01.tar.gz 34869969 BLAKE2B 0a27f34df213a0dcc2d87c6001c100269be7496519c614fa5b51cd6502d98232d09de0f3c44216c34b6788ec8a1f626d22a53cb7329027006c614a10777b6896 SHA512 d9bca66b086a309a577dcf018c0ca52f5d786b1ebe5ce9d30c29c579c342399816c34efbcb34af60871145b6713cb8151f5517c5a0aa9d24d00e4257a5c1c6c0
-DIST geant4.10.06.p02.tar.gz 34833550 BLAKE2B c1a3b51cf5fc135edd8f547e5a88c80f8f6ed991be92439e161225afa0447473b67c0ef0757011e1e3a22a370f43ad9b14c9fe9cb3d5f5f0a78a762c86e0dd80 SHA512 bcfbea05c88a6021898e361ffa0c8e28637631e65b2f9ae2d694deae36a67c6af78785569c5971d1c63a4692a3dfbfc082cf14d7af209cb9f36efff9bec9bc20
-DIST geant4.10.06.p03.tar.gz 35099426 BLAKE2B 75668b87eb3f1d8be00c46dc3e6e2131707ad89f4d077d2c55b7c985803709da565dbddd2ebd6ee7b6a3f4d58dc84a41bcded3b1db926127b480fb8e9fab2765 SHA512 844769991e20f4397a336a8e94bb82434b4ce44c84c956935659d2407ebf29b388b672650466f9683d3c99f9c7fa4f2c81e3f27075427f1613d825f38a74df69
-DIST geant4.10.06.tar.gz 34834510 BLAKE2B 48f50c734186e444f5ef2fd02b013565db7f404b7fbaeb3127d7dd67ede76196fd5fa4512a5482cceb7696305eb72dbe819fe43fa26ac63ded49259d804f5ccf SHA512 e03d69cb66947ddc71d20b9065fd5db384dfc8b2b8e905ddab9ebb992c642dc33f369d7eba5f2338487da5d9d28f20f3078917f222d187c65e5af1a0112ee044
 DIST geant4.10.07.tar.gz 36422877 BLAKE2B d81a37e0968f3c13bb846efc252b1b31cb01a8642610b079bcf6ec1741e7f5da09d50f4abe4054b7a06433dc7d9b611110c4f9a1f971a5f1df27580d49b8906d SHA512 057ab2c6ee5d5ad7012bd889bf883faa3ef1fa72a93190d00d1320f250b7b52e21cbae552cbc35065ad5f5bd46cd91fd1536dd4d5e620afa0abb6b065bd7c86b
-EBUILD geant-4.10.6-r1.ebuild 3074 BLAKE2B 510a8c15faa1ad4140823c3c9551a69e10ce13a4305dabb066dfde64b701dde40be609942e7dadeacd7e4b5f586888c05c5705cfb423b752109b6421a3aba9a6 SHA512 38c2a9759e0a510eae076acd0ac11abc093ae2ecefb91333302a62fb8940efc9094af02ea2acfe316b835b00f3511f7fe62805e4c67c631337d19fdcec1823f8
-EBUILD geant-4.10.6.3.ebuild 3146 BLAKE2B c2b84128498597479c046f17fa4d06b871601a54cb6188525779a67c0268a38804ce7cf65e9e22d967b07b5bbe018842e2cd3af216092849f06871f498e0a14c SHA512 dfcfe5f15b66028903b640ef31d9970d0f4d3da02eb4fbde1cc2bf416c9b20c34ddc9931a99de2222044af4ea3f80e5d58feb812460b1bcab3dabd41c2451d44
-EBUILD geant-4.10.6_p1-r1.ebuild 3074 BLAKE2B 510a8c15faa1ad4140823c3c9551a69e10ce13a4305dabb066dfde64b701dde40be609942e7dadeacd7e4b5f586888c05c5705cfb423b752109b6421a3aba9a6 SHA512 38c2a9759e0a510eae076acd0ac11abc093ae2ecefb91333302a62fb8940efc9094af02ea2acfe316b835b00f3511f7fe62805e4c67c631337d19fdcec1823f8
-EBUILD geant-4.10.6_p2.ebuild 3024 BLAKE2B 1716d3eeb1092286b0d166488c38bd44206790e5a9b5937b542019960001f5d954de57c7bff709f8359b7cedbdfb4af76121cff22c8bbf8bb331105ad035809e SHA512 713ac726c201f589d1c4b42b1bafe2c8144e3eba46d12dd53b413f48bcecba9c5789ce10a0bd0384d40c1f7854bdd057253a47d2df0f66b0e90f15e66cef5785
 EBUILD geant-4.10.7.ebuild 2959 BLAKE2B d61150dfb0d0e2e5c3c5e2e7168b6808ce6f7acdb7fe62b2e2939bbd03b717a8c5bd7e875c85833cad97f7431d7f23e1a316495e741caa03626a22981688d395 SHA512 027ffcf842f0d4b4e439a5b9b61702d9830a6ddb7188b8af0d18801d48be16c017a94443238cf1d120ded2bd014ea0643f8254a93a874acf50e54d7afe202c2c
 MISC metadata.xml 1683 BLAKE2B a0eb481dd6e784064dce6265b9361b51c24fa845f7af7ec238a1ffef215ef16dba7c02b795d8ea50dddb255c513c1a3941761bb99f813664d3ef012377aca174 SHA512 7631f3f6fbc0a5a730fb260476c9d514b05c71c4967c5f0059523cbae99415e5e48a416a8a4b481de5c2c484484489b4260f8ceacdeca4b0ee0e670dc7293985
diff --git a/sci-physics/geant/files/geant-4.10.6-datadir.patch b/sci-physics/geant/files/geant-4.10.6-datadir.patch
deleted file mode 100644
index c26bf8914b46..000000000000
--- a/sci-physics/geant/files/geant-4.10.6-datadir.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From 44966c44635debaddd859c788b008cd4e6c7fab6 Mon Sep 17 00:00:00 2001
-From: Guilherme Amadio <amadio@cern.ch>
-Date: Fri, 13 Mar 2020 15:36:27 +0100
-Subject: [PATCH] Allow customization of CMAKE_INSTALL_DATADIR
-
----
- cmake/Modules/G4CMakeMain.cmake               |  2 +-
- cmake/Modules/G4ConfigureGNUMakeHelpers.cmake | 20 +++++++++----------
- cmake/Modules/Geant4InstallData.cmake         |  4 ++--
- source/analysis/CMakeLists.txt                |  2 +-
- source/analysis/g4tools/CMakeLists.txt        |  2 +-
- 5 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/cmake/Modules/G4CMakeMain.cmake b/cmake/Modules/G4CMakeMain.cmake
-index a6b984fcad..5ab63202ca 100644
---- a/cmake/Modules/G4CMakeMain.cmake
-+++ b/cmake/Modules/G4CMakeMain.cmake
-@@ -121,7 +121,7 @@ mark_as_advanced(GEANT4_INSTALL_EXAMPLES)
- 
- if(GEANT4_INSTALL_EXAMPLES)
-   install(DIRECTORY examples
--    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Geant4-${Geant4_VERSION}
-+    DESTINATION ${CMAKE_INSTALL_DATADIR}
-     COMPONENT Examples
-     PATTERN "CVS" EXCLUDE
-     PATTERN ".svn" EXCLUDE
-diff --git a/cmake/Modules/G4ConfigureGNUMakeHelpers.cmake b/cmake/Modules/G4ConfigureGNUMakeHelpers.cmake
-index c2aeefee59..1052f43a45 100644
---- a/cmake/Modules/G4ConfigureGNUMakeHelpers.cmake
-+++ b/cmake/Modules/G4ConfigureGNUMakeHelpers.cmake
-@@ -729,7 +729,7 @@ _g4tc_configure_build_tree_scripts(geant4make)
- # +- CMAKE_INSTALL_PREFIX
- #    +- LIBDIR/Geant4-VERSION (G4LIB)
- #    +- INCLUDEDIR/Geant4     (G4INCLUDE)
--#    +- DATAROOTDIR/Geant4-VERSION/
-+#    +- DATADIR/
- #       +- geant4make              (THIS IS G4INSTALL!)
- #          +- geant4make.(c)sh
- #          +- config/
-@@ -742,7 +742,7 @@ set(G4INSTALL "\"\$geant4make_root\"")
- # - Include dir
- file(RELATIVE_PATH
-   G4MAKE_TO_INCLUDEDIR
--  ${CMAKE_INSTALL_FULL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make
-+  ${CMAKE_INSTALL_FULL_DATADIR}/geant4make
-   ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${PROJECT_NAME}
-   )
- set(G4INCLUDE "\"`cd \$geant4make_root/${G4MAKE_TO_INCLUDEDIR} > /dev/null \; pwd`\"")
-@@ -750,7 +750,7 @@ set(G4INCLUDE "\"`cd \$geant4make_root/${G4MAKE_TO_INCLUDEDIR} > /dev/null \; pw
- # - Bin dir
- file(RELATIVE_PATH
-   G4MAKE_TO_BINDIR
--  ${CMAKE_INSTALL_FULL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make
-+  ${CMAKE_INSTALL_FULL_DATADIR}/geant4make
-   ${CMAKE_INSTALL_FULL_BINDIR}
-   )
- set(G4BIN_DIR "\"`cd \$geant4make_root/${G4MAKE_TO_BINDIR} > /dev/null \; pwd`\"")
-@@ -758,7 +758,7 @@ set(G4BIN_DIR "\"`cd \$geant4make_root/${G4MAKE_TO_BINDIR} > /dev/null \; pwd`\"
- # - Lib dir
- file(RELATIVE_PATH
-   G4MAKE_TO_LIBDIR
--  ${CMAKE_INSTALL_FULL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make
-+  ${CMAKE_INSTALL_FULL_DATADIR}/geant4make
-   ${CMAKE_INSTALL_FULL_LIBDIR}
-   )
- set(G4LIB "\"`cd \$geant4make_root/${G4MAKE_TO_LIBDIR}/Geant4-${Geant4_VERSION} > /dev/null \; pwd`\"")
-@@ -775,7 +775,7 @@ foreach(_ds ${GEANT4_EXPORTED_DATASETS})
- 
-   file(RELATIVE_PATH
-     G4MAKE_TO_DATADIR
--    ${CMAKE_INSTALL_FULL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make
-+    ${CMAKE_INSTALL_FULL_DATADIR}/geant4make
-     ${${_ds}_PATH}
-     )
-   set(${_ds}_PATH "\"`cd \$geant4make_root/${G4MAKE_TO_DATADIR} > /dev/null \; pwd`\"")
-@@ -788,7 +788,7 @@ set(TOOLS_FONT_PATH "\"`cd \$geant4make_root/../fonts > /dev/null ; pwd`\"")
- _g4tc_configure_install_tree_scripts(
-     ${CMAKE_BINARY_DIR}/InstallTreeFiles
-     geant4make
--    ${CMAKE_INSTALL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make
-+    ${CMAKE_INSTALL_DATADIR}/geant4make
-     )
- 
- 
-@@ -797,7 +797,7 @@ _g4tc_configure_install_tree_scripts(
- #   softlink to the G4SYSTEM directory.
- #
- install(DIRECTORY config
--    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make
-+    DESTINATION ${CMAKE_INSTALL_DATADIR}/geant4make
-     COMPONENT Development
-     FILES_MATCHING PATTERN "*.gmk"
-     PATTERN "CVS" EXCLUDE
-@@ -845,11 +845,11 @@ endforeach()
- 
- # - Fonts
- file(RELATIVE_PATH
--  G4ENV_BINDIR_TO_DATAROOTDIR
-+  G4ENV_BINDIR_TO_DATADIR
-   "${CMAKE_INSTALL_FULL_BINDIR}"
--  "${CMAKE_INSTALL_FULL_DATAROOTDIR}/Geant4-${Geant4_VERSION}"
-+  "${CMAKE_INSTALL_FULL_DATADIR}"
-   )
--set(TOOLS_FONT_PATH "\"`cd \$geant4_envbindir/${G4ENV_BINDIR_TO_DATAROOTDIR}/fonts > /dev/null ; pwd`\"")
-+set(TOOLS_FONT_PATH "\"`cd \$geant4_envbindir/${G4ENV_BINDIR_TO_DATADIR}/fonts > /dev/null ; pwd`\"")
- 
- 
- # - Configure for each shell
-diff --git a/cmake/Modules/Geant4InstallData.cmake b/cmake/Modules/Geant4InstallData.cmake
-index 496b0fc4df..55536e51d4 100644
---- a/cmake/Modules/Geant4InstallData.cmake
-+++ b/cmake/Modules/Geant4InstallData.cmake
-@@ -105,7 +105,7 @@ set(GEANT4_DATASETS_URL "https://cern.ch/geant4-data/datasets")
- set(GEANT4_BUILD_FULL_DATADIR ${PROJECT_BINARY_DIR}/data)
- 
- # Where to install data in the install tree (a Default)
--set(GEANT4_INSTALL_DATADIR_DEFAULT "${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}-${${PROJECT_NAME}_VERSION}/data")
-+set(GEANT4_INSTALL_DATADIR_DEFAULT "${CMAKE_INSTALL_DATADIR}/data")
- 
- # File containing dataset list
- set(GEANT4_DATASETS_DEFINITIONS "Geant4DatasetDefinitions")
-@@ -596,7 +596,7 @@ endfunction()
- # Choose Physics Data Install Dir
- # This follows the pattern for interface and setting as in GNUInstallDirs
- if(NOT GEANT4_INSTALL_DATADIR)
--  set(GEANT4_INSTALL_DATADIR "" CACHE PATH "read-only architecture independent Geant4 physics data (DATAROOTDIR/${GEANT4_INSTALL_DATADIR_DEFAULT}")
-+  set(GEANT4_INSTALL_DATADIR "" CACHE PATH "read-only architecture independent Geant4 physics data (DATADIR/data")
-   set(GEANT4_INSTALL_DATADIR "${GEANT4_INSTALL_DATADIR_DEFAULT}")
- endif()
- 
-diff --git a/source/analysis/CMakeLists.txt b/source/analysis/CMakeLists.txt
-index 44fa4a97be..4c40c704be 100644
---- a/source/analysis/CMakeLists.txt
-+++ b/source/analysis/CMakeLists.txt
-@@ -67,7 +67,7 @@ endif()
- #
- if (GEANT4_USE_FREETYPE)
-   install(DIRECTORY fonts/
--    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/fonts
-+    DESTINATION ${CMAKE_INSTALL_DATADIR}/fonts
-     PATTERN ".svn" EXCLUDE
-   )
- endif()
-diff --git a/source/analysis/g4tools/CMakeLists.txt b/source/analysis/g4tools/CMakeLists.txt
-index 54c72f1297..df87582bc1 100644
---- a/source/analysis/g4tools/CMakeLists.txt
-+++ b/source/analysis/g4tools/CMakeLists.txt
-@@ -43,7 +43,7 @@ install(DIRECTORY include/
- # We also need to install the tools license
- #
- install(FILES tools.license
--  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Geant4-${Geant4_VERSION}
-+  DESTINATION ${CMAKE_INSTALL_DATADIR}
-   )
- 
- #------------------------------------------------------------------------------
--- 
-2.25.1
-
diff --git a/sci-physics/geant/geant-4.10.6-r1.ebuild b/sci-physics/geant/geant-4.10.6-r1.ebuild
deleted file mode 100644
index 59fedc8d7cc8..000000000000
--- a/sci-physics/geant/geant-4.10.6-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-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"
-	;;
-*_p*)
-	MY_P+=.p$(printf %02d $(ver_cut 5))
-	DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
-	HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
-	;;
-*)
-	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 )"
-
-RDEPEND="
-	dev-libs/expat
-	>=sci-physics/clhep-2.4.1.3: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
-	)"
-
-PATCHES=( "${FILESDIR}"/geant-4.10.6-datadir.patch )
-
-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_TLS_MODEL=$(usex threads global-dynamic initial-exec)
-		-DGEANT4_INSTALL_DATA=OFF
-		-DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
-		-DGEANT4_INSTALL_EXAMPLES=$(usex examples)
-		-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_WT=OFF
-		-DGEANT4_USE_XM=$(usex motif)
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		${EXTRA_ECONF}
-	)
-	if use inventor; then
-		mycmakeargs+=(
-			-DINVENTOR_INCLUDE_DIR="$(coin-config --includedir)"
-			-DINVENTOR_SOXT_INCLUDE_DIR="$(coin-config --includedir)"
-		)
-	fi
-	cmake-utils_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-utils_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.6.3.ebuild b/sci-physics/geant/geant-4.10.6.3.ebuild
deleted file mode 100644
index 2339a156d897..000000000000
--- a/sci-physics/geant/geant-4.10.6.3.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 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.1.3: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_WT=OFF
-		-DGEANT4_USE_XM=$(usex motif)
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		${EXTRA_ECONF}
-	)
-	if use inventor; then
-		mycmakeargs+=(
-			-DINVENTOR_INCLUDE_DIR="$(coin-config --includedir)"
-			-DINVENTOR_SOXT_INCLUDE_DIR="$(coin-config --includedir)"
-		)
-	fi
-	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.6_p1-r1.ebuild b/sci-physics/geant/geant-4.10.6_p1-r1.ebuild
deleted file mode 100644
index 59fedc8d7cc8..000000000000
--- a/sci-physics/geant/geant-4.10.6_p1-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-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"
-	;;
-*_p*)
-	MY_P+=.p$(printf %02d $(ver_cut 5))
-	DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
-	HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
-	;;
-*)
-	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 )"
-
-RDEPEND="
-	dev-libs/expat
-	>=sci-physics/clhep-2.4.1.3: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
-	)"
-
-PATCHES=( "${FILESDIR}"/geant-4.10.6-datadir.patch )
-
-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_TLS_MODEL=$(usex threads global-dynamic initial-exec)
-		-DGEANT4_INSTALL_DATA=OFF
-		-DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
-		-DGEANT4_INSTALL_EXAMPLES=$(usex examples)
-		-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_WT=OFF
-		-DGEANT4_USE_XM=$(usex motif)
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		${EXTRA_ECONF}
-	)
-	if use inventor; then
-		mycmakeargs+=(
-			-DINVENTOR_INCLUDE_DIR="$(coin-config --includedir)"
-			-DINVENTOR_SOXT_INCLUDE_DIR="$(coin-config --includedir)"
-		)
-	fi
-	cmake-utils_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-utils_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.6_p2.ebuild b/sci-physics/geant/geant-4.10.6_p2.ebuild
deleted file mode 100644
index b266de392cd4..000000000000
--- a/sci-physics/geant/geant-4.10.6_p2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-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"
-	;;
-*_p*)
-	MY_P+=.p$(printf %02d $(ver_cut 5))
-	DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
-	HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
-	;;
-*)
-	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 )"
-
-RDEPEND="
-	dev-libs/expat
-	>=sci-physics/clhep-2.4.1.3:2=[threads?]
-	data? ( ~sci-physics/geant-data-4.10.6_p1 )
-	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_TLS_MODEL=$(usex threads global-dynamic initial-exec)
-		-DGEANT4_INSTALL_DATA=OFF
-		-DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
-		-DGEANT4_INSTALL_EXAMPLES=$(usex examples)
-		-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_WT=OFF
-		-DGEANT4_USE_XM=$(usex motif)
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		${EXTRA_ECONF}
-	)
-	if use inventor; then
-		mycmakeargs+=(
-			-DINVENTOR_INCLUDE_DIR="$(coin-config --includedir)"
-			-DINVENTOR_SOXT_INCLUDE_DIR="$(coin-config --includedir)"
-		)
-	fi
-	cmake-utils_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-utils_src_install
-	rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
-
-	einstalldocs
-}
diff --git a/sci-physics/pythia/Manifest b/sci-physics/pythia/Manifest
index 544667930df7..9a0a3a47ac45 100644
--- a/sci-physics/pythia/Manifest
+++ b/sci-physics/pythia/Manifest
@@ -14,12 +14,9 @@ DIST pythia-6.4.28.tar.xz 490248 BLAKE2B aff9006a4d3a0536d39a5b5161329f058b98055
 DIST pythia6-20160413.tar.gz 567976 BLAKE2B 92ee81e41db46d49706599ee387a650f67d54a0ea165648de0d09d6cec811c2a4b22903c15cca0abaf5f34cf28333d70315a2c71f4ce0ec0bc48757c20114ae7 SHA512 2a9ea2ae299e8d49bd9750f8c68f0b7f534fb91254c2eebc60ef40828400bdf5e5c4e0956d61807e773a51db873ab4a036c3ac264f904d0bb2b85f4860e538d3
 DIST pythia6.tar.gz 567451 BLAKE2B c32a67d87fc6f22027d3d9551256af5a0151e494fbae02c5d14ccf08595f1ebf49b638a1c33f7a52214e8bbb510756a72ef0f68f5dc8037e2a6acd3fbf290cfd SHA512 baa18023de22c3e90f14d2a5a39efa171905f507a31a90f87c65dca271b3be4c9f0d1a56282f5a04b3efabe0b5b15c964e4569d1f9994a75750e52e0be4360b1
 DIST pythia8186.tgz 8921248 BLAKE2B 9e753a04c2dbc5362a24b06d40c238e5fcc5ac700dd20b9bc47b1a68604fdb87808018593c28a1d6dcb06a212bdec1146431f1096db70f4c934413a0c3b20fa0 SHA512 84729004abbdf522183c27918ae35db037a8954af761a2b452dcff54f82076b1e3bfc7fe9ea0a7cb2c0b6499aedb1c25cc13768d47b24edaa08d631b55d0b86b
-DIST pythia8210.tgz 14301345 BLAKE2B 799955192d55f34fb7a0b91c4ea4b130fe2836437b5fed3416be5e0edf476c00a3054615e73d3b926cfc3facffbf6bbd973fb59e1439481a95c00e91fdabb5f5 SHA512 fe2d02e32fd5d25bcdcc216754b91ca509a189c58f1a06ca8deba975af552586632fc8cf8ad3e62920884ee64c4af596fbe7c6872f5ddbd1f5a0cea4ba4bc90d
 DIST pythia8226.tgz 17639842 BLAKE2B b80d7c10bd5ccc45fbb2db0df0eff679236b9911958f58987517b475e055959aa494a2199f64117631baedd90c8e2753f996e5d64552e39e54859bfe77274dad SHA512 85db807264f99c27dd87ad0572b98f4ac8d37fed818c3dd1ac89f0ac124ae0a5ee13b290727e515cb04269a6e0be8b386d954bed62309f26d1e60b431f952ca0
 EBUILD pythia-6.4.28-r1.ebuild 1908 BLAKE2B cc2ddb262eea5a646d38c983e22f3ff46f60621b73aa9c469a7afb67455ec3935d89826d3633d2401ada405ae9df09e823f263c57d1ccad5829eb492af71f17c SHA512 dcbf3226adf25fb2c738f0825cd70aef70d3c1d77d123bb765db2f9666b7fe23e06f469ed2ee285dd1a315731ddc7a90d798e53b88723b72586a0dfe11ad7863
 EBUILD pythia-6.4.28.ebuild 1864 BLAKE2B c89b5effbe414331507c920841617698affb57152a721be748a336cdd26e1cb492d273e9f43e60e485d4ad7407fbda88c2578b72f2c56789026c7e0bccf76999 SHA512 9e3fa32d791672b3aec15f779700fd33a6a83488ca315e365e3fdc7eb88ee3a8405dffcc6eda705d3334c79e8a726c1130ba97b2baf0d91004c881b1e922a2af
 EBUILD pythia-8.1.86-r1.ebuild 2618 BLAKE2B 28b0db0d7168c731eb627deebe5542426bb3969f76a8135ebd4dc02d5e710f68ff268c65b3c9fd7ea78246bc5d428041e22984959b9f62921dc2fc1a0a479f7b SHA512 0b07f2d9d85cc46a04cd79d9363bb044f80494c20ace27411d9593d4847932c79453129a158fc20ddf616f63a0965be165c1e68c61994919f0fb17e13a14af1c
-EBUILD pythia-8.1.86.ebuild 2573 BLAKE2B 7cf44a768151c21ebc854ca5b3ce3ad3022ccb98977f4d9035169efdbc66e5b1a0256508298f7b020064d946c86e6f4e051690ce068e167f210a86054db04ce9 SHA512 e1682daf71c734fd97a0d957975856158e3ba4c674a804be6ee9e1dedf4b03fb3f5b2639a39a2ae37bbef96d980efe1ce57b9d6dc89e2635c6a720df75b9a5f5
-EBUILD pythia-8.2.10.ebuild 5821 BLAKE2B f712bffef7f25bc38cef85eb8af4c7fea376147f60d8945d314d47121a4a3a4c8482b25878e534350fc12eb4a4e5096fbfa0604bfb85e3c984184cfacd69c0f5 SHA512 26a5ebbc406147c5a58accf6749f972f75417aeee72b4e421e616668dee15f151f2cc72075edafc0c94a538a3b7c806571b290262937187e7d1d5f6acafac530
 EBUILD pythia-8.2.26.ebuild 5847 BLAKE2B 7c62a7b2d2f1623af2b30350a84af3843430c0b25af45b46d1c2d5beb79c93d05f1d06042ddcd151ce5bd9c2ef015fd49bc6ae6df2c938fa9fed0df63748a4bf SHA512 727d1f977d5425544512b2c9fa76a3c5229641f2c01e45ab27f1e8262ab7585421ac29b10ffe77225a5fe27092595de2c2c759e4bde2325d6be1eaefc983087c
 MISC metadata.xml 1298 BLAKE2B 3a8448cffc50ab81baf30e783a7d30387f4cd61be3f1a35ccdc9277dbb33d7178bbe9e103d189dd78a6775fcfa563480363448308a583ab2d9b513eb6e6f2b46 SHA512 b991381193c62d05d01ea82c74a2fabe3968683b4a1e0914027768dbbc3d2b52a85584b77b1b7274e77222e10da0aaa1a55d3982b423bc7c2b5deb4d775e6389
diff --git a/sci-physics/pythia/pythia-8.1.86.ebuild b/sci-physics/pythia/pythia-8.1.86.ebuild
deleted file mode 100644
index b7a47e6657ba..000000000000
--- a/sci-physics/pythia/pythia-8.1.86.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils versionator toolchain-funcs multilib
-
-MV=$(get_major_version)
-MY_P=${PN}$(replace_all_version_separators "" ${PV})
-
-DESCRIPTION="Lund Monte Carlo high-energy physics event generator"
-HOMEPAGE="http://pythia8.hepforge.org/"
-SRC_URI="http://home.thep.lu.se/~torbjorn/${PN}${MV}/${MY_P}.tgz"
-
-SLOT="8"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples gzip +hepmc static-libs"
-
-DEPEND="
-	gzip? ( dev-libs/boost sys-libs/zlib )
-	hepmc? ( sci-physics/hepmc:0= )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	PYTHIADIR="${EPREFIX}/usr/share/pythia8"
-	# set datadir for xmldor in include file
-	sed -i \
-		-e "s:../xmldoc:${PYTHIADIR}/xmldoc:" \
-		include/Pythia8/Pythia.h || die
-	# respect libdir, prefix, flags
-	sed -i \
-		-e "s:/lib:/$(get_libdir):g" \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e "s:-O2::g" \
-		configure || die
-	sed -i \
-		-e "s:LIBDIR=.*:LIBDIR=$(get_libdir):" \
-		-e "s:LIBDIRARCH=.*:LIBDIRARCH=$(get_libdir):" \
-		-e "s:cp -r lib:cp -r $(get_libdir):" \
-		-e '/ln -fs/d' \
-		Makefile examples/Makefile || die
-}
-
-src_configure() {
-	export USRCXXFLAGS="${CXXFLAGS}"
-	export USRLDFLAGSSHARED="${LDFLAGS}"
-	tc-export CC CXX
-	# homemade configure script
-	./configure \
-		--installdir="${EPREFIX}/usr" \
-		--datadir="${PYTHIADIR}" \
-		--enable-shared \
-		$(usex gzip "--enable-gzip=yes" "") \
-		$(usex hepmc "--with-hepmcversion=2 --with-hepmc=${EPREFIX}/usr" "") \
-		|| die
-	if ! use static-libs; then
-		sed -i \
-			-e '/targets.*=$(LIBDIR.*\.a$/d' \
-			-e 's/+=\(.*libpythia8\.\)/=\1/' \
-			Makefile || die
-		sed -i \
-			-e 's:\.a:\.so:g' \
-			-e 's:$(LIBDIRARCH):$(LIBDIR):g' \
-			examples/Makefile || die
-	fi
-}
-
-src_test() {
-	cd examples || die
-	# use emake for parallel instead of long runmains
-	local tests="$(echo main0{1..8})" t
-	use hepmc && tests="${tests} main31"
-	emake ${tests}
-	for t in ${tests}; do
-		LD_LIBRARY_PATH="${S}/$(get_libdir):${LD_LIBRARY_PATH}" \
-			bin/${t}.exe > ${t}.out || die "test ${t} failed"
-	done
-	emake clean && rm main*out
-}
-
-src_install() {
-	emake INSTALLDIR="${ED}/usr" DATADIR="${D}/${PYTHIADIR}" install
-	rm -r "${D}"/${PYTHIADIR}/{html,php}doc || die
-	echo "PYTHIA8DATA=${PYTHIADIR}/xmldoc" >> 99pythia8
-	doenvd 99pythia8
-
-	dodoc GUIDELINES AUTHORS README
-	if use doc; then
-		dodoc worksheet.pdf
-		dohtml -r htmldoc/*
-	fi
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/sci-physics/pythia/pythia-8.2.10.ebuild b/sci-physics/pythia/pythia-8.2.10.ebuild
deleted file mode 100644
index 8c08ee47f626..000000000000
--- a/sci-physics/pythia/pythia-8.2.10.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs versionator
-
-MV=$(get_major_version)
-MY_P=${PN}$(replace_all_version_separators "" ${PV})
-LHA_VER="6.1"
-
-DESCRIPTION="Lund Monte Carlo high-energy physics event generator"
-HOMEPAGE="http://pythia8.hepforge.org/"
-SRC_URI="http://home.thep.lu.se/~torbjorn/${PN}${MV}/${MY_P}.tgz
-	test? ( lhapdf? (
-		https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/CT10.tar.gz
-		https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/MRST2007lomod.tar.gz
-		https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/NNPDF23_nlo_as_0119_qed_mc.tar.gz
-		https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/NNPDF23_nnlo_as_0119_qed_mc.tar.gz
-		https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/cteq66.tar.gz
-		https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/cteq6l1.tar.gz
-		https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/unvalidated/MRST2004qed.tar.gz
-	) )"
-
-SLOT="8"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples gzip +hepmc fastjet lhapdf root static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	fastjet? ( >=sci-physics/fastjet-3 )
-	gzip? ( sys-libs/zlib )
-	hepmc? ( sci-physics/hepmc:0= )
-	lhapdf? ( >=sci-physics/lhapdf-6:= )
-"
-# ROOT is used only when building related tests
-DEPEND="${RDEPEND}
-	test? ( root? ( sci-physics/root:= ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if use root && ! use test; then
-		ewarn "ROOT support will only affect examples code build during test stage."
-		ewarn "Since you have tests disabled, this is a no-op."
-	fi
-}
-
-src_prepare() {
-	PYTHIADIR="/usr/share/pythia8"
-	EPYTHIADIR="${EPREFIX}${PYTHIADIR}"
-	# set datadir for xmldor in include file
-	sed -i \
-		-e "s:../share/Pythia8/xmldoc:${EPYTHIADIR}/xmldoc:" \
-		include/Pythia8/Pythia.h || die
-	# respect libdir, prefix, flags
-	sed -i \
-		-e "s:/lib:/$(get_libdir):g" \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e "s:-O2:${CXXFLAGS}:g" \
-		-e "s:Cint:Core:g" \
-		configure || die
-	sed -i 's:$(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED):$(CXX) $(LDFLAGS) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED):g' \
-		Makefile || die
-	sed -i 's:$(CXX):$(CXX) $(LDFLAGS):' examples/Makefile || die
-	# we use lhapdf6 instead of lhapdf5
-	# some PDFs changed, use something similar
-	sed -i \
-		-e "s:LHAPDF5:LHAPDF6:g" \
-		-e "s:\.LHgrid::g" \
-		-e "s:\.LHpdf::g" \
-		-e "s:MRST2001lo:MRST2007lomod:g" \
-		-e "s:cteq6ll:cteq6l1:g" \
-		-e "s:cteq6m:cteq66:g" \
-		examples/*.{cc,cmnd} || die
-	# After lhapdf5->6 migration PDFs are identical within ~1/1000
-	# https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/README
-	sed -i \
-		-e "s:1e-8:3e-1:g" \
-		-e "s:nlo_as_0119_qed:nlo_as_0119_qed_mc:g" \
-		-e "s:xmldoc:share/Pythia8/xmldoc:g" \
-		examples/main54.cc || die
-	# ask cflags from root
-	sed -i "s:root-config:root-config --cflags:g" examples/Makefile || die
-	if ! use static-libs; then
-		sed -i \
-			-e '/TARGETS=$(LOCAL_LIB)\/libpythia8\.a/d' \
-			-e 's:libpythia8\.a$:libpythia8\.so$:g' \
-			Makefile || die
-		sed -i 's:libpythia8\.a:libpythia8\.so:g' \
-			examples/Makefile || die
-	fi
-
-	epatch "${FILESDIR}/${PN}8209-run-tests.patch"
-	epatch "${FILESDIR}/${PN}8209-root-noninteractive.patch"
-}
-
-# TODO: the following optional packages are out of Gentoo tree:
-# - EvtGen http://atlas-computing.web.cern.ch/atlas-computing/links/externalDirectory/EvtGen/
-# - PowHEG http://powhegbox.mib.infn.it/
-# - ProMC  https://github.com/Argonne-National-Laboratory/ProMC/
-src_configure() {
-	# homemade configure script
-	./configure \
-		--arch=Linux \
-		--cxx=$(tc-getCXX) \
-		--enable-shared \
-		--prefix="${EPREFIX}/usr" \
-		--prefix-lib="$(get_libdir)" \
-		--prefix-share="${EPYTHIADIR}" \
-		$(usex fastjet "--with-fastjet3" "") \
-		$(usex gzip "--with-gzip" "") \
-		$(usex hepmc "--with-hepmc2" "") \
-		$(usex lhapdf "--with-lhapdf6
-			--with-lhapdf6-plugin=LHAPDF6.h
-			--with-lhapdf6-lib=${EPREFIX}/usr/$(get_libdir)" "") \
-		$(usex root "--with-root
-			--with-root-include=${EPREFIX}/usr/include/root
-			--with-root-lib=${EPREFIX}/usr/$(get_libdir)/root" "") \
-		|| die
-
-	# fix pythia config script
-	sed -i \
-		-e 's:pythia8/examples/Makefile.inc:pythia8/Makefile.inc:' \
-		-e 's:LINE%=:LINE%%=:' \
-		bin/pythia8-config || die
-}
-
-src_test() {
-	cd examples || die
-
-	local tests="$(echo main{{01..32},37,38,61,62,73,80}.out)"
-	use hepmc && tests+=" $(echo main{41,42,85,86}.out)"
-	use hepmc && use lhapdf && tests+=" $(echo main{43,{87..89}}.out)"
-	use lhapdf && tests+=" $(echo main{51..54}.out)"
-	use fastjet && tests+=" $(echo main{71,72}.out)"
-	use fastjet && use hepmc && use lhapdf && tests+=" $(echo main{81..84}).out"
-	use root && tests+=" main91.out"
-	# Disabled tests:
-	# 33	needs PowHEG
-	# 46	needs ProMC
-	# 48	needs EvtGen
-	# 92	generated ROOT dictionary is badly broken
-
-	# use emake for parallel instead of long runmains
-	LD_LIBRARY_PATH="${S}/$(get_libdir):${LD_LIBRARY_PATH}" \
-	PYTHIA8DATA="../share/Pythia8/xmldoc/" \
-	LHAPDF_DATA_PATH="${WORKDIR}" \
-	emake ${tests}
-	emake clean
-}
-
-src_install() {
-	# make install is too broken, much easier to install manually
-	dobin bin/pythia8-config
-	doheader -r include/*
-	dolib lib/*
-	insinto "${PYTHIADIR}"
-	doins -r share/Pythia8/xmldoc examples/Makefile.inc
-
-	echo "PYTHIA8DATA=${EPYTHIADIR}/xmldoc" >> 99pythia8
-	doenvd 99pythia8
-
-	dodoc AUTHORS GUIDELINES README
-	if use doc; then
-		dodoc share/Pythia8/pdfdoc/*
-		dohtml -r share/Pythia8/htmldoc/*
-	fi
-	if use examples; then
-		# reuse system Makefile.inc
-		rm examples/Makefile.inc || die
-		sed -i "s:include Makefile.inc:include ${EPYTHIADIR}:" \
-			examples/Makefile || die
-
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	# cleanup
-	unset PYTHIADIR EPYTHIADIR
-}
diff --git a/sci-physics/qmeq/Manifest b/sci-physics/qmeq/Manifest
index aa547c9ff78a..20df408b1e8d 100644
--- a/sci-physics/qmeq/Manifest
+++ b/sci-physics/qmeq/Manifest
@@ -1,6 +1,4 @@
-DIST qmeq-1.0.tar.gz 590715 BLAKE2B 7f091be0651236f2dcb45825df541813e27b43b2b8ec9184a342c962363921e29462726ba23530d0b956bba45793ed2036cec6287696e5fa58f91204d9267933 SHA512 3589fe927740cac5130a5b936e7fb8f73ce20f280878a326cdf91fe6340e8853f5e055c7e07170433c0977130cbb31644b0d9f84d23cd467aaa82557c8541e6f
 DIST qmeq-1.0_p202004.tgz 98025 BLAKE2B fa0ad1bafca28a1c8a16db7b3f9c590bd12340bdd635616592cc75c2a448f719c16b266f960a17ab60de53b40489022ce4ee34548ff44aa997e4dfb6804885d8 SHA512 3001ebc7f8670269ac65bff3f3b96be900946a7991afcc76408e3bbfec5a39d603a67e27f88f48f30d2b576dbf91c0d1898fdbe43cfc194c408f2565abd12806
 DIST qmeq-examples-1.0.tgz 289316 BLAKE2B add7520b579023c8da91aff294dd5a8fd29ba3520c3b496f2a98c8159dab4ad6bcdd1d12070357d868a10bbf224511ab27da069b94951d2c8632064344d2e143 SHA512 4a7b78a200ab4fa407401ea89740cdbcfb82376d97e8146e20a1cdab154269a6b9ce8217fb7ce78af73677b544ab535c5eadd386655dbff9c4ebde6c8eda9e38
-EBUILD qmeq-1.0-r1.ebuild 940 BLAKE2B 442cf3aaf269df78993f0d5117be16e49baee56f21f532c378f107a52a466c00ece867d3f5e586240b70fbb5a88585c2bc479c32718f50e968ed82a1ccfd743e SHA512 fe356e79687fe6f3ff0939fc6bff8bf38f5cc2a55dc214cfd96700900303d2374d31f082f7585ed62beee2a03590703e231e822198f60951cccb330be0cfb45d
 EBUILD qmeq-1.0_p202004.ebuild 1176 BLAKE2B 0e41a9842f0540355a566d9d0483384ac9640a4b2bb62660d5db838da2c90d7a63685d7251e0ead6ef10f01865b7e95a49aabfd33aa4c1b3072673c327655bc5 SHA512 052ef5a828257f4a4021cd878ac222b06ce1b7125f7ff72d2b5a995b34048b032cb84666106783155ff362ff5199f13364343532b1f2638bfbe1ddb5ab1400f2
 MISC metadata.xml 342 BLAKE2B 8bfc619eb36e81fb749932d8478b86b7ebce4e36378b3caf00b7d76b3a0d876debf3b42b1182fc68f5e1122974430a48b6977e69d9699f4eb04efe34b8be1ed1 SHA512 678efb4d82074368f3d07aa488049a79ccaa214c729b8de358e5f4eaeb3f49728a1019bf0ed5fb5bb6859f667b6d5ae2632a60d9af8b6cbd82c63c68b7624660
diff --git a/sci-physics/qmeq/qmeq-1.0-r1.ebuild b/sci-physics/qmeq/qmeq-1.0-r1.ebuild
deleted file mode 100644
index 7ae48a59361c..000000000000
--- a/sci-physics/qmeq/qmeq-1.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2018-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Quantum master equation package for Quantum dot transport calculations"
-HOMEPAGE="https://github.com/gedaskir/qmeq"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	examples? ( https://github.com/gedaskir/${PN}-examples/archive/${PV}.tar.gz -> ${PN}-examples-${PV}.tgz )
-"
-
-KEYWORDS="~amd64"
-IUSE="examples"
-LICENSE="BSD-2"
-SLOT="0"
-
-COMMON_DEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	examples? ( dev-python/jupyter[${PYTHON_USEDEP}] )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-src_install() {
-	distutils-r1_src_install
-	docompress -x "/usr/share/doc/${PF}"
-	use examples && dodoc -r "${WORKDIR}/${PN}-examples-${PV}"/*
-}
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 50d2c8eb0911..75c731167a87 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,5 +1,4 @@
 AUX root-6.12.06_cling-runtime-sysroot.patch 989 BLAKE2B 8202cc8f2bf72cc25642d0a03ba26c3969069b291a6a22188879dbedbf0c3c496149f79f671d0eb51d81d0ee36565660d136b4741f5d018c2b05325ff08381f0 SHA512 c96dee9843da1051c54bd6870ef0a04714944ffe1f86800c9a51b8eb8ef84107d3315d3a708dcc0b651248af4bec362c7f31695514505045aeda9c793d40dc58
-AUX root-6.22.00-rlogger.patch 1284 BLAKE2B 4eb69454d83abbf4d29f6c117b1df60aac171c6f8d5a1e085bef67d3f17234bb662f8ede7435564516a3789634721d56e190fe00b37a9e226a7c979634451ef9 SHA512 271aa94d272fd7c668c90af624adb086b28283d6b27d2ae2be84e2ed523dfa2085b83b2941ce6b4975fcc47b7cc566374b91b6f70a3045130857df96c147f911
 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 7564 BLAKE2B 9d9a0358d7d460292a4f30252f3cbf52598d3d78d5cc7567511437e0a213648c064eff3c1efde7d3d165971aeae56a285185e9aa5fa4ef21a0da0df07cba0bdc SHA512 1300e869b64cd8d720bf5fb201c886e8c130f0237d9d5d3ec8db8649c6b56e259d0f6834043d39ac3f80f941a1536b622fdcc4b17bcd078a6ab8cb933bf08149
diff --git a/sci-physics/root/files/root-6.22.00-rlogger.patch b/sci-physics/root/files/root-6.22.00-rlogger.patch
deleted file mode 100644
index 8ff25c86b521..000000000000
--- a/sci-physics/root/files/root-6.22.00-rlogger.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From bea87d2cde7c490c8417a97f043eaa6905c27f08 Mon Sep 17 00:00:00 2001
-From: Axel Naumann <Axel.Naumann@cern.ch>
-Date: Wed, 3 Jun 2020 16:38:49 +0200
-Subject: [PATCH] [cmake] Fix ROOT/RLogger.hxx not found:
-
-When building without root7 but with C++14, RLogger is used.
-Make it available to the include directories.
-
-(cherry picked from commit fbe075ceedcd7d7f9993864c82ac5bd2960f3494)
----
- core/base/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/core/base/CMakeLists.txt b/core/base/CMakeLists.txt
-index 66ec9a2224..95eea9b44a 100644
---- a/core/base/CMakeLists.txt
-+++ b/core/base/CMakeLists.txt
-@@ -198,6 +198,7 @@ set(BASE_SOURCES
- if(CMAKE_CXX_STANDARD GREATER 11)
-   list(APPEND BASE_HEADERS ROOT/RLogger.hxx)
-   list(APPEND BASE_SOURCES v7/src/RLogger.cxx)
-+  set(BASE_V7_INC ${CMAKE_SOURCE_DIR}/core/base/v7/inc)
-   # TLogger.hxx may be used without root7 flag, but is placed in v7/inc/,
-   # so we need to tell ROOT_INSTALL_HEADERS() where to find it
-   set(BASE_HEADER_DIRS inc/ v7/inc/)
-@@ -220,6 +221,7 @@ set(Core_dict_headers ${BASE_HEADERS} PARENT_SCOPE)
- ROOT_OBJECT_LIBRARY(Base ${BASE_SOURCES})
- 
- target_include_directories(Base PRIVATE
-+   ${BASE_V7_INC}
-    ${PCRE_INCLUDE_DIR}
-    res
-    ${CMAKE_SOURCE_DIR}/core/foundation/res
--- 
-2.27.0
-
diff --git a/sci-physics/siscone/Manifest b/sci-physics/siscone/Manifest
index 838268f3f210..ac0e95acfd58 100644
--- a/sci-physics/siscone/Manifest
+++ b/sci-physics/siscone/Manifest
@@ -1,5 +1,3 @@
-DIST siscone-2.0.6.tar.gz 473370 BLAKE2B 25395184c443a27a792cea3e713e98c923fd34a3df26f9c13ba3a23072ef9891783255fbf82a3954c3724b21554d92f1bc3d0ed8fdfa1196ce6e431174ab77e9 SHA512 3a1bbd50db8800a2ce00eac4f4cd498d7e6674ba739ed8157f6e0c0e32fd7724d19d227b5a023fa945a5b4be5c415c5c77c2e2a60e80ec4029c016e3fd95983d
 DIST siscone-3.0.3.tar.gz 540939 BLAKE2B dfb9c9fab91f4faf8d8aa8a44fca505a83cdd02d2a9b659bacf6487e505159ef61bf2ed8db08a304328effdd6aac8c4a593b630954898aceb985a3a270a5aeb6 SHA512 dccbb872c897b8c0c28dff593d7f015b396923a0bd885182930d74e5115b901875a89565244a33fad0329fdfb5a83d6cc570152d0085c45c24bc427de075e559
-EBUILD siscone-2.0.6.ebuild 656 BLAKE2B a038bf41c8107339c2989bd320ea86f6516a384e7bc29663eee9c9ce121d181e4e3d94cf140f5d5d7ae2494aaf9f4aadbf8d74ce9c8f3b840178556c27cfc197 SHA512 b5e4b5ee97bc82c1af7639dc4da21e6c3b1a4182f82ae6a843c4134f33489f97dc06737753460e6dd4677b032cd5599cdbb2bb5febd6c15a704d8d342b372794
 EBUILD siscone-3.0.3.ebuild 676 BLAKE2B b715f9679770e557b75165a1b6afbf0d2bb84929ce7144212e1709128a978ee810a40a2b340d097d7186d38ae7902fcae4dd06654bc74bd868c66777236dbc20 SHA512 0fecdbeb640f389b60de9bfd5738c9bc252d811bbf72d4e1aa717858cb205df94604566cc0ff7bf5a95b88539c6a101a1de54a9f1ab7d04bc7a1f5fd06fcbc46
 MISC metadata.xml 486 BLAKE2B 78449852e87d6566e8b168cff4d5431a8576b8e5fb28c80d355648ebd20b7e4d4ddd74c4b5ce6fcba3a921a55339007cc316218f9a2920b797ed2f3d0a058278 SHA512 104eb63b263c5ae7aae4f31851427996b3ca84a2d72304184bcc66bbbeb245a662ea79d6b188f79ce8ff8ce87c9c3cbf1a0c1171a0266ac70f755868234c6b91
diff --git a/sci-physics/siscone/siscone-2.0.6.ebuild b/sci-physics/siscone/siscone-2.0.6.ebuild
deleted file mode 100644
index c6e2acc0d5c7..000000000000
--- a/sci-physics/siscone/siscone-2.0.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Hadron Seedless Infrared-Safe Cone jet algorithm"
-HOMEPAGE="http://siscone.hepforge.org/"
-SRC_URI="http://www.hepforge.org/archive/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.{cpp,h}
-		insinto /usr/share/doc/${PF}/examples/events
-		doins examples/events/*.dat
-	fi
-}
diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest
index dffc86a4684d..16ac3c2b694d 100644
--- a/sci-physics/vgm/Manifest
+++ b/sci-physics/vgm/Manifest
@@ -1,7 +1,7 @@
-AUX vgm-fix-FindCLHEP.patch 2191 BLAKE2B 465bd6dfca5aaedaa85759092d4d66a65f5df8a3be9a78bfd5edf0630e5ea733f23d14a4d892e272d5062927ff2622560987f566d130324cbdb96c097d083800 SHA512 24d6cd832e496ebe573ee6b8a95ac7a777c16919626f9b7019d260295d12766f89f5832bb3d5ca794eb28dbd293828935a92627f11ca55381c6f7645f61893ac
-DIST vgm-4.5.tar.gz 3474063 BLAKE2B 70c4fe0bd5eb9bc94607553ad30ffb625e66ef4e6f8a965b1289c1c7ad6f71d7eba035d2825ba8cd94705a0c223aa56408d3285748b068045eee3a29f556e3b2 SHA512 541fde12e12cc51ba065900788dbceb8e5b9a4e4615a4e4e0bbd2ba199b8a203b6927dbe23ead7bc183bd61f6b641e3e954fe7b78451c2d423d3a2b737f00572
+AUX vgm-copy-test-seed.patch 341 BLAKE2B 0a3fdc57a76e5ee27ccea0221acd3742e4f00d6e9592d73a0f7083c172b6a4ce822eb6f78f45d9b0be756ba12950d446828cbbe896f32279b9979ff656cc7e7f SHA512 26a6df0823495a86322b32d55fde0b25d471687425d69fc48f4937e3bb7546f7c15b24373c324aa168cb764ce79ad16bc8b16eae6a587c58fe7088d71bddd957
 DIST vgm-4.8.tar.gz 3661965 BLAKE2B 29f878fb6716e261c27d60b2c9081d66313591a053d80f78501973f131aff88bbcee743ff9767836883dcb28d3ce5aeee3759a5890d7c8811a6a61503417284f SHA512 8b7cabc5796649c4014ccbdf1c6d209d2e7c2b4b06258716a72cadd997a9f6f51c4f9cb5870fd10abfd1ee133766876523c84441a69c7242bc2002687ca0ce58
-EBUILD vgm-4.5.ebuild 1760 BLAKE2B 3d00a62d6c19f167956d06999e8633362da4cba056ee9716425aef025c366e23ed623b77f2ecffc9eebf34be27be2d4b5c81fdd6e5e8f6a52e709df6a04c7611 SHA512 26283fcbc9bdb0d8980734e3fbd2a35831aba214ad97d80b9e15aa2f137eba3e18d198797d5c479bba77a608a3220b17666ac355466335abb694ff1372fa6f34
+DIST vgm-4.9.tar.gz 3881029 BLAKE2B 596a8df12f0dcd813a0d84e8c33eaa92dd2d332d9accf2fc38992f385748a2bd3579fee2af6cc00b878fe5491af4996d80775aa630120507ccc665f102f63b11 SHA512 90845d75a7ff0022f5fba15b7f621efd588251060c0d8e715fcc2e28bb6b4b01ddd83420dbd233cc0dd437ee6b8b5390bb1f84571ed12e696ee8c1dfc4bd8fd9
 EBUILD vgm-4.8.ebuild 1752 BLAKE2B fc304e1dd772b40743cfa906668136e99eae34e1ea2ead012ea5bdceacf15495c0f02669b13c2617ea4c67952859dfd6bf9e4698298d76e461994c39b35f967d SHA512 82ad2b67ea5d703af84a1c8fbc338a6ffb582492758ff2560fdbf9109bb30424ac32f032db466fc3b08dc419d7a1b49c8d34f7daa127b5e335bfd104686aadb9
-EBUILD vgm-9999.ebuild 1752 BLAKE2B fc304e1dd772b40743cfa906668136e99eae34e1ea2ead012ea5bdceacf15495c0f02669b13c2617ea4c67952859dfd6bf9e4698298d76e461994c39b35f967d SHA512 82ad2b67ea5d703af84a1c8fbc338a6ffb582492758ff2560fdbf9109bb30424ac32f032db466fc3b08dc419d7a1b49c8d34f7daa127b5e335bfd104686aadb9
+EBUILD vgm-4.9.ebuild 2004 BLAKE2B fbc00bf7ae3cca7b8fcd867123ebc2b4d83a0e7b8426a26f4310130763d57c5ceedf4dc93d39834f80935975eb35c8c8021111b6090471ec4576e5b56fd8f2ee SHA512 8561eb343bb08b3d013c36de7295794af5dc3b84899e6a3719d23dc5ac08a20866546652ed4438b8e51474999e82d8daf4c364e991fff7d1638fb23fbe7711a9
+EBUILD vgm-9999.ebuild 1948 BLAKE2B 136002894861b03e058dcde44d56a41ddac671b760bab9f447afd8b79d1643a7691a79fcd5caf6136a7ecbb8e2f1304482ca93bbcbe017457c98ef3def792928 SHA512 3a9b3b52f07a2fd98dcd402a7b7a81190906407dd0ada486959c5e77b6849cfada0eaf01074a6d4aea741ac41063943054c9937a20821c342f5b3082723dcc9e
 MISC metadata.xml 971 BLAKE2B 76e1255814eea59a44c610d3fc9c2a304909610bfd77a847fa5fd05974b9d0d4db1081b5dd32db9e860213204c6272ea14c7dc6dc717472f5de7c5ab42211335 SHA512 30d69c4518b7a69bf458eaa2ba894b3690e2af8bb2b1a63ecb28b7e531c26843f688152f6f102faf2a033ab1424078047cbeb9bad4a0dba5e39c3d2456575259
diff --git a/sci-physics/vgm/files/vgm-copy-test-seed.patch b/sci-physics/vgm/files/vgm-copy-test-seed.patch
new file mode 100644
index 000000000000..31dcebdccde2
--- /dev/null
+++ b/sci-physics/vgm/files/vgm-copy-test-seed.patch
@@ -0,0 +1,14 @@
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 395eef0..bcf3a4a 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -76,7 +76,8 @@ set(VGM_TEST_SCRIPTS
+   test1_suite.sh
+   test2_suite.sh
+   test3_suite.sh
+-  test_suite.sh)
++  test_suite.sh
++  startRun.rdm)
+ 
+ foreach(_script ${VGM_TEST_SCRIPTS})
+   configure_file(
diff --git a/sci-physics/vgm/files/vgm-fix-FindCLHEP.patch b/sci-physics/vgm/files/vgm-fix-FindCLHEP.patch
deleted file mode 100644
index d3bf3d0d4f31..000000000000
--- a/sci-physics/vgm/files/vgm-fix-FindCLHEP.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -Naur vgm/cmake/FindCLHEP.cmake vgm.patched/cmake/FindCLHEP.cmake
---- vgm/cmake/FindCLHEP.cmake	2019-01-25 18:46:25.000000000 +0100
-+++ vgm.patched/cmake/FindCLHEP.cmake	2019-06-29 19:50:18.092076913 +0200
-@@ -4,13 +4,13 @@
- # The configuration file for CMake build for Virtual Geometry Model
- # Copyright (C) 2012, Ivana Hrivnacova
- # All rights reserved.
--# 
-+#
- # For the licensing terms see vgm/LICENSE.
- # Contact: ivana@ipno.in2p3.fr
- # ------------------------------------------------------------------------------
- 
--# The CMake build for Virtual Geometry Model is a result of a merge 
--# of the CMake configuration files kindly provided 
-+# The CMake build for Virtual Geometry Model is a result of a merge
-+# of the CMake configuration files kindly provided
- # by Florian Uhlig, GSI and Pere Mato, CERN.
- 
- # - Try to find CLHEP
-@@ -36,28 +36,29 @@
-   $ENV{CLHEP_BASE_DIR}/include
- )
- 
--# CLHEP library external to Geant4 
--find_path(EXTERNAL_CLHEP_LIBRARY_DIR NAMES libCLHEP.so libCLHEP.dylib PATHS
-+# CLHEP library external to Geant4
-+find_library(EXTERNAL_CLHEP_LIBRARY NAMES libCLHEP.so libCLHEP.dylib PATHS
-   ${CLHEP_LIB_DIR}
-   ${CLHEP_DIR}/lib
-   $ENV{CLHEP_BASE_DIR}/lib
- )
--if (EXTERNAL_CLHEP_LIBRARY_DIR)
--  set(CLHEP_LIBRARY_DIR ${EXTERNAL_CLHEP_LIBRARY_DIR})
--  set(CLHEP_LIBRARY_NAME CLHEP)  
--endif()    
--
--# CLHEP library within Geant4 
--if (NOT EXTERNAL_CLHEP_LIBRARY_DIR)
--  find_path(CLHEP_LIBRARY_DIR NAMES libG4clhep.so libG4clhep.dylib PATHS
-+if (EXTERNAL_CLHEP_LIBRARY)
-+  get_filename_component(CLHEP_LIBRARY_DIR "${EXTERNAL_CLHEP_LIBRARY}" DIRECTORY)
-+  set(CLHEP_LIBRARY_NAME CLHEP)
-+endif()
-+
-+# CLHEP library within Geant4
-+if (NOT EXTERNAL_CLHEP_LIBRARY)
-+  find_library(CLHEP_LIBRARY NAMES libG4clhep.so libG4clhep.dylib PATHS
-     ${Geant4_DIR}/..
-     ${GEANT4_LIBRARY_DIR}
-   )
--  if (CLHEP_LIBRARY_DIR)
-+  if (CLHEP_LIBRARY)
-+    get_filename_component(CLHEP_LIBRARY_DIR "${CLHEP_LIBRARY}" DIRECTORY)
-     set(CLHEP_LIBRARY_NAME G4clhep)
--  endif(CLHEP_LIBRARY_DIR)
--endif()    
--   
-+  endif(CLHEP_LIBRARY)
-+endif()
-+
- if (CLHEP_INCLUDE_DIRS AND CLHEP_LIBRARY_DIR)
-   set(CLHEP_FOUND TRUE)
- endif (CLHEP_INCLUDE_DIRS AND CLHEP_LIBRARY_DIR)
diff --git a/sci-physics/vgm/vgm-4.5.ebuild b/sci-physics/vgm/vgm-4.9.ebuild
index 5020ac5b5500..ede9e854018d 100644
--- a/sci-physics/vgm/vgm-4.5.ebuild
+++ b/sci-physics/vgm/vgm-4.9.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
@@ -16,17 +16,18 @@ else
 fi
 
 DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments"
-HOMEPAGE="http://ivana.home.cern.ch/ivana/VGM.html"
+HOMEPAGE="http://ivana.home.cern.ch/ivana/VGM.html https://github.com/vmc-project/vgm/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc examples +geant4 +root test"
+IUSE="+c++11 c++14 c++17 doc examples +geant4 +root test"
+
+REQUIRED_USE="^^ ( c++11 c++14 c++17 )"
 
-# sci-physics/root[c++11] required to match sci-physics/geant
 RDEPEND="
 	sci-physics/clhep:=
-	root? ( >=sci-physics/root-6.14:=[c++11] )
-	geant4? ( >=sci-physics/geant-4.10.03 )"
+	geant4? ( >=sci-physics/geant-4.10.6[c++11?,c++14?,c++17?] )
+	root? ( >=sci-physics/root-6.14:=[c++11?,c++14?,c++17?] )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[dot] )
 	test? (
@@ -36,7 +37,8 @@ DEPEND="${RDEPEND}
 RESTRICT="
 	!geant4? ( test )
 	!root? ( test )
-	!test? ( test )"
+	!test? ( test )
+	!examples? ( test )"
 
 DOCS=(
 	doc/README
@@ -46,7 +48,7 @@ DOCS=(
 	doc/VGMversions.html
 )
 PATCHES=(
-	"${FILESDIR}"/"${PN}-fix-FindCLHEP.patch"
+	"${FILESDIR}"/"${PN}-copy-test-seed.patch"
 )
 
 src_configure() {
@@ -76,7 +78,9 @@ src_compile() {
 
 src_test() {
 	cd "${BUILD_DIR}"/test || die
-	./test_suite.sh || die
+	# See upstream issue: https://github.com/vmc-project/vgm/issues/5
+	sed -i 's/ ScaledSolids / /' test3_suite.sh || die
+	PATH="${BUILD_DIR}"/test:${PATH} ./test_suite.sh || die
 }
 
 src_install() {
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index 659728a149ea..eb9ce1b27be0 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.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
@@ -8,7 +8,6 @@ inherit cmake
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
-	KEYWORDS=""
 else
 	MY_PV=$(ver_rs 1- -)
 	SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
@@ -17,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments"
-HOMEPAGE="http://ivana.home.cern.ch/ivana/VGM.html"
+HOMEPAGE="http://ivana.home.cern.ch/ivana/VGM.html https://github.com/vmc-project/vgm/"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -38,7 +37,8 @@ DEPEND="${RDEPEND}
 RESTRICT="
 	!geant4? ( test )
 	!root? ( test )
-	!test? ( test )"
+	!test? ( test )
+	!examples? ( test )"
 
 DOCS=(
 	doc/README
@@ -75,7 +75,9 @@ src_compile() {
 
 src_test() {
 	cd "${BUILD_DIR}"/test || die
-	./test_suite.sh || die
+	# See upstream issue: https://github.com/vmc-project/vgm/issues/5
+	sed -i 's/ ScaledSolids / /' test3_suite.sh || die
+	PATH="${BUILD_DIR}"/test:${PATH} ./test_suite.sh || die
 }
 
 src_install() {
diff --git a/sci-physics/vmc/Manifest b/sci-physics/vmc/Manifest
index e76a68a4d446..2eb44bb29054 100644
--- a/sci-physics/vmc/Manifest
+++ b/sci-physics/vmc/Manifest
@@ -1,4 +1,4 @@
-DIST vmc-1.0_p2.tar.gz 91400 BLAKE2B d444a003433f4939f1b737ee8aa117a3230f83428ff9a79f8219a88bf5146104460a8be80ada9ab3a0a0edebc7d85d02bc51de053d54b06739d26cb0bbec3429 SHA512 51d6a8462c854411b595a20a2657b8012f19cd9c139f3341ccd72eb262473d01f6909ad22ee8d083f01cc5a2e43b2af265a7ed7c62a1285e8fab34c1b68ee3cd
-EBUILD vmc-1.0_p2.ebuild 1013 BLAKE2B 13342eb9c395fca1d4562c9822f877ef161122aa63770ff842cb58e526ff5bb761e5d560884dea39af41f0b68abaaf1e3a52f245dd4444be3f8a05763df8d24b SHA512 d5ac7b7ebf74ec367374efe4f40dd6d003f21a3be969b87d7b1155ba2f5587bedb74545790dbb13d91e701df444b281912f6f5901809e33801362df7c651cc8a
-EBUILD vmc-9999.ebuild 1013 BLAKE2B 13342eb9c395fca1d4562c9822f877ef161122aa63770ff842cb58e526ff5bb761e5d560884dea39af41f0b68abaaf1e3a52f245dd4444be3f8a05763df8d24b SHA512 d5ac7b7ebf74ec367374efe4f40dd6d003f21a3be969b87d7b1155ba2f5587bedb74545790dbb13d91e701df444b281912f6f5901809e33801362df7c651cc8a
+DIST vmc-1.0_p3.tar.gz 91476 BLAKE2B 3005e0575a5835b832175e6a272d4e3c328990e28ac998aca60a42c4ddd03faba4d1b761867d8af597ca2468cf3072c49bb007852b5ec892c215df37297656dc SHA512 621c0cb3f2846f9401e3e4fff6fa47ab2afbff7c4dca5c19869abb1806ec19d4a221e5741aad9b3929a4e8b8207ee6008a9bf06ec8bf03ed73771cb29fda1b8d
+EBUILD vmc-1.0_p3.ebuild 1056 BLAKE2B 99f62fedfbe5591b64f68bc603bd6861f5ba1a98a0095e1a7cae576f68bac8979d96ad3f3995b1b697b8dffca3566a9b5d09c3443ccc41d0d7eb5e50372164fd SHA512 c211c30a52a7b301268694dce0c9522aaf8c4a38802f15381789590fd2d5d05ddc02e947ac1e0e196847673f84b82ca3649db31388bbf4cb9ba5cdd48b49f64d
+EBUILD vmc-9999.ebuild 1056 BLAKE2B 99f62fedfbe5591b64f68bc603bd6861f5ba1a98a0095e1a7cae576f68bac8979d96ad3f3995b1b697b8dffca3566a9b5d09c3443ccc41d0d7eb5e50372164fd SHA512 c211c30a52a7b301268694dce0c9522aaf8c4a38802f15381789590fd2d5d05ddc02e947ac1e0e196847673f84b82ca3649db31388bbf4cb9ba5cdd48b49f64d
 MISC metadata.xml 789 BLAKE2B e58e20f9b0e3254b2cc437d069f2d45d6cc02a8827a6015edcec1a47028b0089f5283dde64c62c5ea2e6d811ec12ecbcc9562e3c5605b47fc2d951009c732275 SHA512 850ccb5bb65bad8767756c4869f3b368d4a7664425287a23ae60aebb6d9b22d10586289a838a195bcbc74b15eef923eb10b005a30958d9d6541efc208a517516
diff --git a/sci-physics/vmc/vmc-1.0_p2.ebuild b/sci-physics/vmc/vmc-1.0_p3.ebuild
index fdebc4ac86fa..91c335813c8d 100644
--- a/sci-physics/vmc/vmc-1.0_p2.ebuild
+++ b/sci-physics/vmc/vmc-1.0_p3.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
@@ -15,8 +15,8 @@ else
 	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 
-DESCRIPTION="The Virtual Monte Carlo core library."
-HOMEPAGE="https://vmc-project.github.io/"
+DESCRIPTION="The Virtual Monte Carlo core library"
+HOMEPAGE="https://vmc-project.github.io/ https://github.com/vmc-project/vmc"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -25,8 +25,8 @@ IUSE="+c++11 c++14 c++17 doc"
 REQUIRED_USE="^^ ( c++11 c++14 c++17 )"
 
 RDEPEND=">=sci-physics/root-6.18:=[c++11?,c++14?,c++17?,-vmc]"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
 DOCS=(README.md History)
 
diff --git a/sci-physics/vmc/vmc-9999.ebuild b/sci-physics/vmc/vmc-9999.ebuild
index fdebc4ac86fa..91c335813c8d 100644
--- a/sci-physics/vmc/vmc-9999.ebuild
+++ b/sci-physics/vmc/vmc-9999.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
@@ -15,8 +15,8 @@ else
 	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 
-DESCRIPTION="The Virtual Monte Carlo core library."
-HOMEPAGE="https://vmc-project.github.io/"
+DESCRIPTION="The Virtual Monte Carlo core library"
+HOMEPAGE="https://vmc-project.github.io/ https://github.com/vmc-project/vmc"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -25,8 +25,8 @@ IUSE="+c++11 c++14 c++17 doc"
 REQUIRED_USE="^^ ( c++11 c++14 c++17 )"
 
 RDEPEND=">=sci-physics/root-6.18:=[c++11?,c++14?,c++17?,-vmc]"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
 DOCS=(README.md History)
 
diff --git a/sci-physics/xfoil/Manifest b/sci-physics/xfoil/Manifest
index e8a4b37ed002..1d2f9620e06d 100644
--- a/sci-physics/xfoil/Manifest
+++ b/sci-physics/xfoil/Manifest
@@ -1,9 +1,6 @@
 AUX xfoil-6.96-gfortran.patch 920 BLAKE2B 3ab603034f6b2be74e884ce476410698a5583c4fda751fe24d9462b7441170f7bc04c0f8fd49ad1001c92dfae4a2d2c20bdc555b8ba0d7794fd457d3013f6222 SHA512 7f708a3176a08367b125cbe30dcb1830e05df55706e32b5e8964317d0bf961ba0032dd7237f3a721ec3d7b813792decfb9a6d4e750fbb72d70a92a26b1d287ef
-AUX xfoil-6.97-overflow.patch 558 BLAKE2B cd282f1fef0f352fc507ed1322dcd56f5f05f50d97cc01fd079922a6bb0be8d70ac34a875d4523d6c665e47379e9afb998b8c953e99f1f263bae95359344878c SHA512 98e12c43fe8b2cbb06595c09f0a65ebf25271649918272672bd72e7132792f6be107874b6ecd6cf49e18e5cbf970ae043da30c3e33e659b155115bb00bfd5a47
 AUX xfoil-6.99-overflow.patch 399 BLAKE2B e98e8c2774a5be9b22ef28b172ba8dfdfff196bff88beb2a911f72caad25c88b01fa657e4812c167a30e914997131b61e75333b2cc851013b2502dc132c22d96 SHA512 8d6defa10c11c204128bea359461da12c3780f178d9738071f5f111d26d6151adbfa67e6898b814df4740e6b7006f5bbbd6ec3bc4ddf65fb511b1ffdf79c468f
 DIST dataflow.pdf 7654 BLAKE2B 67871007f6d2d72fe89c0f3bfcd7027d08ad8d064a0426c2947c5e41d6a31049973dd8b586ca0dd482def6745023c337157a77dbf35b541a5f3a8295f0162b03 SHA512 1bb5be8e70fca1fa90f28d214140e96a8795c7d82a37f4fe4d68606fa3eb28252913b8fb13eb3e97a3cf05c3001c88dbfcdb8a2f20d4baed5e730770a2d602b1
-DIST xfoil6.97.tar.gz 3972497 BLAKE2B 25c50621bb76cec5463f05ca975b97b52688408cc8111e464fc89fd6bf1ab3f66b43798d89aa68c4a2ef4ffb049801e5930b45b520c0afeabfb8d89efd486536 SHA512 02c0a123fb99fa20de1e3577ca7c6ce00d494058f2ef3ec82e3fdea48901f4346180aea3436e001c5b90401007ccdd5b7e9daa6a96794f0d6b5781a5b36e36e7
 DIST xfoil6.99.tgz 4515991 BLAKE2B a96dc534a0ceff116970a22b9e267705065076f1561052334c4706d7d6d2d750ad75954fb9af843ef50ca5e8ab8cfd4c8e5d873f9f36b6337fe3381604cb2d37 SHA512 6f5bed520826dba2efd1b191b1f90dd810b53d9041cbbaddde09207ba9042f99dd0c9e9aa8b8cdf48767bf2695e328ac8fbd297e1510e53ac10b0f1eea35cfef
-EBUILD xfoil-6.97-r1.ebuild 1770 BLAKE2B 13eb9adbaca50af8fda37254bea0334fcd77525aded91ee608ad11e6d8b412e59b6f59585236b0472de91ad22385ac7a76a2e9ff332902d4d949a0bad931bcef SHA512 71b844db6c5898fa3669e5d337d45b229e3a3c729121875eb206b286963f4e5cf719d343263c6fc72812720b9e0a1b9ed2b484bb843f9d88fc34b675e3c9cb8f
 EBUILD xfoil-6.99.ebuild 1809 BLAKE2B 96b15901069c3f8d0262ca73e7e387025d9cd8bddd74d5c03532385b3b0f6f4f270ea10e68d3cf6460d9151a1ca4c6151cc8bc5b6e32bc5ebbeae208627f3168 SHA512 6b08944ba975cdf14b64623db35530160dbabbb1f35b1de438f91a6cd7d44dcc907c9fd6c398a1f0e812727d94fa8d9717b24bac07775c3a2d649b08404e2e23
 MISC metadata.xml 969 BLAKE2B 18a78d7af82b11de7f0fca8a64151d0ad1e6ffdd1e4271f45ee0c72639320e9f900fa57cd7f70ac1c7da0948c018efec19ce88a5f1d2cec330cfedc41df07de8 SHA512 4322b856b3879b23e7bcda3477e829e44d529aca1bc1b97e554a7e93c53ed841e95edcb8d321c352a17caa25e44c6fefe651e8c517caa441ded9bb8f069801af
diff --git a/sci-physics/xfoil/files/xfoil-6.97-overflow.patch b/sci-physics/xfoil/files/xfoil-6.97-overflow.patch
deleted file mode 100644
index 6f71440f050c..000000000000
--- a/sci-physics/xfoil/files/xfoil-6.97-overflow.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/pplot.f
-+++ b/src/pplot.f
-@@ -36,7 +36,7 @@
-       PROGRAM PPLOT
-       INCLUDE 'PPLOT.INC'
- C
--      LOGICAL ERROR, LGETFN
-+      LOGICAL ERROR, LGETFN, LERR
-       REAL RINP(10)
-       REAL CPOLO(NAX,IPTOT,NPX), VPOLO(NAX,2,NPX)
- C
---- a/src/xoper.f
-+++ b/src/xoper.f
-@@ -114,7 +114,7 @@
- C---- don't try to read integers, since might get integer overflow
-       DO I=1, NINPUT
-         IF(ABS(RINPUT(I)) .GT. 2.1E9) THEN
--         IINPUT(I) = 2**31
-+         IINPUT(I) = HUGE(0)
-         ELSE
-          IINPUT(I) = INT(RINPUT(I))
-         ENDIF
diff --git a/sci-physics/xfoil/xfoil-6.97-r1.ebuild b/sci-physics/xfoil/xfoil-6.97-r1.ebuild
deleted file mode 100644
index 80e95dc414c7..000000000000
--- a/sci-physics/xfoil/xfoil-6.97-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fortran-2 toolchain-funcs
-
-DESCRIPTION="Design and analysis of subsonic isolated airfoils"
-HOMEPAGE="http://raphael.mit.edu/xfoil/"
-SRC_URI="
-	http://web.mit.edu/drela/Public/web/${PN}/${PN}${PV}.tar.gz
-	doc? ( http://web.mit.edu/drela/Public/web/${PN}/dataflow.pdf )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-overflow.patch )
-
-S="${WORKDIR}/${PN^}"
-
-src_prepare() {
-	# fix bug #147033
-	[[ $(tc-getFC) == *gfortran ]] && PATCHES+=( "${FILESDIR}"/${PN}-6.96-gfortran.patch )
-	default
-
-	sed \
-		-e '/^FC/d' \
-		-e '/^CC/d' \
-		-e '/^FFLAGS/d' \
-		-e '/^CFLAGS/d' \
-		-e 's/^\(FFLOPT .*\)/FFLOPT = $(FFLAGS)/g' \
-		-i {bin,plotlib,orrs/bin}/Makefile plotlib/config.make \
-		|| die "sed for flags and compilers failed"
-
-	sed \
-		-e "s:/var/local/codes/orrs/osmap.dat:${EPREFIX}/usr/share/xfoil/orrs/osmap.dat:" \
-		-i orrs/src/osmap.f || die "sed osmap.f failed"
-}
-
-src_compile() {
-	emake -C orrs/bin FLG="${FFLAGS}" FTNLIB="${LDFLAGS}" OS
-	pushd orrs >/dev/null || die
-	bin/osgen osmaps_ns.lst
-	popd >/dev/null || die
-	emake -C plotlib CFLAGS="${CFLAGS} -DUNDERSCORE"
-
-	local i
-	for i in xfoil pplot pxplot; do
-		emake -C bin \
-			PLTOBJ="../plotlib/libPlt.a" \
-			CFLAGS="${CFLAGS} -DUNDERSCORE" \
-			FTNLIB="${LDFLAGS}" \
-			$i
-	done
-}
-
-src_install() {
-	dobin bin/{pplot,pxplot,xfoil}
-	insinto /usr/share/xfoil/orrs
-	doins orrs/osm*.dat
-
-	local DOCS=( *.txt README )
-	use doc && DOCS+=( "${DISTDIR}"/dataflow.pdf )
-	einstalldocs
-	if use examples; then
-		dodoc -r runs
-		docompress -x /usr/share/doc/${PF}/runs
-	fi
-}
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
commit	abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree	eca3dd248b73b92013cba00a0fcc1edf2696e19a /sci-physics
parent	24fd814c326e282c4321965c31f341dad77e270d (diff)