public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant-vmc/
@ 2018-08-23 14:19 Guilherme Amadio
  0 siblings, 0 replies; 14+ messages in thread
From: Guilherme Amadio @ 2018-08-23 14:19 UTC (permalink / raw
  To: gentoo-commits

commit:     ff01e7c6bcc8917f61a34eb2ae58e4a44880d94c
Author:     Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Mon Feb  5 23:17:42 2018 +0000
Commit:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Thu Aug 23 14:18:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff01e7c6

sci-physics/geant-vmc: new package.

Geant4 VMC represents the realisation of the
Virtual Monte Carlo (VMC) for Geant4.

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --force

 sci-physics/geant-vmc/Manifest               |  1 +
 sci-physics/geant-vmc/geant-vmc-4.3.6.ebuild | 88 ++++++++++++++++++++++++++++
 sci-physics/geant-vmc/geant-vmc-9999.ebuild  | 88 ++++++++++++++++++++++++++++
 sci-physics/geant-vmc/metadata.xml           | 21 +++++++
 4 files changed, 198 insertions(+)

diff --git a/sci-physics/geant-vmc/Manifest b/sci-physics/geant-vmc/Manifest
new file mode 100644
index 00000000000..0bd6fad71af
--- /dev/null
+++ b/sci-physics/geant-vmc/Manifest
@@ -0,0 +1 @@
+DIST geant4_vmc.3.6.tar.gz 1017407 BLAKE2B f386ea49843abedbed16ba1d12a10ae4165123fb0f7842482c416becf4141bc15360be1038626ce40f96a9dbb15d27116cd2fbd46d74b856d5a9391d073784a5 SHA512 eaf8626a3702149a1c5be4adff7843ef828da8024aafb8de489dd6b55b4ee05850581318d01032a4008767ad4e2fc0fde23e1aa5c751693e902d51ce9ad3d1df

diff --git a/sci-physics/geant-vmc/geant-vmc-4.3.6.ebuild b/sci-physics/geant-vmc/geant-vmc-4.3.6.ebuild
new file mode 100644
index 00000000000..2156a04588f
--- /dev/null
+++ b/sci-physics/geant-vmc/geant-vmc-4.3.6.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eapi7-ver
+
+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[root7] flag activates std=c++14, which we could only support if also Geant is built with it.
+# Disable for now.
+RDEPEND="
+	>=sci-physics/geant-4.10.03:=[opengl,geant3?]
+	sci-physics/root:=[-root7]
+	vgm? ( >=sci-physics/vgm-4.4:= )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+RESTRICT="
+	!geant3? ( test )
+	!g4root? ( test )
+	!mtroot? ( test )
+	!vgm? ( test )"
+
+DOCS=(
+	history
+	README.md
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DGeant4VMC_USE_VGM="$(usex vgm)"
+		-DGeant4VMC_USE_GEANT4_G3TOG4="$(usex geant3)"
+		-DGeant4VMC_USE_G4Root="$(usex g4root)"
+		-DGeant4VMC_BUILD_MTRoot="$(usex mtroot)"
+		-DGeant4VMC_BUILD_EXAMPLES="$(usex test)"
+		-DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_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
+	./test_suite.sh --g3=off --builddir="${BUILD_DIR}" || die
+	./test_suite_exe.sh --g3=off --builddir="${BUILD_DIR}" || die
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && local HTML_DOCS=(doc/.)
+	einstalldocs
+}

diff --git a/sci-physics/geant-vmc/geant-vmc-9999.ebuild b/sci-physics/geant-vmc/geant-vmc-9999.ebuild
new file mode 100644
index 00000000000..2156a04588f
--- /dev/null
+++ b/sci-physics/geant-vmc/geant-vmc-9999.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eapi7-ver
+
+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[root7] flag activates std=c++14, which we could only support if also Geant is built with it.
+# Disable for now.
+RDEPEND="
+	>=sci-physics/geant-4.10.03:=[opengl,geant3?]
+	sci-physics/root:=[-root7]
+	vgm? ( >=sci-physics/vgm-4.4:= )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+RESTRICT="
+	!geant3? ( test )
+	!g4root? ( test )
+	!mtroot? ( test )
+	!vgm? ( test )"
+
+DOCS=(
+	history
+	README.md
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DGeant4VMC_USE_VGM="$(usex vgm)"
+		-DGeant4VMC_USE_GEANT4_G3TOG4="$(usex geant3)"
+		-DGeant4VMC_USE_G4Root="$(usex g4root)"
+		-DGeant4VMC_BUILD_MTRoot="$(usex mtroot)"
+		-DGeant4VMC_BUILD_EXAMPLES="$(usex test)"
+		-DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_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
+	./test_suite.sh --g3=off --builddir="${BUILD_DIR}" || die
+	./test_suite_exe.sh --g3=off --builddir="${BUILD_DIR}" || die
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && local HTML_DOCS=(doc/.)
+	einstalldocs
+}

diff --git a/sci-physics/geant-vmc/metadata.xml b/sci-physics/geant-vmc/metadata.xml
new file mode 100644
index 00000000000..ef4bdfb269e
--- /dev/null
+++ b/sci-physics/geant-vmc/metadata.xml
@@ -0,0 +1,21 @@
+<?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>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">vmc-project/geant4_vmc</remote-id>
+  </upstream>
+  <use>
+    <flag name="vgm">Enable the Virtual Geometry Model (<pkg>sci-physics/vgm</pkg>)</flag>
+    <flag name="g4root">Build G4Root (interface for GEANT4 simulation with a ROOT geometry)</flag>
+    <flag name="geant3">Build with Geant4 G3toG4 library</flag>
+    <flag name="mtroot">Build MTRoot (provides ROOT IO manager classes with multi-threading support)</flag>
+  </use>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant-vmc/
@ 2019-07-18 16:12 Michał Górny
  0 siblings, 0 replies; 14+ messages in thread
From: Michał Górny @ 2019-07-18 16:12 UTC (permalink / raw
  To: gentoo-commits

commit:     f0856e549448bc63c0a5cc816c72b859d20360b1
Author:     Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Tue Jul 16 23:29:58 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 15:45:47 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0856e54

sci-physics/geant-vmc: Fixes for test suite.

This works around issues either already
fixed in upstream master or in pending PRs.

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild | 7 ++++++-
 sci-physics/geant-vmc/geant-vmc-9999.ebuild  | 5 +++--
 2 files changed, 9 insertions(+), 3 deletions(-)

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 ae53bfcd41d..83c2f0b1204 100644
--- a/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 RESTRICT="
+	!examples? ( test )
 	!geant3? ( test )
 	!g4root? ( test )
 	!mtroot? ( test )
@@ -77,8 +78,12 @@ src_test() {
 	# 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 --builddir="${BUILD_DIR}" || die
+	./test_suite_exe.sh --g3=off --garfield=off --builddir="${BUILD_DIR}" || die
 }
 
 src_install() {

diff --git a/sci-physics/geant-vmc/geant-vmc-9999.ebuild b/sci-physics/geant-vmc/geant-vmc-9999.ebuild
index ae53bfcd41d..ffc8e7dc874 100644
--- a/sci-physics/geant-vmc/geant-vmc-9999.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-9999.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 RESTRICT="
+	!examples? ( test )
 	!geant3? ( test )
 	!g4root? ( test )
 	!mtroot? ( test )
@@ -77,8 +78,8 @@ src_test() {
 	# see e.g. https://sft.its.cern.ch/jira/browse/ROOT-8146 .
 	addwrite /dev/random
 	cd examples || die
-	./test_suite.sh --g3=off --builddir="${BUILD_DIR}" || die
-	./test_suite_exe.sh --g3=off --builddir="${BUILD_DIR}" || die
+	./test_suite.sh --debug --g3=off --garfield=off --builddir="${BUILD_DIR}" || die
+	./test_suite_exe.sh -debug --g3=off --garfield=off --builddir="${BUILD_DIR}" || die
 }
 
 src_install() {


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant-vmc/
@ 2019-07-18 16:12 Michał Górny
  0 siblings, 0 replies; 14+ messages in thread
From: Michał Górny @ 2019-07-18 16:12 UTC (permalink / raw
  To: gentoo-commits

commit:     2acec32e7fff3d46567f29fd49506541148a96ef
Author:     Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Mon Jul 15 19:42:38 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 15:45:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2acec32e

sci-physics/geant-vmc: Ebuild fixes and updates.

- Bump to EAPI 7 (revbump).
- Block >=sci-physics/geant-4.10.05 for
  =geant-vmc-4.3.6.
- Correct dependency on sci-physics/root[c++11].
- Add missing dependency on sci-physics/root[vmc].

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../{geant-vmc-9999.ebuild => geant-vmc-4.3.6-r1.ebuild} | 13 +++++++------
 sci-physics/geant-vmc/geant-vmc-9999.ebuild              | 16 ++++++++--------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/sci-physics/geant-vmc/geant-vmc-9999.ebuild b/sci-physics/geant-vmc/geant-vmc-4.3.6-r1.ebuild
similarity index 88%
copy from sci-physics/geant-vmc/geant-vmc-9999.ebuild
copy to sci-physics/geant-vmc/geant-vmc-4.3.6-r1.ebuild
index 2156a04588f..b92483ba721 100644
--- a/sci-physics/geant-vmc/geant-vmc-9999.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-4.3.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils eapi7-ver
+inherit cmake-utils
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -23,11 +23,11 @@ LICENSE="GPL-2"
 SLOT="4"
 IUSE="doc examples geant3 +g4root +mtroot vgm test"
 
-# sci-physics/root[root7] flag activates std=c++14, which we could only support if also Geant is built with it.
-# Disable for now.
+# sci-physics/root[c++11] required to match sci-physics/geant flags.
 RDEPEND="
 	>=sci-physics/geant-4.10.03:=[opengl,geant3?]
-	sci-physics/root:=[-root7]
+	<sci-physics/geant-4.10.05:=
+	sci-physics/root:=[c++11,vmc]
 	vgm? ( >=sci-physics/vgm-4.4:= )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
@@ -35,6 +35,7 @@ RESTRICT="
 	!geant3? ( test )
 	!g4root? ( test )
 	!mtroot? ( test )
+	!test? ( test )
 	!vgm? ( test )"
 
 DOCS=(

diff --git a/sci-physics/geant-vmc/geant-vmc-9999.ebuild b/sci-physics/geant-vmc/geant-vmc-9999.ebuild
index 2156a04588f..ae53bfcd41d 100644
--- a/sci-physics/geant-vmc/geant-vmc-9999.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils eapi7-ver
+inherit cmake-utils
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -11,8 +11,8 @@ if [[ ${PV} == *9999* ]]; then
 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}"
+	SOURCE_PV=$(ver_rs 1- . ${DOWN_PV})
+	S="${WORKDIR}/geant4_vmc.${SOURCE_PV}"
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
@@ -23,11 +23,10 @@ LICENSE="GPL-2"
 SLOT="4"
 IUSE="doc examples geant3 +g4root +mtroot vgm test"
 
-# sci-physics/root[root7] flag activates std=c++14, which we could only support if also Geant is built with it.
-# Disable for now.
+# sci-physics/root[c++11] required to match sci-physics/geant flags.
 RDEPEND="
 	>=sci-physics/geant-4.10.03:=[opengl,geant3?]
-	sci-physics/root:=[-root7]
+	sci-physics/root:=[c++11,vmc]
 	vgm? ( >=sci-physics/vgm-4.4:= )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
@@ -35,6 +34,7 @@ RESTRICT="
 	!geant3? ( test )
 	!g4root? ( test )
 	!mtroot? ( test )
+	!test? ( test )
 	!vgm? ( test )"
 
 DOCS=(


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant-vmc/
@ 2019-07-18 16:12 Michał Górny
  0 siblings, 0 replies; 14+ messages in thread
From: Michał Górny @ 2019-07-18 16:12 UTC (permalink / raw
  To: gentoo-commits

commit:     18749d45f9d4fcb9c1189423563a75ec8fd73216
Author:     Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Mon Jul 15 19:43:24 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 15:45:45 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18749d45

sci-physics/geant-vmc: Version bump to 4.4.0.

Compatible with latest sci-physics/geant.

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sci-physics/geant-vmc/Manifest               |  1 +
 sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild | 88 ++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+)

diff --git a/sci-physics/geant-vmc/Manifest b/sci-physics/geant-vmc/Manifest
index 0bd6fad71af..a4d93d148dc 100644
--- a/sci-physics/geant-vmc/Manifest
+++ b/sci-physics/geant-vmc/Manifest
@@ -1 +1,2 @@
 DIST geant4_vmc.3.6.tar.gz 1017407 BLAKE2B f386ea49843abedbed16ba1d12a10ae4165123fb0f7842482c416becf4141bc15360be1038626ce40f96a9dbb15d27116cd2fbd46d74b856d5a9391d073784a5 SHA512 eaf8626a3702149a1c5be4adff7843ef828da8024aafb8de489dd6b55b4ee05850581318d01032a4008767ad4e2fc0fde23e1aa5c751693e902d51ce9ad3d1df
+DIST geant4_vmc.4.0.tar.gz 7118838 BLAKE2B 5edbd13adeeb560188deb54c1f5d52fda371dd5f3dc04d676bcaf7edad0bbf8eb573d6345e5c3626b5b64c229d49b7f02aafec77a2587e525cf3f407444391b5 SHA512 faf5fed17b317399b97f77ff1c2a1bf1cead8f0b02a3a89244f01f8ae04ce621763e52b40000e481b3826796bb4d94216368d2e3c98a62f02048c5979f4ee648

diff --git a/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild b/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
new file mode 100644
index 00000000000..ae53bfcd41d
--- /dev/null
+++ b/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
@@ -0,0 +1,88 @@
+# 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/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="
+	!geant3? ( test )
+	!g4root? ( test )
+	!mtroot? ( test )
+	!test? ( test )
+	!vgm? ( test )"
+
+DOCS=(
+	history
+	README.md
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DGeant4VMC_USE_VGM="$(usex vgm)"
+		-DGeant4VMC_USE_GEANT4_G3TOG4="$(usex geant3)"
+		-DGeant4VMC_USE_G4Root="$(usex g4root)"
+		-DGeant4VMC_BUILD_MTRoot="$(usex mtroot)"
+		-DGeant4VMC_BUILD_EXAMPLES="$(usex test)"
+		-DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_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
+	./test_suite.sh --g3=off --builddir="${BUILD_DIR}" || die
+	./test_suite_exe.sh --g3=off --builddir="${BUILD_DIR}" || die
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && local HTML_DOCS=(doc/.)
+	einstalldocs
+}


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant-vmc/
@ 2019-12-12 16:46 Michał Górny
  0 siblings, 0 replies; 14+ messages in thread
From: Michał Górny @ 2019-12-12 16:46 UTC (permalink / raw
  To: gentoo-commits

commit:     8d42897e0ae206eaa42cf854d09bed052a9b0e5b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 15:33:39 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 16:35:16 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d42897e

sci-physics/geant-vmc: [QA] Fix MissingTestRestrict

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sci-physics/geant-vmc/geant-vmc-4.3.6.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-physics/geant-vmc/geant-vmc-4.3.6.ebuild b/sci-physics/geant-vmc/geant-vmc-4.3.6.ebuild
index 2156a04588f..c24d2ccce83 100644
--- a/sci-physics/geant-vmc/geant-vmc-4.3.6.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-4.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -35,6 +35,7 @@ RESTRICT="
 	!geant3? ( test )
 	!g4root? ( test )
 	!mtroot? ( test )
+	!test? ( test )
 	!vgm? ( test )"
 
 DOCS=(


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant-vmc/
@ 2020-03-16 18:04 Matt Turner
  0 siblings, 0 replies; 14+ messages in thread
From: Matt Turner @ 2020-03-16 18:04 UTC (permalink / raw
  To: gentoo-commits

commit:     37f8fb3a611da78144838123b35dc0fb6f8fc875
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 16 18:03:45 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 16 18:03:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37f8fb3a

sci-physics/geant-vmc: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 sci-physics/geant-vmc/Manifest                  |  1 -
 sci-physics/geant-vmc/geant-vmc-4.3.6-r1.ebuild | 89 -------------------------
 sci-physics/geant-vmc/geant-vmc-4.3.6.ebuild    | 89 -------------------------
 3 files changed, 179 deletions(-)

diff --git a/sci-physics/geant-vmc/Manifest b/sci-physics/geant-vmc/Manifest
index a4d93d148dc..bdc478d40f6 100644
--- a/sci-physics/geant-vmc/Manifest
+++ b/sci-physics/geant-vmc/Manifest
@@ -1,2 +1 @@
-DIST geant4_vmc.3.6.tar.gz 1017407 BLAKE2B f386ea49843abedbed16ba1d12a10ae4165123fb0f7842482c416becf4141bc15360be1038626ce40f96a9dbb15d27116cd2fbd46d74b856d5a9391d073784a5 SHA512 eaf8626a3702149a1c5be4adff7843ef828da8024aafb8de489dd6b55b4ee05850581318d01032a4008767ad4e2fc0fde23e1aa5c751693e902d51ce9ad3d1df
 DIST geant4_vmc.4.0.tar.gz 7118838 BLAKE2B 5edbd13adeeb560188deb54c1f5d52fda371dd5f3dc04d676bcaf7edad0bbf8eb573d6345e5c3626b5b64c229d49b7f02aafec77a2587e525cf3f407444391b5 SHA512 faf5fed17b317399b97f77ff1c2a1bf1cead8f0b02a3a89244f01f8ae04ce621763e52b40000e481b3826796bb4d94216368d2e3c98a62f02048c5979f4ee648

diff --git a/sci-physics/geant-vmc/geant-vmc-4.3.6-r1.ebuild b/sci-physics/geant-vmc/geant-vmc-4.3.6-r1.ebuild
deleted file mode 100644
index 585f02e1660..00000000000
--- a/sci-physics/geant-vmc/geant-vmc-4.3.6-r1.ebuild
+++ /dev/null
@@ -1,89 +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/geant-4.10.05:=
-	sci-physics/root:=[c++11,vmc]
-	vgm? ( >=sci-physics/vgm-4.4:= )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-RESTRICT="
-	!geant3? ( test )
-	!g4root? ( test )
-	!mtroot? ( test )
-	!test? ( test )
-	!vgm? ( test )"
-
-DOCS=(
-	history
-	README.md
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DGeant4VMC_USE_VGM="$(usex vgm)"
-		-DGeant4VMC_USE_GEANT4_G3TOG4="$(usex geant3)"
-		-DGeant4VMC_USE_G4Root="$(usex g4root)"
-		-DGeant4VMC_BUILD_MTRoot="$(usex mtroot)"
-		-DGeant4VMC_BUILD_EXAMPLES="$(usex test)"
-		-DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc ; then
-		local dirs=(
-			source
-			$(usev g4root)
-			$(usev mtroot)
-			$(usev examples)
-		)
-		local d
-		for d in "${dirs[@]}"; do
-			pushd "${d}" > /dev/null || die
-			doxygen || die
-			popd > /dev/null || die
-		done
-	fi
-}
-
-src_test() {
-	# 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
-	./test_suite.sh --g3=off --builddir="${BUILD_DIR}" || die
-	./test_suite_exe.sh --g3=off --builddir="${BUILD_DIR}" || die
-}
-
-src_install() {
-	cmake_src_install
-	use doc && local HTML_DOCS=(doc/.)
-	einstalldocs
-}

diff --git a/sci-physics/geant-vmc/geant-vmc-4.3.6.ebuild b/sci-physics/geant-vmc/geant-vmc-4.3.6.ebuild
deleted file mode 100644
index c24d2ccce83..00000000000
--- a/sci-physics/geant-vmc/geant-vmc-4.3.6.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eapi7-ver
-
-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[root7] flag activates std=c++14, which we could only support if also Geant is built with it.
-# Disable for now.
-RDEPEND="
-	>=sci-physics/geant-4.10.03:=[opengl,geant3?]
-	sci-physics/root:=[-root7]
-	vgm? ( >=sci-physics/vgm-4.4:= )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-RESTRICT="
-	!geant3? ( test )
-	!g4root? ( test )
-	!mtroot? ( test )
-	!test? ( test )
-	!vgm? ( test )"
-
-DOCS=(
-	history
-	README.md
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DGeant4VMC_USE_VGM="$(usex vgm)"
-		-DGeant4VMC_USE_GEANT4_G3TOG4="$(usex geant3)"
-		-DGeant4VMC_USE_G4Root="$(usex g4root)"
-		-DGeant4VMC_BUILD_MTRoot="$(usex mtroot)"
-		-DGeant4VMC_BUILD_EXAMPLES="$(usex test)"
-		-DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_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
-	./test_suite.sh --g3=off --builddir="${BUILD_DIR}" || die
-	./test_suite_exe.sh --g3=off --builddir="${BUILD_DIR}" || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && local HTML_DOCS=(doc/.)
-	einstalldocs
-}


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant-vmc/
@ 2020-05-20 12:38 Guilherme Amadio
  0 siblings, 0 replies; 14+ messages in thread
From: Guilherme Amadio @ 2020-05-20 12:38 UTC (permalink / raw
  To: gentoo-commits

commit:     18066a823662ba9f21093ba36f978dd72aa007c1
Author:     Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Sun May  3 19:51:04 2020 +0000
Commit:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed May 20 12:37:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18066a82

sci-physics/geant-vmc: Version bump to 4.5.1_p1

New version is now compatible with sci-physics/vmc.

Closes: https://github.com/gentoo/gentoo/pull/15631

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --force
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>

 sci-physics/geant-vmc/Manifest                     |  1 +
 ...t-vmc-9999.ebuild => geant-vmc-4.5.1_p1.ebuild} | 43 ++++++++++++----------
 sci-physics/geant-vmc/geant-vmc-9999.ebuild        | 43 ++++++++++++----------
 sci-physics/geant-vmc/metadata.xml                 |  8 ++++
 4 files changed, 55 insertions(+), 40 deletions(-)

diff --git a/sci-physics/geant-vmc/Manifest b/sci-physics/geant-vmc/Manifest
index bdc478d40f6..173a1bead9d 100644
--- a/sci-physics/geant-vmc/Manifest
+++ b/sci-physics/geant-vmc/Manifest
@@ -1 +1,2 @@
+DIST geant-vmc-4.5.1_p1.tar.gz 7441504 BLAKE2B 2bcb844a8fc79c800eec50f914cd7238a68ba0c1ffa1e8d185adcded70583118e39efbac3330f7942a098fc64f990c1e9e0eeb1796f71ebd98f97d121aa6c121 SHA512 760611c1df481ea3d9f9069061678677ffc2bcf9edd7cfd44789a6359b945bc341f705da0ee85ecda7f8ac2b096cd5b7aa9ea2c44b464e3085c16eeb33ee1316
 DIST geant4_vmc.4.0.tar.gz 7118838 BLAKE2B 5edbd13adeeb560188deb54c1f5d52fda371dd5f3dc04d676bcaf7edad0bbf8eb573d6345e5c3626b5b64c229d49b7f02aafec77a2587e525cf3f407444391b5 SHA512 faf5fed17b317399b97f77ff1c2a1bf1cead8f0b02a3a89244f01f8ae04ce621763e52b40000e481b3826796bb4d94216368d2e3c98a62f02048c5979f4ee648

diff --git a/sci-physics/geant-vmc/geant-vmc-9999.ebuild b/sci-physics/geant-vmc/geant-vmc-4.5.1_p1.ebuild
similarity index 61%
copy from sci-physics/geant-vmc/geant-vmc-9999.ebuild
copy to sci-physics/geant-vmc/geant-vmc-4.5.1_p1.ebuild
index 9c27c2d98ef..b28eff16cc8 100644
--- a/sci-physics/geant-vmc/geant-vmc-9999.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-4.5.1_p1.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
@@ -8,26 +8,35 @@ inherit cmake
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/vmc-project/geant4_vmc.git"
+	KEYWORDS=""
 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"
+	MY_PV=$(ver_rs 1-2 - $(ver_cut 2-))
+	SRC_URI="https://github.com/vmc-project/geant4-vmc/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/geant4_vmc-${MY_PV}"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Virtual Monte Carlo Geant4 implementation"
 HOMEPAGE="http://root.cern.ch/root/vmc/VirtualMC.html"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="4"
-IUSE="doc examples geant3 +g4root +mtroot vgm test"
+IUSE="+c++11 c++14 c++17 doc examples geant3 +g4root +mtroot rootvmc vgm test"
+
+REQUIRED_USE="^^ ( c++11 c++14 c++17 )"
 
-# 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:= )"
+	rootvmc? (
+		>=sci-physics/root-6.18:=[vmc]
+		!!sci-physics/vmc
+	)
+	!rootvmc? (
+		>=sci-physics/root-6.18:=[-vmc]
+		sci-physics/vmc:=[c++11?,c++14?,c++17?]
+	)
+	>=sci-physics/geant-4.10.6[c++11?,c++14?,c++17?,opengl,geant3?]
+	>=sci-physics/root-6.18:=[c++11?,c++14?,c++17?]
+	vgm? ( >=sci-physics/vgm-4.8:=[c++11?,c++14?,c++17?] )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 RESTRICT="
@@ -38,10 +47,7 @@ RESTRICT="
 	!test? ( test )
 	!vgm? ( test )"
 
-DOCS=(
-	history
-	README.md
-)
+DOCS=(history README.md)
 
 src_configure() {
 	local mycmakeargs=(
@@ -74,12 +80,9 @@ src_compile() {
 }
 
 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
 	./test_suite.sh --debug --g3=off --garfield=off --builddir="${BUILD_DIR}" || die
-	./test_suite_exe.sh -debug --g3=off --garfield=off --builddir="${BUILD_DIR}" || die
+	./test_suite_exe.sh --g3=off --garfield=off --garfield=off --builddir="${BUILD_DIR}" || die
 }
 
 src_install() {

diff --git a/sci-physics/geant-vmc/geant-vmc-9999.ebuild b/sci-physics/geant-vmc/geant-vmc-9999.ebuild
index 9c27c2d98ef..b28eff16cc8 100644
--- a/sci-physics/geant-vmc/geant-vmc-9999.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-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
@@ -8,26 +8,35 @@ inherit cmake
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/vmc-project/geant4_vmc.git"
+	KEYWORDS=""
 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"
+	MY_PV=$(ver_rs 1-2 - $(ver_cut 2-))
+	SRC_URI="https://github.com/vmc-project/geant4-vmc/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/geant4_vmc-${MY_PV}"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Virtual Monte Carlo Geant4 implementation"
 HOMEPAGE="http://root.cern.ch/root/vmc/VirtualMC.html"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="4"
-IUSE="doc examples geant3 +g4root +mtroot vgm test"
+IUSE="+c++11 c++14 c++17 doc examples geant3 +g4root +mtroot rootvmc vgm test"
+
+REQUIRED_USE="^^ ( c++11 c++14 c++17 )"
 
-# 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:= )"
+	rootvmc? (
+		>=sci-physics/root-6.18:=[vmc]
+		!!sci-physics/vmc
+	)
+	!rootvmc? (
+		>=sci-physics/root-6.18:=[-vmc]
+		sci-physics/vmc:=[c++11?,c++14?,c++17?]
+	)
+	>=sci-physics/geant-4.10.6[c++11?,c++14?,c++17?,opengl,geant3?]
+	>=sci-physics/root-6.18:=[c++11?,c++14?,c++17?]
+	vgm? ( >=sci-physics/vgm-4.8:=[c++11?,c++14?,c++17?] )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 RESTRICT="
@@ -38,10 +47,7 @@ RESTRICT="
 	!test? ( test )
 	!vgm? ( test )"
 
-DOCS=(
-	history
-	README.md
-)
+DOCS=(history README.md)
 
 src_configure() {
 	local mycmakeargs=(
@@ -74,12 +80,9 @@ src_compile() {
 }
 
 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
 	./test_suite.sh --debug --g3=off --garfield=off --builddir="${BUILD_DIR}" || die
-	./test_suite_exe.sh -debug --g3=off --garfield=off --builddir="${BUILD_DIR}" || die
+	./test_suite_exe.sh --g3=off --garfield=off --garfield=off --builddir="${BUILD_DIR}" || die
 }
 
 src_install() {

diff --git a/sci-physics/geant-vmc/metadata.xml b/sci-physics/geant-vmc/metadata.xml
index ef4bdfb269e..02aa869b861 100644
--- a/sci-physics/geant-vmc/metadata.xml
+++ b/sci-physics/geant-vmc/metadata.xml
@@ -5,6 +5,10 @@
     <email>o.freyermuth@googlemail.com</email>
     <name>Oliver Freyermuth</name>
   </maintainer>
+  <maintainer type="person">
+    <email>amadio@gentoo.org</email>
+    <name>Guilherme Amadio</name>
+  </maintainer>
   <maintainer type="project">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
@@ -13,9 +17,13 @@
     <remote-id type="github">vmc-project/geant4_vmc</remote-id>
   </upstream>
   <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="vgm">Enable the Virtual Geometry Model (<pkg>sci-physics/vgm</pkg>)</flag>
     <flag name="g4root">Build G4Root (interface for GEANT4 simulation with a ROOT geometry)</flag>
     <flag name="geant3">Build with Geant4 G3toG4 library</flag>
     <flag name="mtroot">Build MTRoot (provides ROOT IO manager classes with multi-threading support)</flag>
+    <flag name="rootvmc">Use sci-physics/root[vmc] (deprecated) instead of sci-physics/vmc as VMC provider</flag>
   </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant-vmc/
@ 2021-01-17 10:16 Joonas Niilola
  0 siblings, 0 replies; 14+ messages in thread
From: Joonas Niilola @ 2021-01-17 10:16 UTC (permalink / raw
  To: gentoo-commits

commit:     8a64b8d592525697c072b352925f00cec8cb732b
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 10:08:41 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 10:16:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a64b8d5

sci-physics/geant-vmc: ebuild enhancement for 4.5.3

 - add BDEPEND,
 - remove KEYWORDS line from 9999 if-block,
 - update HOMEPAGE.

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 sci-physics/geant-vmc/geant-vmc-4.5.3.ebuild | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/sci-physics/geant-vmc/geant-vmc-4.5.3.ebuild b/sci-physics/geant-vmc/geant-vmc-4.5.3.ebuild
index b28eff16cc8..a4e3263f8af 100644
--- a/sci-physics/geant-vmc/geant-vmc-4.5.3.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-4.5.3.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/geant4_vmc.git"
-	KEYWORDS=""
 else
 	MY_PV=$(ver_rs 1-2 - $(ver_cut 2-))
 	SRC_URI="https://github.com/vmc-project/geant4-vmc/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
@@ -17,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Virtual Monte Carlo Geant4 implementation"
-HOMEPAGE="http://root.cern.ch/root/vmc/VirtualMC.html"
+HOMEPAGE="https://github.com/vmc-project/vmc"
 
 LICENSE="GPL-3"
 SLOT="4"
@@ -37,8 +36,8 @@ RDEPEND="
 	>=sci-physics/geant-4.10.6[c++11?,c++14?,c++17?,opengl,geant3?]
 	>=sci-physics/root-6.18:=[c++11?,c++14?,c++17?]
 	vgm? ( >=sci-physics/vgm-4.8:=[c++11?,c++14?,c++17?] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 RESTRICT="
 	!examples? ( test )
 	!geant3? ( test )


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant-vmc/
@ 2021-01-17 10:16 Joonas Niilola
  0 siblings, 0 replies; 14+ messages in thread
From: Joonas Niilola @ 2021-01-17 10:16 UTC (permalink / raw
  To: gentoo-commits

commit:     d2f24698a738cf314b5d7e003193ca10d3c9f463
Author:     Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Sun Dec 20 16:32:29 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=d2f24698

sci-physics/geant-vmc: Version bump to 4.5.3.

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 sci-physics/geant-vmc/Manifest               |  1 +
 sci-physics/geant-vmc/geant-vmc-4.5.3.ebuild | 92 ++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+)

diff --git a/sci-physics/geant-vmc/Manifest b/sci-physics/geant-vmc/Manifest
index 173a1bead9d..d68add146ca 100644
--- a/sci-physics/geant-vmc/Manifest
+++ b/sci-physics/geant-vmc/Manifest
@@ -1,2 +1,3 @@
 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/geant-vmc-4.5.3.ebuild b/sci-physics/geant-vmc/geant-vmc-4.5.3.ebuild
new file mode 100644
index 00000000000..b28eff16cc8
--- /dev/null
+++ b/sci-physics/geant-vmc/geant-vmc-4.5.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 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"
+	KEYWORDS=""
+else
+	MY_PV=$(ver_rs 1-2 - $(ver_cut 2-))
+	SRC_URI="https://github.com/vmc-project/geant4-vmc/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/geant4_vmc-${MY_PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Virtual Monte Carlo Geant4 implementation"
+HOMEPAGE="http://root.cern.ch/root/vmc/VirtualMC.html"
+
+LICENSE="GPL-3"
+SLOT="4"
+IUSE="+c++11 c++14 c++17 doc examples geant3 +g4root +mtroot rootvmc vgm test"
+
+REQUIRED_USE="^^ ( c++11 c++14 c++17 )"
+
+RDEPEND="
+	rootvmc? (
+		>=sci-physics/root-6.18:=[vmc]
+		!!sci-physics/vmc
+	)
+	!rootvmc? (
+		>=sci-physics/root-6.18:=[-vmc]
+		sci-physics/vmc:=[c++11?,c++14?,c++17?]
+	)
+	>=sci-physics/geant-4.10.6[c++11?,c++14?,c++17?,opengl,geant3?]
+	>=sci-physics/root-6.18:=[c++11?,c++14?,c++17?]
+	vgm? ( >=sci-physics/vgm-4.8:=[c++11?,c++14?,c++17?] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+RESTRICT="
+	!examples? ( test )
+	!geant3? ( test )
+	!g4root? ( test )
+	!mtroot? ( test )
+	!test? ( test )
+	!vgm? ( test )"
+
+DOCS=(history README.md)
+
+src_configure() {
+	local mycmakeargs=(
+		-DGeant4VMC_USE_VGM="$(usex vgm)"
+		-DGeant4VMC_USE_GEANT4_G3TOG4="$(usex geant3)"
+		-DGeant4VMC_USE_G4Root="$(usex g4root)"
+		-DGeant4VMC_BUILD_MTRoot="$(usex mtroot)"
+		-DGeant4VMC_BUILD_EXAMPLES="$(usex test)"
+		-DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc ; then
+		local dirs=(
+			source
+			$(usev g4root)
+			$(usev mtroot)
+			$(usev examples)
+		)
+		local d
+		for d in "${dirs[@]}"; do
+			pushd "${d}" > /dev/null || die
+			doxygen || die
+			popd > /dev/null || die
+		done
+	fi
+}
+
+src_test() {
+	cd examples || die
+	./test_suite.sh --debug --g3=off --garfield=off --builddir="${BUILD_DIR}" || die
+	./test_suite_exe.sh --g3=off --garfield=off --garfield=off --builddir="${BUILD_DIR}" || die
+}
+
+src_install() {
+	cmake_src_install
+	use doc && local HTML_DOCS=(doc/.)
+	einstalldocs
+}


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant-vmc/
@ 2021-01-17 10:16 Joonas Niilola
  0 siblings, 0 replies; 14+ messages in thread
From: Joonas Niilola @ 2021-01-17 10:16 UTC (permalink / raw
  To: gentoo-commits

commit:     f2cf41261b977773f35e3ba7285822f94485ce95
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 10:09:20 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 10:16:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2cf4126

sci-physics/geant-vmc: sync live ebuild

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 sci-physics/geant-vmc/geant-vmc-9999.ebuild | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/sci-physics/geant-vmc/geant-vmc-9999.ebuild b/sci-physics/geant-vmc/geant-vmc-9999.ebuild
index b28eff16cc8..a4e3263f8af 100644
--- a/sci-physics/geant-vmc/geant-vmc-9999.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-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
@@ -8,7 +8,6 @@ inherit cmake
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/vmc-project/geant4_vmc.git"
-	KEYWORDS=""
 else
 	MY_PV=$(ver_rs 1-2 - $(ver_cut 2-))
 	SRC_URI="https://github.com/vmc-project/geant4-vmc/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
@@ -17,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Virtual Monte Carlo Geant4 implementation"
-HOMEPAGE="http://root.cern.ch/root/vmc/VirtualMC.html"
+HOMEPAGE="https://github.com/vmc-project/vmc"
 
 LICENSE="GPL-3"
 SLOT="4"
@@ -37,8 +36,8 @@ RDEPEND="
 	>=sci-physics/geant-4.10.6[c++11?,c++14?,c++17?,opengl,geant3?]
 	>=sci-physics/root-6.18:=[c++11?,c++14?,c++17?]
 	vgm? ( >=sci-physics/vgm-4.8:=[c++11?,c++14?,c++17?] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 RESTRICT="
 	!examples? ( test )
 	!geant3? ( test )


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant-vmc/
@ 2021-01-20 10:16 David Seifert
  0 siblings, 0 replies; 14+ messages in thread
From: David Seifert @ 2021-01-20 10:16 UTC (permalink / raw
  To: gentoo-commits

commit:     ee710984579dd84d3591b528f6d05d45fe61244f
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Wed Jan 20 10:16:05 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 10:16:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee710984

sci-physics/geant-vmc: Remove old

Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-physics/geant-vmc/Manifest                  |  1 -
 sci-physics/geant-vmc/geant-vmc-4.5.1_p1.ebuild | 92 -------------------------
 2 files changed, 93 deletions(-)

diff --git a/sci-physics/geant-vmc/Manifest b/sci-physics/geant-vmc/Manifest
index 016c1ffe961..f28791df07e 100644
--- a/sci-physics/geant-vmc/Manifest
+++ b/sci-physics/geant-vmc/Manifest
@@ -1,2 +1 @@
-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

diff --git a/sci-physics/geant-vmc/geant-vmc-4.5.1_p1.ebuild b/sci-physics/geant-vmc/geant-vmc-4.5.1_p1.ebuild
deleted file mode 100644
index b28eff16cc8..00000000000
--- a/sci-physics/geant-vmc/geant-vmc-4.5.1_p1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 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"
-	KEYWORDS=""
-else
-	MY_PV=$(ver_rs 1-2 - $(ver_cut 2-))
-	SRC_URI="https://github.com/vmc-project/geant4-vmc/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/geant4_vmc-${MY_PV}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Virtual Monte Carlo Geant4 implementation"
-HOMEPAGE="http://root.cern.ch/root/vmc/VirtualMC.html"
-
-LICENSE="GPL-3"
-SLOT="4"
-IUSE="+c++11 c++14 c++17 doc examples geant3 +g4root +mtroot rootvmc vgm test"
-
-REQUIRED_USE="^^ ( c++11 c++14 c++17 )"
-
-RDEPEND="
-	rootvmc? (
-		>=sci-physics/root-6.18:=[vmc]
-		!!sci-physics/vmc
-	)
-	!rootvmc? (
-		>=sci-physics/root-6.18:=[-vmc]
-		sci-physics/vmc:=[c++11?,c++14?,c++17?]
-	)
-	>=sci-physics/geant-4.10.6[c++11?,c++14?,c++17?,opengl,geant3?]
-	>=sci-physics/root-6.18:=[c++11?,c++14?,c++17?]
-	vgm? ( >=sci-physics/vgm-4.8:=[c++11?,c++14?,c++17?] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-RESTRICT="
-	!examples? ( test )
-	!geant3? ( test )
-	!g4root? ( test )
-	!mtroot? ( test )
-	!test? ( test )
-	!vgm? ( test )"
-
-DOCS=(history README.md)
-
-src_configure() {
-	local mycmakeargs=(
-		-DGeant4VMC_USE_VGM="$(usex vgm)"
-		-DGeant4VMC_USE_GEANT4_G3TOG4="$(usex geant3)"
-		-DGeant4VMC_USE_G4Root="$(usex g4root)"
-		-DGeant4VMC_BUILD_MTRoot="$(usex mtroot)"
-		-DGeant4VMC_BUILD_EXAMPLES="$(usex test)"
-		-DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc ; then
-		local dirs=(
-			source
-			$(usev g4root)
-			$(usev mtroot)
-			$(usev examples)
-		)
-		local d
-		for d in "${dirs[@]}"; do
-			pushd "${d}" > /dev/null || die
-			doxygen || die
-			popd > /dev/null || die
-		done
-	fi
-}
-
-src_test() {
-	cd examples || die
-	./test_suite.sh --debug --g3=off --garfield=off --builddir="${BUILD_DIR}" || die
-	./test_suite_exe.sh --g3=off --garfield=off --garfield=off --builddir="${BUILD_DIR}" || die
-}
-
-src_install() {
-	cmake_src_install
-	use doc && local HTML_DOCS=(doc/.)
-	einstalldocs
-}


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant-vmc/
@ 2021-06-28 16:15 Guilherme Amadio
  0 siblings, 0 replies; 14+ messages in thread
From: Guilherme Amadio @ 2021-06-28 16:15 UTC (permalink / raw
  To: gentoo-commits

commit:     e77eb6aafa29ea9e5c25229032f5cfd672f3f3e7
Author:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 28 13:58:12 2021 +0000
Commit:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Mon Jun 28 16:15:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e77eb6aa

sci-physics/geant-vmc: remove C++ USE flags, use C++17 as default

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>

 ...ant-vmc-4.5.3.ebuild => geant-vmc-4.5.3-r1.ebuild} | 19 +++++--------------
 sci-physics/geant-vmc/geant-vmc-9999.ebuild           | 19 +++++--------------
 sci-physics/geant-vmc/metadata.xml                    |  4 ----
 3 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/sci-physics/geant-vmc/geant-vmc-4.5.3.ebuild b/sci-physics/geant-vmc/geant-vmc-4.5.3-r1.ebuild
similarity index 78%
rename from sci-physics/geant-vmc/geant-vmc-4.5.3.ebuild
rename to sci-physics/geant-vmc/geant-vmc-4.5.3-r1.ebuild
index a4e3263f8af..d31a6e26d16 100644
--- a/sci-physics/geant-vmc/geant-vmc-4.5.3.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-4.5.3-r1.ebuild
@@ -20,22 +20,13 @@ HOMEPAGE="https://github.com/vmc-project/vmc"
 
 LICENSE="GPL-3"
 SLOT="4"
-IUSE="+c++11 c++14 c++17 doc examples geant3 +g4root +mtroot rootvmc vgm test"
-
-REQUIRED_USE="^^ ( c++11 c++14 c++17 )"
+IUSE="doc examples geant3 +g4root +mtroot vgm test"
 
 RDEPEND="
-	rootvmc? (
-		>=sci-physics/root-6.18:=[vmc]
-		!!sci-physics/vmc
-	)
-	!rootvmc? (
-		>=sci-physics/root-6.18:=[-vmc]
-		sci-physics/vmc:=[c++11?,c++14?,c++17?]
-	)
-	>=sci-physics/geant-4.10.6[c++11?,c++14?,c++17?,opengl,geant3?]
-	>=sci-physics/root-6.18:=[c++11?,c++14?,c++17?]
-	vgm? ( >=sci-physics/vgm-4.8:=[c++11?,c++14?,c++17?] )"
+	sci-physics/geant[c++17,opengl,geant3?]
+	sci-physics/root:=[c++17,-vmc]
+	sci-physics/vmc:=[c++17]
+	vgm? ( sci-physics/vgm:= )"
 DEPEND="${RDEPEND}"
 BDEPEND="doc? ( app-doc/doxygen )"
 RESTRICT="

diff --git a/sci-physics/geant-vmc/geant-vmc-9999.ebuild b/sci-physics/geant-vmc/geant-vmc-9999.ebuild
index a4e3263f8af..d31a6e26d16 100644
--- a/sci-physics/geant-vmc/geant-vmc-9999.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-9999.ebuild
@@ -20,22 +20,13 @@ HOMEPAGE="https://github.com/vmc-project/vmc"
 
 LICENSE="GPL-3"
 SLOT="4"
-IUSE="+c++11 c++14 c++17 doc examples geant3 +g4root +mtroot rootvmc vgm test"
-
-REQUIRED_USE="^^ ( c++11 c++14 c++17 )"
+IUSE="doc examples geant3 +g4root +mtroot vgm test"
 
 RDEPEND="
-	rootvmc? (
-		>=sci-physics/root-6.18:=[vmc]
-		!!sci-physics/vmc
-	)
-	!rootvmc? (
-		>=sci-physics/root-6.18:=[-vmc]
-		sci-physics/vmc:=[c++11?,c++14?,c++17?]
-	)
-	>=sci-physics/geant-4.10.6[c++11?,c++14?,c++17?,opengl,geant3?]
-	>=sci-physics/root-6.18:=[c++11?,c++14?,c++17?]
-	vgm? ( >=sci-physics/vgm-4.8:=[c++11?,c++14?,c++17?] )"
+	sci-physics/geant[c++17,opengl,geant3?]
+	sci-physics/root:=[c++17,-vmc]
+	sci-physics/vmc:=[c++17]
+	vgm? ( sci-physics/vgm:= )"
 DEPEND="${RDEPEND}"
 BDEPEND="doc? ( app-doc/doxygen )"
 RESTRICT="

diff --git a/sci-physics/geant-vmc/metadata.xml b/sci-physics/geant-vmc/metadata.xml
index ed5c44ec6a3..7fc023bcb29 100644
--- a/sci-physics/geant-vmc/metadata.xml
+++ b/sci-physics/geant-vmc/metadata.xml
@@ -17,13 +17,9 @@
     <remote-id type="github">vmc-project/geant4_vmc</remote-id>
   </upstream>
   <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="vgm">Enable the Virtual Geometry Model (<pkg>sci-physics/vgm</pkg>)</flag>
     <flag name="g4root">Build G4Root (interface for GEANT4 simulation with a ROOT geometry)</flag>
     <flag name="geant3">Build with Geant4 G3toG4 library</flag>
     <flag name="mtroot">Build MTRoot (provides ROOT IO manager classes with multi-threading support)</flag>
-    <flag name="rootvmc">Use sci-physics/root[vmc] (deprecated) instead of sci-physics/vmc as VMC provider</flag>
   </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant-vmc/
@ 2021-06-28 16:15 Guilherme Amadio
  0 siblings, 0 replies; 14+ messages in thread
From: Guilherme Amadio @ 2021-06-28 16:15 UTC (permalink / raw
  To: gentoo-commits

commit:     c299b276ed319e2ffa1cf07efca535451531cd41
Author:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 28 15:32:33 2021 +0000
Commit:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Mon Jun 28 16:15:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c299b276

sci-physics/geant-vmc: update dependency on sci-physics/geant

Does not compile against >=sci-physics/geant-4.11.0_beta1.

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>

 sci-physics/geant-vmc/geant-vmc-4.5.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/geant-vmc/geant-vmc-4.5.3-r1.ebuild b/sci-physics/geant-vmc/geant-vmc-4.5.3-r1.ebuild
index d31a6e26d16..1b98d940d1a 100644
--- a/sci-physics/geant-vmc/geant-vmc-4.5.3-r1.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-4.5.3-r1.ebuild
@@ -23,7 +23,7 @@ SLOT="4"
 IUSE="doc examples geant3 +g4root +mtroot vgm test"
 
 RDEPEND="
-	sci-physics/geant[c++17,opengl,geant3?]
+	<sci-physics/geant-4.11[c++17,opengl,geant3?]
 	sci-physics/root:=[c++17,-vmc]
 	sci-physics/vmc:=[c++17]
 	vgm? ( sci-physics/vgm:= )"


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant-vmc/
@ 2021-06-28 19:29 Guilherme Amadio
  0 siblings, 0 replies; 14+ messages in thread
From: Guilherme Amadio @ 2021-06-28 19:29 UTC (permalink / raw
  To: gentoo-commits

commit:     e842c56f51549136e881b53f36949448a7b4ee07
Author:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 28 19:29:18 2021 +0000
Commit:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Mon Jun 28 19:29:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e842c56f

sci-physics/geant-vmc: update HOMEPAGE and SRC_URI

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>

 sci-physics/geant-vmc/geant-vmc-4.5.3-r1.ebuild | 4 ++--
 sci-physics/geant-vmc/geant-vmc-9999.ebuild     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-physics/geant-vmc/geant-vmc-4.5.3-r1.ebuild b/sci-physics/geant-vmc/geant-vmc-4.5.3-r1.ebuild
index 1b98d940d1a..cafdbf75e09 100644
--- a/sci-physics/geant-vmc/geant-vmc-4.5.3-r1.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-4.5.3-r1.ebuild
@@ -10,13 +10,13 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/vmc-project/geant4_vmc.git"
 else
 	MY_PV=$(ver_rs 1-2 - $(ver_cut 2-))
-	SRC_URI="https://github.com/vmc-project/geant4-vmc/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/vmc-project/geant4_vmc/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/geant4_vmc-${MY_PV}"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Virtual Monte Carlo Geant4 implementation"
-HOMEPAGE="https://github.com/vmc-project/vmc"
+HOMEPAGE="https://github.com/vmc-project/geant4_vmc"
 
 LICENSE="GPL-3"
 SLOT="4"

diff --git a/sci-physics/geant-vmc/geant-vmc-9999.ebuild b/sci-physics/geant-vmc/geant-vmc-9999.ebuild
index d31a6e26d16..b22fc0afcbf 100644
--- a/sci-physics/geant-vmc/geant-vmc-9999.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-9999.ebuild
@@ -10,13 +10,13 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/vmc-project/geant4_vmc.git"
 else
 	MY_PV=$(ver_rs 1-2 - $(ver_cut 2-))
-	SRC_URI="https://github.com/vmc-project/geant4-vmc/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/vmc-project/geant4_vmc/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/geant4_vmc-${MY_PV}"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Virtual Monte Carlo Geant4 implementation"
-HOMEPAGE="https://github.com/vmc-project/vmc"
+HOMEPAGE="https://github.com/vmc-project/geant4_vmc"
 
 LICENSE="GPL-3"
 SLOT="4"


^ permalink raw reply related	[flat|nested] 14+ messages in thread
end of thread, other threads:[~2021-06-28 19:29 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-18 16:12 [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant-vmc/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2021-06-28 19:29 Guilherme Amadio
2021-06-28 16:15 Guilherme Amadio
2021-06-28 16:15 Guilherme Amadio
2021-01-20 10:16 David Seifert
2021-01-17 10:16 Joonas Niilola
2021-01-17 10:16 Joonas Niilola
2021-01-17 10:16 Joonas Niilola
2020-05-20 12:38 Guilherme Amadio
2020-03-16 18:04 Matt Turner
2019-12-12 16:46 Michał Górny
2019-07-18 16:12 Michał Górny
2019-07-18 16:12 Michał Górny
2018-08-23 14:19 Guilherme Amadio

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox