gentoo auto-resync : 31:10:2023 - 15:49:10

12 files changed, 65 insertions, 262 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index ae257a4a05e4..da9936686c2e 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/clhep/Manifest b/sci-physics/clhep/Manifest
index 684a9a2ade9e..40379bb7f538 100644
--- a/sci-physics/clhep/Manifest
+++ b/sci-physics/clhep/Manifest
@@ -1,5 +1,7 @@
 DIST clhep-2.4.6.2.tgz 1550248 BLAKE2B 10da3a7adc295c306d3ad57bff68489852717885eac544fe6858aed3868047cb377565f55a861751a09ea6c88584fe94b685f5dcef84c6e51afdddef8080eeb2 SHA512 cae1295d27b804c3b45c21195d8d45e9403e9449ca12d1e1a031615584f46784a1c6f75fdbc51467b901fa47057aa79077bd224994f0b6261abefc99810c2687
 DIST clhep-2.4.6.4.tgz 1550911 BLAKE2B 20da75b641e9396b8b63d81f931f63ecf886ca1e02c8d4eda48ff17ba27753df66bebd758db410d7c5c2c18db0bc82641a48da1e40c48f5da0f01db9524f0d53 SHA512 7df53762a2e788bdc5e4a780bedbca7fa862b033389972cd698f364f0b399e23705554e44da3df140d6334c513b494fe90ffc2b592a36792fbb2bc7c5626da90
+DIST clhep-2.4.7.1.tgz 1229169 BLAKE2B 9bf00c634142874328bc385950c542a1836c83cb35d8366f5b6c3a4ffe5e17e108c9917a5508506f3a400f0bd9e0e635b70e8c7ac73d1db3071e876a0e073339 SHA512 2d997c23fac5c2113cd749764e9d61c9ee3b95e145e29343a4c87a81d0eeed5c0216c73e5ae1630f1462d115b4df78d061a1165949cd1babecb65a9358106095
 EBUILD clhep-2.4.6.2.ebuild 1200 BLAKE2B 11f50b18c145f935c8f5faf246f4ec79a43577be1dbce76d7486e518012435a4d90920fa4f13e90546309743cbcd84d4b28963318061805d4f268f738d186803 SHA512 9d63dff04804e5bc9fe79b214d6ed53f8930a24f2b2c74b8b7760a65389f6cb4d47a0d88db1c9cba08fa4f28af6ae4289a8ee848846f8feacc71553c336c11c6
-EBUILD clhep-2.4.6.4.ebuild 1201 BLAKE2B 75fd2bbaaded4f7aa362eaa65448f23069abf0488911e528f4484aea4a99eb087bb53a14d60e92f377fd64622958685abfc1a29512051ae3bcf70f6ba3dbfda5 SHA512 691223e830de5f4d0059aaba798d4b24f8496be4ba9137c220f065a9ce6a579cadc2003d2d6444171c0bc54cdb3ebbec7cb4d5a1c5284def8a01e94f134c1cba
+EBUILD clhep-2.4.6.4.ebuild 1200 BLAKE2B 11f50b18c145f935c8f5faf246f4ec79a43577be1dbce76d7486e518012435a4d90920fa4f13e90546309743cbcd84d4b28963318061805d4f268f738d186803 SHA512 9d63dff04804e5bc9fe79b214d6ed53f8930a24f2b2c74b8b7760a65389f6cb4d47a0d88db1c9cba08fa4f28af6ae4289a8ee848846f8feacc71553c336c11c6
+EBUILD clhep-2.4.7.1.ebuild 1201 BLAKE2B 75fd2bbaaded4f7aa362eaa65448f23069abf0488911e528f4484aea4a99eb087bb53a14d60e92f377fd64622958685abfc1a29512051ae3bcf70f6ba3dbfda5 SHA512 691223e830de5f4d0059aaba798d4b24f8496be4ba9137c220f065a9ce6a579cadc2003d2d6444171c0bc54cdb3ebbec7cb4d5a1c5284def8a01e94f134c1cba
 MISC metadata.xml 497 BLAKE2B 9f68cecc9a1a96ebbc0f8408a2124a47414e987bf458f979548b458676ad45644d9fa3c690200be93aa01ef1d205e5bc3e7596b18d48a1b8a85455e2fc84fe8a SHA512 9ef1d630cfd0214dc7fb0c8021560d974cebf717c3eecd27f7abc7ee634edcaf2cc128a808b21a8676fc7bed2bf93d927cd682d4b37ef9f9c34041b0c8a06a2d
