gentoo resync : 20.03.2022

7 files changed, 178 insertions, 30 deletions

diff --git a/sci-physics/geant4_vmc/Manifest b/sci-physics/geant4_vmc/Manifest
index 532a4554dfd6..ddb98c8d6b9c 100644
--- a/sci-physics/geant4_vmc/Manifest
+++ b/sci-physics/geant4_vmc/Manifest
@@ -1,6 +1,10 @@
-DIST geant4_vmc-5.3.tar.gz 7411643 BLAKE2B 31a486aa32f879093753aab09798eabf1a936f0aa246bb97c7f055eefb789c9c5a5097c14ce47b05a99f3cc2b46bea6edeba2af80ee362bb8fee039ee711eddc SHA512 918ce3ca4a4fb329f00000fce00dae3d4a4c9f348553f31bf474f727c1e67242b5ff28fe7dc5d3ab12d1174663b1dd96b654b5baf7edfa662ab3f66687792e94
+AUX geant4_vmc-6.0-cmake-g4root-tests.patch 1054 BLAKE2B 3e77d8fe80de29047ac2c14d7ac10d8620e5b52b3664611eb2d5aef27613ff32f51205db4b2a3a56c0d2c0acd07711f007cc41da91e1f9b0bcbc983b4fa75536 SHA512 361688506e7d72b96316146e5fdab2e748cb4d8e5c5167602a1e5d01deadcc8e5f4d16ab58d42a5e39ccb4b9c8a2e0fb3f712b2429070620a8e3d6a8d29078c6
+AUX geant4_vmc-6.0-geant-4.11.0.1-fix.patch 1062 BLAKE2B c70947f3ee19da576744ba5ee60b9f8b20b79e778046cbf5182c6eef098a9c4813344aff39fc72925bb0fdd734792950368420152caf06d37b1c041200e0c5f0 SHA512 b8b20c34ce2d86ca54829e7d3aa0ffe62ef90434a9a3978f6d483b7af1223263f9d1f7715ec7839f3bdff6ceacb9e1e1188b22bae64ad8491ae87b323e8271ee
 DIST geant4_vmc-5.4.tar.gz 7363185 BLAKE2B 3f1738a6d99d7cad1df1249a086b5257ff1d9c5c23657e12720b2d75ed61a96d6e45f2c964c471ba093d1c70fffb5b3df5a0d15fd7bdd54ab78a8f225649f0a1 SHA512 26b53c4b3a10943b9a5aa970dfc8c09b4086a385c6fea2a914bf8b020044032f9b73df7fd054185eba86f66ba50cd86372d0e874c0642bb3e357fba499fd7675
