gentoo auto-resync : 17:06:2023 - 19:45:55

6 files changed, 3 insertions, 155 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 667bbeb049a2..f97c580c629f 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index 023cd56418c7..57560f557ad4 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -11,5 +11,5 @@ DIST pytorch-2.0.0.tar.gz 111327292 BLAKE2B 6d593a975c0ade714f0b189f7e3c4ff704b9
 DIST pytorch-2.0.1.tar.gz 111335778 BLAKE2B 7a10cc2b2d5e2422aef7e060a0c3a62ca5c7460c6e0b9becade9b98939501975c74ed5a175a653731f43ca824d2c9bd31f41d1f633c2b139779ab23d5331e9ce SHA512 2309a22b3be3ccdb36d8d9781a59a7bdcc2fdb8d95ada205702ec77862480f0cbb12cd5d6b8cd3114d01a6e33b7743d0fe9de93debf37138ca5c14403cdb0c43
 EBUILD caffe2-1.13.1-r6.ebuild 5221 BLAKE2B 64a0309f8601752187205d49629245ae8a3305d9fad0626eff293fa555e50c7c147bfa9879ada2bd0a076e41120a9f5f9667cd784a4a3418cee9a4711eb69b05 SHA512 d1162bb88a1ac0c412cc2fa828521f98be9eda5f55d63f4a5162c727940121db1a7ab8155bd151fe1a2b9985851ff82bb49e3f3e01c4e4f1fdc1f3f4444d56ce
 EBUILD caffe2-2.0.0-r4.ebuild 5292 BLAKE2B f0560c057af3e24e81e4538f4ef6f35eba6b3e70a435c00be0e08aed40e1991997beea05127e195fcefe019147b10ca74c338e3b5a1b8bd61c631b680805a587 SHA512 4556d43911ca5fd8438d603529cf74bde4ec8ac30b9e7a45debab2252a9a8db53dde09b20d1be08a76f90dc783bd70401b1252427da6556d6c3e7d487b656345
-EBUILD caffe2-2.0.1-r1.ebuild 5349 BLAKE2B a09dc826194d3816765e6bb955dbd62608625197a9355b674ac8db38c6b9b254ad8004b1265eacc9222e2bf4261593c2b20cf79adb40ea8476cebfe0dde97502 SHA512 114d040104545a920282b1fda181b0e918cbb7d27d74999d42799eeac955d8a3e2ffcfb780c0740ac51eb358e9955bcb682970e8be72fc02b74c98595ee81b5d
+EBUILD caffe2-2.0.1-r2.ebuild 5341 BLAKE2B dbd68dc9ec032f17ccf06050fe0e181ac38187d93d3e7a697c6c1ae0cc06446fd15643ef05d37fcc99f22c07f9818545b6ec445666ca5bd9002d6c740c6fa07a SHA512 825942421b3c7fec44ea308d112aa92a4b95b70420fdea2aaa5e1bfb76204764060dd62bc29d709b557d7afd22083d8291b55e864397d448f9734892f8d73f8e
 MISC metadata.xml 1161 BLAKE2B af1b8f3ab7789f9aa5f635d5a3f1175bbdd7ccbf68f205bfc2769ccab2cb5c519f6fe62024759eb28f0e1353a04bed3216d222808b9f95100d3e0bb591f1d82b SHA512 1737d3dc8fa7786550930beb067ca4eca173a47095a88450ab5c913d3aed08f51fe21c875f484e5663542471a48ef55878cddc97881ff8be7648987b90b79126
diff --git a/sci-libs/caffe2/caffe2-2.0.1-r1.ebuild b/sci-libs/caffe2/caffe2-2.0.1-r2.ebuild
index 65814fb3e0e6..b8f88ae63e41 100644
--- a/sci-libs/caffe2/caffe2-2.0.1-r1.ebuild
+++ b/sci-libs/caffe2/caffe2-2.0.1-r2.ebuild
@@ -49,7 +49,7 @@ RDEPEND="
 	fbgemm? ( dev-libs/FBGEMM )
 	ffmpeg? ( media-video/ffmpeg:= )
 	gloo? ( sci-libs/gloo[cuda?] )
