gentoo resync : 22.12.2021

8 files changed, 45 insertions, 424 deletions

diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index 2c10ec0218e4..d5062673c46d 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -1,12 +1,5 @@
-AUX geant4.10.7-hdf5.patch 2733 BLAKE2B 58b2da9a27d09dbd16048b3da34397b49abd28fe12238d400a86d64fb02799b294c1b4313297de4397d6f8e5fc0feb735f8fc9352ff5b4c34721a445a33d2354 SHA512 a1f64e1e21b09e7b7335eb06110cd2c76f7bbbab80f0dd87bb1139c5d45ee5392f2f03a0466c27e8d796aa24e3b5400fe44f5c260969aa64f1e5e506393b0080
-DIST geant4.10.07.p01.tar.gz 36217226 BLAKE2B 3bc5868db1328ac08582fef4a5246e2f3fc1b2d34bca668d27c6c272af3de230f680cff02c3a8b53ab5abc4186645935b042b456cdff3cba01bc180e0646a50d SHA512 d314d649bf349a4fc5dd09229897d3e4ca3bfba071daeb67ab4d4bde187ec59c120b2478d2b28d1c88615189bd38097666bf4a0c25ce5cb4bc3cf0d9815bea5d
-DIST geant4.10.07.p02.tar.gz 35729676 BLAKE2B 1727ab4e35f4dafe0b406bb189a008955c660922a4fc855a765a269ec8837242ba2372b346c189de6bd6d36c434e0636c483c292f90573726fa6d3b4cc67eb12 SHA512 fe5a387880218782570ff2b28cf8f6abc1457437652f349b8b81ac1045bdec7ee51fa2930451c1271708c02914ac60effd0ee8933d42c29d05819fe320356092
+DIST geant4-v11.0.0.tar.gz 35605817 BLAKE2B c34ded976b88946973a5ea9e81d91e0510318ae25f29c631f46b0ee60a9a97d682375ba18e429773930b1ba7808989b9b7ef6affb8f2f1f220ec1c7bd069590c SHA512 52631043e4f1bce6cb33d822bedca5a384c4c7c8997473a548b4df4f3b1702d45fe6ef64647225e573995c63518e4ba39f82afb645b7daa89591a3127799498a
 DIST geant4.10.07.p03.tar.gz 35756099 BLAKE2B 9e510d17173d280a24d2540d0e0f25f7337a410858c30e9281b937a8402cbc0acd022cc6f41cc3b88fec28b53fa8a266d79e90bfb6545f4ecffe0724e36183da SHA512 174e4f37ca977eff89bbd8f72f18ef5534db72d966665b9a837ed26acffa527d45741fd38fde460f0719c8962dc2ee33db1f3dfe065a7d0e74c148e4582c095c