-EBUILD geant4_vmc-5.3-r1.ebuild 1849 BLAKE2B f99eea3c215cb4cd86b91ff9f3e20b84c367be1219cbfb7a085e77520ad0dd03716b2dd723fd28dc8eacfc0dbf4e5e6292e05640ecd16fd0ed0a8f4273dcacc9 SHA512 4a850e5fce757a424cb409a499b8ad1e494fc2be5435c05e146e774b15044a4751a498657a2957e10e02d891ab3e9c11a2a35597e8e55d2ff914e3fcd151d50c
-EBUILD geant4_vmc-5.4.ebuild 1849 BLAKE2B b4a43efb08a94d8c0cd4b90de666b3a5355d5b7e0fab9e5aa2d429f53fefdb76e30721bcc74a4e61a49a8c993831301d259af31ea248d39f5dfb3285481c39f4 SHA512 116da0c54218575bf79432b8d6daf76d9bfe7656925ba11524da79c730a136ea74fe96e7dd2f94bbdb58b5e1d05d99d11bf87f739fe43ae966087e1fdfc2293e
-EBUILD geant4_vmc-9999.ebuild 1843 BLAKE2B 5e67f677e7eb458fbe63af58b3ebd426a516f781d15f5bbda79ddf7bad1d3981c1a18fe11f821917394c8591eb1c392355a5594fcf38485475555e92a1374d41 SHA512 e108df6228804a64d600b01ab484e839a6f6087d1dd9dbdeec2f98d89632ca8c395b50e64dd240c11f16147433f289386c9180cd6471ac500ae80f95e6946493
+DIST geant4_vmc-6.0.tar.gz 5649857 BLAKE2B 905ee76a579e25ee6259aafe978b0f202313ae6ce7f62e424c663e5a22f3c77e9a2eb3a4d807515267087c9e95aebb962927728da8110248136d69bcb8b1fc56 SHA512 ee21ec2d493d4ef227b294818ca0e6940c437e069197009f4bfab0fa1c282b4ad0dc5744157077ccb3b8953c4a167492571a56f68def2152730bcb79892f56fc
+DIST geant4_vmc-6.1.tar.gz 5604048 BLAKE2B 74d8e7fd20f9abd0205ccb3913180380b8862fef604b563ffde036a27f387887e1bf9ddf1c33fcb530e328c0dc5db42c51eac16097d94861326ec1a4c4ad3eed SHA512 6a9fd1c2b74e57ca5552c2bdb02a568916568da662eba29947f746c27c07a779e69b24315afd9cb9e8eda83b14eb53d351f3494cbe6fefb951eaf85888b0b1be
+EBUILD geant4_vmc-5.4.ebuild 1857 BLAKE2B 246d31602f6c40c9dfe13d123f699b7e7c4f2f49dd24d229f4bcd92dd176b8af207b14237040eb4393ea69554017d0458a99db4c5466bd49da9af45e6c848af2 SHA512 1e5bf979f2a656b9ef89e6ebbfa057db62000049011e3e93593cc903b9b1b0e0ac8f5955d36df531999d1c37d860bab1daa1826aed0846468a6681dc66775598
+EBUILD geant4_vmc-6.0-r1.ebuild 1972 BLAKE2B f6cdd1ff34adc0294022a82081f681ef92453fa85a0b63865d51fb97e07c1532e57fddee8398bd4332be7078408e4ba306d1de28bf754b295b13c1d82103f306 SHA512 048160090c08e3fc391e5963b797557d5dea89f75d0b9a82e41eeb94c625554c436ce4f67b5d32f6e13561bd1539a7cd5d0e9167b1da6f5108e3617c04efad59
+EBUILD geant4_vmc-6.1.ebuild 1813 BLAKE2B ca05d3b7c257195753a7d85e9b60e24968e5106a5ec27cb131a645555461af37143321dd01b33ceb054b10de179201cc71cc1ddcbf1aa8fba6ddb903c106786b SHA512 38c326e0ebe6fe32c9980ad35c0077ac984b23f02f812f6a3a708107ac94dc60064c60ee5c03033cded0cd738c7f1c6c239d55eed1b2e536114ae59c4ab535a3
+EBUILD geant4_vmc-9999.ebuild 1800 BLAKE2B d29a4ed94fe75ddb161922fab6d52e3cab7421e1904fef95f4aece519e89abea0d524b746a95ebf3e18a84d1d4b696abb1c1ac70fced838fb8b15f56094f6f0e SHA512 cad267d8cee1f431e4b93808914ae46535ca6e01cd5c7afcf8b6140d7d435071a062c0698eb4b1a4479f7bc34ddb221445bd90574c114720a462993722987ac9
 MISC metadata.xml 1006 BLAKE2B 65038f11d71140809618866bdeb25849b005969de9c5dafbab594d3c6d3e2025339f97a7dcc7969677bceaaa346f02800427c6cf84f3f78519c149ec92bd85ef SHA512 1e4fe2fcc62983553b86b45fcfa2d0d5ac65d8939ed3b650ac494b22db197f7c04e7967ec7f3502a0c007271b497c6700cc2a62bbe600724fae71ad5d94efaf5
