gentoo resync : 19.07.2019

18 files changed, 461 insertions, 26 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 70b636387e81..d5b427211bd3 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/geant-vmc/Manifest b/sci-physics/geant-vmc/Manifest
index 850a112f232c..3ec595c84f0e 100644
--- a/sci-physics/geant-vmc/Manifest
+++ b/sci-physics/geant-vmc/Manifest
@@ -1,4 +1,8 @@
+AUX geant-vmc-4.4.0-fix-cflags.patch 661 BLAKE2B 121054bdcf8dfae328334221cc85c7d117a8dd9b0b096499ea07938bb05f303759c6478c2187f36e7b4ba22f4e1f0935d980802ce5195c1d2d9b5202d240b683 SHA512 7c6b7c253088a780101c51ac9a055fe79f65d78996206fce77d9e70a558e2b5b222eee4ccba689e68effc429cb8b2d41c6021fe4bead7d44f52daa1820a308a2
 DIST geant4_vmc.3.6.tar.gz 1017407 BLAKE2B f386ea49843abedbed16ba1d12a10ae4165123fb0f7842482c416becf4141bc15360be1038626ce40f96a9dbb15d27116cd2fbd46d74b856d5a9391d073784a5 SHA512 eaf8626a3702149a1c5be4adff7843ef828da8024aafb8de489dd6b55b4ee05850581318d01032a4008767ad4e2fc0fde23e1aa5c751693e902d51ce9ad3d1df
+DIST geant4_vmc.4.0.tar.gz 7118838 BLAKE2B 5edbd13adeeb560188deb54c1f5d52fda371dd5f3dc04d676bcaf7edad0bbf8eb573d6345e5c3626b5b64c229d49b7f02aafec77a2587e525cf3f407444391b5 SHA512 faf5fed17b317399b97f77ff1c2a1bf1cead8f0b02a3a89244f01f8ae04ce621763e52b40000e481b3826796bb4d94216368d2e3c98a62f02048c5979f4ee648
+EBUILD geant-vmc-4.3.6-r1.ebuild 2075 BLAKE2B 1decdfb155c65f5317abb59e2d46b175973aedb0b33398eb3c39e71ce997e78a4629a53685880f5d9c7e06a4f03f3c35e5fa8c0677ce735147ca43b00ff65a4d SHA512 d08b40f5f13c8cb498eec3991e71446ae8051145b63a3366d0f5cb0c1360bf8ed8dcef9292f8bae8e4066bdc14b93ee385cf4db501dcd14f7e9957e64ead2d93
 EBUILD geant-vmc-4.3.6.ebuild 2100 BLAKE2B 50f6b40d3f35d0835c4d9872055930cabe73ba2bdd03a0ee35e9b85697dc82f304659a55caf0fd5b5ecd6a2db3be13b512b6d1d08be86ef4a7ab8cca86c28460 SHA512 88de1fd5ff56a131daafb174968a93d67d89590e64fc709a8ecb7dd29b312f28a6984592df4451dfc900cc084715845e93f79745dc745d28b5b95a42e9b2d03a
