gentoo auto-resync : 03:10:2022 - 01:13:47

6 files changed, 30 insertions, 2 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 173bd7c4e17d..94d298b6a47d 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest
index 0a39ef890c3d..d05be11c1f3f 100644
--- a/dev-ada/langkit/Manifest
+++ b/dev-ada/langkit/Manifest
@@ -1,3 +1,4 @@
+AUX langkit-22.0.0-abc.patch 1129 BLAKE2B 05c136aeca2f6cb07f84d11043ba64ab67c65a9927794d9b67fad088cb39af42552ca48b6c6fe271b9c124dfa69585fdb3e60253ec6b15ba736a4c08afcce9ec SHA512 9af42ece8b8ffa9b5462dfafe84812bc40b7e03c24ae479f3458d0a8137d4439e0d509443e8df117a3c4d7e55090f2267960b43e6caafe60b28bb01af2d2cbc5
 DIST langkit-22.0.0.tar.gz 1008946 BLAKE2B 2b4ee37c9af1c95f9a6e9ad81f37b6bb112d5bd70f36b78e95d969580eacc1101b824ea24de39d04ccf8bc9f9850906fa1c660a29de05e90d12106b10792c37d SHA512 4c6207b650ae8352c65f3edda3192fc66c9b5d2c351665d78ca83b549960a0a41e7828e8974cb8daa3c415281b50253aa15a247407bcedc2c13e573aaa804909
-EBUILD langkit-22.0.0-r2.ebuild 2291 BLAKE2B cfd4f17d23fd53f8c558c0616703e0d41bcc1e5930087b7c2cf9085958bb3151da9f75326d5ac3d1f6f7d7aff8998167b60547dbfc347d19b6ea82a6b174c641 SHA512 583c8d008f76804340bf798c9a33408cc17e077a8433a84769fc9cdcff77e753f0b8c8f04526505f615d542f29582ce3f89b0ba4b8a8835857df702f1d031f0b
+EBUILD langkit-22.0.0-r3.ebuild 2333 BLAKE2B 9fa92b6da6c131d5d9954bf49a71324438cfb0b44da2f9507427a442c9f9857deef4a3f3c7e82156e2493cf35306248777b80294fa98cae62517a8084d266bb7 SHA512 efcc7b7637f5656654158095d2a475476e95451b74de40f948cd571d987e61d8165c63eaa87b7821b50ed8acf7ceddfdaf7c3cbc323218748000414836343168
 MISC metadata.xml 850 BLAKE2B b7710a9fee6e662eb2b84db763574557d7aab3d089ed589fb2d05e0ffe48367e42cb6def1abc5565aff06138de7bcf08c9087e82eba4c243238c5e15d365456a SHA512 e2abdab196f73f3c64edaf1bba302175d28b5b99b2beb21f75802c23633b5437060ad6b0e64e3493babe0217d7e47b333c63f350b8241b8018dc8da67696a7e8
diff --git a/dev-ada/langkit/files/langkit-22.0.0-abc.patch b/dev-ada/langkit/files/langkit-22.0.0-abc.patch
new file mode 100644
index 000000000000..0b3e9bbf8f4f
--- /dev/null
+++ b/dev-ada/langkit/files/langkit-22.0.0-abc.patch
@@ -0,0 +1,24 @@
+From cdc5768fb8db416e4eede97639f381a537ae9336 Mon Sep 17 00:00:00 2001
+From: Charles Pigott <charlespigott@googlemail.com>
+Date: Wed, 10 Nov 2021 20:42:12 +0000
+Subject: [PATCH] Use collections.abc.Sequence as the alias is set to be
+ removed
+
+Alias has been in place since Py 3.3, and minimum (test) version is 3.7.
+---
+ langkit/templates/python_api/module_py.mako | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/langkit/templates/python_api/module_py.mako b/langkit/templates/python_api/module_py.mako
+index 831fb6044..65373fdbc 100644
+--- a/langkit/templates/python_api/module_py.mako
++++ b/langkit/templates/python_api/module_py.mako
+@@ -1503,7 +1503,7 @@ class ${root_astnode_name}:
+         if isinstance(ast_type_or_pred, type):
+             sought_type = ast_type_or_pred
+             pred = lambda node: isinstance(node, sought_type)
+-        elif isinstance(ast_type_or_pred, collections.Sequence):
++        elif isinstance(ast_type_or_pred, collections.abc.Sequence):
+             sought_types = ast_type_or_pred
+             pred = lambda node: isinstance(node, tuple(sought_types))
+         else:
diff --git a/dev-ada/langkit/langkit-22.0.0-r2.ebuild b/dev-ada/langkit/langkit-22.0.0-r3.ebuild
index d9620aaca448..23c1cec4ad52 100644
--- a/dev-ada/langkit/langkit-22.0.0-r2.ebuild
+++ b/dev-ada/langkit/langkit-22.0.0-r3.ebuild
@@ -32,6 +32,8 @@ RDEPEND="${PYTHON_DEPS}
 	dev-ada/e3-core[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-abc.patch )