-DIST geant4.10.07.tar.gz 36422877 BLAKE2B d81a37e0968f3c13bb846efc252b1b31cb01a8642610b079bcf6ec1741e7f5da09d50f4abe4054b7a06433dc7d9b611110c4f9a1f971a5f1df27580d49b8906d SHA512 057ab2c6ee5d5ad7012bd889bf883faa3ef1fa72a93190d00d1320f250b7b52e21cbae552cbc35065ad5f5bd46cd91fd1536dd4d5e620afa0abb6b065bd7c86b
-DIST geant4.11.00.b01.tar.gz 35617362 BLAKE2B 654679f3876081931a80b8ee8dbf579ef45cbd8edb4e8a641ad1facc2edab470ff19f557672e901321e1993453110b4f1f5c5d7a6b0bb293e710def2d5871d12 SHA512 abc39b33d0570bc07db0e957a2e33db91b47e8ebe650bb79cb8f6fdf6f0e4938607a96011f9b0fba0294828afcf7e6f3ee20367e319f2b388f3b315bd615a6db
-EBUILD geant-4.10.7-r3.ebuild 3023 BLAKE2B fc6736cd84396a2b3150e4cb11257e0a2f8a796b71bee008a2c9dc495f2804c19037b647c1f9a562b300455f793d3ab4d846c9bd47a336bbd04b05b3fab3ac2a SHA512 4965ff7ec1f669239c4fd8ba86323ad7d559db830141823351f14df6046896f5f54397b59276ebd512c0c8098a9dddcc06b8bc1f3aa9b6b1a89dfa1f3eff189f
-EBUILD geant-4.10.7.1-r3.ebuild 3023 BLAKE2B fc6736cd84396a2b3150e4cb11257e0a2f8a796b71bee008a2c9dc495f2804c19037b647c1f9a562b300455f793d3ab4d846c9bd47a336bbd04b05b3fab3ac2a SHA512 4965ff7ec1f669239c4fd8ba86323ad7d559db830141823351f14df6046896f5f54397b59276ebd512c0c8098a9dddcc06b8bc1f3aa9b6b1a89dfa1f3eff189f
-EBUILD geant-4.10.7.2-r3.ebuild 3028 BLAKE2B 94bf246880007086975506be8f42c614c935ec30ec26e341b717407c16f26dd521ceb939703808df3cc4ed224fc9843ce38a5d95506a2bb81c158f5ff3da2a46 SHA512 e2f5b172e01ab6267d1c80948b4183ce91c1b2ad033fdd5d8c951bde7a596734eee35da3a8b232392f255450a50026650e9ef8beb8e3e151013a5c168ca9aaad
-EBUILD geant-4.10.7.3.ebuild 2978 BLAKE2B a3afb598bdb82415dec02e6856ee09693b323122b6837890421baecf48365003c64abc6e20b592458a2a7bf1390ceae237720e8489b5ca2f9f48768af98e068b SHA512 0faf72fe2fc6ec9c6e48dfc32b33c00bc3a56409c84e2d0b82e2a686fcd161c356bbc5d05a9fd85976c4a32dde6b4860e13536a141049264f159310c46c1e3bd
-EBUILD geant-4.11.0_beta1-r2.ebuild 2981 BLAKE2B 975509af637085168c64325f43e6da45e388bb324de80b9d044aa3a5f682923467edb7835b43216c0137db93b4baaf0141e9572f242e42bc914cd4d23a3999ec SHA512 99b3414f41db5af7971a8fad4512aeb4b7205dd3b1622efc948ea19f6f3f9ccf11b8bb8d4b2fc72477e119a651e82776bddf511a9a64afa1b6fdadaea563dba6
-MISC metadata.xml 1617 BLAKE2B d250ec06dda2df98fbddcc1f806f77313a3aa679b0633c8a9def8a7dad2ecc58077a9a15df14951f306c788484f2928ee4c84019532c3e501e927e11cfee773a SHA512 6bb96f1623967ada736cc78f95e67c66faaedb87c6dd0881baccc2f191342783b74abb4b7edda78fa44639ccce914b9d4206512028c6ecbb4be6a8f3abfc81fc
+EBUILD geant-4.10.7.3.ebuild 2976 BLAKE2B 987a3ba8c35136cb8932663110f8d5fd9c1d9be3fc0a2372c86f9addf65734663c83b64b1a454330bd9104117e705ba4ac2fda3047033323db7d5bccd7408255 SHA512 ae85cffa6ea7eb9437cf8c50ed3c24dc7b2765128dc9755f04dadf2934e27ae39e2611fa5dbf37460675718a0a04d8c7ce70a9abb07350ff411c193d5f9d15d0
+EBUILD geant-4.11.0.0.ebuild 3484 BLAKE2B 529a246976d45c71364f70805e49ac2f1e8efc2b0d75872dbd5dd3de8a78e9ee9ae5be39831995f17c8425b483c292881298efaebedb7ba698ac5ba024af8ddb SHA512 90182ca371145e27dfc75f6d5e7ae7a6a613bd8771702ce07bb87257364b643cc50abf78f6b506f2add37bfab804f660010f13c632ee5f1355d6c53fb75f3495
+MISC metadata.xml 1765 BLAKE2B 70ee66225468abedfaebb6faec123c5d0c1748088080a483c9378654e93190d9436abc0c781e4a5909283fb63541c3ae4450e5bb43fa720dfcfb928023079064 SHA512 5ccca521e3249cdf0d1f9d0dabae8fea73ac03a564be7d7c5f19a85fafb16f4078ea39bf7b55d7c45e4b5575e0b809fd251cc18e28d2e5bba993f71f5056fd4d
diff --git a/sci-physics/geant/files/geant4.10.7-hdf5.patch b/sci-physics/geant/files/geant4.10.7-hdf5.patch
deleted file mode 100644
index 679cdfbed9d6..000000000000
--- a/sci-physics/geant/files/geant4.10.7-hdf5.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 4e86e523e7f0e419b990520a15ef7d524102cd06 Mon Sep 17 00:00:00 2001
-From: Guilherme Amadio <amadio@gentoo.org>
-Date: Mon, 23 Aug 2021 13:18:25 +0200
-Subject: [PATCH] Rename Geant4::HDF5 to hdf5::hdf5
-
-Needed to be compatible with CMake 3.20, which now provides imported
-targets for HDF5 (https://cmake.org/cmake/help/v3.20/module/FindHDF5.html).
----
- cmake/Modules/G4HDF5Shim.cmake           | 16 ++++++++--------
- cmake/Modules/G4OptionalComponents.cmake |  2 +-
-
-diff --git a/cmake/Modules/G4HDF5Shim.cmake b/cmake/Modules/G4HDF5Shim.cmake
-index 963a7bb5be..97d97248d8 100644
---- a/cmake/Modules/G4HDF5Shim.cmake
-+++ b/cmake/Modules/G4HDF5Shim.cmake
-@@ -1,10 +1,10 @@
-- # - G4HDF5Shim
-+# - G4HDF5Shim
- #
- # Geant4's Geant4Config.cmake file aims to support CMake 3.8 and newer
- # The HDF5 dependency is located through CMake's builtin FindHDF5
--# module, but this does not supply imported targets as of CMake 3.16.
-+# module, but this does not supply imported targets until CMake 3.20.
- # It may use HDF5's hdf5-config.cmake file if available, so create
--# custom imported target Geant4::HDF5 to allow both cases to be handled
-+# custom imported target hdf5::hdf5 to allow both cases to be handled
- # without interference with either.
-  
- if(HDF5_FOUND)
-@@ -24,18 +24,18 @@ if(HDF5_FOUND)
-    endif()
-  endif()
- 
-- # As FindHDF5 does not yet supply imported targets, we
-+ # If FindHDF5 does not yet supply imported targets, we
-  # create an internal INTERFACE target to wrap these.
-  # This still hard-codes include/library paths, but limits it
-  # to one place. Later, we'll create proper imported targets
-  # with re-finds but for now this is the best minimally invasive proceedure
-- if(NOT TARGET Geant4::HDF5)
--   add_library(Geant4::HDF5 IMPORTED UNKNOWN)
--   set_target_properties(Geant4::HDF5 PROPERTIES
-+ if(NOT TARGET hdf5::hdf5)
-+   add_library(hdf5::hdf5 IMPORTED UNKNOWN)
-+   set_target_properties(hdf5::hdf5 PROPERTIES
-      IMPORTED_LINK_INTERFACE_LANGUAGES "C"
-      IMPORTED_LOCATION "${HDF5_C_LIBRARY_hdf5}"
-      INTERFACE_INCLUDE_DIRECTORIES "${HDF5_C_INCLUDE_DIRS}"
-      INTERFACE_LINK_LIBRARIES "${HDF5_C_LIBRARIES}"
-      )
-  endif()
--endif()
-\ No newline at end of file
-+endif()
-diff --git a/cmake/Modules/G4OptionalComponents.cmake b/cmake/Modules/G4OptionalComponents.cmake
-index c0639a538b..77b3c91241 100644
---- a/cmake/Modules/G4OptionalComponents.cmake
-+++ b/cmake/Modules/G4OptionalComponents.cmake
-@@ -369,7 +369,7 @@ if(GEANT4_USE_HDF5)
-   find_package(HDF5 1.8 REQUIRED)
-   include("${CMAKE_CURRENT_LIST_DIR}/G4HDF5Shim.cmake")
-   # Backward compatibility
--  set(HDF5_LIBRARIES Geant4::HDF5)
-+  set(HDF5_LIBRARIES hdf5::hdf5)
- 
-   # May have found via config mode...
-   if(HDF5_DIR)
--- 
-2.33.0
-
diff --git a/sci-physics/geant/geant-4.10.7-r3.ebuild b/sci-physics/geant/geant-4.10.7-r3.ebuild
deleted file mode 100644
index 085e5abcf44a..000000000000
--- a/sci-physics/geant/geant-4.10.7-r3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3))
-
-case ${PV} in
-*_beta*)
-	MY_P+=.b$(printf %02d $(ver_cut 5))
-	DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt"
-	;;
-*)
-	if [[ $(ver_cut 4) -gt 0 ]]; then
-		MY_P+=.p$(printf %02d $(ver_cut 4))
-		DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
-	fi
-	HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
-	;;
-esac
-
-DESCRIPTION="Toolkit for simulation of passage of particles through matter"
-HOMEPAGE="https://geant4.web.cern.ch/"
-SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
-
-LICENSE="geant4"
-SLOT="4"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="c++11 c++14 +c++17 +data dawn doc examples freetype gdml geant3 hdf5
-	inventor motif opengl qt5 raytracerx static-libs threads vrml"
-
-REQUIRED_USE="
-	^^ ( c++11 c++14 c++17 )
-	inventor? ( opengl )
-	motif? ( opengl )
-	qt5? ( opengl )
-"
-
-RDEPEND="
-	dev-libs/expat
-	>=sci-physics/clhep-2.4.4.0:2=[threads?]
-	data? ( ~sci-physics/geant-data-${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/qt3d:5
-		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}"/geant4.10.7-hdf5.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_STORE_TRAJECTORY=OFF
-		-DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec)
-		-DGEANT4_BUILD_VERBOSE_CODE=OFF
-		-DGEANT4_INSTALL_DATA=OFF
-		-DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
-		-DGEANT4_INSTALL_EXAMPLES=$(usex examples)
-		-DGEANT4_INSTALL_PACKAGE_CACHE=OFF
-		-DGEANT4_USE_FREETYPE=$(usex freetype)
-		-DGEANT4_USE_G3TOG4=$(usex geant3)
-		-DGEANT4_USE_GDML=$(usex gdml)
-		-DGEANT4_USE_HDF5=$(usex hdf5)
-		-DGEANT4_USE_INVENTOR=$(usex inventor)
-		-DGEANT4_USE_NETWORKDAWN=$(usex dawn)
-		-DGEANT4_USE_NETWORKVRML=$(usex vrml)
-		-DGEANT4_USE_OPENGL_X11=$(usex opengl)
-		-DGEANT4_USE_QT=$(usex qt5)
-		-DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
-		-DGEANT4_USE_SYSTEM_CLHEP=ON
-		-DGEANT4_USE_SYSTEM_EXPAT=ON
-		-DGEANT4_USE_SYSTEM_ZLIB=ON
-		-DGEANT4_USE_XM=$(usex motif)
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		${EXTRA_ECONF}
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	# adjust clhep linking flags for system clhep
-	# binmake.gmk is only useful for legacy build systems
-	sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
-	cmake_src_install
-	rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
-
-	einstalldocs
-}
diff --git a/sci-physics/geant/geant-4.10.7.1-r3.ebuild b/sci-physics/geant/geant-4.10.7.1-r3.ebuild
deleted file mode 100644
index 085e5abcf44a..000000000000
--- a/sci-physics/geant/geant-4.10.7.1-r3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3))
-
-case ${PV} in
-*_beta*)
-	MY_P+=.b$(printf %02d $(ver_cut 5))
-	DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt"
-	;;
-*)
-	if [[ $(ver_cut 4) -gt 0 ]]; then
-		MY_P+=.p$(printf %02d $(ver_cut 4))
-		DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
-	fi
-	HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
-	;;
-esac
-
-DESCRIPTION="Toolkit for simulation of passage of particles through matter"
-HOMEPAGE="https://geant4.web.cern.ch/"
-SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
-
-LICENSE="geant4"
-SLOT="4"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="c++11 c++14 +c++17 +data dawn doc examples freetype gdml geant3 hdf5
-	inventor motif opengl qt5 raytracerx static-libs threads vrml"
-
-REQUIRED_USE="
-	^^ ( c++11 c++14 c++17 )
-	inventor? ( opengl )
-	motif? ( opengl )
-	qt5? ( opengl )
-"
-
-RDEPEND="
-	dev-libs/expat
-	>=sci-physics/clhep-2.4.4.0:2=[threads?]
-	data? ( ~sci-physics/geant-data-${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/qt3d:5
-		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}"/geant4.10.7-hdf5.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_STORE_TRAJECTORY=OFF
-		-DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec)
-		-DGEANT4_BUILD_VERBOSE_CODE=OFF
-		-DGEANT4_INSTALL_DATA=OFF
-		-DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
-		-DGEANT4_INSTALL_EXAMPLES=$(usex examples)
-		-DGEANT4_INSTALL_PACKAGE_CACHE=OFF
-		-DGEANT4_USE_FREETYPE=$(usex freetype)
-		-DGEANT4_USE_G3TOG4=$(usex geant3)
-		-DGEANT4_USE_GDML=$(usex gdml)
-		-DGEANT4_USE_HDF5=$(usex hdf5)
-		-DGEANT4_USE_INVENTOR=$(usex inventor)
-		-DGEANT4_USE_NETWORKDAWN=$(usex dawn)
-		-DGEANT4_USE_NETWORKVRML=$(usex vrml)
-		-DGEANT4_USE_OPENGL_X11=$(usex opengl)
-		-DGEANT4_USE_QT=$(usex qt5)
-		-DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
-		-DGEANT4_USE_SYSTEM_CLHEP=ON
-		-DGEANT4_USE_SYSTEM_EXPAT=ON
-		-DGEANT4_USE_SYSTEM_ZLIB=ON
-		-DGEANT4_USE_XM=$(usex motif)
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		${EXTRA_ECONF}
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	# adjust clhep linking flags for system clhep
-	# binmake.gmk is only useful for legacy build systems
-	sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
-	cmake_src_install
-	rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
-
-	einstalldocs
-}
diff --git a/sci-physics/geant/geant-4.10.7.2-r3.ebuild b/sci-physics/geant/geant-4.10.7.2-r3.ebuild
deleted file mode 100644
index 32f62303ec77..000000000000
--- a/sci-physics/geant/geant-4.10.7.2-r3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3))
-
-case ${PV} in
-*_beta*)
-	MY_P+=.b$(printf %02d $(ver_cut 5))
-	DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt"
-	;;
-*)
-	if [[ $(ver_cut 4) -gt 0 ]]; then
-		MY_P+=.p$(printf %02d $(ver_cut 4))
-		DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
-	fi
-	HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
-	;;
-esac
-
-DESCRIPTION="Toolkit for simulation of passage of particles through matter"
-HOMEPAGE="https://geant4.web.cern.ch/"
-SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
-
-LICENSE="geant4"
-SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="c++11 c++14 +c++17 +data dawn doc examples freetype gdml geant3 hdf5
-	inventor motif opengl qt5 raytracerx static-libs threads vrml"
-
-REQUIRED_USE="
-	^^ ( c++11 c++14 c++17 )
-	inventor? ( opengl )
-	motif? ( opengl )
-	qt5? ( opengl )
-"
-
-RDEPEND="
-	dev-libs/expat
-	>=sci-physics/clhep-2.4.4.0:2=[threads?]
-	data? ( ~sci-physics/geant-data-4.10.7.1 )
-	dawn? ( media-gfx/dawn )
-	doc? ( =app-doc/geant-docs-$(ver_cut 1-3)* )
-	gdml? ( dev-libs/xerces-c )
-	hdf5? ( sci-libs/hdf5[threads?] )
-	inventor? ( media-libs/SoXt )
-	motif? ( x11-libs/motif:0 )
-	opengl? ( virtual/opengl )
-	qt5? (
-		dev-qt/qt3d:5
-		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}"/geant4.10.7-hdf5.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_STORE_TRAJECTORY=OFF
-		-DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec)
-		-DGEANT4_BUILD_VERBOSE_CODE=OFF
-		-DGEANT4_INSTALL_DATA=OFF
-		-DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
-		-DGEANT4_INSTALL_EXAMPLES=$(usex examples)
-		-DGEANT4_INSTALL_PACKAGE_CACHE=OFF
-		-DGEANT4_USE_FREETYPE=$(usex freetype)
-		-DGEANT4_USE_G3TOG4=$(usex geant3)
-		-DGEANT4_USE_GDML=$(usex gdml)
-		-DGEANT4_USE_HDF5=$(usex hdf5)
-		-DGEANT4_USE_INVENTOR=$(usex inventor)
-		-DGEANT4_USE_NETWORKDAWN=$(usex dawn)
-		-DGEANT4_USE_NETWORKVRML=$(usex vrml)
-		-DGEANT4_USE_OPENGL_X11=$(usex opengl)
-		-DGEANT4_USE_QT=$(usex qt5)
-		-DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
-		-DGEANT4_USE_SYSTEM_CLHEP=ON
-		-DGEANT4_USE_SYSTEM_EXPAT=ON
-		-DGEANT4_USE_SYSTEM_ZLIB=ON
-		-DGEANT4_USE_XM=$(usex motif)
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		${EXTRA_ECONF}
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	# adjust clhep linking flags for system clhep
-	# binmake.gmk is only useful for legacy build systems
-	sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
-	cmake_src_install
-	rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
-
-	einstalldocs
-}
diff --git a/sci-physics/geant/geant-4.10.7.3.ebuild b/sci-physics/geant/geant-4.10.7.3.ebuild
index 2b4f8cd92a19..b25e1a0f55d8 100644
--- a/sci-physics/geant/geant-4.10.7.3.ebuild
+++ b/sci-physics/geant/geant-4.10.7.3.ebuild
@@ -27,7 +27,7 @@ SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
 
 LICENSE="geant4"
 SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="c++11 c++14 +c++17 +data dawn doc examples freetype gdml geant3 hdf5
 	inventor motif opengl qt5 raytracerx static-libs threads vrml"
 