diff --git a/sci-physics/geant4_vmc/files/geant4_vmc-6.0-cmake-g4root-tests.patch b/sci-physics/geant4_vmc/files/geant4_vmc-6.0-cmake-g4root-tests.patch
new file mode 100644
index 000000000000..5f561dc64c88
--- /dev/null
+++ b/sci-physics/geant4_vmc/files/geant4_vmc-6.0-cmake-g4root-tests.patch
@@ -0,0 +1,31 @@
+From 5d25b7fd6d53b620b25bed3a72d739d1644b5731 Mon Sep 17 00:00:00 2001
+From: Oliver Freyermuth <o.freyermuth@googlemail.com>
+Date: Fri, 11 Feb 2022 17:22:13 +0100
+Subject: [PATCH] CMake: Fix G4Root_BUILD_TEST option in main CMakeLists.
+
+The option was not correctly inherited for use by the g4root
+subdirectory. Fixed by:
+- Setting it before add_subdirectory().
+- Storing the value in CACHE (otherwise, not seen in subdirectory).
+
+Pull Request: https://github.com/vmc-project/geant4_vmc/pull/28
+Bug: https://bugs.gentoo.org/833126
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -60,8 +60,8 @@ include(VMCInstallLibDir)
+ #--- Add the packages sources --------------------------------------------------
+ #
+ if(Geant4VMC_BUILD_G4Root)
++  set(G4Root_BUILD_TEST ${Geant4VMC_BUILD_G4Root_TEST} CACHE BOOL "Build G4Root test")
+   add_subdirectory(g4root)
+-  set(G4Root_BUILD_TEST ${Geant4VMC_BUILD_G4Root_TEST})
+ endif(Geant4VMC_BUILD_G4Root)
+ 
+ if(Geant4VMC_BUILD_Geant4VMC)
+-- 
+2.34.1
+
diff --git a/sci-physics/geant4_vmc/files/geant4_vmc-6.0-geant-4.11.0.1-fix.patch b/sci-physics/geant4_vmc/files/geant4_vmc-6.0-geant-4.11.0.1-fix.patch
new file mode 100644
index 000000000000..64e55fccc186
--- /dev/null
+++ b/sci-physics/geant4_vmc/files/geant4_vmc-6.0-geant-4.11.0.1-fix.patch
@@ -0,0 +1,33 @@
+From fad0699c25b864e1ce2466c3c683007af5c350ad Mon Sep 17 00:00:00 2001
+From: Ivana Hrivnacova <Ivana.Hrivnacova@cern.ch>
+Date: Wed, 9 Mar 2022 18:03:18 +0100
+Subject: [PATCH] Fix compilation with Geant4 11.0.p1: (#30)
+
+Added missing test for G4VERSION_NUMBER in TG4RunManager.cxx
+---
+ source/run/src/TG4RunManager.cxx | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/source/run/src/TG4RunManager.cxx b/source/run/src/TG4RunManager.cxx
+index 64a45f0e0..5190172b0 100644
+--- a/source/run/src/TG4RunManager.cxx
++++ b/source/run/src/TG4RunManager.cxx
+@@ -47,6 +47,7 @@
+ #include <G4UIExecutive.hh>
+ #include <G4UImanager.hh>
+ #include <G4UIsession.hh>
++#include <G4Version.hh>
+ #include <Randomize.hh>
+ 
+ #ifdef USE_G4ROOT
+@@ -405,8 +406,10 @@ void TG4RunManager::Initialize()
+   // create G4RunManager
+   // ConfigureRunManager();
+ 
++#if G4VERSION_NUMBER == 1100
+   // Temporary work-around for bug in Cerenkov in Geant4 11.0
+   TG4PhysicsManager::Instance()->StoreCerenkovMaxBetaChangeValue();
++#endif
+ 
+   // initialize Geant4
+   fRunManager->Initialize();
diff --git a/sci-physics/geant4_vmc/geant4_vmc-5.4.ebuild b/sci-physics/geant4_vmc/geant4_vmc-5.4.ebuild
index db6fc22f8e35..a86aa91a1e02 100644
--- a/sci-physics/geant4_vmc/geant4_vmc-5.4.ebuild
+++ b/sci-physics/geant4_vmc/geant4_vmc-5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,8 +24,8 @@ IUSE="doc examples geant3 +g4root +mtroot vgm test"
 
 RDEPEND="
 	<sci-physics/geant-4.11[c++17,opengl,geant3?]
-	sci-physics/root:=[c++17,-vmc]
-	sci-physics/vmc:=[c++17]
+	sci-physics/root:=[c++17,-vmc(-)]
+	<sci-physics/vmc-2.0:=[c++17]
 	vgm? ( sci-physics/vgm:= )"
 DEPEND="${RDEPEND}"
 BDEPEND="doc? ( app-doc/doxygen[dot] )"
diff --git a/sci-physics/geant4_vmc/geant4_vmc-6.0-r1.ebuild b/sci-physics/geant4_vmc/geant4_vmc-6.0-r1.ebuild
new file mode 100644
index 000000000000..b26b9b111f8a
--- /dev/null
+++ b/sci-physics/geant4_vmc/geant4_vmc-6.0-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
+else
+	MY_PV=$(ver_rs 1- -)
+	SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Virtual Monte Carlo Geant4 implementation"
+HOMEPAGE="https://github.com/vmc-project/geant4_vmc"
+
+LICENSE="GPL-3"
+SLOT="4"
+IUSE="doc examples geant3 +g4root vgm test"
+
+RDEPEND="
+	>=sci-physics/geant-4.11[c++17,opengl,geant3?]
+	sci-physics/root:=[c++17,-vmc(-)]
+	>=sci-physics/vmc-2.0:=[c++17]
+	vgm? ( sci-physics/vgm:= )"
+DEPEND="${RDEPEND}
+	test? ( >=sci-physics/geant-4.11[gdml] )"
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
+RESTRICT="
+	!examples? ( test )
+	!geant3? ( test )
+	!g4root? ( test )
+	!test? ( test )
+	!vgm? ( test )"
+
+DOCS=(history README.md)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0-cmake-g4root-tests.patch
+	"${FILESDIR}"/${PN}-6.0-geant-4.11.0.1-fix.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DGeant4VMC_USE_VGM="$(usex vgm)"
+		-DGeant4VMC_USE_GEANT4_G3TOG4="$(usex geant3)"
+		-DGeant4VMC_USE_G4Root="$(usex g4root)"
+		-DGeant4VMC_BUILD_EXAMPLES="$(usex test)"
+		-DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
+		-DGeant4VMC_BUILD_G4Root_TEST="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc ; then
+		local dirs=(
+			source
+			$(usev g4root)
+			$(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/geant4_vmc/geant4_vmc-5.3-r1.ebuild b/sci-physics/geant4_vmc/geant4_vmc-6.1.ebuild
index 0fe08fe74864..99ae522be943 100644
--- a/sci-physics/geant4_vmc/geant4_vmc-5.3-r1.ebuild
+++ b/sci-physics/geant4_vmc/geant4_vmc-6.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -20,20 +20,20 @@ HOMEPAGE="https://github.com/vmc-project/geant4_vmc"
 
 LICENSE="GPL-3"
 SLOT="4"
-IUSE="doc examples geant3 +g4root +mtroot vgm test"
+IUSE="doc examples geant3 +g4root vgm test"
 
 RDEPEND="
-	<sci-physics/geant-4.11[c++17,opengl,geant3?]
-	sci-physics/root:=[c++17,-vmc]
-	sci-physics/vmc:=[c++17]
+	>=sci-physics/geant-4.11[c++17,opengl,geant3?]
+	sci-physics/root:=[c++17,-vmc(-)]
+	>=sci-physics/vmc-2.0:=[c++17]
 	vgm? ( sci-physics/vgm:= )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? ( >=sci-physics/geant-4.11[gdml] )"
 BDEPEND="doc? ( app-doc/doxygen[dot] )"
 RESTRICT="
 	!examples? ( test )
 	!geant3? ( test )
 	!g4root? ( test )
-	!mtroot? ( test )
 	!test? ( test )
 	!vgm? ( test )"
 
@@ -44,9 +44,9 @@ src_configure() {
 		-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)"
+		-DGeant4VMC_BUILD_G4Root_TEST="$(usex test)"
 	)
 	cmake_src_configure
 }
@@ -57,14 +57,11 @@ src_compile() {
 		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
+			doxygen "${d}"/Doxyfile || die
 		done
 	fi
 }
diff --git a/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild b/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild
index 9ad9d152375f..13017563cf1f 100644
--- a/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild
+++ b/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,20 +20,20 @@ HOMEPAGE="https://github.com/vmc-project/geant4_vmc"
 
 LICENSE="GPL-3"
 SLOT="4"
-IUSE="doc examples geant3 +g4root +mtroot vgm test"
+IUSE="doc examples geant3 +g4root vgm test"
 
 RDEPEND="
 	sci-physics/geant[c++17,opengl,geant3?]
-	sci-physics/root:=[c++17,-vmc]
+	sci-physics/root:=[c++17,-vmc(-)]
 	sci-physics/vmc:=[c++17]
 	vgm? ( sci-physics/vgm:= )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? ( >=sci-physics/geant-4.11[gdml] )"
 BDEPEND="doc? ( app-doc/doxygen[dot] )"
 RESTRICT="
 	!examples? ( test )
 	!geant3? ( test )
 	!g4root? ( test )
-	!mtroot? ( test )
 	!test? ( test )
 	!vgm? ( test )"
 
@@ -44,9 +44,9 @@ src_configure() {
 		-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)"
+		-DGeant4VMC_BUILD_G4Root_TEST="$(usex test)"
 	)
 	cmake_src_configure
 }
@@ -57,14 +57,11 @@ src_compile() {
 		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
+			doxygen "${d}"/Doxyfile || die
 		done
 	fi
 }