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: [email protected]
+ #
------------------------------------------------------------------------------
+
+-# 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] )