-	mpi? ( sys-cluster/openmpi )
+	mpi? ( virtual/mpi )
 	nnpack? ( sci-libs/NNPACK )
 	numpy? ( $(python_gen_cond_dep '
 		dev-python/numpy[${PYTHON_USEDEP}]
@@ -106,7 +106,7 @@ src_configure() {
 		ewarn ""
 		ewarn "To configure caffe2 with the CUDA compute capability that is optimal for your GPU,"
 		ewarn "set TORCH_CUDA_ARCH_LIST in your make.conf, and re-emerge caffe2."
-		ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TORCH_CUDA_ARCH_LIST=7.5,3.5"
+		ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TORCH_CUDA_ARCH_LIST=7.5 3.5"
 		ewarn "For a Maxwell model GPU, an example value would be: TORCH_CUDA_ARCH_LIST=Maxwell"
 		ewarn ""
 		ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus"
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 4e444ef170cb..3ed6cb0d6d95 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,9 +1,4 @@
-DIST proj-9.1.1.tar.gz 5311995 BLAKE2B d51652f649ac97f419740e30facd86b04ee0872197d235aecc9d8fd50c18340bc7969a4a78c33f28753fc8b5556e7e8bdc47e0b6a9d9971e214575481cf25c0b SHA512 b9d19a999e063e465579eb86da3fd2aa32fd894f0d15ba178733bcbad92246b3b3ea1811a276cd556874e171a5ba7cfd678ce563c0b8626c6db9349a64c04726
-DIST proj-9.2.0.tar.gz 5521397 BLAKE2B e3793c619b662a22c1e63d38885dae012256d798f7acde4e29f2021502c45b32eff1e0025c2418b8eea38c30ed15b6baba375ca52b07f3d416aae53e5bfaef1e SHA512 b9c5c72ba2ff1ab4b3c34ab43da411613d27e5206d38c734909fd7a8ab84a113f25a85633c1da1d35af5de22534e3d82f5a66edae52547d3016b51c3bf53f771
 DIST proj-9.2.1.tar.gz 5536575 BLAKE2B e08dc370cfac2c6358e1b28e44f3893c75e07fd64a4235041edf836885d31af33605673486edb122cec8aa13a2c564156c429a68e5045de52d8ea970d2e440f1 SHA512 5640e9bd4ea24a0e0b1521c90b8f709b64b9ee357190aaf08af0cff5df68ae93bdfb27211bde5c50340b067fc218b4f2aa8fb998ed2852ebeb2c2ad0ac4629ef
-DIST proj-data-1.12.tar.gz 611423889 BLAKE2B 5376f041aae1a23668a0cae79f4deadff29aad80a1187f837cd5c62c21dc49738fc598c52825f5d8575cd135b55c188d9456b5da72adc6a507fa778f0cad6596 SHA512 788d7c3ad70dd7aab21824ff189dd0cddc28b7e64999f6a9953d7af95f9fabab7143b0f1c3bed19d5deb8f3e3a7be62723fc5fda778fcaefab0ab6d449db5def
 DIST proj-data-1.13.tar.gz 709788173 BLAKE2B 33a487f327d2b35acfd6c7c12286bcd6e338c3459540482f968ef7038d78cea9d1519d89ba979f493e007fa961e0eb955889bf2348a235705ec3b71abf1e31c1 SHA512 14eca1b47dad913de608babc73708a35da8bb614c5374e990564a32549998a16e90d4c548f2dac0cd555fc8a4a645eeaf649db929cc38906bee1050e378a662e
-EBUILD proj-9.1.1-r1.ebuild 1478 BLAKE2B 288c56fd985c0b614bcdd6404dc9500c4df5fb0c49c0440f9ec3ffa6df7d8206fe6e4926b170a3eae2417890e94593115375e66fbc534636ba15384d4978da5f SHA512 d9a7dbfd289fe8fa7afa77a4391a49e7f0ec3c5c90eac621aa6f24df930fdd858b43e534065b130ab8353b467fcb2dc00ebad36093c683821fb5c553f9e35f1c
-EBUILD proj-9.2.0.ebuild 1571 BLAKE2B 520d47a5e5298ec6f8537497a73d5990dbda29d17f7b17eafd24c2e8329c8a42c2f20c520620222c0fcff2133254ec65072fdb6961e5f20149702b3750369223 SHA512 006c7621b102c011b5c85d57aeffb39deb9485b528ddd32a501379ddc023c289b6da256b29c06d978e4b8a481449d12624808a025281955c19b77b04628bf1de
 EBUILD proj-9.2.1.ebuild 1567 BLAKE2B f713eff00dd54919a12d842c731987705a8faad46aa80fdafccea97c9ed15b9a43101339381293c465e24c96f5c7147f112858f8e4c7d83d5f7323d9ff72f495 SHA512 c503bc98cf3cc95271388717e4041480e126cf7d1a5380f6bb9caa17bbaa7b8726a7ef1fc608a9ca216d58c188ed732755b33a10a7f96e270427afe24029bd2d
 MISC metadata.xml 345 BLAKE2B 356bd57a232baa5119842e6741d735afe44bf2c48fe144286743dd64716b3777f190980074d9013640cabb57306057e0abd42ea9fed80a44ee53366ea2413b23 SHA512 ec91a8fd73c7c798cfb0f23fc138e79bc642181265e4ee1fd94b9535dc3ae97e717f9115300ba648314e177f1dd3d0e3077e5746fbbc4c8eacd9b4692c721453
diff --git a/sci-libs/proj/proj-9.1.1-r1.ebuild b/sci-libs/proj/proj-9.1.1-r1.ebuild
deleted file mode 100644
index fa1a13f83779..000000000000
--- a/sci-libs/proj/proj-9.1.1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-# Check https://proj.org/download.html for latest data tarball
-PROJ_DATA="proj-data-1.12.tar.gz"
-DESCRIPTION="PROJ coordinate transformation software"
-HOMEPAGE="https://proj.org/"
-SRC_URI="https://download.osgeo.org/proj/${P}.tar.gz
-	https://download.osgeo.org/proj/${PROJ_DATA}"
-
-LICENSE="MIT"
-# Changes on every major release
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="curl test +tiff"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-db/sqlite:3
-	curl? ( net-misc/curl )
-	tiff? ( media-libs/tiff:= )"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	cd "${S}"/data || die
-	mv README README.DATA || die
-
-	unpack ${PROJ_DATA}
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DBUILD_PROJSYNC=$(usex curl)
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_TIFF=$(usex tiff)
-	)
-
-	use test && mycmakeargs+=( -DUSE_EXTERNAL_GTEST=ON )
-
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# proj_test_cpp_api: https://lists.osgeo.org/pipermail/proj/2019-September/008836.html
-		# testprojinfo: Also related to map data?
-		-E "(proj_test_cpp_api|testprojinfo)"
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	cd data || die
-	dodoc README.DATA
-
-	find "${ED}" -name '*.la' -type f -delete || die
-}
diff --git a/sci-libs/proj/proj-9.2.0.ebuild b/sci-libs/proj/proj-9.2.0.ebuild
deleted file mode 100644
index 816fcfaec6bf..000000000000
--- a/sci-libs/proj/proj-9.2.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-# Check https://proj.org/download.html for latest data tarball
-PROJ_DATA="proj-data-1.13.tar.gz"
-DESCRIPTION="PROJ coordinate transformation software"
-HOMEPAGE="https://proj.org/"
-SRC_URI="
-	https://download.osgeo.org/proj/${P}.tar.gz
-	https://download.osgeo.org/proj/${PROJ_DATA}
-"
-
-LICENSE="MIT"
-# Changes on every major release
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="curl test +tiff"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-db/sqlite:3
-	curl? ( net-misc/curl )
-	tiff? ( media-libs/tiff:= )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	cd "${S}"/data || die
-	mv README README.DATA || die
-
-	unpack ${PROJ_DATA}
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DBUILD_PROJSYNC=$(usex curl)
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_TIFF=$(usex tiff)
-	)
-
-	if use test ; then
-		mycmakeargs+=(
-			-DUSE_EXTERNAL_GTEST=ON
-			-DBUILD_BENCHMARKS=OFF
-			-DRUN_NETWORK_DEPENDENT_TESTS=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# proj_test_cpp_api: https://lists.osgeo.org/pipermail/proj/2019-September/008836.html
-		# testprojinfo: Also related to map data?
-		-E "(proj_test_cpp_api|testprojinfo)"
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	cd data || die
-	dodoc README.DATA
-
-	find "${ED}" -name '*.la' -type f -delete || die
-}