gentoo resync : 22.01.2021

5 files changed, 11 insertions, 127 deletions

diff --git a/sci-physics/geant-vmc/Manifest b/sci-physics/geant-vmc/Manifest
index 60fee01a124d..502bfc8df380 100644
--- a/sci-physics/geant-vmc/Manifest
+++ b/sci-physics/geant-vmc/Manifest
@@ -1,7 +1,4 @@
-AUX geant-vmc-4.4.0-fix-cflags.patch 661 BLAKE2B 121054bdcf8dfae328334221cc85c7d117a8dd9b0b096499ea07938bb05f303759c6478c2187f36e7b4ba22f4e1f0935d980802ce5195c1d2d9b5202d240b683 SHA512 7c6b7c253088a780101c51ac9a055fe79f65d78996206fce77d9e70a558e2b5b222eee4ccba689e68effc429cb8b2d41c6021fe4bead7d44f52daa1820a308a2
-DIST geant-vmc-4.5.1_p1.tar.gz 7441504 BLAKE2B 2bcb844a8fc79c800eec50f914cd7238a68ba0c1ffa1e8d185adcded70583118e39efbac3330f7942a098fc64f990c1e9e0eeb1796f71ebd98f97d121aa6c121 SHA512 760611c1df481ea3d9f9069061678677ffc2bcf9edd7cfd44789a6359b945bc341f705da0ee85ecda7f8ac2b096cd5b7aa9ea2c44b464e3085c16eeb33ee1316
-DIST geant4_vmc.4.0.tar.gz 7118838 BLAKE2B 5edbd13adeeb560188deb54c1f5d52fda371dd5f3dc04d676bcaf7edad0bbf8eb573d6345e5c3626b5b64c229d49b7f02aafec77a2587e525cf3f407444391b5 SHA512 faf5fed17b317399b97f77ff1c2a1bf1cead8f0b02a3a89244f01f8ae04ce621763e52b40000e481b3826796bb4d94216368d2e3c98a62f02048c5979f4ee648
-EBUILD geant-vmc-4.4.0.ebuild 2442 BLAKE2B 60d7a84b777d2f87fde249a31b05a9a0e6fd90f1f9e5c7b74d0770e9dd6f2f40663316b39e68f56e9ccf9b4edf9d9a1aec2ae83f13435529992eb7fb88ca59ec SHA512 c533ceccfdeed7ecaa4596056a11f6fcec9828a7f3f82556dd24686d59313318b4982ac87f57ef20d44393cd9c7308904dd2f3dc4a0d155f7e304f280fe97d1c
-EBUILD geant-vmc-4.5.1_p1.ebuild 2145 BLAKE2B 27addb17a3e05d8d635e6f2e57b2cb106857776d31862003f242a5a5c180cb2b5ec2162ab9a3d0f4124aa86560352f732f22e512b5a6f09fd738a7f5b1c49daf SHA512 85f23a09ba6ce4ddc905807955f944491d6e2ebc1889a0eda979ea82c89770cb822dfbc48c718103ae42075ef7d53160194689e562b993d7523ccdb47ff7ba2c
-EBUILD geant-vmc-9999.ebuild 2145 BLAKE2B 27addb17a3e05d8d635e6f2e57b2cb106857776d31862003f242a5a5c180cb2b5ec2162ab9a3d0f4124aa86560352f732f22e512b5a6f09fd738a7f5b1c49daf SHA512 85f23a09ba6ce4ddc905807955f944491d6e2ebc1889a0eda979ea82c89770cb822dfbc48c718103ae42075ef7d53160194689e562b993d7523ccdb47ff7ba2c
+DIST geant-vmc-4.5.3.tar.gz 7411643 BLAKE2B 31a486aa32f879093753aab09798eabf1a936f0aa246bb97c7f055eefb789c9c5a5097c14ce47b05a99f3cc2b46bea6edeba2af80ee362bb8fee039ee711eddc SHA512 918ce3ca4a4fb329f00000fce00dae3d4a4c9f348553f31bf474f727c1e67242b5ff28fe7dc5d3ab12d1174663b1dd96b654b5baf7edfa662ab3f66687792e94
+EBUILD geant-vmc-4.5.3.ebuild 2132 BLAKE2B 2b06d32c99ff9053351ec20246d28eb4b8a2e6121a49f724ab36b787395517a846770c14282e013c3f4c5206513165fb22e89ae3a16f3a677b013a5c20c1e497 SHA512 ffe882863e92e60b896221e2d7b752e3a77d687ab947374b381ff023271adf5189cbfffc6d3b60839d442263c6a3dc912484fd62ef63fb3831accb45887d5f87
+EBUILD geant-vmc-9999.ebuild 2132 BLAKE2B 2b06d32c99ff9053351ec20246d28eb4b8a2e6121a49f724ab36b787395517a846770c14282e013c3f4c5206513165fb22e89ae3a16f3a677b013a5c20c1e497 SHA512 ffe882863e92e60b896221e2d7b752e3a77d687ab947374b381ff023271adf5189cbfffc6d3b60839d442263c6a3dc912484fd62ef63fb3831accb45887d5f87
 MISC metadata.xml 1272 BLAKE2B 341ef37e4e2262b40fa6161af831f886a9ef2deb7691555323a8b464f731c526eaa2dc118e050b6fdbcd6f6663830ed238c6dc227ac2013617981d06c56731e5 SHA512 9e871ddf520845ea33f6db1f608a0ddfbf29e8c2c2a51a2cb39a419a8de7c0297747fe2c5a9da335923a7ad01795bd37e930da7b3fa6fd042c97acfb09a10a27
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
deleted file mode 100644
index d3bf0dfdd308..000000000000
--- a/sci-physics/geant-vmc/files/geant-vmc-4.4.0-fix-cflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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.4.0.ebuild b/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
deleted file mode 100644
index fb2e982ebfd8..000000000000
--- a/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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_src_configure
-}
-
-src_compile() {
-	cmake_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_src_install
-	use doc && local HTML_DOCS=(doc/.)
-	einstalldocs
-}
diff --git a/sci-physics/geant-vmc/geant-vmc-4.5.1_p1.ebuild b/sci-physics/geant-vmc/geant-vmc-4.5.3.ebuild
index b28eff16cc8b..a4e3263f8afa 100644
--- a/sci-physics/geant-vmc/geant-vmc-4.5.1_p1.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-4.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,6 @@ inherit cmake
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/vmc-project/geant4_vmc.git"
-	KEYWORDS=""
 else
 	MY_PV=$(ver_rs 1-2 - $(ver_cut 2-))
 	SRC_URI="https://github.com/vmc-project/geant4-vmc/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
