summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sci-physics/geant/geant-4.11.0_beta1.ebuild8
-rw-r--r--sci-physics/geant/metadata.xml1
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 62c4b4c198c8..d0b2f94a4e2c 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 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>