gentoo resync : 30.05.2020

4 files changed, 127 insertions, 22 deletions

diff --git a/sci-physics/geant-vmc/Manifest b/sci-physics/geant-vmc/Manifest
index 3bf35d888da4..60fee01a124d 100644
--- a/sci-physics/geant-vmc/Manifest
+++ b/sci-physics/geant-vmc/Manifest
@@ -1,5 +1,7 @@
 AUX geant-vmc-4.4.0-fix-cflags.patch 661 BLAKE2B 121054bdcf8dfae328334221cc85c7d117a8dd9b0b096499ea07938bb05f303759c6478c2187f36e7b4ba22f4e1f0935d980802ce5195c1d2d9b5202d240b683 SHA512 7c6b7c253088a780101c51ac9a055fe79f65d78996206fce77d9e70a558e2b5b222eee4ccba689e68effc429cb8b2d41c6021fe4bead7d44f52daa1820a308a2
+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
 EBUILD geant-vmc-4.4.0.ebuild 2442 BLAKE2B 60d7a84b777d2f87fde249a31b05a9a0e6fd90f1f9e5c7b74d0770e9dd6f2f40663316b39e68f56e9ccf9b4edf9d9a1aec2ae83f13435529992eb7fb88ca59ec SHA512 c533ceccfdeed7ecaa4596056a11f6fcec9828a7f3f82556dd24686d59313318b4982ac87f57ef20d44393cd9c7308904dd2f3dc4a0d155f7e304f280fe97d1c
-EBUILD geant-vmc-9999.ebuild 2087 BLAKE2B 2c922fce9990e941b90bbc13d90e6938cfcbe9eb4b75bb67847e6b194530ec2c7441733d7d5a2cc128d90c30a57210c500cc17be30206e2a6a57e336e22cae4e SHA512 8db090fb5919def57b56f34bd0dba1d8dd461b16a664e2586e6b0f82d95030384450e395d606281c1f26363d89198d5127862af0f838fd42b53cc3c2943af08f
-MISC metadata.xml 859 BLAKE2B 4bec2c6236dfc1bdb9ba9f1caff6c9b545861c6e51c58d90bfa652d2d5aaa323437473173912f1840ba3c690f92798929980e5bcb3cacb5fe4cdd8a0edb014d9 SHA512 15a0f421563051a8553e2bdf9a8f82dc5077e336513cc18ef7e9bea49e084ea4dc1aa32800fbc928743d8c09036d136518a5a6a74c2f57c61215da2f44dc9727
+EBUILD geant-vmc-4.5.1_p1.ebuild 2145 BLAKE2B 27addb17a3e05d8d635e6f2e57b2cb106857776d31862003f242a5a5c180cb2b5ec2162ab9a3d0f4124aa86560352f732f22e512b5a6f09fd738a7f5b1c49daf SHA512 85f23a09ba6ce4ddc905807955f944491d6e2ebc1889a0eda979ea82c89770cb822dfbc48c718103ae42075ef7d53160194689e562b993d7523ccdb47ff7ba2c
+EBUILD geant-vmc-9999.ebuild 2145 BLAKE2B 27addb17a3e05d8d635e6f2e57b2cb106857776d31862003f242a5a5c180cb2b5ec2162ab9a3d0f4124aa86560352f732f22e512b5a6f09fd738a7f5b1c49daf SHA512 85f23a09ba6ce4ddc905807955f944491d6e2ebc1889a0eda979ea82c89770cb822dfbc48c718103ae42075ef7d53160194689e562b993d7523ccdb47ff7ba2c
+MISC metadata.xml 1272 BLAKE2B 341ef37e4e2262b40fa6161af831f886a9ef2deb7691555323a8b464f731c526eaa2dc118e050b6fdbcd6f6663830ed238c6dc227ac2013617981d06c56731e5 SHA512 9e871ddf520845ea33f6db1f608a0ddfbf29e8c2c2a51a2cb39a419a8de7c0297747fe2c5a9da335923a7ad01795bd37e930da7b3fa6fd042c97acfb09a10a27
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
new file mode 100644
index 000000000000..b28eff16cc8b
--- /dev/null
+++ b/sci-physics/geant-vmc/geant-vmc-4.5.1_p1.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
+}
diff --git a/sci-physics/geant-vmc/geant-vmc-9999.ebuild b/sci-physics/geant-vmc/geant-vmc-9999.ebuild
index 9c27c2d98efa..b28eff16cc8b 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 ef4bdfb269e8..02aa869b861c 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>