| 1 |
commit: 0c5d4e2b0e549028a9c768f9680da975d3a0864b |
| 2 |
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 28 12:42:03 2021 +0000 |
| 4 |
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 28 13:10:31 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c5d4e2b |
| 7 |
|
| 8 |
sci-physics/geant: fix bug #799020 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/799020 |
| 11 |
Fixes: c7c1d593a8afec705fde43123856ae1370ff37eb |
| 12 |
|
| 13 |
Geant4 11.0 beta only supports C++17 and above. |
| 14 |
|
| 15 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 16 |
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org> |
| 17 |
|
| 18 |
sci-physics/geant/geant-4.11.0_beta1.ebuild | 8 ++++---- |
| 19 |
sci-physics/geant/metadata.xml | 1 + |
| 20 |
2 files changed, 5 insertions(+), 4 deletions(-) |
| 21 |
|
| 22 |
diff --git a/sci-physics/geant/geant-4.11.0_beta1.ebuild b/sci-physics/geant/geant-4.11.0_beta1.ebuild |
| 23 |
index 62c4b4c198c..d0b2f94a4e2 100644 |
| 24 |
--- a/sci-physics/geant/geant-4.11.0_beta1.ebuild |
| 25 |
+++ b/sci-physics/geant/geant-4.11.0_beta1.ebuild |
| 26 |
@@ -28,11 +28,11 @@ SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz" |
| 27 |
LICENSE="geant4" |
| 28 |
SLOT="4" |
| 29 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 30 |
-IUSE="+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5 |
| 31 |
- inventor motif opengl qt5 raytracerx static-libs threads vrml" |
| 32 |
+IUSE="+c++17 c++20 +data dawn doc examples freetype gdml geant3 hdf5 inventor motif opengl |
| 33 |
+ qt5 raytracerx static-libs threads vrml" |
| 34 |
|
| 35 |
REQUIRED_USE=" |
| 36 |
- ^^ ( c++11 c++14 c++17 ) |
| 37 |
+ ^^ ( c++17 c++20 ) |
| 38 |
inventor? ( opengl ) |
| 39 |
motif? ( opengl ) |
| 40 |
qt5? ( opengl ) |
| 41 |
@@ -66,7 +66,7 @@ S="${WORKDIR}/${MY_P}" |
| 42 |
src_configure() { |
| 43 |
local mycmakeargs=( |
| 44 |
-DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4" |
| 45 |
- -DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-) |
| 46 |
+ -DCMAKE_CXX_STANDARD=$((usev c++17 || usev c++20) | cut -c4-) |
| 47 |
-DGEANT4_BUILD_MULTITHREADED=$(usex threads) |
| 48 |
-DGEANT4_BUILD_STORE_TRAJECTORY=OFF |
| 49 |
-DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec) |
| 50 |
|
| 51 |
diff --git a/sci-physics/geant/metadata.xml b/sci-physics/geant/metadata.xml |
| 52 |
index b6e9a45b039..64262edc274 100644 |
| 53 |
--- a/sci-physics/geant/metadata.xml |
| 54 |
+++ b/sci-physics/geant/metadata.xml |
| 55 |
@@ -18,6 +18,7 @@ |
| 56 |
<flag name="c++11">Build using the C++11 standard</flag> |
| 57 |
<flag name="c++14">Build using the C++14 standard</flag> |
| 58 |
<flag name="c++17">Build using the C++17 standard</flag> |
| 59 |
+ <flag name="c++20">Build using the C++20 standard</flag> |
| 60 |
<flag name="data">Add a lot of standard physics data files for geant4</flag> |
| 61 |
<flag name="dawn">Add support for <pkg>media-gfx/dawn</pkg> (3D postscript rendering)</flag> |
| 62 |
<flag name="freetype">Add support for <pkg>media-libs/freetype</pkg></flag> |
Archives