Gentoo Archives: gentoo-commits

From: Alfredo Tupone <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/, dev-ada/langkit/files/
Date: Sun, 19 Mar 2023 19:53:34
Message-Id: 1679255590.03fa0b2ce8bdb625ccdcef676f95ba9617c1f207.tupone@gentoo
1 commit: 03fa0b2ce8bdb625ccdcef676f95ba9617c1f207
2 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 19 19:53:10 2023 +0000
4 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 19 19:53:10 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03fa0b2c
7
8 dev-ada/langkit: drop 22.0.0-r3
9
10 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
11
12 dev-ada/langkit/Manifest | 1 -
13 dev-ada/langkit/files/langkit-22.0.0-abc.patch | 24 -------
14 dev-ada/langkit/langkit-22.0.0-r3.ebuild | 90 --------------------------
15 3 files changed, 115 deletions(-)
16
17 diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest
18 index 59b6bdba50b4..9a010d224369 100644
19 --- a/dev-ada/langkit/Manifest
20 +++ b/dev-ada/langkit/Manifest
21 @@ -1,2 +1 @@
22 -DIST langkit-22.0.0.tar.gz 1008946 BLAKE2B 2b4ee37c9af1c95f9a6e9ad81f37b6bb112d5bd70f36b78e95d969580eacc1101b824ea24de39d04ccf8bc9f9850906fa1c660a29de05e90d12106b10792c37d SHA512 4c6207b650ae8352c65f3edda3192fc66c9b5d2c351665d78ca83b549960a0a41e7828e8974cb8daa3c415281b50253aa15a247407bcedc2c13e573aaa804909
23 DIST langkit-23.0.0.tar.gz 1178557 BLAKE2B c3b81cafea3afcfd90a87192dca5abd0f19c5ff4e195515dd7c4df70824bf328c24855a6761264b89bf44a56afc8dd77b78fbf322c6f92299082507aa65d61e5 SHA512 6cc6adacb157a47ebc8da46591e45a4ff212fba2cd5ac80c12adb2e84f4508735d98dc68ffce86aa5e5e8d873e6f51efb4f88f4d76a190b9eb0024bf69deefc1
24
25 diff --git a/dev-ada/langkit/files/langkit-22.0.0-abc.patch b/dev-ada/langkit/files/langkit-22.0.0-abc.patch
26 deleted file mode 100644
27 index 0b3e9bbf8f4f..000000000000
28 --- a/dev-ada/langkit/files/langkit-22.0.0-abc.patch
29 +++ /dev/null
30 @@ -1,24 +0,0 @@
31 -From cdc5768fb8db416e4eede97639f381a537ae9336 Mon Sep 17 00:00:00 2001
32 -From: Charles Pigott <charlespigott@××××××××××.com>
33 -Date: Wed, 10 Nov 2021 20:42:12 +0000
34 -Subject: [PATCH] Use collections.abc.Sequence as the alias is set to be
35 - removed
36 -
37 -Alias has been in place since Py 3.3, and minimum (test) version is 3.7.
38 ----
39 - langkit/templates/python_api/module_py.mako | 2 +-
40 - 1 file changed, 1 insertion(+), 1 deletion(-)
41 -
42 -diff --git a/langkit/templates/python_api/module_py.mako b/langkit/templates/python_api/module_py.mako
43 -index 831fb6044..65373fdbc 100644
44 ---- a/langkit/templates/python_api/module_py.mako
45 -+++ b/langkit/templates/python_api/module_py.mako
46 -@@ -1503,7 +1503,7 @@ class ${root_astnode_name}:
47 - if isinstance(ast_type_or_pred, type):
48 - sought_type = ast_type_or_pred
49 - pred = lambda node: isinstance(node, sought_type)
50 -- elif isinstance(ast_type_or_pred, collections.Sequence):
51 -+ elif isinstance(ast_type_or_pred, collections.abc.Sequence):
52 - sought_types = ast_type_or_pred
53 - pred = lambda node: isinstance(node, tuple(sought_types))
54 - else:
55
56 diff --git a/dev-ada/langkit/langkit-22.0.0-r3.ebuild b/dev-ada/langkit/langkit-22.0.0-r3.ebuild
57 deleted file mode 100644
58 index a5c90c452b7b..000000000000
59 --- a/dev-ada/langkit/langkit-22.0.0-r3.ebuild
60 +++ /dev/null
61 @@ -1,90 +0,0 @@
62 -# Copyright 1999-2023 Gentoo Authors
63 -# Distributed under the terms of the GNU General Public License v2
64 -
65 -EAPI=7
66 -
67 -PYTHON_COMPAT=( python3_10 )
68 -ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
69 -
70 -DISTUTILS_USE_SETUPTOOLS=no
71 -inherit distutils-r1 ada multiprocessing
72 -
73 -DESCRIPTION="A Python framework to generate language parsers"
74 -HOMEPAGE="https://www.adacore.com/community"
75 -SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
76 - -> ${P}.tar.gz"
77 -
78 -LICENSE="GPL-3"
79 -SLOT="0/${PV}"
80 -KEYWORDS="~amd64 ~x86"
81 -IUSE="+shared static-libs static-pic"
82 -REQUIRED_USE="${PYTHON_REQUIRED_USE}
83 - ${ADA_REQUIRED_USE}
84 - || ( shared static-libs static-pic )"
85 -
86 -RDEPEND="${PYTHON_DEPS}
87 - ${ADA_DEPS}
88 - dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv,shared?,static-libs?,static-pic?]
89 - dev-python/mako[${PYTHON_USEDEP}]
90 - dev-python/pyyaml[${PYTHON_USEDEP}]
91 - dev-python/funcy[${PYTHON_USEDEP}]
92 - dev-python/docutils[${PYTHON_USEDEP}]
93 - dev-ada/e3-core[${PYTHON_USEDEP}]"
94 -BDEPEND="${RDEPEND}"
95 -
96 -PATCHES=( "${FILESDIR}"/${P}-abc.patch )
97 -
98 -python_prepare_all() {
99 - distutils-r1_python_prepare_all
100 - cd testsuite/tests
101 -
102 - # missing gprbuild option to build libraries static/relocatable
103 - rm -r {langkit_support,adalog,misc/link_two_libs} || die
104 -
105 - # require railroad-diagrams
106 - rm -r contrib/svg_railroad_diagrams || die
107 -}
108 -
109 -python_compile_all() {
110 - build () {
111 - gprbuild -j$(makeopts_jobs) -p -v \
112 - -XLIBRARY_TYPE=$1 -P support/langkit_support.gpr -XBUILD_MODE=dev \
113 - -cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
114 - }
115 - if use shared; then
116 - build relocatable
117 - fi
118 - if use static-libs; then
119 - build static
120 - fi
121 - if use static-pic; then
122 - build static-pic
123 - fi
124 -}
125 -
126 -python_test_all() {
127 - export GPR_PROJECT_PATH="${S}"/support
128 - ${EPYTHON} ./manage.py make --no-langkit-support || die
129 - eval $(./manage.py setenv)
130 - ${EPYTHON} ./manage.py test --verbose |& tee langkit.testOut
131 - grep -qw FAIL langkit.testOut && die
132 -}
133 -
134 -python_install_all() {
135 - build () {
136 - gprinstall -v -P support/langkit_support.gpr -p -XBUILD_MODE=dev \
137 - --prefix="${D}"/usr --build-var=LIBRARY_TYPE \
138 - --build-var=LANGKIT_SUPPORT_LIBRARY_TYPE \
139 - --sources-subdir=include/langkit_support \
140 - -XLIBRARY_TYPE=$1 --build-name=$1 || die
141 - }
142 - if use shared; then
143 - build relocatable
144 - fi
145 - if use static-libs; then
146 - build static
147 - fi
148 - if use static-pic; then
149 - build static-pic
150 - fi
151 -}