commit: e8bb2d3a13597251ac293d9fb96c5d9feb8997cb Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com> AuthorDate: Tue Jan 24 10:46:17 2023 +0000 Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org> CommitDate: Thu Jan 26 11:10:52 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8bb2d3a
sci-physics/geant4_vmc: drop 5.4, 6.0-r1, 6.1 Closes: https://github.com/gentoo/gentoo/pull/29244 Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com> Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org> sci-physics/geant4_vmc/Manifest | 3 - .../files/geant4_vmc-6.0-cmake-g4root-tests.patch | 31 -------- .../files/geant4_vmc-6.0-geant-4.11.0.1-fix.patch | 33 --------- sci-physics/geant4_vmc/geant4_vmc-5.4.ebuild | 82 --------------------- sci-physics/geant4_vmc/geant4_vmc-6.0-r1.ebuild | 86 ---------------------- sci-physics/geant4_vmc/geant4_vmc-6.1.ebuild | 79 -------------------- sci-physics/geant4_vmc/metadata.xml | 1 - 7 files changed, 315 deletions(-) diff --git a/sci-physics/geant4_vmc/Manifest b/sci-physics/geant4_vmc/Manifest index 4678b54e61dd..2247d3b867c6 100644 --- a/sci-physics/geant4_vmc/Manifest +++ b/sci-physics/geant4_vmc/Manifest @@ -1,6 +1,3 @@ -DIST geant4_vmc-5.4.tar.gz 7363185 BLAKE2B 3f1738a6d99d7cad1df1249a086b5257ff1d9c5c23657e12720b2d75ed61a96d6e45f2c964c471ba093d1c70fffb5b3df5a0d15fd7bdd54ab78a8f225649f0a1 SHA512 26b53c4b3a10943b9a5aa970dfc8c09b4086a385c6fea2a914bf8b020044032f9b73df7fd054185eba86f66ba50cd86372d0e874c0642bb3e357fba499fd7675 -DIST geant4_vmc-6.0.tar.gz 5649857 BLAKE2B 905ee76a579e25ee6259aafe978b0f202313ae6ce7f62e424c663e5a22f3c77e9a2eb3a4d807515267087c9e95aebb962927728da8110248136d69bcb8b1fc56 SHA512 ee21ec2d493d4ef227b294818ca0e6940c437e069197009f4bfab0fa1c282b4ad0dc5744157077ccb3b8953c4a167492571a56f68def2152730bcb79892f56fc -DIST geant4_vmc-6.1.tar.gz 5604048 BLAKE2B 74d8e7fd20f9abd0205ccb3913180380b8862fef604b563ffde036a27f387887e1bf9ddf1c33fcb530e328c0dc5db42c51eac16097d94861326ec1a4c4ad3eed SHA512 6a9fd1c2b74e57ca5552c2bdb02a568916568da662eba29947f746c27c07a779e69b24315afd9cb9e8eda83b14eb53d351f3494cbe6fefb951eaf85888b0b1be DIST geant4_vmc-6.1_p2.tar.gz 5606450 BLAKE2B 943398e4cf9a8f4d6e44687f89eff6e6f09e4904b8a57684e202719162d861d5b370c1fc9bcf40de43aa607cfa89db1d1a740046a1ad9744ba2c538dbc8103f8 SHA512 97f825a32958d7da8d4086e87397c358b0331ac8f6630b83c1a8142f02be21093bed65c0841a24c0db5548adb611f52f2c5e05e92f39a67f13c70d76f901d47e DIST geant4_vmc-6.1_p3.tar.gz 5605174 BLAKE2B 80d7936534d4102b545a4285b8ddba4eb7c9ec31b1343194da922a6c79730c1f779cc9719b1d2e5b4bcf02a681c371157057d727c5fa86633e6c7497d64206e0 SHA512 ccb568c2ce004300c7c6ad908aa8d97319f3c0d4add0da3ace418231906cf91ef9f73b5c774fbadd6e4473dcc1b49071023d7fa159b5864f03b28dae407074c6 DIST geant4_vmc-6.2.tar.gz 5743487 BLAKE2B 062fece07714f255eddd13c6bda660ea6737772fe7a43413df07c9ed221c0f80a872fe72614e5e4ad18396c72aae2c2000cdf6e3b1c2436f9419933ac32704bb SHA512 72651ab5261a398feb6f37271a41a5770334a20dc61be2046b19ca8ff4780cf7649136314e4a8597023d14782996d7ee0d047579b33a983c4dea9c21b32b4551 diff --git a/sci-physics/geant4_vmc/files/geant4_vmc-6.0-cmake-g4root-tests.patch b/sci-physics/geant4_vmc/files/geant4_vmc-6.0-cmake-g4root-tests.patch deleted file mode 100644 index 5f561dc64c88..000000000000 --- a/sci-physics/geant4_vmc/files/geant4_vmc-6.0-cmake-g4root-tests.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5d25b7fd6d53b620b25bed3a72d739d1644b5731 Mon Sep 17 00:00:00 2001 -From: Oliver Freyermuth <[email protected]> -Date: Fri, 11 Feb 2022 17:22:13 +0100 -Subject: [PATCH] CMake: Fix G4Root_BUILD_TEST option in main CMakeLists. - -The option was not correctly inherited for use by the g4root -subdirectory. Fixed by: -- Setting it before add_subdirectory(). -- Storing the value in CACHE (otherwise, not seen in subdirectory). - -Pull Request: https://github.com/vmc-project/geant4_vmc/pull/28 -Bug: https://bugs.gentoo.org/833126 ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -60,8 +60,8 @@ include(VMCInstallLibDir) - #--- Add the packages sources -------------------------------------------------- - # - if(Geant4VMC_BUILD_G4Root) -+ set(G4Root_BUILD_TEST ${Geant4VMC_BUILD_G4Root_TEST} CACHE BOOL "Build G4Root test") - add_subdirectory(g4root) -- set(G4Root_BUILD_TEST ${Geant4VMC_BUILD_G4Root_TEST}) - endif(Geant4VMC_BUILD_G4Root) - - if(Geant4VMC_BUILD_Geant4VMC) --- -2.34.1 - diff --git a/sci-physics/geant4_vmc/files/geant4_vmc-6.0-geant-4.11.0.1-fix.patch b/sci-physics/geant4_vmc/files/geant4_vmc-6.0-geant-4.11.0.1-fix.patch deleted file mode 100644 index 64e55fccc186..000000000000 --- a/sci-physics/geant4_vmc/files/geant4_vmc-6.0-geant-4.11.0.1-fix.patch +++ /dev/null @@ -1,33 +0,0 @@ -From fad0699c25b864e1ce2466c3c683007af5c350ad Mon Sep 17 00:00:00 2001 -From: Ivana Hrivnacova <[email protected]> -Date: Wed, 9 Mar 2022 18:03:18 +0100 -Subject: [PATCH] Fix compilation with Geant4 11.0.p1: (#30) - -Added missing test for G4VERSION_NUMBER in TG4RunManager.cxx ---- - source/run/src/TG4RunManager.cxx | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/source/run/src/TG4RunManager.cxx b/source/run/src/TG4RunManager.cxx -index 64a45f0e0..5190172b0 100644 ---- a/source/run/src/TG4RunManager.cxx -+++ b/source/run/src/TG4RunManager.cxx -@@ -47,6 +47,7 @@ - #include <G4UIExecutive.hh> - #include <G4UImanager.hh> - #include <G4UIsession.hh> -+#include <G4Version.hh> - #include <Randomize.hh> - - #ifdef USE_G4ROOT -@@ -405,8 +406,10 @@ void TG4RunManager::Initialize() - // create G4RunManager - // ConfigureRunManager(); - -+#if G4VERSION_NUMBER == 1100 - // Temporary work-around for bug in Cerenkov in Geant4 11.0 - TG4PhysicsManager::Instance()->StoreCerenkovMaxBetaChangeValue(); -+#endif - - // initialize Geant4 - fRunManager->Initialize(); diff --git a/sci-physics/geant4_vmc/geant4_vmc-5.4.ebuild b/sci-physics/geant4_vmc/geant4_vmc-5.4.ebuild deleted file mode 100644 index a86aa91a1e02..000000000000 --- a/sci-physics/geant4_vmc/geant4_vmc-5.4.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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" - S="${WORKDIR}/${PN}-${MY_PV}" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Virtual Monte Carlo Geant4 implementation" -HOMEPAGE="https://github.com/vmc-project/geant4_vmc"; - -LICENSE="GPL-3" -SLOT="4" -IUSE="doc examples geant3 +g4root +mtroot vgm test" - -RDEPEND=" - <sci-physics/geant-4.11[c++17,opengl,geant3?] - sci-physics/root:=[c++17,-vmc(-)] - <sci-physics/vmc-2.0:=[c++17] - vgm? ( sci-physics/vgm:= )" -DEPEND="${RDEPEND}" -BDEPEND="doc? ( app-doc/doxygen[dot] )" -RESTRICT=" - !examples? ( test ) - !geant3? ( test ) - !g4root? ( test ) - !mtroot? ( test ) - !test? ( test ) - !vgm? ( test )" - -DOCS=(history README.md) - -src_configure() { - local mycmakeargs=( - -DGeant4VMC_USE_VGM="$(usex vgm)" - -DGeant4VMC_USE_GEANT4_G3TOG4="$(usex geant3)" - -DGeant4VMC_USE_G4Root="$(usex g4root)" - -DGeant4VMC_BUILD_MTRoot="$(usex mtroot)" - -DGeant4VMC_BUILD_EXAMPLES="$(usex test)" - -DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)" - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - if use doc ; then - local dirs=( - source - $(usev g4root) - $(usev mtroot) - $(usev examples) - ) - local d - for d in "${dirs[@]}"; do - pushd "${d}" > /dev/null || die - doxygen || die - popd > /dev/null || die - done - fi -} - -src_test() { - cd examples || die - ./test_suite.sh --debug --g3=off --garfield=off --builddir="${BUILD_DIR}" || die - ./test_suite_exe.sh --g3=off --garfield=off --garfield=off --builddir="${BUILD_DIR}" || die -} - -src_install() { - cmake_src_install - use doc && local HTML_DOCS=(doc/.) - einstalldocs -} diff --git a/sci-physics/geant4_vmc/geant4_vmc-6.0-r1.ebuild b/sci-physics/geant4_vmc/geant4_vmc-6.0-r1.ebuild deleted file mode 100644 index b26b9b111f8a..000000000000 --- a/sci-physics/geant4_vmc/geant4_vmc-6.0-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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" - S="${WORKDIR}/${PN}-${MY_PV}" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Virtual Monte Carlo Geant4 implementation" -HOMEPAGE="https://github.com/vmc-project/geant4_vmc"; - -LICENSE="GPL-3" -SLOT="4" -IUSE="doc examples geant3 +g4root vgm test" - -RDEPEND=" - >=sci-physics/geant-4.11[c++17,opengl,geant3?] - sci-physics/root:=[c++17,-vmc(-)] - >=sci-physics/vmc-2.0:=[c++17] - vgm? ( sci-physics/vgm:= )" -DEPEND="${RDEPEND} - test? ( >=sci-physics/geant-4.11[gdml] )" -BDEPEND="doc? ( app-doc/doxygen[dot] )" -RESTRICT=" - !examples? ( test ) - !geant3? ( test ) - !g4root? ( test ) - !test? ( test ) - !vgm? ( test )" - -DOCS=(history README.md) - -PATCHES=( - "${FILESDIR}"/${PN}-6.0-cmake-g4root-tests.patch - "${FILESDIR}"/${PN}-6.0-geant-4.11.0.1-fix.patch -) - -src_configure() { - local mycmakeargs=( - -DGeant4VMC_USE_VGM="$(usex vgm)" - -DGeant4VMC_USE_GEANT4_G3TOG4="$(usex geant3)" - -DGeant4VMC_USE_G4Root="$(usex g4root)" - -DGeant4VMC_BUILD_EXAMPLES="$(usex test)" - -DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)" - -DGeant4VMC_BUILD_G4Root_TEST="$(usex test)" - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - if use doc ; then - local dirs=( - source - $(usev g4root) - $(usev examples) - ) - local d - for d in "${dirs[@]}"; do - pushd "${d}" > /dev/null || die - doxygen || die - popd > /dev/null || die - done - fi -} - -src_test() { - cd examples || die - ./test_suite.sh --debug --g3=off --garfield=off --builddir="${BUILD_DIR}" || die - ./test_suite_exe.sh --g3=off --garfield=off --garfield=off --builddir="${BUILD_DIR}" || die -} - -src_install() { - cmake_src_install - use doc && local HTML_DOCS=(doc/.) - einstalldocs -} diff --git a/sci-physics/geant4_vmc/geant4_vmc-6.1.ebuild b/sci-physics/geant4_vmc/geant4_vmc-6.1.ebuild deleted file mode 100644 index 99ae522be943..000000000000 --- a/sci-physics/geant4_vmc/geant4_vmc-6.1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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" - S="${WORKDIR}/${PN}-${MY_PV}" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Virtual Monte Carlo Geant4 implementation" -HOMEPAGE="https://github.com/vmc-project/geant4_vmc"; - -LICENSE="GPL-3" -SLOT="4" -IUSE="doc examples geant3 +g4root vgm test" - -RDEPEND=" - >=sci-physics/geant-4.11[c++17,opengl,geant3?] - sci-physics/root:=[c++17,-vmc(-)] - >=sci-physics/vmc-2.0:=[c++17] - vgm? ( sci-physics/vgm:= )" -DEPEND="${RDEPEND} - test? ( >=sci-physics/geant-4.11[gdml] )" -BDEPEND="doc? ( app-doc/doxygen[dot] )" -RESTRICT=" - !examples? ( test ) - !geant3? ( test ) - !g4root? ( test ) - !test? ( test ) - !vgm? ( test )" - -DOCS=(history README.md) - -src_configure() { - local mycmakeargs=( - -DGeant4VMC_USE_VGM="$(usex vgm)" - -DGeant4VMC_USE_GEANT4_G3TOG4="$(usex geant3)" - -DGeant4VMC_USE_G4Root="$(usex g4root)" - -DGeant4VMC_BUILD_EXAMPLES="$(usex test)" - -DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)" - -DGeant4VMC_BUILD_G4Root_TEST="$(usex test)" - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - if use doc ; then - local dirs=( - source - $(usev g4root) - $(usev examples) - ) - local d - for d in "${dirs[@]}"; do - doxygen "${d}"/Doxyfile || die - done - fi -} - -src_test() { - cd examples || die - ./test_suite.sh --debug --g3=off --garfield=off --builddir="${BUILD_DIR}" || die - ./test_suite_exe.sh --g3=off --garfield=off --garfield=off --builddir="${BUILD_DIR}" || die -} - -src_install() { - cmake_src_install - use doc && local HTML_DOCS=(doc/.) - einstalldocs -} diff --git a/sci-physics/geant4_vmc/metadata.xml b/sci-physics/geant4_vmc/metadata.xml index ec868275882a..ea62582fcde8 100644 --- a/sci-physics/geant4_vmc/metadata.xml +++ b/sci-physics/geant4_vmc/metadata.xml @@ -20,6 +20,5 @@ <flag name="vgm">Enable the Virtual Geometry Model (<pkg>sci-physics/vgm</pkg>)</flag> <flag name="g4root">Build G4Root (interface for GEANT4 simulation with a ROOT geometry)</flag> <flag name="geant3">Build with Geant4 G3toG4 library</flag> - <flag name="mtroot">Build MTRoot (provides ROOT IO manager classes with multi-threading support)</flag> </use> </pkgmetadata>
