gentoo auto-resync : 27:11:2024 - 02:00:00

3 files changed, 2 insertions, 19 deletions

diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index cf37a3111c31..8eb16d683785 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1,6 +1,5 @@
-AUX cartopy-0.23.0-backport-test-fixes.patch 520 BLAKE2B 57edd4f30665f243a7e710f3341fae647c897aab5066adf2749fd3c084adc67a730203d29dc3c5d19b8b963ecde2c41cbfd8a5da2c82e8775161d2ee4621a1ef SHA512 701b61807388962d2be57da2b7d32a0cd0b84584119cd0772d8b2a1da15e9cf233a048c2bd3ac08bd353732f7c2ae36bf500983569c1c42fec093752a9c570bd
-DIST cartopy-0.23.0.gh.tar.gz 10645484 BLAKE2B aa9306e9f5bd85ae28be4802aac1a36d67df5812e9d188ad20d27103eaff1856b7d48e256459519b4e647bdf17fc207e8473ec6ead7413db113311fe821faba6 SHA512 8f357faad592db03c564d2c87f6d1600d2a04a68b71b250925c222cea418b8588f2eb48f64d3ec7210650a34372777ef8416c8f129af7911661615759d2c60b5
 DIST cartopy-0.24.0.gh.tar.gz 10701591 BLAKE2B 93b555e43031561f4927952839ddb7f95bef3801cbdaa5c20d98612b5a6d0383b83f4c41cf965b9ef2c64aea68c0507b34a3959bebb71b00bd86fc25d2de412a SHA512 eb0349dc3c1358b18f8c8ae71166f1947c3024337d7bf27fe28a2dea30593e7c6fcf1aa4a540537dd02d95f66051469ca679f3a5b8b3c2cf09d2f25736e03a9b
-EBUILD cartopy-0.23.0.ebuild 2193 BLAKE2B 82d5147690bbe2081793db394666cbd1ad41c68a8f18a55f7f6e555d7551273f617db996b4298a062f7436635b0b00f085b9cf3773267705082af22562e63fe7 SHA512 4afffbef0971f207444de7013d948993fac1bac211310fd5f10fa2c2f92e338638bb19023a99b49819b88329563510bfc28e11ba67c477e19855dc7dfa1f15ca
+DIST cartopy-0.24.1.gh.tar.gz 10701425 BLAKE2B b1c6980e4e2b03e6ca2f55eec949b7dc4f58577af3795f71af81bd25f0d6e6a2ef3aca1d09b73dbf9c8e9a611f697843189e60bd821516f80bdbc2af2a4f93af SHA512 de5a4c191e3917941b0bab4e9c92fb60a91ef0263f7066753fd64286c347304ae8b7529b08fa901669173e8630c2b396775daf98161e8cadc62346641555c01a
 EBUILD cartopy-0.24.0.ebuild 2135 BLAKE2B 6adcea70334d7599ea992c8a62979b48c92247618558b0e975dc4d7819321bf59817209460189774d29964503a2dbd60191a5d0ca7c057dadb2c280d7033578a SHA512 5aa3e739e7b0e4f27cc7faf65b2c5b51161b52268687d77eec8a84ddca2fd809b604ea51b401d51e5a27349fe6d8dc779317666884b403b5eb416690bfe6b28c
+EBUILD cartopy-0.24.1.ebuild 2135 BLAKE2B 6adcea70334d7599ea992c8a62979b48c92247618558b0e975dc4d7819321bf59817209460189774d29964503a2dbd60191a5d0ca7c057dadb2c280d7033578a SHA512 5aa3e739e7b0e4f27cc7faf65b2c5b51161b52268687d77eec8a84ddca2fd809b604ea51b401d51e5a27349fe6d8dc779317666884b403b5eb416690bfe6b28c
 MISC metadata.xml 729 BLAKE2B 38605f8140ccae8c9edf2b5eb7bf394e9c99fd089fa998c98422967cc12d3b808d3b7901d3746da25558c9211e47deec01a3d5856176cda8a868c0151a03fed8 SHA512 f3fb714f50475c2e0f4150d20423195fffb39243aefd313e9a9d0fa834364a928a712006d6e1e1def77b902f8c349a4045d3081fe38697054e744441e622a591
diff --git a/sci-libs/cartopy/cartopy-0.23.0.ebuild b/sci-libs/cartopy/cartopy-0.24.1.ebuild
index 024cbd93e090..3c21d69d0004 100644
--- a/sci-libs/cartopy/cartopy-0.23.0.ebuild
+++ b/sci-libs/cartopy/cartopy-0.24.1.ebuild
@@ -55,9 +55,6 @@ BDEPEND="
 		')
 	)
 "
-PATCHES=(
-	"${FILESDIR}"/${P}-backport-test-fixes.patch
-)
 
 EPYTEST_IGNORE=(
 	# Require network access, not covered by markers
diff --git a/sci-libs/cartopy/files/cartopy-0.23.0-backport-test-fixes.patch b/sci-libs/cartopy/files/cartopy-0.23.0-backport-test-fixes.patch
deleted file mode 100644
index b88d4110dd6f..000000000000
--- a/sci-libs/cartopy/files/cartopy-0.23.0-backport-test-fixes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# backport last test fix just after v0.23 release
-diff --git a/lib/cartopy/tests/mpl/test_gridliner.py b/lib/cartopy/tests/mpl/test_gridliner.py
-index 7d82178..d07573e 100644
---- a/lib/cartopy/tests/mpl/test_gridliner.py
-+++ b/lib/cartopy/tests/mpl/test_gridliner.py
-@@ -496,6 +496,7 @@ def test_gridliner_count_draws():
-         mocked.assert_called_once()
- 
- 
-+@pytest.mark.natural_earth
- @pytest.mark.mpl_image_compare(
-     baseline_dir='baseline_images/mpl/test_mpl_integration',
-     filename='simple_global.png')