gentoo resync : 20.03.2022

3 files changed, 18 insertions, 21 deletions

diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest
index f5a86b9e16a4..25c67711ed29 100644
--- a/sci-physics/vgm/Manifest
+++ b/sci-physics/vgm/Manifest
@@ -1,7 +1,7 @@
 AUX vgm-copy-test-seed.patch 341 BLAKE2B 0a3fdc57a76e5ee27ccea0221acd3742e4f00d6e9592d73a0f7083c172b6a4ce822eb6f78f45d9b0be756ba12950d446828cbbe896f32279b9979ff656cc7e7f SHA512 26a6df0823495a86322b32d55fde0b25d471687425d69fc48f4937e3bb7546f7c15b24373c324aa168cb764ce79ad16bc8b16eae6a587c58fe7088d71bddd957
-DIST vgm-4.8.tar.gz 3661965 BLAKE2B 29f878fb6716e261c27d60b2c9081d66313591a053d80f78501973f131aff88bbcee743ff9767836883dcb28d3ce5aeee3759a5890d7c8811a6a61503417284f SHA512 8b7cabc5796649c4014ccbdf1c6d209d2e7c2b4b06258716a72cadd997a9f6f51c4f9cb5870fd10abfd1ee133766876523c84441a69c7242bc2002687ca0ce58
 DIST vgm-4.9.tar.gz 3881029 BLAKE2B 596a8df12f0dcd813a0d84e8c33eaa92dd2d332d9accf2fc38992f385748a2bd3579fee2af6cc00b878fe5491af4996d80775aa630120507ccc665f102f63b11 SHA512 90845d75a7ff0022f5fba15b7f621efd588251060c0d8e715fcc2e28bb6b4b01ddd83420dbd233cc0dd437ee6b8b5390bb1f84571ed12e696ee8c1dfc4bd8fd9
-EBUILD vgm-4.8-r1.ebuild 1641 BLAKE2B 5e166637d935346aee91539347c1c7c4f7dc2cd825d6b580e5ee079cc1a091c90c49a38b99fa80b91a1d18e28f7ff4cc4f486b77fe92d9b6fa8617340ce96cbf SHA512 3bd300bf45cb16c7906f98f39c15fca9a8b3622f9148039749a44ae6bcfc360f95b68bd4a976f6676c0f2ede25cc4f3a48816cf160e599d0345301b3e908bddd
+DIST vgm-5.0.tar.gz 3862583 BLAKE2B 7a1643b329f6f6b019e1b68ce691ed45a32d343925c59451d6e218469606a7a352334d4f1e330873fa1cbc4e1182b4557dc396f52ce7d35e26df81e79121cd60 SHA512 771c2e013c052ea1785fb79ba317b48482428ddf703e263eaf1c9840fbae66dd280d73aee99de30e1c3d70e46a5eb63affc92dfc5ba19298e2d4487b9e302588
 EBUILD vgm-4.9-r1.ebuild 1870 BLAKE2B cb8d6b19e229b6461cfb44eee7b99bc55222883547c79c6086a89f9e6d3f4c431fa4c6030caad64098220b9b2496a006a14b37026c6c6110df21e9f018002ea2 SHA512 581d83f287a7c690808aa25edae631c5cb441c1c27d335d9d85c35293ec2bb7fa2e5ad2e5922afe26f87daf37c2f3c3f1ee7fa573c8aa8781707ec994a4a9bb5
