gentoo auto-resync : 05:12:2023 - 17:02:58

26 files changed, 69 insertions, 180 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 5a36988d3648..e80560f1de59 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index 76f44c8921b7..2d3135427162 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -2,7 +2,7 @@ AUX geant-4.11.0.2-musl-avoid-execinfo.patch 2812 BLAKE2B 7bede49a061f174d2cd3ad
 DIST geant4-v11.0.4.tar.gz 35827159 BLAKE2B 52297887fb3467c5a08725340da959cda72ebe1b0b0d526d240213a7d954f1c68b379abf04c00b271013a019c1179ce6d6d8dbc22a5339ea66927b30342aa58d SHA512 ae5c60702a9f08e30d202dbd9270c1e1353751b369f7129d91f3744b5ba9c5a30549bf90a1bce98351e0e5ddc57624a8748132c289de1c3a0679670ab4e30602
 DIST geant4-v11.1.2.tar.gz 36423840 BLAKE2B 14ea4402b421d9d5613c0fed7e818d8e3e8daef7f60ebbb0aef654cc9d6e499b57fa42d731a2796815261b979646751c359402d1e92546cc81a330f2b69a9097 SHA512 592296fe4dcb6d7fbaf60a3fa7cb2a1281246dbb67ad88c4ebb24361b4668b4308195edf72c1daeb9f178b7bdafc4ca744ef1661b9e229129beab12f7d20702b
 DIST geant4-v11.1.3.tar.gz 36455707 BLAKE2B 3edb035422906e0d9cfc1d2bd431eb6dc7abb2f62698fb333379776a5b548d3105a954ef5a1a87e7992b08e6ef85cb11445a3d95f09a2414f5ab6e93318e6d9f SHA512 2154443534de6c74ef48459b4ff818182801a18bfceaf4350dc8aa841363d71397c8a8ab5f5ad34ddb664ade9461508327072e33c520e69016729320cee6d9c7
-EBUILD geant-4.11.0.4.ebuild 3461 BLAKE2B ef422b5c5c45d13c1c1a0f573c58a59e19ef5a7cd138429fdca1987a6ccd439303a9e124524e7bcac90958b8bf754327d37aecbb982424e91335f5f323d800d1 SHA512 dcd1051a766e023a914428ab1f6ceab8a29cf570596d2835d719d42f12a1d4c3d8e8618154b1e189666c6043e1831cb7e6a7da4863d5070d83bbef1a895cdd8d
-EBUILD geant-4.11.1.2.ebuild 3014 BLAKE2B bd2c99f31df312ee0474e372470f5c9d40738527b257bf6c5ba91df8a4dee100f765792c85532b754e61ca888fb3372706766d7100d3db3ed681329a0dd6f1b5 SHA512 6096a8222c3c5d25906261d6aca9e135ad594ebf8c69f2099bfb2ddd85305a8b59cdf2547eacf384e6579150f6215c736589f438afe4180fda280959243ee20b
-EBUILD geant-4.11.1.3.ebuild 3015 BLAKE2B fd1f2a0372dca10b3aa41915dc45467afcb4082d8538b41e52ea24bb8f9b666fb235f6e7ad7753a2f4bea30de26244ab12d0e302b07164d04ca788520e90bd70 SHA512 77e909be2440a94b009408145fa753539e23f4d087eb747657f183f082098f06f72a992686dcd82fa562188d31ae824178e4adcdc77000bea0114eda52a2b9dd
-MISC metadata.xml 1649 BLAKE2B aa1d00d2f11d3c35231a3ea66bc2fe33466b644152171d0a1ded5f62d404816d517e992ada87adf1842d58624ee1b2538b46b3869f5a62185f361507eb78659a SHA512 02a6b99d4fae650dccd478de365c943e200909dd35ea158582b42747fb522c11392eaa84d35566b49f65834571a4e3377bba1d31d20598dd9a1c7a2d98923b14
+EBUILD geant-4.11.0.4-r1.ebuild 3378 BLAKE2B 7866291004cafc5078614dfbfd59319964fc1b0bbf7a0914f83ae49ad2dc586a8dbc6fe317071fed3963ceffae04e4d5075f3b473e788fb1a90bc263fadda116 SHA512 451a91db6ca90b6f61d84d75a23c07afdb40ab1944308939404a790b7aa3075eeca93401851399e25e9a438b34b80abae43f4ea0713d04587b906b3ebe94317c
+EBUILD geant-4.11.1.2-r1.ebuild 2931 BLAKE2B f4e100968a9d4a8d7c4a8f13820d73db4d6e2f5ee787200e5d961a429230d9b9f66b55c960bfe8d5151ea31dfcbd8c94c87886646c493e629c787d8ff9ef39b7 SHA512 5460a507c95acaa00f9177f38bf84ecb1e75e9f2d41fe0689a78a3b45427ff0e033299fa5a2e9ac575f1da0f93e5ab1eea7ab8d53a6759f04bc4c35346795d2a
+EBUILD geant-4.11.1.3-r1.ebuild 2932 BLAKE2B 4903a4c3527a49f7c6caab2ba5149756dd33a49e3903c41e79664d7b6ca9f2423a25d172d5fe05be687e07ac5a1be1b0f8fbf9ebc6588cf6f43bbb6da9587184 SHA512 cbba86291b0b7882ceaf75db28ed4a8e86704e7f67ba473337555b5315797d4e478527740fb912501d3e8971955bff5dd851121178550381d992921bb1ca63da
+MISC metadata.xml 1527 BLAKE2B f077711907b2effb5aa79e7470db8397e36dddad753e494e2398c72992b6b5cc1f1ef6ed3fa35640ccd119a7a46448e0f3b205803e886b6a587ba5afe4a568b5 SHA512 db1ae57378e4f109283b14d8f27ef38e0426b39a33cdd6bdf2fd6683bbf6b1cca5e89e78ef6771afa3e770af3db872c7bfbbfae3177f516147e2527aae51b181
diff --git a/sci-physics/geant/geant-4.11.0.4.ebuild b/sci-physics/geant/geant-4.11.0.4-r1.ebuild
index 46177ea9e071..fe3bcbab87c2 100644
--- a/sci-physics/geant/geant-4.11.0.4.ebuild
+++ b/sci-physics/geant/geant-4.11.0.4-r1.ebuild
@@ -26,13 +26,12 @@ 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"
+SLOT="4/$(ver_cut 1-4)"
 KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+c++17 c++20 +data debug doc examples freetype gdml geant3 hdf5 inventor motif opengl