diff --git a/sci-physics/clhep/clhep-2.4.6.4.ebuild b/sci-physics/clhep/clhep-2.4.6.4.ebuild
index 8297ecd068ed..78d5e4cde95d 100644
--- a/sci-physics/clhep/clhep-2.4.6.4.ebuild
+++ b/sci-physics/clhep/clhep-2.4.6.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://proj-clhep.web.cern.ch/proj-clhep/"
 SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/dist1/${P}.tgz"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 IUSE="doc test threads"
 RESTRICT="!test? ( test )"
diff --git a/sci-physics/clhep/clhep-2.4.7.1.ebuild b/sci-physics/clhep/clhep-2.4.7.1.ebuild
new file mode 100644
index 000000000000..8297ecd068ed
--- /dev/null
+++ b/sci-physics/clhep/clhep-2.4.7.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="High Energy Physics C++ library"
+HOMEPAGE="http://proj-clhep.web.cern.ch/proj-clhep/"
+SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/dist1/${P}.tgz"
+LICENSE="GPL-3 LGPL-3"
+SLOT="2/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+IUSE="doc test threads"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+
+S="${WORKDIR}/${PV}/CLHEP"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# respect flags
+	sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
+	# dont build test if not asked
+	if ! use test; then
+		cmake_comment_add_subdirectory test
+	fi
+	# gentoo doc directory
+	if use doc; then
+		grep -rl 'share/doc/CLHEP' |
+		xargs sed -i \
+			-e "s:share/doc/CLHEP:share/doc/${PF}:" \
+			{.,*}/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCLHEP_BUILD_DOCS=$(usex doc)
+		-DCLHEP_SINGLE_THREAD=$(usex threads no yes)
+	)
+	cmake_src_configure
+}
diff --git a/sci-physics/geant-data/Manifest b/sci-physics/geant-data/Manifest
index 39ff1983b3e2..9804dcd9e5ca 100644
--- a/sci-physics/geant-data/Manifest
+++ b/sci-physics/geant-data/Manifest
@@ -12,6 +12,6 @@ DIST G4RadioactiveDecay.5.6.tar.gz 1059792 BLAKE2B 610761030c01445ecd3159df01938
 DIST G4RealSurface.2.2.tar.gz 132506346 BLAKE2B 8b725cdd4ed5739692e3c07627661921e8d7e08bd448cb70f1d9cdd7ca8e2e090f4c65ac3b4fc3fbceb96cca22bef3ac9000075df490b3ac520b515a40b2cf6e SHA512 360fc0cd829f9daa21300b4df8da294982d13659a9fe77cbdf1f5c411eace0153d8202c658525d4b82b7925524baf8e138a51ae71bdbd1f91f674fc80958ffed
 DIST G4SAIDDATA.2.0.tar.gz 38502 BLAKE2B 349608f8f8f57b091579b4892f1547c25f0c730fe8b22de3a7355f45ea08232c3ab12af64583cf4d48528b54489d0c71c724066715592766a2a51a1a6d4eb745 SHA512 cb192c10cc9805ab8d57d5f6dca595f85ac628ccac5b975b5d8ff965ed3841b9b01071ffa76469c9a03f9ca564267f5c4a300f13d8df5056b43cd71c669bd35c
 DIST G4TENDL.1.4.tar.gz 912261874 BLAKE2B 9ed05676ed52ca8341007cade3620b655fcf56eea3d3bda01814ae7133ec04bd2ef84b1c34ee5cd76114407bd6977bd4392322decebea1e1ed7e6377a482e1e8 SHA512 6fb1e5fc8daad9ef8391ff04793f10394cfc28cab0967bba0d9c91a69b92a7af7406e543275d9c1d9ff76d3dfec2c9f653bcff40040e17edbb765fb21012cae8