-EBUILD geant-vmc-9999.ebuild 2100 BLAKE2B 50f6b40d3f35d0835c4d9872055930cabe73ba2bdd03a0ee35e9b85697dc82f304659a55caf0fd5b5ecd6a2db3be13b512b6d1d08be86ef4a7ab8cca86c28460 SHA512 88de1fd5ff56a131daafb174968a93d67d89590e64fc709a8ecb7dd29b312f28a6984592df4451dfc900cc084715845e93f79745dc745d28b5b95a42e9b2d03a
+EBUILD geant-vmc-4.4.0.ebuild 2466 BLAKE2B 2b4be636cbbd9431026ef6e81dc7d639ba2b5351c542cf0a0a121a8f87915e4564e25fb820c639a227eaa88b621519b19ed43344b08e6d1273fd8bea5ab830d5 SHA512 d897e2a35bd35ec79597c2fd1ef178cdb054fe3d8818c37752ccc0375503f23faa676040475e5c2b39dbe450a6e5a18b80b7a3a183d52ac26decb2a30e8bb9fa
+EBUILD geant-vmc-9999.ebuild 2111 BLAKE2B be011b3c4a43174045c99051982a88c3efefd954edeb30f15e7baf2152c9300cfb9d86caab1495886dd46ecaeef0a10b7e360c3d10e16c83b078f2523b862d54 SHA512 48a3504c92aed063b64e82e6547e27d2f961ebae57d1bd2934e96b50f79af50413c601d8990a8b02ca54070f6418bf7ff6f030524c6042987fa0e90d9b7a58d6
 MISC metadata.xml 859 BLAKE2B 4bec2c6236dfc1bdb9ba9f1caff6c9b545861c6e51c58d90bfa652d2d5aaa323437473173912f1840ba3c690f92798929980e5bcb3cacb5fe4cdd8a0edb014d9 SHA512 15a0f421563051a8553e2bdf9a8f82dc5077e336513cc18ef7e9bea49e084ea4dc1aa32800fbc928743d8c09036d136518a5a6a74c2f57c61215da2f44dc9727
diff --git a/sci-physics/geant-vmc/files/geant-vmc-4.4.0-fix-cflags.patch b/sci-physics/geant-vmc/files/geant-vmc-4.4.0-fix-cflags.patch
new file mode 100644
index 000000000000..d3bf0dfdd308
--- /dev/null
+++ b/sci-physics/geant-vmc/files/geant-vmc-4.4.0-fix-cflags.patch
@@ -0,0 +1,15 @@
+diff --git a/g4root/test/OpNovice/CMakeLists.txt b/g4root/test/OpNovice/CMakeLists.txt
+index 1a8f316c..a2e144b6 100644
+--- a/g4root/test/OpNovice/CMakeLists.txt
++++ b/g4root/test/OpNovice/CMakeLists.txt
+@@ -44,7 +44,9 @@ endif()
+ #----------------------------------------------------------------------------
+ # Setup Geant4 include directories and compile definitions
+ #
+-include(${Geant4_USE_FILE})
++# Workaround for upstream bug: http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1663
++#include(${Geant4_USE_FILE})
++include(UseGeant4)
+ 
+ #----------------------------------------------------------------------------
+ # Locate sources and headers for this project
diff --git a/sci-physics/geant-vmc/geant-vmc-4.3.6-r1.ebuild b/sci-physics/geant-vmc/geant-vmc-4.3.6-r1.ebuild
new file mode 100644
index 000000000000..b92483ba721f
--- /dev/null
+++ b/sci-physics/geant-vmc/geant-vmc-4.3.6-r1.ebuild
@@ -0,0 +1,89 @@
+# 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/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-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-4.4.0.ebuild b/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
new file mode 100644
index 000000000000..0f091fe6412e
--- /dev/null
+++ b/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
@@ -0,0 +1,96 @@
+# 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="
+	!examples? ( test )
+	!geant3? ( test )
+	!g4root? ( test )
+	!mtroot? ( test )
+	!test? ( test )
+	!vgm? ( test )"
+
+DOCS=(
+	history
+	README.md
+)
+PATCHES=(
+	"${FILESDIR}"/"${PN}-${PV}"-fix-cflags.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DGeant4VMC_USE_VGM="$(usex vgm)"
+		-DGeant4VMC_USE_GEANT4_G3TOG4="$(usex geant3)"
+		-DGeant4VMC_USE_G4Root="$(usex g4root)"
+		-DGeant4VMC_BUILD_MTRoot="$(usex mtroot)"
+		-DGeant4VMC_BUILD_EXAMPLES="$(usex test)"
+		-DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
+	)
+	cmake-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
+	# Bug: Can not disable Garfield in test suite, fixed upstream.
+	sed -i 's/ExGarfield//' test_suite.sh || die
+	# Bug: Path for E03 sub-examples wrong, see https://github.com/vmc-project/geant4_vmc/pull/11 .
+	sed -i 's#only in E03 test#only in E03 test\nG4EXEDIR=${BUILDDIR}/examples/$EXAMPLE/$OPTION#' test_suite_exe.sh || die
+	./test_suite.sh --g3=off --builddir="${BUILD_DIR}" || die
+	./test_suite_exe.sh --g3=off --garfield=off --builddir="${BUILD_DIR}" || die
+}
+
+src_install() {
+	cmake-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
index 2156a04588fa..ffc8e7dc8743 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,18 +23,19 @@ 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 )"
 RESTRICT="
