gentoo auto-resync : 26:11:2024 - 02:00:48

5 files changed, 16 insertions, 153 deletions

diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index a8a615443f5a..719db5bd8af4 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -1,9 +1,6 @@
 AUX geant-4.11.0.2-musl-avoid-execinfo.patch 2812 BLAKE2B 7bede49a061f174d2cd3ad9176db104dc8dd4e8253949412d9b8b749d860fae8d27b29b64f817d0051785d2f657e0a46f9567fd06093e6a1e1aaf8925761b2f3 SHA512 d16ea93357e62571344a26ad8162a50333f0822a4eda9e3d349d9ac8041e39555face07d25382e1f4e53ca5256dbdd213248af329ce5f0d1739ce95cd99add22
-AUX geant-4.11.2.1-find-soxt-noversion.patch 744 BLAKE2B 8cd3fa68d2ae631fe8cbf7a6a09e1679dfd205b68747286611886e6029f90041774df5108893a96cd5923cbe47d3a8139431b1f831b31223d4e24885338ce530 SHA512 bce5fe13aef48b7972bb0b2ed79b5d683791a503920dca9cd1bbcf0b6c16a08eef3d41514d62ca42fb1284d3e00e465785b1ecf37f8a6bb0c1574cc5c35a1087
 DIST geant4-v11.2.0.tar.gz 36652313 BLAKE2B 41b5138b778be1302776961c0e029efd6143ceed9f3e81b0b1aeb542e1999f746b85dfe66b02421ce38e9475fd95ac0b2513944e13e4689a2e5ec627fa5b9e45 SHA512 57b31fd4125d992754e7ce2770d7427355d204cb0b28708429f8c7983aeb0b41897aa3f5fd345489b343232f459eede6b153752fece96146a7ee59660363acf9
-DIST geant4-v11.2.1.tar.gz 36631774 BLAKE2B e7c8f97f9ceaa32b38954f4ae9b49e2236134a8f5b9cb720d207ece002e7e2f1eb993888b2c53a09aa5293709502a3ab2b13332083a4332c466adaa59110905e SHA512 bdbf4e6ecc4ba5119b5364707cc256e92ea1a245f1c14a434bb7ad748649b27b6b0e20fb1b0624cfe2c66b4267c8a3ff25069794a47d348242cd5664e72812ab
 DIST geant4-v11.2.2.tar.gz 36649158 BLAKE2B 5eaa3949f1322aec13839bae2a851f1346560fa373efd1e91a725fcec8652c6469ab0cd77e7cba2cf1bb7e2bd66700735dfada285f25b55364a3b913211a1f05 SHA512 dd7ffb35f0578208283edf094c0c80e26cbc583a58840cd847f850fd129e5d6330646fb0cd1af6a8ffdc2f82d6423d671d650f656fe79cfc6a8c436adf848fea
