commit: 81a8882a480668357ce3798fc56ba970862a72bd Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Sun Oct 2 17:53:55 2022 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Sun Oct 2 17:53:55 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81a8882a
dev-ada/langkit: fix deprecated collections.Sequence Closes: https://bugs.gentoo.org/873787 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> dev-ada/langkit/files/langkit-22.0.0-abc.patch | 24 ++++++++++++++++++++++ ...t-22.0.0-r2.ebuild => langkit-22.0.0-r3.ebuild} | 2 ++ 2 files changed, 26 insertions(+) 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 <[email protected]> +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 similarity index 98% rename from dev-ada/langkit/langkit-22.0.0-r2.ebuild rename to 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
