From abaa75b10f899ada8dd05b23cc03205064394bc6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 22 Jan 2021 20:28:19 +0000 Subject: gentoo resync : 22.01.2021 --- sci-physics/vgm/Manifest | 8 +-- sci-physics/vgm/files/vgm-copy-test-seed.patch | 14 ++++ sci-physics/vgm/files/vgm-fix-FindCLHEP.patch | 64 ------------------ sci-physics/vgm/vgm-4.5.ebuild | 86 ------------------------ sci-physics/vgm/vgm-4.9.ebuild | 90 ++++++++++++++++++++++++++ sci-physics/vgm/vgm-9999.ebuild | 12 ++-- 6 files changed, 115 insertions(+), 159 deletions(-) create mode 100644 sci-physics/vgm/files/vgm-copy-test-seed.patch delete mode 100644 sci-physics/vgm/files/vgm-fix-FindCLHEP.patch delete mode 100644 sci-physics/vgm/vgm-4.5.ebuild create mode 100644 sci-physics/vgm/vgm-4.9.ebuild (limited to 'sci-physics/vgm') diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest index dffc86a4684d..16ac3c2b694d 100644 --- a/sci-physics/vgm/Manifest +++ b/sci-physics/vgm/Manifest @@ -1,7 +1,7 @@ -AUX vgm-fix-FindCLHEP.patch 2191 BLAKE2B 465bd6dfca5aaedaa85759092d4d66a65f5df8a3be9a78bfd5edf0630e5ea733f23d14a4d892e272d5062927ff2622560987f566d130324cbdb96c097d083800 SHA512 24d6cd832e496ebe573ee6b8a95ac7a777c16919626f9b7019d260295d12766f89f5832bb3d5ca794eb28dbd293828935a92627f11ca55381c6f7645f61893ac -DIST vgm-4.5.tar.gz 3474063 BLAKE2B 70c4fe0bd5eb9bc94607553ad30ffb625e66ef4e6f8a965b1289c1c7ad6f71d7eba035d2825ba8cd94705a0c223aa56408d3285748b068045eee3a29f556e3b2 SHA512 541fde12e12cc51ba065900788dbceb8e5b9a4e4615a4e4e0bbd2ba199b8a203b6927dbe23ead7bc183bd61f6b641e3e954fe7b78451c2d423d3a2b737f00572 +AUX vgm-copy-test-seed.patch 341 BLAKE2B 0a3fdc57a76e5ee27ccea0221acd3742e4f00d6e9592d73a0f7083c172b6a4ce822eb6f78f45d9b0be756ba12950d446828cbbe896f32279b9979ff656cc7e7f SHA512 26a6df0823495a86322b32d55fde0b25d471687425d69fc48f4937e3bb7546f7c15b24373c324aa168cb764ce79ad16bc8b16eae6a587c58fe7088d71bddd957 DIST vgm-4.8.tar.gz 3661965 BLAKE2B 29f878fb6716e261c27d60b2c9081d66313591a053d80f78501973f131aff88bbcee743ff9767836883dcb28d3ce5aeee3759a5890d7c8811a6a61503417284f SHA512 8b7cabc5796649c4014ccbdf1c6d209d2e7c2b4b06258716a72cadd997a9f6f51c4f9cb5870fd10abfd1ee133766876523c84441a69c7242bc2002687ca0ce58 -EBUILD vgm-4.5.ebuild 1760 BLAKE2B 3d00a62d6c19f167956d06999e8633362da4cba056ee9716425aef025c366e23ed623b77f2ecffc9eebf34be27be2d4b5c81fdd6e5e8f6a52e709df6a04c7611 SHA512 26283fcbc9bdb0d8980734e3fbd2a35831aba214ad97d80b9e15aa2f137eba3e18d198797d5c479bba77a608a3220b17666ac355466335abb694ff1372fa6f34 +DIST vgm-4.9.tar.gz 3881029 BLAKE2B 596a8df12f0dcd813a0d84e8c33eaa92dd2d332d9accf2fc38992f385748a2bd3579fee2af6cc00b878fe5491af4996d80775aa630120507ccc665f102f63b11 SHA512 90845d75a7ff0022f5fba15b7f621efd588251060c0d8e715fcc2e28bb6b4b01ddd83420dbd233cc0dd437ee6b8b5390bb1f84571ed12e696ee8c1dfc4bd8fd9 EBUILD vgm-4.8.ebuild 1752 BLAKE2B fc304e1dd772b40743cfa906668136e99eae34e1ea2ead012ea5bdceacf15495c0f02669b13c2617ea4c67952859dfd6bf9e4698298d76e461994c39b35f967d SHA512 82ad2b67ea5d703af84a1c8fbc338a6ffb582492758ff2560fdbf9109bb30424ac32f032db466fc3b08dc419d7a1b49c8d34f7daa127b5e335bfd104686aadb9 -EBUILD vgm-9999.ebuild 1752 BLAKE2B fc304e1dd772b40743cfa906668136e99eae34e1ea2ead012ea5bdceacf15495c0f02669b13c2617ea4c67952859dfd6bf9e4698298d76e461994c39b35f967d SHA512 82ad2b67ea5d703af84a1c8fbc338a6ffb582492758ff2560fdbf9109bb30424ac32f032db466fc3b08dc419d7a1b49c8d34f7daa127b5e335bfd104686aadb9 +EBUILD vgm-4.9.ebuild 2004 BLAKE2B fbc00bf7ae3cca7b8fcd867123ebc2b4d83a0e7b8426a26f4310130763d57c5ceedf4dc93d39834f80935975eb35c8c8021111b6090471ec4576e5b56fd8f2ee SHA512 8561eb343bb08b3d013c36de7295794af5dc3b84899e6a3719d23dc5ac08a20866546652ed4438b8e51474999e82d8daf4c364e991fff7d1638fb23fbe7711a9 +EBUILD vgm-9999.ebuild 1948 BLAKE2B 136002894861b03e058dcde44d56a41ddac671b760bab9f447afd8b79d1643a7691a79fcd5caf6136a7ecbb8e2f1304482ca93bbcbe017457c98ef3def792928 SHA512 3a9b3b52f07a2fd98dcd402a7b7a81190906407dd0ada486959c5e77b6849cfada0eaf01074a6d4aea741ac41063943054c9937a20821c342f5b3082723dcc9e MISC metadata.xml 971 BLAKE2B 76e1255814eea59a44c610d3fc9c2a304909610bfd77a847fa5fd05974b9d0d4db1081b5dd32db9e860213204c6272ea14c7dc6dc717472f5de7c5ab42211335 SHA512 30d69c4518b7a69bf458eaa2ba894b3690e2af8bb2b1a63ecb28b7e531c26843f688152f6f102faf2a033ab1424078047cbeb9bad4a0dba5e39c3d2456575259 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 000000000000..31dcebdccde2 --- /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/files/vgm-fix-FindCLHEP.patch b/sci-physics/vgm/files/vgm-fix-FindCLHEP.patch deleted file mode 100644 index d3bf3d0d4f31..000000000000 --- a/sci-physics/vgm/files/vgm-fix-FindCLHEP.patch +++ /dev/null @@ -1,64 +0,0 @@ -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.5.ebuild b/sci-physics/vgm/vgm-4.5.ebuild deleted file mode 100644 index 5020ac5b5500..000000000000 --- a/sci-physics/vgm/vgm-4.5.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git" -else - MY_PV=$(ver_rs 1- -) - SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${PN}-${MY_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-6.14:=[c++11] ) - geant4? ( >=sci-physics/geant-4.10.03 )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen[dot] ) - test? ( - sci-physics/geant[gdml] - 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="${EPREFIX}/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_src_configure -} - -src_compile() { - cmake_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_src_install - use doc && local HTML_DOCS=( doc/html/. ) - einstalldocs -} diff --git a/sci-physics/vgm/vgm-4.9.ebuild b/sci-physics/vgm/vgm-4.9.ebuild new file mode 100644 index 000000000000..ede9e854018d --- /dev/null +++ b/sci-physics/vgm/vgm-4.9.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git" +else + MY_PV=$(ver_rs 1- -) + SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${PN}-${MY_PV}" +fi + +DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments" +HOMEPAGE="http://ivana.home.cern.ch/ivana/VGM.html https://github.com/vmc-project/vgm/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+c++11 c++14 c++17 doc examples +geant4 +root test" + +REQUIRED_USE="^^ ( c++11 c++14 c++17 )" + +RDEPEND=" + sci-physics/clhep:= + geant4? ( >=sci-physics/geant-4.10.6[c++11?,c++14?,c++17?] ) + root? ( >=sci-physics/root-6.14:=[c++11?,c++14?,c++17?] )" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen[dot] ) + test? ( + sci-physics/geant[gdml] + sci-physics/geant-vmc[g4root] + )" +RESTRICT=" + !geant4? ( test ) + !root? ( test ) + !test? ( test ) + !examples? ( test )" + +DOCS=( + doc/README + doc/todo.txt + doc/VGMhistory.txt + doc/VGM.html + doc/VGMversions.html +) +PATCHES=( + "${FILESDIR}"/"${PN}-copy-test-seed.patch" +) + +src_configure() { + local mycmakeargs=( + -DCLHEP_DIR="${EPREFIX}/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_src_configure +} + +src_compile() { + cmake_src_compile + if use doc; then + cd packages + doxygen || die + fi +} + +src_test() { + cd "${BUILD_DIR}"/test || 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() { + cmake_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 659728a149ea..eb9ce1b27be0 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 @@ -8,7 +8,6 @@ inherit cmake if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git" - KEYWORDS="" else MY_PV=$(ver_rs 1- -) SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" @@ -17,7 +16,7 @@ else fi DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments" -HOMEPAGE="http://ivana.home.cern.ch/ivana/VGM.html" +HOMEPAGE="http://ivana.home.cern.ch/ivana/VGM.html https://github.com/vmc-project/vgm/" LICENSE="GPL-2" SLOT="0" @@ -38,7 +37,8 @@ DEPEND="${RDEPEND} RESTRICT=" !geant4? ( test ) !root? ( test ) - !test? ( test )" + !test? ( test ) + !examples? ( test )" DOCS=( doc/README @@ -75,7 +75,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() { -- cgit v1.2.3