gentoo auto-resync : 29:01:2023 - 20:56:01

3 files changed, 3 insertions, 86 deletions

diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index 475b30e15383..0c998ae1b938 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1,5 +1,3 @@
-DIST cartopy-0.21.0.gh.tar.gz 10815721 BLAKE2B 8a249d6e6b19d5a784a25d44fe062b5417811078f9b5362beed4e60f6a7e3d89996773a0b9530c96a27d3aa3a5a62ce05010ee17cc9ea71d33b9d7f6d1a5c602 SHA512 bb227e3f9ff591a33e7b4c053010321b04f2a03c68e84b1ea17cab125fc1d04f587b7f54125fe5bd3faae1379a0df8a217fd0ad5f85a7c461f9595f5b38f72f9
 DIST cartopy-0.21.1.gh.tar.gz 10815884 BLAKE2B 4137f593b6ce35270f9df5016529250a07c57ec5a95843db8740eb494f55109b5129cf72153b0216e4f786771bf5cedde3caaecd40175fe9ad5c6fb65ad84788 SHA512 de1d09ee3bf6af13bcc7cc4bb1f7c13335ba67e05d2ad64efa0fb00bdb74c7e13c6fc44822d5ac1d70ee7d39b2322280c1395dc66119b9ecd94ca26014e413a1
-EBUILD cartopy-0.21.0-r1.ebuild 2057 BLAKE2B b7eb4a78d004895f5b94b6be307be9f308df4028adca7021d9420d2963983bda96828d9415f1e6971f9b5d3cc3b6124779ca5be378643578a50b976b11792a55 SHA512 396920226351df57b1d0dcc9cb2eff525e6e9b6ff9c2595d3123105cb2afa0b24255b4ff08c2cff3a820312fbe072dda09d9bf4042c453e560eba5b9811dc827
-EBUILD cartopy-0.21.1.ebuild 2057 BLAKE2B b7eb4a78d004895f5b94b6be307be9f308df4028adca7021d9420d2963983bda96828d9415f1e6971f9b5d3cc3b6124779ca5be378643578a50b976b11792a55 SHA512 396920226351df57b1d0dcc9cb2eff525e6e9b6ff9c2595d3123105cb2afa0b24255b4ff08c2cff3a820312fbe072dda09d9bf4042c453e560eba5b9811dc827
+EBUILD cartopy-0.21.1.ebuild 2056 BLAKE2B 67d0beee114eff3fa353bce278949c2d3bd7e4e9defd44863746e70216f574763950936334c58475fb61cc8839a7f10e886f0ef2ae20d84ecd2adc2761c578d1 SHA512 fa1a5bd64cbc9b8111529e2daa6566e8e92f1c691f2d20d14721fcb82439ff101a2f48c1418ef4df9a367fb7cf137337a4323775038407f0bd1c1d65aea3a249
 MISC metadata.xml 729 BLAKE2B 38605f8140ccae8c9edf2b5eb7bf394e9c99fd089fa998c98422967cc12d3b808d3b7901d3746da25558c9211e47deec01a3d5856176cda8a868c0151a03fed8 SHA512 f3fb714f50475c2e0f4150d20423195fffb39243aefd313e9a9d0fa834364a928a712006d6e1e1def77b902f8c349a4045d3081fe38697054e744441e622a591
diff --git a/sci-libs/cartopy/cartopy-0.21.0-r1.ebuild b/sci-libs/cartopy/cartopy-0.21.0-r1.ebuild
deleted file mode 100644
index e0c53cc8374c..000000000000
--- a/sci-libs/cartopy/cartopy-0.21.0-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1 multiprocessing virtualx
-
-MY_PV=${PV/_beta/b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Python package for geospatial data processing and analysis"
-HOMEPAGE="https://scitools.org.uk/cartopy"
-SRC_URI="https://github.com/SciTools/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	sci-libs/gdal[python,${PYTHON_SINGLE_USEDEP}]
-	sci-libs/geos
-	$(python_gen_cond_dep '
-		>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
-		dev-python/shapely[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/pillow[jpeg,${PYTHON_USEDEP}]
-		dev-python/pyproj[${PYTHON_USEDEP}]
-		sci-libs/pyshp[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-		dev-python/cython[${PYTHON_USEDEP}]
-	')
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/filelock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/flufl-lock[${PYTHON_USEDEP}]
-			dev-python/pytest-mpl[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-EPYTEST_IGNORE=(
-	# Require network access, not covered by markers
-	lib/cartopy/tests/mpl/test_crs.py
-	lib/cartopy/tests/mpl/test_gridliner.py
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-	# Prepare matplotlib backend for test suite
-	export MPLCONFIGDIR="${T}"
-	echo "backend : Agg" > "${MPLCONFIGDIR}"/matplotlibrc || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-
-	# Drop all tests needing network access
-	virtx epytest -n "$(makeopts_jobs)" -m "not network and not natural_earth" || die "test failed"
-}
diff --git a/sci-libs/cartopy/cartopy-0.21.1.ebuild b/sci-libs/cartopy/cartopy-0.21.1.ebuild
index e0c53cc8374c..380a7c7ba024 100644
--- a/sci-libs/cartopy/cartopy-0.21.1.ebuild
+++ b/sci-libs/cartopy/cartopy-0.21.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python3_{9..10} )
 
-inherit distutils-r1 multiprocessing virtualx
+inherit distutils-r1 multibuild multiprocessing virtualx
 
 MY_PV=${PV/_beta/b}
 MY_P=${PN}-${MY_PV}
@@ -41,7 +41,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+		dev-python/setuptools_scm[${PYTHON_USEDEP}]
 		dev-python/cython[${PYTHON_USEDEP}]
 	')
 	test? (