+	!examples? ( test )
 	!geant3? ( test )
 	!g4root? ( test )
 	!mtroot? ( test )
+	!test? ( test )
 	!vgm? ( test )"
 
 DOCS=(
@@ -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() {
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 6d6d1f2ccc78..406a504abf03 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -9,10 +9,10 @@ DIST root_v6.12.06.source.tar.gz 162284452 BLAKE2B 944b5e899677bab40842d7ec969ff
 DIST root_v6.14.08.source.tar.gz 162474562 BLAKE2B f8bfdabb4d91bbdfbab0b17626fff1f8aa265292996d857025cbd1543306f3ec540a1afb080788bfc7149ea835932b59d7c54dcd802354e31294ba2e5e9d2366 SHA512 827e39efbf3c69429a0a256127ca9f87550d9084c34c715bddccbf87a8c111c367b9a0ac6882aac747c9b48f4a3effb3747b4df567429910c93ee64dfe35df5b
 DIST root_v6.16.00.source.tar.gz 164836293 BLAKE2B 9d8f02631bdc1fa1775cbdaf50dd1feacd9b3c86b81d679ba6f0ca3c5787cd1d22ef7c33358b608361a01ad4f0aff3e8c749649d24773a35c52ce87f808d08f5 SHA512 17e5b9815973773e30ff83c2f4028e9e93691c1ecb824c162c8b3e02d1f6666fb8e0b72a5d0652a90032af146d92d271cbffcd634fb6fe6a63bdf46d672789bf
 DIST root_v6.18.00.source.tar.gz 165917160 BLAKE2B 8c83f4dc7a7af8f8627e7711792d09800d3b426ce9ca338aad3bc65c9c307723bd97ca84f0e1790fb844f80be80c8cea9e58c1a6b469880752439db21f7d34cd SHA512 abc4630b773f979e01e0ede7bee095fa3f0f8172218538b37e68230dfce6f0623f24a9567bd40cf1e72ccb4e3398cec858fdfd53ba246ca3615fefd9e5a0d0cd
-EBUILD root-6.12.06-r9.ebuild 7694 BLAKE2B fb1fdf4f36493df97893a9181fd9a64feba98bb39b89943d2fd162244e4e25b71e381bd21be23c922416bd1ceb1c2621020ff23debc3dc33e2a2c604b01f2cbe SHA512 300e9f8ae90c29ef7a214d4a4d898c25128e00c1ee61900478ff802fa8280617dadfd05061e25428c7de38dfb93156dd09dc93b9ada93afd200641800d624245
-EBUILD root-6.14.08-r2.ebuild 7958 BLAKE2B 3d97b689b73e3dca32dd092730afb963d643aafc6a5948d7e378f1fe930555d6f71916773f57cd24c06b79e4e6a6de5aeb2d554ff762ef7d2813f5d5a111bd48 SHA512 da86353beb076717afaa692f798adba69629a38ac391a809a51b26bc99861158170ea1dc7beee4f592b5e3d5a92e7b265b3cc883390b2590d51f4fe6b5bbf251
-EBUILD root-6.16.00-r1.ebuild 8044 BLAKE2B d247bce9342e6612d53cc75992e7a5195a7d10b6b60f4b6ddde05c230d6df36f24d2142a9baffb006699bd5230470d118241af917b2d7fdc075e9ba6c453bf7a SHA512 c466be0558379c97ac5b685b392b6539d845eeb69cf0e980a9eea5637cf29dc7a57b288f3b361343e48c2100c8acf46cc5d858dbae4294d89534b8cded4cab7e
-EBUILD root-6.16.00.ebuild 7987 BLAKE2B b01e5e5069219006dee484a15b24f0ebcc350140522f9f99d8ef8eb32e2e2c2fe39d4243eaa3a1733c7dde04d6fba9a633c061f8f233fb291635917962fc4407 SHA512 77737611ce737357cb94b2c289baf7c1c29ed3de1dae0249cd805cb432f0b51e9b9103e2235065c6c72dd0a063ef9cba6f92e3eb10be152a022ca642f29f7bc8
-EBUILD root-6.18.00.ebuild 7506 BLAKE2B aaa23dfabd5a488c762a6c3edaa465ef6379e4b07513743b72948b87ebf3a351985bc3c7a62820be246093a96b17d2af87b6a981f59eb1fba6acfbbe7a021095 SHA512 1b9cb10c81554abe3d642f18845bb7685a688c10f283629b248265a94f1cfb79bf9617d3e816e0e6dc73db668143d4e084ad2bc79a4585aabb764d9e79ae8d81
-EBUILD root-9999.ebuild 7566 BLAKE2B 532908c435949f4d1522ddee1aa535d69a92cf9f59e74dd1c1fff2ae8eb4acf0b476be92cb308758fad8636e6626243b37478577f6aa1f0b16daad354e20bf68 SHA512 9b3b7d122f733a3e4095704dd3bb60db33677cb9dac2d1c66f33ffe3e37d910094cdafe8908accb369b4ae46b95730ecee80eba5b27d5e43e9f685fb72a20e14
+EBUILD root-6.12.06-r9.ebuild 7738 BLAKE2B 2ab2e1150a8d85d9008f861be13fe8fd98cbd4b869a5dc3ec33b61151d436358cd6f1ac9b287b8a9dab7711fdbd0c4c961b2c28262b13cb45aee891ca84c9723 SHA512 9cffbfdab77a5b8c0f360bf5e45ae0595b1412b0b9e0c60d7da9f4c590d970ea2ec603ca5135823ff5e4bd04b313fd5e95e828e379fee59a082dcadc2a8132dc
+EBUILD root-6.14.08-r2.ebuild 7924 BLAKE2B ce15e932bcc41237e1453e7dbc5c588ce9148ca5669a76750eba8b27d737d59073bd6b2689e19b712f9f86b0accd19ba76814970c93b7cd692999aa963018b74 SHA512 1def593a5b52df1fbbcfd2afa99a99eea3c9f210951f92fa817a0f9302d83aa4512b507cbfc21223ae28bad53575fa125bb651da0c7131fd795ada9bf6da7021
+EBUILD root-6.16.00-r1.ebuild 8010 BLAKE2B 75e5fcf18928534823e88bb57672f8abc583d2510e8a1e2330ed8a348c947886af6a5d7c04fecbb0a0006892946db77e2fc616ddd8c0be8432a0137f6cb7bb43 SHA512 2f5baadb930f8529da4ce6afa10b0f3a649c6ed56daa5e02f0ea560a2158c871ac94bcc25eedbcecd61eaf9a1f956cf97cc5f2afca545d8d097d18a316171d00
+EBUILD root-6.16.00.ebuild 7953 BLAKE2B 5faab0b4b12cdfa9120f0087a2c41be55a8a76850dc999ec29e1d104244c8b0597edfc04b657754620f9023f7e515c9678ec46b3ba915391d43a65641ebfbeed SHA512 c8314fb55ef6d9e07cb8bab3d7d4e5b850a1bff870582835826157f59a5ee6861dfa60503f253d4c52c1ab492b554000e45103331f4504fb752ad0becf1619c7
+EBUILD root-6.18.00.ebuild 7472 BLAKE2B d8ded18cfe831a6770f71edc313ecea69483007f60e9acdac205d43c633b7699d4dd10615a6253865169793ec507f9dd41b5aa0d120fbfa6ea24309438525696 SHA512 38057a1b671b635e6d2c5c54d013254ebd0b632a4134366c585a3b4c1460ad7b56cda405679c1a06ea9ed9356055d594574dfce3ad81f77d97504e52a1c83784
+EBUILD root-9999.ebuild 7532 BLAKE2B 3a7431f8f445b489749304386d7bd6cd2368c0a14302c51111087b6b183705a94402f45974be9d5d5d996dc480178ada47812d01ef582862a1e0e2a305482316 SHA512 38cf3ae4d3dae505acf544f0913180f2679f3d8f200b6569f75c3e64289d17cef0f2f2f466d9b39dd0379783d29bea8fc6c874210acccf75d036ba654b38a616
 MISC metadata.xml 3145 BLAKE2B 90d0a9fdb2481d8a7afe627ebe61bc97ff4ccc229f6ceed9cfccec918e2b9b51aa342eddd2f6599220fe639f027532e99fc96e806118cf95eac9a81238a5163f SHA512 7c7219d17879c2c6faaadc9a6c91da1844c95f0b2589cfe7d26a2d0f0f76a6c0a412dda94d50ea2b3568f032bba33c4f32f08c5cb891e792e9d707d5e683de34
diff --git a/sci-physics/root/root-6.12.06-r9.ebuild b/sci-physics/root/root-6.12.06-r9.ebuild
index 7797664bc1d8..244f4d26df85 100644
--- a/sci-physics/root/root-6.12.06-r9.ebuild
+++ b/sci-physics/root/root-6.12.06-r9.ebuild
@@ -132,6 +132,8 @@ src_prepare() {
 
 	# CSS should use local images
 	sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
+
+	hprefixify core/clingutils/CMakeLists.txt
 }
 
 # Note: ROOT uses bundled clang because it is patched and API-incompatible
diff --git a/sci-physics/root/root-6.14.08-r2.ebuild b/sci-physics/root/root-6.14.08-r2.ebuild
index 36f4c068c94f..69718f3f6257 100644
--- a/sci-physics/root/root-6.14.08-r2.ebuild
+++ b/sci-physics/root/root-6.14.08-r2.ebuild
@@ -144,7 +144,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_C_FLAGS="${CFLAGS}"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)"
 		-DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
 		-DCMAKE_INSTALL_LIBDIR="lib"
diff --git a/sci-physics/root/root-6.16.00-r1.ebuild b/sci-physics/root/root-6.16.00-r1.ebuild
index 7d0884db5536..c893ead5cca2 100644
--- a/sci-physics/root/root-6.16.00-r1.ebuild
+++ b/sci-physics/root/root-6.16.00-r1.ebuild
@@ -146,7 +146,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_C_FLAGS="${CFLAGS}"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")"
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)"
 		-DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