+
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 	cd testsuite/tests
diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest
index d11a665445ce..f39f683432dc 100644
--- a/dev-ada/libadalang/Manifest
+++ b/dev-ada/libadalang/Manifest
@@ -1,3 +1,3 @@
 DIST libadalang-22.0.0.tar.gz 2364531 BLAKE2B 3992baa7180dce696b2c8aa0d451117a12b90072e83274d96a8d971b627c82bc66c5c21fa1eb6dbdd7ce95e0264852c5702b3d7c90f7bdf093915178e0a4a659 SHA512 b874feb102fe221595ad4b9b95b3ea4c6593686f96097ace17ad3c57534dc801000819de0cf898489e3407fd201eb003dd75f4f743a53dfb76cadfa6c727d789
-EBUILD libadalang-22.0.0.ebuild 2334 BLAKE2B 49bb871b045c0a9782ab3f26c242de5d731592fcbce7f41836563ee4466c5b7f8b1222cf1dd00a992153ab75c3f8fc9f6c3bf4821085cd1813aa021fb3de9de1 SHA512 5a09ce6b1b4398aab5daa2dbc7ed872aa7ca2d22e571d41a6ca62bdf277c343afec174b5e23451d4864d7a68bc1e42718336c240eded7202aced0ec31f3a2a5a
+EBUILD libadalang-22.0.0.ebuild 2357 BLAKE2B af563ce47c5097680cef2dec841b39a0c71594962ce30a200497dc3c51f063d98b7337317926fd5c1025fc21dec42e072cbc72a3f460b0c6e79aa8046c88a237 SHA512 9f814c891390373f08427d81b4a5d8f17ccbc9c323ef748a2f659033c4d6a4e6fe52687299429aa0f799fb664cdf96b4a5629f8098a1d3028a9fb054980b8de0
 MISC metadata.xml 593 BLAKE2B 071bd53cf7e7cf9355eb149d326c208cd63abcee3a690417737c28c26fb6c53b4c7c274029249d9904817b9a4447fa5bcc7f4b7998c1d6cbb4019a00405d085f SHA512 46f32c45534ebf33f69526c239e6832d2a412878d772a8e7d19377d90b49d5850bf42561d853e2a540e50ed9cf759a237b8bdf4d1947ab782081e35323176b20
diff --git a/dev-ada/libadalang/libadalang-22.0.0.ebuild b/dev-ada/libadalang/libadalang-22.0.0.ebuild
index 1e0e48db6236..f3aacee30406 100644
--- a/dev-ada/libadalang/libadalang-22.0.0.ebuild
+++ b/dev-ada/libadalang/libadalang-22.0.0.ebuild
@@ -38,6 +38,7 @@ BDEPEND="test? (
 		dev-ml/camomile
 		dev-ml/ocaml-ctypes
 		dev-ada/e3-testsuite
+		<dev-lang/ocaml-4.14
 	)"
 
 pkg_setup() {