-EBUILD geant-4.11.2.0-r1.ebuild 2908 BLAKE2B a6f64b6bd5c33cfe14e813ab4ced1e9683822b45c025d648b6a4e24c2a0406f6d10a74ccbb188c75af1236eca71b94e9c33b304303a5164ee27170119ffcfb9c SHA512 d20149015d544ceb95adb5f7ef5521142765357d051338e544c603f51bae6c828bf6afcc167d0667709f97cb32c08cdaad6ad2cbacb5f2a232cddb1f9cbcfa32
-EBUILD geant-4.11.2.1-r1.ebuild 2965 BLAKE2B 7e8eaa4b9666ab669f8766d7414f33bdea7a850780c31592ee1857c34cba52d4dd3e57d8c5c89b89dacba5256e7a7d61fa92e9ca7656ef14234836be0ca43318 SHA512 34ae1084af718ca58e6f913a69c005b65db57ad86abd86566fffa3658bf48e5c4d8a8d80921aae66e24ae24a67ab0303477361a3ceec99f71790aec4c6178a2e
-EBUILD geant-4.11.2.2.ebuild 2909 BLAKE2B efaa39e4d60ed5676428cbcdd02916a3e4f5de9f17c4bb70670e47d345be78c6bfce7b7dada87b39412fb1af32f6d39cb4627390abca1ce1d8b41baf736398f0 SHA512 007b7db9b68f382fec4797011cee8d7ca0eec438897655ade512338517e07b7424bd3bc8a94b3eaf473517db97d333cdcaee0dfbebf60560cb90124b6ad3f44f
+EBUILD geant-4.11.2.0-r1.ebuild 2926 BLAKE2B 4881dd914d94bbec7872d05c4f34593e1e8f92e140ca4ef0706b13eb4a9dee7d6e65c334e67d4c647ab18fcb8a040e132f79f775013dc96c08791ef97dd3af4e SHA512 7007af6fd99719f4b6c1fcf4b6cc56987046cc55a52df991447abfc66831a3d02a5f607f0426c4921d60a1400ab9e5c9ceffe072aedfe880947b9a284b24d155
+EBUILD geant-4.11.2.2-r1.ebuild 2912 BLAKE2B e7fa56032a8d631596de66c1c01a7c96bea3dbe347dfc0e7d5b3360c3ba52688640714e49c2b079638b7b39f9365542fee5c2103c31a86de34ae9094d1251738 SHA512 e797b5d9b51f3cdd6694dc44f9eebfc54b2896f04c655464894fc7f8830ccd3c49f041a54f2c6c7c0021d96aa62bfdafdd33252dd8c400cead887907065ba7fc
 MISC metadata.xml 1527 BLAKE2B f077711907b2effb5aa79e7470db8397e36dddad753e494e2398c72992b6b5cc1f1ef6ed3fa35640ccd119a7a46448e0f3b205803e886b6a587ba5afe4a568b5 SHA512 db1ae57378e4f109283b14d8f27ef38e0426b39a33cdd6bdf2fd6683bbf6b1cca5e89e78ef6771afa3e770af3db872c7bfbbfae3177f516147e2527aae51b181
diff --git a/sci-physics/geant/files/geant-4.11.2.1-find-soxt-noversion.patch b/sci-physics/geant/files/geant-4.11.2.1-find-soxt-noversion.patch
deleted file mode 100644
index a35e184ffccb..000000000000
--- a/sci-physics/geant/files/geant-4.11.2.1-find-soxt-noversion.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Remove versions from find_package(SoXt/SoWin), bug 928657.
-Patch submitted upstream.
-
---- a/cmake/Modules/G4InterfaceOptions.cmake
-+++ b/cmake/Modules/G4InterfaceOptions.cmake
-@@ -153,12 +153,12 @@ if(GEANT4_USE_INVENTOR)
-     geant4_save_package_variables(Inventor SoQt_DIR)
-   else()
-     if(UNIX)
--      find_package(SoXt 1.4.0 REQUIRED)
-+      find_package(SoXt REQUIRED)
-       check_sobind_version(SoXt 1.4.0)
-       geant4_save_package_variables(Inventor SoXt_DIR)
-       set(GEANT4_USE_INVENTOR_XT ON)
-     elseif(WIN32)
--      find_package(SoWin 1.4.0 REQUIRED)
-+      find_package(SoWin REQUIRED)
-       check_sobind_version(SoWin 1.4.0)
-       geant4_save_package_variables(Inventor SoWin_DIR)
-       set(GEANT4_USE_INVENTOR_WIN ON)
diff --git a/sci-physics/geant/geant-4.11.2.0-r1.ebuild b/sci-physics/geant/geant-4.11.2.0-r1.ebuild
index 3cfc83638d74..01ba0d427dc5 100644
--- a/sci-physics/geant/geant-4.11.2.0-r1.ebuild
+++ b/sci-physics/geant/geant-4.11.2.0-r1.ebuild
@@ -61,9 +61,9 @@ RDEPEND="
 		x11-libs/libX11
 		x11-libs/libXmu
 	)
