* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/files/, sci-physics/vgm/
@ 2019-07-18 18:00 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2019-07-18 18:00 UTC (permalink / raw
To: gentoo-commits
commit: b51e1f9fa3c5575fba3fc672822e2bff468409ee
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Mon Jul 15 17:49:20 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 18:00:20 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b51e1f9f
sci-physics/vgm: Add patch for vgm-4.4, correct dependency.
Patch needed to correctly find CLHEP on 17.1 profile,
upstreamed. sci-physics/root now has c++11 to depend on.
Revbump for EAPI bump.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sci-physics/vgm/files/vgm-fix-FindCLHEP.patch | 64 ++++++++++++++++++++++
.../vgm/{vgm-9999.ebuild => vgm-4.4-r1.ebuild} | 10 +++-
sci-physics/vgm/vgm-9999.ebuild | 7 ++-
3 files changed, 75 insertions(+), 6 deletions(-)
diff --git a/sci-physics/vgm/files/vgm-fix-FindCLHEP.patch b/sci-physics/vgm/files/vgm-fix-FindCLHEP.patch
new file mode 100644
index 00000000000..d3bf3d0d4f3
--- /dev/null
+++ b/sci-physics/vgm/files/vgm-fix-FindCLHEP.patch
@@ -0,0 +1,64 @@
+diff -Naur vgm/cmake/FindCLHEP.cmake vgm.patched/cmake/FindCLHEP.cmake
+--- vgm/cmake/FindCLHEP.cmake 2019-01-25 18:46:25.000000000 +0100
++++ vgm.patched/cmake/FindCLHEP.cmake 2019-06-29 19:50:18.092076913 +0200
+@@ -4,13 +4,13 @@
+ # The configuration file for CMake build for Virtual Geometry Model
+ # Copyright (C) 2012, Ivana Hrivnacova
+ # All rights reserved.
+-#
++#
+ # For the licensing terms see vgm/LICENSE.
+ # Contact: ivana@ipno.in2p3.fr
+ # ------------------------------------------------------------------------------
+
+-# The CMake build for Virtual Geometry Model is a result of a merge
+-# of the CMake configuration files kindly provided
++# The CMake build for Virtual Geometry Model is a result of a merge
++# of the CMake configuration files kindly provided
+ # by Florian Uhlig, GSI and Pere Mato, CERN.
+
+ # - Try to find CLHEP
+@@ -36,28 +36,29 @@
+ $ENV{CLHEP_BASE_DIR}/include
+ )
+
+-# CLHEP library external to Geant4
+-find_path(EXTERNAL_CLHEP_LIBRARY_DIR NAMES libCLHEP.so libCLHEP.dylib PATHS
++# CLHEP library external to Geant4
++find_library(EXTERNAL_CLHEP_LIBRARY NAMES libCLHEP.so libCLHEP.dylib PATHS
+ ${CLHEP_LIB_DIR}
+ ${CLHEP_DIR}/lib
+ $ENV{CLHEP_BASE_DIR}/lib
+ )
+-if (EXTERNAL_CLHEP_LIBRARY_DIR)
+- set(CLHEP_LIBRARY_DIR ${EXTERNAL_CLHEP_LIBRARY_DIR})
+- set(CLHEP_LIBRARY_NAME CLHEP)
+-endif()
+-
+-# CLHEP library within Geant4
+-if (NOT EXTERNAL_CLHEP_LIBRARY_DIR)
+- find_path(CLHEP_LIBRARY_DIR NAMES libG4clhep.so libG4clhep.dylib PATHS
++if (EXTERNAL_CLHEP_LIBRARY)
++ get_filename_component(CLHEP_LIBRARY_DIR "${EXTERNAL_CLHEP_LIBRARY}" DIRECTORY)
++ set(CLHEP_LIBRARY_NAME CLHEP)
++endif()
++
++# CLHEP library within Geant4
++if (NOT EXTERNAL_CLHEP_LIBRARY)
++ find_library(CLHEP_LIBRARY NAMES libG4clhep.so libG4clhep.dylib PATHS
+ ${Geant4_DIR}/..
+ ${GEANT4_LIBRARY_DIR}
+ )
+- if (CLHEP_LIBRARY_DIR)
++ if (CLHEP_LIBRARY)
++ get_filename_component(CLHEP_LIBRARY_DIR "${CLHEP_LIBRARY}" DIRECTORY)
+ set(CLHEP_LIBRARY_NAME G4clhep)
+- endif(CLHEP_LIBRARY_DIR)
+-endif()
+-
++ endif(CLHEP_LIBRARY)
++endif()
++
+ if (CLHEP_INCLUDE_DIRS AND CLHEP_LIBRARY_DIR)
+ set(CLHEP_FOUND TRUE)
+ endif (CLHEP_INCLUDE_DIRS AND CLHEP_LIBRARY_DIR)
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-4.4-r1.ebuild
similarity index 88%
copy from sci-physics/vgm/vgm-9999.ebuild
copy to sci-physics/vgm/vgm-4.4-r1.ebuild
index b303e23a06c..89f9a9ec138 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-4.4-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit cmake-utils
@@ -21,9 +21,10 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="doc examples +geant4 +root test"
+# sci-physics/root[c++11] required to match sci-physics/geant
RDEPEND="
sci-physics/clhep:=
- root? ( sci-physics/root:= )
+ root? ( sci-physics/root:=[c++11] )
geant4? ( >=sci-physics/geant-4.10.03 )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen[dot] )
@@ -40,6 +41,9 @@ DOCS=(
doc/VGM.html
doc/VGMversions.html
)
+PATCHES=(
+ "${FILESDIR}"/"${PN}-fix-FindCLHEP.patch"
+)
src_configure() {
local mycmakeargs=(
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index b303e23a06c..00846ae113b 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit cmake-utils
@@ -21,9 +21,10 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="doc examples +geant4 +root test"
+# sci-physics/root[c++11] required to match sci-physics/geant
RDEPEND="
sci-physics/clhep:=
- root? ( sci-physics/root:= )
+ root? ( sci-physics/root:=[c++11] )
geant4? ( >=sci-physics/geant-4.10.03 )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen[dot] )
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/files/, sci-physics/vgm/
@ 2021-01-21 8:26 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2021-01-21 8:26 UTC (permalink / raw
To: gentoo-commits
commit: eb9db4c814d220be76f3ef11a5d69849ddb21ce7
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Thu Jan 21 08:22:57 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 08:26:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb9db4c8
sci-physics/vgm: Bump to version 4.9.
This also fixes issues with the test suite
in the live ebuild.
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Closes: https://github.com/gentoo/gentoo/pull/18966
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-physics/vgm/Manifest | 1 +
sci-physics/vgm/files/vgm-copy-test-seed.patch | 14 ++++++++++++++
sci-physics/vgm/{vgm-9999.ebuild => vgm-4.9.ebuild} | 12 +++++++++---
sci-physics/vgm/vgm-9999.ebuild | 9 ++++++---
4 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest
index 717f6f9163e..b03b99d0fe0 100644
--- a/sci-physics/vgm/Manifest
+++ b/sci-physics/vgm/Manifest
@@ -1 +1,2 @@
DIST vgm-4.8.tar.gz 3661965 BLAKE2B 29f878fb6716e261c27d60b2c9081d66313591a053d80f78501973f131aff88bbcee743ff9767836883dcb28d3ce5aeee3759a5890d7c8811a6a61503417284f SHA512 8b7cabc5796649c4014ccbdf1c6d209d2e7c2b4b06258716a72cadd997a9f6f51c4f9cb5870fd10abfd1ee133766876523c84441a69c7242bc2002687ca0ce58
+DIST vgm-4.9.tar.gz 3881029 BLAKE2B 596a8df12f0dcd813a0d84e8c33eaa92dd2d332d9accf2fc38992f385748a2bd3579fee2af6cc00b878fe5491af4996d80775aa630120507ccc665f102f63b11 SHA512 90845d75a7ff0022f5fba15b7f621efd588251060c0d8e715fcc2e28bb6b4b01ddd83420dbd233cc0dd437ee6b8b5390bb1f84571ed12e696ee8c1dfc4bd8fd9
diff --git a/sci-physics/vgm/files/vgm-copy-test-seed.patch b/sci-physics/vgm/files/vgm-copy-test-seed.patch
new file mode 100644
index 00000000000..31dcebdccde
--- /dev/null
+++ b/sci-physics/vgm/files/vgm-copy-test-seed.patch
@@ -0,0 +1,14 @@
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 395eef0..bcf3a4a 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -76,7 +76,8 @@ set(VGM_TEST_SCRIPTS
+ test1_suite.sh
+ test2_suite.sh
+ test3_suite.sh
+- test_suite.sh)
++ test_suite.sh
++ startRun.rdm)
+
+ foreach(_script ${VGM_TEST_SCRIPTS})
+ configure_file(
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-4.9.ebuild
similarity index 84%
copy from sci-physics/vgm/vgm-9999.ebuild
copy to sci-physics/vgm/vgm-4.9.ebuild
index 659728a149e..c592bb49c34 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -38,7 +38,8 @@ DEPEND="${RDEPEND}
RESTRICT="
!geant4? ( test )
!root? ( test )
- !test? ( test )"
+ !test? ( test )
+ !examples? ( test )"
DOCS=(
doc/README
@@ -47,6 +48,9 @@ DOCS=(
doc/VGM.html
doc/VGMversions.html
)
+PATCHES=(
+ "${FILESDIR}"/"${PN}-copy-test-seed.patch"
+)
src_configure() {
local mycmakeargs=(
@@ -75,7 +79,9 @@ src_compile() {
src_test() {
cd "${BUILD_DIR}"/test || die
- ./test_suite.sh || die
+ # See upstream issue: https://github.com/vmc-project/vgm/issues/5
+ sed -i 's/ ScaledSolids / /' test3_suite.sh || die
+ PATH="${BUILD_DIR}"/test:$PATH ./test_suite.sh || die
}
src_install() {
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index 659728a149e..e2d9d75a4f6 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -38,7 +38,8 @@ DEPEND="${RDEPEND}
RESTRICT="
!geant4? ( test )
!root? ( test )
- !test? ( test )"
+ !test? ( test )
+ !examples? ( test )"
DOCS=(
doc/README
@@ -75,7 +76,9 @@ src_compile() {
src_test() {
cd "${BUILD_DIR}"/test || die
- ./test_suite.sh || die
+ # See upstream issue: https://github.com/vmc-project/vgm/issues/5
+ sed -i 's/ ScaledSolids / /' test3_suite.sh || die
+ PATH="${BUILD_DIR}"/test:$PATH ./test_suite.sh || die
}
src_install() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-21 8:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-18 18:00 [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/files/, sci-physics/vgm/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2021-01-21 8:26 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox