gentoo resync : 29.06.2021

6 files changed, 116 insertions, 7 deletions

diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index b73e8a217504..f4b5437ea6a5 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -1,7 +1,9 @@
 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.10.07.tar.gz 36422877 BLAKE2B d81a37e0968f3c13bb846efc252b1b31cb01a8642610b079bcf6ec1741e7f5da09d50f4abe4054b7a06433dc7d9b611110c4f9a1f971a5f1df27580d49b8906d SHA512 057ab2c6ee5d5ad7012bd889bf883faa3ef1fa72a93190d00d1320f250b7b52e21cbae552cbc35065ad5f5bd46cd91fd1536dd4d5e620afa0abb6b065bd7c86b
-EBUILD geant-4.10.7.1.ebuild 2957 BLAKE2B 7cc36acf8b2a32e9a947b38286fd0ef9532bad0edca4a762477b5c5de196ce794e2abdce81d9823c2e795531957eea7331a5d4d6748c2cf5262417ed40c50dbb SHA512 bedc36c9109d96fabee2b87d9eb9fed7baac744c26f8a87c4aef9e3c945755aed38613b77aea779cd51589ad420d0cf22ae7ab3a4e5282be22f4e7d1a5161410
-EBUILD geant-4.10.7.2.ebuild 2962 BLAKE2B 2c7e068def5fc29dc636d50ce87db516d396bb2179eade5a3209bb9713c574d798e7e8d10d4084eea87763091b90a75e5c6032a0ed7455ac3b5f568c51466f31 SHA512 c9d1a02b886de540f5207c763036f74875f8b3213d174105f6030a78f6b6fff90a7fd6342f0dcffb21a19e2fb95d0a493510f14e7104414d51fe81f36442ebd1
-EBUILD geant-4.10.7.ebuild 2957 BLAKE2B 7cc36acf8b2a32e9a947b38286fd0ef9532bad0edca4a762477b5c5de196ce794e2abdce81d9823c2e795531957eea7331a5d4d6748c2cf5262417ed40c50dbb SHA512 bedc36c9109d96fabee2b87d9eb9fed7baac744c26f8a87c4aef9e3c945755aed38613b77aea779cd51589ad420d0cf22ae7ab3a4e5282be22f4e7d1a5161410
-MISC metadata.xml 1555 BLAKE2B 5fdad7ec54d498b37e5f693f7fefd1584e586b7ac91389de21f5b99f3c8a780d57dcca47692f6c46e85364e6d2d80be3031d910c831f2a818a12c8a8b3d3e10e SHA512 25fbb1e5791b7bf205501c1ddeee55d4e49a9554205d42abe170a13e5a718d35f4db98029f06aa8f849753095a0d5b04a283ab4dfb69e8a707ab8aa968063fc8
+DIST geant4.11.00.b01.tar.gz 35617362 BLAKE2B 654679f3876081931a80b8ee8dbf579ef45cbd8edb4e8a641ad1facc2edab470ff19f557672e901321e1993453110b4f1f5c5d7a6b0bb293e710def2d5871d12 SHA512 abc39b33d0570bc07db0e957a2e33db91b47e8ebe650bb79cb8f6fdf6f0e4938607a96011f9b0fba0294828afcf7e6f3ee20367e319f2b388f3b315bd615a6db
+EBUILD geant-4.10.7-r1.ebuild 2957 BLAKE2B 28d640e53af4d9e2f4eeaf2901db2870d6bcc3fdbd481503831b4d80eb1b9b724ac79183c72c73a713ca921f7bf27fb924973cc0d153a12ee9fe151d18df2983 SHA512 bf749cf4766de723a90ad2958a25308ee4e83dcd4583062c903e6b54d77e12f5c7581107011f7feb727342e94663c0db451c7c9b09bf4cab3a08fc117b7c9919
+EBUILD geant-4.10.7.1-r1.ebuild 2957 BLAKE2B 28d640e53af4d9e2f4eeaf2901db2870d6bcc3fdbd481503831b4d80eb1b9b724ac79183c72c73a713ca921f7bf27fb924973cc0d153a12ee9fe151d18df2983 SHA512 bf749cf4766de723a90ad2958a25308ee4e83dcd4583062c903e6b54d77e12f5c7581107011f7feb727342e94663c0db451c7c9b09bf4cab3a08fc117b7c9919
+EBUILD geant-4.10.7.2-r1.ebuild 2962 BLAKE2B 1968bb3341005f9c6a589afd4bf843b5e69b91b85bee168ff975fad0186bc9dc449ba52839fadfe027f0df28606d21193b85b9e39593d0b73772ca28a42dd6c8 SHA512 12e6a77179609185379c9037ff37d84433ea6dfffdfa6758714b41090ac3e8562613c38b909291ed7315bb83a6fb0bb3ae3bf2e0302c8ed107a8ae041599d250
+EBUILD geant-4.11.0_beta1.ebuild 2915 BLAKE2B 207fa5f560bb92629a5e682976a66cb498a61465343d6d576c891fda571ddad5765b5f7d10409f7ea709120172a4999e9a986525178e92411b6924673c53e97c SHA512 d4ff53aed72ff82a2d194acf6d162ee42382de5fe9cc8c41181952f9bb3e7d352f4a8baf768008767c067c393f854c82b9815b2dbd5701c28ed47e0774069fa3
+MISC metadata.xml 1616 BLAKE2B 3f098e0f66943474a142c2c05859f83449ab45296ba4e38c0de3f958517f626464f7b45d2f79ed273946c91b7e36fbd6d8d1e2f29da975a6212faf36126289b7 SHA512 fe5f63bde72af132440e8c76cfb864caf3fde1872a7a3e71f9b308b96778eaf47b7ac2e829c83bf5d81fc9c221bc50f04d4f0dd4303003a049d0dcf206c1020c
diff --git a/sci-physics/geant/geant-4.10.7.1.ebuild b/sci-physics/geant/geant-4.10.7-r1.ebuild
index 4876bb60e54c..7e6230175a6c 100644
--- a/sci-physics/geant/geant-4.10.7.1.ebuild
+++ b/sci-physics/geant/geant-4.10.7-r1.ebuild
@@ -28,7 +28,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"
-IUSE="+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5
+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="
diff --git a/sci-physics/geant/geant-4.10.7.ebuild b/sci-physics/geant/geant-4.10.7.1-r1.ebuild
index 4876bb60e54c..7e6230175a6c 100644
--- a/sci-physics/geant/geant-4.10.7.ebuild
+++ b/sci-physics/geant/geant-4.10.7.1-r1.ebuild
@@ -28,7 +28,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"
-IUSE="+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5
+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="
diff --git a/sci-physics/geant/geant-4.10.7.2.ebuild b/sci-physics/geant/geant-4.10.7.2-r1.ebuild
index 9687486dde6f..d67384d23d79 100644
--- a/sci-physics/geant/geant-4.10.7.2.ebuild
+++ b/sci-physics/geant/geant-4.10.7.2-r1.ebuild
@@ -28,7 +28,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"
-IUSE="+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5
+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="
diff --git a/sci-physics/geant/geant-4.11.0_beta1.ebuild b/sci-physics/geant/geant-4.11.0_beta1.ebuild
new file mode 100644
index 000000000000..d0b2f94a4e2c
--- /dev/null
+++ b/sci-physics/geant/geant-4.11.0_beta1.ebuild
@@ -0,0 +1,106 @@
+# 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++17 c++20 +data dawn doc examples freetype gdml geant3 hdf5 inventor motif opengl
+	qt5 raytracerx static-libs threads vrml"
+
+REQUIRED_USE="
+	^^ ( c++17 c++20 )
+	inventor? ( opengl )
+	motif? ( opengl )
+	qt5? ( opengl )
+"
+
+RDEPEND="
+	dev-libs/expat
+	>=sci-physics/clhep-2.4.4.2: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 )
+	qt5? (
+		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
+	)"
+
+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_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/metadata.xml b/sci-physics/geant/metadata.xml
index b6e9a45b0397..64262edc2741 100644
--- a/sci-physics/geant/metadata.xml
+++ b/sci-physics/geant/metadata.xml
@@ -18,6 +18,7 @@
     <flag name="c++11">Build using the C++11 standard</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="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="dawn">Add support for <pkg>media-gfx/dawn</pkg> (3D postscript rendering)</flag>
     <flag name="freetype">Add support for <pkg>media-libs/freetype</pkg></flag>