diff --git a/sci-physics/geant/geant-4.11.0_beta1-r2.ebuild b/sci-physics/geant/geant-4.11.0.0.ebuild
index 0b9fdfbf25e5..589a2cd089b5 100644
--- a/sci-physics/geant/geant-4.11.0_beta1-r2.ebuild
+++ b/sci-physics/geant/geant-4.11.0.0.ebuild
@@ -3,21 +3,23 @@
 
 EAPI=7
 
-inherit cmake
+PYTHON_COMPAT=( python3_{8..10} )
 
-MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3))
+inherit cmake python-single-r1
+
+MY_P=${PN}$(ver_cut 1)-v$(ver_cut 2-4)
 
 case ${PV} in
 *_beta*)
 	MY_P+=.b$(printf %02d $(ver_cut 5))
-	DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt"
+	DOCS="ReleaseNotes/Beta.$(ver_cut 2-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"
+		DOCS="ReleaseNotes/Patch.$(ver_cut 2-3)-*.txt"
 	fi
-	HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
+	HTML_DOCS="ReleaseNotes/ReleaseNotes.$(ver_cut 2-3).html"
 	;;
 esac
 
@@ -28,27 +30,35 @@ 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++17 c++20 +data dawn doc examples freetype gdml geant3 hdf5 inventor motif opengl
-	qt5 raytracerx static-libs threads vrml"
+IUSE="+c++17 c++20 +data debug doc examples freetype gdml geant3 hdf5 inventor motif opengl
+	python qt5 raytracerx static-libs tbb threads vtk"
 
 REQUIRED_USE="
 	^^ ( c++17 c++20 )
 	inventor? ( opengl )
 	motif? ( opengl )
