gentoo auto-resync : 21:07:2023 - 10:04:00

5 files changed, 179 insertions, 2 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 4636df0a8e64..4810370794dd 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index 8cdf781c1ba4..b55238f95264 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1,5 +1,7 @@
 AUX cartopy-0.21.1-fix-test.patch 1108 BLAKE2B c88a6a68bf0c0737d31049ac2c5a24791779ccc2b29f767056796c138928b04ffea47d8989dec02ed19725527d512920f07c991eb80f1534b83bf842df48b30e SHA512 010f1c844d21c60dca18dbc5530fcbebb5da99bd4a126e6c844bcb32c55533114c53694fbfc381e9a3aecabab8d11d9fb33a826597b9b66eae30c07f304f44e6
+AUX cartopy-0.21.1-fix-test_proj92.patch 5677 BLAKE2B 6ec667d840e4c7909a5c17ed858cd9dd2ea7c8022ece40cdbad00be2b36167e485864c2698969fc033c7c43882fab4b14bd8e3febeaec7c9727c3f34ad84c22f SHA512 e13235d0ee16dbb0748495fc0d697df450f9f4ea7f66845331c5dc3208f70502ebf9c7288730cdd060b20b489b0b2e729bbcb99616a2b6ddf12e42fc45427b06
+AUX cartopy-0.21.1-fix-test_proj92_1.patch 2002 BLAKE2B 891615c88200d3a4ed84ecdbdc1150c82524734dc06c8240534788c0395d5e5244d9a6faeafedf174e1172fb929c36a27b9e2a2aa205293063471dc925e1218b SHA512 156704f18ca398c8327ed3a111cfd87696a0d5f7907d4e8c34ce3e0c8a99eea4930c241f88f6a9c8fe8bfab34148cbbe995a6f471332c97ad88aa0d4d9c567e0
 DIST cartopy-0.21.1.gh.tar.gz 10815884 BLAKE2B 4137f593b6ce35270f9df5016529250a07c57ec5a95843db8740eb494f55109b5129cf72153b0216e4f786771bf5cedde3caaecd40175fe9ad5c6fb65ad84788 SHA512 de1d09ee3bf6af13bcc7cc4bb1f7c13335ba67e05d2ad64efa0fb00bdb74c7e13c6fc44822d5ac1d70ee7d39b2322280c1395dc66119b9ecd94ca26014e413a1
-EBUILD cartopy-0.21.1-r1.ebuild 2151 BLAKE2B 25c47b8b533e6884160a5a411679e1372f0ddebc1f812f43c0edbdbd43b6ac8c8d4a4e312b787f22b8df295270484cd25b2c7fd38bb834aec642671cd74507cd SHA512 6fa0cd826569b598173568ccb80751cacaaa6ba627b2e785b9781c1a05496935d568b46bcb381eeba93d5c622e2a79d6e64153af33da12494256027f0e9ca8cb
+EBUILD cartopy-0.21.1-r1.ebuild 2301 BLAKE2B 0cad49a11e61991c6f2eb42575769941d7944f5b1a802d894d45525ffa045b43f9491123a02f20ee7cf8faf4fa5a792c21096ce1552628542839d8a1765abe15 SHA512 ed4e5e0f66f270fb298276f222f1fc3b68a99288f7714610df7cc772586e1214fc26497e14f542496d56cf21d07922a97bfb89f256a465b76bf85d5af7836e29
 EBUILD cartopy-0.21.1.ebuild 2103 BLAKE2B 40b5cbc22d3ecae968c8e7739264ff3b80c2953d2644e2df0c5d0e82a283a74e583129dea6c4c5b381738527607dc6cc378421c9ac233831b9e55b29e4244016 SHA512 276ac9f06c63821133e8a0d6e752d7a96a09bd1ebc60acbf74825b56ef7f2e2fdad5e874611612c3889aa285348f561776bdaa9d0ac9a00b50183fd2661b3de7
 MISC metadata.xml 729 BLAKE2B 38605f8140ccae8c9edf2b5eb7bf394e9c99fd089fa998c98422967cc12d3b808d3b7901d3746da25558c9211e47deec01a3d5856176cda8a868c0151a03fed8 SHA512 f3fb714f50475c2e0f4150d20423195fffb39243aefd313e9a9d0fa834364a928a712006d6e1e1def77b902f8c349a4045d3081fe38697054e744441e622a591
