1 |
commit: 2847613455c888834886aeaed6ec17cd866316f8 |
2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jun 30 14:32:30 2017 +0000 |
4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 30 14:32:30 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28476134 |
7 |
|
8 |
dev-ada/gtkada: Add version 2017. Purge 17 and 9999 versions |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
11 |
|
12 |
dev-ada/gtkada/Manifest | 2 +- |
13 |
dev-ada/gtkada/files/gtkada-17.0-gentoo.patch | 85 ---------------------- |
14 |
dev-ada/gtkada/files/gtkada-2016-gentoo.patch | 9 --- |
15 |
...-9999-gentoo.patch => gtkada-2017-gentoo.patch} | 25 ++----- |
16 |
dev-ada/gtkada/gtkada-2016.ebuild | 32 ++++---- |
17 |
.../{gtkada-17.0.ebuild => gtkada-2017.ebuild} | 37 +++++----- |
18 |
dev-ada/gtkada/gtkada-9999.ebuild | 64 ---------------- |
19 |
dev-ada/gtkada/metadata.xml | 2 + |
20 |
8 files changed, 42 insertions(+), 214 deletions(-) |
21 |
|
22 |
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest |
23 |
index afbfcbfb186..f5ce2c9907a 100644 |
24 |
--- a/dev-ada/gtkada/Manifest |
25 |
+++ b/dev-ada/gtkada/Manifest |
26 |
@@ -1,2 +1,2 @@ |
27 |
-DIST gtkada-17.0.tar.gz 5358097 SHA256 65298b7ce604963ab389d5577a2c71c0f0276b176d7387ac55195dc644b87449 SHA512 d2970d9cfb2c1a893e5fc146e41683583bcc70cfb744ba19e953fd00916488b39d96c59170c1d5272eb0b45deebcc906ec1be4a31d1141540a8feceb7b2cb034 WHIRLPOOL fd30280050ca42570509660c5afda2fbd3c463f016a0d8bee62f8d3e88e553600801fae00c97dd3a57ae0dc955fe1e3804250cdaa553a94d5316bb35b3f4cab8 |
28 |
DIST gtkada-gpl-2016-src.tgz 11944697 SHA256 263cc8323e726ae22946508792dd719ff266a9e847a4f7c95e27bd13d3fb4d8f SHA512 90912e15d9e22574a3d86e8bd052d4ce0a0d8018386f699dc1ce3c345978e9b3ddc7bdd3e4247a264496c5da7cff6ae68589a02f43193fc957c418e2a8ef63c7 WHIRLPOOL fc12f151c65ccef5d23b520cfc0625606ece06e56ed2d5b28e39bd65e51850d9b5c40e7382207f1d9186f93ce9232f6024bec977af6973163eb6603178dc1a30 |
29 |
+DIST gtkada-gpl-2017-src.tgz 11952333 SHA256 545a125dd41cce2a5e4aeeefbd9538e9e8c7aecbe39c106d27078eb5a649b5f0 SHA512 f5bbb9ebdd966e70b3edcaaf359cb9e75edba3c3f4f8febfa7de9f634f8e96cd0dd1482fb16ad852b1c9f9b0e2c16eb3a437120d37f0638d90af666620f09f3f WHIRLPOOL 69a05d9e8cd956681951a7adeb5eedd5b13f8d403f5fd0f2473e1f2f4579676314cfa7aac81631fe0e8f68362cdb09dde685b8b2bf30801c38f82ae7ba484b88 |
30 |
|
31 |
diff --git a/dev-ada/gtkada/files/gtkada-17.0-gentoo.patch b/dev-ada/gtkada/files/gtkada-17.0-gentoo.patch |
32 |
deleted file mode 100644 |
33 |
index fbc2cefac53..00000000000 |
34 |
--- a/dev-ada/gtkada/files/gtkada-17.0-gentoo.patch |
35 |
+++ /dev/null |
36 |
@@ -1,85 +0,0 @@ |
37 |
---- gtkada-gpl-2015-src/shared.gpr.in.old 2017-01-05 23:28:35.838073270 +0100 |
38 |
-+++ gtkada-gpl-2015-src/shared.gpr.in 2017-01-05 23:30:17.752255709 +0100 |
39 |
-@@ -44,6 +44,8 @@ |
40 |
- for Switches ("C") use ("-O2"); |
41 |
- end case; |
42 |
- |
43 |
-+ for Driver ("C") use External ("CC", "gcc"); |
44 |
-+ for PIC_Option ("C") use ("-fPIC"); |
45 |
- for Switches ("C") use Compiler'Switches ("C") & Gtk_Include; |
46 |
- for Switches ("Objective-C") use Compiler'Switches ("Objective-C") & Gtk_Include; |
47 |
- end Compiler; |
48 |
---- gtkada-gpl-2016-src/Makefile.in.old 2017-01-21 22:42:18.319969095 +0100 |
49 |
-+++ gtkada-gpl-2016-src/Makefile.in 2017-01-21 22:42:33.989700236 +0100 |
50 |
-@@ -39,7 +39,7 @@ |
51 |
- prefix=@prefix@ |
52 |
- exec_prefix=@exec_prefix@ |
53 |
- libdir=@libdir@ |
54 |
--datadir=@datadir@ |
55 |
-+datadir=$(DESTDIR)@datadir@ |
56 |
- datarootdir=@datarootdir@ |
57 |
- exampledir=${datadir}/examples/gtkada/testgtk |
58 |
- |
59 |
-@@ -60,30 +60,33 @@ |
60 |
- LIBRARY_TYPE_FOR_TOOLS=static |
61 |
- endif |
62 |
- |
63 |
--all: tools tests |
64 |
-+all: tools |
65 |
- static: build_library_type/static |
66 |
- relocatable: build_library_type/relocatable |
67 |
- |
68 |
- tools: |
69 |
- @echo "====== Building tools =====" |
70 |
-- ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Psrc/tools/tools.gpr |
71 |
-+ ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \ |
72 |
-+ -Psrc/tools/tools.gpr -cargs:Ada $(ADAFLAGS) |
73 |
- |
74 |
- build_library_type/%: src/gtkada-intl.adb |
75 |
- @echo "====== Building $(@F) libraries =====" |
76 |
-- ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr |
77 |
-+ ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr \ |
78 |
-+ -cargs:Ada $(ADAFLAGS) -cargs:C $(CFLAGS) |
79 |
- ifeq (${HAVE_OPENGL}, True) |
80 |
- ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/opengl/gtkada_gl.gpr |
81 |
- endif |
82 |
- |
83 |
- src/gtkada-intl.adb: src/gtkada-intl.gpb Makefile |
84 |
-- gnatprep -DGETTEXT_INTL=$(GETTEXT_INTL) -DHAVE_GETTEXT=$(HAVE_GETTEXT) src/gtkada-intl.gpb $@ |
85 |
-+ $(GNATPREP) -DGETTEXT_INTL=$(GETTEXT_INTL) -DHAVE_GETTEXT=$(HAVE_GETTEXT) src/gtkada-intl.gpb $@ |
86 |
- |
87 |
- testgtk/opengl/view_gl.adb: testgtk/opengl/view_gl.gpb Makefile |
88 |
-- gnatprep -r -c -DHAVE_GL=${HAVE_OPENGL} -DWIN32=False testgtk/opengl/view_gl.gpb $@ |
89 |
-+ $(GNATPREP) -r -c -DHAVE_GL=${HAVE_OPENGL} -DWIN32=False testgtk/opengl/view_gl.gpb $@ |
90 |
- |
91 |
- tests: testgtk/opengl/view_gl.adb |
92 |
- @echo "====== Building tests =====" |
93 |
-- cd testgtk; ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Ptestgtk.gpr -aP ../src |
94 |
-+ cd testgtk; ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \ |
95 |
-+ -Ptestgtk.gpr -aP ../src -cargs:Ada $(ADAFLAGS) |
96 |
- |
97 |
- install/%: force |
98 |
- ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(@F) --build-name=$(@F) \ |
99 |
-@@ -96,7 +96,7 @@ |
100 |
- ifeq (${HAVE_OPENGL}, True) |
101 |
- ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(@F) --build-name=$(@F) \ |
102 |
- --sources-subdir=include/gtkada/gtkada_gl.$(@F) \ |
103 |
-- --lib-subdir=${libdir}/gtkada/gtkada_gl.$(@F) \ |
104 |
-+ --lib-subdir=lib/gtkada/gtkada_gl.$(@F) \ |
105 |
- -Psrc/opengl/gtkada_gl.gpr |
106 |
- endif |
107 |
- |
108 |
-@@ -118,12 +118,9 @@ |
109 |
- --project-subdir=lib/gnat gtkada |
110 |
- endif |
111 |
- |
112 |
--install: install-clean |
113 |
-+install: |
114 |
- ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \ |
115 |
- --mode=usage -Psrc/tools/tools.gpr |
116 |
-- cd testgtk; ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \ |
117 |
-- --mode=usage --exec-subdir=${DESTDIR}${exampledir} \ |
118 |
-- -Ptestgtk.gpr -aP ../src |
119 |
- |
120 |
- @echo '-----------------------------------------------------------------------' |
121 |
- @echo '-- GtkAda has now been installed. --' |
122 |
|
123 |
diff --git a/dev-ada/gtkada/files/gtkada-2016-gentoo.patch b/dev-ada/gtkada/files/gtkada-2016-gentoo.patch |
124 |
index a9550fe883f..808b07dfdfa 100644 |
125 |
--- a/dev-ada/gtkada/files/gtkada-2016-gentoo.patch |
126 |
+++ b/dev-ada/gtkada/files/gtkada-2016-gentoo.patch |
127 |
@@ -11,15 +11,6 @@ |
128 |
end Compiler; |
129 |
--- gtkada-gpl-2016-src/Makefile.in.old 2017-01-21 22:42:18.319969095 +0100 |
130 |
+++ gtkada-gpl-2016-src/Makefile.in 2017-01-21 22:42:33.989700236 +0100 |
131 |
-@@ -39,7 +39,7 @@ |
132 |
- prefix=@prefix@ |
133 |
- exec_prefix=@exec_prefix@ |
134 |
- libdir=@libdir@ |
135 |
--datadir=@datadir@ |
136 |
-+datadir=$(DESTDIR)@datadir@ |
137 |
- datarootdir=@datarootdir@ |
138 |
- exampledir=${datadir}/examples/gtkada/testgtk |
139 |
- |
140 |
@@ -60,30 +60,33 @@ |
141 |
LIBRARY_TYPE_FOR_TOOLS=static |
142 |
endif |
143 |
|
144 |
diff --git a/dev-ada/gtkada/files/gtkada-9999-gentoo.patch b/dev-ada/gtkada/files/gtkada-2017-gentoo.patch |
145 |
similarity index 81% |
146 |
rename from dev-ada/gtkada/files/gtkada-9999-gentoo.patch |
147 |
rename to dev-ada/gtkada/files/gtkada-2017-gentoo.patch |
148 |
index 8b0f82e9572..ec8ebdf8f60 100644 |
149 |
--- a/dev-ada/gtkada/files/gtkada-9999-gentoo.patch |
150 |
+++ b/dev-ada/gtkada/files/gtkada-2017-gentoo.patch |
151 |
@@ -4,22 +4,13 @@ |
152 |
for Switches ("C") use ("-O2"); |
153 |
end case; |
154 |
|
155 |
-+ for Driver ("C") use External ("CC", "gcc"); |
156 |
++ for Driver ("C") use External ("GCC", "gcc"); |
157 |
+ for PIC_Option ("C") use ("-fPIC"); |
158 |
for Switches ("C") use Compiler'Switches ("C") & Gtk_Include; |
159 |
for Switches ("Objective-C") use Compiler'Switches ("Objective-C") & Gtk_Include; |
160 |
end Compiler; |
161 |
--- gtkada-gpl-2016-src/Makefile.in.old 2017-01-21 22:42:18.319969095 +0100 |
162 |
+++ gtkada-gpl-2016-src/Makefile.in 2017-01-21 22:42:33.989700236 +0100 |
163 |
-@@ -39,7 +39,7 @@ |
164 |
- prefix=@prefix@ |
165 |
- exec_prefix=@exec_prefix@ |
166 |
- libdir=@libdir@ |
167 |
--datadir=@datadir@ |
168 |
-+datadir=$(DESTDIR)@datadir@ |
169 |
- datarootdir=@datarootdir@ |
170 |
- exampledir=${datadir}/examples/gtkada/testgtk |
171 |
- |
172 |
@@ -60,30 +60,33 @@ |
173 |
LIBRARY_TYPE_FOR_TOOLS=static |
174 |
endif |
175 |
@@ -32,13 +23,13 @@ |
176 |
tools: |
177 |
@echo "====== Building tools =====" |
178 |
- ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Psrc/tools/tools.gpr |
179 |
-+ ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \ |
180 |
++ ${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \ |
181 |
+ -Psrc/tools/tools.gpr -cargs:Ada $(ADAFLAGS) |
182 |
|
183 |
build_library_type/%: src/gtkada-intl.adb |
184 |
@echo "====== Building $(@F) libraries =====" |
185 |
- ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr |
186 |
-+ ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr \ |
187 |
++ ${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr \ |
188 |
+ -cargs:Ada $(ADAFLAGS) -cargs:C $(CFLAGS) |
189 |
ifeq (${HAVE_OPENGL}, True) |
190 |
${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/opengl/gtkada_gl.gpr |
191 |
@@ -55,17 +46,13 @@ |
192 |
tests: testgtk/opengl/view_gl.adb |
193 |
@echo "====== Building tests =====" |
194 |
- cd testgtk; ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Ptestgtk.gpr -aP ../src |
195 |
-+ cd testgtk; ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \ |
196 |
++ cd testgtk; ${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \ |
197 |
+ -Ptestgtk.gpr -aP ../src -cargs:Ada $(ADAFLAGS) |
198 |
|
199 |
install/%: force |
200 |
${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(@F) --build-name=$(@F) \ |
201 |
-@@ -118,12 +118,9 @@ |
202 |
- --project-subdir=lib/gnat gtkada |
203 |
- endif |
204 |
- |
205 |
--install: install-clean |
206 |
-+install: |
207 |
+@@ -121,9 +121,6 @@ |
208 |
+ install: install-clean |
209 |
${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \ |
210 |
--mode=usage -Psrc/tools/tools.gpr |
211 |
- cd testgtk; ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \ |
212 |
|
213 |
diff --git a/dev-ada/gtkada/gtkada-2016.ebuild b/dev-ada/gtkada/gtkada-2016.ebuild |
214 |
index 8f9e4adc92c..6ca105eb365 100644 |
215 |
--- a/dev-ada/gtkada/gtkada-2016.ebuild |
216 |
+++ b/dev-ada/gtkada/gtkada-2016.ebuild |
217 |
@@ -15,9 +15,10 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5739985fc7a447658e0affae |
218 |
LICENSE="GPL-3" |
219 |
SLOT="0" |
220 |
KEYWORDS="~amd64" |
221 |
-IUSE="+shared static" |
222 |
+IUSE="gnat_2016 gnat_2017 +shared static" |
223 |
|
224 |
-RDEPEND="dev-lang/gnat-gpl:* |
225 |
+RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) |
226 |
+ gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) |
227 |
dev-libs/atk |
228 |
dev-libs/glib:2 |
229 |
media-libs/fontconfig |
230 |
@@ -27,23 +28,12 @@ RDEPEND="dev-lang/gnat-gpl:* |
231 |
x11-libs/gtk+:3 |
232 |
x11-libs/pango" |
233 |
DEPEND="${RDEPEND} |
234 |
- dev-ada/gprbuild" |
235 |
+ dev-ada/gprbuild[gnat_2016=,gnat_2017=]" |
236 |
|
237 |
S="${WORKDIR}"/${MYP}-src |
238 |
|
239 |
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
240 |
|
241 |
-pkg_setup() { |
242 |
- GCC=${ADA:-$(tc-getCC)} |
243 |
- export GNATPREP="${GCC/gcc/gnatprep}" |
244 |
- if [[ -z "$(type ${GNATPREP} 2>/dev/null)" ]] ; then |
245 |
- eerror "You need a gcc compiler that provides the Ada Compiler:" |
246 |
- eerror "1) use gcc-config to select the right compiler or" |
247 |
- eerror "2) set ADA=gcc-4.9.4 in make.conf" |
248 |
- die "ada compiler not available" |
249 |
- fi |
250 |
-} |
251 |
- |
252 |
src_prepare() { |
253 |
default |
254 |
mv configure.{in,ac} |
255 |
@@ -51,19 +41,25 @@ src_prepare() { |
256 |
} |
257 |
|
258 |
src_configure() { |
259 |
+ if use gnat_2016; then |
260 |
+ GCC_PV=4.9.4 |
261 |
+ else |
262 |
+ GCC_PV=6.3.0 |
263 |
+ fi |
264 |
+ GCC=${CHOST}-gcc-${GCC_PV} |
265 |
econf \ |
266 |
+ --prefix="${D}/usr" \ |
267 |
$(use_enable static) \ |
268 |
$(use_enable shared) \ |
269 |
--without-GL |
270 |
} |
271 |
|
272 |
src_compile() { |
273 |
- GCC=${GCC} emake -j1 PROCESSORS=$(makeopts_jobs) |
274 |
+ GNATPREP=${CHOST}-gnatprep-${GCC_PV} |
275 |
+ GCC=${GCC} emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs) |
276 |
} |
277 |
|
278 |
src_install() { |
279 |
- emake -j1 DESTDIR="${D}" install |
280 |
+ emake -j1 install |
281 |
einstalldocs |
282 |
- mv "${D}"usr/share/doc/${PN}/* "${D}"usr/share/doc/${PF} || die |
283 |
- rmdir "${D}"usr/share/doc/${PN} |
284 |
} |
285 |
|
286 |
diff --git a/dev-ada/gtkada/gtkada-17.0.ebuild b/dev-ada/gtkada/gtkada-2017.ebuild |
287 |
similarity index 55% |
288 |
rename from dev-ada/gtkada/gtkada-17.0.ebuild |
289 |
rename to dev-ada/gtkada/gtkada-2017.ebuild |
290 |
index 850f5959937..659aacbe7b7 100644 |
291 |
--- a/dev-ada/gtkada/gtkada-17.0.ebuild |
292 |
+++ b/dev-ada/gtkada/gtkada-2017.ebuild |
293 |
@@ -5,16 +5,20 @@ EAPI=6 |
294 |
|
295 |
inherit autotools multiprocessing |
296 |
|
297 |
+MYP=${PN}-gpl-${PV} |
298 |
+ |
299 |
DESCRIPTION="A complete Ada graphical toolkit" |
300 |
HOMEPAGE="http://libre.adacore.com//tools/gtkada/" |
301 |
-SRC_URI="https://github.com/AdaCore/gtkada/archive/${P}.tar.gz" |
302 |
+SRC_URI="http://mirrors.cdn.adacore.com/art/591ae7a8c7a4473fcbb154c9 |
303 |
+ -> ${MYP}-src.tgz" |
304 |
|
305 |
LICENSE="GPL-3" |
306 |
SLOT="0" |
307 |
KEYWORDS="~amd64" |
308 |
-IUSE="+shared static" |
309 |
+IUSE="gnat_2016 gnat_2017 +shared static" |
310 |
|
311 |
-RDEPEND="dev-lang/gnat-gpl:* |
312 |
+RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) |
313 |
+ gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) |
314 |
dev-libs/atk |
315 |
dev-libs/glib:2 |
316 |
media-libs/fontconfig |
317 |
@@ -24,23 +28,12 @@ RDEPEND="dev-lang/gnat-gpl:* |
318 |
x11-libs/gtk+:3 |
319 |
x11-libs/pango" |
320 |
DEPEND="${RDEPEND} |
321 |
- dev-ada/gprbuild" |
322 |
+ dev-ada/gprbuild[gnat_2016=,gnat_2017=]" |
323 |
|
324 |
-S="${WORKDIR}"/${PN}-${P} |
325 |
+S="${WORKDIR}"/${MYP}-src |
326 |
|
327 |
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
328 |
|
329 |
-pkg_setup() { |
330 |
- GCC=${ADA:-$(tc-getCC)} |
331 |
- export GNATPREP="${GCC/gcc/gnatprep}" |
332 |
- if [[ -z "$(type ${GNATPREP} 2>/dev/null)" ]] ; then |
333 |
- eerror "You need a gcc compiler that provides the Ada Compiler:" |
334 |
- eerror "1) use gcc-config to select the right compiler or" |
335 |
- eerror "2) set ADA=gcc-4.9.4 in make.conf" |
336 |
- die "ada compiler not available" |
337 |
- fi |
338 |
-} |
339 |
- |
340 |
src_prepare() { |
341 |
default |
342 |
mv configure.{in,ac} |
343 |
@@ -48,17 +41,25 @@ src_prepare() { |
344 |
} |
345 |
|
346 |
src_configure() { |
347 |
+ if use gnat_2016; then |
348 |
+ GCC_PV=4.9.4 |
349 |
+ else |
350 |
+ GCC_PV=6.3.0 |
351 |
+ fi |
352 |
+ GCC=${CHOST}-gcc-${GCC_PV} |
353 |
econf \ |
354 |
+ --prefix="${D}/usr" \ |
355 |
$(use_enable static) \ |
356 |
$(use_enable shared) \ |
357 |
--without-GL |
358 |
} |
359 |
|
360 |
src_compile() { |
361 |
- GCC=${GCC} emake -j1 PROCESSORS=$(makeopts_jobs) |
362 |
+ GNATPREP=${CHOST}-gnatprep-${GCC_PV} |
363 |
+ GCC=${GCC} emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs) |
364 |
} |
365 |
|
366 |
src_install() { |
367 |
- emake -j1 DESTDIR="${D}" install |
368 |
+ emake -j1 install |
369 |
einstalldocs |
370 |
} |
371 |
|
372 |
diff --git a/dev-ada/gtkada/gtkada-9999.ebuild b/dev-ada/gtkada/gtkada-9999.ebuild |
373 |
deleted file mode 100644 |
374 |
index 9d4e1b093c5..00000000000 |
375 |
--- a/dev-ada/gtkada/gtkada-9999.ebuild |
376 |
+++ /dev/null |
377 |
@@ -1,64 +0,0 @@ |
378 |
-# Copyright 1999-2017 Gentoo Foundation |
379 |
-# Distributed under the terms of the GNU General Public License v2 |
380 |
- |
381 |
-EAPI=6 |
382 |
- |
383 |
-inherit autotools multiprocessing git-r3 |
384 |
- |
385 |
-DESCRIPTION="A complete Ada graphical toolkit" |
386 |
-HOMEPAGE="http://libre.adacore.com//tools/gtkada/" |
387 |
-SRC_URI="" |
388 |
- |
389 |
-LICENSE="GPL-3" |
390 |
-SLOT="0" |
391 |
-KEYWORDS="" |
392 |
-IUSE="+shared static" |
393 |
- |
394 |
-RDEPEND="dev-lang/gnat-gpl:* |
395 |
- dev-libs/atk |
396 |
- dev-libs/glib:2 |
397 |
- media-libs/fontconfig |
398 |
- media-libs/freetype |
399 |
- x11-libs/cairo |
400 |
- x11-libs/gdk-pixbuf:2 |
401 |
- x11-libs/gtk+:3 |
402 |
- x11-libs/pango" |
403 |
-DEPEND="${RDEPEND} |
404 |
- dev-ada/gprbuild" |
405 |
- |
406 |
-EGIT_REPO_URI="https://github.com/AdaCore/gtkada.git" |
407 |
- |
408 |
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
409 |
- |
410 |
-pkg_setup() { |
411 |
- GCC=${ADA:-$(tc-getCC)} |
412 |
- export GNATPREP="${GCC/gcc/gnatprep}" |
413 |
- if [[ -z "$(type ${GNATPREP} 2>/dev/null)" ]] ; then |
414 |
- eerror "You need a gcc compiler that provides the Ada Compiler:" |
415 |
- eerror "1) use gcc-config to select the right compiler or" |
416 |
- eerror "2) set ADA=gcc-4.9.4 in make.conf" |
417 |
- die "ada compiler not available" |
418 |
- fi |
419 |
-} |
420 |
- |
421 |
-src_prepare() { |
422 |
- default |
423 |
- mv configure.{in,ac} |
424 |
- eautoreconf |
425 |
-} |
426 |
- |
427 |
-src_configure() { |
428 |
- econf \ |
429 |
- $(use_enable static) \ |
430 |
- $(use_enable shared) \ |
431 |
- --without-GL |
432 |
-} |
433 |
- |
434 |
-src_compile() { |
435 |
- GCC=${GCC} emake -j1 PROCESSORS=$(makeopts_jobs) |
436 |
-} |
437 |
- |
438 |
-src_install() { |
439 |
- emake -j1 DESTDIR="${D}" install |
440 |
- einstalldocs |
441 |
-} |
442 |
|
443 |
diff --git a/dev-ada/gtkada/metadata.xml b/dev-ada/gtkada/metadata.xml |
444 |
index 520b5b59b81..ba0f05fc23e 100644 |
445 |
--- a/dev-ada/gtkada/metadata.xml |
446 |
+++ b/dev-ada/gtkada/metadata.xml |
447 |
@@ -6,6 +6,8 @@ |
448 |
<name>Tupone Alfredo</name> |
449 |
</maintainer> |
450 |
<use> |
451 |
+ <flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag> |
452 |
+ <flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag> |
453 |
<flag name="shared">Build gtkada as shared library</flag> |
454 |
<flag name="static">Build gtkada as static library</flag> |
455 |
</use> |