1 |
commit: 420ab9ba4ada904e5582c90f8a77c01e611381d5 |
2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 3 18:13:32 2019 +0000 |
4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 3 18:15:26 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=420ab9ba |
7 |
|
8 |
dev-ada/gps: remove old version |
9 |
|
10 |
Package-Manager: Portage-2.3.76, Repoman-2.3.16 |
11 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
12 |
|
13 |
dev-ada/gps/Manifest | 2 - |
14 |
dev-ada/gps/files/gps-2017-gentoo.patch | 339 -------------------------------- |
15 |
dev-ada/gps/gps-2017.ebuild | 87 -------- |
16 |
3 files changed, 428 deletions(-) |
17 |
|
18 |
diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest |
19 |
index 1b976f5d7a2..41219d3921b 100644 |
20 |
--- a/dev-ada/gps/Manifest |
21 |
+++ b/dev-ada/gps/Manifest |
22 |
@@ -1,5 +1,3 @@ |
23 |
-DIST gnat-gpl-2017-x86_64-linux-bin.tar.gz 496338280 BLAKE2B b3eee6d311fb9c20bc8fa7217c0731ca1e91ced38700df1d63d91a16c3fa28dfd44c7c8e867c3a857b88e4f0c8b2a7200fb6a8a630b8403538c4784f8914d1a5 SHA512 01a8f3be9b7b7e83cc5bd4a45137b1d35c6448bc22a88bcaf5d312cd63e11081b6b2fe9f09ad2a27d8f0b6471fc5c1a99573bf3bcee1589329054074eaeef04f |
24 |
-DIST gps-gpl-2017-src.tar.gz 41216830 BLAKE2B 51ca89c38fa81888a9cf1831cf97f7e0ad72c444328a29063249a4fe72bbdc8357552d470872e9fbbeaf349ef0427b59fa41a0efb56200a07a9426343c731a57 SHA512 101ecef7f183de1da0c2b09d77f284a5e8c5ae56f34a897c8d471e79fe9a2832742608ff5251197ba2a52b5d9dfee6c6937fc22cd55f6d8f38359b070393cb64 |
25 |
DIST gps-gpl-2018-src.tar.gz 40541905 BLAKE2B abe38dd23d9afede27b4ec8294e3245c12d52d60491b6e7c1b2d120a6f1e5d808fdcfb648e72da31376e2de176f7a039c5493341ad295db33b6a1ce44bb64096 SHA512 da0eaa85eb753f215354c9765272d85378f36ebe207314bab9211642f9d9b505a3d05cdec9de6964ae9139c4f8942a29e06c72db32b2aeb053a694e9c982e470 |
26 |
DIST gtk+-3.14.15-src.tar.gz 32009863 BLAKE2B 93c6897c431fa8e1c19ea758378bc7e365d486d1decccefbba64876d8c51a488e6bcf932481daa11e7e43a960a328c3db746e41a845e574c6b6070ab71e23188 SHA512 add4607a1758319a938d2be0bbd0dd140c4099accffa9301e3049bc460bf94f395c5a092368214e8b28d53bc25335d1b8329b50c7eb80a1e9a65b2e154135b84 |
27 |
DIST libadalang-tools-gpl-2018-src.tar.gz 19938182 BLAKE2B 34104f3bc43c165a9b74ba8c0c03ee2f34686bcd06b5ced730f70f654d8b808e129a85566e081830b4f20304c793eefe0af81b56984cf06190302ad2f6a419be SHA512 a1176575944cd88b9da5f4e9f03caa1a4d09358df71e6a91300d0b35c2a843d0ea1a77fbd93e7b7f16cef1b978022ee20991f5c2ff74f7d05878c3de1220f2b5 |
28 |
|
29 |
diff --git a/dev-ada/gps/files/gps-2017-gentoo.patch b/dev-ada/gps/files/gps-2017-gentoo.patch |
30 |
deleted file mode 100644 |
31 |
index 1af2488c932..00000000000 |
32 |
--- a/dev-ada/gps/files/gps-2017-gentoo.patch |
33 |
+++ /dev/null |
34 |
@@ -1,339 +0,0 @@ |
35 |
---- a/aclocal.m4 2017-05-13 21:59:20.129039064 +0200 |
36 |
-+++ b/aclocal.m4 2017-05-13 22:02:12.637234659 +0200 |
37 |
-@@ -37,7 +37,7 @@ |
38 |
- HAVE_GNAT_PROJECT_$1=yes |
39 |
- else |
40 |
- # Try with "gnatls", in case gprls was not available |
41 |
-- if AC_TRY_COMMAND([gnat ls -Pconftest.gpr system.ads > /dev/null 2>conftest.out]) |
42 |
-+ if AC_TRY_COMMAND([@GNAT@ ls -Pconftest.gpr system.ads > /dev/null 2>conftest.out]) |
43 |
- then |
44 |
- HAVE_GNAT_PROJECT_$1=yes |
45 |
- else |
46 |
-@@ -156,7 +156,7 @@ |
47 |
- |
48 |
- AC_DEFUN(AM_PATH_GNAT, |
49 |
- [ |
50 |
-- AC_PATH_PROG(GNATMAKE, gnatmake, no) |
51 |
-+ AC_PATH_PROG(GNATMAKE, @GNATMAKE@, no) |
52 |
- |
53 |
- if test x$GNATMAKE = xno ; then |
54 |
- AC_MSG_ERROR(I could not find gnatmake. See the file 'INSTALL' for more details.) |
55 |
-@@ -279,7 +279,7 @@ |
56 |
- AC_MSG_RESULT($GTK_PREFIX $GLIB_PREFIX $ATK_PREFIX $PANGO_PREFIX $CAIRO_PREFIX) |
57 |
- fi |
58 |
- |
59 |
-- AC_PATH_PROG(GNATDRV, gnat, no) |
60 |
-+ AC_PATH_PROG(GNATDRV, @GNAT@, no) |
61 |
- min_gtk_version=ifelse([$1], ,2.0.0,$1) |
62 |
- AC_MSG_CHECKING(for GtkAda - version >= $min_gtk_version) |
63 |
- GTKADA_PRJ=`$GNATDRV ls -vP1 -Pgtkada 2>&1 | grep gtkada.gpr | grep Parsing | cut -d'"' -f2 | head -1` |
64 |
---- a/templates_parser/templates_parser.gpr 2017-05-18 21:34:42.892039427 +0200 |
65 |
-+++ b/templates_parser/templates_parser.gpr 2017-05-18 21:35:16.661512990 +0200 |
66 |
-@@ -55,7 +55,7 @@ |
67 |
- |
68 |
- end Naming; |
69 |
- |
70 |
-- Common_Options := ("-gnat05"); |
71 |
-+ Common_Options := ("-gnat05", "-fPIC"); |
72 |
- -- Common options used for the Debug and Release modes |
73 |
- |
74 |
- Debug_Options := |
75 |
---- a/shared.gpr.in 2017-05-18 21:35:56.475892075 +0200 |
76 |
-+++ b/shared.gpr.in 2017-05-18 21:36:24.972447550 +0200 |
77 |
-@@ -24,7 +24,7 @@ |
78 |
- end IDE; |
79 |
- |
80 |
- package Compiler is |
81 |
-- Common := ("-g", "-gnat12"); |
82 |
-+ Common := ("-g", "-gnat12", "-fPIC"); |
83 |
- Optimize := (); |
84 |
- |
85 |
- case OS is |
86 |
-@@ -83,6 +83,7 @@ |
87 |
- when "false" => |
88 |
- null; |
89 |
- end case; |
90 |
-+ for Driver use External ("CC", "gcc"); |
91 |
- end Linker; |
92 |
- |
93 |
- end Shared; |
94 |
---- a/common/common_with_xmlada.gpr.in 2017-05-18 21:37:25.302506085 +0200 |
95 |
-+++ b/common/common_with_xmlada.gpr.in 2017-05-18 21:37:58.472988222 +0200 |
96 |
-@@ -13,7 +13,7 @@ |
97 |
- for Switches ("Ada") use Shared.Compiler'Switches ("Ada"); |
98 |
- for Switches ("C") use Shared.Compiler'Switches ("C"); |
99 |
- for Switches ("test_htables.adb") use ("-g", "-O2", "-gnatwue"); |
100 |
-- for Switches ("s-memory.adb") use ("-g", "-O2", "-gnatpg"); |
101 |
-+ for Switches ("s-memory.adb") use ("-g", "-O2", "-gnatpg", "-fPIC"); |
102 |
- |
103 |
- No_Checks := ("-g", "-O2", "-gnat2012", "-gnatpn"); |
104 |
- |
105 |
---- a/common/common_no_xmlada.gpr.in 2017-05-18 21:37:31.406410812 +0200 |
106 |
-+++ b/common/common_no_xmlada.gpr.in 2017-05-18 21:38:14.796733359 +0200 |
107 |
-@@ -12,7 +12,7 @@ |
108 |
- for Switches ("Ada") use Shared.Compiler'Switches ("Ada"); |
109 |
- for Switches ("C") use Shared.Compiler'Switches ("C"); |
110 |
- for Switches ("test_htables.adb") use ("-g", "-O2", "-gnatwue"); |
111 |
-- for Switches ("s-memory.adb") use ("-g", "-O2", "-gnatpg"); |
112 |
-+ for Switches ("s-memory.adb") use ("-g", "-O2", "-gnatpg", "-fPIC"); |
113 |
- |
114 |
- No_Checks := ("-g", "-O2", "-gnat2012", "-gnatpn"); |
115 |
- |
116 |
---- a/widgets/widgets.gpr 2017-05-18 22:26:05.117847006 +0200 |
117 |
-+++ b/widgets/widgets.gpr 2017-05-18 22:21:01.646368091 +0200 |
118 |
-@@ -12,6 +12,7 @@ |
119 |
- package Compiler extends Shared.Compiler is |
120 |
- for Switches ("C") use |
121 |
- Shared.Compiler'Switches ("C") & GnatColl_Gtk.Gtk_Include; |
122 |
-+ for Driver ("C") use External ("CC", "gcc"); |
123 |
- end Compiler; |
124 |
- |
125 |
- package IDE renames Shared.IDE; |
126 |
---- a/cli/Makefile 2017-05-19 08:07:44.591042479 +0200 |
127 |
-+++ b/cli/Makefile 2017-05-19 08:08:50.086991123 +0200 |
128 |
-@@ -1,8 +1,9 @@ |
129 |
- GPRBUILD=gprbuild |
130 |
- GPRCLEAN=gprclean |
131 |
-+GPRBUILD_FLAGS=0 |
132 |
- |
133 |
- all default: |
134 |
-- $(GPRBUILD) -p -Pcli |
135 |
-+ $(GPRBUILD) $(GPRBUILD_FLAGS) -p -Pcli |
136 |
- |
137 |
- clean: |
138 |
- $(GPRCLEAN) -q -r -Pcli |
139 |
---- a/gps/gps.gpr 2017-05-19 09:24:19.438123599 +0200 |
140 |
-+++ b/gps/gps.gpr 2017-05-19 09:24:58.639492518 +0200 |
141 |
-@@ -75,7 +75,7 @@ |
142 |
- end case; |
143 |
- for Switches ("Ada") use Linker'Switches ("Ada") |
144 |
- & Shared.Linker'Switches ("Ada"); |
145 |
-- |
146 |
-+ for Driver use External ("CC", "gcc"); |
147 |
- -- for Switches ("Ada") use ("-lgmem"); |
148 |
- -- for Switches ("Ada") use ("-pg"); |
149 |
- end Linker; |
150 |
---- a/testsuite/Makefile 2017-05-19 11:08:48.966913663 +0200 |
151 |
-+++ b/testsuite/Makefile 2017-05-19 11:06:17.245366714 +0200 |
152 |
-@@ -1,5 +1,6 @@ |
153 |
- GPRBUILD=gprbuild |
154 |
- GPRCLEAN=gprclean |
155 |
-+GPRBUILD_FLAGS= |
156 |
- |
157 |
- SYS := $(shell gcc -dumpmachine) |
158 |
- ifeq ($(OS),Windows_NT) |
159 |
-@@ -14,7 +14,7 @@ |
160 |
- endif |
161 |
- |
162 |
- all default: package |
163 |
-- $(GPRBUILD) -P testsuite_drivers.gpr -m -XOS=${OS} -j0 -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable |
164 |
-+ $(GPRBUILD) $(GPRBUILD_FLAGS) -P testsuite_drivers.gpr -m -XOS=${OS} -j0 -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable |
165 |
- |
166 |
- package: |
167 |
- mkdir -p share/doc |
168 |
---- a/testsuite/testsuite_drivers.gpr 2017-05-19 11:21:20.645705481 +0200 |
169 |
-+++ b/testsuite/testsuite_drivers.gpr 2017-05-19 11:15:42.163206405 +0200 |
170 |
-@@ -10,6 +10,10 @@ |
171 |
- for Object_Dir use "obj"; |
172 |
- for Exec_Dir use "bin"; |
173 |
- |
174 |
-+ package Compiler is |
175 |
-+ for Switches ("Ada") use ("-fPIC"); |
176 |
-+ end Compiler; |
177 |
-+ |
178 |
- package Builder is |
179 |
- for Switches ("Ada") use ("-gnat12", "-ws", "-g", "-j0", "-m", "-gnaty"); |
180 |
- end Builder; |
181 |
---- a/Makefile.in 2017-05-19 11:49:47.172018411 +0200 |
182 |
-+++ b/Makefile.in 2017-05-19 11:50:24.653412280 +0200 |
183 |
-@@ -10,7 +10,7 @@ |
184 |
- INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
185 |
- INSTALL_DATA = @INSTALL_DATA@ |
186 |
- GNATCOLL_INSTALL = @GNATCOLL_INSTALL@ |
187 |
--prefix = @prefix@ |
188 |
-+prefix = $(DESTDIR)@prefix@ |
189 |
- bindir = $(prefix)/bin |
190 |
- sharedir = $(prefix)/share |
191 |
- examplesdir = $(prefix)/share/examples/gps |
192 |
---- a/docs/Makefile.in 2017-05-19 11:54:52.805076624 +0200 |
193 |
-+++ b/docs/Makefile.in 2017-05-19 11:55:24.332566945 +0200 |
194 |
-@@ -1,4 +1,4 @@ |
195 |
--prefix = @prefix@ |
196 |
-+prefix = $(DESTDIR)@prefix@ |
197 |
- docdir = $(prefix)/share/doc/gps |
198 |
- sharedir = $(prefix)/share/gps |
199 |
- |
200 |
---- a/share/support/core/gnat_help_menus.py 2017-11-23 21:41:11.897912345 +0100 |
201 |
-+++ b/share/support/core/gnat_help_menus.py 2017-11-23 21:44:53.019038030 +0100 |
202 |
-@@ -25,7 +25,7 @@ |
203 |
- # GPRbuild |
204 |
- 'gprbuild': {"GPR Tools User's Guide": |
205 |
- ('gprbuild/html/gprbuild_ug.html', 'GPR/')}, |
206 |
-- 'gnatls': { |
207 |
-+ '@GNATLS@': { |
208 |
- # Ada RMs |
209 |
- "Ada 2005 Reference Manual": ('gnat/html/arm05.html', 'Ada/'), |
210 |
- "Ada 2012 Reference Manual": ('gnat/html/arm12.html', 'Ada/'), |
211 |
-@@ -86,8 +86,8 @@ |
212 |
- |
213 |
- for exec_name in _DOC_ENTRIES.keys(): |
214 |
- executable = exec_name |
215 |
-- if exec_name == 'gnatls' and GPS.get_target(): |
216 |
-- executable = '{}-gnatls'.format(GPS.get_target()) |
217 |
-+ if exec_name == '@GNATLS@' and GPS.get_target(): |
218 |
-+ executable = '{}-@GNATLS@'.format(GPS.get_target()) |
219 |
- ex = os_utils.locate_exec_on_path(executable) |
220 |
- if ex: |
221 |
- for descr, tup in _DOC_ENTRIES[exec_name].iteritems(): |
222 |
---- a/share/support/core/toolchains.py 2017-11-23 21:46:11.969652447 +0100 |
223 |
-+++ b/share/support/core/toolchains.py 2017-11-23 21:47:21.723427305 +0100 |
224 |
-@@ -16,11 +16,11 @@ |
225 |
- nullified by using an empty value in the corresponding tag |
226 |
- --> |
227 |
- <toolchain_default> |
228 |
-- <gnat_driver>gnat</gnat_driver> |
229 |
-- <gnat_list>gnatls</gnat_list> |
230 |
-+ <gnat_driver>@GNAT@</gnat_driver> |
231 |
-+ <gnat_list>@GNATLS@</gnat_list> |
232 |
- <debugger>gdb</debugger> |
233 |
- <cpp_filt>c++filt</cpp_filt> |
234 |
-- <compiler lang="ada">gnatmake</compiler> |
235 |
-+ <compiler lang="ada">@GNATMAKE@</compiler> |
236 |
- <compiler lang="c">gcc</compiler> |
237 |
- <compiler lang="c++">g++</compiler> |
238 |
- <compiler lang="asm">gcc</compiler> |
239 |
---- a/share/support/core/projects.py 2017-11-23 21:49:13.477462632 +0100 |
240 |
-+++ b/share/support/core/projects.py 2017-11-23 21:51:53.774640693 +0100 |
241 |
-@@ -143,7 +143,7 @@ |
242 |
- <string /> |
243 |
- </index> |
244 |
- <specialized_index value="Ada"> |
245 |
-- <choice default="true" >gnatmake</choice> |
246 |
-+ <choice default="true" >@GNATMAKE@</choice> |
247 |
- </specialized_index> |
248 |
- </project_attribute> |
249 |
- |
250 |
-@@ -163,7 +163,7 @@ |
251 |
- description="The gnatls command used to find where the Ada run time files are installed (including optional arguments, e.g. gnatls --RTS=sjlj)." |
252 |
- hide_in="all" |
253 |
- label="Gnatls"> |
254 |
-- <choice default="true" >gnatls</choice> |
255 |
-+ <choice default="true" >@GNATLS@</choice> |
256 |
- <string /> |
257 |
- </project_attribute> |
258 |
- |
259 |
-@@ -175,7 +175,7 @@ |
260 |
- description="The gnat driver used to run the various commands associated with the GNAT toolchain." |
261 |
- hide_in="all" |
262 |
- label="Gnat"> |
263 |
-- <choice default="true" >gnat</choice> |
264 |
-+ <choice default="true" >@GNAT@</choice> |
265 |
- <string /> |
266 |
- </project_attribute> |
267 |
- |
268 |
---- a/cli/src/gps-cli_utils.adb 2017-11-23 22:00:22.716652753 +0100 |
269 |
-+++ b/cli/src/gps-cli_utils.adb 2017-11-23 22:01:19.885640611 +0100 |
270 |
-@@ -166,7 +166,7 @@ |
271 |
- |
272 |
- -- Set GNAT version |
273 |
- Kernel.Registry.Environment.Set_Path_From_Gnatls |
274 |
-- ("gnatls", GNAT_Version); |
275 |
-+ ("@GNATLS@", GNAT_Version); |
276 |
- end Create_Kernel_Context; |
277 |
- |
278 |
- ---------------------------- |
279 |
---- a/toolchains_editor/core/src/toolchains.adb 2017-11-23 22:02:52.819994229 +0100 |
280 |
-+++ b/toolchains_editor/core/src/toolchains.adb 2017-11-23 22:07:20.326248295 +0100 |
281 |
-@@ -309,12 +309,13 @@ |
282 |
- else |
283 |
- Set_Command |
284 |
- (Tc, GNAT_Driver, |
285 |
-- To_String (Full_Path) & "gnat", |
286 |
-+ To_String (Full_Path) & "@GNAT@", |
287 |
- From_Default, |
288 |
- Is_Default_Path); |
289 |
- Set_Command |
290 |
- (Tc, GNAT_List, |
291 |
-- To_String (Full_Path) & "gnatls", |
292 |
-+ To_String (Full_Path) & |
293 |
-+ "@GNATLS@", |
294 |
- From_Default, |
295 |
- Is_Default_Path); |
296 |
- Set_Command |
297 |
-@@ -728,10 +728,10 @@ |
298 |
- begin |
299 |
- case Name is |
300 |
- when GNAT_List => |
301 |
-- return "gnatls"; |
302 |
-+ return "@GNATLS@"; |
303 |
- |
304 |
- when GNAT_Driver => |
305 |
-- return "gnat"; |
306 |
-+ return "@GNAT@"; |
307 |
- |
308 |
- when Debugger => |
309 |
- return "gdb"; |
310 |
-@@ -2000,15 +2000,18 @@ |
311 |
- Manager => Toolchain_Manager (Manager), |
312 |
- Refs => 0); |
313 |
- |
314 |
-- Set_Command (Native_Toolchain, GNAT_Driver, "gnat", From_Default, True); |
315 |
-- Set_Command (Native_Toolchain, GNAT_List, "gnatls", From_Default, True); |
316 |
-+ Set_Command (Native_Toolchain, GNAT_Driver, |
317 |
-+ "@GNAT@", From_Default, True); |
318 |
-+ Set_Command (Native_Toolchain, GNAT_List, |
319 |
-+ "@GNATLS@", From_Default, True); |
320 |
- Set_Command (Native_Toolchain, Debugger, "gdb", From_Default, True); |
321 |
- Set_Command (Native_Toolchain, CPP_Filt, "c++filt", From_Default, True); |
322 |
- |
323 |
- Compute_Predefined_Paths (Native_Toolchain); |
324 |
- |
325 |
- if Get_Compiler (Native_Toolchain, "Ada") = No_Compiler then |
326 |
-- Add_Compiler (Native_Toolchain, "Ada", "gnatmake", From_Default); |
327 |
-+ Add_Compiler (Native_Toolchain, "Ada", |
328 |
-+ "@GNATMAKE@", From_Default); |
329 |
- end if; |
330 |
- |
331 |
- if Get_Compiler (Native_Toolchain, "C") = No_Compiler then |
332 |
---- a/gps/Makefile 2017-12-10 20:29:18.267622400 +0100 |
333 |
-+++ b/gps/Makefile 2017-12-10 20:29:34.564312700 +0100 |
334 |
-@@ -45,7 +45,8 @@ |
335 |
- for f in ../kernel/generated/*; do cat $$f | tr -d '\015' > $$f-aux; mv -f $$f-aux $$f; done |
336 |
- endif |
337 |
- $(GPRBUILD) $(GPRBUILD_FLAGS) -m -p -ws -XTP_TASKING=No_Tasking \ |
338 |
-- $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs` |
339 |
-+ $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs` \ |
340 |
-+ -cargs:Ada $(ADAFLAGS) -cargs:C ${CFLAGS} |
341 |
- |
342 |
- resources: |
343 |
- ifeq ($(OS),Windows_NT) |
344 |
---- a/common/common_no_xmlada.gpr.in 2017-12-10 20:48:13.986166250 +0100 |
345 |
-+++ b/common/common_no_xmlada.gpr.in 2017-12-10 20:48:29.654872055 +0100 |
346 |
-@@ -22,6 +22,7 @@ |
347 |
- for Switches ("dynamic_arrays.adb") use No_Checks; |
348 |
- when "Debug" => |
349 |
- end case; |
350 |
-+ for Driver ("C") use External ("CC", "gcc"); |
351 |
- end Compiler; |
352 |
- |
353 |
- package Naming is |
354 |
---- a/common/common_with_xmlada.gpr.in 2017-12-10 20:48:37.352727540 +0100 |
355 |
-+++ b/common/common_with_xmlada.gpr.in 2017-12-10 20:48:50.423482155 +0100 |
356 |
-@@ -23,6 +23,7 @@ |
357 |
- for Switches ("dynamic_arrays.adb") use No_Checks; |
358 |
- when "Debug" => |
359 |
- end case; |
360 |
-+ for Driver ("C") use External ("CC", "gcc"); |
361 |
- end Compiler; |
362 |
- |
363 |
- package Binder is |
364 |
---- a/shared.gpr.in 2017-12-10 20:52:51.117967249 +0100 |
365 |
-+++ b/shared.gpr.in 2017-12-10 20:53:15.627507886 +0100 |
366 |
-@@ -56,6 +56,7 @@ |
367 |
- ); |
368 |
- for Switches ("C") use Optimize & ("-g", "-O2"); |
369 |
- end case; |
370 |
-+ for Driver ("C") use External ("CC", "gcc"); |
371 |
- end Compiler; |
372 |
- |
373 |
- package Binder is |
374 |
|
375 |
diff --git a/dev-ada/gps/gps-2017.ebuild b/dev-ada/gps/gps-2017.ebuild |
376 |
deleted file mode 100644 |
377 |
index 0cc43ab4908..00000000000 |
378 |
--- a/dev-ada/gps/gps-2017.ebuild |
379 |
+++ /dev/null |
380 |
@@ -1,87 +0,0 @@ |
381 |
-# Copyright 1999-2018 Gentoo Authors |
382 |
-# Distributed under the terms of the GNU General Public License v2 |
383 |
- |
384 |
-EAPI=6 |
385 |
-PYTHON_COMPAT=( python2_7 ) |
386 |
-inherit python-single-r1 autotools desktop |
387 |
- |
388 |
-MYP=${PN}-gpl-${PV}-src |
389 |
- |
390 |
-DESCRIPTION="The GNAT Programming Studio" |
391 |
-HOMEPAGE="http://libre.adacore.com/tools/gps/" |
392 |
-SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed03b |
393 |
- -> ${MYP}.tar.gz |
394 |
- doc? ( http://mirrors.cdn.adacore.com/art/591c6d80c7a447af2deed1d7 |
395 |
- -> gnat-gpl-2017-x86_64-linux-bin.tar.gz )" |
396 |
- |
397 |
-LICENSE="GPL-3" |
398 |
-SLOT="0" |
399 |
-KEYWORDS="amd64 x86" |
400 |
-IUSE="doc gnat_2016 +gnat_2017 gnat_2018" |
401 |
- |
402 |
-RDEPEND="${PYTHON_DEPS} |
403 |
- dev-ada/gnatcoll[gtk,iconv,pygobject,sqlite,static-libs,tools] |
404 |
- ~dev-ada/gtkada-2017 |
405 |
- dev-ada/libadalang |
406 |
- dev-libs/gobject-introspection |
407 |
- dev-libs/libffi |
408 |
- sys-devel/clang:= |
409 |
- x11-themes/adwaita-icon-theme |
410 |
- x11-themes/hicolor-icon-theme |
411 |
- dev-python/pep8[${PYTHON_USEDEP}] |
412 |
- dev-python/jedi[${PYTHON_USEDEP}]" |
413 |
- |
414 |
-DEPEND="${RDEPEND}" |
415 |
- |
416 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
417 |
- ^^ ( gnat_2016 gnat_2017 ) !gnat_2018" |
418 |
- |
419 |
-RESTRICT="test" |
420 |
- |
421 |
-S="${WORKDIR}"/${MYP} |
422 |
- |
423 |
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
424 |
- |
425 |
-src_prepare() { |
426 |
- default |
427 |
- if use gnat_2016; then |
428 |
- GCC_PV=4.9.4 |
429 |
- else |
430 |
- GCC_PV=6.3.0 |
431 |
- fi |
432 |
- mv configure.{in,ac} || die |
433 |
- sed -i \ |
434 |
- -e "s:@GNATMAKE@:${CHOST}-gnatmake-${GCC_PV}:g" \ |
435 |
- -e "s:@GNAT@:${CHOST}-gnat-${GCC_PV}:g" \ |
436 |
- -e "s:@GNATLS@:${CHOST}-gnatls-${GCC_PV}:g" \ |
437 |
- aclocal.m4 \ |
438 |
- share/support/core/gnat_help_menus.py \ |
439 |
- share/support/core/toolchains.py \ |
440 |
- share/support/core/projects.py \ |
441 |
- cli/src/gps-cli_utils.adb \ |
442 |
- toolchains_editor/core/src/toolchains.adb \ |
443 |
- || die |
444 |
- eautoreconf |
445 |
-} |
446 |
- |
447 |
-src_configure() { |
448 |
- econf \ |
449 |
- --with-clang=$(llvm-config --libdir) |
450 |
-} |
451 |
- |
452 |
-src_compile() { |
453 |
- ADAFLAGS+=" -fno-strict-aliasing" |
454 |
- emake GPRBUILD_FLAGS="-v ${MAKEOPTS} \ |
455 |
- -XLIBRARY_TYPE=relocatable \ |
456 |
- -XGPR_BUILD=relocatable \ |
457 |
- -XXMLADA_BUILD=relocatable" |
458 |
-} |
459 |
- |
460 |
-src_install() { |
461 |
- default |
462 |
- if use doc; then |
463 |
- insinto /usr/share/doc |
464 |
- doins -r "${WORKDIR}"/gnat-gpl-2017-x86_64-linux-bin/share/doc/gnat |
465 |
- fi |
466 |
- make_desktop_entry "${PN}" "GPS" "${EPREFIX}/usr/share/gps/icons/hicolor/32x32/apps/gps_32.png" "Development;IDE;" |
467 |
-} |