* [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant-vmc/, sci-physics/geant-vmc/files/
@ 2019-07-18 16:12 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2019-07-18 16:12 UTC (permalink / raw
To: gentoo-commits
commit: be4fc9f3afbd40da068325ca6d1334a3626797d4
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Thu Jul 18 15:17:42 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 15:45:48 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be4fc9f3
sci-physics/geant-vmc: Add patch to honour cflags.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Closes: https://github.com/gentoo/gentoo/pull/12451
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../geant-vmc/files/geant-vmc-4.4.0-fix-cflags.patch | 15 +++++++++++++++
sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild | 3 +++
2 files changed, 18 insertions(+)
diff --git a/sci-physics/geant-vmc/files/geant-vmc-4.4.0-fix-cflags.patch b/sci-physics/geant-vmc/files/geant-vmc-4.4.0-fix-cflags.patch
new file mode 100644
index 00000000000..d3bf0dfdd30
--- /dev/null
+++ b/sci-physics/geant-vmc/files/geant-vmc-4.4.0-fix-cflags.patch
@@ -0,0 +1,15 @@
+diff --git a/g4root/test/OpNovice/CMakeLists.txt b/g4root/test/OpNovice/CMakeLists.txt
+index 1a8f316c..a2e144b6 100644
+--- a/g4root/test/OpNovice/CMakeLists.txt
++++ b/g4root/test/OpNovice/CMakeLists.txt
+@@ -44,7 +44,9 @@ endif()
+ #----------------------------------------------------------------------------
+ # Setup Geant4 include directories and compile definitions
+ #
+-include(${Geant4_USE_FILE})
++# Workaround for upstream bug: http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1663
++#include(${Geant4_USE_FILE})
++include(UseGeant4)
+
+ #----------------------------------------------------------------------------
+ # Locate sources and headers for this project
diff --git a/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild b/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
index 83c2f0b1204..0f091fe6412 100644
--- a/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
@@ -42,6 +42,9 @@ DOCS=(
history
README.md
)
+PATCHES=(
+ "${FILESDIR}"/"${PN}-${PV}"-fix-cflags.patch
+)
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant-vmc/, sci-physics/geant-vmc/files/
@ 2021-01-17 10:16 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2021-01-17 10:16 UTC (permalink / raw
To: gentoo-commits
commit: 5fcfbfd003afe1c5ccb2bb5f77f0446c382f86d6
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Sun Dec 20 16:33:15 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 10:16:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fcfbfd0
sci-physics/geant-vmc: Drop oldest version.
This also gets rid of the last patch.
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Closes: https://github.com/gentoo/gentoo/pull/18736
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-physics/geant-vmc/Manifest | 1 -
.../files/geant-vmc-4.4.0-fix-cflags.patch | 15 ----
sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild | 96 ----------------------
3 files changed, 112 deletions(-)
diff --git a/sci-physics/geant-vmc/Manifest b/sci-physics/geant-vmc/Manifest
index d68add146ca..016c1ffe961 100644
--- a/sci-physics/geant-vmc/Manifest
+++ b/sci-physics/geant-vmc/Manifest
@@ -1,3 +1,2 @@
DIST geant-vmc-4.5.1_p1.tar.gz 7441504 BLAKE2B 2bcb844a8fc79c800eec50f914cd7238a68ba0c1ffa1e8d185adcded70583118e39efbac3330f7942a098fc64f990c1e9e0eeb1796f71ebd98f97d121aa6c121 SHA512 760611c1df481ea3d9f9069061678677ffc2bcf9edd7cfd44789a6359b945bc341f705da0ee85ecda7f8ac2b096cd5b7aa9ea2c44b464e3085c16eeb33ee1316
DIST geant-vmc-4.5.3.tar.gz 7411643 BLAKE2B 31a486aa32f879093753aab09798eabf1a936f0aa246bb97c7f055eefb789c9c5a5097c14ce47b05a99f3cc2b46bea6edeba2af80ee362bb8fee039ee711eddc SHA512 918ce3ca4a4fb329f00000fce00dae3d4a4c9f348553f31bf474f727c1e67242b5ff28fe7dc5d3ab12d1174663b1dd96b654b5baf7edfa662ab3f66687792e94
-DIST geant4_vmc.4.0.tar.gz 7118838 BLAKE2B 5edbd13adeeb560188deb54c1f5d52fda371dd5f3dc04d676bcaf7edad0bbf8eb573d6345e5c3626b5b64c229d49b7f02aafec77a2587e525cf3f407444391b5 SHA512 faf5fed17b317399b97f77ff1c2a1bf1cead8f0b02a3a89244f01f8ae04ce621763e52b40000e481b3826796bb4d94216368d2e3c98a62f02048c5979f4ee648
diff --git a/sci-physics/geant-vmc/files/geant-vmc-4.4.0-fix-cflags.patch b/sci-physics/geant-vmc/files/geant-vmc-4.4.0-fix-cflags.patch
deleted file mode 100644
index d3bf0dfdd30..00000000000
--- a/sci-physics/geant-vmc/files/geant-vmc-4.4.0-fix-cflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/g4root/test/OpNovice/CMakeLists.txt b/g4root/test/OpNovice/CMakeLists.txt
-index 1a8f316c..a2e144b6 100644
---- a/g4root/test/OpNovice/CMakeLists.txt
-+++ b/g4root/test/OpNovice/CMakeLists.txt
-@@ -44,7 +44,9 @@ endif()
- #----------------------------------------------------------------------------
- # Setup Geant4 include directories and compile definitions
- #
--include(${Geant4_USE_FILE})
-+# Workaround for upstream bug: http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1663
-+#include(${Geant4_USE_FILE})
-+include(UseGeant4)
-
- #----------------------------------------------------------------------------
- # Locate sources and headers for this project
diff --git a/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild b/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
deleted file mode 100644
index fb2e982ebfd..00000000000
--- a/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2019 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/geant4_vmc.git"
-else
- DOWN_PV=$(ver_cut 2-)
- SRC_URI="http://root.cern.ch/download/vmc/geant4_vmc.${DOWN_PV}.tar.gz"
- SOURCE_PV=$(ver_rs 1- . ${DOWN_PV})
- S="${WORKDIR}/geant4_vmc.${SOURCE_PV}"
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Virtual Monte Carlo Geant4 implementation"
-HOMEPAGE="http://root.cern.ch/root/vmc/VirtualMC.html"
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="doc examples geant3 +g4root +mtroot vgm test"
-
-# sci-physics/root[c++11] required to match sci-physics/geant flags.
-RDEPEND="
- >=sci-physics/geant-4.10.03:=[opengl,geant3?]
- sci-physics/root:=[c++11,vmc]
- vgm? ( >=sci-physics/vgm-4.4:= )"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )"
-RESTRICT="
- !examples? ( test )
- !geant3? ( test )
- !g4root? ( test )
- !mtroot? ( test )
- !test? ( test )
- !vgm? ( test )"
-
-DOCS=(
- history
- README.md
-)
-PATCHES=(
- "${FILESDIR}"/"${PN}-${PV}"-fix-cflags.patch
-)
-
-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() {
- # Required by sci-physics/root for pointer validity checking,
- # see e.g. https://sft.its.cern.ch/jira/browse/ROOT-8146 .
- addwrite /dev/random
- cd examples || die
- # Bug: Can not disable Garfield in test suite, fixed upstream.
- sed -i 's/ExGarfield//' test_suite.sh || die
- # Bug: Path for E03 sub-examples wrong, see https://github.com/vmc-project/geant4_vmc/pull/11 .
- sed -i 's#only in E03 test#only in E03 test\nG4EXEDIR=${BUILDDIR}/examples/$EXAMPLE/$OPTION#' test_suite_exe.sh || die
- ./test_suite.sh --g3=off --builddir="${BUILD_DIR}" || die
- ./test_suite_exe.sh --g3=off --garfield=off --builddir="${BUILD_DIR}" || die
-}
-
-src_install() {
- cmake_src_install
- use doc && local HTML_DOCS=(doc/.)
- einstalldocs
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-17 10:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-17 10:16 [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant-vmc/, sci-physics/geant-vmc/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2019-07-18 16:12 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox