* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/
@ 2018-02-20 20:43 Patrice Clement
0 siblings, 0 replies; 25+ messages in thread
From: Patrice Clement @ 2018-02-20 20:43 UTC (permalink / raw
To: gentoo-commits
commit: 44e267976acad350dd75b6f7e878135baf2a2c1f
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Sun Jan 21 16:35:20 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Feb 20 20:43:05 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44e26797
sci-physics/vgm: new package.
VGM (Virtual Geometry Model) is a geometry conversion tool, actually providing
conversion between Geant4 and ROOT TGeo geometry models.
Package-Manager: Portage-2.3.20, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/6922
sci-physics/vgm/Manifest | 1 +
sci-physics/vgm/metadata.xml | 24 ++++++++++++++
sci-physics/vgm/vgm-4.4.ebuild | 73 +++++++++++++++++++++++++++++++++++++++++
sci-physics/vgm/vgm-9999.ebuild | 73 +++++++++++++++++++++++++++++++++++++++++
4 files changed, 171 insertions(+)
diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest
new file mode 100644
index 00000000000..ea44ee2059a
--- /dev/null
+++ b/sci-physics/vgm/Manifest
@@ -0,0 +1 @@
+DIST vgm.4.4.tar.gz 3064087 BLAKE2B 845d04fa3ebaaa07f90ef7f216cac10e5ca4129ebbd6161e3fecce39663379b2575026186fe2b88ae8bf08f71bed6d8afcbbd5d7aa9922d37b3f9ed900d35a33 SHA512 500ae0e2ac66b580bbc26b6cd1a8bd6d6e3127c99e6fe6babe5825406e576d72da5cd76d22d0d1b82d7df9eb74ddddf084ee9a96b544c97af5b12cbf948d3406
diff --git a/sci-physics/vgm/metadata.xml b/sci-physics/vgm/metadata.xml
new file mode 100644
index 00000000000..cd1e3ea3587
--- /dev/null
+++ b/sci-physics/vgm/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>o.freyermuth@googlemail.com</email>
+ <name>Oliver Freyermuth</name>
+ <description>Proxy-maintainer, assign bugs</description>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription lang="en">
+ The Virtual Geometry Model (VGM) is an
+ abstraction layer between the Geant4 and ROOT software.
+ </longdescription>
+ <use>
+ <flag name="geant4">Enable interaction with Geant4(<pkg>sci-physics/geant</pkg>:4)</flag>
+ <flag name="root">Enable interaction with ROOT (<pkg>sci-physics/root</pkg>)</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">vmc-project/vgm</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-physics/vgm/vgm-4.4.ebuild b/sci-physics/vgm/vgm-4.4.ebuild
new file mode 100644
index 00000000000..c7202c3244e
--- /dev/null
+++ b/sci-physics/vgm/vgm-4.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils versionator
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
+else
+ SRC_URI="http://ivana.home.cern.ch/ivana/${PN}.${PV}.tar.gz"
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+ S="${WORKDIR}/${PN}.${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"
+
+RDEPEND="
+ sci-physics/clhep:=
+ root? ( sci-physics/root:= )
+ geant4? ( >=sci-physics/geant-4.10.03 )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen[dot] )"
+
+DOCS=(
+ doc/README
+ doc/todo.txt
+ doc/VGMhistory.txt
+ doc/VGM.html
+ doc/VGMversions.html
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DCLHEP_DIR="${EROOT}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-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_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-utils_src_install
+ use doc && local HTML_DOCS=( doc/html/. )
+ einstalldocs
+}
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
new file mode 100644
index 00000000000..c7202c3244e
--- /dev/null
+++ b/sci-physics/vgm/vgm-9999.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils versionator
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
+else
+ SRC_URI="http://ivana.home.cern.ch/ivana/${PN}.${PV}.tar.gz"
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+ S="${WORKDIR}/${PN}.${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"
+
+RDEPEND="
+ sci-physics/clhep:=
+ root? ( sci-physics/root:= )
+ geant4? ( >=sci-physics/geant-4.10.03 )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen[dot] )"
+
+DOCS=(
+ doc/README
+ doc/todo.txt
+ doc/VGMhistory.txt
+ doc/VGM.html
+ doc/VGMversions.html
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DCLHEP_DIR="${EROOT}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-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_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-utils_src_install
+ use doc && local HTML_DOCS=( doc/html/. )
+ einstalldocs
+}
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/
@ 2018-08-23 12:30 Michał Górny
0 siblings, 0 replies; 25+ messages in thread
From: Michał Górny @ 2018-08-23 12:30 UTC (permalink / raw
To: gentoo-commits
commit: c36653f0c0247dabcbb6289d65b7849412f14807
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Wed Aug 22 17:05:27 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 23 12:30:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c36653f0
sci-physics/vgm: Release 4.4 does not yet support std=c++14.
Package-Manager: Portage-2.3.48, Repoman-2.3.10
Closes: https://github.com/gentoo/gentoo/pull/9668
sci-physics/vgm/vgm-4.4.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sci-physics/vgm/vgm-4.4.ebuild b/sci-physics/vgm/vgm-4.4.ebuild
index ebf37d44fd6..71ee86decf4 100644
--- a/sci-physics/vgm/vgm-4.4.ebuild
+++ b/sci-physics/vgm/vgm-4.4.ebuild
@@ -21,9 +21,10 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="doc examples +geant4 +root test"
+# sci-physics/root[root7] flag activates std=c++14, only supported from VGM >4.4.
RDEPEND="
sci-physics/clhep:=
- root? ( sci-physics/root:= )
+ root? ( sci-physics/root:=[-root7] )
geant4? ( >=sci-physics/geant-4.10.03 )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen[dot] )"
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/
@ 2018-08-23 12:30 Michał Górny
0 siblings, 0 replies; 25+ messages in thread
From: Michał Górny @ 2018-08-23 12:30 UTC (permalink / raw
To: gentoo-commits
commit: b549080ecaecd46fa1d185ffe59096876b0a4bbe
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Wed Aug 22 17:04:43 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 23 12:30:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b549080e
sci-physics/vgm: Restrict test-suite to what upstream supports.
Also, drop unused versionator inheritance.
Package-Manager: Portage-2.3.48, Repoman-2.3.10
sci-physics/vgm/vgm-4.4.ebuild | 5 ++++-
sci-physics/vgm/vgm-9999.ebuild | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/sci-physics/vgm/vgm-4.4.ebuild b/sci-physics/vgm/vgm-4.4.ebuild
index c7202c3244e..ebf37d44fd6 100644
--- a/sci-physics/vgm/vgm-4.4.ebuild
+++ b/sci-physics/vgm/vgm-4.4.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit cmake-utils versionator
+inherit cmake-utils
if [[ ${PV} == *9999* ]]; then
inherit git-r3
@@ -27,6 +27,9 @@ RDEPEND="
geant4? ( >=sci-physics/geant-4.10.03 )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen[dot] )"
+RESTRICT="
+ !geant4? ( test )
+ !root? ( test )"
DOCS=(
doc/README
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index c7202c3244e..ebf37d44fd6 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit cmake-utils versionator
+inherit cmake-utils
if [[ ${PV} == *9999* ]]; then
inherit git-r3
@@ -27,6 +27,9 @@ RDEPEND="
geant4? ( >=sci-physics/geant-4.10.03 )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen[dot] )"
+RESTRICT="
+ !geant4? ( test )
+ !root? ( test )"
DOCS=(
doc/README
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/
@ 2018-08-24 6:01 Michał Górny
0 siblings, 0 replies; 25+ messages in thread
From: Michał Górny @ 2018-08-24 6:01 UTC (permalink / raw
To: gentoo-commits
commit: c737484eafc3f6905c1b70f8757c5606fa28a6cb
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Thu Aug 23 15:38:03 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Aug 24 06:01:46 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c737484e
sci-physics/vgm: Add missing dependency for test.
Package-Manager: Portage-2.3.48, Repoman-2.3.10
Closes: https://github.com/gentoo/gentoo/pull/9677
sci-physics/vgm/vgm-4.4.ebuild | 6 ++++--
sci-physics/vgm/vgm-9999.ebuild | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/sci-physics/vgm/vgm-4.4.ebuild b/sci-physics/vgm/vgm-4.4.ebuild
index 71ee86decf4..831f0cc0c4a 100644
--- a/sci-physics/vgm/vgm-4.4.ebuild
+++ b/sci-physics/vgm/vgm-4.4.ebuild
@@ -27,10 +27,12 @@ RDEPEND="
root? ( sci-physics/root:=[-root7] )
geant4? ( >=sci-physics/geant-4.10.03 )"
DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen[dot] )"
+ doc? ( app-doc/doxygen[dot] )
+ test? ( sci-physics/geant-vmc[g4root] )"
RESTRICT="
!geant4? ( test )
- !root? ( test )"
+ !root? ( test )
+ !test? ( test )"
DOCS=(
doc/README
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index ebf37d44fd6..b303e23a06c 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.ebuild
@@ -26,10 +26,12 @@ RDEPEND="
root? ( sci-physics/root:= )
geant4? ( >=sci-physics/geant-4.10.03 )"
DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen[dot] )"
+ doc? ( app-doc/doxygen[dot] )
+ test? ( sci-physics/geant-vmc[g4root] )"
RESTRICT="
!geant4? ( test )
- !root? ( test )"
+ !root? ( test )
+ !test? ( test )"
DOCS=(
doc/README
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/
@ 2019-07-18 18:00 Michał Górny
0 siblings, 0 replies; 25+ messages in thread
From: Michał Górny @ 2019-07-18 18:00 UTC (permalink / raw
To: gentoo-commits
commit: 674d27c66a39b9483bcf34699f17d4cdcabf1558
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Mon Jul 15 17:50:19 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 18:00:21 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=674d27c6
sci-physics/vgm: Version bump to 4.5.
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/12449
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sci-physics/vgm/Manifest | 1 +
sci-physics/vgm/vgm-4.5.ebuild | 82 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 83 insertions(+)
diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest
index ea44ee2059a..0ff4444fb7a 100644
--- a/sci-physics/vgm/Manifest
+++ b/sci-physics/vgm/Manifest
@@ -1 +1,2 @@
DIST vgm.4.4.tar.gz 3064087 BLAKE2B 845d04fa3ebaaa07f90ef7f216cac10e5ca4129ebbd6161e3fecce39663379b2575026186fe2b88ae8bf08f71bed6d8afcbbd5d7aa9922d37b3f9ed900d35a33 SHA512 500ae0e2ac66b580bbc26b6cd1a8bd6d6e3127c99e6fe6babe5825406e576d72da5cd76d22d0d1b82d7df9eb74ddddf084ee9a96b544c97af5b12cbf948d3406
+DIST vgm.4.5.tar.gz 9602541 BLAKE2B 183c8ed91546e5421c4f1a873a48285e9d2ab6bf4bb6a7bb7b46ab2c3c80a5dfc50cd5f97890c3994ada67014067349726e9f4d65cda1e1e4f1ae9484a4249ef SHA512 a873e24ed2c6cfc09d1828b60af9059a0bee341410e5cb77c9312aa72f1650a913779a0ff929d98910f01fcc5a3e6a04b352dd1a780a8bf60b1fa925b1985491
diff --git a/sci-physics/vgm/vgm-4.5.ebuild b/sci-physics/vgm/vgm-4.5.ebuild
new file mode 100644
index 00000000000..7053d1d2a92
--- /dev/null
+++ b/sci-physics/vgm/vgm-4.5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
+else
+ SRC_URI="http://ivana.home.cern.ch/ivana/${PN}.${PV}.tar.gz"
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+ S="${WORKDIR}/${PN}"
+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:=[c++11] )
+ geant4? ( >=sci-physics/geant-4.10.03 )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen[dot] )
+ test? ( 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="${EROOT}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-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_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-utils_src_install
+ use doc && local HTML_DOCS=( doc/html/. )
+ einstalldocs
+}
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/
@ 2019-08-11 11:20 David Seifert
0 siblings, 0 replies; 25+ messages in thread
From: David Seifert @ 2019-08-11 11:20 UTC (permalink / raw
To: gentoo-commits
commit: 8634275eb1987efd8f7886cd0aac3d545db1c6c5
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 11:20:17 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 11:20:17 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8634275e
sci-physics/vgm: [QA] Fix missing trailing slash
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-physics/vgm/vgm-4.4-r1.ebuild | 2 +-
sci-physics/vgm/vgm-4.5.ebuild | 2 +-
sci-physics/vgm/vgm-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sci-physics/vgm/vgm-4.4-r1.ebuild b/sci-physics/vgm/vgm-4.4-r1.ebuild
index 89f9a9ec138..ccda066630d 100644
--- a/sci-physics/vgm/vgm-4.4-r1.ebuild
+++ b/sci-physics/vgm/vgm-4.4-r1.ebuild
@@ -47,7 +47,7 @@ PATCHES=(
src_configure() {
local mycmakeargs=(
- -DCLHEP_DIR="${EROOT}usr"
+ -DCLHEP_DIR="${EPREFIX}/usr"
-DWITH_EXAMPLES="$(usex examples)"
-DINSTALL_EXAMPLES="$(usex examples)"
-DWITH_GEANT4="$(usex geant4)"
diff --git a/sci-physics/vgm/vgm-4.5.ebuild b/sci-physics/vgm/vgm-4.5.ebuild
index 7053d1d2a92..16c08cfb932 100644
--- a/sci-physics/vgm/vgm-4.5.ebuild
+++ b/sci-physics/vgm/vgm-4.5.ebuild
@@ -47,7 +47,7 @@ PATCHES=(
src_configure() {
local mycmakeargs=(
- -DCLHEP_DIR="${EROOT}usr"
+ -DCLHEP_DIR="${EPREFIX}/usr"
-DWITH_EXAMPLES="$(usex examples)"
-DINSTALL_EXAMPLES="$(usex examples)"
-DWITH_GEANT4="$(usex geant4)"
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index 00846ae113b..8443bf3f67a 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.ebuild
@@ -44,7 +44,7 @@ DOCS=(
src_configure() {
local mycmakeargs=(
- -DCLHEP_DIR="${EROOT}usr"
+ -DCLHEP_DIR="${EPREFIX}/usr"
-DWITH_EXAMPLES="$(usex examples)"
-DINSTALL_EXAMPLES="$(usex examples)"
-DWITH_GEANT4="$(usex geant4)"
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/
@ 2020-05-20 12:38 Guilherme Amadio
0 siblings, 0 replies; 25+ messages in thread
From: Guilherme Amadio @ 2020-05-20 12:38 UTC (permalink / raw
To: gentoo-commits
commit: ed2604a78b1cfd52db71439f0cc84b557dec11ee
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Sun Apr 19 15:41:26 2020 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed May 20 12:37:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed2604a7
sci-physics/vgm: Adapt SRC_URI and drop *-linux keywords
Upstream has moved to GitHub and sci-physics/root
has dropped *-linux from keywords.
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
sci-physics/vgm/Manifest | 2 +-
sci-physics/vgm/vgm-4.5.ebuild | 9 +++++----
sci-physics/vgm/vgm-9999.ebuild | 9 +++++----
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest
index e08e8e8df2d..4f6a20815ad 100644
--- a/sci-physics/vgm/Manifest
+++ b/sci-physics/vgm/Manifest
@@ -1 +1 @@
-DIST vgm.4.5.tar.gz 9602541 BLAKE2B 183c8ed91546e5421c4f1a873a48285e9d2ab6bf4bb6a7bb7b46ab2c3c80a5dfc50cd5f97890c3994ada67014067349726e9f4d65cda1e1e4f1ae9484a4249ef SHA512 a873e24ed2c6cfc09d1828b60af9059a0bee341410e5cb77c9312aa72f1650a913779a0ff929d98910f01fcc5a3e6a04b352dd1a780a8bf60b1fa925b1985491
+DIST vgm-4.5.tar.gz 3474063 BLAKE2B 70c4fe0bd5eb9bc94607553ad30ffb625e66ef4e6f8a965b1289c1c7ad6f71d7eba035d2825ba8cd94705a0c223aa56408d3285748b068045eee3a29f556e3b2 SHA512 541fde12e12cc51ba065900788dbceb8e5b9a4e4615a4e4e0bbd2ba199b8a203b6927dbe23ead7bc183bd61f6b641e3e954fe7b78451c2d423d3a2b737f00572
diff --git a/sci-physics/vgm/vgm-4.5.ebuild b/sci-physics/vgm/vgm-4.5.ebuild
index 66433421fc4..df15b5bdb7d 100644
--- a/sci-physics/vgm/vgm-4.5.ebuild
+++ b/sci-physics/vgm/vgm-4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,9 +9,10 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
else
- SRC_URI="http://ivana.home.cern.ch/ivana/${PN}.${PV}.tar.gz"
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
- S="${WORKDIR}/${PN}"
+ 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"
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index 675c07b071b..a6a93af9078 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,9 +9,10 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
else
- SRC_URI="http://ivana.home.cern.ch/ivana/${PN}.${PV}.tar.gz"
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
- S="${WORKDIR}/${PN}.${PV}"
+ 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"
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/
@ 2020-05-20 12:38 Guilherme Amadio
0 siblings, 0 replies; 25+ messages in thread
From: Guilherme Amadio @ 2020-05-20 12:38 UTC (permalink / raw
To: gentoo-commits
commit: 7d81896718ad8460ec0440e3ee21ae4b516e2e75
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Sun Apr 19 15:39:02 2020 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed May 20 12:37:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d818967
sci-physics/vgm: Drop old
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
sci-physics/vgm/Manifest | 1 -
sci-physics/vgm/vgm-4.4-r1.ebuild | 82 ---------------------------------------
sci-physics/vgm/vgm-4.4.ebuild | 79 -------------------------------------
3 files changed, 162 deletions(-)
diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest
index 0ff4444fb7a..e08e8e8df2d 100644
--- a/sci-physics/vgm/Manifest
+++ b/sci-physics/vgm/Manifest
@@ -1,2 +1 @@
-DIST vgm.4.4.tar.gz 3064087 BLAKE2B 845d04fa3ebaaa07f90ef7f216cac10e5ca4129ebbd6161e3fecce39663379b2575026186fe2b88ae8bf08f71bed6d8afcbbd5d7aa9922d37b3f9ed900d35a33 SHA512 500ae0e2ac66b580bbc26b6cd1a8bd6d6e3127c99e6fe6babe5825406e576d72da5cd76d22d0d1b82d7df9eb74ddddf084ee9a96b544c97af5b12cbf948d3406
DIST vgm.4.5.tar.gz 9602541 BLAKE2B 183c8ed91546e5421c4f1a873a48285e9d2ab6bf4bb6a7bb7b46ab2c3c80a5dfc50cd5f97890c3994ada67014067349726e9f4d65cda1e1e4f1ae9484a4249ef SHA512 a873e24ed2c6cfc09d1828b60af9059a0bee341410e5cb77c9312aa72f1650a913779a0ff929d98910f01fcc5a3e6a04b352dd1a780a8bf60b1fa925b1985491
diff --git a/sci-physics/vgm/vgm-4.4-r1.ebuild b/sci-physics/vgm/vgm-4.4-r1.ebuild
deleted file mode 100644
index 1ef3af47246..00000000000
--- a/sci-physics/vgm/vgm-4.4-r1.ebuild
+++ /dev/null
@@ -1,82 +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/${PN}.git"
-else
- SRC_URI="http://ivana.home.cern.ch/ivana/${PN}.${PV}.tar.gz"
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
- S="${WORKDIR}/${PN}.${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:=[c++11] )
- geant4? ( >=sci-physics/geant-4.10.03 )"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen[dot] )
- test? ( 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
-}
diff --git a/sci-physics/vgm/vgm-4.4.ebuild b/sci-physics/vgm/vgm-4.4.ebuild
deleted file mode 100644
index 831f0cc0c4a..00000000000
--- a/sci-physics/vgm/vgm-4.4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
-else
- SRC_URI="http://ivana.home.cern.ch/ivana/${PN}.${PV}.tar.gz"
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
- S="${WORKDIR}/${PN}.${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[root7] flag activates std=c++14, only supported from VGM >4.4.
-RDEPEND="
- sci-physics/clhep:=
- root? ( sci-physics/root:=[-root7] )
- geant4? ( >=sci-physics/geant-4.10.03 )"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen[dot] )
- test? ( 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
-)
-
-src_configure() {
- local mycmakeargs=(
- -DCLHEP_DIR="${EROOT}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-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_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-utils_src_install
- use doc && local HTML_DOCS=( doc/html/. )
- einstalldocs
-}
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/
@ 2020-05-20 12:38 Guilherme Amadio
0 siblings, 0 replies; 25+ messages in thread
From: Guilherme Amadio @ 2020-05-20 12:38 UTC (permalink / raw
To: gentoo-commits
commit: 5d089e2315b4f8020ca0698ffdeb97dd4f404704
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Sun Apr 19 15:42:35 2020 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed May 20 12:37:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d089e23
sci-physics/vgm: Bump to version 4.8
This adds c++11,c++14,c++17 flags and
requires >=sci-physics/root-6.14 which also implements
these switches.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
sci-physics/vgm/Manifest | 1 +
sci-physics/vgm/metadata.xml | 3 +++
sci-physics/vgm/vgm-4.5.ebuild | 2 +-
sci-physics/vgm/{vgm-9999.ebuild => vgm-4.8.ebuild} | 10 ++++++----
sci-physics/vgm/vgm-9999.ebuild | 10 ++++++----
5 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest
index 4f6a20815ad..6e9c7ee47e1 100644
--- a/sci-physics/vgm/Manifest
+++ b/sci-physics/vgm/Manifest
@@ -1 +1,2 @@
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/metadata.xml b/sci-physics/vgm/metadata.xml
index cd1e3ea3587..444b0055096 100644
--- a/sci-physics/vgm/metadata.xml
+++ b/sci-physics/vgm/metadata.xml
@@ -15,6 +15,9 @@
abstraction layer between the Geant4 and ROOT software.
</longdescription>
<use>
+ <flag name="c++11">Build using the C++11 standard</flag>
+ <flag name="c++14">Build using the C++14 standard</flag>
+ <flag name="c++17">Build using the C++17 standard</flag>
<flag name="geant4">Enable interaction with Geant4(<pkg>sci-physics/geant</pkg>:4)</flag>
<flag name="root">Enable interaction with ROOT (<pkg>sci-physics/root</pkg>)</flag>
</use>
diff --git a/sci-physics/vgm/vgm-4.5.ebuild b/sci-physics/vgm/vgm-4.5.ebuild
index df15b5bdb7d..6d8a518fd73 100644
--- a/sci-physics/vgm/vgm-4.5.ebuild
+++ b/sci-physics/vgm/vgm-4.5.ebuild
@@ -25,7 +25,7 @@ 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:=[c++11] )
+ root? ( >=sci-physics/root-6.14:=[c++11] )
geant4? ( >=sci-physics/geant-4.10.03 )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen[dot] )
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-4.8.ebuild
similarity index 86%
copy from sci-physics/vgm/vgm-9999.ebuild
copy to sci-physics/vgm/vgm-4.8.ebuild
index a6a93af9078..5fba573e3f6 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-4.8.ebuild
@@ -8,6 +8,7 @@ inherit cmake
if [[ ${PV} == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
+ KEYWORDS=""
else
MY_PV=$(ver_rs 1- -)
SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
@@ -20,13 +21,14 @@ HOMEPAGE="http://ivana.home.cern.ch/ivana/VGM.html"
LICENSE="GPL-2"
SLOT="0"
-IUSE="doc examples +geant4 +root test"
+IUSE="+c++11 c++14 c++17 doc examples +geant4 +root test"
+
+REQUIRED_USE="^^ ( c++11 c++14 c++17 )"
-# sci-physics/root[c++11] required to match sci-physics/geant
RDEPEND="
sci-physics/clhep:=
- root? ( sci-physics/root:=[c++11] )
- geant4? ( >=sci-physics/geant-4.10.03 )"
+ geant4? ( >=sci-physics/geant-4.10.6[c++11?,c++14?,c++17?] )
+ root? ( >=sci-physics/root-6.14:=[c++11?,c++14?,c++17?] )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen[dot] )
test? ( sci-physics/geant-vmc[g4root] )"
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index a6a93af9078..5fba573e3f6 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.ebuild
@@ -8,6 +8,7 @@ inherit cmake
if [[ ${PV} == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
+ KEYWORDS=""
else
MY_PV=$(ver_rs 1- -)
SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
@@ -20,13 +21,14 @@ HOMEPAGE="http://ivana.home.cern.ch/ivana/VGM.html"
LICENSE="GPL-2"
SLOT="0"
-IUSE="doc examples +geant4 +root test"
+IUSE="+c++11 c++14 c++17 doc examples +geant4 +root test"
+
+REQUIRED_USE="^^ ( c++11 c++14 c++17 )"
-# sci-physics/root[c++11] required to match sci-physics/geant
RDEPEND="
sci-physics/clhep:=
- root? ( sci-physics/root:=[c++11] )
- geant4? ( >=sci-physics/geant-4.10.03 )"
+ geant4? ( >=sci-physics/geant-4.10.6[c++11?,c++14?,c++17?] )
+ root? ( >=sci-physics/root-6.14:=[c++11?,c++14?,c++17?] )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen[dot] )
test? ( sci-physics/geant-vmc[g4root] )"
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/
@ 2020-05-20 12:38 Guilherme Amadio
0 siblings, 0 replies; 25+ messages in thread
From: Guilherme Amadio @ 2020-05-20 12:38 UTC (permalink / raw
To: gentoo-commits
commit: 4f468a7f17c5f3f2acb6e4352bf0600e622d9e80
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Sun May 3 18:11:05 2020 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed May 20 12:37:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f468a7f
sci-physics/vgm: Add amadio as maintainer
Closes: https://github.com/gentoo/gentoo/pull/15410
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
sci-physics/vgm/metadata.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sci-physics/vgm/metadata.xml b/sci-physics/vgm/metadata.xml
index 444b0055096..a056f194758 100644
--- a/sci-physics/vgm/metadata.xml
+++ b/sci-physics/vgm/metadata.xml
@@ -4,7 +4,10 @@
<maintainer type="person">
<email>o.freyermuth@googlemail.com</email>
<name>Oliver Freyermuth</name>
- <description>Proxy-maintainer, assign bugs</description>
+ </maintainer>
+ <maintainer type="person">
+ <email>amadio@gentoo.org</email>
+ <name>Guilherme Amadio</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/
@ 2020-09-17 7:39 Guilherme Amadio
0 siblings, 0 replies; 25+ messages in thread
From: Guilherme Amadio @ 2020-09-17 7:39 UTC (permalink / raw
To: gentoo-commits
commit: ebe392555bcebb237089b337c062bd1e689e33e5
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Sat Sep 12 17:08:45 2020 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 07:39:05 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebe39255
sci-physics/vgm: Add missing dependency on sci-physics/geant[gdml]
This is required only for sci-physics/vgm[test] since it is used
by the test suite.
Closes: https://bugs.gentoo.org/741648
Closes: https://github.com/gentoo/gentoo/pull/17511
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
sci-physics/vgm/vgm-4.5.ebuild | 5 ++++-
sci-physics/vgm/vgm-4.8.ebuild | 5 ++++-
sci-physics/vgm/vgm-9999.ebuild | 5 ++++-
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/sci-physics/vgm/vgm-4.5.ebuild b/sci-physics/vgm/vgm-4.5.ebuild
index 6d8a518fd73..5020ac5b550 100644
--- a/sci-physics/vgm/vgm-4.5.ebuild
+++ b/sci-physics/vgm/vgm-4.5.ebuild
@@ -29,7 +29,10 @@ RDEPEND="
geant4? ( >=sci-physics/geant-4.10.03 )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen[dot] )
- test? ( sci-physics/geant-vmc[g4root] )"
+ test? (
+ sci-physics/geant[gdml]
+ sci-physics/geant-vmc[g4root]
+ )"
RESTRICT="
!geant4? ( test )
!root? ( test )
diff --git a/sci-physics/vgm/vgm-4.8.ebuild b/sci-physics/vgm/vgm-4.8.ebuild
index 5fba573e3f6..659728a149e 100644
--- a/sci-physics/vgm/vgm-4.8.ebuild
+++ b/sci-physics/vgm/vgm-4.8.ebuild
@@ -31,7 +31,10 @@ RDEPEND="
root? ( >=sci-physics/root-6.14:=[c++11?,c++14?,c++17?] )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen[dot] )
- test? ( sci-physics/geant-vmc[g4root] )"
+ test? (
+ sci-physics/geant[gdml]
+ sci-physics/geant-vmc[g4root]
+ )"
RESTRICT="
!geant4? ( test )
!root? ( test )
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index 5fba573e3f6..659728a149e 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.ebuild
@@ -31,7 +31,10 @@ RDEPEND="
root? ( >=sci-physics/root-6.14:=[c++11?,c++14?,c++17?] )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen[dot] )
- test? ( sci-physics/geant-vmc[g4root] )"
+ test? (
+ sci-physics/geant[gdml]
+ sci-physics/geant-vmc[g4root]
+ )"
RESTRICT="
!geant4? ( test )
!root? ( test )
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/
@ 2021-01-21 8:26 Joonas Niilola
0 siblings, 0 replies; 25+ messages in thread
From: Joonas Niilola @ 2021-01-21 8:26 UTC (permalink / raw
To: gentoo-commits
commit: 21a80a62a65b63813a42e0b238e34f6671913d8f
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 08:25:25 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=21a80a62
sci-physics/vgm: add Github as HOMEPAGE
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-physics/vgm/vgm-4.9.ebuild | 5 ++---
sci-physics/vgm/vgm-9999.ebuild | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/sci-physics/vgm/vgm-4.9.ebuild b/sci-physics/vgm/vgm-4.9.ebuild
index c592bb49c34..ede9e854018 100644
--- a/sci-physics/vgm/vgm-4.9.ebuild
+++ b/sci-physics/vgm/vgm-4.9.ebuild
@@ -8,7 +8,6 @@ inherit cmake
if [[ ${PV} == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
- KEYWORDS=""
else
MY_PV=$(ver_rs 1- -)
SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
@@ -17,7 +16,7 @@ else
fi
DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments"
-HOMEPAGE="http://ivana.home.cern.ch/ivana/VGM.html"
+HOMEPAGE="http://ivana.home.cern.ch/ivana/VGM.html https://github.com/vmc-project/vgm/"
LICENSE="GPL-2"
SLOT="0"
@@ -81,7 +80,7 @@ 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
+ 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 e2d9d75a4f6..eb9ce1b27be 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.ebuild
@@ -8,7 +8,6 @@ inherit cmake
if [[ ${PV} == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
- KEYWORDS=""
else
MY_PV=$(ver_rs 1- -)
SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
@@ -17,7 +16,7 @@ else
fi
DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments"
-HOMEPAGE="http://ivana.home.cern.ch/ivana/VGM.html"
+HOMEPAGE="http://ivana.home.cern.ch/ivana/VGM.html https://github.com/vmc-project/vgm/"
LICENSE="GPL-2"
SLOT="0"
@@ -78,7 +77,7 @@ 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
+ PATH="${BUILD_DIR}"/test:${PATH} ./test_suite.sh || die
}
src_install() {
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/
@ 2021-02-15 0:32 Sam James
0 siblings, 0 replies; 25+ messages in thread
From: Sam James @ 2021-02-15 0:32 UTC (permalink / raw
To: gentoo-commits
commit: 72e16f1a66cb067ab033372ed5a02bda713c3e91
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 23:24:03 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 00:31:59 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72e16f1a
sci-physics/vgm: fix double KEYWORDS
Double KEYWORDS lines break tools like ekeyword and Nattka.
As per PMS, blank/empty KEYWORDS is implied by not defining
the variable.
See: https://projects.gentoo.org/qa/policy-guide/ebuild-format.html#pg0105
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-physics/vgm/vgm-4.8.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sci-physics/vgm/vgm-4.8.ebuild b/sci-physics/vgm/vgm-4.8.ebuild
index 659728a149e..c99ae4840d2 100644
--- a/sci-physics/vgm/vgm-4.8.ebuild
+++ b/sci-physics/vgm/vgm-4.8.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
@@ -8,7 +8,6 @@ inherit cmake
if [[ ${PV} == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
- KEYWORDS=""
else
MY_PV=$(ver_rs 1- -)
SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/
@ 2021-06-28 16:15 Guilherme Amadio
0 siblings, 0 replies; 25+ messages in thread
From: Guilherme Amadio @ 2021-06-28 16:15 UTC (permalink / raw
To: gentoo-commits
commit: 6612332362789e82e70209b83f9b682c8567f4e1
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 28 13:59:46 2021 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Mon Jun 28 16:15:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66123323
sci-physics/vgm: remove C++ USE flags, use C++17 as default
Geant4 11.0 and onwards will only support C++17 and above,
so this is in preparation to remove C++ USE flags altogether
in favor of coordinated settings in all packages that currently
depend on such USE flags.
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
sci-physics/vgm/metadata.xml | 3 ---
sci-physics/vgm/{vgm-4.8.ebuild => vgm-4.8-r1.ebuild} | 8 +++-----
sci-physics/vgm/{vgm-4.9.ebuild => vgm-4.9-r1.ebuild} | 8 +++-----
sci-physics/vgm/vgm-9999.ebuild | 8 +++-----
4 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/sci-physics/vgm/metadata.xml b/sci-physics/vgm/metadata.xml
index b5b1b3c1755..70819ee2ad2 100644
--- a/sci-physics/vgm/metadata.xml
+++ b/sci-physics/vgm/metadata.xml
@@ -14,9 +14,6 @@
<name>Proxy Maintainers</name>
</maintainer>
<use>
- <flag name="c++11">Build using the C++11 standard</flag>
- <flag name="c++14">Build using the C++14 standard</flag>
- <flag name="c++17">Build using the C++17 standard</flag>
<flag name="geant4">Enable interaction with Geant4(<pkg>sci-physics/geant</pkg>:4)</flag>
<flag name="root">Enable interaction with ROOT (<pkg>sci-physics/root</pkg>)</flag>
</use>
diff --git a/sci-physics/vgm/vgm-4.8.ebuild b/sci-physics/vgm/vgm-4.8-r1.ebuild
similarity index 87%
rename from sci-physics/vgm/vgm-4.8.ebuild
rename to sci-physics/vgm/vgm-4.8-r1.ebuild
index c99ae4840d2..db8bf0661fc 100644
--- a/sci-physics/vgm/vgm-4.8.ebuild
+++ b/sci-physics/vgm/vgm-4.8-r1.ebuild
@@ -20,14 +20,12 @@ HOMEPAGE="http://ivana.home.cern.ch/ivana/VGM.html"
LICENSE="GPL-2"
SLOT="0"
-IUSE="+c++11 c++14 c++17 doc examples +geant4 +root test"
-
-REQUIRED_USE="^^ ( c++11 c++14 c++17 )"
+IUSE="doc examples +geant4 +root test"
RDEPEND="
sci-physics/clhep:=
- geant4? ( >=sci-physics/geant-4.10.6[c++11?,c++14?,c++17?] )
- root? ( >=sci-physics/root-6.14:=[c++11?,c++14?,c++17?] )"
+ geant4? ( sci-physics/geant[c++17] )
+ root? ( sci-physics/root:=[c++17] )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen[dot] )
test? (
diff --git a/sci-physics/vgm/vgm-4.9.ebuild b/sci-physics/vgm/vgm-4.9-r1.ebuild
similarity index 88%
rename from sci-physics/vgm/vgm-4.9.ebuild
rename to sci-physics/vgm/vgm-4.9-r1.ebuild
index ede9e854018..1d116e9ae85 100644
--- a/sci-physics/vgm/vgm-4.9.ebuild
+++ b/sci-physics/vgm/vgm-4.9-r1.ebuild
@@ -20,14 +20,12 @@ HOMEPAGE="http://ivana.home.cern.ch/ivana/VGM.html https://github.com/vmc-projec
LICENSE="GPL-2"
SLOT="0"
-IUSE="+c++11 c++14 c++17 doc examples +geant4 +root test"
-
-REQUIRED_USE="^^ ( c++11 c++14 c++17 )"
+IUSE="doc examples +geant4 +root test"
RDEPEND="
sci-physics/clhep:=
- geant4? ( >=sci-physics/geant-4.10.6[c++11?,c++14?,c++17?] )
- root? ( >=sci-physics/root-6.14:=[c++11?,c++14?,c++17?] )"
+ geant4? ( sci-physics/geant[c++17] )
+ root? ( sci-physics/root:=[c++17] )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen[dot] )
test? (
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index eb9ce1b27be..fd992406f6e 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.ebuild
@@ -20,14 +20,12 @@ HOMEPAGE="http://ivana.home.cern.ch/ivana/VGM.html https://github.com/vmc-projec
LICENSE="GPL-2"
SLOT="0"
-IUSE="+c++11 c++14 c++17 doc examples +geant4 +root test"
-
-REQUIRED_USE="^^ ( c++11 c++14 c++17 )"
+IUSE="doc examples +geant4 +root test"
RDEPEND="
sci-physics/clhep:=
- geant4? ( >=sci-physics/geant-4.10.6[c++11?,c++14?,c++17?] )
- root? ( >=sci-physics/root-6.14:=[c++11?,c++14?,c++17?] )"
+ geant4? ( sci-physics/geant[c++17] )
+ root? ( sci-physics/root:=[c++17] )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen[dot] )
test? (
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/
@ 2021-06-28 19:25 Guilherme Amadio
0 siblings, 0 replies; 25+ messages in thread
From: Guilherme Amadio @ 2021-06-28 19:25 UTC (permalink / raw
To: gentoo-commits
commit: 1bab86950f12bd0447eafcde64ca368f98838eb7
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 28 19:25:36 2021 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Mon Jun 28 19:25:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bab8695
sci-physics/vgm: update HOMEPAGE
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
sci-physics/vgm/vgm-4.8-r1.ebuild | 2 +-
sci-physics/vgm/vgm-4.9-r1.ebuild | 2 +-
sci-physics/vgm/vgm-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sci-physics/vgm/vgm-4.8-r1.ebuild b/sci-physics/vgm/vgm-4.8-r1.ebuild
index db8bf0661fc..2719bc7a350 100644
--- a/sci-physics/vgm/vgm-4.8-r1.ebuild
+++ b/sci-physics/vgm/vgm-4.8-r1.ebuild
@@ -16,7 +16,7 @@ else
fi
DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments"
-HOMEPAGE="http://ivana.home.cern.ch/ivana/VGM.html"
+HOMEPAGE="https://github.com/vmc-project/vgm/"
LICENSE="GPL-2"
SLOT="0"
diff --git a/sci-physics/vgm/vgm-4.9-r1.ebuild b/sci-physics/vgm/vgm-4.9-r1.ebuild
index 1d116e9ae85..b7b9482e355 100644
--- a/sci-physics/vgm/vgm-4.9-r1.ebuild
+++ b/sci-physics/vgm/vgm-4.9-r1.ebuild
@@ -16,7 +16,7 @@ else
fi
DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments"
-HOMEPAGE="http://ivana.home.cern.ch/ivana/VGM.html https://github.com/vmc-project/vgm/"
+HOMEPAGE="https://github.com/vmc-project/vgm/"
LICENSE="GPL-2"
SLOT="0"
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index fd992406f6e..bd7c83ff458 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.ebuild
@@ -16,7 +16,7 @@ else
fi
DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments"
-HOMEPAGE="http://ivana.home.cern.ch/ivana/VGM.html https://github.com/vmc-project/vgm/"
+HOMEPAGE="https://github.com/vmc-project/vgm/"
LICENSE="GPL-2"
SLOT="0"
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/
@ 2021-09-02 15:15 Guilherme Amadio
0 siblings, 0 replies; 25+ messages in thread
From: Guilherme Amadio @ 2021-09-02 15:15 UTC (permalink / raw
To: gentoo-commits
commit: 4112d3e21c207f27e041bed2c819c6f5976e5e53
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Thu Sep 2 14:35:36 2021 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Thu Sep 2 15:15:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4112d3e2
sci-physics/vgm: update dependency on sci-physics/geant
Does not compile against >=sci-physics/geant-4.11.0_beta1.
Closes: https://bugs.gentoo.org/811435
Closes: https://github.com/gentoo/gentoo/pull/22192
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
sci-physics/vgm/vgm-4.8-r1.ebuild | 4 ++--
sci-physics/vgm/vgm-4.9-r1.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sci-physics/vgm/vgm-4.8-r1.ebuild b/sci-physics/vgm/vgm-4.8-r1.ebuild
index 0b5ee6471a3..6fb28e08553 100644
--- a/sci-physics/vgm/vgm-4.8-r1.ebuild
+++ b/sci-physics/vgm/vgm-4.8-r1.ebuild
@@ -24,12 +24,12 @@ IUSE="doc examples +geant4 +root test"
RDEPEND="
sci-physics/clhep:=
- geant4? ( sci-physics/geant[c++17] )
+ 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[gdml]
+ <sci-physics/geant-4.11[gdml]
sci-physics/geant4_vmc[g4root]
)"
RESTRICT="
diff --git a/sci-physics/vgm/vgm-4.9-r1.ebuild b/sci-physics/vgm/vgm-4.9-r1.ebuild
index b9d0ad2bcca..16ffe2e9ae2 100644
--- a/sci-physics/vgm/vgm-4.9-r1.ebuild
+++ b/sci-physics/vgm/vgm-4.9-r1.ebuild
@@ -24,12 +24,12 @@ IUSE="doc examples +geant4 +root test"
RDEPEND="
sci-physics/clhep:=
- geant4? ( sci-physics/geant[c++17] )
+ 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[gdml]
+ <sci-physics/geant-4.11[gdml]
sci-physics/geant4_vmc[g4root]
)"
RESTRICT="
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/
@ 2022-02-11 7:36 Guilherme Amadio
0 siblings, 0 replies; 25+ messages in thread
From: Guilherme Amadio @ 2022-02-11 7:36 UTC (permalink / raw
To: gentoo-commits
commit: a3c8b9858642e22cce32888ae6c4d511f28ef905
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Thu Feb 10 23:42:57 2022 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 07:36:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3c8b985
sci-physics/vgm: Bump version to 5.0.
New version supports for =sci-physics/geant-4.11.0,
drops patch (upstreamed) and simplifies docs generation.
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
sci-physics/vgm/Manifest | 1 +
sci-physics/vgm/vgm-5.0.ebuild | 82 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 83 insertions(+)
diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest
index b03b99d0fe04..f9a2c77c3bb0 100644
--- a/sci-physics/vgm/Manifest
+++ b/sci-physics/vgm/Manifest
@@ -1,2 +1,3 @@
DIST vgm-4.8.tar.gz 3661965 BLAKE2B 29f878fb6716e261c27d60b2c9081d66313591a053d80f78501973f131aff88bbcee743ff9767836883dcb28d3ce5aeee3759a5890d7c8811a6a61503417284f SHA512 8b7cabc5796649c4014ccbdf1c6d209d2e7c2b4b06258716a72cadd997a9f6f51c4f9cb5870fd10abfd1ee133766876523c84441a69c7242bc2002687ca0ce58
DIST vgm-4.9.tar.gz 3881029 BLAKE2B 596a8df12f0dcd813a0d84e8c33eaa92dd2d332d9accf2fc38992f385748a2bd3579fee2af6cc00b878fe5491af4996d80775aa630120507ccc665f102f63b11 SHA512 90845d75a7ff0022f5fba15b7f621efd588251060c0d8e715fcc2e28bb6b4b01ddd83420dbd233cc0dd437ee6b8b5390bb1f84571ed12e696ee8c1dfc4bd8fd9
+DIST vgm-5.0.tar.gz 3862583 BLAKE2B 7a1643b329f6f6b019e1b68ce691ed45a32d343925c59451d6e218469606a7a352334d4f1e330873fa1cbc4e1182b4557dc396f52ce7d35e26df81e79121cd60 SHA512 771c2e013c052ea1785fb79ba317b48482428ddf703e263eaf1c9840fbae66dd280d73aee99de30e1c3d70e46a5eb63affc92dfc5ba19298e2d4487b9e302588
diff --git a/sci-physics/vgm/vgm-5.0.ebuild b/sci-physics/vgm/vgm-5.0.ebuild
new file mode 100644
index 000000000000..d58370b67b04
--- /dev/null
+++ b/sci-physics/vgm/vgm-5.0.ebuild
@@ -0,0 +1,82 @@
+# 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"
+ 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/VGMhistory.txt
+ doc/todo.txt
+)
+
+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
+ doxygen packages/Doxyfile || 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
+}
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/
@ 2022-02-11 7:36 Guilherme Amadio
0 siblings, 0 replies; 25+ messages in thread
From: Guilherme Amadio @ 2022-02-11 7:36 UTC (permalink / raw
To: gentoo-commits
commit: 18c90efb4e18e520eede41ea5d2ece5e9978b254
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Thu Feb 10 23:50:36 2022 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 07:36:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18c90efb
sci-physics/vgm: Update live ebuild.
Adapt to new documentation handling upstream,
bump EAPI.
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
sci-physics/vgm/vgm-9999.ebuild | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index a2b21203209d..fdf095918a01 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake
@@ -40,10 +40,8 @@ RESTRICT="
DOCS=(
doc/README
- doc/todo.txt
doc/VGMhistory.txt
- doc/VGM.html
- doc/VGMversions.html
+ doc/todo.txt
)
src_configure() {
@@ -66,8 +64,7 @@ src_configure() {
src_compile() {
cmake_src_compile
if use doc; then
- cd packages
- doxygen || die
+ doxygen packages/Doxyfile || die
fi
}
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/
@ 2022-02-11 7:36 Guilherme Amadio
0 siblings, 0 replies; 25+ messages in thread
From: Guilherme Amadio @ 2022-02-11 7:36 UTC (permalink / raw
To: gentoo-commits
commit: c00dd988b042ae19f21eca4ace379716c5cdee27
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Thu Feb 10 23:51:14 2022 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 07:36:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c00dd988
sci-physics/vgm: Drop oldest version.
Closes: https://github.com/gentoo/gentoo/pull/24153
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
sci-physics/vgm/Manifest | 1 -
sci-physics/vgm/vgm-4.8-r1.ebuild | 82 ---------------------------------------
2 files changed, 83 deletions(-)
diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest
index f9a2c77c3bb0..07163b3d4018 100644
--- a/sci-physics/vgm/Manifest
+++ b/sci-physics/vgm/Manifest
@@ -1,3 +1,2 @@
-DIST vgm-4.8.tar.gz 3661965 BLAKE2B 29f878fb6716e261c27d60b2c9081d66313591a053d80f78501973f131aff88bbcee743ff9767836883dcb28d3ce5aeee3759a5890d7c8811a6a61503417284f SHA512 8b7cabc5796649c4014ccbdf1c6d209d2e7c2b4b06258716a72cadd997a9f6f51c4f9cb5870fd10abfd1ee133766876523c84441a69c7242bc2002687ca0ce58
DIST vgm-4.9.tar.gz 3881029 BLAKE2B 596a8df12f0dcd813a0d84e8c33eaa92dd2d332d9accf2fc38992f385748a2bd3579fee2af6cc00b878fe5491af4996d80775aa630120507ccc665f102f63b11 SHA512 90845d75a7ff0022f5fba15b7f621efd588251060c0d8e715fcc2e28bb6b4b01ddd83420dbd233cc0dd437ee6b8b5390bb1f84571ed12e696ee8c1dfc4bd8fd9
DIST vgm-5.0.tar.gz 3862583 BLAKE2B 7a1643b329f6f6b019e1b68ce691ed45a32d343925c59451d6e218469606a7a352334d4f1e330873fa1cbc4e1182b4557dc396f52ce7d35e26df81e79121cd60 SHA512 771c2e013c052ea1785fb79ba317b48482428ddf703e263eaf1c9840fbae66dd280d73aee99de30e1c3d70e46a5eb63affc92dfc5ba19298e2d4487b9e302588
diff --git a/sci-physics/vgm/vgm-4.8-r1.ebuild b/sci-physics/vgm/vgm-4.8-r1.ebuild
deleted file mode 100644
index 6fb28e08553c..000000000000
--- a/sci-physics/vgm/vgm-4.8-r1.ebuild
+++ /dev/null
@@ -1,82 +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 )"
-
-DOCS=(
- doc/README
- doc/todo.txt
- doc/VGMhistory.txt
- doc/VGM.html
- doc/VGMversions.html
-)
-
-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
-}
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/
@ 2022-12-24 7:42 Sam James
0 siblings, 0 replies; 25+ messages in thread
From: Sam James @ 2022-12-24 7:42 UTC (permalink / raw
To: gentoo-commits
commit: fec296a07eb82feb1e34ed1849f780d28ef78aab
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Sun Dec 18 17:58:59 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 07:41:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fec296a0
sci-physics/vgm: require <sci-physics/geant-4.11.1
There is include breakage with newer versions,
and libraries are missing for VGM tests (G4gl2ps).
Closes: https://bugs.gentoo.org/886599
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Closes: https://github.com/gentoo/gentoo/pull/28705
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-physics/vgm/vgm-5.0.ebuild | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/sci-physics/vgm/vgm-5.0.ebuild b/sci-physics/vgm/vgm-5.0.ebuild
index d58370b67b04..99dabda494c5 100644
--- a/sci-physics/vgm/vgm-5.0.ebuild
+++ b/sci-physics/vgm/vgm-5.0.ebuild
@@ -22,9 +22,13 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="doc examples +geant4 +root test"
+# upper version bound for Geant, see https://github.com/vmc-project/vgm/issues/10
RDEPEND="
sci-physics/clhep:=
- geant4? ( >=sci-physics/geant-4.11[c++17] )
+ geant4? (
+ >=sci-physics/geant-4.11[c++17]
+ <sci-physics/geant-4.11.1[c++17]
+ )
root? ( sci-physics/root:=[c++17] )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen[dot] )
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/
@ 2023-01-26 11:11 Guilherme Amadio
0 siblings, 0 replies; 25+ messages in thread
From: Guilherme Amadio @ 2023-01-26 11:11 UTC (permalink / raw
To: gentoo-commits
commit: 8119d73192a628b59ec3cfbaa435a7dac4048810
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Tue Jan 24 09:55:32 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=8119d731
sci-physics/vgm: Add 5.1 (supports >=sci-physics/geant-4.11.1.0 )
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
sci-physics/vgm/Manifest | 1 +
sci-physics/vgm/{vgm-9999.ebuild => vgm-5.1.ebuild} | 7 +++----
sci-physics/vgm/vgm-9999.ebuild | 7 +++----
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest
index 4208e434d3ad..c165d33f3e7f 100644
--- a/sci-physics/vgm/Manifest
+++ b/sci-physics/vgm/Manifest
@@ -1 +1,2 @@
DIST vgm-5.0.tar.gz 3862583 BLAKE2B 7a1643b329f6f6b019e1b68ce691ed45a32d343925c59451d6e218469606a7a352334d4f1e330873fa1cbc4e1182b4557dc396f52ce7d35e26df81e79121cd60 SHA512 771c2e013c052ea1785fb79ba317b48482428ddf703e263eaf1c9840fbae66dd280d73aee99de30e1c3d70e46a5eb63affc92dfc5ba19298e2d4487b9e302588
+DIST vgm-5.1.tar.gz 3871449 BLAKE2B 19dc9337700edaa854a69b435e6e3012d12762fcc6fe2f3f1799ed11709a04c1b2e6b011ba2de89b251af6bb3471d6969037f4572e51bc21ae1de6cfcb2a3e6f SHA512 ac45c031d3e72d171a1d5048aa2d9e1330574a62cb80caa82a2875dfea4d52a314a7c52d4da99b387f6aeb4ce62842776216447082f8d594182210d34bf567ac
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-5.1.ebuild
similarity index 93%
copy from sci-physics/vgm/vgm-9999.ebuild
copy to sci-physics/vgm/vgm-5.1.ebuild
index fdf095918a01..5f58d81f0baf 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -24,12 +24,12 @@ IUSE="doc examples +geant4 +root test"
RDEPEND="
sci-physics/clhep:=
- geant4? ( sci-physics/geant[c++17] )
+ 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[gdml]
+ >=sci-physics/geant-4.11:=[gdml]
sci-physics/geant4_vmc[g4root]
)"
RESTRICT="
@@ -41,7 +41,6 @@ RESTRICT="
DOCS=(
doc/README
doc/VGMhistory.txt
- doc/todo.txt
)
src_configure() {
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index fdf095918a01..777ea264b4d8 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-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -24,12 +24,12 @@ IUSE="doc examples +geant4 +root test"
RDEPEND="
sci-physics/clhep:=
- geant4? ( sci-physics/geant[c++17] )
+ geant4? ( sci-physics/geant:=[c++17] )
root? ( sci-physics/root:=[c++17] )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen[dot] )
test? (
- sci-physics/geant[gdml]
+ sci-physics/geant:=[gdml]
sci-physics/geant4_vmc[g4root]
)"
RESTRICT="
@@ -41,7 +41,6 @@ RESTRICT="
DOCS=(
doc/README
doc/VGMhistory.txt
- doc/todo.txt
)
src_configure() {
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/
@ 2023-09-13 8:10 Guilherme Amadio
0 siblings, 0 replies; 25+ messages in thread
From: Guilherme Amadio @ 2023-09-13 8:10 UTC (permalink / raw
To: gentoo-commits
commit: 6faa46f98a00aea0182cf799149c4929ec6bb8e6
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Wed Jun 14 20:26:58 2023 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed Sep 13 08:10:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6faa46f9
sci-physics/vgm: add 5.2
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
sci-physics/vgm/Manifest | 1 +
sci-physics/vgm/vgm-5.2.ebuild | 81 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 82 insertions(+)
diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest
index c165d33f3e7f..ccc7ee0a8616 100644
--- a/sci-physics/vgm/Manifest
+++ b/sci-physics/vgm/Manifest
@@ -1,2 +1,3 @@
DIST vgm-5.0.tar.gz 3862583 BLAKE2B 7a1643b329f6f6b019e1b68ce691ed45a32d343925c59451d6e218469606a7a352334d4f1e330873fa1cbc4e1182b4557dc396f52ce7d35e26df81e79121cd60 SHA512 771c2e013c052ea1785fb79ba317b48482428ddf703e263eaf1c9840fbae66dd280d73aee99de30e1c3d70e46a5eb63affc92dfc5ba19298e2d4487b9e302588
DIST vgm-5.1.tar.gz 3871449 BLAKE2B 19dc9337700edaa854a69b435e6e3012d12762fcc6fe2f3f1799ed11709a04c1b2e6b011ba2de89b251af6bb3471d6969037f4572e51bc21ae1de6cfcb2a3e6f SHA512 ac45c031d3e72d171a1d5048aa2d9e1330574a62cb80caa82a2875dfea4d52a314a7c52d4da99b387f6aeb4ce62842776216447082f8d594182210d34bf567ac
+DIST vgm-5.2.tar.gz 3963607 BLAKE2B 6b82f0ac8fa345e4a736d38c2e961f04836c943445fa2dbe52e48dcc378826a4aa7e1ea1af74ae097288121e52549d599e434da30bfd2b46c35b177ef42dae14 SHA512 f141215bf67684d41acb3ae3551e0c8b643033fca841d924030eedc18136e94d75efd8940b43eaca2640470c78331fff36957173e98c7f8a1cccc6325abbf870
diff --git a/sci-physics/vgm/vgm-5.2.ebuild b/sci-physics/vgm/vgm-5.2.ebuild
new file mode 100644
index 000000000000..d0dbdb3dc943
--- /dev/null
+++ b/sci-physics/vgm/vgm-5.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 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"
+ 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}
+ test? (
+ >=sci-physics/geant-4.11:=[gdml]
+ sci-physics/geant4_vmc[g4root]
+ )"
+BDEPEND="
+ doc? ( app-doc/doxygen[dot] )
+"
+RESTRICT="
+ !geant4? ( test )
+ !root? ( test )
+ !test? ( test )
+ !examples? ( test )"
+
+DOCS=(
+ doc/README
+ doc/VGMhistory.txt
+)
+
+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
+ doxygen packages/Doxyfile || die
+ fi
+}
+
+src_test() {
+ cd "${BUILD_DIR}"/test || die
+ PATH="${BUILD_DIR}"/test:${PATH} ./test_suite.sh || die
+}
+
+src_install() {
+ cmake_src_install
+ use doc && local HTML_DOCS=( doc/html/. )
+ einstalldocs
+}
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/
@ 2023-09-13 8:10 Guilherme Amadio
0 siblings, 0 replies; 25+ messages in thread
From: Guilherme Amadio @ 2023-09-13 8:10 UTC (permalink / raw
To: gentoo-commits
commit: f33278825b6c160fb745fbd562622169d094e2df
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Wed Jun 14 20:27:30 2023 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed Sep 13 08:10:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3327882
sci-physics/vgm: reactivate test, move doxygen to BDEPEND
ScaledSolids test fixed upstream.
Closes: https://github.com/gentoo/gentoo/pull/31439
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
sci-physics/vgm/vgm-9999.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index 777ea264b4d8..f7524d3384d5 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.ebuild
@@ -27,11 +27,13 @@ RDEPEND="
geant4? ( sci-physics/geant:=[c++17] )
root? ( sci-physics/root:=[c++17] )"
DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen[dot] )
test? (
sci-physics/geant:=[gdml]
sci-physics/geant4_vmc[g4root]
)"
+BDEPEND="
+ doc? ( app-doc/doxygen[dot] )
+"
RESTRICT="
!geant4? ( test )
!root? ( test )
@@ -69,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
}
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/
@ 2023-12-05 12:16 Guilherme Amadio
0 siblings, 0 replies; 25+ messages in thread
From: Guilherme Amadio @ 2023-12-05 12:16 UTC (permalink / raw
To: gentoo-commits
commit: d5b8f7b4596c4372216e3c808f9abc54ff29789e
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 1 08:59:23 2023 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Tue Dec 5 12:16:25 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5b8f7b4
sci-physics/vgm: drop C++ standard USE flags in dependencies
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
sci-physics/vgm/{vgm-5.0.ebuild => vgm-5.0-r1.ebuild} | 8 ++++----
sci-physics/vgm/{vgm-5.1.ebuild => vgm-5.1-r1.ebuild} | 4 ++--
sci-physics/vgm/{vgm-5.2.ebuild => vgm-5.2-r1.ebuild} | 4 ++--
sci-physics/vgm/vgm-9999.ebuild | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/sci-physics/vgm/vgm-5.0.ebuild b/sci-physics/vgm/vgm-5.0-r1.ebuild
similarity index 92%
rename from sci-physics/vgm/vgm-5.0.ebuild
rename to sci-physics/vgm/vgm-5.0-r1.ebuild
index 99dabda494c5..9a728c675b8b 100644
--- a/sci-physics/vgm/vgm-5.0.ebuild
+++ b/sci-physics/vgm/vgm-5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -26,10 +26,10 @@ IUSE="doc examples +geant4 +root test"
RDEPEND="
sci-physics/clhep:=
geant4? (
- >=sci-physics/geant-4.11[c++17]
- <sci-physics/geant-4.11.1[c++17]
+ >=sci-physics/geant-4.11
+ <sci-physics/geant-4.11.1
)
- root? ( sci-physics/root:=[c++17] )"
+ root? ( sci-physics/root:= )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen[dot] )
test? (
diff --git a/sci-physics/vgm/vgm-5.1.ebuild b/sci-physics/vgm/vgm-5.1-r1.ebuild
similarity index 95%
rename from sci-physics/vgm/vgm-5.1.ebuild
rename to sci-physics/vgm/vgm-5.1-r1.ebuild
index 5f58d81f0baf..c3e7db7ec478 100644
--- a/sci-physics/vgm/vgm-5.1.ebuild
+++ b/sci-physics/vgm/vgm-5.1-r1.ebuild
@@ -24,8 +24,8 @@ 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? (
diff --git a/sci-physics/vgm/vgm-5.2.ebuild b/sci-physics/vgm/vgm-5.2-r1.ebuild
similarity index 94%
rename from sci-physics/vgm/vgm-5.2.ebuild
rename to sci-physics/vgm/vgm-5.2-r1.ebuild
index d0dbdb3dc943..300d057df338 100644
--- a/sci-physics/vgm/vgm-5.2.ebuild
+++ b/sci-physics/vgm/vgm-5.2-r1.ebuild
@@ -24,8 +24,8 @@ 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}
test? (
>=sci-physics/geant-4.11:=[gdml]
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index f7524d3384d5..94069713f88b 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.ebuild
@@ -24,8 +24,8 @@ 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}
test? (
sci-physics/geant:=[gdml]
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/
@ 2024-03-10 20:06 Guilherme Amadio
0 siblings, 0 replies; 25+ messages in thread
From: Guilherme Amadio @ 2024-03-10 20:06 UTC (permalink / raw
To: gentoo-commits
commit: 88701cd3afc40fbba15cffe5e724547eb3e886ba
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 10 20:05:58 2024 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 20:05:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88701cd3
sci-physics/vgm: drop 5.0-r1, 5.1-r1
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
sci-physics/vgm/Manifest | 2 -
sci-physics/vgm/vgm-5.0-r1.ebuild | 86 ---------------------------------------
sci-physics/vgm/vgm-5.1-r1.ebuild | 81 ------------------------------------
3 files changed, 169 deletions(-)
diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest
index ccc7ee0a8616..72b367706d35 100644
--- a/sci-physics/vgm/Manifest
+++ b/sci-physics/vgm/Manifest
@@ -1,3 +1 @@
-DIST vgm-5.0.tar.gz 3862583 BLAKE2B 7a1643b329f6f6b019e1b68ce691ed45a32d343925c59451d6e218469606a7a352334d4f1e330873fa1cbc4e1182b4557dc396f52ce7d35e26df81e79121cd60 SHA512 771c2e013c052ea1785fb79ba317b48482428ddf703e263eaf1c9840fbae66dd280d73aee99de30e1c3d70e46a5eb63affc92dfc5ba19298e2d4487b9e302588
-DIST vgm-5.1.tar.gz 3871449 BLAKE2B 19dc9337700edaa854a69b435e6e3012d12762fcc6fe2f3f1799ed11709a04c1b2e6b011ba2de89b251af6bb3471d6969037f4572e51bc21ae1de6cfcb2a3e6f SHA512 ac45c031d3e72d171a1d5048aa2d9e1330574a62cb80caa82a2875dfea4d52a314a7c52d4da99b387f6aeb4ce62842776216447082f8d594182210d34bf567ac
DIST vgm-5.2.tar.gz 3963607 BLAKE2B 6b82f0ac8fa345e4a736d38c2e961f04836c943445fa2dbe52e48dcc378826a4aa7e1ea1af74ae097288121e52549d599e434da30bfd2b46c35b177ef42dae14 SHA512 f141215bf67684d41acb3ae3551e0c8b643033fca841d924030eedc18136e94d75efd8940b43eaca2640470c78331fff36957173e98c7f8a1cccc6325abbf870
diff --git a/sci-physics/vgm/vgm-5.0-r1.ebuild b/sci-physics/vgm/vgm-5.0-r1.ebuild
deleted file mode 100644
index 6edd821b53dc..000000000000
--- a/sci-physics/vgm/vgm-5.0-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2024 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"
- 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"
-
-# upper version bound for Geant, see https://github.com/vmc-project/vgm/issues/10
-RDEPEND="
- sci-physics/clhep:=
- geant4? (
- >=sci-physics/geant-4.11
- <sci-physics/geant-4.11.1
- )
- root? ( sci-physics/root:= )"
-DEPEND="${RDEPEND}
- doc? ( app-text/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/VGMhistory.txt
- doc/todo.txt
-)
-
-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
- doxygen packages/Doxyfile || 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.1-r1.ebuild b/sci-physics/vgm/vgm-5.1-r1.ebuild
deleted file mode 100644
index 16a49e17a6e6..000000000000
--- a/sci-physics/vgm/vgm-5.1-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2024 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"
- 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:= )
- root? ( sci-physics/root:= )"
-DEPEND="${RDEPEND}
- doc? ( app-text/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/VGMhistory.txt
-)
-
-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
- doxygen packages/Doxyfile || 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
-}
^ permalink raw reply related [flat|nested] 25+ messages in thread
end of thread, other threads:[~2024-03-10 20:06 UTC | newest]
Thread overview: 25+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-23 12:30 [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2024-03-10 20:06 Guilherme Amadio
2023-12-05 12:16 Guilherme Amadio
2023-09-13 8:10 Guilherme Amadio
2023-09-13 8:10 Guilherme Amadio
2023-01-26 11:11 Guilherme Amadio
2022-12-24 7:42 Sam James
2022-02-11 7:36 Guilherme Amadio
2022-02-11 7:36 Guilherme Amadio
2022-02-11 7:36 Guilherme Amadio
2021-09-02 15:15 Guilherme Amadio
2021-06-28 19:25 Guilherme Amadio
2021-06-28 16:15 Guilherme Amadio
2021-02-15 0:32 Sam James
2021-01-21 8:26 Joonas Niilola
2020-09-17 7:39 Guilherme Amadio
2020-05-20 12:38 Guilherme Amadio
2020-05-20 12:38 Guilherme Amadio
2020-05-20 12:38 Guilherme Amadio
2020-05-20 12:38 Guilherme Amadio
2019-08-11 11:20 David Seifert
2019-07-18 18:00 Michał Górny
2018-08-24 6:01 Michał Górny
2018-08-23 12:30 Michał Górny
2018-02-20 20:43 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox