commit: 7a6e4cc929ad66caace9ee9e15dd563a03aca877 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Wed Jan 20 10:16:10 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Wed Jan 20 10:16:10 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a6e4cc9
sci-physics/vgm: Remove old Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> Signed-off-by: David Seifert <soap <AT> gentoo.org> sci-physics/vgm/Manifest | 1 - sci-physics/vgm/files/vgm-fix-FindCLHEP.patch | 64 -------------------- sci-physics/vgm/vgm-4.5.ebuild | 86 --------------------------- 3 files changed, 151 deletions(-) diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest index 6e9c7ee47e1..717f6f9163e 100644 --- a/sci-physics/vgm/Manifest +++ b/sci-physics/vgm/Manifest @@ -1,2 +1 @@ -DIST vgm-4.5.tar.gz 3474063 BLAKE2B 70c4fe0bd5eb9bc94607553ad30ffb625e66ef4e6f8a965b1289c1c7ad6f71d7eba035d2825ba8cd94705a0c223aa56408d3285748b068045eee3a29f556e3b2 SHA512 541fde12e12cc51ba065900788dbceb8e5b9a4e4615a4e4e0bbd2ba199b8a203b6927dbe23ead7bc183bd61f6b641e3e954fe7b78451c2d423d3a2b737f00572 DIST vgm-4.8.tar.gz 3661965 BLAKE2B 29f878fb6716e261c27d60b2c9081d66313591a053d80f78501973f131aff88bbcee743ff9767836883dcb28d3ce5aeee3759a5890d7c8811a6a61503417284f SHA512 8b7cabc5796649c4014ccbdf1c6d209d2e7c2b4b06258716a72cadd997a9f6f51c4f9cb5870fd10abfd1ee133766876523c84441a69c7242bc2002687ca0ce58 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 d3bf3d0d4f3..00000000000 --- 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: [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-4.5.ebuild b/sci-physics/vgm/vgm-4.5.ebuild deleted file mode 100644 index 5020ac5b550..00000000000 --- 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 -}
