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/files/, dev-ada/gprbuild/
Date: Tue, 27 Aug 2019 07:03:51
Message-Id: 1566889412.66c86278b6d3667532d4a1c8a99b842b99d940ec.tupone@gentoo
1 commit: 66c86278b6d3667532d4a1c8a99b842b99d940ec
2 Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 27 07:03:32 2019 +0000
4 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 27 07:03:32 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66c86278
7
8 dev-ada/gprbuild: remove unused version
9
10 Package-Manager: Portage-2.3.66, Repoman-2.3.16
11 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
12
13 dev-ada/gprbuild/Manifest | 2 -
14 dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch | 284 ----------------------
15 dev-ada/gprbuild/gprbuild-2018-r3.ebuild | 86 -------
16 dev-ada/gprbuild/gprbuild-2018-r4.ebuild | 89 -------
17 4 files changed, 461 deletions(-)
18
19 diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
20 index 06e3942bc69..492408c6c4b 100644
21 --- a/dev-ada/gprbuild/Manifest
22 +++ b/dev-ada/gprbuild/Manifest
23 @@ -1,6 +1,4 @@
24 DIST gprbuild-2019-20190517-194D8-src.tar.gz 2507961 BLAKE2B 0f70d94cb0db9ddc1dd308862aaa305a91965a62a936cfbdde2ae9f3f735f0cc3d69596b09da4b979a1d7923087ab0ec5cf2d6541551f057b5e8e0c499065a90 SHA512 0388d7e6cdf625fef40b33da764091b3283dd88714c64ecfad4b5e99253f183b1a9b717c19281e6d45cc4277a05fadb2e2ace394d6f30638664b66c97123052b
25 DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
26 -DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab SHA512 d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044
27 DIST xmlada-2019-20190429-19B9D-src.tar.gz 1582603 BLAKE2B e2be3e7c0c8b843bfc808a3dd726235a82588caed8c919975a97ce34c72d6d634361bbc34208590210936add9e2f881b59d01168ef79abed1e489c50b27094d8 SHA512 f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380
28 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
29 -DIST xmlada-gpl-2018-src.tar.gz 1582215 BLAKE2B 11012dab19f45507eeb5ce6ebec9a77ceb5dfb7749960922f0f48bb1b0409305fd43466a7af90b48ff0a0cf58612e8859274a92e0fe272b4e57a59b92a1725f1 SHA512 8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430
30
31 diff --git a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
32 deleted file mode 100644
33 index 34936ea1f52..00000000000
34 --- a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
35 +++ /dev/null
36 @@ -1,284 +0,0 @@
37 ---- a/gpr/gpr.gpr 2017-05-27 20:59:07.061135892 +0200
38 -+++ b/gpr/gpr.gpr 2017-05-27 20:59:38.022638398 +0200
39 -@@ -67,6 +67,7 @@
40 - for Switches ("gpr*.ad?") use
41 - Compiler'Default_Switches ("Ada") & ("-g1");
42 - end case;
43 -+ for Driver ("C") use External ("CC", "gcc");
44 - end Compiler;
45 -
46 - end GPR;
47 ---- a/gpr/src/gpr-names.ads 2017-11-19 13:09:18.947527738 +0100
48 -+++ b/gpr/src/gpr-names.ads 2017-11-19 13:10:08.125654595 +0100
49 -@@ -27,6 +27,8 @@
50 - Name_Buffer : String (1 .. 1_000_000);
51 - Name_Len : Natural := 0;
52 -
53 -+ Last_Id : Name_Id := Name_Id'First;
54 -+
55 - procedure Get_Name_String (Id : Name_Id);
56 - procedure Get_Name_String (Id : Unit_Name_Type);
57 - procedure Get_Name_String (Id : File_Name_Type);
58 ---- a/gpr/src/gpr-names.adb 2017-11-19 13:10:27.674316703 +0100
59 -+++ b/gpr/src/gpr-names.adb 2017-11-19 13:14:38.360963627 +0100
60 -@@ -354,6 +354,8 @@
61 -
62 - Name_Chars.Append (ASCII.NUL);
63 -
64 -+ Last_Id := Name_Entries.Last;
65 -+
66 - return Name_Entries.Last;
67 - end Name_Enter;
68 -
69 -@@ -427,6 +429,8 @@
70 -
71 - Name_Chars.Append (ASCII.NUL);
72 -
73 -+ Last_Id := Name_Entries.Last;
74 -+
75 - return Name_Entries.Last;
76 - end Name_Find;
77 -
78 ---- a/gpr/src/gpr-snames.adb 2017-11-19 13:12:41.592995718 +0100
79 -+++ b/gpr/src/gpr-snames.adb 2017-11-19 13:16:31.980979696 +0100
80 -@@ -53,6 +53,10 @@
81 - return;
82 - end if;
83 -
84 -+ if Last_Id = Name_Id'First then
85 -+ Add_Name ("");
86 -+ end if;
87 -+
88 - Add_Name ("a");
89 - Add_Name ("b");
90 - Add_Name ("c");
91 ---- a/src/gprlib.adb 2017-12-18 12:20:02.937317216 +0100
92 -+++ b/src/gprlib.adb 2017-12-18 12:21:36.519604590 +0100
93 -@@ -263,7 +263,9 @@
94 -
95 - Driver_Name : Name_Id := No_Name;
96 -
97 -- Gnatbind_Name : String_Access := new String'("gnatbind");
98 -+ Gnatbind_Name : String_Access := new String'("@GNATBIND@");
99 -+
100 -+ Gnatbind_Path_Option : constant String := "--gnatbind_path=";
101 -
102 - Compiler_Name : String_Access := new String'("gcc");
103 -
104 -@@ -1944,13 +1946,13 @@
105 - and then Line (Last - 2 .. Last) = "gcc"
106 - then
107 - Gnatbind_Name :=
108 -- new String'(Line (1 .. Last - 3) & "gnatbind");
109 -+ new String'(Line (1 .. Last - 3) & "@GNATBIND@");
110 -
111 - elsif Last > 7
112 - and then Line (Last - 6 .. Last) = "gcc.exe"
113 - then
114 - Gnatbind_Name :=
115 -- new String'(Line (1 .. Last - 7) & "gnatbind");
116 -+ new String'(Line (1 .. Last - 7) & "@GNATBIND@");
117 - end if;
118 - end if;
119 -
120 -@@ -2100,7 +2102,13 @@
121 - Mapping_File_Name := new String'(Line (1 .. Last));
122 -
123 - when Binding_Options =>
124 -- Binding_Options_Table.Append (Line (1 .. Last));
125 -+ if Last > Gnatbind_Path_Option'Length
126 -+ and then Line (1 .. Gnatbind_Path_Option'Length) =
127 -+ Gnatbind_Path_Option then
128 -+ null;
129 -+ else
130 -+ Binding_Options_Table.Append (Line (1 .. Last));
131 -+ end if;
132 -
133 - when Copy_Source_Dir =>
134 - Copy_Source_Directory := new String'(Line (1 .. Last));
135 ---- a/share/gprconfig/compilers.xml 2018-10-17 14:36:15.100480516 +0200
136 -+++ b/share/gprconfig/compilers.xml 2018-10-17 15:38:57.333256634 +0200
137 -@@ -20,15 +20,15 @@
138 - <!-- GCC 3.x & 4.x (not for GNAT Pro)-->
139 - <compiler_description>
140 - <name>GCC</name>
141 -- <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>
142 -+ <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>
143 - <version>
144 -- <external>${PREFIX}gcc -v</external>
145 -+ <external>${PREFIX}gcc-@VER@ -v</external>
146 - <nogrep regexp="for GNAT Pro"></nogrep>
147 - <grep regexp="^gcc \S+ (\S+)" group="1"></grep>
148 - </version>
149 - <languages>C</languages>
150 - <target>
151 -- <external>${PREFIX}gcc -dumpmachine</external>
152 -+ <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
153 - <grep regexp="[^\r\n]+"></grep>
154 - </target>
155 - </compiler_description>
156 -@@ -170,14 +170,14 @@
157 - -->
158 - <compiler_description>
159 - <name>GNAT</name>
160 -- <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>
161 -+ <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>
162 - <version>
163 -- <external>${PREFIX}gnatls -v --version</external>
164 -+ <external>${PREFIX}gnatls-@VER@ -v --version</external>
165 - <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
166 - </version>
167 - <languages>Ada</languages>
168 - <variable name="gcc_version">
169 -- <external>${PREFIX}gcc -v</external>
170 -+ <external>${PREFIX}gcc-@VER@ -v</external>
171 - <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
172 - </variable>
173 - <runtimes default="default,kernel,native">
174 -@@ -187,71 +187,11 @@
175 - <directory group="1" >\.\./$TARGET/lib/gnat/(.*)/adalib/</directory>
176 - </runtimes>
177 - <target>
178 -- <external>${PREFIX}gcc -dumpmachine</external>
179 -+ <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
180 - <grep regexp="[^\r\n]+"></grep>
181 - </target>
182 - </compiler_description>
183 -
184 -- <!-- CodePeer -->
185 --
186 -- <compiler_description>
187 -- <name>GNAT_CODEPEER</name>
188 -- <executable prefix="1">(.*codepeer-)gnatls</executable>
189 -- <version>
190 -- <external>${PREFIX}gnatls -v</external>
191 -- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
192 -- </version>
193 -- <languages>Ada</languages>
194 -- <variable name="gcc_version">
195 -- <external>${PREFIX}gcc -v</external>
196 -- <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
197 -- </variable>
198 -- <runtimes default="default,native">
199 -- <directory group="default" >\.\./lib/gcc/.*/$gcc_version/adalib/</directory>
200 -- <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory>
201 -- <directory group="1" >\.\./lib/gcc/.*/$gcc_version/rts-(.*)/adalib/</directory>
202 -- </runtimes>
203 -- <target>codepeer</target>
204 -- </compiler_description>
205 --
206 -- <!-- C Target -->
207 --
208 -- <compiler_description>
209 -- <name>GNAT_C</name>
210 -- <executable prefix="1">(c-)gnatls</executable>
211 -- <version>
212 -- <external>${PREFIX}gnatls -v</external>
213 -- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
214 -- </version>
215 -- <languages>Ada</languages>
216 -- <variable name="gcc_version">
217 -- <external>${PREFIX}gcc -v</external>
218 -- <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
219 -- </variable>
220 -- <runtimes default="default">
221 -- <directory group="default" >\.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/adalib/</directory>
222 -- <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory>
223 -- </runtimes>
224 -- <target>c</target>
225 -- </compiler_description>
226 --
227 -- <!-- GNAT_DOTNET -->
228 --
229 -- <compiler_description>
230 -- <name>GNAT_DOTNET</name>
231 -- <executable prefix="1">(.*dotnet-)gnatls</executable>
232 -- <version>
233 -- <external>${PREFIX}gnatls -v</external>
234 -- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
235 -- </version>
236 -- <languages>Ada</languages>
237 -- <runtimes default="default,kernel">
238 -- <directory group="default" >\.\./lib/dotgnat/adalib/</directory>
239 -- <directory group="1" >\.\./lib/dotgnat/rts-(.*)/adalib/</directory>
240 -- </runtimes>
241 -- <target>dotnet</target>
242 -- </compiler_description>
243 --
244 - <!-- G77 -->
245 - <compiler_description>
246 - <name>G77</name>
247 -@@ -295,21 +295,6 @@
248 - </target>
249 - </compiler_description>
250 -
251 -- <!-- LLVM Compiler -->
252 -- <compiler_description>
253 -- <name>LLVM</name>
254 -- <executable>clang</executable>
255 -- <version>
256 -- <external>clang -v</external>
257 -- <grep regexp=".*(LLVM|clang) version ([0-9.]*)" group="2"></grep>
258 -- </version>
259 -- <languages>C</languages>
260 -- <target>
261 -- <external>clang -dumpmachine</external>
262 -- <grep regexp="[^\r\n]+"></grep>
263 -- </target>
264 -- </compiler_description>
265 --
266 - <!-- Windres compiler -->
267 - <compiler_description>
268 - <name>WINDRES</name>
269 ---- a/share/gprconfig/gnat.xml 2018-10-17 18:38:35.547094541 +0200
270 -+++ b/share/gprconfig/gnat.xml 2018-10-17 18:40:16.281379341 +0200
271 -@@ -60,7 +60,7 @@
272 - &filter_gnat;
273 - <config>
274 - package Compiler is
275 -- for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc";
276 -+ for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc-@VER@";
277 - for Language_Kind ("Ada") use "unit_based";
278 - for Dependency_Kind ("Ada") use "ALI_File";
279 - for Leading_Required_Switches ("Ada") use
280 -@@ -77,6 +77,9 @@
281 - for Objects_Path_File ("Ada") use "ADA_PRJ_OBJECTS_FILE";
282 - for Driver ("Ada") use
283 - "${GPRCONFIG_PREFIX}libexec/gprbuild/gprbind";
284 -+ for Switches ("Ada") use ("--gnatbind_path=gnatbind-@VER@");
285 -+ for Required_Switches ("Ada") use
286 -+ Binder'Required_Switches ("Ada") &amp; ("--RTS=${RUNTIME_DIR(ada)}");
287 - end Binder;
288 -
289 - for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}";
290 ---- a/share/gprconfig/c.xml 2018-10-17 21:31:44.442501471 +0200
291 -+++ b/share/gprconfig/c.xml 2018-10-17 21:33:06.562088044 +0200
292 -@@ -14,7 +14,7 @@
293 - </compilers>
294 - <config>
295 - package Compiler is
296 -- for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc";
297 -+ for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@";
298 - end Compiler;
299 - </config>
300 - </configuration>
301 ---- a/share/gprconfig/linker.xml 2018-10-17 21:36:15.856883517 +0200
302 -+++ b/share/gprconfig/linker.xml 2018-10-17 21:35:15.985896804 +0200
303 -@@ -1025,7 +1025,7 @@
304 - </targets>
305 - <config>
306 - for Library_Partial_Linker use
307 -- ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib", "-Wl,-r", "-o");
308 -+ ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o");
309 - </config>
310 - </configuration>
311 -
312 -@@ -1044,7 +1044,7 @@
313 - </targets>
314 - <config>
315 - for Library_Partial_Linker use
316 -- ("${PATH(c)}${PREFIX(c)}gcc", "-nostdlib", "-Wl,-r", "-o");
317 -+ ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o");
318 - </config>
319 - </configuration>
320 -
321
322 diff --git a/dev-ada/gprbuild/gprbuild-2018-r3.ebuild b/dev-ada/gprbuild/gprbuild-2018-r3.ebuild
323 deleted file mode 100644
324 index a1157f5c370..00000000000
325 --- a/dev-ada/gprbuild/gprbuild-2018-r3.ebuild
326 +++ /dev/null
327 @@ -1,86 +0,0 @@
328 -# Copyright 1999-2018 Gentoo Authors
329 -# Distributed under the terms of the GNU General Public License v2
330 -
331 -EAPI=6
332 -
333 -inherit toolchain-funcs multiprocessing
334 -
335 -MYP=${PN}-gpl-${PV}
336 -
337 -DESCRIPTION="Multi-Language Management"
338 -HOMEPAGE="http://libre.adacore.com/"
339 -SRC_URI="
340 - http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68
341 - -> ${MYP}-src.tar.gz
342 - http://mirrors.cdn.adacore.com/art/5b0819dec7a447df26c27a40
343 - -> xmlada-gpl-${PV}-src.tar.gz"
344 -LICENSE="GPL-3"
345 -SLOT="0"
346 -KEYWORDS="amd64 x86"
347 -IUSE="gnat_2016 gnat_2017 +gnat_2018"
348 -
349 -DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
350 - gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
351 - gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )"
352 -RDEPEND="${DEPEND}"
353 -
354 -S="${WORKDIR}"/${MYP}-src
355 -
356 -REQUIRED_USE="!gnat_2016 ^^ ( gnat_2017 gnat_2018 )"
357 -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
358 -
359 -src_prepare() {
360 - if use gnat_2017; then
361 - GCC_PV=6.3.0
362 - else
363 - GCC_PV=7.3.1
364 - fi
365 - default
366 - sed -i \
367 - -e "s:@VER@:${GCC_PV}:g" \
368 - share/gprconfig/compilers.xml \
369 - share/gprconfig/gnat.xml \
370 - share/gprconfig/c.xml \
371 - share/gprconfig/linker.xml \
372 - || die
373 - sed -i \
374 - -e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \
375 - src/gprlib.adb \
376 - || die
377 -}
378 -
379 -src_configure() {
380 - emake prefix="${D}"usr setup
381 -}
382 -
383 -bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
384 -lib_progs="gprlib gprbind"
385 -
386 -src_compile() {
387 - GCC=${CHOST}-gcc-${GCC_PV}
388 - GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
389 - local xmlada_src="../xmlada-gpl-${PV}-src"
390 - incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
391 - -I${xmlada_src}/schema -I${xmlada_src}/unicode \
392 - -I${xmlada_src}/input_sources"
393 - ${GCC} -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
394 - for bin in ${bin_progs}; do
395 - ${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
396 - -o ${bin} -largs gpr_imports.o || die
397 - done
398 - for lib in $lib_progs; do
399 - ${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
400 - -largs gpr_imports.o || die
401 - done
402 -}
403 -
404 -src_install() {
405 - dobin ${bin_progs}
406 - exeinto /usr/libexec/gprbuild
407 - doexe ${lib_progs}
408 - insinto /usr/share/gprconfig
409 - doins share/gprconfig/*
410 - insinto /usr/share/gpr
411 - doins share/_default.gpr
412 - einstalldocs
413 -}
414
415 diff --git a/dev-ada/gprbuild/gprbuild-2018-r4.ebuild b/dev-ada/gprbuild/gprbuild-2018-r4.ebuild
416 deleted file mode 100644
417 index de11e09704d..00000000000
418 --- a/dev-ada/gprbuild/gprbuild-2018-r4.ebuild
419 +++ /dev/null
420 @@ -1,89 +0,0 @@
421 -# Copyright 1999-2019 Gentoo Authors
422 -# Distributed under the terms of the GNU General Public License v2
423 -
424 -EAPI=6
425 -
426 -inherit toolchain-funcs multiprocessing
427 -
428 -MYP=${PN}-gpl-${PV}
429 -
430 -DESCRIPTION="Multi-Language Management"
431 -HOMEPAGE="http://libre.adacore.com/"
432 -SRC_URI="
433 - http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68
434 - -> ${MYP}-src.tar.gz
435 - http://mirrors.cdn.adacore.com/art/5b0819dec7a447df26c27a40
436 - -> xmlada-gpl-${PV}-src.tar.gz"
437 -LICENSE="GPL-3"
438 -SLOT="0"
439 -KEYWORDS="amd64 x86"
440 -IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019"
441 -
442 -DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
443 - gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
444 - gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )
445 - gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )"
446 -RDEPEND="${DEPEND}"
447 -
448 -S="${WORKDIR}"/${MYP}-src
449 -
450 -REQUIRED_USE="!gnat_2016 ^^ ( gnat_2017 gnat_2018 gnat_2019 )"
451 -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
452 -
453 -src_prepare() {
454 - if use gnat_2017; then
455 - GCC_PV=6.3.0
456 - elif use gnat_2018; then
457 - GCC_PV=7.3.1
458 - else
459 - GCC_PV=8.3.1
460 - fi
461 - default
462 - sed -i \
463 - -e "s:@VER@:${GCC_PV}:g" \
464 - share/gprconfig/compilers.xml \
465 - share/gprconfig/gnat.xml \
466 - share/gprconfig/c.xml \
467 - share/gprconfig/linker.xml \
468 - || die
469 - sed -i \
470 - -e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \
471 - src/gprlib.adb \
472 - || die
473 -}
474 -
475 -src_configure() {
476 - emake prefix="${D}"usr setup
477 -}
478 -
479 -bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
480 -lib_progs="gprlib gprbind"
481 -
482 -src_compile() {
483 - GCC=${CHOST}-gcc-${GCC_PV}
484 - GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
485 - local xmlada_src="../xmlada-gpl-${PV}-src"
486 - incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
487 - -I${xmlada_src}/schema -I${xmlada_src}/unicode \
488 - -I${xmlada_src}/input_sources"
489 - ${GCC} -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
490 - for bin in ${bin_progs}; do
491 - ${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
492 - -o ${bin} -largs gpr_imports.o || die
493 - done
494 - for lib in $lib_progs; do
495 - ${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
496 - -largs gpr_imports.o || die
497 - done
498 -}
499 -
500 -src_install() {
501 - dobin ${bin_progs}
502 - exeinto /usr/libexec/gprbuild
503 - doexe ${lib_progs}
504 - insinto /usr/share/gprconfig
505 - doins share/gprconfig/*
506 - insinto /usr/share/gpr
507 - doins share/_default.gpr
508 - einstalldocs
509 -}