Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/vala/files/, dev-lang/vala/
Date: Tue, 04 May 2021 01:45:44
Message-Id: 1620092679.d94e775b3186b0b843058e613b70a59dd8964e9b.mattst88@gentoo
1 commit: d94e775b3186b0b843058e613b70a59dd8964e9b
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 4 01:38:15 2021 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Tue May 4 01:44:39 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d94e775b
7
8 dev-lang/vala: Drop old versions
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 dev-lang/vala/Manifest | 6 -
13 ...0.40-Allow-disabling-the-build-of-valadoc.patch | 184 ------------------
14 ...valadoc-doclets-data-parallel-installable.patch | 212 ---------------------
15 dev-lang/vala/vala-0.36.20.ebuild | 38 ----
16 dev-lang/vala/vala-0.40.24.ebuild | 54 ------
17 dev-lang/vala/vala-0.50.2.ebuild | 49 -----
18 dev-lang/vala/vala-0.52.2.ebuild | 52 -----
19 7 files changed, 595 deletions(-)
20
21 diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
22 index 727ac668d9b..8a695bd5de6 100644
23 --- a/dev-lang/vala/Manifest
24 +++ b/dev-lang/vala/Manifest
25 @@ -1,9 +1,3 @@
26 -DIST vala-0.36.20.tar.xz 2918672 BLAKE2B 9c2c46992444fafd173f767a4a10ac185b0c49db0ede3cb52dec10da08ab3370adb4445087b24c91c9126e8586418a149ac783b3de92cac6c4badd488f3dc56f SHA512 21ca0573a2f9d945a362f7f15da7db25532fd7b19a0aa0442243b95df0568b7a88ae94d0659af44f6f57e364f4370de361102e7e46a070487985e7cb5d81277c
27 -DIST vala-0.40.24.tar.xz 3484308 BLAKE2B eb31444099c55b41ac2a2aa5be40eb3bc767e08d0670f2a36d51317cfd39a4a601578561863687385b8a922232909b5d8fb85a842e414aace077290070044100 SHA512 c10e9e51b5854d2f0087ce8a9eac561fbc22785bb719bf96936c69187550b2cb92ceafb5fd9df85b4eaa49f5c1f77c660de305d0cee944c216850c80c5f4cc65
28 -DIST vala-0.44.11.tar.xz 3370248 BLAKE2B c111b6175e6339148e30bedc77f62a9ef3ec912ad0621c9303fc5dba31694173b49ccc433d3681303d64a1e442ed9b7b064f27931369cb13fa028bfc25ffa3c9 SHA512 6111699039ed37084426d7603b82dfa9bd497c66ba7353ee22e8541bf15a2cbb634d315593c093f18c20bac877ae34884e5b570cd25237ce12aa73e941c4c540
29 -DIST vala-0.46.13.tar.xz 3434196 BLAKE2B 49b7e0b776e185653c1b8c00747a150ceb42cf89006fd55d37e3efd0824dace379d2c72cdb45d481b0545d0b4b37299bc6161b2d083d3221d2d8d8ca7c10d6dc SHA512 6d8d1acebf4706346d5dc986f5c900cfda929ca59ca3f3907cff56892a496bf524b1f74032ac6c8587b236a473124e15c6f83f949636e28141a55c8abeddf004
30 DIST vala-0.48.12.tar.xz 3492200 BLAKE2B 0a401ac4349dc1c628fa608b5a89504583d6d2bb05ca74eb507e766cca418121e14adfe6e8cfeb8f42212c717280b9b91426309df415d869896654be626c46c5 SHA512 da7becf8b92985a07b139651c14bd41ec86aed3e2b610029d2b376f70335c98607f39de4a1fa4efe9d51e6088edd4c13d22431cada389679d55f684ad548f4d1
31 -DIST vala-0.50.2.tar.xz 3514208 BLAKE2B f2f7e86b90ac1245d593ba82204667a830843e2fdb8e9a5afaa44453a146461f0ce2b9f9338ef4743bc6055bbce6c023ae92f0bf2ca66757cddd7fc3d7a4db63 SHA512 77069b53037adcd4c3fed2dc4a5c740216b950c52e8a0ed777a5cf9a5d9f078d0abbc4dbce08e122817cd3de0ac75ebd150b0f6f0b0cf4a09cb4a46f96bf4c3e
32 DIST vala-0.50.7.tar.xz 3540048 BLAKE2B 4f3abdfe7f0448846f22a4d822b803484afd1a2371604d63cd7092e2854dbfdb15169ac74226404ca572bc8ac29d5262c6e39346271704003138b9881bd99b30 SHA512 50c4c257e0be020f45270b07fef3646712dc1556dd43ae9d54f164b97056b26779b3559deab9fe96afa11e2e97a13aa2cce348a34cf5d72ea6a3be4a8d7efc94
33 -DIST vala-0.52.2.tar.xz 3573764 BLAKE2B 88340f7142518a0c17ab2347cd76853d18c00f86ed030cdcdbe726d92dc165ce2c83d07301f77c08f839f1d6b0da05c77e19671817483786fa57ed5bbcd240cc SHA512 c30b64f6899c53eb852128b95265ccec99d27a14388525829da1e5f5ff229c695a1e67b9e3bcc8fef751221c8923aa853bd2065ec0cfbc9b19d6c04007ed4110
34 DIST vala-0.52.3.tar.xz 3575936 BLAKE2B bef10fdca6af1db5d8ff7b01b624fee5879d82ceb35ccc84d847f9ce26445194d4fc7ec8c3f8177534c0144e9027633ed1b00793e4e2edbe3df51f55f29129cb SHA512 5b757c6a9d1a2e9615fddb014c64a92f6a7c231ba964e449a43e9ad19293d415b66642625aad98d18e436ab438a4530d00bb670c7c7eaae56f43b407f4035bd9
35
36 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
37 deleted file mode 100644
38 index 55bcb7d63b0..00000000000
39 --- a/dev-lang/vala/files/0.40-Allow-disabling-the-build-of-valadoc.patch
40 +++ /dev/null
41 @@ -1,184 +0,0 @@
42 -From 1dae711f17473e12c822a657ffca02abee27b3a2 Mon Sep 17 00:00:00 2001
43 -From: Rico Tzschichholz <ricotz@××××××.com>
44 -Date: Sun, 27 Aug 2017 16:03:03 +0200
45 -Subject: [PATCH] build: Allow disabling the build of valadoc
46 -
47 -Allow disabling build of valadoc with configure option --disable-valadoc
48 -
49 -Fixes https://gitlab.gnome.org/GNOME/vala/issues/596
50 ----
51 - Makefile.am | 10 +++++++++
52 - configure.ac | 59 ++++++++++++++++++++++++++-----------------------
53 - doc/Makefile.am | 17 +++++++++++++-
54 - 3 files changed, 57 insertions(+), 29 deletions(-)
55 -
56 -diff --git a/Makefile.am b/Makefile.am
57 -index 88bef90ed..e4d46741f 100644
58 ---- a/Makefile.am
59 -+++ b/Makefile.am
60 -@@ -13,9 +13,19 @@ SUBDIRS = \
61 - doc \
62 - gobject-introspection \
63 - vapigen \
64 -+ $(NULL)
65 -+
66 -+if ENABLE_VALADOC
67 -+SUBDIRS += \
68 - libvaladoc \
69 - valadoc \
70 - $(NULL)
71 -+endif
72 -+
73 -+DISTCHECK_CONFIGURE_FLAGS = \
74 -+ --enable-valadoc \
75 -+ --enable-unversioned \
76 -+ $(NULL)
77 -
78 - if ENABLE_UNVERSIONED
79 - aclocaldir = $(datadir)/aclocal
80 -diff --git a/configure.ac b/configure.ac
81 -index 88ca0f94b..9d1c97417 100644
82 ---- a/configure.ac
83 -+++ b/configure.ac
84 -@@ -119,35 +119,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
85 - AC_SUBST(GMODULE_CFLAGS)
86 - AC_SUBST(GMODULE_LIBS)
87 -
88 --PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
89 --AC_MSG_CHECKING([for CGRAPH])
90 --cgraph_tmp_LIBADD="$LIBADD"
91 --cgraph_tmp_CFLAGS="$CFLAGS"
92 --LIBADD="$LIBADD $LIBGVC_LIBS"
93 --CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
94 --AC_RUN_IFELSE(
95 -- [AC_LANG_SOURCE([
96 -- #include <gvc.h>
97 --
98 -- int main(void) {
99 -- #ifdef WITH_CGRAPH
100 -- return 0;
101 -- #else
102 -- return -1;
103 -- #endif
104 -- }
105 -- ])], [
106 -- AC_MSG_RESULT([yes])
107 -- VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
108 -- have_cgraph=yes
109 -- ], [
110 -- AC_MSG_RESULT([no])
111 -- have_cgraph=no
112 -- ]
113 --)
114 --LIBADD="$cgraph_tmp_LIBADD"
115 --CFLAGS="$cgraph_tmp_CFLAGS"
116 -+AC_ARG_ENABLE(valadoc, AS_HELP_STRING([--disable-valadoc], [Disable valadoc]), enable_valadoc=$enableval, enable_valadoc=yes)
117 -+if test x$enable_valadoc = xyes; then
118 -+ PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
119 -+ AC_MSG_CHECKING([for CGRAPH])
120 -+ cgraph_tmp_LIBADD="$LIBADD"
121 -+ cgraph_tmp_CFLAGS="$CFLAGS"
122 -+ LIBADD="$LIBADD $LIBGVC_LIBS"
123 -+ CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
124 -+ AC_RUN_IFELSE(
125 -+ [AC_LANG_SOURCE([
126 -+ #include <gvc.h>
127 -+ int main(void) {
128 -+ #ifdef WITH_CGRAPH
129 -+ return 0;
130 -+ #else
131 -+ return -1;
132 -+ #endif
133 -+ }
134 -+ ])], [
135 -+ AC_MSG_RESULT([yes])
136 -+ VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
137 -+ have_cgraph=yes
138 -+ ], [
139 -+ AC_MSG_RESULT([no])
140 -+ have_cgraph=no
141 -+ ]
142 -+ )
143 -+ LIBADD="$cgraph_tmp_LIBADD"
144 -+ CFLAGS="$cgraph_tmp_CFLAGS"
145 -+fi
146 - AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes")
147 -+AM_CONDITIONAL(ENABLE_VALADOC, test x$enable_valadoc = xyes)
148 -
149 - AC_PATH_PROG([XSLTPROC], [xsltproc], :)
150 - AM_CONDITIONAL(HAVE_XSLTPROC, test "$XSLTPROC" != :)
151 -diff --git a/doc/Makefile.am b/doc/Makefile.am
152 -index 758ad733a..b79f229c4 100644
153 ---- a/doc/Makefile.am
154 -+++ b/doc/Makefile.am
155 -@@ -6,11 +6,16 @@ SUBDIRS = \
156 -
157 - dist_man_MANS = \
158 - valac.1 \
159 -- valadoc.1 \
160 - vala-gen-introspect.1 \
161 - vapigen.1 \
162 - $(NULL)
163 -
164 -+if ENABLE_VALADOC
165 -+dist_man_MANS += \
166 -+ valadoc.1 \
167 -+ $(NULL)
168 -+endif
169 -+
170 - EXTRA_DIST = \
171 - valac.h2m \
172 - valadoc.h2m \
173 -@@ -19,7 +24,11 @@ EXTRA_DIST = \
174 - $(NULL)
175 -
176 - if HAVE_HELP2MAN
177 -+if ENABLE_VALADOC
178 - manpages: valac.1 valadoc.1 vala-gen-introspect.1 vapigen.1
179 -+else
180 -+manpages: valac.1 vala-gen-introspect.1 vapigen.1
181 -+endif
182 - @rm $^
183 - $(MAKE) $(AM_MAKEFLAGS) $^
184 -
185 -@@ -28,11 +37,13 @@ valac.1:
186 - --include $(srcdir)/valac.h2m \
187 - --libtool --no-info \
188 - --output=$@
189 -+if ENABLE_VALADOC
190 - valadoc.1:
191 - $(HELP2MAN) $(top_builddir)/valadoc/valadoc \
192 - --include $(srcdir)/valadoc.h2m \
193 - --libtool --no-info \
194 - --output=$@
195 -+endif
196 - vala-gen-introspect.1:
197 - $(HELP2MAN) $(top_builddir)/gobject-introspection/gen-introspect \
198 - --include $(srcdir)/vala-gen-introspect.h2m \
199 -@@ -49,12 +60,15 @@ endif
200 - if ENABLE_UNVERSIONED
201 - install-data-hook:
202 - cd $(DESTDIR)$(man1dir) && $(LN_S) -f valac@PACKAGE_SUFFIX@.1 valac.1
203 -+if ENABLE_VALADOC
204 - cd $(DESTDIR)$(man1dir) && $(LN_S) -f valadoc@PACKAGE_SUFFIX@.1 valadoc.1
205 -+endif
206 - cd $(DESTDIR)$(man1dir) && $(LN_S) -f vala-gen-introspect@PACKAGE_SUFFIX@.1 vala-gen-introspect.1
207 - cd $(DESTDIR)$(man1dir) && $(LN_S) -f vapigen@PACKAGE_SUFFIX@.1 vapigen.1
208 - endif
209 -
210 -
211 -+if ENABLE_VALADOC
212 - COMMON_VALADOCFLAGS = \
213 - --force \
214 - --verbose \
215 -@@ -130,6 +144,7 @@ internal-apis/valadoc: $(valadoc_VALASOURCES) internal-apis/codegen
216 - @touch $@
217 -
218 - internal-api-docs: internal-apis/gee internal-apis/vala internal-apis/ccode internal-apis/codegen internal-apis/valadoc
219 -+endif
220 -
221 - clean-local:
222 - rm -rf $(builddir)/internal-apis
223 ---
224 -2.20.1
225 -
226
227 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
228 deleted file mode 100644
229 index 1c9b44677e1..00000000000
230 --- a/dev-lang/vala/files/0.40-valadoc-doclets-data-parallel-installable.patch
231 +++ /dev/null
232 @@ -1,212 +0,0 @@
233 -From 3dc5768c045c400ff522b8a510b789001aa93df4 Mon Sep 17 00:00:00 2001
234 -From: Gilles Dartiguelongue <eva@g.o>
235 -Date: Fri, 4 Jan 2019 11:31:14 +0100
236 -Subject: [PATCH 2/2] Make valadoc doclets & data parallel installable
237 -
238 ----
239 - libvaladoc/Makefile.am | 12 ++++++++++--
240 - valadoc/Makefile.am | 7 ++++++-
241 - valadoc/doclets/devhelp/Makefile.am | 11 ++++++++---
242 - valadoc/doclets/gtkdoc/Makefile.am | 11 ++++++++---
243 - valadoc/doclets/html/Makefile.am | 11 ++++++++---
244 - valadoc/icons/Makefile.am | 4 ++++
245 - valadoc/tests/Makefile.am | 7 ++++++-
246 - 7 files changed, 50 insertions(+), 13 deletions(-)
247 -
248 -diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am
249 -index f3f790e76..86875631b 100644
250 ---- a/libvaladoc/Makefile.am
251 -+++ b/libvaladoc/Makefile.am
252 -@@ -3,8 +3,6 @@ include $(top_srcdir)/Makefile.common
253 - NULL =
254 -
255 - AM_CFLAGS = \
256 -- -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
257 -- -DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \
258 - -DPACKAGE_VERSION=\"$(VERSION)\" \
259 - $(COVERAGE_CFLAGS) \
260 - $(LIBGVC_CFLAGS) \
261 -@@ -16,6 +14,16 @@ AM_CFLAGS = \
262 - -I$(top_srcdir)/codegen \
263 - $(NULL)
264 -
265 -+if ENABLE_UNVERSIONED
266 -+AM_CFLAGS += \
267 -+ -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
268 -+ -DPACKAGE_DATADIR=\"$(libdir)/valadoc\"
269 -+else
270 -+AM_CFLAGS += \
271 -+ -DPACKAGE_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\" \
272 -+ -DPACKAGE_DATADIR=\"$(libdir)/valadoc@PACKAGE_SUFFIX@\"
273 -+endif
274 -+
275 - AM_VALAFLAGS = \
276 - $(NULL)
277 -
278 -diff --git a/valadoc/Makefile.am b/valadoc/Makefile.am
279 -index 33f3a9375..2f3dec848 100644
280 ---- a/valadoc/Makefile.am
281 -+++ b/valadoc/Makefile.am
282 -@@ -9,7 +9,6 @@ SUBDIRS = \
283 - $(NULL)
284 -
285 - AM_CFLAGS = \
286 -- -DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \
287 - -DPACKAGE_VERSION=\"$(VERSION)\" \
288 - -I$(top_srcdir)/libvaladoc/ \
289 - -I$(top_srcdir)/gee \
290 -@@ -22,6 +21,12 @@ AM_CFLAGS = \
291 - $(LIBGVC_CFLAGS) \
292 - $(NULL)
293 -
294 -+if ENABLE_UNVERSIONED
295 -+AM_CFLAGS += -DPACKAGE_DATADIR=\"$(libdir)/valadoc\"
296 -+else
297 -+AM_CFLAGS += -DPACKAGE_DATADIR=\"$(libdir)/valadoc@PACKAGE_SUFFIX@\"
298 -+endif
299 -+
300 - BUILT_SOURCES = valadoc.vala.stamp
301 -
302 - bin_PROGRAMS = valadoc
303 -diff --git a/valadoc/doclets/devhelp/Makefile.am b/valadoc/doclets/devhelp/Makefile.am
304 -index 5783c0b5a..afbb8f7f9 100644
305 ---- a/valadoc/doclets/devhelp/Makefile.am
306 -+++ b/valadoc/doclets/devhelp/Makefile.am
307 -@@ -3,7 +3,6 @@ include $(top_srcdir)/Makefile.common
308 - NULL =
309 -
310 - AM_CFLAGS = \
311 -- -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
312 - -I$(top_srcdir)/gee/ \
313 - -I$(top_srcdir)/vala/ \
314 - -I$(top_srcdir)/libvaladoc/ \
315 -@@ -12,12 +11,18 @@ AM_CFLAGS = \
316 - $(LIBGVC_CFLAGS) \
317 - $(NULL)
318 -
319 -+if ENABLE_UNVERSIONED
320 -+AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\"
321 -+docletdir = $(libdir)/valadoc/doclets/devhelp
322 -+else
323 -+AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\"
324 -+docletdir = $(libdir)/valadoc@PACKAGE_SUFFIX@/doclets/devhelp
325 -+endif
326 -+
327 - BUILT_SOURCES = libdoclet.vala.stamp
328 -
329 - doclet_LTLIBRARIES = libdoclet.la
330 -
331 --docletdir = $(libdir)/valadoc/doclets/devhelp
332 --
333 - libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined
334 -
335 - libdoclet_la_VALASOURCES = \
336 -diff --git a/valadoc/doclets/gtkdoc/Makefile.am b/valadoc/doclets/gtkdoc/Makefile.am
337 -index 763e46932..f689018ce 100644
338 ---- a/valadoc/doclets/gtkdoc/Makefile.am
339 -+++ b/valadoc/doclets/gtkdoc/Makefile.am
340 -@@ -3,7 +3,6 @@ include $(top_srcdir)/Makefile.common
341 - NULL =
342 -
343 - AM_CFLAGS = \
344 -- -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
345 - -I$(top_srcdir)/gee/ \
346 - -I$(top_srcdir)/vala/ \
347 - -I$(top_srcdir)/libvaladoc/ \
348 -@@ -12,12 +11,18 @@ AM_CFLAGS = \
349 - $(LIBGVC_CFLAGS) \
350 - $(NULL)
351 -
352 -+if ENABLE_UNVERSIONED
353 -+AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\"
354 -+docletdir = $(libdir)/valadoc/doclets/gtkdoc
355 -+else
356 -+AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\"
357 -+docletdir = $(libdir)/valadoc@PACKAGE_SUFFIX@/doclets/gtkdoc
358 -+endif
359 -+
360 - BUILT_SOURCES = libdoclet.vala.stamp
361 -
362 - doclet_LTLIBRARIES = libdoclet.la
363 -
364 --docletdir = $(libdir)/valadoc/doclets/gtkdoc
365 --
366 - libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined
367 -
368 - libdoclet_la_VALASOURCES = \
369 -diff --git a/valadoc/doclets/html/Makefile.am b/valadoc/doclets/html/Makefile.am
370 -index 885fbfbab..855184020 100644
371 ---- a/valadoc/doclets/html/Makefile.am
372 -+++ b/valadoc/doclets/html/Makefile.am
373 -@@ -3,7 +3,6 @@ include $(top_srcdir)/Makefile.common
374 - NULL =
375 -
376 - AM_CFLAGS = \
377 -- -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
378 - -I$(top_srcdir)/gee/ \
379 - -I$(top_srcdir)/vala/ \
380 - -I$(top_srcdir)/libvaladoc/ \
381 -@@ -12,12 +11,18 @@ AM_CFLAGS = \
382 - $(LIBGVC_CFLAGS) \
383 - $(NULL)
384 -
385 -+if ENABLE_UNVERSIONED
386 -+AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\"
387 -+docletdir = $(libdir)/valadoc/doclets/html
388 -+else
389 -+AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\"
390 -+docletdir = $(libdir)/valadoc@PACKAGE_SUFFIX@/doclets/html
391 -+endif
392 -+
393 - BUILT_SOURCES = libdoclet.vala.stamp
394 -
395 - doclet_LTLIBRARIES = libdoclet.la
396 -
397 --docletdir = $(libdir)/valadoc/doclets/html
398 --
399 - libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined
400 -
401 - libdoclet_la_VALASOURCES = \
402 -diff --git a/valadoc/icons/Makefile.am b/valadoc/icons/Makefile.am
403 -index 454bdba7c..668956f3b 100644
404 ---- a/valadoc/icons/Makefile.am
405 -+++ b/valadoc/icons/Makefile.am
406 -@@ -1,6 +1,10 @@
407 - NULL =
408 -
409 -+if ENABLE_UNVERSIONED
410 - iconsdir = $(datadir)/valadoc/icons
411 -+else
412 -+iconsdir = $(datadir)/valadoc@PACKAGE_SUFFIX@/icons
413 -+endif
414 -
415 - dist_icons_DATA = \
416 - abstractclass.png \
417 -diff --git a/valadoc/tests/Makefile.am b/valadoc/tests/Makefile.am
418 -index e40cc1ca3..2bca58128 100644
419 ---- a/valadoc/tests/Makefile.am
420 -+++ b/valadoc/tests/Makefile.am
421 -@@ -22,7 +22,6 @@ check-TESTS: $(TESTS)
422 - G_DEBUG=fatal_warnings $(builddir)/driver
423 -
424 - AM_CFLAGS = \
425 -- -DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \
426 - -DPACKAGE_VERSION=\"$(VERSION)\" \
427 - -DTOP_SRC_DIR=\"$(abs_top_srcdir)\" \
428 - -I$(top_srcdir)/libvaladoc/ \
429 -@@ -36,6 +35,12 @@ AM_CFLAGS = \
430 - $(LIBGVC_CFLAGS) \
431 - $(NULL)
432 -
433 -+if ENABLE_UNVERSIONED
434 -+AM_CFLAGS += -DPACKAGE_DATADIR=\"$(libdir)/valadoc\"
435 -+else
436 -+AM_CFLAGS += -DPACKAGE_DATADIR=\"$(libdir)/valadoc@PACKAGE_SUFFIX@\"
437 -+endif
438 -+
439 - BUILT_SOURCES = driver.vala.stamp
440 -
441 - check_PROGRAMS = driver
442 ---
443 -2.20.1
444 -
445
446 diff --git a/dev-lang/vala/vala-0.36.20.ebuild b/dev-lang/vala/vala-0.36.20.ebuild
447 deleted file mode 100644
448 index 109cbd7c871..00000000000
449 --- a/dev-lang/vala/vala-0.36.20.ebuild
450 +++ /dev/null
451 @@ -1,38 +0,0 @@
452 -# Copyright 1999-2021 Gentoo Authors
453 -# Distributed under the terms of the GNU General Public License v2
454 -
455 -EAPI=6
456 -inherit gnome2
457 -
458 -DESCRIPTION="Compiler for the GObject type system"
459 -HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
460 -
461 -LICENSE="LGPL-2.1"
462 -SLOT="0.36"
463 -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
464 -IUSE="test"
465 -RESTRICT="!test? ( test )"
466 -
467 -RDEPEND="
468 - >=dev-libs/glib-2.32:2
469 - >=dev-libs/vala-common-${PV}
470 -"
471 -DEPEND="${RDEPEND}
472 - !${CATEGORY}/${PN}:0
473 - dev-libs/libxslt
474 - sys-devel/flex
475 - virtual/pkgconfig
476 - virtual/yacc
477 - test? (
478 - dev-libs/dbus-glib
479 - >=dev-libs/glib-2.26:2
480 - dev-libs/gobject-introspection )
481 -"
482 -
483 -src_configure() {
484 - # weasyprint enables generation of PDF from HTML
485 - gnome2_src_configure \
486 - --disable-unversioned \
487 - VALAC=: \
488 - WEASYPRINT=:
489 -}
490
491 diff --git a/dev-lang/vala/vala-0.40.24.ebuild b/dev-lang/vala/vala-0.40.24.ebuild
492 deleted file mode 100644
493 index 06f7e854eea..00000000000
494 --- a/dev-lang/vala/vala-0.40.24.ebuild
495 +++ /dev/null
496 @@ -1,54 +0,0 @@
497 -# Copyright 1999-2021 Gentoo Authors
498 -# Distributed under the terms of the GNU General Public License v2
499 -
500 -EAPI=6
501 -GNOME2_EAUTORECONF="yes"
502 -
503 -inherit gnome2
504 -
505 -DESCRIPTION="Compiler for the GObject type system"
506 -HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
507 -
508 -LICENSE="LGPL-2.1"
509 -SLOT="0.40"
510 -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
511 -IUSE="test valadoc"
512 -RESTRICT="!test? ( test )"
513 -
514 -RDEPEND="
515 - >=dev-libs/glib-2.40.0:2
516 - >=dev-libs/vala-common-${PV}
517 - valadoc? ( >=media-gfx/graphviz-2.16 )
518 -"
519 -DEPEND="${RDEPEND}
520 - !${CATEGORY}/${PN}:0
521 - dev-libs/libxslt
522 - sys-devel/flex
523 - virtual/pkgconfig
524 - virtual/yacc
525 - test? (
526 - dev-libs/dbus-glib
527 - >=dev-libs/glib-2.26:2
528 - dev-libs/gobject-introspection )
529 -"
530 -
531 -PATCHES=(
532 - # From master
533 - "${FILESDIR}"/0.40-Allow-disabling-the-build-of-valadoc.patch
534 - # Add missing bits to make valadoc parallel installable
535 - "${FILESDIR}"/0.40-valadoc-doclets-data-parallel-installable.patch
536 -)
537 -
538 -src_configure() {
539 - # weasyprint enables generation of PDF from HTML
540 - gnome2_src_configure \
541 - --disable-unversioned \
542 - $(use_enable valadoc) \
543 - VALAC=: \
544 - WEASYPRINT=:
545 -}
546 -
547 -src_install() {
548 - default
549 - find "${D}" -name "*.la" -delete || die
550 -}
551
552 diff --git a/dev-lang/vala/vala-0.50.2.ebuild b/dev-lang/vala/vala-0.50.2.ebuild
553 deleted file mode 100644
554 index c1a73c907f8..00000000000
555 --- a/dev-lang/vala/vala-0.50.2.ebuild
556 +++ /dev/null
557 @@ -1,49 +0,0 @@
558 -# Copyright 1999-2020 Gentoo Authors
559 -# Distributed under the terms of the GNU General Public License v2
560 -
561 -EAPI=6
562 -
563 -inherit gnome2
564 -
565 -DESCRIPTION="Compiler for the GObject type system"
566 -HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
567 -
568 -LICENSE="LGPL-2.1+"
569 -SLOT="0.50"
570 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
571 -IUSE="test valadoc"
572 -RESTRICT="!test? ( test )"
573 -
574 -RDEPEND="
575 - >=dev-libs/glib-2.48.0:2
576 - >=dev-libs/vala-common-${PV}
577 - valadoc? ( >=media-gfx/graphviz-2.16 )
578 - !<net-libs/libsoup-2.66.2[vala]
579 -" # Older libsoup generates a libsoup-2.4.vapi that isn't fine for vala:0.46 anymore
580 -# We block here, so libsoup[vala] consumers wouldn't have to >= it, which would be bad
581 -# as the newer is not required with older vala when those are picked instead of 0.46.
582 -# vala-0.45.91 ships a broken libsoup-2.4.vapi copy too, but that'll be fixed by 0.45.92
583 -DEPEND="${RDEPEND}
584 - dev-libs/libxslt
585 - sys-devel/flex
586 - virtual/pkgconfig
587 - virtual/yacc
588 - test? (
589 - dev-libs/dbus-glib
590 - >=dev-libs/glib-2.26:2
591 - dev-libs/gobject-introspection )
592 -"
593 -
594 -src_configure() {
595 - # weasyprint enables generation of PDF from HTML
596 - gnome2_src_configure \
597 - --disable-unversioned \
598 - $(use_enable valadoc) \
599 - VALAC=: \
600 - WEASYPRINT=:
601 -}
602 -
603 -src_install() {
604 - default
605 - find "${D}" -name "*.la" -delete || die
606 -}
607
608 diff --git a/dev-lang/vala/vala-0.52.2.ebuild b/dev-lang/vala/vala-0.52.2.ebuild
609 deleted file mode 100644
610 index d3cf852fc94..00000000000
611 --- a/dev-lang/vala/vala-0.52.2.ebuild
612 +++ /dev/null
613 @@ -1,52 +0,0 @@
614 -# Copyright 1999-2021 Gentoo Authors
615 -# Distributed under the terms of the GNU General Public License v2
616 -
617 -EAPI=7
618 -
619 -inherit gnome2
620 -
621 -DESCRIPTION="Compiler for the GObject type system"
622 -HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
623 -
624 -LICENSE="LGPL-2.1+"
625 -SLOT="0.52"
626 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
627 -IUSE="test valadoc"
628 -RESTRICT="!test? ( test )"
629 -
630 -RDEPEND="
631 - >=dev-libs/glib-2.48.0:2
632 - >=dev-libs/vala-common-${PV}
633 - valadoc? ( >=media-gfx/graphviz-2.16 )
634 - !<net-libs/libsoup-2.66.2[vala]
635 -" # Older libsoup generates a libsoup-2.4.vapi that isn't fine for vala:0.46 anymore
636 -# We block here, so libsoup[vala] consumers wouldn't have to >= it, which would be bad
637 -# as the newer is not required with older vala when those are picked instead of 0.46.
638 -# vala-0.45.91 ships a broken libsoup-2.4.vapi copy too, but that'll be fixed by 0.45.92
639 -DEPEND="${RDEPEND}
640 - test? (
641 - dev-libs/dbus-glib
642 - >=dev-libs/glib-2.26:2
643 - dev-libs/gobject-introspection
644 - )
645 -"
646 -BDEPEND="
647 - dev-libs/libxslt
648 - sys-devel/flex
649 - virtual/pkgconfig
650 - virtual/yacc
651 -"
652 -
653 -src_configure() {
654 - # weasyprint enables generation of PDF from HTML
655 - gnome2_src_configure \
656 - --disable-unversioned \
657 - $(use_enable valadoc) \
658 - VALAC=: \
659 - WEASYPRINT=:
660 -}
661 -
662 -src_install() {
663 - default
664 - find "${D}" -name "*.la" -delete || die
665 -}