gentoo auto-resync : 26:01:2023 - 13:56:06

12 files changed, 115 insertions, 190 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 04d478f06cf0..8fbb465e0036 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/geant4_vmc/Manifest b/sci-physics/geant4_vmc/Manifest
index c94137d1ae3a..2b2215c150e4 100644
--- a/sci-physics/geant4_vmc/Manifest
+++ b/sci-physics/geant4_vmc/Manifest
@@ -1,12 +1,8 @@
-AUX geant4_vmc-6.0-cmake-g4root-tests.patch 1054 BLAKE2B 3e77d8fe80de29047ac2c14d7ac10d8620e5b52b3664611eb2d5aef27613ff32f51205db4b2a3a56c0d2c0acd07711f007cc41da91e1f9b0bcbc983b4fa75536 SHA512 361688506e7d72b96316146e5fdab2e748cb4d8e5c5167602a1e5d01deadcc8e5f4d16ab58d42a5e39ccb4b9c8a2e0fb3f712b2429070620a8e3d6a8d29078c6
-AUX geant4_vmc-6.0-geant-4.11.0.1-fix.patch 1062 BLAKE2B c70947f3ee19da576744ba5ee60b9f8b20b79e778046cbf5182c6eef098a9c4813344aff39fc72925bb0fdd734792950368420152caf06d37b1c041200e0c5f0 SHA512 b8b20c34ce2d86ca54829e7d3aa0ffe62ef90434a9a3978f6d483b7af1223263f9d1f7715ec7839f3bdff6ceacb9e1e1188b22bae64ad8491ae87b323e8271ee
-DIST geant4_vmc-5.4.tar.gz 7363185 BLAKE2B 3f1738a6d99d7cad1df1249a086b5257ff1d9c5c23657e12720b2d75ed61a96d6e45f2c964c471ba093d1c70fffb5b3df5a0d15fd7bdd54ab78a8f225649f0a1 SHA512 26b53c4b3a10943b9a5aa970dfc8c09b4086a385c6fea2a914bf8b020044032f9b73df7fd054185eba86f66ba50cd86372d0e874c0642bb3e357fba499fd7675
-DIST geant4_vmc-6.0.tar.gz 5649857 BLAKE2B 905ee76a579e25ee6259aafe978b0f202313ae6ce7f62e424c663e5a22f3c77e9a2eb3a4d807515267087c9e95aebb962927728da8110248136d69bcb8b1fc56 SHA512 ee21ec2d493d4ef227b294818ca0e6940c437e069197009f4bfab0fa1c282b4ad0dc5744157077ccb3b8953c4a167492571a56f68def2152730bcb79892f56fc
-DIST geant4_vmc-6.1.tar.gz 5604048 BLAKE2B 74d8e7fd20f9abd0205ccb3913180380b8862fef604b563ffde036a27f387887e1bf9ddf1c33fcb530e328c0dc5db42c51eac16097d94861326ec1a4c4ad3eed SHA512 6a9fd1c2b74e57ca5552c2bdb02a568916568da662eba29947f746c27c07a779e69b24315afd9cb9e8eda83b14eb53d351f3494cbe6fefb951eaf85888b0b1be
 DIST geant4_vmc-6.1_p2.tar.gz 5606450 BLAKE2B 943398e4cf9a8f4d6e44687f89eff6e6f09e4904b8a57684e202719162d861d5b370c1fc9bcf40de43aa607cfa89db1d1a740046a1ad9744ba2c538dbc8103f8 SHA512 97f825a32958d7da8d4086e87397c358b0331ac8f6630b83c1a8142f02be21093bed65c0841a24c0db5548adb611f52f2c5e05e92f39a67f13c70d76f901d47e
