gentoo auto-resync : 26:10:2022 - 03:54:55

3 files changed, 60 insertions, 1 deletions

diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index 091eadc552f8..a52c73c1bf51 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1,5 +1,6 @@
+AUX pyproj-3.4.0-proj-9.1.patch 1995 BLAKE2B 0ce5cbf73d8d231dc07a0c764787d9aa9da6b15b925d136bc6b9012b6d170fc7d9e13e6f206c22ef826a56ee6a770e0745eb7969207f346a33125569b3a15888 SHA512 09cd051caec9ac5dfdbf181ce626ded3cdaa5e8d643becefba52c43d399739deefda2abb1939fc41042756166475aa35b2aa1d05b8c1df2b1bdf7a43e312fcf2
 DIST pyproj-3.3.1.gh.tar.gz 238373 BLAKE2B 7996d253a35e3d64a343141179a88d2ab97e88f96447f3daf14c9f8d731099b506228c163fe460d3be30ae69c87e908879b3c0fe31eb7624c3bb8da157838337 SHA512 7175479f4ec526ada830d178bea77552d66aace4c7f6cde584aebef5fc4c6b7a46272eea2bd95f71910411c9ac8d8832d350891ffffda8a86eabb5449177a5eb
 DIST pyproj-3.4.0.gh.tar.gz 231365 BLAKE2B a62e02a33424583ffec1e1de603a0162ea187b4eb093be51b957fb720b3625c7e4b65162f1272fb4a057edfd92f8146d74c17f1ad68a3beb0ae199df8641e03b SHA512 d0e9425ea5a10ce1620c2a2b3279be786741e75ad698a2430e38237acb73e2cd7dbd16dbb4cf952f52c38810526f4528c08f9bb0795a34fdab2f39686e6914c9
 EBUILD pyproj-3.3.1.ebuild 917 BLAKE2B a68f8b2ae45515fed681b2e17f510187753e9b34fef78122f1d08ca541e8ec1b9139fffb61a80a97cc3b513a86268336a53046c05768ebd36fb4a14eb497ead0 SHA512 50e98ad158e47af5488161d92c8feb90e2a30888c341df9f2a251407495b702cee5b75c5503f8f9591cf0e495351814e1446115bd6ed1e7ebf53a01ba0de11e4
-EBUILD pyproj-3.4.0.ebuild 947 BLAKE2B 7557c6f8522e525e6eafb9175f8196889b1d560a11f6f7d2be44f061bcb255af62dc772f7c54d920952a4901a990860b0ced10a402b65066b1b7c1832adbc92d SHA512 be28c92f6ac6122bc92eaf65e1bc631eab53a10f1d2f651859511640e4014d32fd3b280845e2ec64357509b9007c7e5eda79b2098bc85f1862d48dcf261f24a1
+EBUILD pyproj-3.4.0.ebuild 995 BLAKE2B e36a786037940f5cc6d9d35d5991eae3f31856757cd1af288253294ff5e5378d9e926e7e0461511f65ca64b7d6936ed958ad9a8ac0cbc57de8a3cd0434980cc9 SHA512 57ff52b4667e8c3051a7706d8bd46ad647b75b7be7235f5d301eedc87c318295b878f2cd8c99012d8dea66c4521ec67ca2b06de0315014f3acd7d311d2a61c30
 MISC metadata.xml 415 BLAKE2B 4f3ab70bc72ca97a428c357257d3a59591b410f12276a42e141cd0a43072b79107529c95c6a313906129e8893c75b63a6ef11ddc2f3842a7f5e5e7f7349ec38e SHA512 7ca8a01534471dff67c42a96c524d166278e26da309b2c4d766045e38086cc0e52ccc990881ebed7ca81219d705d9e4a9c16e86b052a50867bb032457e354903
diff --git a/dev-python/pyproj/files/pyproj-3.4.0-proj-9.1.patch b/dev-python/pyproj/files/pyproj-3.4.0-proj-9.1.patch
new file mode 100644
index 000000000000..a2be9f58850b
--- /dev/null
+++ b/dev-python/pyproj/files/pyproj-3.4.0-proj-9.1.patch
@@ -0,0 +1,54 @@
+https://github.com/pyproj4/pyproj/commit/831209477286f55b6c3ac777e1df3e947cfb12be
+https://github.com/pyproj4/pyproj/commit/2c0abe3d8d2c1632751f093baf421b93f65783a8
+
+From 831209477286f55b6c3ac777e1df3e947cfb12be Mon Sep 17 00:00:00 2001
+From: "Alan D. Snow" <alansnow21@gmail.com>
+Date: Sat, 17 Sep 2022 11:23:10 -0500
+Subject: [PATCH] TST: update test_get_transform_grid_list__contains expectd
+ output (#1147)
+
+--- a/test/test_sync.py
++++ b/test/test_sync.py
+@@ -82,7 +82,7 @@ def test_get_transform_grid_list__contains():
+     source_ids = set()
+     for grid in grids:
+         source_ids.add(grid["properties"]["source_id"])
+-    assert sorted(source_ids) == ["no_kv", "nz_linz"]
++    assert sorted(source_ids) == ["nz_linz"]
+ 
+ 
+ @pytest.mark.network
+
+From 2c0abe3d8d2c1632751f093baf421b93f65783a8 Mon Sep 17 00:00:00 2001
+From: "Alan D. Snow" <alansnow21@gmail.com>
+Date: Sat, 17 Sep 2022 12:06:32 -0500
+Subject: [PATCH] TST: adjust test_transformer_group__get_transform_crs for
+ nl_nsgi_nlgeo2018 and PROJ 9.1 (#1148)
+
+--- a/test/test_transformer.py
++++ b/test/test_transformer.py
+@@ -695,12 +695,19 @@ def get_transformer_group():
+ @pytest.mark.grid
+ def test_transformer_group__get_transform_crs():
+     tg = TransformerGroup("epsg:4258", "epsg:7415")
+-    if not grids_available("nl_nsgi_rdtrans2018.tif"):
+-        assert len(tg.transformers) == 1
+-    elif PROJ_GTE_91:
++    if grids_available(
++        "nl_nsgi_nlgeo2018.tif", "nl_nsgi_rdtrans2018.tif", check_all=True
++    ):
++        if PROJ_GTE_91:
++            assert len(tg.transformers) == 2
++        else:
++            assert len(tg.transformers) == 6
++    elif not PROJ_GTE_91 and grids_available("nl_nsgi_rdtrans2018.tif"):
+         assert len(tg.transformers) == 2
++    elif not PROJ_GTE_91 and grids_available("nl_nsgi_nlgeo2018.tif"):
++        assert len(tg.transformers) == 4
+     else:
+-        assert len(tg.transformers) == 6
++        assert len(tg.transformers) == 1
+ 
+ 
+ def test_transformer__area_of_interest():
+
diff --git a/dev-python/pyproj/pyproj-3.4.0.ebuild b/dev-python/pyproj/pyproj-3.4.0.ebuild
index aa7eb95785a6..70379b19b4dd 100644
--- a/dev-python/pyproj/pyproj-3.4.0.ebuild
+++ b/dev-python/pyproj/pyproj-3.4.0.ebuild
@@ -39,6 +39,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-proj-9.1.patch
+)
+
 distutils_enable_sphinx docs \
 	dev-python/furo
 distutils_enable_tests pytest