-EBUILD geant-data-4.11.0.0.ebuild 1519 BLAKE2B bd07ec950d9213a0eab3da1729741a19d6e7c0026fd5a07a455a69ecc7887170d91e0bd03e3395b2b550170cc92a3881c3a6ef843e6031e992fce135abebe037 SHA512 b38428d2a8579483d54ab57706dcef3d0a8a4d52a7094a83469b1dc90c209f29215d9a85070f1e46f818d479c32f9ae7e813a08d034ed26e1dcb7713a912ce54
-EBUILD geant-data-4.11.1.0.ebuild 1307 BLAKE2B bd9ab3071f5a0841ff23a3d42a8ec00c82807ef49299d0d094a3d74d8dd63559ea22f58bcddbb406c612ce9fe024530e9216e9732b5fcbeca8ec2ffc163d3347 SHA512 2af47dd787576fb616050e670b9d4dc09288a6e84390b81e28c5f2639f1781a1a0f7b2fc034c9458760504bfbe9f7c4b24edf668e5b6139242f8facbaf76e512
+EBUILD geant-data-4.11.0.0.ebuild 1511 BLAKE2B c7702a6de5eb8955d0192574e970e32d5ff46ee5e5e798ddcf54737d7720ae785cdb61c4eb71ac536b1028e465635b7d78a241b7eda3624aa2012ca16c527d3b SHA512 5ac8bfad79208a7326effa56486647e708c592d0d6a975308b72053823cc3dbee566b4a231e14994aad5df0c64c0f46d211c6f742beef308f3522d727637a19a
+EBUILD geant-data-4.11.1.0.ebuild 1299 BLAKE2B 45ea8cace0a6d571960e90e8a68c887af6c952c4455be8688f36436e1ac0c4e8cc260a5c9eb3a34e1d11b16e78dc95d4a40d18e0462329050da490af9b272344 SHA512 a46397f273c0314ba174eea29520575bca3a350a7db9fb248bb4385aaf570954c2d1b0962271155ff190584b3bb782e35fda67a04bd1bf273c6ee173396c8c42
 MISC metadata.xml 425 BLAKE2B 9c0c8f8f3e0e16f4f7a567778027c58efe973849c46e2d50df71751a7e661199fa786a57bc62b1bd89b720a8444707ef65bf58425d23ecb46cd4a6d90dc50612 SHA512 6b0d4f5b10a443188474552fe06c3abf4fff696804ccc6dfdd328b152321769ac0e566573bd047221df7609de045d3238df7a5a6c14d60dfb3d7072b89298664
diff --git a/sci-physics/geant-data/geant-data-4.11.0.0.ebuild b/sci-physics/geant-data/geant-data-4.11.0.0.ebuild
index 4de8c335e5b9..ae47de6bb948 100644
--- a/sci-physics/geant-data/geant-data-4.11.0.0.ebuild
+++ b/sci-physics/geant-data/geant-data-4.11.0.0.ebuild
@@ -33,7 +33,6 @@ unset DATASET FILENAME VERSION ENVVAR
 LICENSE="geant4"
 SLOT="4"
 KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 S="${WORKDIR}"
 
diff --git a/sci-physics/geant-data/geant-data-4.11.1.0.ebuild b/sci-physics/geant-data/geant-data-4.11.1.0.ebuild
index 3029bb0f9a79..1876b4efb159 100644
--- a/sci-physics/geant-data/geant-data-4.11.1.0.ebuild
+++ b/sci-physics/geant-data/geant-data-4.11.1.0.ebuild
@@ -33,7 +33,6 @@ unset DATASET FILENAME VERSION ENVVAR
 LICENSE="geant4"
 SLOT="4"
 KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 S="${WORKDIR}"
 
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index 9e69bd71d83d..82b367042d93 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -1,10 +1,6 @@
 AUX geant-4.11.0.2-musl-avoid-execinfo.patch 2812 BLAKE2B 7bede49a061f174d2cd3ad9176db104dc8dd4e8253949412d9b8b749d860fae8d27b29b64f817d0051785d2f657e0a46f9567fd06093e6a1e1aaf8925761b2f3 SHA512 d16ea93357e62571344a26ad8162a50333f0822a4eda9e3d349d9ac8041e39555face07d25382e1f4e53ca5256dbdd213248af329ce5f0d1739ce95cd99add22
-DIST geant4-v11.0.3.tar.gz 35680670 BLAKE2B 202cd035cd9ed7520d8662c80a49063b639ec90107255234fca95664b245a12af495546d92227d905f69c5cddabd56ee1fb5b0ecbe468a9e4bf5ff2063f7f705 SHA512 43f86fc8df90a36f26914bd72967c376a909ab9bd7369b4d1c04dc1a95f73cdef4ba32195d4e99cc5eac5ce2c8dc07d6c952aa23347db10e4cef16c47baca34a
 DIST geant4-v11.0.4.tar.gz 35827159 BLAKE2B 52297887fb3467c5a08725340da959cda72ebe1b0b0d526d240213a7d954f1c68b379abf04c00b271013a019c1179ce6d6d8dbc22a5339ea66927b30342aa58d SHA512 ae5c60702a9f08e30d202dbd9270c1e1353751b369f7129d91f3744b5ba9c5a30549bf90a1bce98351e0e5ddc57624a8748132c289de1c3a0679670ab4e30602