-EBUILD geant4_vmc-5.4.ebuild 1857 BLAKE2B 246d31602f6c40c9dfe13d123f699b7e7c4f2f49dd24d229f4bcd92dd176b8af207b14237040eb4393ea69554017d0458a99db4c5466bd49da9af45e6c848af2 SHA512 1e5bf979f2a656b9ef89e6ebbfa057db62000049011e3e93593cc903b9b1b0e0ac8f5955d36df531999d1c37d860bab1daa1826aed0846468a6681dc66775598
-EBUILD geant4_vmc-6.0-r1.ebuild 1972 BLAKE2B f6cdd1ff34adc0294022a82081f681ef92453fa85a0b63865d51fb97e07c1532e57fddee8398bd4332be7078408e4ba306d1de28bf754b295b13c1d82103f306 SHA512 048160090c08e3fc391e5963b797557d5dea89f75d0b9a82e41eeb94c625554c436ce4f67b5d32f6e13561bd1539a7cd5d0e9167b1da6f5108e3617c04efad59
-EBUILD geant4_vmc-6.1.ebuild 1813 BLAKE2B ca05d3b7c257195753a7d85e9b60e24968e5106a5ec27cb131a645555461af37143321dd01b33ceb054b10de179201cc71cc1ddcbf1aa8fba6ddb903c106786b SHA512 38c326e0ebe6fe32c9980ad35c0077ac984b23f02f812f6a3a708107ac94dc60064c60ee5c03033cded0cd738c7f1c6c239d55eed1b2e536114ae59c4ab535a3
+DIST geant4_vmc-6.1_p3.tar.gz 5605174 BLAKE2B 80d7936534d4102b545a4285b8ddba4eb7c9ec31b1343194da922a6c79730c1f779cc9719b1d2e5b4bcf02a681c371157057d727c5fa86633e6c7497d64206e0 SHA512 ccb568c2ce004300c7c6ad908aa8d97319f3c0d4add0da3ace418231906cf91ef9f73b5c774fbadd6e4473dcc1b49071023d7fa159b5864f03b28dae407074c6
+DIST geant4_vmc-6.2.tar.gz 5743487 BLAKE2B 062fece07714f255eddd13c6bda660ea6737772fe7a43413df07c9ed221c0f80a872fe72614e5e4ad18396c72aae2c2000cdf6e3b1c2436f9419933ac32704bb SHA512 72651ab5261a398feb6f37271a41a5770334a20dc61be2046b19ca8ff4780cf7649136314e4a8597023d14782996d7ee0d047579b33a983c4dea9c21b32b4551
 EBUILD geant4_vmc-6.1_p2.ebuild 1814 BLAKE2B f0341fad2ad04f491729ad18c417812727f6b853c54324450c8e282d52ebd96559fad271f498bee13acb41fd79907eac69fa42b31dc3b79d095982ef370596d1 SHA512 c772f49074e2aa35b76b89259fbbeb2d77593ffafde8a2cb2b795e2c29785af7d947101642083a6032f0af4e02ef4049ef5aa5520e6db1236deab97e35180399
