Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/vala/files/, dev-lang/vala/
Date: Mon, 11 Feb 2019 17:19:06
Message-Id: 1549905294.696f9e562286dd080ea0591ee4ae4d4aae2f4de0.leio@gentoo
1 commit: 696f9e562286dd080ea0591ee4ae4d4aae2f4de0
2 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 4 10:47:24 2019 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 11 17:14:54 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=696f9e56
7
8 dev-lang/vala: 0.36.17 → 0.40.12
9
10 Includes valadoc.
11
12 Package-Manager: Portage-2.3.53, Repoman-2.3.12
13 Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org>
14 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
15
16 dev-lang/vala/Manifest | 1 +
17 ...0.40-Allow-disabling-the-build-of-valadoc.patch | 184 ++++++++++++++++++
18 ...valadoc-doclets-data-parallel-installable.patch | 212 +++++++++++++++++++++
19 dev-lang/vala/metadata.xml | 11 +-
20 dev-lang/vala/vala-0.40.12.ebuild | 56 ++++++
21 5 files changed, 460 insertions(+), 4 deletions(-)
22
23 diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
24 index 5862496b973..8691b0b8736 100644
25 --- a/dev-lang/vala/Manifest
26 +++ b/dev-lang/vala/Manifest
27 @@ -2,3 +2,4 @@ DIST vala-0.32.1.tar.xz 2759528 BLAKE2B cce23844ee5769216ef5cccb20476f4bdd2cb809
28 DIST vala-0.34.16.tar.xz 2795676 BLAKE2B 64428099c209e13a6aad09233af650f412efa191ff4873fae1dbfb9bcc252e13d4e152733c9f199cd23323872fd912807a685980f651c1f784bfaffae7bf4162 SHA512 6411d55524a6c717c2eaf5cc1231ac931400e3f66d151a8b8856910258eb5bd7affe3a90946de34feb51aabfafce721b8d57f61e0475095b275d20b73cc4bbec
29 DIST vala-0.36.15.tar.xz 2880300 BLAKE2B ea83bde6396f3be1c96038d63ae30b18fa070a6f7a06b75569bfed9d7792c898201a1f24d000f5b6415bb890cf975758341a97f22db74da02fcbeb3f283e546f SHA512 1c8f888832b2dd4248737a5a27f00f42d8bab2fe0a0790a7df5c426f4e3e1d0919ed0f6f6fd905be758ed477ba840e18f608e67811389c811ba65710094abe61
30 DIST vala-0.36.17.tar.xz 2898524 BLAKE2B 4a5a373bacd4e4a392350c7819e0498054e38f50dce89658412d7aeb5642892ef9f32a7689ebd45f53c41f064e0b6d2f52fb441be67a1dd48e67311a1e764637 SHA512 93d4fa600cd0ef62b71ed056b837f2c0a42c3aba25b021b2bbd2045428550307727827b250dae546926ea3fe2e33a5ac80c9b24b5100f02550ec584dd5da5e92
31 +DIST vala-0.40.12.tar.xz 3390368 BLAKE2B b11eef3687b3c6cd5c7a3b0ffdaa29e20c0c00ea1cb457c6d7cc02f2fd0a842a27f65091b842846f606f80c62fc89cd2e5b620af635ebe0b9cd55d8c35251c47 SHA512 3bc28fe2ad7c05f4de00c593bde1def0c8d8e496fecd11009d6a4e987f4aeae0a31be995efdda2ba339b9aa540610c6f2f8f9295f1b0d4be6dd7ee841c08598d
32
33 diff --git a/dev-lang/vala/files/0.40-Allow-disabling-the-build-of-valadoc.patch b/dev-lang/vala/files/0.40-Allow-disabling-the-build-of-valadoc.patch
34 new file mode 100644
35 index 00000000000..55bcb7d63b0
36 --- /dev/null
37 +++ b/dev-lang/vala/files/0.40-Allow-disabling-the-build-of-valadoc.patch
38 @@ -0,0 +1,184 @@
39 +From 1dae711f17473e12c822a657ffca02abee27b3a2 Mon Sep 17 00:00:00 2001
40 +From: Rico Tzschichholz <ricotz@××××××.com>
41 +Date: Sun, 27 Aug 2017 16:03:03 +0200
42 +Subject: [PATCH] build: Allow disabling the build of valadoc
43 +
44 +Allow disabling build of valadoc with configure option --disable-valadoc
45 +
46 +Fixes https://gitlab.gnome.org/GNOME/vala/issues/596
47 +---
48 + Makefile.am | 10 +++++++++
49 + configure.ac | 59 ++++++++++++++++++++++++++-----------------------
50 + doc/Makefile.am | 17 +++++++++++++-
51 + 3 files changed, 57 insertions(+), 29 deletions(-)
52 +
53 +diff --git a/Makefile.am b/Makefile.am
54 +index 88bef90ed..e4d46741f 100644
55 +--- a/Makefile.am
56 ++++ b/Makefile.am
57 +@@ -13,9 +13,19 @@ SUBDIRS = \
58 + doc \
59 + gobject-introspection \
60 + vapigen \
61 ++ $(NULL)
62 ++
63 ++if ENABLE_VALADOC
64 ++SUBDIRS += \
65 + libvaladoc \
66 + valadoc \
67 + $(NULL)
68 ++endif
69 ++
70 ++DISTCHECK_CONFIGURE_FLAGS = \
71 ++ --enable-valadoc \
72 ++ --enable-unversioned \
73 ++ $(NULL)
74 +
75 + if ENABLE_UNVERSIONED
76 + aclocaldir = $(datadir)/aclocal
77 +diff --git a/configure.ac b/configure.ac
78 +index 88ca0f94b..9d1c97417 100644
79 +--- a/configure.ac
80 ++++ b/configure.ac
81 +@@ -119,35 +119,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
82 + AC_SUBST(GMODULE_CFLAGS)
83 + AC_SUBST(GMODULE_LIBS)
84 +
85 +-PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
86 +-AC_MSG_CHECKING([for CGRAPH])
87 +-cgraph_tmp_LIBADD="$LIBADD"
88 +-cgraph_tmp_CFLAGS="$CFLAGS"
89 +-LIBADD="$LIBADD $LIBGVC_LIBS"
90 +-CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
91 +-AC_RUN_IFELSE(
92 +- [AC_LANG_SOURCE([
93 +- #include <gvc.h>
94 +-
95 +- int main(void) {
96 +- #ifdef WITH_CGRAPH
97 +- return 0;
98 +- #else
99 +- return -1;
100 +- #endif
101 +- }
102 +- ])], [
103 +- AC_MSG_RESULT([yes])
104 +- VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
105 +- have_cgraph=yes
106 +- ], [
107 +- AC_MSG_RESULT([no])
108 +- have_cgraph=no
109 +- ]
110 +-)
111 +-LIBADD="$cgraph_tmp_LIBADD"
112 +-CFLAGS="$cgraph_tmp_CFLAGS"
113 ++AC_ARG_ENABLE(valadoc, AS_HELP_STRING([--disable-valadoc], [Disable valadoc]), enable_valadoc=$enableval, enable_valadoc=yes)
114 ++if test x$enable_valadoc = xyes; then
115 ++ PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
116 ++ AC_MSG_CHECKING([for CGRAPH])
117 ++ cgraph_tmp_LIBADD="$LIBADD"
118 ++ cgraph_tmp_CFLAGS="$CFLAGS"
119 ++ LIBADD="$LIBADD $LIBGVC_LIBS"
120 ++ CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
121 ++ AC_RUN_IFELSE(
122 ++ [AC_LANG_SOURCE([
123 ++ #include <gvc.h>
124 ++ int main(void) {
125 ++ #ifdef WITH_CGRAPH
126 ++ return 0;
127 ++ #else
128 ++ return -1;
129 ++ #endif
130 ++ }
131 ++ ])], [
132 ++ AC_MSG_RESULT([yes])
133 ++ VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
134 ++ have_cgraph=yes
135 ++ ], [
136 ++ AC_MSG_RESULT([no])
137 ++ have_cgraph=no
138 ++ ]
139 ++ )
140 ++ LIBADD="$cgraph_tmp_LIBADD"
141 ++ CFLAGS="$cgraph_tmp_CFLAGS"
142 ++fi
143 + AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes")
144 ++AM_CONDITIONAL(ENABLE_VALADOC, test x$enable_valadoc = xyes)
145 +
146 + AC_PATH_PROG([XSLTPROC], [xsltproc], :)
147 + AM_CONDITIONAL(HAVE_XSLTPROC, test "$XSLTPROC" != :)
148 +diff --git a/doc/Makefile.am b/doc/Makefile.am
149 +index 758ad733a..b79f229c4 100644
150 +--- a/doc/Makefile.am
151 ++++ b/doc/Makefile.am
152 +@@ -6,11 +6,16 @@ SUBDIRS = \
153 +
154 + dist_man_MANS = \
155 + valac.1 \
156 +- valadoc.1 \
157 + vala-gen-introspect.1 \
158 + vapigen.1 \
159 + $(NULL)
160 +
161 ++if ENABLE_VALADOC
162 ++dist_man_MANS += \
163 ++ valadoc.1 \
164 ++ $(NULL)
165 ++endif
166 ++
167 + EXTRA_DIST = \
168 + valac.h2m \
169 + valadoc.h2m \
170 +@@ -19,7 +24,11 @@ EXTRA_DIST = \
171 + $(NULL)
172 +
173 + if HAVE_HELP2MAN
174 ++if ENABLE_VALADOC
175 + manpages: valac.1 valadoc.1 vala-gen-introspect.1 vapigen.1
176 ++else
177 ++manpages: valac.1 vala-gen-introspect.1 vapigen.1
178 ++endif
179 + @rm $^
180 + $(MAKE) $(AM_MAKEFLAGS) $^
181 +
182 +@@ -28,11 +37,13 @@ valac.1:
183 + --include $(srcdir)/valac.h2m \
184 + --libtool --no-info \
185 + --output=$@
186 ++if ENABLE_VALADOC
187 + valadoc.1:
188 + $(HELP2MAN) $(top_builddir)/valadoc/valadoc \
189 + --include $(srcdir)/valadoc.h2m \
190 + --libtool --no-info \
191 + --output=$@
192 ++endif
193 + vala-gen-introspect.1:
194 + $(HELP2MAN) $(top_builddir)/gobject-introspection/gen-introspect \
195 + --include $(srcdir)/vala-gen-introspect.h2m \
196 +@@ -49,12 +60,15 @@ endif
197 + if ENABLE_UNVERSIONED
198 + install-data-hook:
199 + cd $(DESTDIR)$(man1dir) && $(LN_S) -f valac@PACKAGE_SUFFIX@.1 valac.1
200 ++if ENABLE_VALADOC
201 + cd $(DESTDIR)$(man1dir) && $(LN_S) -f valadoc@PACKAGE_SUFFIX@.1 valadoc.1
202 ++endif
203 + cd $(DESTDIR)$(man1dir) && $(LN_S) -f vala-gen-introspect@PACKAGE_SUFFIX@.1 vala-gen-introspect.1
204 + cd $(DESTDIR)$(man1dir) && $(LN_S) -f vapigen@PACKAGE_SUFFIX@.1 vapigen.1
205 + endif
206 +
207 +
208 ++if ENABLE_VALADOC
209 + COMMON_VALADOCFLAGS = \
210 + --force \
211 + --verbose \
212 +@@ -130,6 +144,7 @@ internal-apis/valadoc: $(valadoc_VALASOURCES) internal-apis/codegen
213 + @touch $@
214 +
215 + internal-api-docs: internal-apis/gee internal-apis/vala internal-apis/ccode internal-apis/codegen internal-apis/valadoc
216 ++endif
217 +
218 + clean-local:
219 + rm -rf $(builddir)/internal-apis
220 +--
221 +2.20.1
222 +
223
224 diff --git a/dev-lang/vala/files/0.40-valadoc-doclets-data-parallel-installable.patch b/dev-lang/vala/files/0.40-valadoc-doclets-data-parallel-installable.patch
225 new file mode 100644
226 index 00000000000..1c9b44677e1
227 --- /dev/null
228 +++ b/dev-lang/vala/files/0.40-valadoc-doclets-data-parallel-installable.patch
229 @@ -0,0 +1,212 @@
230 +From 3dc5768c045c400ff522b8a510b789001aa93df4 Mon Sep 17 00:00:00 2001
231 +From: Gilles Dartiguelongue <eva@g.o>
232 +Date: Fri, 4 Jan 2019 11:31:14 +0100
233 +Subject: [PATCH 2/2] Make valadoc doclets & data parallel installable
234 +
235 +---
236 + libvaladoc/Makefile.am | 12 ++++++++++--
237 + valadoc/Makefile.am | 7 ++++++-
238 + valadoc/doclets/devhelp/Makefile.am | 11 ++++++++---
239 + valadoc/doclets/gtkdoc/Makefile.am | 11 ++++++++---
240 + valadoc/doclets/html/Makefile.am | 11 ++++++++---
241 + valadoc/icons/Makefile.am | 4 ++++
242 + valadoc/tests/Makefile.am | 7 ++++++-
243 + 7 files changed, 50 insertions(+), 13 deletions(-)
244 +
245 +diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am
246 +index f3f790e76..86875631b 100644
247 +--- a/libvaladoc/Makefile.am
248 ++++ b/libvaladoc/Makefile.am
249 +@@ -3,8 +3,6 @@ include $(top_srcdir)/Makefile.common
250 + NULL =
251 +
252 + AM_CFLAGS = \
253 +- -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
254 +- -DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \
255 + -DPACKAGE_VERSION=\"$(VERSION)\" \
256 + $(COVERAGE_CFLAGS) \
257 + $(LIBGVC_CFLAGS) \
258 +@@ -16,6 +14,16 @@ AM_CFLAGS = \
259 + -I$(top_srcdir)/codegen \
260 + $(NULL)
261 +
262 ++if ENABLE_UNVERSIONED
263 ++AM_CFLAGS += \
264 ++ -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
265 ++ -DPACKAGE_DATADIR=\"$(libdir)/valadoc\"
266 ++else
267 ++AM_CFLAGS += \
268 ++ -DPACKAGE_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\" \
269 ++ -DPACKAGE_DATADIR=\"$(libdir)/valadoc@PACKAGE_SUFFIX@\"
270 ++endif
271 ++
272 + AM_VALAFLAGS = \
273 + $(NULL)
274 +
275 +diff --git a/valadoc/Makefile.am b/valadoc/Makefile.am
276 +index 33f3a9375..2f3dec848 100644
277 +--- a/valadoc/Makefile.am
278 ++++ b/valadoc/Makefile.am
279 +@@ -9,7 +9,6 @@ SUBDIRS = \
280 + $(NULL)
281 +
282 + AM_CFLAGS = \
283 +- -DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \
284 + -DPACKAGE_VERSION=\"$(VERSION)\" \
285 + -I$(top_srcdir)/libvaladoc/ \
286 + -I$(top_srcdir)/gee \
287 +@@ -22,6 +21,12 @@ AM_CFLAGS = \
288 + $(LIBGVC_CFLAGS) \
289 + $(NULL)
290 +
291 ++if ENABLE_UNVERSIONED
292 ++AM_CFLAGS += -DPACKAGE_DATADIR=\"$(libdir)/valadoc\"
293 ++else
294 ++AM_CFLAGS += -DPACKAGE_DATADIR=\"$(libdir)/valadoc@PACKAGE_SUFFIX@\"
295 ++endif
296 ++
297 + BUILT_SOURCES = valadoc.vala.stamp
298 +
299 + bin_PROGRAMS = valadoc
300 +diff --git a/valadoc/doclets/devhelp/Makefile.am b/valadoc/doclets/devhelp/Makefile.am
301 +index 5783c0b5a..afbb8f7f9 100644
302 +--- a/valadoc/doclets/devhelp/Makefile.am
303 ++++ b/valadoc/doclets/devhelp/Makefile.am
304 +@@ -3,7 +3,6 @@ include $(top_srcdir)/Makefile.common
305 + NULL =
306 +
307 + AM_CFLAGS = \
308 +- -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
309 + -I$(top_srcdir)/gee/ \
310 + -I$(top_srcdir)/vala/ \
311 + -I$(top_srcdir)/libvaladoc/ \
312 +@@ -12,12 +11,18 @@ AM_CFLAGS = \
313 + $(LIBGVC_CFLAGS) \
314 + $(NULL)
315 +
316 ++if ENABLE_UNVERSIONED
317 ++AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\"
318 ++docletdir = $(libdir)/valadoc/doclets/devhelp
319 ++else
320 ++AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\"
321 ++docletdir = $(libdir)/valadoc@PACKAGE_SUFFIX@/doclets/devhelp
322 ++endif
323 ++
324 + BUILT_SOURCES = libdoclet.vala.stamp
325 +
326 + doclet_LTLIBRARIES = libdoclet.la
327 +
328 +-docletdir = $(libdir)/valadoc/doclets/devhelp
329 +-
330 + libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined
331 +
332 + libdoclet_la_VALASOURCES = \
333 +diff --git a/valadoc/doclets/gtkdoc/Makefile.am b/valadoc/doclets/gtkdoc/Makefile.am
334 +index 763e46932..f689018ce 100644
335 +--- a/valadoc/doclets/gtkdoc/Makefile.am
336 ++++ b/valadoc/doclets/gtkdoc/Makefile.am
337 +@@ -3,7 +3,6 @@ include $(top_srcdir)/Makefile.common
338 + NULL =
339 +
340 + AM_CFLAGS = \
341 +- -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
342 + -I$(top_srcdir)/gee/ \
343 + -I$(top_srcdir)/vala/ \
344 + -I$(top_srcdir)/libvaladoc/ \
345 +@@ -12,12 +11,18 @@ AM_CFLAGS = \
346 + $(LIBGVC_CFLAGS) \
347 + $(NULL)
348 +
349 ++if ENABLE_UNVERSIONED
350 ++AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\"
351 ++docletdir = $(libdir)/valadoc/doclets/gtkdoc
352 ++else
353 ++AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\"
354 ++docletdir = $(libdir)/valadoc@PACKAGE_SUFFIX@/doclets/gtkdoc
355 ++endif
356 ++
357 + BUILT_SOURCES = libdoclet.vala.stamp
358 +
359 + doclet_LTLIBRARIES = libdoclet.la
360 +
361 +-docletdir = $(libdir)/valadoc/doclets/gtkdoc
362 +-
363 + libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined
364 +
365 + libdoclet_la_VALASOURCES = \
366 +diff --git a/valadoc/doclets/html/Makefile.am b/valadoc/doclets/html/Makefile.am
367 +index 885fbfbab..855184020 100644
368 +--- a/valadoc/doclets/html/Makefile.am
369 ++++ b/valadoc/doclets/html/Makefile.am
370 +@@ -3,7 +3,6 @@ include $(top_srcdir)/Makefile.common
371 + NULL =
372 +
373 + AM_CFLAGS = \
374 +- -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
375 + -I$(top_srcdir)/gee/ \
376 + -I$(top_srcdir)/vala/ \
377 + -I$(top_srcdir)/libvaladoc/ \
378 +@@ -12,12 +11,18 @@ AM_CFLAGS = \
379 + $(LIBGVC_CFLAGS) \
380 + $(NULL)
381 +
382 ++if ENABLE_UNVERSIONED
383 ++AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\"
384 ++docletdir = $(libdir)/valadoc/doclets/html
385 ++else
386 ++AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\"
387 ++docletdir = $(libdir)/valadoc@PACKAGE_SUFFIX@/doclets/html
388 ++endif
389 ++
390 + BUILT_SOURCES = libdoclet.vala.stamp
391 +
392 + doclet_LTLIBRARIES = libdoclet.la
393 +
394 +-docletdir = $(libdir)/valadoc/doclets/html
395 +-
396 + libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined
397 +
398 + libdoclet_la_VALASOURCES = \
399 +diff --git a/valadoc/icons/Makefile.am b/valadoc/icons/Makefile.am
400 +index 454bdba7c..668956f3b 100644
401 +--- a/valadoc/icons/Makefile.am
402 ++++ b/valadoc/icons/Makefile.am
403 +@@ -1,6 +1,10 @@
404 + NULL =
405 +
406 ++if ENABLE_UNVERSIONED
407 + iconsdir = $(datadir)/valadoc/icons
408 ++else
409 ++iconsdir = $(datadir)/valadoc@PACKAGE_SUFFIX@/icons
410 ++endif
411 +
412 + dist_icons_DATA = \
413 + abstractclass.png \
414 +diff --git a/valadoc/tests/Makefile.am b/valadoc/tests/Makefile.am
415 +index e40cc1ca3..2bca58128 100644
416 +--- a/valadoc/tests/Makefile.am
417 ++++ b/valadoc/tests/Makefile.am
418 +@@ -22,7 +22,6 @@ check-TESTS: $(TESTS)
419 + G_DEBUG=fatal_warnings $(builddir)/driver
420 +
421 + AM_CFLAGS = \
422 +- -DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \
423 + -DPACKAGE_VERSION=\"$(VERSION)\" \
424 + -DTOP_SRC_DIR=\"$(abs_top_srcdir)\" \
425 + -I$(top_srcdir)/libvaladoc/ \
426 +@@ -36,6 +35,12 @@ AM_CFLAGS = \
427 + $(LIBGVC_CFLAGS) \
428 + $(NULL)
429 +
430 ++if ENABLE_UNVERSIONED
431 ++AM_CFLAGS += -DPACKAGE_DATADIR=\"$(libdir)/valadoc\"
432 ++else
433 ++AM_CFLAGS += -DPACKAGE_DATADIR=\"$(libdir)/valadoc@PACKAGE_SUFFIX@\"
434 ++endif
435 ++
436 + BUILT_SOURCES = driver.vala.stamp
437 +
438 + check_PROGRAMS = driver
439 +--
440 +2.20.1
441 +
442
443 diff --git a/dev-lang/vala/metadata.xml b/dev-lang/vala/metadata.xml
444 index 5f429420cb7..a6cf4ba175a 100644
445 --- a/dev-lang/vala/metadata.xml
446 +++ b/dev-lang/vala/metadata.xml
447 @@ -1,8 +1,11 @@
448 <?xml version="1.0" encoding="UTF-8"?>
449 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
450 <pkgmetadata>
451 - <maintainer type="project">
452 - <email>gnome@g.o</email>
453 - <name>Gentoo GNOME Desktop</name>
454 - </maintainer>
455 + <maintainer type="project">
456 + <email>gnome@g.o</email>
457 + <name>Gentoo GNOME Desktop</name>
458 + </maintainer>
459 + <use>
460 + <flag name="valadoc">Installs valadoc documentation generation tool</flag>
461 + </use>
462 </pkgmetadata>
463
464 diff --git a/dev-lang/vala/vala-0.40.12.ebuild b/dev-lang/vala/vala-0.40.12.ebuild
465 new file mode 100644
466 index 00000000000..bebbf410293
467 --- /dev/null
468 +++ b/dev-lang/vala/vala-0.40.12.ebuild
469 @@ -0,0 +1,56 @@
470 +# Copyright 1999-2019 Gentoo Authors
471 +# Distributed under the terms of the GNU General Public License v2
472 +
473 +EAPI=6
474 +GNOME2_EAUTORECONF="yes"
475 +
476 +inherit gnome2
477 +
478 +DESCRIPTION="Compiler for the GObject type system"
479 +HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
480 +
481 +LICENSE="LGPL-2.1"
482 +SLOT="0.40"
483 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
484 +IUSE="test valadoc"
485 +
486 +RDEPEND="
487 + >=dev-libs/glib-2.40.0:2
488 + >=dev-libs/vala-common-${PV}
489 + valadoc? ( >=media-gfx/graphviz-2.16 )
490 +"
491 +DEPEND="${RDEPEND}
492 + !${CATEGORY}/${PN}:0
493 + dev-libs/libxslt
494 + sys-devel/flex
495 + virtual/pkgconfig
496 + virtual/yacc
497 + test? (
498 + dev-libs/dbus-glib
499 + >=dev-libs/glib-2.26:2
500 + dev-libs/gobject-introspection )
501 +"
502 +
503 +PATCHES=(
504 + # From master
505 + "${FILESDIR}"/0.40-Allow-disabling-the-build-of-valadoc.patch
506 + # Add missing bits to make valadoc parallel installable
507 + "${FILESDIR}"/0.40-valadoc-doclets-data-parallel-installable.patch
508 +)
509 +
510 +src_configure() {
511 + # https://bugs.gentoo.org/483134
512 + export GIT_CEILING_DIRECTORIES="${WORKDIR}"
513 +
514 + # weasyprint enables generation of PDF from HTML
515 + gnome2_src_configure \
516 + --disable-unversioned \
517 + $(use_enable valadoc) \
518 + VALAC=: \
519 + WEASYPRINT=:
520 +}
521 +
522 +src_install() {
523 + default
524 + find "${D}" -name "*.la" -delete || die
525 +}