diff --git a/sci-physics/root/root-6.16.00.ebuild b/sci-physics/root/root-6.16.00.ebuild
index c6952c5f4198..86ee4bde95b1 100644
--- a/sci-physics/root/root-6.16.00.ebuild
+++ b/sci-physics/root/root-6.16.00.ebuild
@@ -145,7 +145,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_C_FLAGS="${CFLAGS}"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")"
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)"
 		-DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
diff --git a/sci-physics/root/root-6.18.00.ebuild b/sci-physics/root/root-6.18.00.ebuild
index 9ce194c23498..7d471c4b2069 100644
--- a/sci-physics/root/root-6.18.00.ebuild
+++ b/sci-physics/root/root-6.18.00.ebuild
@@ -141,7 +141,6 @@ src_configure() {
 		-DCMAKE_C_FLAGS="${CFLAGS}"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
 		-DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
-		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")"
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)"
 		-DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index ef22dfe2f86a..d300c32a9370 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -152,7 +152,6 @@ src_configure() {
 		-DCMAKE_C_FLAGS="${CFLAGS}"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
 		-DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
-		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")"
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)"
 		-DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest
index da08439a03d2..b7eaad7a59cd 100644
--- a/sci-physics/vgm/Manifest
+++ b/sci-physics/vgm/Manifest
@@ -1,4 +1,8 @@
+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 1718 BLAKE2B 2586aff67f39536151fd5ad05e94e4fb5b80b3a452a2b17753275aa9138868ab77c54b1ebc36474246c0fc641820cb19c1f00a7d53dec52d7afd7ac344d79cd6 SHA512 c81e6d4cb70a460f7e60095907d6643029a8e32f08c2e9db200bc80620dcd00ca31137e44730b30ca7cac57e60cff4b64d1f4f1f32d0f9a06c011894e1b436b5
 EBUILD vgm-4.4.ebuild 1687 BLAKE2B 465f91a5943a39258201724d093dc5cefdf20fe5179c3215945f97bd8fea6b5b4c059daf9a8b652c604463bf3cdfce47c575814ad0db0112dc0e7588b1e807c6 SHA512 01dadc26e284d521c00cbeaa46ab1a3de612435c5e667e57d21f82b87bb9bb099a238c07a9b67bfb368edaa27447c265e666fd2330ebab867a8c15f496567be7