-EBUILD vgm-9999.ebuild 1802 BLAKE2B 7f00f8349c0147db8994d0f0a973901f87fbaca97d9f3b79349d9f2b5dec8b6512ccf63fbd91e4a7a20ed221cebe1b4aa485660dcafa0c040de638458c22bf67 SHA512 88db98999c0fc50bd14fefbaedc3419a831acdfafd7ec8324273d3ba99cdfca93291a01c5b49048648fd4fb8a1e12e32a854f1e9a0f71d2d9a7590d2306e5b55
+EBUILD vgm-5.0.ebuild 1784 BLAKE2B c1cc7617013417f3450f35291ad4641736309c250f899786ce5c2409baa8da2ed922e4bd10b9570bc2699cfd829d64e76cffa4e7b039ecd8cd5d815af0326035 SHA512 9bd28cc72c729528e337eab49f643884e06418689d6c539d1e9948c2bd72724ed077f6f46c100c2848c11744cb2a4e4b1441ed28fbd50576de610040c7c43e15
+EBUILD vgm-9999.ebuild 1770 BLAKE2B 985a3dc2387110c228a6d58d1754b7a22d6b4bd26bf144f52f7dd821c9a00a4027a68a6af864de7a95e9f994716682a5106422a916fc05b51718c747bd5dd220 SHA512 02739f111eea2a76e3fc67bbade81ba0a01e2c92824aff8eec7550279f9b54b855ada79ebd3b41886f854a9423d6b51cd06b76f7e39d831659c84cb7ac2bd7a6
 MISC metadata.xml 819 BLAKE2B 04ac719d56f70b20157b47d72551ef2867807589f1bfa577bb8a7e12954fa039a531a07384fac09555dbead90d8609cf6bf96a075f992492fd04166fb5711d3d SHA512 bda8c954d6cdd776af7fdc781de5f2b07566777a29d4fe99bbe596ead476481a0352ef28a8978b0625051310de458fb77fb00f6c3e9d20f27f727f8b39d954dc
diff --git a/sci-physics/vgm/vgm-4.8-r1.ebuild b/sci-physics/vgm/vgm-5.0.ebuild
index 6fb28e08553c..d58370b67b04 100644
--- a/sci-physics/vgm/vgm-4.8-r1.ebuild
+++ b/sci-physics/vgm/vgm-5.0.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
 
@@ -24,25 +24,24 @@ IUSE="doc examples +geant4 +root test"
 
 RDEPEND="
 	sci-physics/clhep:=
-	geant4? ( <sci-physics/geant-4.11[c++17] )
+	geant4? ( >=sci-physics/geant-4.11[c++17] )
 	root? ( sci-physics/root:=[c++17] )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[dot] )
 	test? (
-		<sci-physics/geant-4.11[gdml]
+		>=sci-physics/geant-4.11[gdml]
 		sci-physics/geant4_vmc[g4root]
 	)"
 RESTRICT="
 	!geant4? ( test )
 	!root? ( test )
-	!test? ( test )"
+	!test? ( test )
+	!examples? ( test )"
 
 DOCS=(
 	doc/README
-	doc/todo.txt
 	doc/VGMhistory.txt
-	doc/VGM.html
-	doc/VGMversions.html
+	doc/todo.txt
 )
 
 src_configure() {
@@ -65,14 +64,15 @@ src_configure() {
 src_compile() {
 	cmake_src_compile
 	if use doc; then
-		cd packages
-		doxygen || die
+		doxygen packages/Doxyfile || die
 	fi
 }
 
 src_test() {
 	cd "${BUILD_DIR}"/test || die
-	./test_suite.sh || die
+	# See upstream issue: https://github.com/vmc-project/vgm/issues/5
+	sed -i 's/ ScaledSolids / /' test3_suite.sh || die
+	PATH="${BUILD_DIR}"/test:${PATH} ./test_suite.sh || die
 }
 
 src_install() {
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index a2b21203209d..fdf095918a01 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.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
 
@@ -40,10 +40,8 @@ RESTRICT="
 
 DOCS=(
 	doc/README
-	doc/todo.txt
 	doc/VGMhistory.txt
-	doc/VGM.html
-	doc/VGMversions.html
+	doc/todo.txt
 )
 
 src_configure() {
@@ -66,8 +64,7 @@ src_configure() {
 src_compile() {
 	cmake_src_compile
 	if use doc; then
-		cd packages
-		doxygen || die
+		doxygen packages/Doxyfile || die
 	fi
 }