-DIST geant4-v11.1.0.tar.gz 36412990 BLAKE2B 92d7a370ab7c3f2e91edf9bd323ba76833ee1e4973701507c40849b348a032e7cc6baeaf06bff850d76e0b92704ce042a797a41d2ed93e309ca5f4d6ed4c6f8c SHA512 b8d181e3433754b89a27fec8f3a3ebff8289fbd5ec0bc04521b18f0df7774304ea391c3aca547aa03707c83fc72501a670827ef02ab4999e113e869da9eca88f
 DIST geant4-v11.1.2.tar.gz 36423840 BLAKE2B 14ea4402b421d9d5613c0fed7e818d8e3e8daef7f60ebbb0aef654cc9d6e499b57fa42d731a2796815261b979646751c359402d1e92546cc81a330f2b69a9097 SHA512 592296fe4dcb6d7fbaf60a3fa7cb2a1281246dbb67ad88c4ebb24361b4668b4308195edf72c1daeb9f178b7bdafc4ca744ef1661b9e229129beab12f7d20702b
-EBUILD geant-4.11.0.3.ebuild 3487 BLAKE2B 1768eb178c05115125208b1c09ad2ac88dba240bf8a116d64f0719817cb07c5716d1547fc8c23fbcb676f53c47f80c67c3416605b3e3d8d9e2dda8e860f71da8 SHA512 f28bbedd849e19f34bbe3ed441fd12565f69d2b77033e41e82f6910bba01467d0c1e1a543b2b34bbdb04bdeb0d6c4d1927dbb778fb2ce32faf77122ac25e2bc0
-EBUILD geant-4.11.0.4.ebuild 3462 BLAKE2B 000d7797f428805db147eaf59aa3a42b089e35b22402cd255c314bc59adcd185230af9338f4baba85cf18b9b52816b42a39e76b5e73ddd114e98ee8f9bcbf666 SHA512 a6e3e41d665b6878302a642047d43c415384e89eb2d353f06dd8b4c823713f7aef391338d0c11acdbd06ffc5aec62842dfbdd2e3542503e34e53be66c7e3143f
-EBUILD geant-4.11.1.0.ebuild 3042 BLAKE2B 31a23f9c93f7717a34ff4b68fcd2347664f709574cc3230407bffd300a8583e8b5ad746d8b9ab1c55bf5bc079f2318f4585bb7a344ffdfebb7a95dfdaf3dbe09 SHA512 24aa1b900ca65d758a62bfe0e610b37a2fecc72b57510d51bc2882788f33fcc568b5e984dcfebd5961c7d0138be47a277e4c0c3ad54f3b66a747ee8581a8d4fa
-EBUILD geant-4.11.1.2.ebuild 3015 BLAKE2B fd1f2a0372dca10b3aa41915dc45467afcb4082d8538b41e52ea24bb8f9b666fb235f6e7ad7753a2f4bea30de26244ab12d0e302b07164d04ca788520e90bd70 SHA512 77e909be2440a94b009408145fa753539e23f4d087eb747657f183f082098f06f72a992686dcd82fa562188d31ae824178e4adcdc77000bea0114eda52a2b9dd
+EBUILD geant-4.11.0.4.ebuild 3461 BLAKE2B ef422b5c5c45d13c1c1a0f573c58a59e19ef5a7cd138429fdca1987a6ccd439303a9e124524e7bcac90958b8bf754327d37aecbb982424e91335f5f323d800d1 SHA512 dcd1051a766e023a914428ab1f6ceab8a29cf570596d2835d719d42f12a1d4c3d8e8618154b1e189666c6043e1831cb7e6a7da4863d5070d83bbef1a895cdd8d
+EBUILD geant-4.11.1.2.ebuild 3014 BLAKE2B bd2c99f31df312ee0474e372470f5c9d40738527b257bf6c5ba91df8a4dee100f765792c85532b754e61ca888fb3372706766d7100d3db3ed681329a0dd6f1b5 SHA512 6096a8222c3c5d25906261d6aca9e135ad594ebf8c69f2099bfb2ddd85305a8b59cdf2547eacf384e6579150f6215c736589f438afe4180fda280959243ee20b
 MISC metadata.xml 1649 BLAKE2B aa1d00d2f11d3c35231a3ea66bc2fe33466b644152171d0a1ded5f62d404816d517e992ada87adf1842d58624ee1b2538b46b3869f5a62185f361507eb78659a SHA512 02a6b99d4fae650dccd478de365c943e200909dd35ea158582b42747fb522c11392eaa84d35566b49f65834571a4e3377bba1d31d20598dd9a1c7a2d98923b14