+IUSE="+data debug doc examples freetype gdml geant3 hdf5 inventor motif opengl
 	python qt5 raytracerx static-libs tbb threads trajectories vtk"
 
 REQUIRED_USE="
-	^^ ( c++17 c++20 )
 	inventor? ( opengl )
 	motif? ( opengl )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -82,7 +81,6 @@ PATCHES=(
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
-		-DCMAKE_CXX_STANDARD=$( (usev c++17 || usev c++20) | cut -c4-)
 		-DGEANT4_BUILD_BUILTIN_BACKTRACE=$(usex debug)
 		-DGEANT4_BUILD_MULTITHREADED=$(usex threads)
 		-DGEANT4_BUILD_STORE_TRAJECTORY=$(usex trajectories)
diff --git a/sci-physics/geant/geant-4.11.1.2.ebuild b/sci-physics/geant/geant-4.11.1.2-r1.ebuild
index f3b3080d4a6c..324bd2fcce0f 100644
--- a/sci-physics/geant/geant-4.11.1.2.ebuild
+++ b/sci-physics/geant/geant-4.11.1.2-r1.ebuild
@@ -24,13 +24,12 @@ 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"
+SLOT="4/$(ver_cut 1-4)"
 KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+c++17 c++20 +data debug doc examples freetype gdml geant3 hdf5 inventor motif opengl
+IUSE="+data debug doc examples freetype gdml geant3 hdf5 inventor motif opengl
 	qt5 raytracerx static-libs tbb threads trajectories vtk"
 
 REQUIRED_USE="
-	^^ ( c++17 c++20 )
 	inventor? ( opengl )
 	motif? ( opengl )
 	qt5? ( opengl )
@@ -73,7 +72,6 @@ PATCHES=(
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
-		-DCMAKE_CXX_STANDARD=$( (usev c++17 || usev c++20) | cut -c4-)
 		-DGEANT4_BUILD_BUILTIN_BACKTRACE=$(usex debug)
 		-DGEANT4_BUILD_MULTITHREADED=$(usex threads)
 		-DGEANT4_BUILD_STORE_TRAJECTORY=$(usex trajectories)
diff --git a/sci-physics/geant/geant-4.11.1.3.ebuild b/sci-physics/geant/geant-4.11.1.3-r1.ebuild
index f27e52f2f965..6d0073515709 100644
--- a/sci-physics/geant/geant-4.11.1.3.ebuild
+++ b/sci-physics/geant/geant-4.11.1.3-r1.ebuild
@@ -24,13 +24,12 @@ 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"
+SLOT="4/$(ver_cut 1-4)"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+c++17 c++20 +data debug doc examples freetype gdml geant3 hdf5 inventor motif opengl
+IUSE="+data debug doc examples freetype gdml geant3 hdf5 inventor motif opengl
 	qt5 raytracerx static-libs tbb threads trajectories vtk"
 
 REQUIRED_USE="
-	^^ ( c++17 c++20 )
 	inventor? ( opengl )
 	motif? ( opengl )
 	qt5? ( opengl )
@@ -73,7 +72,6 @@ PATCHES=(
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
-		-DCMAKE_CXX_STANDARD=$( (usev c++17 || usev c++20) | cut -c4-)
 		-DGEANT4_BUILD_BUILTIN_BACKTRACE=$(usex debug)
 		-DGEANT4_BUILD_MULTITHREADED=$(usex threads)
 		-DGEANT4_BUILD_STORE_TRAJECTORY=$(usex trajectories)
diff --git a/sci-physics/geant/metadata.xml b/sci-physics/geant/metadata.xml
index e30535f60f9a..c3ee4dbc5921 100644
--- a/sci-physics/geant/metadata.xml
+++ b/sci-physics/geant/metadata.xml
@@ -15,8 +15,6 @@
   features and detectors.
   </longdescription>
   <use>
-    <flag name="c++17">Build using the C++17 standard</flag>
-    <flag name="c++20">Build using the C++20 standard</flag>
     <flag name="data">Add a lot of standard physics data files for geant4</flag>
     <flag name="freetype">Add support for <pkg>media-libs/freetype</pkg></flag>
     <flag name="gdml">Enable geometry markup language for xml</flag>
diff --git a/sci-physics/geant4_vmc/Manifest b/sci-physics/geant4_vmc/Manifest
index 5f0045a39edb..d0d6a4f2f1c2 100644
--- a/sci-physics/geant4_vmc/Manifest
+++ b/sci-physics/geant4_vmc/Manifest
@@ -1,6 +1,4 @@
-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
+EBUILD geant4_vmc-6.3_p2-r1.ebuild 1842 BLAKE2B 66af230d7a4b65039ce2338483f6d25608704441ae51bd1b1efe10553d4003c00f03b7c6a0767c614c0473ce429beca492248dcbb6629c100d36a67ffe4ba6b8 SHA512 93d54db4ad03cf978ac271debc9a797166eb92b3662876c686bfacefe99b6f6835dd430e8ad9ab6af3fc75bf5ae8c9ad25ae2b619714fd8fb7b290263bc410b2
+EBUILD geant4_vmc-9999.ebuild 1812 BLAKE2B 00639262cdf9b4121b45bdc0c770447e0d5dd526e4bebbf641b938178089a35a6b58bb2050d6c03e5ebb12f5593e70212bf941d85817304d476399e02d05ae17 SHA512 eda76e372b87bda80d24226ffd125852153ceca569dbf474d3d7dbee9b23567e4da5da2663b29c904dab483a4306cc18aba26bc401d5dc3ee9a63e727d3966c8
 MISC metadata.xml 898 BLAKE2B d938774267f72be00ef3ce6e483d5c1c2f84b20cc3ee46129cefc8677cbd7725760d7289863a5cb2ebb44a43e375831fa581597f75c2c4a1218acbd97872d181 SHA512 f2c0b0b9e6440975f0a322f57943c9eb40b244081927971377f355f4913d2db678cc6e65e49be6b7a67457440974c101fbe3a4ae3dbfb49c27f16175cd16dd6c
diff --git a/sci-physics/geant4_vmc/geant4_vmc-6.1_p8.ebuild b/sci-physics/geant4_vmc/geant4_vmc-6.1_p8.ebuild
deleted file mode 100644
index 17ef687237da..000000000000
--- a/sci-physics/geant4_vmc/geant4_vmc-6.1_p8.ebuild
+++ /dev/null
@@ -1,81 +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/clhep:=
-	>=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.3_p2.ebuild b/sci-physics/geant4_vmc/geant4_vmc-6.3_p2-r1.ebuild
index 9a117b1ee171..f376fc36fd36 100644
--- a/sci-physics/geant4_vmc/geant4_vmc-6.3_p2.ebuild
+++ b/sci-physics/geant4_vmc/geant4_vmc-6.3_p2-r1.ebuild
@@ -24,9 +24,9 @@ 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]
+	>=sci-physics/geant-4.11.1:=[opengl,geant3?]
+	sci-physics/root:=
+	>=sci-physics/vmc-2.0:=
 	vgm? ( >=sci-physics/vgm-5.1:= )"
 DEPEND="${RDEPEND}
 	test? ( >=sci-physics/geant-4.11.1:=[gdml] )"
diff --git a/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild b/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild
index dc161ebc6b0d..3c6c3fa37d32 100644
--- a/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild
+++ b/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild
@@ -24,9 +24,9 @@ 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]
+	sci-physics/geant:=[opengl,geant3?]
+	sci-physics/root:=
+	sci-physics/vmc:=
 	vgm? ( sci-physics/vgm:= )"
 DEPEND="${RDEPEND}
 	test? ( sci-physics/geant:=[gdml] )"
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 6f95af045f3f..175b56c3d075 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,8 +1,8 @@
 AUX root-6.12.06_cling-runtime-sysroot.patch 989 BLAKE2B 8202cc8f2bf72cc25642d0a03ba26c3969069b291a6a22188879dbedbf0c3c496149f79f671d0eb51d81d0ee36565660d136b4741f5d018c2b05325ff08381f0 SHA512 c96dee9843da1051c54bd6870ef0a04714944ffe1f86800c9a51b8eb8ef84107d3315d3a708dcc0b651248af4bec362c7f31695514505045aeda9c793d40dc58
 DIST root_v6.28.10.source.tar.gz 186626700 BLAKE2B 8a3b7b37da8b7467695cb26f5073bba0c07a8b65f13c2df88d400aa2eb6c0e3774ce73e314df3d6328cf150fe376b785cf0f0516900f45f0767fc494605503cf SHA512 9020027952977f6fc5ddaffd26010711a296b86f5ca8d3e6a902d06f94cdc5f7036360d6137eee7f70f9a1297c253e5e85c4284826e40cf32bc0e99216d53b90
 DIST root_v6.30.02.source.tar.gz 184758362 BLAKE2B 38b07dff364adac544c927cb76b5f02d69e4a58949b429e6a276906a80769b74f19db72537183c6f33543d2cf924354e626417b386b8952094d6f31e697065f3 SHA512 c6955c1ed7704eed16aedf1becb727e5221fe50f4f60c11a762d376230f2213e5d4320ddda3cd730cf735a4d10a7afb1b57f08669ebf364f7ac040980d7ca774
-EBUILD root-6.28.10.ebuild 8674 BLAKE2B 38503205c9b75cd8b2fdd7fa5377146b05e441e87849291a72a246f17d4ffcd539b88c3f600d83e2b3fa2fa6f19bb9fd19d0cfe11f1446d09030e4d09e0ab434 SHA512 c1b07901c812f23a81dc45bcff0d81f8fe5a308936aa7c4e6eded844046c7d46586ec49b6cdc8b21841bfa01b7bfc8a72a525ed4e0ddcfde4213f243eefabc2e
-EBUILD root-6.30.02.ebuild 8674 BLAKE2B 38503205c9b75cd8b2fdd7fa5377146b05e441e87849291a72a246f17d4ffcd539b88c3f600d83e2b3fa2fa6f19bb9fd19d0cfe11f1446d09030e4d09e0ab434 SHA512 c1b07901c812f23a81dc45bcff0d81f8fe5a308936aa7c4e6eded844046c7d46586ec49b6cdc8b21841bfa01b7bfc8a72a525ed4e0ddcfde4213f243eefabc2e
-EBUILD root-6.30.9999.ebuild 8674 BLAKE2B 38503205c9b75cd8b2fdd7fa5377146b05e441e87849291a72a246f17d4ffcd539b88c3f600d83e2b3fa2fa6f19bb9fd19d0cfe11f1446d09030e4d09e0ab434 SHA512 c1b07901c812f23a81dc45bcff0d81f8fe5a308936aa7c4e6eded844046c7d46586ec49b6cdc8b21841bfa01b7bfc8a72a525ed4e0ddcfde4213f243eefabc2e
-EBUILD root-9999.ebuild 8674 BLAKE2B 38503205c9b75cd8b2fdd7fa5377146b05e441e87849291a72a246f17d4ffcd539b88c3f600d83e2b3fa2fa6f19bb9fd19d0cfe11f1446d09030e4d09e0ab434 SHA512 c1b07901c812f23a81dc45bcff0d81f8fe5a308936aa7c4e6eded844046c7d46586ec49b6cdc8b21841bfa01b7bfc8a72a525ed4e0ddcfde4213f243eefabc2e
-MISC metadata.xml 3211 BLAKE2B 8f678c40100528276d8e2dce7df446bf7963f109707c22a21d7d1997411df939fb51a10ef75b8c682cc396956c67cb359a33b9ab23e99b2ff6b2a00006957bd4 SHA512 33a7c65e7bfa8f051141e2f09a56107049f2b1f674d78df6a1c9f69db439e88ed5b78371a91be6c56bb9b64c7b2a88b34276bc170fbd42762e0068d9b1dccf33
+EBUILD root-6.28.10-r1.ebuild 8552 BLAKE2B 80749682e2e1b3ccbe26bcb744cc532696afd3f04860568c73204c8f6d1f85d68d3caff2c2492886c3c6c653dbbaf56a8f57d41b9c845e9a959c8680bad5f25e SHA512 2f84212a90110b0497bd90ee11ad521f836174d3e5047e787d3c3bd8254e6b666d78d181dfcf20d9a5f48d657df58cff29b1c08b95bd08690c7441624a2314b9
+EBUILD root-6.30.02-r1.ebuild 8552 BLAKE2B 80749682e2e1b3ccbe26bcb744cc532696afd3f04860568c73204c8f6d1f85d68d3caff2c2492886c3c6c653dbbaf56a8f57d41b9c845e9a959c8680bad5f25e SHA512 2f84212a90110b0497bd90ee11ad521f836174d3e5047e787d3c3bd8254e6b666d78d181dfcf20d9a5f48d657df58cff29b1c08b95bd08690c7441624a2314b9
+EBUILD root-6.30.9999.ebuild 8552 BLAKE2B 80749682e2e1b3ccbe26bcb744cc532696afd3f04860568c73204c8f6d1f85d68d3caff2c2492886c3c6c653dbbaf56a8f57d41b9c845e9a959c8680bad5f25e SHA512 2f84212a90110b0497bd90ee11ad521f836174d3e5047e787d3c3bd8254e6b666d78d181dfcf20d9a5f48d657df58cff29b1c08b95bd08690c7441624a2314b9
+EBUILD root-9999.ebuild 8552 BLAKE2B 80749682e2e1b3ccbe26bcb744cc532696afd3f04860568c73204c8f6d1f85d68d3caff2c2492886c3c6c653dbbaf56a8f57d41b9c845e9a959c8680bad5f25e SHA512 2f84212a90110b0497bd90ee11ad521f836174d3e5047e787d3c3bd8254e6b666d78d181dfcf20d9a5f48d657df58cff29b1c08b95bd08690c7441624a2314b9
+MISC metadata.xml 3089 BLAKE2B 1a4a2c82a7c1b9ba34f4b6813e6dbf01a85f3f81488923b5abb2545e41dfdba47c382785b322063ba3c918d6b67a84d5143d3ed626177d6623e821ef5bb89435 SHA512 5973ef80edb8fa3cbc2d651345f6b5e4c78964c737598e29813a79b48d2aa9a2e58abc7ede9e5f666ee975edab1f7dc1632821ad98439592202e9da954f815a3
diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 0ce5b7e0cb6a..1d44dde0a37c 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -24,8 +24,6 @@
   </upstream>
   <use>
     <flag name="asimage">Enable support for <pkg>media-libs/libafterimage</pkg></flag>
-    <flag name="c++14">Build using the C++14 standard</flag>
-    <flag name="c++17">Build using the C++17 standard</flag>
     <flag name="cuda">Enable support for nVidia CUDA</flag>
     <flag name="cudnn">Enable support for nVidia cuDNN library</flag>
     <flag name="davix">Enable support for DAVIX Data Management Client (https://cern.ch/davix)</flag>
diff --git a/sci-physics/root/root-6.28.10.ebuild b/sci-physics/root/root-6.28.10-r1.ebuild
index 32012c31e7b4..831e28f81da0 100644
--- a/sci-physics/root/root-6.28.10.ebuild
+++ b/sci-physics/root/root-6.28.10-r1.ebuild
@@ -13,10 +13,11 @@ inherit cmake cuda fortran-2 python-single-r1 toolchain-funcs
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="https://root.cern"
 
-IUSE="+X aqua +asimage c++14 +c++17 cuda cudnn +davix debug +examples
-	fits fftw fortran +gdml graphviz +gsl http jupyter libcxx +minuit mpi
-	mysql odbc +opengl oracle postgres pythia6 pythia8 +python qt5 R +roofit
-	+root7 shadow sqlite +ssl +tbb test +tmva +unuran uring vc +xml xrootd"
+IUSE="+X aqua +asimage cuda cudnn +davix debug +examples fits fftw fortran
+	+gdml graphviz +gsl http jupyter libcxx +minuit mpi mysql odbc +opengl
+	oracle postgres pythia6 pythia8 +python qt5 R +roofit +root7 shadow
+	sqlite +ssl +tbb test +tmva +unuran uring vc +xml xrootd"
+
 RESTRICT="test"
 PROPERTIES="test_network"
 
@@ -38,7 +39,6 @@ fi
 LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
 
 REQUIRED_USE="
-	^^ ( c++14 c++17 )
 	cuda? ( tmva )
 	cudnn? ( cuda )
 	!X? ( !asimage !opengl !qt5 )
@@ -47,7 +47,6 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	qt5? ( root7 )
 	roofit? ( minuit )
-	root7? ( || ( c++17 ) )
 	tmva? ( gsl python )
 	uring? ( root7 )
 "
@@ -175,7 +174,6 @@ src_configure() {
 		-DCMAKE_CUDA_HOST_COMPILER="$(tc-getCXX)"
 		-DCMAKE_C_FLAGS="${CFLAGS}"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-		-DCMAKE_CXX_STANDARD=$( (usev c++14 || usev c++17) | cut -c4-)
 		# set build type flags to empty to avoid overriding CXXFLAGS
 		-UCMAKE_C_FLAGS_RELEASE
 		-UCMAKE_C_FLAGS_RELWITHDEBINFO
diff --git a/sci-physics/root/root-6.30.02.ebuild b/sci-physics/root/root-6.30.02-r1.ebuild
index 32012c31e7b4..831e28f81da0 100644
--- a/sci-physics/root/root-6.30.02.ebuild
+++ b/sci-physics/root/root-6.30.02-r1.ebuild
@@ -13,10 +13,11 @@ inherit cmake cuda fortran-2 python-single-r1 toolchain-funcs
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="https://root.cern"
 
-IUSE="+X aqua +asimage c++14 +c++17 cuda cudnn +davix debug +examples
-	fits fftw fortran +gdml graphviz +gsl http jupyter libcxx +minuit mpi
-	mysql odbc +opengl oracle postgres pythia6 pythia8 +python qt5 R +roofit
-	+root7 shadow sqlite +ssl +tbb test +tmva +unuran uring vc +xml xrootd"
+IUSE="+X aqua +asimage cuda cudnn +davix debug +examples fits fftw fortran
+	+gdml graphviz +gsl http jupyter libcxx +minuit mpi mysql odbc +opengl
+	oracle postgres pythia6 pythia8 +python qt5 R +roofit +root7 shadow
+	sqlite +ssl +tbb test +tmva +unuran uring vc +xml xrootd"
+
 RESTRICT="test"
 PROPERTIES="test_network"
 
@@ -38,7 +39,6 @@ fi
 LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
 
 REQUIRED_USE="
-	^^ ( c++14 c++17 )
 	cuda? ( tmva )
 	cudnn? ( cuda )
 	!X? ( !asimage !opengl !qt5 )
@@ -47,7 +47,6 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	qt5? ( root7 )
 	roofit? ( minuit )
-	root7? ( || ( c++17 ) )
 	tmva? ( gsl python )
 	uring? ( root7 )
 "
@@ -175,7 +174,6 @@ src_configure() {
 		-DCMAKE_CUDA_HOST_COMPILER="$(tc-getCXX)"
 		-DCMAKE_C_FLAGS="${CFLAGS}"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-		-DCMAKE_CXX_STANDARD=$( (usev c++14 || usev c++17) | cut -c4-)
 		# set build type flags to empty to avoid overriding CXXFLAGS
 		-UCMAKE_C_FLAGS_RELEASE
 		-UCMAKE_C_FLAGS_RELWITHDEBINFO
diff --git a/sci-physics/root/root-6.30.9999.ebuild b/sci-physics/root/root-6.30.9999.ebuild
index 32012c31e7b4..831e28f81da0 100644
--- a/sci-physics/root/root-6.30.9999.ebuild
+++ b/sci-physics/root/root-6.30.9999.ebuild
@@ -13,10 +13,11 @@ inherit cmake cuda fortran-2 python-single-r1 toolchain-funcs
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="https://root.cern"
 
-IUSE="+X aqua +asimage c++14 +c++17 cuda cudnn +davix debug +examples
-	fits fftw fortran +gdml graphviz +gsl http jupyter libcxx +minuit mpi
-	mysql odbc +opengl oracle postgres pythia6 pythia8 +python qt5 R +roofit
-	+root7 shadow sqlite +ssl +tbb test +tmva +unuran uring vc +xml xrootd"
+IUSE="+X aqua +asimage cuda cudnn +davix debug +examples fits fftw fortran
+	+gdml graphviz +gsl http jupyter libcxx +minuit mpi mysql odbc +opengl
+	oracle postgres pythia6 pythia8 +python qt5 R +roofit +root7 shadow
+	sqlite +ssl +tbb test +tmva +unuran uring vc +xml xrootd"
+
 RESTRICT="test"
 PROPERTIES="test_network"
 
@@ -38,7 +39,6 @@ fi
 LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
 
 REQUIRED_USE="
-	^^ ( c++14 c++17 )
 	cuda? ( tmva )
 	cudnn? ( cuda )
 	!X? ( !asimage !opengl !qt5 )
@@ -47,7 +47,6 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	qt5? ( root7 )
 	roofit? ( minuit )
-	root7? ( || ( c++17 ) )
 	tmva? ( gsl python )
 	uring? ( root7 )
 "
@@ -175,7 +174,6 @@ src_configure() {
 		-DCMAKE_CUDA_HOST_COMPILER="$(tc-getCXX)"
 		-DCMAKE_C_FLAGS="${CFLAGS}"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-		-DCMAKE_CXX_STANDARD=$( (usev c++14 || usev c++17) | cut -c4-)
 		# set build type flags to empty to avoid overriding CXXFLAGS
 		-UCMAKE_C_FLAGS_RELEASE
 		-UCMAKE_C_FLAGS_RELWITHDEBINFO
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 32012c31e7b4..831e28f81da0 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -13,10 +13,11 @@ inherit cmake cuda fortran-2 python-single-r1 toolchain-funcs
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="https://root.cern"
 
-IUSE="+X aqua +asimage c++14 +c++17 cuda cudnn +davix debug +examples
-	fits fftw fortran +gdml graphviz +gsl http jupyter libcxx +minuit mpi
-	mysql odbc +opengl oracle postgres pythia6 pythia8 +python qt5 R +roofit
-	+root7 shadow sqlite +ssl +tbb test +tmva +unuran uring vc +xml xrootd"
+IUSE="+X aqua +asimage cuda cudnn +davix debug +examples fits fftw fortran
+	+gdml graphviz +gsl http jupyter libcxx +minuit mpi mysql odbc +opengl
+	oracle postgres pythia6 pythia8 +python qt5 R +roofit +root7 shadow
+	sqlite +ssl +tbb test +tmva +unuran uring vc +xml xrootd"
+
 RESTRICT="test"
 PROPERTIES="test_network"
 
@@ -38,7 +39,6 @@ fi
 LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
 
 REQUIRED_USE="
-	^^ ( c++14 c++17 )
 	cuda? ( tmva )
 	cudnn? ( cuda )
 	!X? ( !asimage !opengl !qt5 )
@@ -47,7 +47,6 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	qt5? ( root7 )
 	roofit? ( minuit )
-	root7? ( || ( c++17 ) )
 	tmva? ( gsl python )
 	uring? ( root7 )
 "
@@ -175,7 +174,6 @@ src_configure() {
 		-DCMAKE_CUDA_HOST_COMPILER="$(tc-getCXX)"
 		-DCMAKE_C_FLAGS="${CFLAGS}"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-		-DCMAKE_CXX_STANDARD=$( (usev c++14 || usev c++17) | cut -c4-)
 		# set build type flags to empty to avoid overriding CXXFLAGS
 		-UCMAKE_C_FLAGS_RELEASE
 		-UCMAKE_C_FLAGS_RELWITHDEBINFO
diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest
index 58958fa678c1..93edcea7d445 100644
--- a/sci-physics/vgm/Manifest
+++ b/sci-physics/vgm/Manifest
@@ -1,8 +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-5.2.ebuild 1667 BLAKE2B 2b2e94fe5fcbd6100aa3f6955d38701a2581ca7a96569e28683b086ecaa9cb7fd617e5f2d9241317c9c6444546d1ad666e7c2d6d22bc62b81fe5172a2aa7f42b SHA512 fd9d19ef393f2e1b0fbcffd83ece9b4aeefbec7971e695d63f866912126b59aee192fbc8d00871c5932ec06ee5d0674eb128cd08de9095bf0c1ffa16912dc1d0
-EBUILD vgm-9999.ebuild 1653 BLAKE2B fc505b8ce16becbd98cc235411d30027785b858cb34f45f32d504d0b30acbe18f30c3d574f5d6fad1b7d8cb8415217c96e144fb129116025464080c20710fc99 SHA512 ffdf6f62ba77cc2689c2ff9c8ed778342f1b9f68544ecbc8119bb2f19e86df46b618a60e5d506c29f5d183143c6b0faaab7460cba5fc27733a67dc7cb78b0549
+EBUILD vgm-5.0-r1.ebuild 1883 BLAKE2B 801bd69642625e76accc10f40ac353fb5f5a4b8c3ed999928c09bf3a33aa882bce2aa5f95a540341e4b4882dd0d4cdcfb4b53d198523809333588806fb37ebc7 SHA512 8ba3d8810726eea84b92ac42bd9356c4115adf7021ce5949a9d71c7b33898586079833d8d350b708ae0b4957bc2201d8440069e85ae3080e2070dc165be340e1
+EBUILD vgm-5.1-r1.ebuild 1760 BLAKE2B 8c31ead54c92c405242a25092e4192896f21dcbce391a6c0414428b367e4346fd30574dc90e463902e002811ce930432447b3664f50056fa6cedfd9e02c73b5b SHA512 1e24b99ef29e7f657f30d95a68a196628a3b84abf26b4ded164940615ae63f2388e88f8a6d2618860ee1622f8735123014941c2321751bdfbda0f04c51eef1fb
+EBUILD vgm-5.2-r1.ebuild 1653 BLAKE2B 954a3eceec13c3e71cf7f495ca32c65d38a9a29b3736cc8c86cab0fe0a671d3a8a15a6c45acf1d6cbb9aaadd712e9c09425fa64969aa63c6c531bb11e8b78c02 SHA512 d466b349c67c6ea91ec1afd1dd5d873ac52715b9370816ec0f5415722a2b3a3bba5ceefcd3dbbb460cc7b6acc50b971ed9af8ff9a61c88ccfb3c8d4cdc20cdfb
+EBUILD vgm-9999.ebuild 1639 BLAKE2B 90956793030a20fa5bd82c78b8624c380db22816c98468277d3ae11d22247b520930be1a47dc6ada202032c1a85d33ccfeca6f36f20ee82ffd9d3e1ab9f0a08a SHA512 0f6202536a1d29db55a3081276ad2422b32fde7d1bcd9976e1b507576905b80500922119e1c26c314a7803fe27978c0b3ab5bf82feb1a558e5ed89eef05637fb
 MISC metadata.xml 819 BLAKE2B 04ac719d56f70b20157b47d72551ef2867807589f1bfa577bb8a7e12954fa039a531a07384fac09555dbead90d8609cf6bf96a075f992492fd04166fb5711d3d SHA512 bda8c954d6cdd776af7fdc781de5f2b07566777a29d4fe99bbe596ead476481a0352ef28a8978b0625051310de458fb77fb00f6c3e9d20f27f727f8b39d954dc
diff --git a/sci-physics/vgm/vgm-5.0.ebuild b/sci-physics/vgm/vgm-5.0-r1.ebuild
index 99dabda494c5..9a728c675b8b 100644
--- a/sci-physics/vgm/vgm-5.0.ebuild
+++ b/sci-physics/vgm/vgm-5.0-r1.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
@@ -26,10 +26,10 @@ IUSE="doc examples +geant4 +root test"
 RDEPEND="
 	sci-physics/clhep:=
 	geant4? (
-		>=sci-physics/geant-4.11[c++17]
-		<sci-physics/geant-4.11.1[c++17]
+		>=sci-physics/geant-4.11
+		<sci-physics/geant-4.11.1
 	)
-	root? ( sci-physics/root:=[c++17] )"
+	root? ( sci-physics/root:= )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[dot] )
 	test? (
diff --git a/sci-physics/vgm/vgm-5.1.ebuild b/sci-physics/vgm/vgm-5.1-r1.ebuild
index 5f58d81f0baf..c3e7db7ec478 100644
--- a/sci-physics/vgm/vgm-5.1.ebuild
+++ b/sci-physics/vgm/vgm-5.1-r1.ebuild
@@ -24,8 +24,8 @@ IUSE="doc examples +geant4 +root test"
 
 RDEPEND="
 	sci-physics/clhep:=
-	geant4? ( >=sci-physics/geant-4.11:=[c++17] )
-	root? ( sci-physics/root:=[c++17] )"
+	geant4? ( >=sci-physics/geant-4.11:= )
+	root? ( sci-physics/root:= )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[dot] )
 	test? (
diff --git a/sci-physics/vgm/vgm-5.2.ebuild b/sci-physics/vgm/vgm-5.2-r1.ebuild
index d0dbdb3dc943..300d057df338 100644
--- a/sci-physics/vgm/vgm-5.2.ebuild
+++ b/sci-physics/vgm/vgm-5.2-r1.ebuild
@@ -24,8 +24,8 @@ IUSE="doc examples +geant4 +root test"
 
 RDEPEND="
 	sci-physics/clhep:=
-	geant4? ( >=sci-physics/geant-4.11:=[c++17] )
-	root? ( sci-physics/root:=[c++17] )"
+	geant4? ( >=sci-physics/geant-4.11:= )
+	root? ( sci-physics/root:= )"
 DEPEND="${RDEPEND}
 	test? (
 		>=sci-physics/geant-4.11:=[gdml]
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index f7524d3384d5..94069713f88b 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.ebuild
@@ -24,8 +24,8 @@ IUSE="doc examples +geant4 +root test"
 
 RDEPEND="
 	sci-physics/clhep:=
-	geant4? ( sci-physics/geant:=[c++17] )
-	root? ( sci-physics/root:=[c++17] )"
+	geant4? ( sci-physics/geant:= )
+	root? ( sci-physics/root:= )"
 DEPEND="${RDEPEND}
 	test? (
 		sci-physics/geant:=[gdml]
diff --git a/sci-physics/vmc/Manifest b/sci-physics/vmc/Manifest
index 212d973ff6c5..016e38c74620 100644
--- a/sci-physics/vmc/Manifest
+++ b/sci-physics/vmc/Manifest
@@ -1,6 +1,6 @@
 DIST vmc-1.1_p1.tar.gz 91722 BLAKE2B 6849b52c95dd33393f75d24eb184571bfbc3b711e6bba7c33853493e97ad63fbdfa4c49c61f664b911d7e047229bcde08303b48a345f1a0b9bfffee3f078e275 SHA512 407d8a6d3c3375e448273750aaffe43e9f4a63cc2f4a4ec41d1cd9b3c830b836cbef8d4e9cb37e5a0595f54a22989b7e1dd62dda0606a84f5732d1d3f6eaaee8
 DIST vmc-2.0.tar.gz 96865 BLAKE2B 487ad5888389e10ba79364f4701ab4caec33d88b940ee277a8039a401fd624d3a9f7ae62bd4a50be770ac924703256325bf118e243bfe700ed8e390104f4e3d5 SHA512 3f0a88bf2bcf3daaa1327125a1aebb05452dabce3d5f274797c05cbd15cdd1c9d4fdfeebdef70a70ce5d575f19c2856330be18683e7bf241113881e11a022a89
-EBUILD vmc-1.1_p1.ebuild 1033 BLAKE2B 458b8e5afe0c598283ee03918c9c0d499f1a1c6d3299d2cdf49f9026270716a011cef69805079523b691565c0e3518681b7716813d0d6d0fee6e229915038755 SHA512 732aa15de49506f3ffa82a0f045db0559e2dd8aa29cf961139cdca3391a332e73ed007557e6c0e7cacfc5f0674da448f68236fd58cc2d3786184324d62ce14f5
-EBUILD vmc-2.0.ebuild 1033 BLAKE2B 458b8e5afe0c598283ee03918c9c0d499f1a1c6d3299d2cdf49f9026270716a011cef69805079523b691565c0e3518681b7716813d0d6d0fee6e229915038755 SHA512 732aa15de49506f3ffa82a0f045db0559e2dd8aa29cf961139cdca3391a332e73ed007557e6c0e7cacfc5f0674da448f68236fd58cc2d3786184324d62ce14f5
-EBUILD vmc-9999.ebuild 953 BLAKE2B 9ab0441d4e4618ff5d29f70820a65cb8b4d8771fd7bf6c4114c31b72117300dcf63737fc6dd444b4ea77cfd91082048304d7320963af7402647e5c76b25d42b3 SHA512 e86cfcbeff962fd6a854dc54fe8d4ccafd03fd5b69d3b5a3003d3fe385d0824f4ec66ff29295161d5cb2b53f06fb309eb33b2bbd1d25087253686b32633dafdb
-MISC metadata.xml 759 BLAKE2B 788f419034c59dbb0c685ec957452c48655a85193456494474e0f36d342c07ed2d5cabe38352c8fb5627319279a623a3ec328acd06be1fa95fdb279b70a0d07a SHA512 42ce917b3392ad4910016aaca17d079c5af220ce7b851866e1b73ae6e6061679196b470258fc8dee81a7687e7bcee027356206b4dd413977cbeed7977aa6134f
+EBUILD vmc-1.1_p1-r1.ebuild 962 BLAKE2B 9c24d72756a63ac873d4cfea8880d2321dfffd2afb9cb346fcf46833a0c29d963e1612b542ebb3c061dad8300c8a86990eb10b905082575f0bdd4e7042229d54 SHA512 4f6cdc5d601487b9ed5b7d442b43ccd5227e68e66e3f745f3de9a3128fdb54113e4c9d978392463f56a52c150dca5b6e92fac10851ba1bbc70698725cd498512
+EBUILD vmc-2.0-r1.ebuild 962 BLAKE2B 9c24d72756a63ac873d4cfea8880d2321dfffd2afb9cb346fcf46833a0c29d963e1612b542ebb3c061dad8300c8a86990eb10b905082575f0bdd4e7042229d54 SHA512 4f6cdc5d601487b9ed5b7d442b43ccd5227e68e66e3f745f3de9a3128fdb54113e4c9d978392463f56a52c150dca5b6e92fac10851ba1bbc70698725cd498512
+EBUILD vmc-9999.ebuild 882 BLAKE2B 16ec478c47efae63f3ad33432ff8c3af55dfb76164327d630164df55262d9b36eb11f4d3b3e590e8c2ecca45fdb771840df2a363bbf93ea499e1595874355fc6 SHA512 8acd07c08128ad0117a92d88844e5c14447f9a00f2799d0b46ffcaf92844ab83febc12cbf2c7e04c0a6e5f9bf4113d1333cd44ef4cdb2ab240617869c5b47e65
+MISC metadata.xml 620 BLAKE2B 835ccaf6950dcea15c00225b31555f02219fb688d164b27b99a96fe8abf78cb96243173f9ed4c06277f45ea9dcaece0c74cbf6484092bdcbe685f30ae3ebab14 SHA512 d3bf35da1e5e3cfdad9f2c04ff50b92ceb66c1d8d9550afb5af77a2fc107f4b23acde2bc445083e60222fcc8cd4255d10975b392902c064a35825ae1c2b8788b
diff --git a/sci-physics/vmc/metadata.xml b/sci-physics/vmc/metadata.xml
index e83a4cd24ef5..966a77c37cd6 100644
--- a/sci-physics/vmc/metadata.xml
+++ b/sci-physics/vmc/metadata.xml
@@ -13,10 +13,6 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
-  <use>
-    <flag name="c++14">Build using the C++14 standard</flag>
-    <flag name="c++17">Build using the C++17 standard</flag>
-  </use>
   <upstream>
     <remote-id type="github">vmc-project/vmc</remote-id>
   </upstream>
diff --git a/sci-physics/vmc/vmc-2.0.ebuild b/sci-physics/vmc/vmc-1.1_p1-r1.ebuild
index a92dc7f26a5a..8cf9327f72c4 100644
--- a/sci-physics/vmc/vmc-2.0.ebuild
+++ b/sci-physics/vmc/vmc-1.1_p1-r1.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
@@ -20,11 +20,9 @@ HOMEPAGE="https://vmc-project.github.io/ https://github.com/vmc-project/vmc"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="c++14 +c++17 doc"
+IUSE="doc"
 
-REQUIRED_USE="^^ ( c++14 c++17 )"
-
-RDEPEND="sci-physics/root:=[c++14?,c++17?,-vmc(-)]"
+RDEPEND="sci-physics/root:="
 DEPEND="${RDEPEND}"
 BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
diff --git a/sci-physics/vmc/vmc-1.1_p1.ebuild b/sci-physics/vmc/vmc-2.0-r1.ebuild
index a92dc7f26a5a..8cf9327f72c4 100644
--- a/sci-physics/vmc/vmc-1.1_p1.ebuild
+++ b/sci-physics/vmc/vmc-2.0-r1.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
@@ -20,11 +20,9 @@ HOMEPAGE="https://vmc-project.github.io/ https://github.com/vmc-project/vmc"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="c++14 +c++17 doc"
+IUSE="doc"
 
-REQUIRED_USE="^^ ( c++14 c++17 )"
-
-RDEPEND="sci-physics/root:=[c++14?,c++17?,-vmc(-)]"
+RDEPEND="sci-physics/root:="
 DEPEND="${RDEPEND}"
 BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
diff --git a/sci-physics/vmc/vmc-9999.ebuild b/sci-physics/vmc/vmc-9999.ebuild
index cf26fb07595b..b7d3876a475b 100644
--- a/sci-physics/vmc/vmc-9999.ebuild
+++ b/sci-physics/vmc/vmc-9999.ebuild
@@ -20,11 +20,9 @@ HOMEPAGE="https://vmc-project.github.io/ https://github.com/vmc-project/vmc"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="c++14 +c++17 doc"
+IUSE="doc"
 
-REQUIRED_USE="^^ ( c++14 c++17 )"
-
-RDEPEND="sci-physics/root:=[c++14?,c++17?,-vmc(-)]"
+RDEPEND="sci-physics/root:="
 DEPEND="${RDEPEND}"
 BDEPEND="doc? ( app-doc/doxygen[dot] )"