-	vtk? (
-		sci-libs/vtk:=[qt5]
-	)"
+	vtk? ( sci-libs/vtk:=[qt5] )
+"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.11.0.2-musl-avoid-execinfo.patch
diff --git a/sci-physics/geant/geant-4.11.2.1-r1.ebuild b/sci-physics/geant/geant-4.11.2.1-r1.ebuild
deleted file mode 100644
index 22d1352ce552..000000000000
--- a/sci-physics/geant/geant-4.11.2.1-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2024 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"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="geant4"
-SLOT="4/$(ver_cut 1-4)"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+data debug doc examples freetype gdml geant3 hdf5 inventor motif opengl
-	qt5 raytracerx static-libs tbb threads trajectories vtk"
-
-REQUIRED_USE="
-	inventor? ( opengl )
-	motif? ( opengl )
-	qt5? ( opengl )
-	tbb? ( threads )
-	vtk? ( qt5 )
-"
-
-RDEPEND="
-	dev-libs/expat
-	>=sci-physics/clhep-2.4.7.1:2=[threads?]
-	data? ( ~sci-physics/geant-data-4.11.2.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/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	raytracerx? (
-		x11-libs/libX11
-		x11-libs/libXmu
-	)
-	vtk? (
-		sci-libs/vtk:=[qt5]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.11.0.2-musl-avoid-execinfo.patch
-	"${FILESDIR}"/${PN}-4.11.2.1-find-soxt-noversion.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
-		-DGEANT4_BUILD_BUILTIN_BACKTRACE=$(usex debug)
-		-DGEANT4_BUILD_MULTITHREADED=$(usex threads)
-		-DGEANT4_BUILD_STORE_TRAJECTORY=$(usex trajectories)
-		-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)
-	)
-
-	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.2.2.ebuild b/sci-physics/geant/geant-4.11.2.2-r1.ebuild
index b1c227bd6a4b..f8e18f076dea 100644
--- a/sci-physics/geant/geant-4.11.2.2.ebuild
+++ b/sci-physics/geant/geant-4.11.2.2-r1.ebuild
@@ -30,14 +30,14 @@ SLOT="4/$(ver_cut 1-4)"
 
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+data debug doc examples freetype gdml geant3 hdf5 inventor motif opengl
-	qt5 raytracerx static-libs tbb threads trajectories vtk"
+	qt6 raytracerx static-libs tbb threads trajectories vtk"
 
 REQUIRED_USE="
 	inventor? ( opengl )
 	motif? ( opengl )
-	qt5? ( opengl )
+	qt6? ( opengl )
 	tbb? ( threads )
-	vtk? ( qt5 )
+	vtk? ( qt6 )
 "
 
 RDEPEND="
@@ -50,20 +50,17 @@ RDEPEND="
 	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/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
+	qt6? (
+		dev-qt/qt3d:6
+		dev-qt/qtbase:6[gui,opengl?,widgets]
 	)
 	raytracerx? (
 		x11-libs/libX11
 		x11-libs/libXmu
 	)
-	vtk? (
-		sci-libs/vtk:=[qt5]
-	)"
+	vtk? ( sci-libs/vtk:=[qt6] )
+"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.11.0.2-musl-avoid-execinfo.patch
@@ -87,7 +84,8 @@ src_configure() {
 		-DGEANT4_USE_HDF5=$(usex hdf5)
 		-DGEANT4_USE_INVENTOR=$(usex inventor)
 		-DGEANT4_USE_OPENGL_X11=$(usex opengl)
-		-DGEANT4_USE_QT=$(usex qt5)
+		-DGEANT4_USE_QT=$(usex qt6)
+		-DGEANT4_USE_QT_QT6=$(usex qt6)
 		-DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
 		-DGEANT4_USE_SYSTEM_CLHEP=ON
 		-DGEANT4_USE_SYSTEM_EXPAT=ON