commit: eb9db4c814d220be76f3ef11a5d69849ddb21ce7 Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com> AuthorDate: Thu Jan 21 08:22:57 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Thu Jan 21 08:26:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb9db4c8
sci-physics/vgm: Bump to version 4.9. This also fixes issues with the test suite in the live ebuild. Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com> Closes: https://github.com/gentoo/gentoo/pull/18966 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> sci-physics/vgm/Manifest | 1 + sci-physics/vgm/files/vgm-copy-test-seed.patch | 14 ++++++++++++++ sci-physics/vgm/{vgm-9999.ebuild => vgm-4.9.ebuild} | 12 +++++++++--- sci-physics/vgm/vgm-9999.ebuild | 9 ++++++--- 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest index 717f6f9163e..b03b99d0fe0 100644 --- a/sci-physics/vgm/Manifest +++ b/sci-physics/vgm/Manifest @@ -1 +1,2 @@ DIST vgm-4.8.tar.gz 3661965 BLAKE2B 29f878fb6716e261c27d60b2c9081d66313591a053d80f78501973f131aff88bbcee743ff9767836883dcb28d3ce5aeee3759a5890d7c8811a6a61503417284f SHA512 8b7cabc5796649c4014ccbdf1c6d209d2e7c2b4b06258716a72cadd997a9f6f51c4f9cb5870fd10abfd1ee133766876523c84441a69c7242bc2002687ca0ce58 +DIST vgm-4.9.tar.gz 3881029 BLAKE2B 596a8df12f0dcd813a0d84e8c33eaa92dd2d332d9accf2fc38992f385748a2bd3579fee2af6cc00b878fe5491af4996d80775aa630120507ccc665f102f63b11 SHA512 90845d75a7ff0022f5fba15b7f621efd588251060c0d8e715fcc2e28bb6b4b01ddd83420dbd233cc0dd437ee6b8b5390bb1f84571ed12e696ee8c1dfc4bd8fd9 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 00000000000..31dcebdccde --- /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/vgm-9999.ebuild b/sci-physics/vgm/vgm-4.9.ebuild similarity index 84% copy from sci-physics/vgm/vgm-9999.ebuild copy to sci-physics/vgm/vgm-4.9.ebuild index 659728a149e..c592bb49c34 100644 --- a/sci-physics/vgm/vgm-9999.ebuild +++ b/sci-physics/vgm/vgm-4.9.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 @@ -38,7 +38,8 @@ DEPEND="${RDEPEND} RESTRICT=" !geant4? ( test ) !root? ( test ) - !test? ( test )" + !test? ( test ) + !examples? ( test )" DOCS=( doc/README @@ -47,6 +48,9 @@ DOCS=( doc/VGM.html doc/VGMversions.html ) +PATCHES=( + "${FILESDIR}"/"${PN}-copy-test-seed.patch" +) src_configure() { local mycmakeargs=( @@ -75,7 +79,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() { diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild index 659728a149e..e2d9d75a4f6 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 @@ -38,7 +38,8 @@ DEPEND="${RDEPEND} RESTRICT=" !geant4? ( test ) !root? ( test ) - !test? ( test )" + !test? ( test ) + !examples? ( test )" DOCS=( doc/README @@ -75,7 +76,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() {