+	python? ( ${PYTHON_REQUIRED_USE} )
 	qt5? ( opengl )
+	tbb? ( threads )
+	vtk? ( qt5 )
 "
 
 RDEPEND="
 	dev-libs/expat
-	>=sci-physics/clhep-2.4.4.2:2=[threads?]
+	>=sci-physics/clhep-2.4.5.1:2=[threads?]
 	data? ( ~sci-physics/geant-data-${PV} )
-	dawn? ( media-gfx/dawn )
 	doc? ( app-doc/geant-docs )
 	gdml? ( dev-libs/xerces-c )
 	hdf5? ( sci-libs/hdf5[threads?] )
 	inventor? ( media-libs/SoXt )
 	motif? ( x11-libs/motif:0 )
 	opengl? ( virtual/opengl )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[${PYTHON_USEDEP}]
+		')
+	)
 	qt5? (
 		dev-qt/qt3d:5
 		dev-qt/qtcore:5
@@ -60,20 +70,22 @@ RDEPEND="
 	raytracerx? (
 		x11-libs/libX11
 		x11-libs/libXmu
+	)
+	vtk? (
+		sci-libs/vtk:=[qt5]
 	)"
 
-PATCHES=( "${FILESDIR}"/geant4.10.7-hdf5.patch )
-
 S="${WORKDIR}/${MY_P}"
 
 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=OFF
 		-DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec)