-EBUILD vgm-9999.ebuild 1597 BLAKE2B 52ec50d53da0b17a8e2a038dbe478a8a3ca283472209daf489e08228dc9778e4ae9a2ba6a9e270e63644c16177bdb4729ac29433a90e4b85c17c19a193f9771a SHA512 4df20b7c0874135222b0025e025c119d9cc5e556a49a7f3e8ba05c5455f2329c577b959dd8c229b54936a430962eecd3daec5e6af405d846fd17b05dfc76bbf4
+EBUILD vgm-4.5.ebuild 1712 BLAKE2B 39d3e5aa95ce4357227687287d895c4d6d7d12200e56f0359423612a87a39943ed186cdcd4b519d9a27e0d5be25c8c26f6b23b2ab2e26327768c219cdebfd1e2 SHA512 4c1aed49137aeefdfb50a5d9433b9862c730abc1716ee1bf831215676874485f96db062501faf7b0a80bd5169d882988be85df5ba1ba161d1d4ac41f912d9fac
+EBUILD vgm-9999.ebuild 1663 BLAKE2B 41230e994009e8ed462db50a071cc71800a9e4cd399cc89991ce4f8879c2653feb1263a5a148ce5f24662cb1638af2df4efa884f9c86f1ab4b1d570e034a5cfd SHA512 795149adb05e3c02906795725cd353d52d61869c3fc5cadd3182c38e7e63a36a099a4bea938291b0b1553060f2f01c8c67ea3ddd820fd9b7ab9cda551f88e16d
 MISC metadata.xml 887 BLAKE2B 2bed4c9deeb9bbda28704462bf45eaf31d810b115608bd66ccdd8f5e8494556b87962301395d0f0cbf229aaf8d497b1f07b9821600d6c101aad34c5ef49cf643 SHA512 5e52d57dc9cc78020a147c4984aa037b3441f910f6288e75a3919398a0b22d16f312fd910bf0a692bfb039c3540f2854e4f2c660f7d3c4a4c23cbc63f9885dbf
