From 121ed4eec41fbf03e1998d09eede1bf449da63b9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 19 Jul 2019 22:05:27 +0100 Subject: gentoo resync : 19.07.2019 --- sci-physics/vgm/Manifest | 6 +- sci-physics/vgm/files/vgm-fix-FindCLHEP.patch | 64 +++++++++++++++++++++ sci-physics/vgm/vgm-4.4-r1.ebuild | 82 +++++++++++++++++++++++++++ sci-physics/vgm/vgm-4.5.ebuild | 82 +++++++++++++++++++++++++++ sci-physics/vgm/vgm-9999.ebuild | 7 ++- 5 files changed, 237 insertions(+), 4 deletions(-) create mode 100644 sci-physics/vgm/files/vgm-fix-FindCLHEP.patch create mode 100644 sci-physics/vgm/vgm-4.4-r1.ebuild create mode 100644 sci-physics/vgm/vgm-4.5.ebuild (limited to 'sci-physics/vgm') diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest index da08439a03d2..b7eaad7a59cd 100644 --- a/sci-physics/vgm/Manifest +++ b/sci-physics/vgm/Manifest @@ -1,4 +1,8 @@ +AUX vgm-fix-FindCLHEP.patch 2191 BLAKE2B 465bd6dfca5aaedaa85759092d4d66a65f5df8a3be9a78bfd5edf0630e5ea733f23d14a4d892e272d5062927ff2622560987f566d130324cbdb96c097d083800 SHA512 24d6cd832e496ebe573ee6b8a95ac7a777c16919626f9b7019d260295d12766f89f5832bb3d5ca794eb28dbd293828935a92627f11ca55381c6f7645f61893ac DIST vgm.4.4.tar.gz 3064087 BLAKE2B 845d04fa3ebaaa07f90ef7f216cac10e5ca4129ebbd6161e3fecce39663379b2575026186fe2b88ae8bf08f71bed6d8afcbbd5d7aa9922d37b3f9ed900d35a33 SHA512 500ae0e2ac66b580bbc26b6cd1a8bd6d6e3127c99e6fe6babe5825406e576d72da5cd76d22d0d1b82d7df9eb74ddddf084ee9a96b544c97af5b12cbf948d3406 +DIST vgm.4.5.tar.gz 9602541 BLAKE2B 183c8ed91546e5421c4f1a873a48285e9d2ab6bf4bb6a7bb7b46ab2c3c80a5dfc50cd5f97890c3994ada67014067349726e9f4d65cda1e1e4f1ae9484a4249ef SHA512 a873e24ed2c6cfc09d1828b60af9059a0bee341410e5cb77c9312aa72f1650a913779a0ff929d98910f01fcc5a3e6a04b352dd1a780a8bf60b1fa925b1985491 +EBUILD vgm-4.4-r1.ebuild 1718 BLAKE2B 2586aff67f39536151fd5ad05e94e4fb5b80b3a452a2b17753275aa9138868ab77c54b1ebc36474246c0fc641820cb19c1f00a7d53dec52d7afd7ac344d79cd6 SHA512 c81e6d4cb70a460f7e60095907d6643029a8e32f08c2e9db200bc80620dcd00ca31137e44730b30ca7cac57e60cff4b64d1f4f1f32d0f9a06c011894e1b436b5 EBUILD vgm-4.4.ebuild 1687 BLAKE2B 465f91a5943a39258201724d093dc5cefdf20fe5179c3215945f97bd8fea6b5b4c059daf9a8b652c604463bf3cdfce47c575814ad0db0112dc0e7588b1e807c6 SHA512 01dadc26e284d521c00cbeaa46ab1a3de612435c5e667e57d21f82b87bb9bb099a238c07a9b67bfb368edaa27447c265e666fd2330ebab867a8c15f496567be7 -EBUILD vgm-9999.ebuild 1597 BLAKE2B 52ec50d53da0b17a8e2a038dbe478a8a3ca283472209daf489e08228dc9778e4ae9a2ba6a9e270e63644c16177bdb4729ac29433a90e4b85c17c19a193f9771a SHA512 4df20b7c0874135222b0025e025c119d9cc5e556a49a7f3e8ba05c5455f2329c577b959dd8c229b54936a430962eecd3daec5e6af405d846fd17b05dfc76bbf4 +EBUILD vgm-4.5.ebuild 1712 BLAKE2B 39d3e5aa95ce4357227687287d895c4d6d7d12200e56f0359423612a87a39943ed186cdcd4b519d9a27e0d5be25c8c26f6b23b2ab2e26327768c219cdebfd1e2 SHA512 4c1aed49137aeefdfb50a5d9433b9862c730abc1716ee1bf831215676874485f96db062501faf7b0a80bd5169d882988be85df5ba1ba161d1d4ac41f912d9fac +EBUILD vgm-9999.ebuild 1663 BLAKE2B 41230e994009e8ed462db50a071cc71800a9e4cd399cc89991ce4f8879c2653feb1263a5a148ce5f24662cb1638af2df4efa884f9c86f1ab4b1d570e034a5cfd SHA512 795149adb05e3c02906795725cd353d52d61869c3fc5cadd3182c38e7e63a36a099a4bea938291b0b1553060f2f01c8c67ea3ddd820fd9b7ab9cda551f88e16d MISC metadata.xml 887 BLAKE2B 2bed4c9deeb9bbda28704462bf45eaf31d810b115608bd66ccdd8f5e8494556b87962301395d0f0cbf229aaf8d497b1f07b9821600d6c101aad34c5ef49cf643 SHA512 5e52d57dc9cc78020a147c4984aa037b3441f910f6288e75a3919398a0b22d16f312fd910bf0a692bfb039c3540f2854e4f2c660f7d3c4a4c23cbc63f9885dbf 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 000000000000..d3bf3d0d4f31 --- /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-4.4-r1.ebuild b/sci-physics/vgm/vgm-4.4-r1.ebuild new file mode 100644 index 000000000000..89f9a9ec1384 --- /dev/null +++ b/sci-physics/vgm/vgm-4.4-r1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git" +else + SRC_URI="http://ivana.home.cern.ch/ivana/${PN}.${PV}.tar.gz" + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + S="${WORKDIR}/${PN}.${PV}" +fi + +DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments" +HOMEPAGE="http://ivana.home.cern.ch/ivana/VGM.html" + +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:=[c++11] ) + geant4? ( >=sci-physics/geant-4.10.03 )" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen[dot] ) + test? ( sci-physics/geant-vmc[g4root] )" +RESTRICT=" + !geant4? ( test ) + !root? ( test ) + !test? ( test )" + +DOCS=( + doc/README + doc/todo.txt + doc/VGMhistory.txt + doc/VGM.html + doc/VGMversions.html +) +PATCHES=( + "${FILESDIR}"/"${PN}-fix-FindCLHEP.patch" +) + +src_configure() { + local mycmakeargs=( + -DCLHEP_DIR="${EROOT}usr" + -DWITH_EXAMPLES="$(usex examples)" + -DINSTALL_EXAMPLES="$(usex examples)" + -DWITH_GEANT4="$(usex geant4)" + -DWITH_ROOT="$(usex root)" + -DWITH_TEST="$(usex test)" + ) + if use test && use root && use geant4; then + mycmakeargs+=( -DWITH_G4ROOT=yes ) + else + mycmakeargs+=( -DWITH_G4ROOT=no ) + fi + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + if use doc; then + cd packages + doxygen || die + fi +} + +src_test() { + cd "${BUILD_DIR}"/test || die + ./test_suite.sh || die +} + +src_install() { + cmake-utils_src_install + use doc && local HTML_DOCS=( doc/html/. ) + einstalldocs +} diff --git a/sci-physics/vgm/vgm-4.5.ebuild b/sci-physics/vgm/vgm-4.5.ebuild new file mode 100644 index 000000000000..7053d1d2a92d --- /dev/null +++ b/sci-physics/vgm/vgm-4.5.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git" +else + SRC_URI="http://ivana.home.cern.ch/ivana/${PN}.${PV}.tar.gz" + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + S="${WORKDIR}/${PN}" +fi + +DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments" +HOMEPAGE="http://ivana.home.cern.ch/ivana/VGM.html" + +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:=[c++11] ) + geant4? ( >=sci-physics/geant-4.10.03 )" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen[dot] ) + test? ( sci-physics/geant-vmc[g4root] )" +RESTRICT=" + !geant4? ( test ) + !root? ( test ) + !test? ( test )" + +DOCS=( + doc/README + doc/todo.txt + doc/VGMhistory.txt + doc/VGM.html + doc/VGMversions.html +) +PATCHES=( + "${FILESDIR}"/"${PN}-fix-FindCLHEP.patch" +) + +src_configure() { + local mycmakeargs=( + -DCLHEP_DIR="${EROOT}usr" + -DWITH_EXAMPLES="$(usex examples)" + -DINSTALL_EXAMPLES="$(usex examples)" + -DWITH_GEANT4="$(usex geant4)" + -DWITH_ROOT="$(usex root)" + -DWITH_TEST="$(usex test)" + ) + if use test && use root && use geant4; then + mycmakeargs+=( -DWITH_G4ROOT=yes ) + else + mycmakeargs+=( -DWITH_G4ROOT=no ) + fi + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + if use doc; then + cd packages + doxygen || die + fi +} + +src_test() { + cd "${BUILD_DIR}"/test || die + ./test_suite.sh || die +} + +src_install() { + cmake-utils_src_install + use doc && local HTML_DOCS=( doc/html/. ) + einstalldocs +} diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild index b303e23a06c6..00846ae113bd 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] ) -- cgit v1.2.3