Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ada/libadalang/files/, dev-ada/libadalang/, profiles/
Date: Sun, 31 Jan 2021 00:07:53
Message-Id: 1612051592.ca4e339210df90d84cab313993fea402474b9ff1.mgorny@gentoo
1 commit: ca4e339210df90d84cab313993fea402474b9ff1
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 30 23:47:55 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 31 00:06:32 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca4e3392
7
8 dev-ada/libadalang: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/735264
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 dev-ada/libadalang/Manifest | 2 -
14 .../libadalang/files/libadalang-2017-gentoo.patch | 20 ------
15 .../libadalang/files/libadalang-2018-gentoo.patch | 11 ----
16 .../libadalang/files/libadalang-2019-gentoo.patch | 55 ----------------
17 .../libadalang/files/libadalang-2019-pyyaml.patch | 11 ----
18 dev-ada/libadalang/libadalang-2018-r2.ebuild | 69 -------------------
19 dev-ada/libadalang/libadalang-2019-r1.ebuild | 77 ----------------------
20 dev-ada/libadalang/metadata.xml | 16 -----
21 profiles/package.mask | 1 -
22 9 files changed, 262 deletions(-)
23
24 diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest
25 deleted file mode 100644
26 index 963641874fc..00000000000
27 --- a/dev-ada/libadalang/Manifest
28 +++ /dev/null
29 @@ -1,2 +0,0 @@
30 -DIST libadalang-2019-20190510-19916-src.tar.gz 2345942 BLAKE2B 807fd6ea0183b5535e96b258998a0540aa77dec0669db81bae10b56894e12bbb381b356bd55d6684156101d2ea0e5439c2551a4213a81e79e4697a7ff6ba5df2 SHA512 9ebf8d0c01d12f5a8081fced9504b78a45cbde6ecc0e6abeed99aff03abd0b241c1ecba85b256911e474cb77e10e5e387f64d51a2d9b18596baf40313f44f089
31 -DIST libadalang-gpl-2018-src.tar.gz 1990774 BLAKE2B ffad46d4988de7fb8c9bf94d24360a726c59e3c70a2318725a59e0b6b62351e8f5d8dd6501964618607122e3c7cb3bda0e1181818c68324d4067d59ac93e2b1c SHA512 b95196323097065be2996ced767f8f89fb77445f99c249d84043c68d926d61c78b310b4fef0699d08f9112dc423596c076f452745469a75a8467c35b5e10ac2c
32
33 diff --git a/dev-ada/libadalang/files/libadalang-2017-gentoo.patch b/dev-ada/libadalang/files/libadalang-2017-gentoo.patch
34 deleted file mode 100644
35 index 00f9aca4695..00000000000
36 --- a/dev-ada/libadalang/files/libadalang-2017-gentoo.patch
37 +++ /dev/null
38 @@ -1,20 +0,0 @@
39 ---- a/ada/testsuite/python_support/utils.py 2018-11-14 22:21:36.366873970 +0100
40 -+++ b/ada/testsuite/python_support/utils.py 2018-11-14 22:21:59.397477086 +0100
41 -@@ -28,6 +28,7 @@
42 - library_kind = 'static' if LAL_DISABLE_SHARED else 'relocatable'
43 - argv.extend([
44 - '-XLIBRARY_TYPE={}'.format(library_kind),
45 -+ '-XGPR_BUILD={}'.format(library_kind),
46 - '-XXMLADA_BUILD={}'.format(library_kind),
47 - ])
48 - subprocess.check_call(argv)
49 ---- a/ada/testsuite/testsuite_support/base_driver.py 2018-11-14 22:22:37.698817058 +0100
50 -+++ b/ada/testsuite/testsuite_support/base_driver.py 2018-11-14 22:30:37.631613448 +0100
51 -@@ -310,6 +310,7 @@
52 - """
53 - library_type = 'static' if self.disable_shared else 'relocatable'
54 - return ['-XLIBRARY_TYPE={}'.format(library_type),
55 -+ '-XGPR_BUILD={}'.format(library_type),
56 - '-XXMLADA_BUILD={}'.format(library_type)]
57 -
58 - #
59
60 diff --git a/dev-ada/libadalang/files/libadalang-2018-gentoo.patch b/dev-ada/libadalang/files/libadalang-2018-gentoo.patch
61 deleted file mode 100644
62 index 96c45c74a85..00000000000
63 --- a/dev-ada/libadalang/files/libadalang-2018-gentoo.patch
64 +++ /dev/null
65 @@ -1,11 +0,0 @@
66 ---- a/ada/testsuite/tests/c_api/unit_file_providers/test.out 2018-07-05 20:57:15.718357269 +0200
67 -+++ b/ada/testsuite/tests/c_api/unit_file_providers/test.out 2018-07-05 20:58:47.363026320 +0200
68 -@@ -5,6 +5,8 @@
69 - Calling ufp_get_unit_filename (some_field=42, kind=0) with name: "foo"
70 - Calling ufp_get_file_from_name (some_field=42, kind=0) with name: "foo"
71 - Calling ufp_get_file_from_name (some_field=42, kind=0) with name: "foo"
72 -+Calling ufp_get_unit_filename (some_field=42, kind=0) with name: "foo"
73 -+Calling ufp_get_file_from_name (some_field=42, kind=0) with name: "foo"
74 - <DottedName 5:17-5:22> resolves to:
75 - <ObjectDecl ["I"] 2:4-2:21>
76 - Calling ufp_destroy (some_field=42)
77
78 diff --git a/dev-ada/libadalang/files/libadalang-2019-gentoo.patch b/dev-ada/libadalang/files/libadalang-2019-gentoo.patch
79 deleted file mode 100644
80 index 5471632a2ad..00000000000
81 --- a/dev-ada/libadalang/files/libadalang-2019-gentoo.patch
82 +++ /dev/null
83 @@ -1,55 +0,0 @@
84 ---- a/ada/testsuite/tests/name_resolution/for_of_derived/test.yaml 2019-06-10 18:10:52.274104372 +0200
85 -+++ b/ada/testsuite/tests/name_resolution/for_of_derived/test.yaml 2019-06-10 18:12:09.050950758 +0200
86 -@@ -1,2 +1,3 @@
87 - driver: name-resolution
88 - input_sources: [for_of_derived.adb]
89 -+expect_failure: Gentoo unfixed
90 ---- a/ada/testsuite/tests/name_resolution/test_subp_address/test.yaml 2019-06-10 18:13:18.821902438 +0200
91 -+++ b/ada/testsuite/tests/name_resolution/test_subp_address/test.yaml 2019-06-10 18:13:40.055583691 +0200
92 -@@ -1,3 +1,4 @@
93 - driver: name-resolution
94 - input_sources: [test_subp_address.adb]
95 - with_default_project: False
96 -+expect_failure: Gentoo unfixed
97 ---- a/ada/testsuite/tests/name_resolution/delay_until/test.yaml 2019-06-10 18:17:48.878848194 +0200
98 -+++ b/ada/testsuite/tests/name_resolution/delay_until/test.yaml 2019-06-10 18:18:00.052680426 +0200
99 -@@ -1,2 +1,3 @@
100 - driver: name-resolution
101 - input_sources: [delay_until.adb]
102 -+expect_failure: Gentoo unfixed
103 ---- a/ada/testsuite/tests/name_resolution/exception_occurence/test.yaml 2019-06-10 18:14:22.803941966 +0200
104 -+++ b/ada/testsuite/tests/name_resolution/exception_occurence/test.yaml 2019-06-10 18:15:40.665773085 +0200
105 -@@ -1,2 +1,3 @@
106 - driver: name-resolution
107 - input_sources: [test_exc.adb]
108 -+expect_failure: Gentoo unfixed
109 ---- a/ada/testsuite/tests/name_resolution/int_text_io/test.yaml 2019-06-10 18:18:29.797233863 +0200
110 -+++ b/ada/testsuite/tests/name_resolution/int_text_io/test.yaml 2019-06-10 18:18:40.230077225 +0200
111 -@@ -1,2 +1,3 @@
112 - driver: name-resolution
113 - input_sources: [foo.adb]
114 -+expect_failure: Gentoo unfixed
115 ---- a/ada/testsuite/tests/name_resolution/stream_attrs/test.yaml 2019-06-10 18:18:59.441788761 +0200
116 -+++ b/ada/testsuite/tests/name_resolution/stream_attrs/test.yaml 2019-06-10 18:19:09.873632142 +0200
117 -@@ -1,2 +1,3 @@
118 - driver: name-resolution
119 - input_sources: [streamable_types.ads]
120 -+expect_failure: Gentoo unfixed
121 ---- a/ada/testsuite/tests/name_resolution/pow_op_2/test.yaml 2019-06-10 18:20:04.207816327 +0200
122 -+++ b/ada/testsuite/tests/name_resolution/pow_op_2/test.yaml 2019-06-10 18:20:15.739643192 +0200
123 -@@ -1,2 +1,3 @@
124 - driver: name-resolution
125 - input_sources: [test.adb]
126 -+expect_failure: Gentoo unfixed
127 ---- a/ada/testsuite/tests/name_resolution/text_io_child_units/test.yaml 2019-06-10 18:19:33.552276617 +0200
128 -+++ b/ada/testsuite/tests/name_resolution/text_io_child_units/test.yaml 2019-06-10 18:19:42.437143224 +0200
129 -@@ -1,2 +1,3 @@
130 - driver: name-resolution
131 - input_sources: [foo.adb]
132 -+expect_failure: Gentoo unfixed
133 ---- a/ada/testsuite/tests/name_resolution/for_of_vector/test.yaml 2019-06-10 18:20:36.925325094 +0200
134 -+++ b/ada/testsuite/tests/name_resolution/for_of_vector/test.yaml 2019-06-10 18:20:45.641194223 +0200
135 -@@ -1,2 +1,3 @@
136 - driver: name-resolution
137 - input_sources: [testvec.adb]
138 -+expect_failure: Gentoo unfixed
139
140 diff --git a/dev-ada/libadalang/files/libadalang-2019-pyyaml.patch b/dev-ada/libadalang/files/libadalang-2019-pyyaml.patch
141 deleted file mode 100644
142 index ad78d5af1f3..00000000000
143 --- a/dev-ada/libadalang/files/libadalang-2019-pyyaml.patch
144 +++ /dev/null
145 @@ -1,11 +0,0 @@
146 ---- a/ada/testsuite/testsuite_support/polyfill.py 2020-03-26 20:52:45.678476467 +0100
147 -+++ b/ada/testsuite/testsuite_support/polyfill.py 2020-03-26 20:53:13.612979979 +0100
148 -@@ -368,7 +368,7 @@
149 - # First load data provided by this testcase
150 - try:
151 - with open(os.path.join(test_dir, 'test.yaml'), 'r') as f:
152 -- test_data = yaml.load(f)
153 -+ test_data = yaml.safe_load(f)
154 - except (IOError, yaml.error.YAMLError) as exc:
155 - status = 'PROBLEM'
156 - message = 'Invalid test.yaml: {}'.format(exc)
157
158 diff --git a/dev-ada/libadalang/libadalang-2018-r2.ebuild b/dev-ada/libadalang/libadalang-2018-r2.ebuild
159 deleted file mode 100644
160 index 976d27263cc..00000000000
161 --- a/dev-ada/libadalang/libadalang-2018-r2.ebuild
162 +++ /dev/null
163 @@ -1,69 +0,0 @@
164 -# Copyright 1999-2020 Gentoo Authors
165 -# Distributed under the terms of the GNU General Public License v2
166 -
167 -EAPI=7
168 -
169 -PYTHON_COMPAT=( python2_7 )
170 -ADA_COMPAT=( gnat_201{7,8,9} )
171 -
172 -inherit ada python-single-r1
173 -
174 -MYP=${PN}-gpl-${PV}-src
175 -DESCRIPTION="high performance semantic engine for the Ada programming language"
176 -HOMEPAGE="https://libre.adacore.com/"
177 -SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf9adc7a4475263382c18
178 - -> ${MYP}.tar.gz"
179 -
180 -LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
181 -SLOT="0"
182 -KEYWORDS="amd64 x86"
183 -IUSE="+shared static-libs"
184 -
185 -RDEPEND="dev-python/pyyaml
186 - dev-ada/gnatcoll-bindings[${ADA_USEDEP},iconv,shared=,static-libs=]
187 - ${ADA_DEPS}
188 - ${PYTHON_DEPS}"
189 -DEPEND="${RDEPEND}
190 - ~dev-ada/langkit-2018
191 - dev-ada/gprbuild[${ADA_USEDEP}]"
192 -REQUIRED_USE="${PYTHON_REQUIRED_USE}
193 - ${ADA_REQUIRED_USE}"
194 -
195 -S="${WORKDIR}"/${MYP}
196 -
197 -pkg_setup() {
198 - python-single-r1_pkg_setup
199 - ada_pkg_setup
200 -}
201 -
202 -PATCHES=(
203 - "${FILESDIR}"/${P}-gentoo.patch
204 - "${FILESDIR}"/${PN}-2017-gentoo.patch
205 - "${FILESDIR}"/${PN}-2019-pyyaml.patch
206 -)
207 -
208 -src_configure() {
209 - ada/manage.py -v debug generate || die
210 -}
211 -
212 -src_compile() {
213 - ada/manage.py \
214 - -v \
215 - $(use_enable shared) \
216 - $(use_enable static-libs static) \
217 - build \
218 - --build-mode='prod' || die
219 -}
220 -
221 -src_test() {
222 - ada/manage.py test | grep FAILED && die
223 -}
224 -
225 -src_install() {
226 - ada/manage.py \
227 - $(use_enable shared) \
228 - $(use_enable static-libs static) \
229 - install "${D}"/usr || die
230 - python_domodule build/python/libadalang.py
231 - rm -r "${D}"/usr/python || die
232 -}
233
234 diff --git a/dev-ada/libadalang/libadalang-2019-r1.ebuild b/dev-ada/libadalang/libadalang-2019-r1.ebuild
235 deleted file mode 100644
236 index 7acb3a03a87..00000000000
237 --- a/dev-ada/libadalang/libadalang-2019-r1.ebuild
238 +++ /dev/null
239 @@ -1,77 +0,0 @@
240 -# Copyright 1999-2020 Gentoo Authors
241 -# Distributed under the terms of the GNU General Public License v2
242 -
243 -EAPI=7
244 -
245 -PYTHON_COMPAT=( python2_7 )
246 -ADA_COMPAT=( gnat_201{8,9} )
247 -
248 -inherit ada python-single-r1
249 -
250 -MYP=${P}-20190510-19916-src
251 -DESCRIPTION="high performance semantic engine for the Ada programming language"
252 -HOMEPAGE="https://libre.adacore.com/"
253 -SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8f3331e87a8f1c967d27
254 - -> ${MYP}.tar.gz"
255 -
256 -LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
257 -SLOT="0"
258 -KEYWORDS="amd64 x86"
259 -IUSE="+shared static-libs"
260 -
261 -RDEPEND="dev-python/pyyaml
262 - dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv,shared=,static-libs=]
263 - ${ADA_DEPS}
264 - ${PYTHON_DEPS}"
265 -DEPEND="${RDEPEND}
266 - dev-ada/gprbuild[${ADA_USEDEP}]
267 - >=dev-ada/langkit-2019"
268 -
269 -REQUIRED_USE="${PYTHON_REQUIRED_USE}
270 - ${ADA_REQUIRED_USE}"
271 -
272 -S="${WORKDIR}"/${MYP}
273 -
274 -pkg_setup() {
275 - python-single-r1_pkg_setup
276 - ada_pkg_setup
277 -}
278 -
279 -PATCHES=(
280 - "${FILESDIR}"/${P}-gentoo.patch
281 - "${FILESDIR}"/${P}-pyyaml.patch
282 -)
283 -
284 -src_configure() {
285 - ada/manage.py -v debug generate || die
286 -}
287 -
288 -src_compile() {
289 - libtype=relocatable
290 - if use shared; then
291 - if use static-libs; then
292 - libtype=static,relocatable
293 - fi
294 - elif use static-libs; then
295 - libtype=static
296 - fi
297 - ada/manage.py \
298 - -v \
299 - --library-types $libtype \
300 - build \
301 - --build-mode='prod' || die
302 -}
303 -
304 -src_test() {
305 - ada/manage.py test | tee libadalang.testOut;
306 - grep -q FAILED libadalang.testOut && die
307 -}
308 -
309 -src_install() {
310 - ada/manage.py \
311 - -v \
312 - --library-types $libtype \
313 - install "${D}"/usr || die
314 - python_domodule build/python/libadalang
315 - rm -r "${D}"/usr/python || die
316 -}
317
318 diff --git a/dev-ada/libadalang/metadata.xml b/dev-ada/libadalang/metadata.xml
319 deleted file mode 100644
320 index 7cfa6c9dcea..00000000000
321 --- a/dev-ada/libadalang/metadata.xml
322 +++ /dev/null
323 @@ -1,16 +0,0 @@
324 -<?xml version="1.0" encoding="UTF-8"?>
325 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
326 -<pkgmetadata>
327 - <maintainer type="project">
328 - <email>ada@g.o</email>
329 - </maintainer>
330 - <use>
331 - <flag name="shared">Build shared library</flag>
332 - </use>
333 - <longdescription lang="en">
334 - Libadalang is a project to build a high performance semantic engine for
335 - the Ada programming language. It is meant to provide a basis to write
336 - Ada tooling, including tools working on potentially changing and
337 - incorrect code, such as IDEs.
338 - </longdescription>
339 -</pkgmetadata>
340
341 diff --git a/profiles/package.mask b/profiles/package.mask
342 index a881278ff35..31a5f32e866 100644
343 --- a/profiles/package.mask
344 +++ b/profiles/package.mask
345 @@ -347,7 +347,6 @@ dev-lang/spark
346 # Masking for removal to prevent eclass from crashing on these packages.
347 # Removal in 30 days.
348 dev-ada/langkit
349 -dev-ada/libadalang
350
351 # Mart Raudsepp <leio@g.o> (2020-08-15)
352 # Development release, needs testing to ensure valac-0.50