diff options
Diffstat (limited to 'dev-ada')
| -rw-r--r-- | dev-ada/Manifest.gz | bin | 4563 -> 4561 bytes | |||
| -rw-r--r-- | dev-ada/langkit/Manifest | 3 | ||||
| -rw-r--r-- | dev-ada/langkit/files/langkit-23.0.0-py311.patch | 88 | ||||
| -rw-r--r-- | dev-ada/langkit/langkit-23.0.0-r1.ebuild | 11 |
4 files changed, 97 insertions, 5 deletions
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz Binary files differindex 2ad8f3e724e2..ce138e5b59b4 100644 --- a/dev-ada/Manifest.gz +++ b/dev-ada/Manifest.gz diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest index 66688215fd5c..aead58991751 100644 --- a/dev-ada/langkit/Manifest +++ b/dev-ada/langkit/Manifest @@ -1,7 +1,8 @@ AUX langkit-22.0.0-abc.patch 1129 BLAKE2B 05c136aeca2f6cb07f84d11043ba64ab67c65a9927794d9b67fad088cb39af42552ca48b6c6fe271b9c124dfa69585fdb3e60253ec6b15ba736a4c08afcce9ec SHA512 9af42ece8b8ffa9b5462dfafe84812bc40b7e03c24ae479f3458d0a8137d4439e0d509443e8df117a3c4d7e55090f2267960b43e6caafe60b28bb01af2d2cbc5 AUX langkit-23.0.0-gentoo.patch 357 BLAKE2B 3408d89156a55658881a65d9d180d361d6f516308c0e55f44d7aa78ca261fdd5426e66de25b004c9496d610a16b93054abe98a81fe213af0e1e9a6aa628c37c4 SHA512 8dff9eb7cd914eb112c53d38b3d47f02cd48aa56d65319ae537967baab328e2f4ac94483bf5760455e68e7f621a9d2188bef25025a17e6a19dee9cb381e8e8e5 +AUX langkit-23.0.0-py311.patch 3488 BLAKE2B fee31cc4e09a69c357791eaca65152ca56ef5934d3cedf36f4940ba842c595d2b79bfd72fb11c9d60c8cacf208969421ca39db5f528d61b34ae03e99755b5032 SHA512 a022ab4f31e7fa49912382fbdef3f446209f6daa2c78b2443a1e52c5a9ca7d7c078a94e0d8cc2ecda1fcb925320223943dbbf65ded961be9a06ad9457ce0d3ea DIST langkit-22.0.0.tar.gz 1008946 BLAKE2B 2b4ee37c9af1c95f9a6e9ad81f37b6bb112d5bd70f36b78e95d969580eacc1101b824ea24de39d04ccf8bc9f9850906fa1c660a29de05e90d12106b10792c37d SHA512 4c6207b650ae8352c65f3edda3192fc66c9b5d2c351665d78ca83b549960a0a41e7828e8974cb8daa3c415281b50253aa15a247407bcedc2c13e573aaa804909 DIST langkit-23.0.0.tar.gz 1178557 BLAKE2B c3b81cafea3afcfd90a87192dca5abd0f19c5ff4e195515dd7c4df70824bf328c24855a6761264b89bf44a56afc8dd77b78fbf322c6f92299082507aa65d61e5 SHA512 6cc6adacb157a47ebc8da46591e45a4ff212fba2cd5ac80c12adb2e84f4508735d98dc68ffce86aa5e5e8d873e6f51efb4f88f4d76a190b9eb0024bf69deefc1 EBUILD langkit-22.0.0-r3.ebuild 2323 BLAKE2B e477e2adcddbf67acf6d2805dfe1e738abfe837f6da4fcf4bcc65e1111bb1015c0f0111a16d4c55802e8138c3fa08b4e0072b8bdc008fd8262b0c630c0a36286 SHA512 4f5d17cf42ca4792711c7afd426bbe5adf61c0ebcd901b5fd81c8383ecdbcdb070fac4f7989523ecf46b2539c5ba2af3baa5af9acc89dcd088493853cdb24cb5 -EBUILD langkit-23.0.0-r1.ebuild 2929 BLAKE2B 2bdb1fddc18721037c705aec442079b1c2bec264bb6969ba651005b8dacb111ed322a6a1e47e2045050a686d5823e61d3416d989765b4493f29b2e6c1f9540b3 SHA512 ff9e73ed9ed07c45bf98ec604464a74d78a2fe4e923521a546daadc473fa7e46bf79a8a4ce4163276daa9e301c57eb48301e241f44e425f7a978e9c87be024e4 +EBUILD langkit-23.0.0-r1.ebuild 2975 BLAKE2B 210a3dfc70046952be6d09f3bd52b143283573500fa88ae771aab82a070ea491d1fb668860a779e206fb8b413b007fba7e95647e7c29473e20e5dfbaa0c3746b SHA512 cb09d2dcd95133295d890c6f4fa2b29367b84beec9a7c547c368197e1fa4fad5ab54177c4f5f0433defcdd1f7264f0e4eac8c44f594810bdf0ba9b52c795ea6b MISC metadata.xml 930 BLAKE2B 5ec7305df09ee1011fc0a0b93f75bbbf315a153a835d0e3c074e95b717d6c95c7f0b29e99537375be3c6aa73e5cf089cd32fcc3567f78bb3c6768e171c3d4521 SHA512 8f0056d87158d87dc3fad08ceffcfc2a6c065977669b8d0f8560b72627f8b050ed34886e4cad19e51062b8a2e412f37b1c3ff983f1d33da79cb6283f6532df85 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 |