gentoo resync : 30.05.2020

6 files changed, 41 insertions, 111 deletions

diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest
index b0bef55f0999..db7b1a048d30 100644
--- a/sci-physics/vgm/Manifest
+++ b/sci-physics/vgm/Manifest
@@ -1,8 +1,7 @@
 AUX vgm-fix-FindCLHEP.patch 2191 BLAKE2B 465bd6dfca5aaedaa85759092d4d66a65f5df8a3be9a78bfd5edf0630e5ea733f23d14a4d892e272d5062927ff2622560987f566d130324cbdb96c097d083800 SHA512 24d6cd832e496ebe573ee6b8a95ac7a777c16919626f9b7019d260295d12766f89f5832bb3d5ca794eb28dbd293828935a92627f11ca55381c6f7645f61893ac
-DIST vgm.4.4.tar.gz 3064087 BLAKE2B 845d04fa3ebaaa07f90ef7f216cac10e5ca4129ebbd6161e3fecce39663379b2575026186fe2b88ae8bf08f71bed6d8afcbbd5d7aa9922d37b3f9ed900d35a33 SHA512 500ae0e2ac66b580bbc26b6cd1a8bd6d6e3127c99e6fe6babe5825406e576d72da5cd76d22d0d1b82d7df9eb74ddddf084ee9a96b544c97af5b12cbf948d3406
-DIST vgm.4.5.tar.gz 9602541 BLAKE2B 183c8ed91546e5421c4f1a873a48285e9d2ab6bf4bb6a7bb7b46ab2c3c80a5dfc50cd5f97890c3994ada67014067349726e9f4d65cda1e1e4f1ae9484a4249ef SHA512 a873e24ed2c6cfc09d1828b60af9059a0bee341410e5cb77c9312aa72f1650a913779a0ff929d98910f01fcc5a3e6a04b352dd1a780a8bf60b1fa925b1985491
-EBUILD vgm-4.4-r1.ebuild 1697 BLAKE2B 75b9591434bb99e5bea85f662326394930193e56ec62d9398ef345f16f4c760b9e9f832c0e3f70afbd81f471677c2d451a88c5fe6dc3707bd3d6ff1b98675aa1 SHA512 25a49d0867722fde3af879934b1f3a7622be8409ce8682f86d4b90eca9d9eac6c6c090f2d93cda62886ab84220eaa790ad0ca2aaa600eac626ddfe60eedd1e09
-EBUILD vgm-4.4.ebuild 1687 BLAKE2B 465f91a5943a39258201724d093dc5cefdf20fe5179c3215945f97bd8fea6b5b4c059daf9a8b652c604463bf3cdfce47c575814ad0db0112dc0e7588b1e807c6 SHA512 01dadc26e284d521c00cbeaa46ab1a3de612435c5e667e57d21f82b87bb9bb099a238c07a9b67bfb368edaa27447c265e666fd2330ebab867a8c15f496567be7
-EBUILD vgm-4.5.ebuild 1691 BLAKE2B 1cb8c51a0177247a5346b4562f08db7fe6f2602e8198b5100d23e0ec444539baffcd5c4ee81249db872eb12aeb803c2f715fa2ab2eacafe7e4c05427c091a99d SHA512 c917101788a8eac679dc02fd5ce65f696cae1f5c40bac7506521706b32fd8a2ae2ad3fbcebc17332e0003bc1369d78b8dc35bb75f3aad0c37500984832a5fa42
-EBUILD vgm-9999.ebuild 1642 BLAKE2B 63346114dcfe38e30e6e552c78c5c4f05c7991bf02d01df29e6ae1e63c1934b5e56d1b149a64cdd37a1ac9fb9fb29c7b491927875596db7229bed77e4e878792 SHA512 37f9b27b5ba784e56d81247684c55e3d2c207020af6e5b89fecf53fe6010a8de10c84e1525b3da596848f123d45d02535f1d346849e270da9d0a1fd2e499ea28
-MISC metadata.xml 887 BLAKE2B 2bed4c9deeb9bbda28704462bf45eaf31d810b115608bd66ccdd8f5e8494556b87962301395d0f0cbf229aaf8d497b1f07b9821600d6c101aad34c5ef49cf643 SHA512 5e52d57dc9cc78020a147c4984aa037b3441f910f6288e75a3919398a0b22d16f312fd910bf0a692bfb039c3540f2854e4f2c660f7d3c4a4c23cbc63f9885dbf
+DIST vgm-4.5.tar.gz 3474063 BLAKE2B 70c4fe0bd5eb9bc94607553ad30ffb625e66ef4e6f8a965b1289c1c7ad6f71d7eba035d2825ba8cd94705a0c223aa56408d3285748b068045eee3a29f556e3b2 SHA512 541fde12e12cc51ba065900788dbceb8e5b9a4e4615a4e4e0bbd2ba199b8a203b6927dbe23ead7bc183bd61f6b641e3e954fe7b78451c2d423d3a2b737f00572
+DIST vgm-4.8.tar.gz 3661965 BLAKE2B 29f878fb6716e261c27d60b2c9081d66313591a053d80f78501973f131aff88bbcee743ff9767836883dcb28d3ce5aeee3759a5890d7c8811a6a61503417284f SHA512 8b7cabc5796649c4014ccbdf1c6d209d2e7c2b4b06258716a72cadd997a9f6f51c4f9cb5870fd10abfd1ee133766876523c84441a69c7242bc2002687ca0ce58
+EBUILD vgm-4.5.ebuild 1731 BLAKE2B a47f04930ae347ad16a5aeece529d38f5cb69bc527316c6979d55e0e90640a33802838a2f6a614d697d0055eae80ef26ffe1bfc69d7fb06d16a60d5c1e273433 SHA512 3850bae4ba6a413579e0d00cb8963b44e99558b01ef386adaf86b4d953a12293049e5bf23e71ba1ee79aee68036cbdf95f394a90e25fa1e50be136d5b2729599
+EBUILD vgm-4.8.ebuild 1723 BLAKE2B e245ba4e11697a0afde229b6ddb4ae5c815c38ac03d44ae026f4c643cbf5dde0a09816f80ab58751849f73fa48002971d652ae1aa815de55e203ad34ef023ade SHA512 8bddb92ff4a061e0d24cce45afe3d1361e5d76dd666358ad87ced6f5b58a94aa95b888a1d052acf90d2e1241972bf5f87c774172118091e8f94c521f58eef2ce
+EBUILD vgm-9999.ebuild 1723 BLAKE2B e245ba4e11697a0afde229b6ddb4ae5c815c38ac03d44ae026f4c643cbf5dde0a09816f80ab58751849f73fa48002971d652ae1aa815de55e203ad34ef023ade SHA512 8bddb92ff4a061e0d24cce45afe3d1361e5d76dd666358ad87ced6f5b58a94aa95b888a1d052acf90d2e1241972bf5f87c774172118091e8f94c521f58eef2ce
+MISC metadata.xml 1125 BLAKE2B 68595b87c779be5084958e3b459a9d14da2a5a824fbd803a7e9cd8faf54929304b1f690cdc3263d816ba0a2f52268c60a450543ece3bc85587e3736378b8c95a SHA512 5e71328efba446a86aee20d30f455aa58de31002eb4cae2f375b9a9e7c282a37b7adfc7c43f751fd06c7bce2cb07c5d615629ab8f8c0dfebdb3e083461b99764
diff --git a/sci-physics/vgm/metadata.xml b/sci-physics/vgm/metadata.xml
index cd1e3ea3587f..a056f1947583 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>
@@ -15,6 +18,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.4.ebuild b/sci-physics/vgm/vgm-4.4.ebuild
deleted file mode 100644
index 831f0cc0c4a2..000000000000
--- 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
-}
diff --git a/sci-physics/vgm/vgm-4.5.ebuild b/sci-physics/vgm/vgm-4.5.ebuild
index 66433421fc47..6d8a518fd73f 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"
@@ -24,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-4.4-r1.ebuild b/sci-physics/vgm/vgm-4.8.ebuild
index 1ef3af47246f..5fba573e3f61 100644
--- a/sci-physics/vgm/vgm-4.4-r1.ebuild
+++ b/sci-physics/vgm/vgm-4.8.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,10 +8,12 @@ inherit cmake
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
+	KEYWORDS=""
 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"
@@ -19,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] )"
@@ -41,9 +44,6 @@ DOCS=(
 	doc/VGM.html
 	doc/VGMversions.html
 )
-PATCHES=(
-	"${FILESDIR}"/"${PN}-fix-FindCLHEP.patch"
-)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index 675c07b071b1..5fba573e3f61 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
@@ -8,10 +8,12 @@ inherit cmake
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
+	KEYWORDS=""
 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"
@@ -19,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] )"