-EBUILD geant4_vmc-9999.ebuild 1801 BLAKE2B b2d988607237ab31007d369d186cb0a89b5de0cf6be691679cf95570d6b5b26b4749db6a06f857bc06000aa6a8065f1dc40a1be451ba6380d2cdd57b77b29a10 SHA512 639f134e396072c297c25dacd8f60055c747bd5fedcefac9d35bb1159bd879cfe353d463733988de940351363cad7af090625b9d96267ece3038c4c3adc45371
-MISC metadata.xml 1006 BLAKE2B 65038f11d71140809618866bdeb25849b005969de9c5dafbab594d3c6d3e2025339f97a7dcc7969677bceaaa346f02800427c6cf84f3f78519c149ec92bd85ef SHA512 1e4fe2fcc62983553b86b45fcfa2d0d5ac65d8939ed3b650ac494b22db197f7c04e7967ec7f3502a0c007271b497c6700cc2a62bbe600724fae71ad5d94efaf5
+EBUILD geant4_vmc-6.1_p3.ebuild 1868 BLAKE2B 68f3505235e6b1b164a8341bc43b69594089fae8bf0900bf13a2403bb350f0f3afc2ab47e6dd29df5b05d5364bffb27a056ebac1226be01435afc17c4c5a0c77 SHA512 71c8f8afa0cff7a8f5b6234553bb0bf8b209749085a476b7fa89badce021b44afe70046b3f231f6ef7a93b4027d61a833008c67cd09a9665b1833db7e7c85346
+EBUILD geant4_vmc-6.2.ebuild 1849 BLAKE2B 6b4b868db375a6c4cf03bbe34932790b0cb41370c312baeedbfa15e6519cd3cd8b7011afc7c5b9e665a5002fe2641286d67b088502fbf9167ff03b7246642495 SHA512 4fa995527b44b692a87cb6ee4fc1ca2de4166a5e0d01109427fe897e023071d72a64b9c99f2cd5f620812d032420f7e959e9f92217f961eead8eb9c1b0b9b91c
+EBUILD geant4_vmc-9999.ebuild 1819 BLAKE2B 1cd28f536fa6cd271bd660c26ead896177233f85f69c593776f304244956108f97f5dd57cc9a7ac08128adca78c1a0cf662627d88ff5039ba7e56ce3d8860cd3 SHA512 c3269b9cdaf7005bd89a7c8ea2327a99b72cf3f54f188a5ab57ac070ad12fdafa8bbafbde8b17f2802b4af3f26a36eda4744c3056e15fcb081ff6c1cb36c9f27
+MISC metadata.xml 898 BLAKE2B d938774267f72be00ef3ce6e483d5c1c2f84b20cc3ee46129cefc8677cbd7725760d7289863a5cb2ebb44a43e375831fa581597f75c2c4a1218acbd97872d181 SHA512 f2c0b0b9e6440975f0a322f57943c9eb40b244081927971377f355f4913d2db678cc6e65e49be6b7a67457440974c101fbe3a4ae3dbfb49c27f16175cd16dd6c
diff --git a/sci-physics/geant4_vmc/files/geant4_vmc-6.0-cmake-g4root-tests.patch b/sci-physics/geant4_vmc/files/geant4_vmc-6.0-cmake-g4root-tests.patch
deleted file mode 100644
index 5f561dc64c88..000000000000
--- a/sci-physics/geant4_vmc/files/geant4_vmc-6.0-cmake-g4root-tests.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5d25b7fd6d53b620b25bed3a72d739d1644b5731 Mon Sep 17 00:00:00 2001
-From: Oliver Freyermuth <o.freyermuth@googlemail.com>
-Date: Fri, 11 Feb 2022 17:22:13 +0100
-Subject: [PATCH] CMake: Fix G4Root_BUILD_TEST option in main CMakeLists.
-
-The option was not correctly inherited for use by the g4root
-subdirectory. Fixed by:
-- Setting it before add_subdirectory().
-- Storing the value in CACHE (otherwise, not seen in subdirectory).
-
-Pull Request: https://github.com/vmc-project/geant4_vmc/pull/28
-Bug: https://bugs.gentoo.org/833126
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,8 +60,8 @@ include(VMCInstallLibDir)
- #--- Add the packages sources --------------------------------------------------
- #
- if(Geant4VMC_BUILD_G4Root)
-+  set(G4Root_BUILD_TEST ${Geant4VMC_BUILD_G4Root_TEST} CACHE BOOL "Build G4Root test")
-   add_subdirectory(g4root)
--  set(G4Root_BUILD_TEST ${Geant4VMC_BUILD_G4Root_TEST})
- endif(Geant4VMC_BUILD_G4Root)
- 
- if(Geant4VMC_BUILD_Geant4VMC)
--- 
-2.34.1
-
diff --git a/sci-physics/geant4_vmc/files/geant4_vmc-6.0-geant-4.11.0.1-fix.patch b/sci-physics/geant4_vmc/files/geant4_vmc-6.0-geant-4.11.0.1-fix.patch
deleted file mode 100644
index 64e55fccc186..000000000000
--- a/sci-physics/geant4_vmc/files/geant4_vmc-6.0-geant-4.11.0.1-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From fad0699c25b864e1ce2466c3c683007af5c350ad Mon Sep 17 00:00:00 2001
-From: Ivana Hrivnacova <Ivana.Hrivnacova@cern.ch>
-Date: Wed, 9 Mar 2022 18:03:18 +0100
-Subject: [PATCH] Fix compilation with Geant4 11.0.p1: (#30)
-
-Added missing test for G4VERSION_NUMBER in TG4RunManager.cxx
----
- source/run/src/TG4RunManager.cxx | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/source/run/src/TG4RunManager.cxx b/source/run/src/TG4RunManager.cxx
-index 64a45f0e0..5190172b0 100644
---- a/source/run/src/TG4RunManager.cxx
-+++ b/source/run/src/TG4RunManager.cxx
-@@ -47,6 +47,7 @@
- #include <G4UIExecutive.hh>
- #include <G4UImanager.hh>
- #include <G4UIsession.hh>
-+#include <G4Version.hh>
- #include <Randomize.hh>
- 
- #ifdef USE_G4ROOT
-@@ -405,8 +406,10 @@ void TG4RunManager::Initialize()
-   // create G4RunManager
-   // ConfigureRunManager();
- 
-+#if G4VERSION_NUMBER == 1100
-   // Temporary work-around for bug in Cerenkov in Geant4 11.0
-   TG4PhysicsManager::Instance()->StoreCerenkovMaxBetaChangeValue();
-+#endif
- 
-   // initialize Geant4
-   fRunManager->Initialize();
diff --git a/sci-physics/geant4_vmc/geant4_vmc-5.4.ebuild b/sci-physics/geant4_vmc/geant4_vmc-5.4.ebuild
deleted file mode 100644
index a86aa91a1e02..000000000000
--- a/sci-physics/geant4_vmc/geant4_vmc-5.4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
-else
-	MY_PV=$(ver_rs 1- -)
-	SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Virtual Monte Carlo Geant4 implementation"
-HOMEPAGE="https://github.com/vmc-project/geant4_vmc"
-
-LICENSE="GPL-3"
-SLOT="4"
-IUSE="doc examples geant3 +g4root +mtroot vgm test"
-
-RDEPEND="
-	<sci-physics/geant-4.11[c++17,opengl,geant3?]
-	sci-physics/root:=[c++17,-vmc(-)]
-	<sci-physics/vmc-2.0:=[c++17]
-	vgm? ( sci-physics/vgm:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-doc/doxygen[dot] )"
-RESTRICT="
-	!examples? ( test )
-	!geant3? ( test )
-	!g4root? ( test )
-	!mtroot? ( test )
-	!test? ( test )
-	!vgm? ( test )"
-
-DOCS=(history README.md)
-
-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() {
-	cd examples || die
-	./test_suite.sh --debug --g3=off --garfield=off --builddir="${BUILD_DIR}" || die
-	./test_suite_exe.sh --g3=off --garfield=off --garfield=off --builddir="${BUILD_DIR}" || die
-}
-
-src_install() {
-	cmake_src_install
-	use doc && local HTML_DOCS=(doc/.)
-	einstalldocs
-}
diff --git a/sci-physics/geant4_vmc/geant4_vmc-6.1.ebuild b/sci-physics/geant4_vmc/geant4_vmc-6.1_p3.ebuild
index 99ae522be943..d345df0c65eb 100644
--- a/sci-physics/geant4_vmc/geant4_vmc-6.1.ebuild
+++ b/sci-physics/geant4_vmc/geant4_vmc-6.1_p3.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake
+inherit cmake virtualx
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
 else
-	MY_PV=$(ver_rs 1- -)
+	MY_PV=$(ver_rs 1-2 -)
 	SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 	KEYWORDS="~amd64 ~x86"
@@ -26,7 +26,7 @@ RDEPEND="
 	>=sci-physics/geant-4.11[c++17,opengl,geant3?]
 	sci-physics/root:=[c++17,-vmc(-)]
 	>=sci-physics/vmc-2.0:=[c++17]
-	vgm? ( sci-physics/vgm:= )"
+	vgm? ( <=sci-physics/vgm-5.0:= )"
 DEPEND="${RDEPEND}
 	test? ( >=sci-physics/geant-4.11[gdml] )"
 BDEPEND="doc? ( app-doc/doxygen[dot] )"
@@ -67,9 +67,10 @@ src_compile() {
 }
 
 src_test() {
+	export QT_DEBUG_PLUGINS=1
 	cd examples || die
-	./test_suite.sh --debug --g3=off --garfield=off --builddir="${BUILD_DIR}" || die
-	./test_suite_exe.sh --g3=off --garfield=off --garfield=off --builddir="${BUILD_DIR}" || die
+	virtx ./test_suite.sh --debug --g3=off --garfield=off --builddir="${BUILD_DIR}" || die
+	virtx ./test_suite_exe.sh --g3=off --garfield=off --garfield=off --builddir="${BUILD_DIR}" || die
 }
 
 src_install() {
diff --git a/sci-physics/geant4_vmc/geant4_vmc-6.0-r1.ebuild b/sci-physics/geant4_vmc/geant4_vmc-6.2.ebuild
index b26b9b111f8a..b379508aa225 100644
--- a/sci-physics/geant4_vmc/geant4_vmc-6.0-r1.ebuild
+++ b/sci-physics/geant4_vmc/geant4_vmc-6.2.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake
+inherit cmake virtualx
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
 else
-	MY_PV=$(ver_rs 1- -)
+	MY_PV=$(ver_rs 1-2 -)
 	SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 	KEYWORDS="~amd64 ~x86"
@@ -23,12 +23,12 @@ SLOT="4"
 IUSE="doc examples geant3 +g4root vgm test"
 
 RDEPEND="
-	>=sci-physics/geant-4.11[c++17,opengl,geant3?]
+	>=sci-physics/geant-4.11.1:=[c++17,opengl,geant3?]
 	sci-physics/root:=[c++17,-vmc(-)]
 	>=sci-physics/vmc-2.0:=[c++17]
-	vgm? ( sci-physics/vgm:= )"
+	vgm? ( >=sci-physics/vgm-5.1:= )"
 DEPEND="${RDEPEND}
-	test? ( >=sci-physics/geant-4.11[gdml] )"
+	test? ( >=sci-physics/geant-4.11.1:=[gdml] )"
 BDEPEND="doc? ( app-doc/doxygen[dot] )"
 RESTRICT="
 	!examples? ( test )
@@ -39,11 +39,6 @@ RESTRICT="
 
 DOCS=(history README.md)
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0-cmake-g4root-tests.patch
-	"${FILESDIR}"/${PN}-6.0-geant-4.11.0.1-fix.patch
-)
-
 src_configure() {
 	local mycmakeargs=(
 		-DGeant4VMC_USE_VGM="$(usex vgm)"
@@ -66,17 +61,15 @@ src_compile() {
 		)
 		local d
 		for d in "${dirs[@]}"; do
-			pushd "${d}" > /dev/null || die
-			doxygen || die
-			popd > /dev/null || die
+			doxygen "${d}"/Doxyfile || die
 		done
 	fi
 }
 
 src_test() {
 	cd examples || die
-	./test_suite.sh --debug --g3=off --garfield=off --builddir="${BUILD_DIR}" || die
-	./test_suite_exe.sh --g3=off --garfield=off --garfield=off --builddir="${BUILD_DIR}" || die
+	virtx ./test_suite.sh --debug --g3=off --garfield=off --builddir="${BUILD_DIR}" || die
+	virtx ./test_suite_exe.sh --g3=off --garfield=off --garfield=off --builddir="${BUILD_DIR}" || die
 }
 
 src_install() {
diff --git a/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild b/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild
index 2bc5b7595a6d..988ae63d16b7 100644
--- a/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild
+++ b/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake
+inherit cmake virtualx
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -23,12 +23,12 @@ SLOT="4"
 IUSE="doc examples geant3 +g4root vgm test"
 
 RDEPEND="
-	sci-physics/geant[c++17,opengl,geant3?]
+	sci-physics/geant:=[c++17,opengl,geant3?]
 	sci-physics/root:=[c++17,-vmc(-)]
 	sci-physics/vmc:=[c++17]
 	vgm? ( sci-physics/vgm:= )"
 DEPEND="${RDEPEND}
-	test? ( >=sci-physics/geant-4.11[gdml] )"
+	test? ( sci-physics/geant:=[gdml] )"
 BDEPEND="doc? ( app-doc/doxygen[dot] )"
 RESTRICT="
 	!examples? ( test )
@@ -68,8 +68,8 @@ src_compile() {
 
 src_test() {
 	cd examples || die
-	./test_suite.sh --debug --g3=off --garfield=off --builddir="${BUILD_DIR}" || die
-	./test_suite_exe.sh --g3=off --garfield=off --garfield=off --builddir="${BUILD_DIR}" || die
+	virtx ./test_suite.sh --debug --g3=off --garfield=off --builddir="${BUILD_DIR}" || die
+	virtx ./test_suite_exe.sh --g3=off --garfield=off --garfield=off --builddir="${BUILD_DIR}" || die
 }
 
 src_install() {
diff --git a/sci-physics/geant4_vmc/metadata.xml b/sci-physics/geant4_vmc/metadata.xml
index ec868275882a..ea62582fcde8 100644
--- a/sci-physics/geant4_vmc/metadata.xml
+++ b/sci-physics/geant4_vmc/metadata.xml
@@ -20,6 +20,5 @@
     <flag name="vgm">Enable the Virtual Geometry Model (<pkg>sci-physics/vgm</pkg>)</flag>
     <flag name="g4root">Build G4Root (interface for GEANT4 simulation with a ROOT geometry)</flag>
     <flag name="geant3">Build with Geant4 G3toG4 library</flag>
-    <flag name="mtroot">Build MTRoot (provides ROOT IO manager classes with multi-threading support)</flag>
   </use>
 </pkgmetadata>
diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest
index 4b823eb3f278..0a3f8107b7ce 100644
--- a/sci-physics/vgm/Manifest
+++ b/sci-physics/vgm/Manifest
@@ -1,4 +1,6 @@
 DIST vgm-5.0.tar.gz 3862583 BLAKE2B 7a1643b329f6f6b019e1b68ce691ed45a32d343925c59451d6e218469606a7a352334d4f1e330873fa1cbc4e1182b4557dc396f52ce7d35e26df81e79121cd60 SHA512 771c2e013c052ea1785fb79ba317b48482428ddf703e263eaf1c9840fbae66dd280d73aee99de30e1c3d70e46a5eb63affc92dfc5ba19298e2d4487b9e302588
+DIST vgm-5.1.tar.gz 3871449 BLAKE2B 19dc9337700edaa854a69b435e6e3012d12762fcc6fe2f3f1799ed11709a04c1b2e6b011ba2de89b251af6bb3471d6969037f4572e51bc21ae1de6cfcb2a3e6f SHA512 ac45c031d3e72d171a1d5048aa2d9e1330574a62cb80caa82a2875dfea4d52a314a7c52d4da99b387f6aeb4ce62842776216447082f8d594182210d34bf567ac
 EBUILD vgm-5.0.ebuild 1904 BLAKE2B c6ebf472bdd23c00204f0f452e7c4eac5b0b0f54146c9fcea24f60692ebf2e51ee5465179d88d69de98ef85f9f646493e2896c2884c86c2a78a687bf26869191 SHA512 2be580bafde809cb429a7530d9e48926449d17be799154644c98313ab81b949217ff65c7a5b52fc0838c1e746c7d89bae0a6bbab7af75e0aa9ee6108d95b38f0
-EBUILD vgm-9999.ebuild 1770 BLAKE2B 985a3dc2387110c228a6d58d1754b7a22d6b4bd26bf144f52f7dd821c9a00a4027a68a6af864de7a95e9f994716682a5106422a916fc05b51718c747bd5dd220 SHA512 02739f111eea2a76e3fc67bbade81ba0a01e2c92824aff8eec7550279f9b54b855ada79ebd3b41886f854a9423d6b51cd06b76f7e39d831659c84cb7ac2bd7a6
+EBUILD vgm-5.1.ebuild 1774 BLAKE2B 78232f275aa6f4d825f2a74face1a2ebfa697cd223adbafd3c268146f86427705b11712ed0ae8bcaba24e97d13868e7aa456d21789c5abe306b5018f87839ce2 SHA512 2faa2d0fe81c7fa9e46a95aaadd67f1b9943b5d24e9790b3a28821b7d6cc55e5dc2f6018ee25ce5e2fa643621174ddeb0d6a854354b64949dcb688db3ee687c5
+EBUILD vgm-9999.ebuild 1760 BLAKE2B fde904e7cdb812ffee695d55c8f5e473a5c950da772f884e1b2df0f9911472d7d448408e91ebbf63a0df77565f048e652949312d405c06e180845d80ce5c15c2 SHA512 2133d6fb969f26c2a5eaefd43c5ac4377d9be841986f2c3450200b7be090638b2f7837b6208804175dff680f0ce48b2f40c36a68bfd511f7dcfa155e8428ec99
 MISC metadata.xml 819 BLAKE2B 04ac719d56f70b20157b47d72551ef2867807589f1bfa577bb8a7e12954fa039a531a07384fac09555dbead90d8609cf6bf96a075f992492fd04166fb5711d3d SHA512 bda8c954d6cdd776af7fdc781de5f2b07566777a29d4fe99bbe596ead476481a0352ef28a8978b0625051310de458fb77fb00f6c3e9d20f27f727f8b39d954dc
diff --git a/sci-physics/vgm/vgm-5.1.ebuild b/sci-physics/vgm/vgm-5.1.ebuild
new file mode 100644
index 000000000000..5f58d81f0baf
--- /dev/null
+++ b/sci-physics/vgm/vgm-5.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
+else
+	MY_PV=$(ver_rs 1- -)
+	SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments"
+HOMEPAGE="https://github.com/vmc-project/vgm/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc examples +geant4 +root test"
+
+RDEPEND="
+	sci-physics/clhep:=
+	geant4? ( >=sci-physics/geant-4.11:=[c++17] )
+	root? ( sci-physics/root:=[c++17] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen[dot] )
+	test? (
+		>=sci-physics/geant-4.11:=[gdml]
+		sci-physics/geant4_vmc[g4root]
+	)"
+RESTRICT="
+	!geant4? ( test )
+	!root? ( test )
+	!test? ( test )
+	!examples? ( test )"
+
+DOCS=(
+	doc/README
+	doc/VGMhistory.txt
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCLHEP_DIR="${EPREFIX}/usr"
+		-DWITH_EXAMPLES="$(usex examples)"
+		-DINSTALL_EXAMPLES="$(usex examples)"
+		-DWITH_GEANT4="$(usex geant4)"
+		-DWITH_ROOT="$(usex root)"
+		-DWITH_TEST="$(usex test)"
+	)
+	if use test && use root && use geant4; then
+		mycmakeargs+=( -DWITH_G4ROOT=yes )
+	else
+		mycmakeargs+=( -DWITH_G4ROOT=no )
+	fi
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		doxygen packages/Doxyfile || die
+	fi
+}
+
+src_test() {
+	cd "${BUILD_DIR}"/test || 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() {
+	cmake_src_install
+	use doc && local HTML_DOCS=( doc/html/. )
+	einstalldocs
+}
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index fdf095918a01..777ea264b4d8 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,12 +24,12 @@ IUSE="doc examples +geant4 +root test"
 
 RDEPEND="
 	sci-physics/clhep:=
-	geant4? ( sci-physics/geant[c++17] )
+	geant4? ( sci-physics/geant:=[c++17] )
 	root? ( sci-physics/root:=[c++17] )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[dot] )
 	test? (
-		sci-physics/geant[gdml]
+		sci-physics/geant:=[gdml]
 		sci-physics/geant4_vmc[g4root]
 	)"
 RESTRICT="
@@ -41,7 +41,6 @@ RESTRICT="
 DOCS=(
 	doc/README
 	doc/VGMhistory.txt
-	doc/todo.txt
 )
 
 src_configure() {