diff --git a/sci-physics/vgm/files/vgm-fix-FindCLHEP.patch b/sci-physics/vgm/files/vgm-fix-FindCLHEP.patch
new file mode 100644
index 000000000000..d3bf3d0d4f31
--- /dev/null
+++ b/sci-physics/vgm/files/vgm-fix-FindCLHEP.patch
@@ -0,0 +1,64 @@
+diff -Naur vgm/cmake/FindCLHEP.cmake vgm.patched/cmake/FindCLHEP.cmake
+--- vgm/cmake/FindCLHEP.cmake	2019-01-25 18:46:25.000000000 +0100
++++ vgm.patched/cmake/FindCLHEP.cmake	2019-06-29 19:50:18.092076913 +0200
+@@ -4,13 +4,13 @@
+ # The configuration file for CMake build for Virtual Geometry Model
+ # Copyright (C) 2012, Ivana Hrivnacova
+ # All rights reserved.
+-# 
++#
+ # For the licensing terms see vgm/LICENSE.
+ # Contact: ivana@ipno.in2p3.fr
+ # ------------------------------------------------------------------------------
+ 
+-# The CMake build for Virtual Geometry Model is a result of a merge 
+-# of the CMake configuration files kindly provided 
++# The CMake build for Virtual Geometry Model is a result of a merge
++# of the CMake configuration files kindly provided
+ # by Florian Uhlig, GSI and Pere Mato, CERN.
+ 
+ # - Try to find CLHEP
+@@ -36,28 +36,29 @@
+   $ENV{CLHEP_BASE_DIR}/include
+ )
+ 
+-# CLHEP library external to Geant4 
+-find_path(EXTERNAL_CLHEP_LIBRARY_DIR NAMES libCLHEP.so libCLHEP.dylib PATHS
++# CLHEP library external to Geant4
++find_library(EXTERNAL_CLHEP_LIBRARY NAMES libCLHEP.so libCLHEP.dylib PATHS
+   ${CLHEP_LIB_DIR}
+   ${CLHEP_DIR}/lib
+   $ENV{CLHEP_BASE_DIR}/lib
+ )
+-if (EXTERNAL_CLHEP_LIBRARY_DIR)
+-  set(CLHEP_LIBRARY_DIR ${EXTERNAL_CLHEP_LIBRARY_DIR})
+-  set(CLHEP_LIBRARY_NAME CLHEP)  
+-endif()    
+-
+-# CLHEP library within Geant4 
+-if (NOT EXTERNAL_CLHEP_LIBRARY_DIR)
+-  find_path(CLHEP_LIBRARY_DIR NAMES libG4clhep.so libG4clhep.dylib PATHS
++if (EXTERNAL_CLHEP_LIBRARY)
++  get_filename_component(CLHEP_LIBRARY_DIR "${EXTERNAL_CLHEP_LIBRARY}" DIRECTORY)
++  set(CLHEP_LIBRARY_NAME CLHEP)
++endif()
++
++# CLHEP library within Geant4
++if (NOT EXTERNAL_CLHEP_LIBRARY)
++  find_library(CLHEP_LIBRARY NAMES libG4clhep.so libG4clhep.dylib PATHS
+     ${Geant4_DIR}/..
+     ${GEANT4_LIBRARY_DIR}
+   )
+-  if (CLHEP_LIBRARY_DIR)
++  if (CLHEP_LIBRARY)
++    get_filename_component(CLHEP_LIBRARY_DIR "${CLHEP_LIBRARY}" DIRECTORY)
+     set(CLHEP_LIBRARY_NAME G4clhep)
+-  endif(CLHEP_LIBRARY_DIR)
+-endif()    
+-   
++  endif(CLHEP_LIBRARY)
++endif()
++
+ if (CLHEP_INCLUDE_DIRS AND CLHEP_LIBRARY_DIR)
+   set(CLHEP_FOUND TRUE)
+ endif (CLHEP_INCLUDE_DIRS AND CLHEP_LIBRARY_DIR)
diff --git a/sci-physics/vgm/vgm-4.4-r1.ebuild b/sci-physics/vgm/vgm-4.4-r1.ebuild
new file mode 100644
index 000000000000..89f9a9ec1384
--- /dev/null
+++ b/sci-physics/vgm/vgm-4.4-r1.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}.${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="${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
new file mode 100644
index 000000000000..7053d1d2a92d
--- /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
+}
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index b303e23a06c6..00846ae113bd 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.ebuild
@@ -1,7 +1,7 @@
-# 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
 
@@ -21,9 +21,10 @@ 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:= )
+	root? ( sci-physics/root:=[c++11] )
 	geant4? ( >=sci-physics/geant-4.10.03 )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[dot] )