@@ -17,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Virtual Monte Carlo Geant4 implementation"
-HOMEPAGE="http://root.cern.ch/root/vmc/VirtualMC.html"
+HOMEPAGE="https://github.com/vmc-project/vmc"
 
 LICENSE="GPL-3"
 SLOT="4"
@@ -37,8 +36,8 @@ RDEPEND="
 	>=sci-physics/geant-4.10.6[c++11?,c++14?,c++17?,opengl,geant3?]
 	>=sci-physics/root-6.18:=[c++11?,c++14?,c++17?]
 	vgm? ( >=sci-physics/vgm-4.8:=[c++11?,c++14?,c++17?] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 RESTRICT="
 	!examples? ( test )
 	!geant3? ( test )
diff --git a/sci-physics/geant-vmc/geant-vmc-9999.ebuild b/sci-physics/geant-vmc/geant-vmc-9999.ebuild
index b28eff16cc8b..a4e3263f8afa 100644
--- a/sci-physics/geant-vmc/geant-vmc-9999.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,6 @@ inherit cmake
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/vmc-project/geant4_vmc.git"
-	KEYWORDS=""
 else
 	MY_PV=$(ver_rs 1-2 - $(ver_cut 2-))
 	SRC_URI="https://github.com/vmc-project/geant4-vmc/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
@@ -17,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Virtual Monte Carlo Geant4 implementation"
-HOMEPAGE="http://root.cern.ch/root/vmc/VirtualMC.html"
+HOMEPAGE="https://github.com/vmc-project/vmc"
 
 LICENSE="GPL-3"
 SLOT="4"
@@ -37,8 +36,8 @@ RDEPEND="
 	>=sci-physics/geant-4.10.6[c++11?,c++14?,c++17?,opengl,geant3?]
 	>=sci-physics/root-6.18:=[c++11?,c++14?,c++17?]
 	vgm? ( >=sci-physics/vgm-4.8:=[c++11?,c++14?,c++17?] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 RESTRICT="
 	!examples? ( test )
 	!geant3? ( test )