commit: ef18586c5125d60b669172f4c9fc398b797eeceb
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 25 20:59:29 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 21:03:07 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef18586c
dev-ada/langkit: drop 23.0.0-r3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ada/langkit/Manifest | 1 -
dev-ada/langkit/files/langkit-23.0.0-gentoo.patch | 10 --
dev-ada/langkit/files/langkit-23.0.0-py311.patch | 88 ----------------
dev-ada/langkit/langkit-23.0.0-r3.ebuild | 111 ---------------------
...gkit-24.0.0.ebuild => langkit-24.0.0-r1.ebuild} | 4 +-
5 files changed, 2 insertions(+), 212 deletions(-)
diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest
index e1505522fde0..f8aac2b278ff 100644
--- a/dev-ada/langkit/Manifest
+++ b/dev-ada/langkit/Manifest
@@ -1,2 +1 @@
-DIST langkit-23.0.0.tar.gz 1178557 BLAKE2B
c3b81cafea3afcfd90a87192dca5abd0f19c5ff4e195515dd7c4df70824bf328c24855a6761264b89bf44a56afc8dd77b78fbf322c6f92299082507aa65d61e5
SHA512
6cc6adacb157a47ebc8da46591e45a4ff212fba2cd5ac80c12adb2e84f4508735d98dc68ffce86aa5e5e8d873e6f51efb4f88f4d76a190b9eb0024bf69deefc1
DIST langkit-24.0.0.tar.gz 1282265 BLAKE2B
63aa3eb05be6ea590c3f4d0478cdfa0ee217606607c73b4c172c5b89d8a2a5d815efbf2bcd23b84548ececd11ffa1f89ebcbc5d411845b7a3834d6f7e16aa0b1
SHA512
b26a83cd7e57d8821d09e5e1aeaa2fa5837ab2f3901a006cfd49b059a3cfc98d7ea236dc39a2e24365196bd45c2124396795fd46fdaf4d7cb41aabb45ff85326
diff --git a/dev-ada/langkit/files/langkit-23.0.0-gentoo.patch
b/dev-ada/langkit/files/langkit-23.0.0-gentoo.patch
deleted file mode 100644
index cbae758013e2..000000000000
--- a/dev-ada/langkit/files/langkit-23.0.0-gentoo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/langkit/parsers.py 2022-12-08 23:09:42.178267815 +0100
-+++ b/langkit/parsers.py 2022-12-08 22:33:40.755660102 +0100
-@@ -1306,6 +1306,7 @@
- # ... and we want to memoize the result.
- self.cached_type = None
-
-+ @property
- def can_parse_token_node(self) -> bool:
- return all(p.can_parse_token_node for p in self.parsers)
-
diff --git a/dev-ada/langkit/files/langkit-23.0.0-py311.patch
b/dev-ada/langkit/files/langkit-23.0.0-py311.patch
deleted file mode 100644
index b85027ec2b8d..000000000000
--- a/dev-ada/langkit/files/langkit-23.0.0-py311.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- 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-r3.ebuild
b/dev-ada/langkit/langkit-23.0.0-r3.ebuild
deleted file mode 100644
index ba2c97a21b70..000000000000
--- a/dev-ada/langkit/langkit-23.0.0-r3.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 )
-
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 ada multiprocessing
-
-DESCRIPTION="A Python framework to generate language parsers"
-HOMEPAGE="https://www.adacore.com/community";
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
- -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+shared static-libs static-pic"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ${ADA_REQUIRED_USE}
- || ( shared static-libs static-pic )"
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
- ${ADA_DEPS}
- dev-ada/gnatcoll-core:=
-
dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv,shared?,static-libs?,static-pic?]
- dev-python/mako[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/funcy[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/mypy[${PYTHON_USEDEP}]
- dev-python/types-gdb[${PYTHON_USEDEP}]
- dev-python/types-docutils[${PYTHON_USEDEP}]
- dev-ada/e3-core[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-gentoo.patch
- "${FILESDIR}"/${P}-py311.patch
-)
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
- cd testsuite/tests
-
- # missing gprbuild option to build libraries static/relocatable
- rm -r {langkit_support,adalog,misc/link_two_libs} || die
- rm -r misc/standalone || die
-
- # other failures
- rm -r misc/docstrings_lkt_roles || die
-}
-
-python_compile_all() {
- build () {
- rm -f langkit/support/obj/dev/*lexch
- gprbuild -j$(makeopts_jobs) -p -v \
- -XLIBRARY_TYPE=$1 -P
langkit/support/langkit_support.gpr -XBUILD_MODE=dev \
- -cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die
"gprbuild failed"
- }
- if use shared; then
- build relocatable
- fi
- if use static-libs; then
- build static
- fi
- if use static-pic; then
- build static-pic
- fi
- gprbuild -j$(makeopts_jobs) -p -v \
- -P sigsegv_handler/langkit_sigsegv_handler.gpr -XBUILD_MODE=dev
\
- -cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild
failed"
-}
-
-python_test_all() {
- export GPR_PROJECT_PATH="${S}"/langkit/support
- ${EPYTHON} ./manage.py make --no-langkit-support || die
- eval $(./manage.py setenv)
- ${EPYTHON} ./manage.py test -v \
- --disable-ocaml \
- --disable-gdb \
- --disable-tear-up-builds \
- --restricted-env \
- --jobs $(makeopts_jobs) \
- |& tee langkit.testOut
- grep -qw FAIL langkit.testOut && die
-}
-
-python_install_all() {
- build () {
- gprinstall -v -P langkit/support/langkit_support.gpr -p
-XBUILD_MODE=dev \
- --prefix="${D}"/usr --build-var=LIBRARY_TYPE \
- --build-var=LANGKIT_SUPPORT_LIBRARY_TYPE \
- --sources-subdir=include/langkit_support \
- -XLIBRARY_TYPE=$1 --build-name=$1 || die
- }
- if use static-libs; then
- build static
- fi
- if use static-pic; then
- build static-pic
- fi
- if use shared; then
- build relocatable
- fi
- gprinstall -v -P sigsegv_handler/langkit_sigsegv_handler.gpr -p
-XBUILD_MODE=dev \
- --prefix="${D}"/usr || die
-}
diff --git a/dev-ada/langkit/langkit-24.0.0.ebuild
b/dev-ada/langkit/langkit-24.0.0-r1.ebuild
similarity index 95%
rename from dev-ada/langkit/langkit-24.0.0.ebuild
rename to dev-ada/langkit/langkit-24.0.0-r1.ebuild
index a61b6612d5dc..a8bd4e53fb15 100644
--- a/dev-ada/langkit/langkit-24.0.0.ebuild
+++ b/dev-ada/langkit/langkit-24.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -26,7 +26,7 @@ RESTRICT="test"
RDEPEND="${PYTHON_DEPS}
${ADA_DEPS}
dev-ada/gnatcoll-core:=
-
dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv,shared?,static-libs?,static-pic?]
+
dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv(+),shared?,static-libs?,static-pic?]
dev-ada/AdaSAT[${ADA_USEDEP},shared?,static-libs?,static-pic?]
dev-python/mako[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
