From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 610EB13877A for ; Sun, 27 Jul 2014 08:58:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5E1CDE0CB6; Sun, 27 Jul 2014 08:58:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C5A57E0CB6 for ; Sun, 27 Jul 2014 08:58:44 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A5EE133BDD7 for ; Sun, 27 Jul 2014 08:58:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 3A5DB18BEF for ; Sun, 27 Jul 2014 08:58:42 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1406402498.f1b0a762af6495064c802db4c47fd46e3e77252f.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/geant-vmc/ X-VCS-Repository: proj/sci X-VCS-Files: sci-physics/geant-vmc/ChangeLog sci-physics/geant-vmc/geant-vmc-9999.ebuild X-VCS-Directories: sci-physics/geant-vmc/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: f1b0a762af6495064c802db4c47fd46e3e77252f X-VCS-Branch: master Date: Sun, 27 Jul 2014 08:58:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 87986390-b87f-448f-bc29-9c560d48091e X-Archives-Hash: 453171ad2de4e6f333099b1217c96f53 commit: f1b0a762af6495064c802db4c47fd46e3e77252f Author: Oliver Freyermuth googlemail com> AuthorDate: Sat Jul 26 19:21:38 2014 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sat Jul 26 19:21:38 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f1b0a762 Fix doxygen-generation, adapt to now working way to run the test-suite (patched upstream). --- sci-physics/geant-vmc/ChangeLog | 5 +++++ sci-physics/geant-vmc/geant-vmc-9999.ebuild | 19 +++++-------------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/sci-physics/geant-vmc/ChangeLog b/sci-physics/geant-vmc/ChangeLog index 807b464..1a52d9e 100644 --- a/sci-physics/geant-vmc/ChangeLog +++ b/sci-physics/geant-vmc/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 26 Jul 2014; Oliver Freyermuth + geant-vmc-9999.ebuild: + Fix doxygen-generation, adapt to now working way to run the test-suite + (patched upstream). + *geant-vmc-9999 (06 Jul 2014) 06 Jul 2014; Oliver Freyermuth diff --git a/sci-physics/geant-vmc/geant-vmc-9999.ebuild b/sci-physics/geant-vmc/geant-vmc-9999.ebuild index fa8fa55..f0a1ebe 100644 --- a/sci-physics/geant-vmc/geant-vmc-9999.ebuild +++ b/sci-physics/geant-vmc/geant-vmc-9999.ebuild @@ -20,7 +20,7 @@ HOMEPAGE="http://root.cern.ch/root/vmc/VirtualMC.html" LICENSE="GPL-2" SLOT="4" -IUSE="doc examples geant3 +g4root +mtroot vgm" +IUSE="doc examples geant3 +g4root +mtroot vgm test" RDEPEND=" sci-physics/root:= @@ -35,6 +35,7 @@ src_configure() { $(cmake-utils_use geant3 Geant4VMC_USE_GEANT4_G3TOG4) $(cmake-utils_use g4root Geant4VMC_USE_G4Root) $(cmake-utils_use mtroot Geant4VMC_USE_MTRoot) + $(cmake-utils_use test Geant4VMC_BUILD_EXAMPLES) $(cmake-utils_use examples Geant4VMC_INSTALL_EXAMPLES) ) cmake-utils_src_configure @@ -42,7 +43,7 @@ src_configure() { src_compile() { cmake-utils_src_compile - local dirs="g4root mtroot source" + local dirs="source" use g4root && dirs+=" g4root " use mtroot && dirs+=" mtroot " use examples && dirs+=" examples " @@ -58,18 +59,8 @@ src_compile() { src_test() { cd examples || die - local origDir=${CMAKE_USE_DIR} - CMAKE_USE_DIR=${CMAKE_USE_DIR}/examples - CMAKE_IN_SOURCE_BUILD=1 - CMAKE_MODULE_PATH=../cmake - local mycmakeargs=( - -DCMAKE_MODULE_PATH=${origDir}/cmake - ) - cmake-utils_src_configure - cmake-utils_src_compile - ./run_suite.sh || die - CMAKE_IN_SOURCE_BUILD=0 - CMAKE_USE_DIR=$origDir + ./test_suite.sh --g3=off --builddir="${BUILD_DIR}" || die + ./test_suite_exe.sh --g3=off --builddir="${BUILD_DIR}" || die } src_install() {