gentoo auto-resync : 10:10:2022 - 19:34:30

3 files changed, 83 insertions, 2 deletions

diff --git a/sci-physics/geant4_vmc/Manifest b/sci-physics/geant4_vmc/Manifest
index ddb98c8d6b9c..c94137d1ae3a 100644
--- a/sci-physics/geant4_vmc/Manifest
+++ b/sci-physics/geant4_vmc/Manifest
@@ -3,8 +3,10 @@ AUX geant4_vmc-6.0-geant-4.11.0.1-fix.patch 1062 BLAKE2B c70947f3ee19da576744ba5
 DIST geant4_vmc-5.4.tar.gz 7363185 BLAKE2B 3f1738a6d99d7cad1df1249a086b5257ff1d9c5c23657e12720b2d75ed61a96d6e45f2c964c471ba093d1c70fffb5b3df5a0d15fd7bdd54ab78a8f225649f0a1 SHA512 26b53c4b3a10943b9a5aa970dfc8c09b4086a385c6fea2a914bf8b020044032f9b73df7fd054185eba86f66ba50cd86372d0e874c0642bb3e357fba499fd7675
 DIST geant4_vmc-6.0.tar.gz 5649857 BLAKE2B 905ee76a579e25ee6259aafe978b0f202313ae6ce7f62e424c663e5a22f3c77e9a2eb3a4d807515267087c9e95aebb962927728da8110248136d69bcb8b1fc56 SHA512 ee21ec2d493d4ef227b294818ca0e6940c437e069197009f4bfab0fa1c282b4ad0dc5744157077ccb3b8953c4a167492571a56f68def2152730bcb79892f56fc
 DIST geant4_vmc-6.1.tar.gz 5604048 BLAKE2B 74d8e7fd20f9abd0205ccb3913180380b8862fef604b563ffde036a27f387887e1bf9ddf1c33fcb530e328c0dc5db42c51eac16097d94861326ec1a4c4ad3eed SHA512 6a9fd1c2b74e57ca5552c2bdb02a568916568da662eba29947f746c27c07a779e69b24315afd9cb9e8eda83b14eb53d351f3494cbe6fefb951eaf85888b0b1be
+DIST geant4_vmc-6.1_p2.tar.gz 5606450 BLAKE2B 943398e4cf9a8f4d6e44687f89eff6e6f09e4904b8a57684e202719162d861d5b370c1fc9bcf40de43aa607cfa89db1d1a740046a1ad9744ba2c538dbc8103f8 SHA512 97f825a32958d7da8d4086e87397c358b0331ac8f6630b83c1a8142f02be21093bed65c0841a24c0db5548adb611f52f2c5e05e92f39a67f13c70d76f901d47e
 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
+EBUILD geant4_vmc-6.1_p2.ebuild 1814 BLAKE2B f0341fad2ad04f491729ad18c417812727f6b853c54324450c8e282d52ebd96559fad271f498bee13acb41fd79907eac69fa42b31dc3b79d095982ef370596d1 SHA512 c772f49074e2aa35b76b89259fbbeb2d77593ffafde8a2cb2b795e2c29785af7d947101642083a6032f0af4e02ef4049ef5aa5520e6db1236deab97e35180399
+EBUILD geant4_vmc-9999.ebuild 1801 BLAKE2B b2d988607237ab31007d369d186cb0a89b5de0cf6be691679cf95570d6b5b26b4749db6a06f857bc06000aa6a8065f1dc40a1be451ba6380d2cdd57b77b29a10 SHA512 639f134e396072c297c25dacd8f60055c747bd5fedcefac9d35bb1159bd879cfe353d463733988de940351363cad7af090625b9d96267ece3038c4c3adc45371
 MISC metadata.xml 1006 BLAKE2B 65038f11d71140809618866bdeb25849b005969de9c5dafbab594d3c6d3e2025339f97a7dcc7969677bceaaa346f02800427c6cf84f3f78519c149ec92bd85ef SHA512 1e4fe2fcc62983553b86b45fcfa2d0d5ac65d8939ed3b650ac494b22db197f7c04e7967ec7f3502a0c007271b497c6700cc2a62bbe600724fae71ad5d94efaf5
diff --git a/sci-physics/geant4_vmc/geant4_vmc-6.1_p2.ebuild b/sci-physics/geant4_vmc/geant4_vmc-6.1_p2.ebuild
new file mode 100644
index 000000000000..69faaa95b781
--- /dev/null
+++ b/sci-physics/geant4_vmc/geant4_vmc-6.1_p2.ebuild
@@ -0,0 +1,79 @@
+# 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-2 -)
+	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)
+
+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
+			doxygen "${d}"/Doxyfile || 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-9999.ebuild b/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild
index 13017563cf1f..2bc5b7595a6d 100644
--- a/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild
+++ b/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
 else
-	MY_PV=$(ver_rs 1- -)
+	MY_PV=$(ver_rs 1-2 -)
 	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"