summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-physics/vgm')
-rw-r--r--sci-physics/vgm/Manifest3
-rw-r--r--sci-physics/vgm/files/vgm-copy-test-seed.patch14
-rw-r--r--sci-physics/vgm/vgm-4.9-r1.ebuild88
-rw-r--r--sci-physics/vgm/vgm-5.2-r1.ebuild (renamed from sci-physics/vgm/vgm-5.0.ebuild)15
-rw-r--r--sci-physics/vgm/vgm-9999.ebuild15
5 files changed, 15 insertions, 120 deletions
diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest
index 07163b3d4018..72b367706d35 100644
--- a/sci-physics/vgm/Manifest
+++ b/sci-physics/vgm/Manifest
@@ -1,2 +1 @@
-DIST vgm-4.9.tar.gz 3881029 BLAKE2B 596a8df12f0dcd813a0d84e8c33eaa92dd2d332d9accf2fc38992f385748a2bd3579fee2af6cc00b878fe5491af4996d80775aa630120507ccc665f102f63b11 SHA512 90845d75a7ff0022f5fba15b7f621efd588251060c0d8e715fcc2e28bb6b4b01ddd83420dbd233cc0dd437ee6b8b5390bb1f84571ed12e696ee8c1dfc4bd8fd9
-DIST vgm-5.0.tar.gz 3862583 BLAKE2B 7a1643b329f6f6b019e1b68ce691ed45a32d343925c59451d6e218469606a7a352334d4f1e330873fa1cbc4e1182b4557dc396f52ce7d35e26df81e79121cd60 SHA512 771c2e013c052ea1785fb79ba317b48482428ddf703e263eaf1c9840fbae66dd280d73aee99de30e1c3d70e46a5eb63affc92dfc5ba19298e2d4487b9e302588
+DIST vgm-5.2.tar.gz 3963607 BLAKE2B 6b82f0ac8fa345e4a736d38c2e961f04836c943445fa2dbe52e48dcc378826a4aa7e1ea1af74ae097288121e52549d599e434da30bfd2b46c35b177ef42dae14 SHA512 f141215bf67684d41acb3ae3551e0c8b643033fca841d924030eedc18136e94d75efd8940b43eaca2640470c78331fff36957173e98c7f8a1cccc6325abbf870
diff --git a/sci-physics/vgm/files/vgm-copy-test-seed.patch b/sci-physics/vgm/files/vgm-copy-test-seed.patch
deleted file mode 100644
index 31dcebdccde2..000000000000
--- a/sci-physics/vgm/files/vgm-copy-test-seed.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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/vgm-4.9-r1.ebuild b/sci-physics/vgm/vgm-4.9-r1.ebuild
deleted file mode 100644
index 16ffe2e9ae28..000000000000
--- a/sci-physics/vgm/vgm-4.9-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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="https://github.com/vmc-project/vgm/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc examples +geant4 +root test"
-
-RDEPEND="
- sci-physics/clhep:=
- geant4? ( <sci-physics/geant-4.11[c++17] )
- root? ( sci-physics/root:=[c++17] )"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen[dot] )
- test? (
- <sci-physics/geant-4.11[gdml]
- sci-physics/geant4_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-5.0.ebuild b/sci-physics/vgm/vgm-5.2-r1.ebuild
index d58370b67b04..6e5f9a755e9c 100644
--- a/sci-physics/vgm/vgm-5.0.ebuild
+++ b/sci-physics/vgm/vgm-5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -24,14 +24,16 @@ IUSE="doc examples +geant4 +root test"
RDEPEND="
sci-physics/clhep:=
- geant4? ( >=sci-physics/geant-4.11[c++17] )
- root? ( sci-physics/root:=[c++17] )"
+ geant4? ( >=sci-physics/geant-4.11:= )
+ root? ( sci-physics/root:= )"
DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen[dot] )
test? (
- >=sci-physics/geant-4.11[gdml]
+ >=sci-physics/geant-4.11:=[gdml]
sci-physics/geant4_vmc[g4root]
)"
+BDEPEND="
+ doc? ( app-text/doxygen[dot] )
+"
RESTRICT="
!geant4? ( test )
!root? ( test )
@@ -41,7 +43,6 @@ RESTRICT="
DOCS=(
doc/README
doc/VGMhistory.txt
- doc/todo.txt
)
src_configure() {
@@ -70,8 +71,6 @@ src_compile() {
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
}
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index fdf095918a01..e4057960f78c 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -24,14 +24,16 @@ IUSE="doc examples +geant4 +root test"
RDEPEND="
sci-physics/clhep:=
- geant4? ( sci-physics/geant[c++17] )
- root? ( sci-physics/root:=[c++17] )"
+ geant4? ( sci-physics/geant:= )
+ root? ( sci-physics/root:= )"
DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen[dot] )
test? (
- sci-physics/geant[gdml]
+ sci-physics/geant:=[gdml]
sci-physics/geant4_vmc[g4root]
)"
+BDEPEND="
+ doc? ( app-text/doxygen[dot] )
+"
RESTRICT="
!geant4? ( test )
!root? ( test )
@@ -41,7 +43,6 @@ RESTRICT="
DOCS=(
doc/README
doc/VGMhistory.txt
- doc/todo.txt
)
src_configure() {
@@ -70,8 +71,6 @@ src_compile() {
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
}