gentoo resync : 15.06.2021

4 files changed, 113 insertions, 5 deletions

diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index cf4c581d71dc..b73e8a217504 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -1,5 +1,7 @@
 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 2959 BLAKE2B aa2df17852666ce5c94ac9b1036b96fd454f6356585ef336433998b22d1c7a01112e28a5bd8d571bcf8fc0570c36d860225e3e078630569bdbf3d7eabe45aeae SHA512 26bfc2ec3619d41bcc3e6f0c7e6418958e599ff17c79b2c1bdb27b3e7325ab1912dc93810a8f565a57039022b49428bda46e629f82e798d9bc56fff66e53d25a
-EBUILD geant-4.10.7.ebuild 2959 BLAKE2B d61150dfb0d0e2e5c3c5e2e7168b6808ce6f7acdb7fe62b2e2939bbd03b717a8c5bd7e875c85833cad97f7431d7f23e1a316495e741caa03626a22981688d395 SHA512 027ffcf842f0d4b4e439a5b9b61702d9830a6ddb7188b8af0d18801d48be16c017a94443238cf1d120ded2bd014ea0643f8254a93a874acf50e54d7afe202c2c
+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
diff --git a/sci-physics/geant/geant-4.10.7.1.ebuild b/sci-physics/geant/geant-4.10.7.1.ebuild
index aeba779ff7b5..4876bb60e54c 100644
--- a/sci-physics/geant/geant-4.10.7.1.ebuild
+++ b/sci-physics/geant/geant-4.10.7.1.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.10.7.2.ebuild b/sci-physics/geant/geant-4.10.7.2.ebuild
new file mode 100644
index 000000000000..9687486dde6f
--- /dev/null
+++ b/sci-physics/geant/geant-4.10.7.2.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++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/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"
+		-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.ebuild b/sci-physics/geant/geant-4.10.7.ebuild
index d286262db573..4876bb60e54c 100644
--- a/sci-physics/geant/geant-4.10.7.ebuild
+++ b/sci-physics/geant/geant-4.10.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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"