[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/, dev-ada/langkit/files/

["Alfredo Tupone" <tupone@gentoo.org>]

commit:     44f7b873fbe429c5346ecd398c0000b9fcd00b98
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 25 18:19:39 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 18:21:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44f7b873

dev-ada/langkit: update EAPI 7 -> 8

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ada/langkit/files/langkit-23.0.0-py311.patch | 88 ++++++++++++++++++++++++
 dev-ada/langkit/langkit-23.0.0-r1.ebuild         | 11 +--
 2 files changed, 95 insertions(+), 4 deletions(-)

diff --git a/dev-ada/langkit/files/langkit-23.0.0-py311.patch b/dev-ada/langkit/files/langkit-23.0.0-py311.patch
new file mode 100644
index 000000000000..b85027ec2b8d
--- /dev/null
+++ b/dev-ada/langkit/files/langkit-23.0.0-py311.patch
@@ -0,0 +1,88 @@
+--- a/langkit/expressions/collections.py	2023-02-25 17:31:43.261369482 +0100
++++ b/langkit/expressions/collections.py	2023-02-25 17:32:03.068054949 +0100
+@@ -265,15 +265,15 @@
+             " function"
+         )
+ 
+-        argspec = inspect.getargspec(expr_fn)
++        argspec = inspect.getfullargspec(expr_fn)
+ 
+         check_multiple([
+             (len(argspec.args) in (1, 2),
+              'Invalid collection iteration lambda: only one'
+              ' or two parameters expected'),
+-            (not argspec.varargs and not argspec.keywords,
++            (not argspec.varargs and not argspec.varkw,
+              'Invalid collection iteration lambda: no *args or **kwargs'),
+             (not argspec.defaults,
+              'Invalid collection iteration lambda: No default values allowed'
+                 'Invalid matcher lambda'
+             )
+--- a/langkit/expressions/structs.py	2023-02-25 17:32:21.884756077 +0100
++++ b/langkit/expressions/structs.py	2023-02-25 17:32:32.382589322 +0100
+@@ -1327,9 +1327,9 @@
+         self.matchers = []
+ 
+         for i, match_fn in enumerate(self.matchers_functions):
+-            argspec = inspect.getargspec(match_fn)
++            argspec = inspect.getfullargspec(match_fn)
+             check_source_language(
+                 len(argspec.args) == 1 and
+                 not argspec.varargs and
+-                not argspec.keywords and
++                not argspec.varkw and
+                 (not argspec.defaults or len(argspec.defaults) < 2),
+--- a/langkit/expressions/base.py	2023-02-25 17:29:35.964403798 +0100
++++ b/langkit/expressions/base.py	2023-02-25 17:30:28.362565456 +0100
+@@ -158,11 +158,11 @@
+     fn_arguments = []
+     fn_expr = None
+ 
+-    argspec = inspect.getargspec(fn)
++    argspec = inspect.getfullargspec(fn)
+     defaults = argspec.defaults or []
+ 
+     check_multiple([
+-        (not argspec.varargs or not argspec.keywords, 'Invalid'
++        (not argspec.varargs or not argspec.varkw, 'Invalid'
+          ' function signature: no *args nor **kwargs allowed'),
+ 
+         (len(argspec.args) == len(defaults), 'All parameters '
+@@ -2822,7 +2822,7 @@
+             lambda_fn = None
+ 
+         else:
+-            argspec = inspect.getargspec(lambda_fn)
++            argspec = inspect.getfullargspec(lambda_fn)
+ 
+             var_names = argspec.args
+             var_exprs = argspec.defaults or []
+@@ -2843,10 +2843,10 @@
+         if self.lambda_fn is None:
+             return
+ 
+-        argspec = inspect.getargspec(self.lambda_fn)
++        argspec = inspect.getfullargspec(self.lambda_fn)
+ 
+         check_multiple([
+-            (not argspec.varargs and not argspec.keywords,
++            (not argspec.varargs and not argspec.varkw,
+              'Invalid function for Let expression (*args and **kwargs '
+              'not accepted)'),
+ 
+--- a/langkit/expressions/boolean.py	2023-02-25 17:30:59.820062103 +0100
++++ b/langkit/expressions/boolean.py	2023-02-25 17:31:10.565890137 +0100
+@@ -475,11 +475,11 @@
+         if self.then_expr:
+             return
+ 
+-        argspec = inspect.getargspec(self.then_fn)
++        argspec = inspect.getfullargspec(self.then_fn)
+         check_source_language(
+             len(argspec.args) == 1
+             and not argspec.varargs
+-            and not argspec.keywords
++            and not argspec.varkw
+             and not argspec.defaults,
+             'Invalid lambda for Then expression: exactly one parameter is'
+             ' required, without a default value'

diff --git a/dev-ada/langkit/langkit-23.0.0-r1.ebuild b/dev-ada/langkit/langkit-23.0.0-r1.ebuild
index f0cf67a22fdb..dcae44ffc718 100644
--- a/dev-ada/langkit/langkit-23.0.0-r1.ebuild
+++ b/dev-ada/langkit/langkit-23.0.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_10 )
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
+PYTHON_COMPAT=( python3_{10..11} )
+ADA_COMPAT=( gnat_2021 gcc_12 gcc_12_2_0 )
 
 DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1 ada multiprocessing
@@ -35,7 +35,10 @@ RDEPEND="${PYTHON_DEPS}
 	dev-ada/e3-core[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-py311.patch
+)
 
 python_prepare_all() {
 	distutils-r1_python_prepare_all