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/gprbuild/, dev-ada/gprbuild/files/
Date: Thu, 25 Nov 2021 07:34:53
Message-Id: 1637825678.db83afa7a333708cc8c0a5e3982ac131aa13f204.tupone@gentoo
1 commit: db83afa7a333708cc8c0a5e3982ac131aa13f204
2 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 25 07:34:38 2021 +0000
4 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 25 07:34:38 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db83afa7
7
8 dev-ada/gprbuild: unsupport gnat_2019, drop old
9
10 Package-Manager: Portage-3.0.28, Repoman-3.0.3
11 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
12
13 dev-ada/gprbuild/Manifest | 2 -
14 dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch | 286 ----------------------
15 dev-ada/gprbuild/gprbuild-2020-r1.ebuild | 76 ------
16 dev-ada/gprbuild/gprbuild-2020.ebuild | 76 ------
17 4 files changed, 440 deletions(-)
18
19 diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
20 index 7f29364e5a67..adc6ed460a2d 100644
21 --- a/dev-ada/gprbuild/Manifest
22 +++ b/dev-ada/gprbuild/Manifest
23 @@ -1,7 +1,5 @@
24 -DIST gprbuild-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B 3a036cb40bbe5522af63c376a672384093901b44df6fd74013f1eff9d269c2f5056224ab5e7d59b6f3cf126cd14dd30420056b09e887851351462de59f700e3a SHA512 d2ff6a5d8281d332a31533c7a5744b6169fd250c9086373fd658486c1e529564d9830b9ef3b2dfcbec5f8c1ba50d244a9eb45bf8fdccd53f8b711dcf29258dfd
25 DIST gprbuild-2021-20210519-19A34-src.tar.gz 2572773 BLAKE2B 42244b96b48a10795812865a430a92a75f3e6a58f384a72e6941945707e712d239f2350e00bd94e6161fb19c6469197547f4ddb565e860ae1d08573b7c667997 SHA512 f2fd10cdf8bd2ae553184104a8d29ddf884329946c55e1a199d49358151e9f1ea25f6566d6e00d15e07d26ea4e84377f4ee137a9af4eecb862fc825dd987ada8
26 DIST gprbuild-22.0.0.tar.gz 945311 BLAKE2B 4573855667fe6c352a61ac2fd8218619e0c9fa5c5079fe6854988733b7dac27225177f550b58b8d596516e8d3bf9a279f44864fdcb00514ee9e5776415c78f2d SHA512 7e77d9441454670a7b3b14cff97339e654bb82e7321abd9d612a771e1559f3276057e5163b50ca08b6ab77ebb9fcfd36590ba3c9cfd28d07fce43c7673ad254a
27 DIST gprconfig_kb-22.0.0.tar.gz 40598 BLAKE2B c0b18078ac3384de9bb503f78a1bb39a486b5ae899ad1ab135fa05da414eb6a55b5b7156bb4fc60a34c0d085b33af13ef2e0ec46840ad43ca63c387863ae6eac SHA512 69f8490af56b0e07afbfef51c12cd6361a00327af774cd0deacf8260ccc4782e1e8465a074e8a025024570ce43ba1b4b3adfbde9ae4ea372e487d342da6994d4
28 -DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B e2c25e103c5c560cf7c9580118580e2952f3ef56c244b0f76c7f484e5629b684d5ee546d2d40520e1a4bf963271d360522423f4e7d81570f7dc1dbc8424c9147 SHA512 e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c
29 DIST xmlada-2021-20210518-19D50-src.tar.gz 1555951 BLAKE2B 589815d4781471a48d3bb4a12475762cb2ba8f885df8ea774f009c8be9ded41bccc414bb88a2b3d313701b0b2edefcd065fac8a13d208a7bb1679a3467a60c35 SHA512 e2fb1a87cb0cebae842f87412d0ccc8a18b20e5e2c4e3d9ad6ec3a6ae18e4e53c12efd9ea3f2515baa5bfec2b4ddee7808385cc471e3cca9b8c4be3d03093e85
30 DIST xmlada-22.0.0.tar.gz 1022947 BLAKE2B cea409a45a3b0c8eba48f858278d4e7129eca2e77fa749f5a761e31a81834efba67223f07c99441a9673a8f6de9a608a12cf610225ca5aee7fbde0235d9af1d9 SHA512 7e8a0cab2f4c300fe3b0d31e00d17334e36798430e49868448caa696044964464f558cffba8f35e35a58b097c968322891119b2abd9f210737ca877f0189f32e
31
32 diff --git a/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch
33 deleted file mode 100644
34 index 9e6040b8ddc9..000000000000
35 --- a/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch
36 +++ /dev/null
37 @@ -1,286 +0,0 @@
38 ---- a/src/gprlib.adb 2019-06-02 10:57:49.807002425 +0200
39 -+++ b/src/gprlib.adb 2019-06-02 11:01:32.986518447 +0200
40 -@@ -266,7 +266,9 @@
41 -
42 - Driver_Name : Name_Id := No_Name;
43 -
44 -- Gnatbind_Name : String_Access := new String'("gnatbind");
45 -+ Gnatbind_Name : String_Access := new String'("@GNATBIND@");
46 -+
47 -+ Gnatbind_Path_Option : constant String := "--gnatbind_path=";
48 -
49 - Compiler_Name : String_Access := new String'("gcc");
50 -
51 -@@ -2081,7 +2083,7 @@
52 - and then Line (Last - 2 .. Last) = "gcc"
53 - then
54 - Gnatbind_Name :=
55 -- new String'(Line (1 .. Last - 3) & "gnatbind");
56 -+ new String'(Line (1 .. Last - 3) & "@GNATBIND@");
57 - Objcopy_Name :=
58 - new String'(Line (1 .. Last - 3) & "objcopy");
59 -
60 -@@ -2089,7 +2091,7 @@
61 - and then Line (Last - 6 .. Last) = "gcc.exe"
62 - then
63 - Gnatbind_Name :=
64 -- new String'(Line (1 .. Last - 7) & "gnatbind");
65 -+ new String'(Line (1 .. Last - 7) & "@GNATBIND@");
66 - Objcopy_Name :=
67 - new String'(Line (1 .. Last - 7) & "objcopy");
68 - end if;
69 -@@ -2241,7 +2243,13 @@
70 - Mapping_File_Name := new String'(Line (1 .. Last));
71 -
72 - when Binding_Options =>
73 -- Binding_Options_Table.Append (Line (1 .. Last));
74 -+ if Last > Gnatbind_Path_Option'Length
75 -+ and then Line (1 .. Gnatbind_Path_Option'Length) =
76 -+ Gnatbind_Path_Option then
77 -+ null;
78 -+ else
79 -+ Binding_Options_Table.Append (Line (1 .. Last));
80 -+ end if;
81 -
82 - when Copy_Source_Dir =>
83 - Copy_Source_Directory := new String'(Line (1 .. Last));
84 ---- a/share/gprconfig/compilers.xml 2019-06-01 21:29:57.611722804 +0200
85 -+++ b/share/gprconfig/compilers.xml 2019-06-01 21:42:56.000608601 +0200
86 -@@ -20,15 +20,15 @@
87 - <!-- GCC 3.x & 4.x (not for GNAT Pro)-->
88 - <compiler_description>
89 - <name>GCC</name>
90 -- <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc</executable>
91 -+ <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc-@VER@</executable>
92 - <version>
93 -- <external>${PREFIX}gcc -v</external>
94 -+ <external>${PREFIX}gcc-@VER@ -v</external>
95 - <nogrep regexp="for GNAT Pro"></nogrep>
96 - <grep regexp="^gcc \S+ (\S+)" group="1"></grep>
97 - </version>
98 - <languages>C</languages>
99 - <target>
100 -- <external>${PREFIX}gcc -dumpmachine</external>
101 -+ <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
102 - <grep regexp="[^\r\n]+"></grep>
103 - </target>
104 - </compiler_description>
105 -@@ -170,14 +170,14 @@
106 - -->
107 - <compiler_description>
108 - <name>GNAT</name>
109 -- <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*-qnx.*)?gnatls</executable>
110 -+ <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*-qnx.*)?gnatls-@VER@</executable>
111 - <version>
112 -- <external>${PREFIX}gnatls -v --version</external>
113 -+ <external>${PREFIX}gnatls-@VER@ -v --version</external>
114 - <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
115 - </version>
116 - <languages>Ada</languages>
117 - <variable name="gcc_version">
118 -- <external>${PREFIX}gcc -v</external>
119 -+ <external>${PREFIX}gcc-@VER@ -v</external>
120 - <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
121 - </variable>
122 - <runtimes default="default,kernel,native">
123 -@@ -187,67 +187,11 @@
124 - <directory group="1" >\.\./$TARGET/lib/gnat/(.*)/adalib/</directory>
125 - </runtimes>
126 - <target>
127 -- <external>${PREFIX}gcc -dumpmachine</external>
128 -+ <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
129 - <grep regexp="[^\r\n]+"></grep>
130 - </target>
131 - </compiler_description>
132 -
133 -- <!-- CodePeer -->
134 --
135 -- <compiler_description>
136 -- <name>GNAT_CODEPEER</name>
137 -- <executable prefix="1">(.*gnsa-|.*codepeer-)gnatls</executable>
138 -- <version>
139 -- <external>${PREFIX}gnatls -v</external>
140 -- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
141 -- </version>
142 -- <languages>Ada,C,C++</languages>
143 -- <variable name="gcc_version">
144 -- <external>${PREFIX}gcc -v</external>
145 -- <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
146 -- </variable>
147 -- <runtimes default="default,native">
148 -- <directory group="default" >\.\./lib/gcc/.*/$gcc_version/adalib/</directory>
149 -- <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory>
150 -- <directory group="1" >\.\./lib/gcc/.*/$gcc_version/rts-(.*)/adalib/</directory>
151 -- </runtimes>
152 -- <target>codepeer</target>
153 -- </compiler_description>
154 --
155 -- <!-- Generic GNAT LLVM Target -->
156 --
157 -- <compiler_description>
158 -- <name>GNAT_LLVM</name>
159 -- <executable prefix="1">(llvm-)gnatls</executable>
160 -- <version>
161 -- <external>${PREFIX}gnatls -v</external>
162 -- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
163 -- </version>
164 -- <languages>Ada</languages>
165 -- <variable name="gcc_version">
166 -- <external>${PREFIX}gcc -v</external>
167 -- <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
168 -- </variable>
169 -- <runtimes default="default,native">
170 -- <directory group="default" >\.\./lib/rts-native/adalib/</directory>
171 -- </runtimes>
172 -- <target>llvm</target>
173 -- </compiler_description>
174 --
175 -- <!-- Generic C compiler for LLVM -->
176 -- <compiler_description>
177 -- <name>C_LLVM</name>
178 -- <executable>clang</executable>
179 -- <version>
180 -- <external>clang --version</external>
181 --
182 -- <!-- 'clang version 6.0.0 ...' -->
183 -- <grep regexp="^clang version (\S+) " group="1"></grep>
184 -- </version>
185 -- <languages>C</languages>
186 -- <target>llvm</target>
187 -- </compiler_description>
188 --
189 - <!-- Generic C++ compiler for LLVM -->
190 - <compiler_description>
191 - <name>C++_LLVM</name>
192 -@@ -262,45 +206,6 @@
193 - <target>llvm</target>
194 - </compiler_description>
195 -
196 -- <!-- C Target -->
197 --
198 -- <compiler_description>
199 -- <name>GNAT_C</name>
200 -- <executable prefix="1">(c-)gnatls</executable>
201 -- <version>
202 -- <external>${PREFIX}gnatls -v</external>
203 -- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
204 -- </version>
205 -- <languages>Ada</languages>
206 -- <variable name="gcc_version">
207 -- <external>${PREFIX}gcc -v</external>
208 -- <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
209 -- </variable>
210 -- <runtimes default="default,ccg">
211 -- <directory group="default" >\.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/adalib/</directory>
212 -- <directory group="1" >\.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/rts-(.*)/adalib/</directory>
213 -- <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory>
214 -- </runtimes>
215 -- <target>c</target>
216 -- </compiler_description>
217 --
218 -- <!-- GNAT_DOTNET -->
219 --
220 -- <compiler_description>
221 -- <name>GNAT_DOTNET</name>
222 -- <executable prefix="1">(.*dotnet-)gnatls</executable>
223 -- <version>
224 -- <external>${PREFIX}gnatls -v</external>
225 -- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
226 -- </version>
227 -- <languages>Ada</languages>
228 -- <runtimes default="default,kernel">
229 -- <directory group="default" >\.\./lib/dotgnat/adalib/</directory>
230 -- <directory group="1" >\.\./lib/dotgnat/rts-(.*)/adalib/</directory>
231 -- </runtimes>
232 -- <target>dotnet</target>
233 -- </compiler_description>
234 --
235 - <!-- JGNAT -->
236 -
237 - <compiler_description>
238 -@@ -421,21 +326,6 @@
239 - </target>
240 - </compiler_description>
241 -
242 -- <!-- LLVM Compiler -->
243 -- <compiler_description>
244 -- <name>LLVM</name>
245 -- <executable>clang</executable>
246 -- <version>
247 -- <external>clang -v</external>
248 -- <grep regexp=".*(LLVM|clang) version ([0-9.]*)" group="2"></grep>
249 -- </version>
250 -- <languages>C,C++</languages>
251 -- <target>
252 -- <external>clang -dumpmachine</external>
253 -- <grep regexp="[^\r\n]+"></grep>
254 -- </target>
255 -- </compiler_description>
256 --
257 - <!-- Windres compiler -->
258 - <compiler_description>
259 - <name>WINDRES</name>
260 ---- a/share/gprconfig/gnat.xml 2019-06-01 21:53:53.383281607 +0200
261 -+++ b/share/gprconfig/gnat.xml 2019-06-01 21:57:08.414196529 +0200
262 -@@ -60,7 +60,7 @@
263 - &filter_gnat;
264 - <config>
265 - package Compiler is
266 -- for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc";
267 -+ for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc-@VER@";
268 - for Language_Kind ("Ada") use "unit_based";
269 - for Dependency_Kind ("Ada") use "ALI_File";
270 - for Leading_Required_Switches ("Ada") use
271 -@@ -77,6 +77,9 @@
272 - for Objects_Path_File ("Ada") use "ADA_PRJ_OBJECTS_FILE";
273 - for Driver ("Ada") use
274 - "${GPRCONFIG_PREFIX}libexec/gprbuild/gprbind";
275 -+ for Switches ("Ada") use ("--gnatbind_path=gnatbind-@VER@");
276 -+ for Required_Switches ("Ada") use
277 -+ Binder'Required_Switches ("Ada") &amp; ("--RTS=${RUNTIME_DIR(ada)}");
278 - end Binder;
279 -
280 - for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}";
281 ---- a/share/gprconfig/c.xml 2019-06-01 21:57:36.244755708 +0200
282 -+++ b/share/gprconfig/c.xml 2019-06-01 21:59:14.919191663 +0200
283 -@@ -14,7 +14,7 @@
284 - </compilers>
285 - <config>
286 - package Compiler is
287 -- for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc";
288 -+ for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@";
289 - end Compiler;
290 - </config>
291 - </configuration>
292 ---- a/share/gprconfig/linker.xml 2019-06-01 21:59:34.546880368 +0200
293 -+++ b/share/gprconfig/linker.xml 2019-06-01 22:00:50.906668730 +0200
294 -@@ -1015,7 +1015,7 @@
295 - </targets>
296 - <config>
297 - for Library_Partial_Linker use
298 -- ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib", "-Wl,-r", "-o");
299 -+ ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o");
300 - </config>
301 - </configuration>
302 -
303 -@@ -1034,7 +1034,7 @@
304 - </targets>
305 - <config>
306 - for Library_Partial_Linker use
307 -- ("${PATH(c)}${PREFIX(c)}gcc", "-nostdlib", "-Wl,-r", "-o");
308 -+ ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o");
309 - </config>
310 - </configuration>
311 -
312 ---- a/share/gprconfig/linker.xml 2020-06-16 22:13:38.508782578 +0200
313 -+++ b/share/gprconfig/linker.xml 2020-06-16 22:14:32.693966110 +0200
314 -@@ -112,6 +112,9 @@
315 - for Object_Lister use ("nm", "-g");
316 - for Object_Lister_Matcher use " [TDRB] (.*)";
317 -
318 -+ LDFLAGS := External_As_List ("LDFLAGS", " ");
319 -+ for Leading_Library_Options use LDFLAGS;
320 -+
321 - package Linker is
322 - for Export_File_Format use "GNU";
323 - for Export_File_Switch use "-Wl,--version-script=";
324
325 diff --git a/dev-ada/gprbuild/gprbuild-2020-r1.ebuild b/dev-ada/gprbuild/gprbuild-2020-r1.ebuild
326 deleted file mode 100644
327 index 0a8c906e76ae..000000000000
328 --- a/dev-ada/gprbuild/gprbuild-2020-r1.ebuild
329 +++ /dev/null
330 @@ -1,76 +0,0 @@
331 -# Copyright 1999-2021 Gentoo Authors
332 -# Distributed under the terms of the GNU General Public License v2
333 -
334 -EAPI=7
335 -
336 -ADA_COMPAT=( gnat_2019 gnat_2020 )
337 -
338 -inherit ada multiprocessing
339 -
340 -MYP=${P}-20200429-19BD2-src
341 -XMLADA=xmlada-${PV}-20200429-19A99-src
342 -
343 -DESCRIPTION="Multi-Language Management"
344 -HOMEPAGE="http://libre.adacore.com/"
345 -SRC_URI="
346 - https://community.download.adacore.com/v1/408ec35c3bb86bd227db3da55d3e1e0c572a56e3?filename=${MYP}.tar.gz
347 - -> ${MYP}.tar.gz
348 - https://community.download.adacore.com/v1/c799502295baf074ad17b48c50f621879c392c57?filename=${XMLADA}.tar.gz
349 - -> ${XMLADA}.tar.gz"
350 -LICENSE="GPL-3"
351 -SLOT="0"
352 -KEYWORDS="~amd64 ~x86"
353 -IUSE=""
354 -
355 -DEPEND="${ADA_DEPS}"
356 -RDEPEND="${DEPEND}"
357 -
358 -S="${WORKDIR}"/${MYP}
359 -
360 -REQUIRED_USE="${ADA_REQUIRED_USE}"
361 -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
362 -
363 -src_prepare() {
364 - default
365 - sed -i \
366 - -e "s:@VER@:${GCC_PV}:g" \
367 - share/gprconfig/compilers.xml \
368 - share/gprconfig/gnat.xml \
369 - share/gprconfig/c.xml \
370 - share/gprconfig/linker.xml \
371 - || die
372 - sed -i \
373 - -e "s:@GNATBIND@:${GNATBIND}:g" \
374 - src/gprlib.adb \
375 - || die
376 -}
377 -
378 -bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
379 -lib_progs="gprlib gprbind"
380 -
381 -src_compile() {
382 - local xmlada_src="../${XMLADA}"
383 - incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
384 - -I${xmlada_src}/schema -I${xmlada_src}/unicode \
385 - -I${xmlada_src}/input_sources"
386 - gcc -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
387 - for bin in ${bin_progs}; do
388 - gnatmake -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
389 - -o ${bin} -largs ${LDFLAGS} gpr_imports.o || die
390 - done
391 - for lib in $lib_progs; do
392 - gnatmake -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
393 - -largs ${LDFLAGS} gpr_imports.o || die
394 - done
395 -}
396 -
397 -src_install() {
398 - dobin ${bin_progs}
399 - exeinto /usr/libexec/gprbuild
400 - doexe ${lib_progs}
401 - insinto /usr/share/gprconfig
402 - doins share/gprconfig/*
403 - insinto /usr/share/gpr
404 - doins share/_default.gpr
405 - einstalldocs
406 -}
407
408 diff --git a/dev-ada/gprbuild/gprbuild-2020.ebuild b/dev-ada/gprbuild/gprbuild-2020.ebuild
409 deleted file mode 100644
410 index 8b3fd0402cc9..000000000000
411 --- a/dev-ada/gprbuild/gprbuild-2020.ebuild
412 +++ /dev/null
413 @@ -1,76 +0,0 @@
414 -# Copyright 1999-2021 Gentoo Authors
415 -# Distributed under the terms of the GNU General Public License v2
416 -
417 -EAPI=7
418 -
419 -ADA_COMPAT=( gnat_2019 )
420 -
421 -inherit ada multiprocessing
422 -
423 -MYP=${P}-20200429-19BD2-src
424 -XMLADA=xmlada-${PV}-20200429-19A99-src
425 -
426 -DESCRIPTION="Multi-Language Management"
427 -HOMEPAGE="http://libre.adacore.com/"
428 -SRC_URI="
429 - https://community.download.adacore.com/v1/408ec35c3bb86bd227db3da55d3e1e0c572a56e3?filename=${MYP}.tar.gz
430 - -> ${MYP}.tar.gz
431 - https://community.download.adacore.com/v1/c799502295baf074ad17b48c50f621879c392c57?filename=${XMLADA}.tar.gz
432 - -> ${XMLADA}.tar.gz"
433 -LICENSE="GPL-3"
434 -SLOT="0"
435 -KEYWORDS="amd64 x86"
436 -IUSE=""
437 -
438 -DEPEND="${ADA_DEPS}"
439 -RDEPEND="${DEPEND}"
440 -
441 -S="${WORKDIR}"/${MYP}
442 -
443 -REQUIRED_USE="${ADA_REQUIRED_USE}"
444 -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
445 -
446 -src_prepare() {
447 - default
448 - sed -i \
449 - -e "s:@VER@:${GCC_PV}:g" \
450 - share/gprconfig/compilers.xml \
451 - share/gprconfig/gnat.xml \
452 - share/gprconfig/c.xml \
453 - share/gprconfig/linker.xml \
454 - || die
455 - sed -i \
456 - -e "s:@GNATBIND@:${GNATBIND}:g" \
457 - src/gprlib.adb \
458 - || die
459 -}
460 -
461 -bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
462 -lib_progs="gprlib gprbind"
463 -
464 -src_compile() {
465 - local xmlada_src="../${XMLADA}"
466 - incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
467 - -I${xmlada_src}/schema -I${xmlada_src}/unicode \
468 - -I${xmlada_src}/input_sources"
469 - gcc -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
470 - for bin in ${bin_progs}; do
471 - gnatmake -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
472 - -o ${bin} -largs ${LDFLAGS} gpr_imports.o || die
473 - done
474 - for lib in $lib_progs; do
475 - gnatmake -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
476 - -largs ${LDFLAGS} gpr_imports.o || die
477 - done
478 -}
479 -
480 -src_install() {
481 - dobin ${bin_progs}
482 - exeinto /usr/libexec/gprbuild
483 - doexe ${lib_progs}
484 - insinto /usr/share/gprconfig
485 - doins share/gprconfig/*
486 - insinto /usr/share/gpr
487 - doins share/_default.gpr
488 - einstalldocs
489 -}