gentoo auto-resync : 13:09:2023 - 10:44:02

3 files changed, 87 insertions, 4 deletions

diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest
index 0a3f8107b7ce..58958fa678c1 100644
--- a/sci-physics/vgm/Manifest
+++ b/sci-physics/vgm/Manifest
@@ -1,6 +1,8 @@
 DIST vgm-5.0.tar.gz 3862583 BLAKE2B 7a1643b329f6f6b019e1b68ce691ed45a32d343925c59451d6e218469606a7a352334d4f1e330873fa1cbc4e1182b4557dc396f52ce7d35e26df81e79121cd60 SHA512 771c2e013c052ea1785fb79ba317b48482428ddf703e263eaf1c9840fbae66dd280d73aee99de30e1c3d70e46a5eb63affc92dfc5ba19298e2d4487b9e302588
 DIST vgm-5.1.tar.gz 3871449 BLAKE2B 19dc9337700edaa854a69b435e6e3012d12762fcc6fe2f3f1799ed11709a04c1b2e6b011ba2de89b251af6bb3471d6969037f4572e51bc21ae1de6cfcb2a3e6f SHA512 ac45c031d3e72d171a1d5048aa2d9e1330574a62cb80caa82a2875dfea4d52a314a7c52d4da99b387f6aeb4ce62842776216447082f8d594182210d34bf567ac
+DIST vgm-5.2.tar.gz 3963607 BLAKE2B 6b82f0ac8fa345e4a736d38c2e961f04836c943445fa2dbe52e48dcc378826a4aa7e1ea1af74ae097288121e52549d599e434da30bfd2b46c35b177ef42dae14 SHA512 f141215bf67684d41acb3ae3551e0c8b643033fca841d924030eedc18136e94d75efd8940b43eaca2640470c78331fff36957173e98c7f8a1cccc6325abbf870
 EBUILD vgm-5.0.ebuild 1904 BLAKE2B c6ebf472bdd23c00204f0f452e7c4eac5b0b0f54146c9fcea24f60692ebf2e51ee5465179d88d69de98ef85f9f646493e2896c2884c86c2a78a687bf26869191 SHA512 2be580bafde809cb429a7530d9e48926449d17be799154644c98313ab81b949217ff65c7a5b52fc0838c1e746c7d89bae0a6bbab7af75e0aa9ee6108d95b38f0
 EBUILD vgm-5.1.ebuild 1774 BLAKE2B 78232f275aa6f4d825f2a74face1a2ebfa697cd223adbafd3c268146f86427705b11712ed0ae8bcaba24e97d13868e7aa456d21789c5abe306b5018f87839ce2 SHA512 2faa2d0fe81c7fa9e46a95aaadd67f1b9943b5d24e9790b3a28821b7d6cc55e5dc2f6018ee25ce5e2fa643621174ddeb0d6a854354b64949dcb688db3ee687c5
-EBUILD vgm-9999.ebuild 1760 BLAKE2B fde904e7cdb812ffee695d55c8f5e473a5c950da772f884e1b2df0f9911472d7d448408e91ebbf63a0df77565f048e652949312d405c06e180845d80ce5c15c2 SHA512 2133d6fb969f26c2a5eaefd43c5ac4377d9be841986f2c3450200b7be090638b2f7837b6208804175dff680f0ce48b2f40c36a68bfd511f7dcfa155e8428ec99
+EBUILD vgm-5.2.ebuild 1667 BLAKE2B 2b2e94fe5fcbd6100aa3f6955d38701a2581ca7a96569e28683b086ecaa9cb7fd617e5f2d9241317c9c6444546d1ad666e7c2d6d22bc62b81fe5172a2aa7f42b SHA512 fd9d19ef393f2e1b0fbcffd83ece9b4aeefbec7971e695d63f866912126b59aee192fbc8d00871c5932ec06ee5d0674eb128cd08de9095bf0c1ffa16912dc1d0
+EBUILD vgm-9999.ebuild 1653 BLAKE2B fc505b8ce16becbd98cc235411d30027785b858cb34f45f32d504d0b30acbe18f30c3d574f5d6fad1b7d8cb8415217c96e144fb129116025464080c20710fc99 SHA512 ffdf6f62ba77cc2689c2ff9c8ed778342f1b9f68544ecbc8119bb2f19e86df46b618a60e5d506c29f5d183143c6b0faaab7460cba5fc27733a67dc7cb78b0549
 MISC metadata.xml 819 BLAKE2B 04ac719d56f70b20157b47d72551ef2867807589f1bfa577bb8a7e12954fa039a531a07384fac09555dbead90d8609cf6bf96a075f992492fd04166fb5711d3d SHA512 bda8c954d6cdd776af7fdc781de5f2b07566777a29d4fe99bbe596ead476481a0352ef28a8978b0625051310de458fb77fb00f6c3e9d20f27f727f8b39d954dc
diff --git a/sci-physics/vgm/vgm-5.2.ebuild b/sci-physics/vgm/vgm-5.2.ebuild
new file mode 100644
index 000000000000..d0dbdb3dc943
--- /dev/null
+++ b/sci-physics/vgm/vgm-5.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 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"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments"
+HOMEPAGE="https://github.com/vmc-project/vgm/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc examples +geant4 +root test"
+
+RDEPEND="
+	sci-physics/clhep:=
+	geant4? ( >=sci-physics/geant-4.11:=[c++17] )
+	root? ( sci-physics/root:=[c++17] )"
+DEPEND="${RDEPEND}
+	test? (
+		>=sci-physics/geant-4.11:=[gdml]
+		sci-physics/geant4_vmc[g4root]
+	)"
+BDEPEND="
+	doc? ( app-doc/doxygen[dot] )
+"
+RESTRICT="
+	!geant4? ( test )
+	!root? ( test )
+	!test? ( test )
+	!examples? ( test )"
+
+DOCS=(
+	doc/README
+	doc/VGMhistory.txt
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCLHEP_DIR="${EPREFIX}/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_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		doxygen packages/Doxyfile || die
+	fi
+}
+
+src_test() {
+	cd "${BUILD_DIR}"/test || die
+	PATH="${BUILD_DIR}"/test:${PATH} ./test_suite.sh || die
+}
+
+src_install() {
+	cmake_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 777ea264b4d8..f7524d3384d5 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.ebuild
@@ -27,11 +27,13 @@ RDEPEND="
 	geant4? ( sci-physics/geant:=[c++17] )
 	root? ( sci-physics/root:=[c++17] )"
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
 	test? (
 		sci-physics/geant:=[gdml]
 		sci-physics/geant4_vmc[g4root]
 	)"
+BDEPEND="
+	doc? ( app-doc/doxygen[dot] )
+"
 RESTRICT="
 	!geant4? ( test )
 	!root? ( test )
@@ -69,8 +71,6 @@ src_compile() {
 
 src_test() {
 	cd "${BUILD_DIR}"/test || 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
 }