[gentoo-commits] repo/gentoo:master commit in: sci-physics/geant/

["Guilherme Amadio" <amadio@gentoo.org>]

commit:     0c5d4e2b0e549028a9c768f9680da975d3a0864b
Author:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 28 12:42:03 2021 +0000
Commit:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Mon Jun 28 13:10:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c5d4e2b

sci-physics/geant: fix bug #799020

Closes: https://bugs.gentoo.org/799020
Fixes: c7c1d593a8afec705fde43123856ae1370ff37eb

Geant4 11.0 beta only supports C++17 and above.

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>

 sci-physics/geant/geant-4.11.0_beta1.ebuild | 8 ++++----
 sci-physics/geant/metadata.xml              | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sci-physics/geant/geant-4.11.0_beta1.ebuild b/sci-physics/geant/geant-4.11.0_beta1.ebuild
index 62c4b4c198c..d0b2f94a4e2 100644
--- a/sci-physics/geant/geant-4.11.0_beta1.ebuild
+++ b/sci-physics/geant/geant-4.11.0_beta1.ebuild
@@ -28,11 +28,11 @@ 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"
+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++11 c++14 c++17 )
+	^^ ( c++17 c++20 )
 	inventor? ( opengl )
 	motif? ( opengl )
 	qt5? ( opengl )
@@ -66,7 +66,7 @@ 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-)
+		-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)

diff --git a/sci-physics/geant/metadata.xml b/sci-physics/geant/metadata.xml
index b6e9a45b039..64262edc274 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>