diff --git a/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild b/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild
index 80e71d718b8f..e7186c4571c4 100644
--- a/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild
+++ b/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild
@@ -57,7 +57,10 @@ BDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}"/${P}-fix-test.patch )
+PATCHES=( "${FILESDIR}"/${P}-fix-test.patch
+		# backports to fix tests with >=PROJ9.2
+		  "${FILESDIR}"/${PN}-0.21.1-fix-test_proj92.patch
+		  "${FILESDIR}"/${PN}-0.21.1-fix-test_proj92_1.patch )
 
 EPYTEST_IGNORE=(
 	# Require network access, not covered by markers
diff --git a/sci-libs/cartopy/files/cartopy-0.21.1-fix-test_proj92.patch b/sci-libs/cartopy/files/cartopy-0.21.1-fix-test_proj92.patch
new file mode 100644
index 000000000000..e9f1d03eeeb2
--- /dev/null
+++ b/sci-libs/cartopy/files/cartopy-0.21.1-fix-test_proj92.patch
@@ -0,0 +1,126 @@
+diff --git a/lib/cartopy/tests/crs/test_equidistant_conic.py b/lib/cartopy/tests/crs/test_equidistant_conic.py
+index 045c87e5d..9f50b4f04 100644
+--- a/lib/cartopy/tests/crs/test_equidistant_conic.py
++++ b/lib/cartopy/tests/crs/test_equidistant_conic.py
+@@ -10,6 +10,7 @@
+ 
+ import numpy as np
+ from numpy.testing import assert_almost_equal, assert_array_almost_equal
++import pyproj
+ import pytest
+ 
+ import cartopy.crs as ccrs
+@@ -23,11 +24,16 @@ def test_default(self):
+                       'y_0=0.0', 'lat_1=20.0', 'lat_2=50.0'}
+         check_proj_params('eqdc', eqdc, other_args)
+ 
++        expected_x = (-22784919.35600352, 22784919.35600352)
++        expected_y = (-10001965.729313632, 17558791.85156368)
++        if pyproj.__proj_version__ >= '9.2.0':
++            expected_x = (-22784919.3559981,  22784919.3559981)
++            expected_y = (-10001965.72931272,  17558791.85157471)
+         assert_almost_equal(np.array(eqdc.x_limits),
+-                            (-22784919.35600352, 22784919.35600352),
++                            expected_x,
+                             decimal=7)
+         assert_almost_equal(np.array(eqdc.y_limits),
+-                            (-10001965.729313632, 17558791.85156368),
++                            expected_y,
+                             decimal=7)
+ 
+     def test_eccentric_globe(self):
+@@ -37,12 +43,16 @@ def test_eccentric_globe(self):
+         other_args = {'a=1000', 'b=500', 'lon_0=0.0', 'lat_0=0.0', 'x_0=0.0',
+                       'y_0=0.0', 'lat_1=20.0', 'lat_2=50.0'}
+         check_proj_params('eqdc', eqdc, other_args)
+-
++        expected_x = (-3016.869847713461, 3016.869847713461)
++        expected_y = (-1216.6029342241113, 2511.0574375797723)
++        if pyproj.__proj_version__ >= '9.2.0':
++            expected_x = (-2960.1009481,  2960.1009481)
++            expected_y = (-1211.05573766,  2606.04249537)
+         assert_almost_equal(np.array(eqdc.x_limits),
+-                            (-3016.869847713461, 3016.869847713461),
++                            expected_x,
+                             decimal=7)
+         assert_almost_equal(np.array(eqdc.y_limits),
+-                            (-1216.6029342241113, 2511.0574375797723),
++                            expected_y,
+                             decimal=7)
+ 
+     def test_eastings(self):
+@@ -127,12 +137,16 @@ def test_ellipsoid_transform(self):
+                       'lat_0=23.0', 'x_0=0.0', 'y_0=0.0', 'lat_1=29.5',
+                       'lat_2=45.5'}
+         check_proj_params('eqdc', eqdc, other_args)
+-
++        expected_x = (-22421870.719894886, 22421870.719894886)
++        expected_y = (-12546277.778958388, 17260638.403203618)
++        if pyproj.__proj_version__ >= '9.2.0':
++            expected_x = (-22421870.71988974,  22421870.71988976)
++            expected_y = (-12546277.77895742,  17260638.403216)
+         assert_almost_equal(np.array(eqdc.x_limits),
+-                            (-22421870.719894886, 22421870.719894886),
++                            expected_x,
+                             decimal=7)
+         assert_almost_equal(np.array(eqdc.y_limits),
+-                            (-12546277.778958388, 17260638.403203618),
++                            expected_y,
+                             decimal=7)
+ 
+         result = eqdc.transform_point(-75.0, 35.0, geodetic)
+diff --git a/lib/cartopy/tests/crs/test_sinusoidal.py b/lib/cartopy/tests/crs/test_sinusoidal.py
+index 2f2a1821a..9347260a1 100644
+--- a/lib/cartopy/tests/crs/test_sinusoidal.py
++++ b/lib/cartopy/tests/crs/test_sinusoidal.py
+@@ -6,6 +6,7 @@
+ 
+ import numpy as np
+ from numpy.testing import assert_almost_equal
++import pyproj
+ import pytest
+ 
+ import cartopy.crs as ccrs
+@@ -32,10 +33,15 @@ def test_eccentric_globe(self):
+         other_args = {'a=1000', 'b=500', 'lon_0=0.0', 'x_0=0.0', 'y_0=0.0'}
+         check_proj_params('sinu', crs, other_args)
+ 
++        expected_x = [-3141.59, 3141.59]
++        expected_y = [-1216.60, 1216.60]
++        if pyproj.__proj_version__ >= '9.2.0':
++            expected_x = [-3141.60, 3141.60]
++            expected_y = [-1211.05,  1211.05]
+         assert_almost_equal(np.array(crs.x_limits),
+-                            [-3141.59, 3141.59], decimal=2)
++                            expected_x, decimal=2)
+         assert_almost_equal(np.array(crs.y_limits),
+-                            [-1216.60, 1216.60], decimal=2)
++                            expected_y, decimal=2)
+ 
+     def test_offset(self):
+         crs = ccrs.Sinusoidal()
+diff --git a/lib/cartopy/tests/test_crs.py b/lib/cartopy/tests/test_crs.py
+index c1a5d11da..b6c38ced3 100644
+--- a/lib/cartopy/tests/test_crs.py
++++ b/lib/cartopy/tests/test_crs.py
+@@ -90,9 +90,17 @@ def test_osgb(self, approx):
+     def test_epsg(self):
+         uk = ccrs.epsg(27700)
+         assert uk.epsg_code == 27700
+-        assert_almost_equal(uk.x_limits, (-104009.357, 688806.007), decimal=3)
+-        assert_almost_equal(uk.y_limits, (-8908.37, 1256558.45), decimal=2)
+-        assert_almost_equal(uk.threshold, 7928.15, decimal=2)
++        expected_x = (-104009.357, 688806.007)
++        expected_y = (-8908.37, 1256558.45)
++        expected_threshold = 7928.15
++        if pyproj.__proj_version__ >= '9.2.0':
++            expected_x = (-104728.764, 688806.007)
++            expected_y = (-8908.36, 1256616.32)
++            expected_threshold = 7935.34
++        assert_almost_equal(uk.x_limits,
++                            expected_x, decimal=3)
++        assert_almost_equal(uk.y_limits, expected_y, decimal=2)
++        assert_almost_equal(uk.threshold, expected_threshold, decimal=2)
+         self._check_osgb(uk)
+ 
+     def test_epsg_compound_crs(self):
diff --git a/sci-libs/cartopy/files/cartopy-0.21.1-fix-test_proj92_1.patch b/sci-libs/cartopy/files/cartopy-0.21.1-fix-test_proj92_1.patch
new file mode 100644
index 000000000000..7ce52bb23364
--- /dev/null
+++ b/sci-libs/cartopy/files/cartopy-0.21.1-fix-test_proj92_1.patch
@@ -0,0 +1,46 @@
+diff --git a/lib/cartopy/tests/crs/test_lambert_conformal.py b/lib/cartopy/tests/crs/test_lambert_conformal.py
+index 6032d2e5c..c64022ff9 100644
+--- a/lib/cartopy/tests/crs/test_lambert_conformal.py
++++ b/lib/cartopy/tests/crs/test_lambert_conformal.py
+@@ -5,6 +5,7 @@
+ # licensing details.
+ 
+ from numpy.testing import assert_array_almost_equal
++import pyproj
+ import pytest
+ 
+ import cartopy.crs as ccrs
+@@ -68,18 +69,29 @@ def test_too_many_parallel(self):
+ 
+     def test_single_spole(self):
+         s_pole_crs = ccrs.LambertConformal(standard_parallels=[-1.])
++        expected_x = (-19939660, 19939660)
++        expected_y = (-735590302, -8183795)
++        if pyproj.__proj_version__ >= '9.2.0':
++            expected_x = (-19840440, 19840440)
++            expected_y = (-370239953, -8191953)
++        print(s_pole_crs.x_limits)
+         assert_array_almost_equal(s_pole_crs.x_limits,
+-                                  (-19939660, 19939660),
++                                  expected_x,
+                                   decimal=0)
+         assert_array_almost_equal(s_pole_crs.y_limits,
+-                                  (-735590302, -8183795),
++                                  expected_y,
+                                   decimal=0)
+ 
+     def test_single_npole(self):
+         n_pole_crs = ccrs.LambertConformal(standard_parallels=[1.])
++        expected_x = (-20130569, 20130569)
++        expected_y = (-8170229, 726200683)
++        if pyproj.__proj_version__ >= '9.2.0':
++            expected_x = (-20222156, 20222156)
++            expected_y = (-8164817, 360848719)
+         assert_array_almost_equal(n_pole_crs.x_limits,
+-                                  (-20130569, 20130569),
++                                  expected_x,
+                                   decimal=0)
+         assert_array_almost_equal(n_pole_crs.y_limits,
+-                                  (-8170229, 726200683),
++                                  expected_y,
+                                   decimal=0)