| 1 |
commit: f1b0a762af6495064c802db4c47fd46e3e77252f |
| 2 |
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com> |
| 3 |
AuthorDate: Sat Jul 26 19:21:38 2014 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 26 19:21:38 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f1b0a762 |
| 7 |
|
| 8 |
Fix doxygen-generation, adapt to now working way to run the test-suite (patched upstream). |
| 9 |
|
| 10 |
--- |
| 11 |
sci-physics/geant-vmc/ChangeLog | 5 +++++ |
| 12 |
sci-physics/geant-vmc/geant-vmc-9999.ebuild | 19 +++++-------------- |
| 13 |
2 files changed, 10 insertions(+), 14 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sci-physics/geant-vmc/ChangeLog b/sci-physics/geant-vmc/ChangeLog |
| 16 |
index 807b464..1a52d9e 100644 |
| 17 |
--- a/sci-physics/geant-vmc/ChangeLog |
| 18 |
+++ b/sci-physics/geant-vmc/ChangeLog |
| 19 |
@@ -2,6 +2,11 @@ |
| 20 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 21 |
# $Header: $ |
| 22 |
|
| 23 |
+ 26 Jul 2014; Oliver Freyermuth <o.freyermuth@××××××××××.com> |
| 24 |
+ geant-vmc-9999.ebuild: |
| 25 |
+ Fix doxygen-generation, adapt to now working way to run the test-suite |
| 26 |
+ (patched upstream). |
| 27 |
+ |
| 28 |
*geant-vmc-9999 (06 Jul 2014) |
| 29 |
|
| 30 |
06 Jul 2014; Oliver Freyermuth <o.freyermuth@××××××××××.com> |
| 31 |
|
| 32 |
diff --git a/sci-physics/geant-vmc/geant-vmc-9999.ebuild b/sci-physics/geant-vmc/geant-vmc-9999.ebuild |
| 33 |
index fa8fa55..f0a1ebe 100644 |
| 34 |
--- a/sci-physics/geant-vmc/geant-vmc-9999.ebuild |
| 35 |
+++ b/sci-physics/geant-vmc/geant-vmc-9999.ebuild |
| 36 |
@@ -20,7 +20,7 @@ HOMEPAGE="http://root.cern.ch/root/vmc/VirtualMC.html" |
| 37 |
|
| 38 |
LICENSE="GPL-2" |
| 39 |
SLOT="4" |
| 40 |
-IUSE="doc examples geant3 +g4root +mtroot vgm" |
| 41 |
+IUSE="doc examples geant3 +g4root +mtroot vgm test" |
| 42 |
|
| 43 |
RDEPEND=" |
| 44 |
sci-physics/root:= |
| 45 |
@@ -35,6 +35,7 @@ src_configure() { |
| 46 |
$(cmake-utils_use geant3 Geant4VMC_USE_GEANT4_G3TOG4) |
| 47 |
$(cmake-utils_use g4root Geant4VMC_USE_G4Root) |
| 48 |
$(cmake-utils_use mtroot Geant4VMC_USE_MTRoot) |
| 49 |
+ $(cmake-utils_use test Geant4VMC_BUILD_EXAMPLES) |
| 50 |
$(cmake-utils_use examples Geant4VMC_INSTALL_EXAMPLES) |
| 51 |
) |
| 52 |
cmake-utils_src_configure |
| 53 |
@@ -42,7 +43,7 @@ src_configure() { |
| 54 |
|
| 55 |
src_compile() { |
| 56 |
cmake-utils_src_compile |
| 57 |
- local dirs="g4root mtroot source" |
| 58 |
+ local dirs="source" |
| 59 |
use g4root && dirs+=" g4root " |
| 60 |
use mtroot && dirs+=" mtroot " |
| 61 |
use examples && dirs+=" examples " |
| 62 |
@@ -58,18 +59,8 @@ src_compile() { |
| 63 |
|
| 64 |
src_test() { |
| 65 |
cd examples || die |
| 66 |
- local origDir=${CMAKE_USE_DIR} |
| 67 |
- CMAKE_USE_DIR=${CMAKE_USE_DIR}/examples |
| 68 |
- CMAKE_IN_SOURCE_BUILD=1 |
| 69 |
- CMAKE_MODULE_PATH=../cmake |
| 70 |
- local mycmakeargs=( |
| 71 |
- -DCMAKE_MODULE_PATH=${origDir}/cmake |
| 72 |
- ) |
| 73 |
- cmake-utils_src_configure |
| 74 |
- cmake-utils_src_compile |
| 75 |
- ./run_suite.sh || die |
| 76 |
- CMAKE_IN_SOURCE_BUILD=0 |
| 77 |
- CMAKE_USE_DIR=$origDir |
| 78 |
+ ./test_suite.sh --g3=off --builddir="${BUILD_DIR}" || die |
| 79 |
+ ./test_suite_exe.sh --g3=off --builddir="${BUILD_DIR}" || die |
| 80 |
} |
| 81 |
|
| 82 |
src_install() { |
Archives