-		-DGEANT4_BUILD_VERBOSE_CODE=OFF
+		-DGEANT4_BUILD_VERBOSE_CODE=$(usex debug)
 		-DGEANT4_INSTALL_DATA=OFF
 		-DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
 		-DGEANT4_INSTALL_EXAMPLES=$(usex examples)
@@ -83,18 +95,28 @@ src_configure() {
 		-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_PYTHON=$(usex python)
 		-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_TBB=$(usex tbb)
 		-DGEANT4_USE_XM=$(usex motif)
+		-DGEANT4_USE_VTK=$(usex vtk)
 		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		${EXTRA_ECONF}
 	)
+
+	if use python; then
+		mycmakeargs+=(
+			-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
+			-DCMAKE_INSTALL_PYTHONDIR="${EPREFIX}/usr/lib/${EPYTHON}/site-packages"
+		)
+	fi
+
+	[ -v EXTRA_ECONF ] && mycmakeargs+=( ${EXTRA_ECONF} )
+
 	cmake_src_configure
 }
 
@@ -103,6 +125,7 @@ src_install() {
 	# binmake.gmk is only useful for legacy build systems
 	sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
 	cmake_src_install
+	use python && python_optimize
 	rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
 
 	einstalldocs
diff --git a/sci-physics/geant/metadata.xml b/sci-physics/geant/metadata.xml
index 74f805af9371..434d3de14115 100644
--- a/sci-physics/geant/metadata.xml
+++ b/sci-physics/geant/metadata.xml
@@ -26,6 +26,8 @@
     <flag name="geant3">Add compatibility for geant321 to geant4</flag>
     <flag name="inventor">Add support for Open Inventor SGI toolkit via Coin3D</flag>
     <flag name="raytracerx">Enable raytracing for physics events</flag>
+    <flag name="tbb">Enable support for <pkg>dev-cpp/tbb</pkg></flag>
     <flag name="vrml">Enable output of geant4 in vrml formats</flag>
+    <flag name="vtk">Use sci-libs/vtk for visualization (experimental)</flag>
   </use>
 </pkgmetadata>