gentoo auto-resync : 13:09:2023 - 10:44:02

12 files changed, 95 insertions, 335 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index b7fe7edcfa97..23d205340746 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 0d91f8c5e219..5f0045a39edb 100644
--- a/sci-physics/geant4_vmc/Manifest
+++ b/sci-physics/geant4_vmc/Manifest
@@ -1,14 +1,6 @@
-DIST geant4_vmc-6.1_p3.tar.gz 5605174 BLAKE2B 80d7936534d4102b545a4285b8ddba4eb7c9ec31b1343194da922a6c79730c1f779cc9719b1d2e5b4bcf02a681c371157057d727c5fa86633e6c7497d64206e0 SHA512 ccb568c2ce004300c7c6ad908aa8d97319f3c0d4add0da3ace418231906cf91ef9f73b5c774fbadd6e4473dcc1b49071023d7fa159b5864f03b28dae407074c6
-DIST geant4_vmc-6.1_p4.tar.gz 5606731 BLAKE2B 441a3398b472db13c5cb5219004c4d32c8ff07041e0c6335d40e6db8df23bc35d67ca2e6920a1b575f0fcb224b2d47ffa573dc5f9d23dac771ddf579b5bd9a2a SHA512 8751899e2db863017b6c14fc87fc172492dbcf26c089c4cea4b262b75e22ae7767d47e3019a3676315c0eb6052e99b6acd10a39135cd51e3ce0f9ea816c09ce6
-DIST geant4_vmc-6.1_p5.tar.gz 5606990 BLAKE2B 27f1071f72816ade025ba955432cdc931350388450902993468466c9860d8213e31b5e749bc6ae01d09832682ac836b477fae18d0600de33eda35c4ad4e616b4 SHA512 e769151751cf3f81fdfe9e6d0b8c33117dffbaa893c686fd3f68474dfd1adc299a7cf1c1fb14fd66bc909d34e7a66cf37308e697d32874fc4425834f9cef6d56
-DIST geant4_vmc-6.2.tar.gz 5743487 BLAKE2B 062fece07714f255eddd13c6bda660ea6737772fe7a43413df07c9ed221c0f80a872fe72614e5e4ad18396c72aae2c2000cdf6e3b1c2436f9419933ac32704bb SHA512 72651ab5261a398feb6f37271a41a5770334a20dc61be2046b19ca8ff4780cf7649136314e4a8597023d14782996d7ee0d047579b33a983c4dea9c21b32b4551
-DIST geant4_vmc-6.3.tar.gz 5737268 BLAKE2B 0de8b6eabd7aceebb8047daa2642bb5d41945abbbe751709fa7a8f4063dd1049676f5243eae17c2d572d232a28bf2f268d64fae72183d886a64af8a761679203 SHA512 4ca9d4593a10a25947eadc27de4460e2522077c499c73a59824f363b75922ae1d2695365fc941c60a7aa83f9b0ec030ac435926a729e764b88c768668b3c5671
-DIST geant4_vmc-6.3_p1.tar.gz 5737383 BLAKE2B 9f99f8367da47b15e195fd94463d2131babd268e4297e85f496c7f34dac60fe720259692d41e0ed54bd7452ece564900211edd7ef87d3d9a8acfa950c016ffbd SHA512 d2ac7881b343e7ecf0d5db42df79fbb26df6331da40db9513afa4b5b093571fd4e4f9ba22cc023d6f9f6827c3120d7d5a182cb88a0978e6aff6501b2c7abd0c6
-EBUILD geant4_vmc-6.1_p3.ebuild 1868 BLAKE2B 68f3505235e6b1b164a8341bc43b69594089fae8bf0900bf13a2403bb350f0f3afc2ab47e6dd29df5b05d5364bffb27a056ebac1226be01435afc17c4c5a0c77 SHA512 71c8f8afa0cff7a8f5b6234553bb0bf8b209749085a476b7fa89badce021b44afe70046b3f231f6ef7a93b4027d61a833008c67cd09a9665b1833db7e7c85346
-EBUILD geant4_vmc-6.1_p4.ebuild 1868 BLAKE2B 68f3505235e6b1b164a8341bc43b69594089fae8bf0900bf13a2403bb350f0f3afc2ab47e6dd29df5b05d5364bffb27a056ebac1226be01435afc17c4c5a0c77 SHA512 71c8f8afa0cff7a8f5b6234553bb0bf8b209749085a476b7fa89badce021b44afe70046b3f231f6ef7a93b4027d61a833008c67cd09a9665b1833db7e7c85346
-EBUILD geant4_vmc-6.1_p5.ebuild 1868 BLAKE2B 68f3505235e6b1b164a8341bc43b69594089fae8bf0900bf13a2403bb350f0f3afc2ab47e6dd29df5b05d5364bffb27a056ebac1226be01435afc17c4c5a0c77 SHA512 71c8f8afa0cff7a8f5b6234553bb0bf8b209749085a476b7fa89badce021b44afe70046b3f231f6ef7a93b4027d61a833008c67cd09a9665b1833db7e7c85346
-EBUILD geant4_vmc-6.2.ebuild 1849 BLAKE2B 6b4b868db375a6c4cf03bbe34932790b0cb41370c312baeedbfa15e6519cd3cd8b7011afc7c5b9e665a5002fe2641286d67b088502fbf9167ff03b7246642495 SHA512 4fa995527b44b692a87cb6ee4fc1ca2de4166a5e0d01109427fe897e023071d72a64b9c99f2cd5f620812d032420f7e959e9f92217f961eead8eb9c1b0b9b91c
-EBUILD geant4_vmc-6.3.ebuild 1849 BLAKE2B 6b4b868db375a6c4cf03bbe34932790b0cb41370c312baeedbfa15e6519cd3cd8b7011afc7c5b9e665a5002fe2641286d67b088502fbf9167ff03b7246642495 SHA512 4fa995527b44b692a87cb6ee4fc1ca2de4166a5e0d01109427fe897e023071d72a64b9c99f2cd5f620812d032420f7e959e9f92217f961eead8eb9c1b0b9b91c
-EBUILD geant4_vmc-6.3_p1.ebuild 1849 BLAKE2B 6b4b868db375a6c4cf03bbe34932790b0cb41370c312baeedbfa15e6519cd3cd8b7011afc7c5b9e665a5002fe2641286d67b088502fbf9167ff03b7246642495 SHA512 4fa995527b44b692a87cb6ee4fc1ca2de4166a5e0d01109427fe897e023071d72a64b9c99f2cd5f620812d032420f7e959e9f92217f961eead8eb9c1b0b9b91c
-EBUILD geant4_vmc-9999.ebuild 1819 BLAKE2B 1cd28f536fa6cd271bd660c26ead896177233f85f69c593776f304244956108f97f5dd57cc9a7ac08128adca78c1a0cf662627d88ff5039ba7e56ce3d8860cd3 SHA512 c3269b9cdaf7005bd89a7c8ea2327a99b72cf3f54f188a5ab57ac070ad12fdafa8bbafbde8b17f2802b4af3f26a36eda4744c3056e15fcb081ff6c1cb36c9f27
+DIST geant4_vmc-6.1_p8.tar.gz 5606161 BLAKE2B 70f98534789d47466859cc7494644aca6808c9a96b8d9daf98be71dfaa14b99b3eae50223762709904bb4147c0b283920331cd5bcbde3ee4f1f351b78ee27031 SHA512 6e7cdc612bee11b61ace387550cb83043ec02db0f05591414c0158bec436568d2e7dbb17a50be7b431ab7c41a0d7757cb1ff607cecb7dc10e7be2c0d2790863f
+DIST geant4_vmc-6.3_p2.tar.gz 5737615 BLAKE2B db6b27e2ff81d37f61c75f39b4bdc775fa2eeded4916b82de7a6e717b206f9648eb295058547d0eaf8bc30bb8f28dddd1b00dea334aeccf6c2cb53da25cee90a SHA512 d9994a291fd195737b94101cafeadbb18aa14a71046cf8c637ea42c8560f290edd7fa524056c472b164fbff8f07afe01b4f5c6b86eeecfa1cfd564e55839052f
+EBUILD geant4_vmc-6.1_p8.ebuild 1889 BLAKE2B ff1098901667fa11aa3646c40ff7c88375b68fd568bedc624ff0308200861ab68c3d669fda52e11861623a6f0c6cfa264ddfed52103966575e7f59629c89d8ea SHA512 fcf3199c909300719b25c6b45dcd734f33b352a8558e8255edbf972bccf4665051991dffa6bb6b611052eb7cdd783f78c50d434ff03be9ec7b9fc7ce481d52a2
+EBUILD geant4_vmc-6.3_p2.ebuild 1870 BLAKE2B 544846c93548001c0b6c795d3a00e17cbb29ab8e60effa47632e8486e4710112509f83148fdc88d59a6fbdc118c3b5af199073f31a589358b892b3088f2647de SHA512 5113667f143f89365641dea4b053ec87d20f23590bd204ac403c91c0facc2514e3f3cc62b3fef1a2c6a8bab1e9ea075f86e4c924d2dc529fc3fa2a5f82dac972
+EBUILD geant4_vmc-9999.ebuild 1840 BLAKE2B e48e73992d4b161128c8d6a5dc7310d7ec7f4a43440c8d4daeb159b1bb83b2be33ab19c9dd3be2a2bb271919924dbdbbf99d56358fa7aff3a48e2ec07f14c90b SHA512 0aee632e7ece4828b48c233dee6738de83653be2ab1e505dc4f8d874dabfe181c7a963058cabd1948ff1042aed5dadefc416ace6d95a7a48fe18db4ca1b50ffc
 MISC metadata.xml 898 BLAKE2B d938774267f72be00ef3ce6e483d5c1c2f84b20cc3ee46129cefc8677cbd7725760d7289863a5cb2ebb44a43e375831fa581597f75c2c4a1218acbd97872d181 SHA512 f2c0b0b9e6440975f0a322f57943c9eb40b244081927971377f355f4913d2db678cc6e65e49be6b7a67457440974c101fbe3a4ae3dbfb49c27f16175cd16dd6c