diff --git a/sci-physics/geant/geant-4.11.0.3.ebuild b/sci-physics/geant/geant-4.11.0.3.ebuild
deleted file mode 100644
index d79f67c5ed4a..000000000000
--- a/sci-physics/geant/geant-4.11.0.3.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-single-r1
-
-MY_P=${PN}$(ver_cut 1)-v$(ver_cut 2-4)
-
-case ${PV} in
-*_beta*)
-	DOCS="ReleaseNotes/Beta.$(ver_cut 2-3)-*.txt"
-	;;
-*)
-	if [[ $(ver_cut 4) -gt 0 ]]; then
-		DOCS="ReleaseNotes/Patch.$(ver_cut 2-3)-*.txt"
-	fi
-	HTML_DOCS="ReleaseNotes/ReleaseNotes.$(ver_cut 2-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++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.5.1:2=[threads?]
-	data? ( ~sci-physics/geant-data-4.11.0.0 )
-	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,${PYTHON_USEDEP}]
-		')
-	)
-	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
-	)
-	vtk? (
-		sci-libs/vtk:=[qt5]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.11.0.2-musl-avoid-execinfo.patch
-)
-
-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=$(usex debug)
-		-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_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)
-	)
-
-	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
-}
-
-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
-	use python && python_optimize
-	rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
-	einstalldocs
-}
diff --git a/sci-physics/geant/geant-4.11.0.4.ebuild b/sci-physics/geant/geant-4.11.0.4.ebuild
index d09ff3396b06..46177ea9e071 100644
--- a/sci-physics/geant/geant-4.11.0.4.ebuild
+++ b/sci-physics/geant/geant-4.11.0.4.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++17 c++20 +data debug doc examples freetype gdml geant3 hdf5 inventor motif opengl
 	python qt5 raytracerx static-libs tbb threads trajectories vtk"
 
diff --git a/sci-physics/geant/geant-4.11.1.0.ebuild b/sci-physics/geant/geant-4.11.1.0.ebuild
deleted file mode 100644
index ccd5494935b6..000000000000
--- a/sci-physics/geant/geant-4.11.1.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_P=${PN}$(ver_cut 1)-v$(ver_cut 2-4)
-
-case ${PV} in
-*_beta*)
-	DOCS="ReleaseNotes/Beta.$(ver_cut 2-3)-*.txt"
-	;;
-*)
-	if [[ $(ver_cut 4) -gt 0 ]]; then
-		DOCS="ReleaseNotes/Patch.$(ver_cut 2-3)-*.txt"
-	fi
-	HTML_DOCS="ReleaseNotes/ReleaseNotes.$(ver_cut 2-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++17 c++20 +data debug doc examples freetype gdml geant3 hdf5 inventor motif opengl
-	qt5 raytracerx static-libs tbb threads vtk"
-
-REQUIRED_USE="
-	^^ ( c++17 c++20 )
-	inventor? ( opengl )
-	motif? ( opengl )
-	qt5? ( opengl )
-	tbb? ( threads )
-	vtk? ( qt5 )
-"
-
-RDEPEND="
-	dev-libs/expat
-	>=sci-physics/clhep-2.4.6.2:2=[threads?]
-	data? ( ~sci-physics/geant-data-4.11.1.0 )
-	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 )
-	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
-	)
-	vtk? (
-		sci-libs/vtk:=[qt5]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.11.0.2-musl-avoid-execinfo.patch
-)
-
-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=$(usex debug)
-		-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_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_TBB=$(usex tbb)
-		-DGEANT4_USE_XM=$(usex motif)
-		-DGEANT4_USE_VTK=$(usex vtk)
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-	)
-
-	[[ -v EXTRA_ECONF ]] && mycmakeargs+=( ${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.11.1.2.ebuild b/sci-physics/geant/geant-4.11.1.2.ebuild
index f27e52f2f965..f3b3080d4a6c 100644
--- a/sci-physics/geant/geant-4.11.1.2.ebuild
+++ b/sci-physics/geant/geant-4.11.1.2.ebuild
@@ -25,7 +25,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++17 c++20 +data debug doc examples freetype gdml geant3 hdf5 inventor motif opengl
 	qt5 raytracerx static-libs tbb threads trajectories vtk"