diff --git a/sci-physics/geant4_vmc/geant4_vmc-6.1_p4.ebuild b/sci-physics/geant4_vmc/geant4_vmc-6.1_p4.ebuild
deleted file mode 100644
index d345df0c65eb..000000000000
--- a/sci-physics/geant4_vmc/geant4_vmc-6.1_p4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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-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"
-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 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-5.0:= )"
-DEPEND="${RDEPEND}
-	test? ( >=sci-physics/geant-4.11[gdml] )"
-BDEPEND="doc? ( app-doc/doxygen[dot] )"
-RESTRICT="
-	!examples? ( test )
-	!geant3? ( test )
-	!g4root? ( 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_EXAMPLES="$(usex test)"
-		-DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
-		-DGeant4VMC_BUILD_G4Root_TEST="$(usex test)"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc ; then
-		local dirs=(
-			source
-			$(usev g4root)
-			$(usev examples)
-		)
-		local d
-		for d in "${dirs[@]}"; do
-			doxygen "${d}"/Doxyfile || die
-		done
-	fi
-}
-
-src_test() {
-	export QT_DEBUG_PLUGINS=1
-	cd examples || 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() {
-	cmake_src_install
-	use doc && local HTML_DOCS=(doc/.)
-	einstalldocs
-}
diff --git a/sci-physics/geant4_vmc/geant4_vmc-6.1_p5.ebuild b/sci-physics/geant4_vmc/geant4_vmc-6.1_p5.ebuild
deleted file mode 100644
index d345df0c65eb..000000000000
--- a/sci-physics/geant4_vmc/geant4_vmc-6.1_p5.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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-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"
-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 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-5.0:= )"
-DEPEND="${RDEPEND}
-	test? ( >=sci-physics/geant-4.11[gdml] )"
-BDEPEND="doc? ( app-doc/doxygen[dot] )"
-RESTRICT="
-	!examples? ( test )
-	!geant3? ( test )
-	!g4root? ( 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_EXAMPLES="$(usex test)"
-		-DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
-		-DGeant4VMC_BUILD_G4Root_TEST="$(usex test)"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc ; then
-		local dirs=(
-			source
-			$(usev g4root)
-			$(usev examples)
-		)
-		local d
-		for d in "${dirs[@]}"; do
-			doxygen "${d}"/Doxyfile || die
-		done
-	fi
-}
-
-src_test() {
-	export QT_DEBUG_PLUGINS=1
-	cd examples || 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() {
-	cmake_src_install
-	use doc && local HTML_DOCS=(doc/.)
-	einstalldocs
-}
diff --git a/sci-physics/geant4_vmc/geant4_vmc-6.1_p3.ebuild b/sci-physics/geant4_vmc/geant4_vmc-6.1_p8.ebuild
index d345df0c65eb..17ef687237da 100644
--- a/sci-physics/geant4_vmc/geant4_vmc-6.1_p3.ebuild
+++ b/sci-physics/geant4_vmc/geant4_vmc-6.1_p8.ebuild
@@ -23,6 +23,7 @@ SLOT="4"
 IUSE="doc examples geant3 +g4root vgm test"
 
 RDEPEND="
+	sci-physics/clhep:=
 	>=sci-physics/geant-4.11[c++17,opengl,geant3?]
 	sci-physics/root:=[c++17,-vmc(-)]
 	>=sci-physics/vmc-2.0:=[c++17]
diff --git a/sci-physics/geant4_vmc/geant4_vmc-6.2.ebuild b/sci-physics/geant4_vmc/geant4_vmc-6.2.ebuild
deleted file mode 100644
index b379508aa225..000000000000
--- a/sci-physics/geant4_vmc/geant4_vmc-6.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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-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"
-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 vgm test"
-
-RDEPEND="
-	>=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-5.1:= )"
-DEPEND="${RDEPEND}
-	test? ( >=sci-physics/geant-4.11.1:=[gdml] )"
-BDEPEND="doc? ( app-doc/doxygen[dot] )"
-RESTRICT="
-	!examples? ( test )
-	!geant3? ( test )
-	!g4root? ( 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_EXAMPLES="$(usex test)"
-		-DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
-		-DGeant4VMC_BUILD_G4Root_TEST="$(usex test)"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc ; then
-		local dirs=(
-			source
-			$(usev g4root)
-			$(usev examples)
-		)
-		local d
-		for d in "${dirs[@]}"; do
-			doxygen "${d}"/Doxyfile || die
-		done
-	fi
-}
-
-src_test() {
-	cd examples || 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() {
-	cmake_src_install
-	use doc && local HTML_DOCS=(doc/.)
-	einstalldocs
-}
diff --git a/sci-physics/geant4_vmc/geant4_vmc-6.3_p1.ebuild b/sci-physics/geant4_vmc/geant4_vmc-6.3_p1.ebuild
deleted file mode 100644
index b379508aa225..000000000000
--- a/sci-physics/geant4_vmc/geant4_vmc-6.3_p1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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-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"
-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 vgm test"
-
-RDEPEND="
-	>=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-5.1:= )"
-DEPEND="${RDEPEND}
-	test? ( >=sci-physics/geant-4.11.1:=[gdml] )"
-BDEPEND="doc? ( app-doc/doxygen[dot] )"
-RESTRICT="
-	!examples? ( test )
-	!geant3? ( test )
-	!g4root? ( 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_EXAMPLES="$(usex test)"
-		-DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
-		-DGeant4VMC_BUILD_G4Root_TEST="$(usex test)"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc ; then
-		local dirs=(
-			source
-			$(usev g4root)
-			$(usev examples)
-		)
-		local d
-		for d in "${dirs[@]}"; do
-			doxygen "${d}"/Doxyfile || die
-		done
-	fi
-}
-
-src_test() {
-	cd examples || 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() {
-	cmake_src_install
-	use doc && local HTML_DOCS=(doc/.)
-	einstalldocs
-}
diff --git a/sci-physics/geant4_vmc/geant4_vmc-6.3.ebuild b/sci-physics/geant4_vmc/geant4_vmc-6.3_p2.ebuild
index b379508aa225..9a117b1ee171 100644
--- a/sci-physics/geant4_vmc/geant4_vmc-6.3.ebuild
+++ b/sci-physics/geant4_vmc/geant4_vmc-6.3_p2.ebuild
@@ -23,6 +23,7 @@ SLOT="4"
 IUSE="doc examples geant3 +g4root vgm test"
 
 RDEPEND="
+	sci-physics/clhep:=
 	>=sci-physics/geant-4.11.1:=[c++17,opengl,geant3?]
 	sci-physics/root:=[c++17,-vmc(-)]
 	>=sci-physics/vmc-2.0:=[c++17]
diff --git a/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild b/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild
index 988ae63d16b7..dc161ebc6b0d 100644
--- a/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild
+++ b/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild
@@ -23,6 +23,7 @@ SLOT="4"
 IUSE="doc examples geant3 +g4root vgm test"
 
 RDEPEND="
+	sci-physics/clhep:=
 	sci-physics/geant:=[c++17,opengl,geant3?]
 	sci-physics/root:=[c++17,-vmc(-)]
 	sci-physics/vmc:=[c++17]
diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest
index 0a3f8107b7ce..58958fa678c1 100644
--- a/sci-physics/vgm/Manifest
+++ b/sci-physics/vgm/Manifest
@@ -1,6 +1,8 @@
 DIST vgm-5.0.tar.gz 3862583 BLAKE2B 7a1643b329f6f6b019e1b68ce691ed45a32d343925c59451d6e218469606a7a352334d4f1e330873fa1cbc4e1182b4557dc396f52ce7d35e26df81e79121cd60 SHA512 771c2e013c052ea1785fb79ba317b48482428ddf703e263eaf1c9840fbae66dd280d73aee99de30e1c3d70e46a5eb63affc92dfc5ba19298e2d4487b9e302588
 DIST vgm-5.1.tar.gz 3871449 BLAKE2B 19dc9337700edaa854a69b435e6e3012d12762fcc6fe2f3f1799ed11709a04c1b2e6b011ba2de89b251af6bb3471d6969037f4572e51bc21ae1de6cfcb2a3e6f SHA512 ac45c031d3e72d171a1d5048aa2d9e1330574a62cb80caa82a2875dfea4d52a314a7c52d4da99b387f6aeb4ce62842776216447082f8d594182210d34bf567ac
+DIST vgm-5.2.tar.gz 3963607 BLAKE2B 6b82f0ac8fa345e4a736d38c2e961f04836c943445fa2dbe52e48dcc378826a4aa7e1ea1af74ae097288121e52549d599e434da30bfd2b46c35b177ef42dae14 SHA512 f141215bf67684d41acb3ae3551e0c8b643033fca841d924030eedc18136e94d75efd8940b43eaca2640470c78331fff36957173e98c7f8a1cccc6325abbf870
 EBUILD vgm-5.0.ebuild 1904 BLAKE2B c6ebf472bdd23c00204f0f452e7c4eac5b0b0f54146c9fcea24f60692ebf2e51ee5465179d88d69de98ef85f9f646493e2896c2884c86c2a78a687bf26869191 SHA512 2be580bafde809cb429a7530d9e48926449d17be799154644c98313ab81b949217ff65c7a5b52fc0838c1e746c7d89bae0a6bbab7af75e0aa9ee6108d95b38f0
 EBUILD vgm-5.1.ebuild 1774 BLAKE2B 78232f275aa6f4d825f2a74face1a2ebfa697cd223adbafd3c268146f86427705b11712ed0ae8bcaba24e97d13868e7aa456d21789c5abe306b5018f87839ce2 SHA512 2faa2d0fe81c7fa9e46a95aaadd67f1b9943b5d24e9790b3a28821b7d6cc55e5dc2f6018ee25ce5e2fa643621174ddeb0d6a854354b64949dcb688db3ee687c5
-EBUILD vgm-9999.ebuild 1760 BLAKE2B fde904e7cdb812ffee695d55c8f5e473a5c950da772f884e1b2df0f9911472d7d448408e91ebbf63a0df77565f048e652949312d405c06e180845d80ce5c15c2 SHA512 2133d6fb969f26c2a5eaefd43c5ac4377d9be841986f2c3450200b7be090638b2f7837b6208804175dff680f0ce48b2f40c36a68bfd511f7dcfa155e8428ec99
+EBUILD vgm-5.2.ebuild 1667 BLAKE2B 2b2e94fe5fcbd6100aa3f6955d38701a2581ca7a96569e28683b086ecaa9cb7fd617e5f2d9241317c9c6444546d1ad666e7c2d6d22bc62b81fe5172a2aa7f42b SHA512 fd9d19ef393f2e1b0fbcffd83ece9b4aeefbec7971e695d63f866912126b59aee192fbc8d00871c5932ec06ee5d0674eb128cd08de9095bf0c1ffa16912dc1d0
+EBUILD vgm-9999.ebuild 1653 BLAKE2B fc505b8ce16becbd98cc235411d30027785b858cb34f45f32d504d0b30acbe18f30c3d574f5d6fad1b7d8cb8415217c96e144fb129116025464080c20710fc99 SHA512 ffdf6f62ba77cc2689c2ff9c8ed778342f1b9f68544ecbc8119bb2f19e86df46b618a60e5d506c29f5d183143c6b0faaab7460cba5fc27733a67dc7cb78b0549
 MISC metadata.xml 819 BLAKE2B 04ac719d56f70b20157b47d72551ef2867807589f1bfa577bb8a7e12954fa039a531a07384fac09555dbead90d8609cf6bf96a075f992492fd04166fb5711d3d SHA512 bda8c954d6cdd776af7fdc781de5f2b07566777a29d4fe99bbe596ead476481a0352ef28a8978b0625051310de458fb77fb00f6c3e9d20f27f727f8b39d954dc
diff --git a/sci-physics/vgm/vgm-5.2.ebuild b/sci-physics/vgm/vgm-5.2.ebuild
new file mode 100644
index 000000000000..d0dbdb3dc943
--- /dev/null
+++ b/sci-physics/vgm/vgm-5.2.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}
+	test? (
+		>=sci-physics/geant-4.11:=[gdml]
+		sci-physics/geant4_vmc[g4root]
+	)"
+BDEPEND="
+	doc? ( app-doc/doxygen[dot] )
+"
+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
+	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 777ea264b4d8..f7524d3384d5 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.ebuild
@@ -27,11 +27,13 @@ RDEPEND="
 	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/geant4_vmc[g4root]
 	)"
+BDEPEND="
+	doc? ( app-doc/doxygen[dot] )
+"
 RESTRICT="
 	!geant4? ( test )
 	!root? ( test )
@@ -69,8 +71,6 @@ src_compile() {
 
 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
 }