gentoo resync : 16.02.1018

6 files changed, 522 insertions, 5 deletions

diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index ec6a5304a486..3b209c3ac03c 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -1,9 +1,15 @@
+AUX 0.40-Allow-disabling-the-build-of-valadoc.patch 4585 BLAKE2B 4f0ee3cb4a47f4479ba29b3acfa173fcf045bedafa677544147969d63b05734de31fe6ce135bfa529f28583318cf8a8e76cd32f372d3513a859ebcbb560ebae1 SHA512 de1c71ac885ca88c7276c2e0b8e92ab63587b662f927cae423775908cec4bfd4bbfdf14f069c541a599e001e7e66712f04b9f45bc88882cc7ee5b0f582bd8229
+AUX 0.40-valadoc-doclets-data-parallel-installable.patch 6105 BLAKE2B 24f3a2c44125da3dfc93c6c7426d85de59ef79baa3e96b898b0c01f8e46b8939e6f5ec1ab3ef1f84052ccef6a3bb61d3c86329aba228f3356b879ee6d867f045 SHA512 87d810c135844ebdbc011bccb66ac58ad77b773ed0513d96cd465b3a34103e308c9fc134c9701ec0df56d49644ecfe73ceafd2fde02699347253bbaabffbbb0f
 DIST vala-0.32.1.tar.xz 2759528 BLAKE2B cce23844ee5769216ef5cccb20476f4bdd2cb809a226236dd8a6bd533bb8ceb5b87add1d4d1c9eec60e0a94e64cafafcd1f46b2b2ae12fc951515fe8571e2195 SHA512 d59db1bd9132f93f187c30ccabff9d21fe8685293a6494e5b009d883de4f844cc4b8dc5d3b6eb4e026a93490f2e4ff7ba83ff22a093c6f8f85e68d83f5fe1bb0
 DIST vala-0.34.16.tar.xz 2795676 BLAKE2B 64428099c209e13a6aad09233af650f412efa191ff4873fae1dbfb9bcc252e13d4e152733c9f199cd23323872fd912807a685980f651c1f784bfaffae7bf4162 SHA512 6411d55524a6c717c2eaf5cc1231ac931400e3f66d151a8b8856910258eb5bd7affe3a90946de34feb51aabfafce721b8d57f61e0475095b275d20b73cc4bbec
 DIST vala-0.36.15.tar.xz 2880300 BLAKE2B ea83bde6396f3be1c96038d63ae30b18fa070a6f7a06b75569bfed9d7792c898201a1f24d000f5b6415bb890cf975758341a97f22db74da02fcbeb3f283e546f SHA512 1c8f888832b2dd4248737a5a27f00f42d8bab2fe0a0790a7df5c426f4e3e1d0919ed0f6f6fd905be758ed477ba840e18f608e67811389c811ba65710094abe61
 DIST vala-0.36.17.tar.xz 2898524 BLAKE2B 4a5a373bacd4e4a392350c7819e0498054e38f50dce89658412d7aeb5642892ef9f32a7689ebd45f53c41f064e0b6d2f52fb441be67a1dd48e67311a1e764637 SHA512 93d4fa600cd0ef62b71ed056b837f2c0a42c3aba25b021b2bbd2045428550307727827b250dae546926ea3fe2e33a5ac80c9b24b5100f02550ec584dd5da5e92
+DIST vala-0.40.13.tar.xz 3394588 BLAKE2B cb3055b859b220f999bc5b4533251a069e9c10690963bc92b087b0ab351f0d78eb8f5992b747cc345d9d2a3dba69c68d130bca20604036c2c62e380442675e8b SHA512 0590224ec5128f6939b66109b6bcf7f764af3ece28f9bce9a5d715f53defbc8746d5d20599039b067848da2f38fdae7a057427be1ea9ef0fe09e0ce45db091d0
+DIST vala-0.42.5.tar.xz 3350460 BLAKE2B 790c9f9e9e656ce96226f1ac6a0d090033ecf1943d024da0c9ee174bf65f76a14721819c6c2263c5b094f16cf112cc964000000ee42c9a7fdc0f2ad6fc01feb7 SHA512 1862307eab505e500326f84e267648f084926629f6b45b9abb6a90a20a7aa6dd2fc305962b9028c5ca7becb574573cca43fbecd9294b782d9942e71639a32aa9
 EBUILD vala-0.32.1.ebuild 775 BLAKE2B 3c4618a9f9782e21964dec7a7e000cf091e1a4a16861d6515087d11c4ae95a86c5445c8db3dda6be2fed99a8f6ca631b275fafd50db4845135df68bcb351f01b SHA512 1f92dfcaf5aff8fe99694ccaf7f52609169f7ef45c18988a2a9d9ef00bd93ebf5f10b7d6e1a3064c1461b70f0f3629cc610bd39293830704d9a2b3d4f0a0ce60
 EBUILD vala-0.34.16.ebuild 775 BLAKE2B 2b84a4a85841d2df0379b735c85c82a1f3f06e382e53b9fa3f6b19e4d704eccea18103adc4ed2fd0c0024be23179e9b97495ed00e1016bba871d6a4761bb8b6b SHA512 5b77b9cfc896ebbaf17d1d0be8e6b87ce33e4624bba65126b6fc771402339909fd8b2a3632a8769f426135ffc4b38e44a62868f85056365aa952d93c56d03c94
 EBUILD vala-0.36.15.ebuild 858 BLAKE2B b057fe90ac84327be175ec67539d16e3f0774acbd4b00833763fecd744b181d73481454edc519e277136f7eabf03d9ce3b8074fd55ace808e7cecdf31c23eb59 SHA512 f14500cdf5c6c37102a4be3a7f1fbc6381ad20406a7bd049876bedfa9e813f2c618905a09fcb1e7421049243ebce5e3bece55c87fb4eddddb0c5c07b19299dc7
 EBUILD vala-0.36.17.ebuild 868 BLAKE2B f493cf3fd23bf54572722d02abe0759b51a141d4137c58b40a0ab8d92f78e4c4bb5a3353305a8502d661ba219dcc7cc668c7e95c2bc15048c3100b3c95f75871 SHA512 0a86d5003edc0ba773919f6d7b93ecfa6deb42e8a5a489922132df3627f357711c630ad268335bf55f4b5b5525e64e13b8eba0a45901e0e2672b35ff403d9ff8
-MISC metadata.xml 255 BLAKE2B 51dc9e0030d68ac68f075bb4a7b4c5f42122c16f354e10463d7338e652b272b26fa1eb12a144ed4a00d29a020af4df19029d909b4591162347184b1684402c94 SHA512 1970039db79f50391650a9fea933485c6102d1165946ab8efe9395403a02f49d4b17c2942795282469ac7c0306e7353002dcbaa797fb1060982b31ea3540b98b
+EBUILD vala-0.40.13.ebuild 1275 BLAKE2B 9f6a160de849bd18f400e1fbf98c4dd899f4b88c28b39e07f55c37ef45263ba3da977e14072f813bc19f0e422b33d4d780a30300fe27f48fd114b1bb7aebc842 SHA512 d0fbf3b7bc834f3cb1efbfb3c3a58b05b78b9053e89e7a26fbfd40faacc0d6f493e7a82fc42e8024172fae05c4daac371f2163786abbf6e8849fb20805e8ff40
+EBUILD vala-0.42.5.ebuild 1275 BLAKE2B 4c0205f782b470ba8aee5e9f72dcd611a1884d4dea03ddebe6835f5cebd5b91bd4627302e83c55f75bdf94c32d666a3147c518c8a7038683f7f9756ac96667c0 SHA512 37a74165e1736d14f800ef5b8ea1a7de12e7cb058486c677378c6c5f83e8ef2b740d8a5aa76801edff48c697b27128afe3737dce489defbb5093d027b332cb17
+MISC metadata.xml 345 BLAKE2B de3110ae281a87f8cb8f6c10d93705f56f0cfed972cd893a063e66c2629150d491498a29b35b4efe19fa5b6baa740f1d989bad440924befc60ef56423096f108 SHA512 163aa55430a075974d504a5bbb71ad9a249cb215de12a82b3141de18bb05f1e0c2078c02c617cf7d98a97c7f8dd407077183754d8c82c77e80dd0d7b2ec38283
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
new file mode 100644
index 000000000000..55bcb7d63b05
--- /dev/null
+++ b/dev-lang/vala/files/0.40-Allow-disabling-the-build-of-valadoc.patch
@@ -0,0 +1,184 @@
+From 1dae711f17473e12c822a657ffca02abee27b3a2 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sun, 27 Aug 2017 16:03:03 +0200
+Subject: [PATCH] build: Allow disabling the build of valadoc
+
+Allow disabling build of valadoc with configure option --disable-valadoc
+
+Fixes https://gitlab.gnome.org/GNOME/vala/issues/596
+---
+ Makefile.am     | 10 +++++++++
+ configure.ac    | 59 ++++++++++++++++++++++++++-----------------------
+ doc/Makefile.am | 17 +++++++++++++-
+ 3 files changed, 57 insertions(+), 29 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 88bef90ed..e4d46741f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -13,9 +13,19 @@ SUBDIRS = \
+ 	doc \
+ 	gobject-introspection \
+ 	vapigen \
++	$(NULL)
++
++if ENABLE_VALADOC
++SUBDIRS += \
+ 	libvaladoc \
+ 	valadoc \
+ 	$(NULL)
++endif
++
++DISTCHECK_CONFIGURE_FLAGS = \
++	--enable-valadoc \
++	--enable-unversioned \
++	$(NULL)
+ 
+ if ENABLE_UNVERSIONED
+ aclocaldir = $(datadir)/aclocal
+diff --git a/configure.ac b/configure.ac
+index 88ca0f94b..9d1c97417 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -119,35 +119,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
+ AC_SUBST(GMODULE_CFLAGS)
+ AC_SUBST(GMODULE_LIBS)
+ 
+-PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
+-AC_MSG_CHECKING([for CGRAPH])
+-cgraph_tmp_LIBADD="$LIBADD"
+-cgraph_tmp_CFLAGS="$CFLAGS"
+-LIBADD="$LIBADD $LIBGVC_LIBS"
+-CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
+-AC_RUN_IFELSE(
+-	[AC_LANG_SOURCE([
+-		#include <gvc.h>
+-
+-		int main(void) {
+-			#ifdef WITH_CGRAPH
+-				return 0;
+-			#else
+-				return -1;
+-			#endif
+-		}
+-	])], [
+-		AC_MSG_RESULT([yes])
+-		VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
+-		have_cgraph=yes
+-	], [
+-		AC_MSG_RESULT([no])
+-		have_cgraph=no
+-	]
+-)
+-LIBADD="$cgraph_tmp_LIBADD"
+-CFLAGS="$cgraph_tmp_CFLAGS"
++AC_ARG_ENABLE(valadoc, AS_HELP_STRING([--disable-valadoc], [Disable valadoc]), enable_valadoc=$enableval, enable_valadoc=yes)
++if test x$enable_valadoc = xyes; then
++	PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
++	AC_MSG_CHECKING([for CGRAPH])
++	cgraph_tmp_LIBADD="$LIBADD"
++	cgraph_tmp_CFLAGS="$CFLAGS"
++	LIBADD="$LIBADD $LIBGVC_LIBS"
++	CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
++	AC_RUN_IFELSE(
++		[AC_LANG_SOURCE([
++			#include <gvc.h>
++			int main(void) {
++				#ifdef WITH_CGRAPH
++					return 0;
++				#else
++					return -1;
++				#endif
++			}
++		])], [
++			AC_MSG_RESULT([yes])
++			VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
++			have_cgraph=yes
++		], [
++			AC_MSG_RESULT([no])
++			have_cgraph=no
++		]
++	)
++	LIBADD="$cgraph_tmp_LIBADD"
++	CFLAGS="$cgraph_tmp_CFLAGS"
++fi
+ AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes")
++AM_CONDITIONAL(ENABLE_VALADOC, test x$enable_valadoc = xyes)
+ 
+ AC_PATH_PROG([XSLTPROC], [xsltproc], :)
+ AM_CONDITIONAL(HAVE_XSLTPROC, test "$XSLTPROC" != :)
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 758ad733a..b79f229c4 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -6,11 +6,16 @@ SUBDIRS = \
+ 
+ dist_man_MANS = \
+ 	valac.1 \
+-	valadoc.1 \
+ 	vala-gen-introspect.1 \
+ 	vapigen.1 \
+ 	$(NULL)
+ 
++if ENABLE_VALADOC
++dist_man_MANS += \
++	valadoc.1 \
++	$(NULL)
++endif
++
+ EXTRA_DIST = \
+ 	valac.h2m \
+ 	valadoc.h2m \
+@@ -19,7 +24,11 @@ EXTRA_DIST = \
+ 	$(NULL)
+ 
+ if HAVE_HELP2MAN
++if ENABLE_VALADOC
+ manpages: valac.1 valadoc.1 vala-gen-introspect.1 vapigen.1
++else
++manpages: valac.1 vala-gen-introspect.1 vapigen.1
++endif
+ 	@rm $^
+ 	$(MAKE) $(AM_MAKEFLAGS) $^
+ 
+@@ -28,11 +37,13 @@ valac.1:
+ 		--include $(srcdir)/valac.h2m \
+ 		--libtool --no-info \
+ 		--output=$@
++if ENABLE_VALADOC
+ valadoc.1:
+ 	$(HELP2MAN) $(top_builddir)/valadoc/valadoc \
+ 		--include $(srcdir)/valadoc.h2m \
+ 		--libtool --no-info \
+ 		--output=$@
++endif
+ vala-gen-introspect.1:
+ 	$(HELP2MAN) $(top_builddir)/gobject-introspection/gen-introspect \
+ 		--include $(srcdir)/vala-gen-introspect.h2m \
+@@ -49,12 +60,15 @@ endif
+ if ENABLE_UNVERSIONED
+ install-data-hook:
+ 	cd $(DESTDIR)$(man1dir) && $(LN_S) -f valac@PACKAGE_SUFFIX@.1 valac.1
++if ENABLE_VALADOC
+ 	cd $(DESTDIR)$(man1dir) && $(LN_S) -f valadoc@PACKAGE_SUFFIX@.1 valadoc.1
++endif
+ 	cd $(DESTDIR)$(man1dir) && $(LN_S) -f vala-gen-introspect@PACKAGE_SUFFIX@.1 vala-gen-introspect.1
+ 	cd $(DESTDIR)$(man1dir) && $(LN_S) -f vapigen@PACKAGE_SUFFIX@.1 vapigen.1
+ endif
+ 
+ 
++if ENABLE_VALADOC
+ COMMON_VALADOCFLAGS = \
+ 	--force \
+ 	--verbose \
+@@ -130,6 +144,7 @@ internal-apis/valadoc: $(valadoc_VALASOURCES) internal-apis/codegen
+ 	@touch $@
+ 
+ internal-api-docs: internal-apis/gee internal-apis/vala internal-apis/ccode internal-apis/codegen internal-apis/valadoc
++endif
+ 
+ clean-local:
+ 	rm -rf $(builddir)/internal-apis
+-- 
+2.20.1
+
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
new file mode 100644
index 000000000000..1c9b44677e1e
--- /dev/null
+++ b/dev-lang/vala/files/0.40-valadoc-doclets-data-parallel-installable.patch
@@ -0,0 +1,212 @@
+From 3dc5768c045c400ff522b8a510b789001aa93df4 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Fri, 4 Jan 2019 11:31:14 +0100
+Subject: [PATCH 2/2] Make valadoc doclets & data parallel installable
+
+---
+ libvaladoc/Makefile.am              | 12 ++++++++++--
+ valadoc/Makefile.am                 |  7 ++++++-
+ valadoc/doclets/devhelp/Makefile.am | 11 ++++++++---
+ valadoc/doclets/gtkdoc/Makefile.am  | 11 ++++++++---
+ valadoc/doclets/html/Makefile.am    | 11 ++++++++---
+ valadoc/icons/Makefile.am           |  4 ++++
+ valadoc/tests/Makefile.am           |  7 ++++++-
+ 7 files changed, 50 insertions(+), 13 deletions(-)
+
+diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am
+index f3f790e76..86875631b 100644
+--- a/libvaladoc/Makefile.am
++++ b/libvaladoc/Makefile.am
+@@ -3,8 +3,6 @@ include $(top_srcdir)/Makefile.common
+ NULL =
+ 
+ AM_CFLAGS = \
+-	-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
+-	-DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \
+ 	-DPACKAGE_VERSION=\"$(VERSION)\" \
+ 	$(COVERAGE_CFLAGS) \
+ 	$(LIBGVC_CFLAGS) \
+@@ -16,6 +14,16 @@ AM_CFLAGS = \
+ 	-I$(top_srcdir)/codegen \
+ 	$(NULL)
+ 
++if ENABLE_UNVERSIONED
++AM_CFLAGS += \
++	-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
++	-DPACKAGE_DATADIR=\"$(libdir)/valadoc\"
++else
++AM_CFLAGS += \
++	-DPACKAGE_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\" \
++	-DPACKAGE_DATADIR=\"$(libdir)/valadoc@PACKAGE_SUFFIX@\"
++endif
++
+ AM_VALAFLAGS = \
+ 	$(NULL)
+ 
+diff --git a/valadoc/Makefile.am b/valadoc/Makefile.am
+index 33f3a9375..2f3dec848 100644
+--- a/valadoc/Makefile.am
++++ b/valadoc/Makefile.am
+@@ -9,7 +9,6 @@ SUBDIRS = \
+ 	$(NULL)
+ 
+ AM_CFLAGS = \
+-	-DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \
+ 	-DPACKAGE_VERSION=\"$(VERSION)\" \
+ 	-I$(top_srcdir)/libvaladoc/ \
+ 	-I$(top_srcdir)/gee \
+@@ -22,6 +21,12 @@ AM_CFLAGS = \
+ 	$(LIBGVC_CFLAGS) \
+ 	$(NULL)
+ 
++if ENABLE_UNVERSIONED
++AM_CFLAGS += -DPACKAGE_DATADIR=\"$(libdir)/valadoc\"
++else
++AM_CFLAGS += -DPACKAGE_DATADIR=\"$(libdir)/valadoc@PACKAGE_SUFFIX@\"
++endif
++
+ BUILT_SOURCES = valadoc.vala.stamp
+ 
+ bin_PROGRAMS = valadoc
+diff --git a/valadoc/doclets/devhelp/Makefile.am b/valadoc/doclets/devhelp/Makefile.am
+index 5783c0b5a..afbb8f7f9 100644
+--- a/valadoc/doclets/devhelp/Makefile.am
++++ b/valadoc/doclets/devhelp/Makefile.am
+@@ -3,7 +3,6 @@ include $(top_srcdir)/Makefile.common
+ NULL =
+ 
+ AM_CFLAGS = \
+-	-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
+ 	-I$(top_srcdir)/gee/ \
+ 	-I$(top_srcdir)/vala/ \
+ 	-I$(top_srcdir)/libvaladoc/ \
+@@ -12,12 +11,18 @@ AM_CFLAGS = \
+ 	$(LIBGVC_CFLAGS) \
+ 	$(NULL)
+ 
++if ENABLE_UNVERSIONED
++AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\"
++docletdir = $(libdir)/valadoc/doclets/devhelp
++else
++AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\"
++docletdir = $(libdir)/valadoc@PACKAGE_SUFFIX@/doclets/devhelp
++endif
++
+ BUILT_SOURCES = libdoclet.vala.stamp
+ 
+ doclet_LTLIBRARIES = libdoclet.la
+ 
+-docletdir = $(libdir)/valadoc/doclets/devhelp
+-
+ libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined
+ 
+ libdoclet_la_VALASOURCES = \
+diff --git a/valadoc/doclets/gtkdoc/Makefile.am b/valadoc/doclets/gtkdoc/Makefile.am
+index 763e46932..f689018ce 100644
+--- a/valadoc/doclets/gtkdoc/Makefile.am
++++ b/valadoc/doclets/gtkdoc/Makefile.am
+@@ -3,7 +3,6 @@ include $(top_srcdir)/Makefile.common
+ NULL =
+ 
+ AM_CFLAGS = \
+-	-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
+ 	-I$(top_srcdir)/gee/ \
+ 	-I$(top_srcdir)/vala/ \
+ 	-I$(top_srcdir)/libvaladoc/ \
+@@ -12,12 +11,18 @@ AM_CFLAGS = \
+ 	$(LIBGVC_CFLAGS) \
+ 	$(NULL)
+ 
++if ENABLE_UNVERSIONED
++AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\"
++docletdir = $(libdir)/valadoc/doclets/gtkdoc
++else
++AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\"
++docletdir = $(libdir)/valadoc@PACKAGE_SUFFIX@/doclets/gtkdoc
++endif
++
+ BUILT_SOURCES = libdoclet.vala.stamp
+ 
+ doclet_LTLIBRARIES = libdoclet.la
+ 
+-docletdir = $(libdir)/valadoc/doclets/gtkdoc
+-
+ libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined
+ 
+ libdoclet_la_VALASOURCES = \
+diff --git a/valadoc/doclets/html/Makefile.am b/valadoc/doclets/html/Makefile.am
+index 885fbfbab..855184020 100644
+--- a/valadoc/doclets/html/Makefile.am
++++ b/valadoc/doclets/html/Makefile.am
+@@ -3,7 +3,6 @@ include $(top_srcdir)/Makefile.common
+ NULL =
+ 
+ AM_CFLAGS = \
+-	-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
+ 	-I$(top_srcdir)/gee/ \
+ 	-I$(top_srcdir)/vala/ \
+ 	-I$(top_srcdir)/libvaladoc/ \
+@@ -12,12 +11,18 @@ AM_CFLAGS = \
+ 	$(LIBGVC_CFLAGS) \
+ 	$(NULL)
+ 
++if ENABLE_UNVERSIONED
++AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\"
++docletdir = $(libdir)/valadoc/doclets/html
++else
++AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\"
++docletdir = $(libdir)/valadoc@PACKAGE_SUFFIX@/doclets/html
++endif
++
+ BUILT_SOURCES = libdoclet.vala.stamp
+ 
+ doclet_LTLIBRARIES = libdoclet.la
+ 
+-docletdir = $(libdir)/valadoc/doclets/html
+-
+ libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined
+ 
+ libdoclet_la_VALASOURCES = \
+diff --git a/valadoc/icons/Makefile.am b/valadoc/icons/Makefile.am
+index 454bdba7c..668956f3b 100644
+--- a/valadoc/icons/Makefile.am
++++ b/valadoc/icons/Makefile.am
+@@ -1,6 +1,10 @@
+ NULL =
+ 
++if ENABLE_UNVERSIONED
+ iconsdir = $(datadir)/valadoc/icons
++else
++iconsdir = $(datadir)/valadoc@PACKAGE_SUFFIX@/icons
++endif
+ 
+ dist_icons_DATA = \
+ 	abstractclass.png \
+diff --git a/valadoc/tests/Makefile.am b/valadoc/tests/Makefile.am
+index e40cc1ca3..2bca58128 100644
+--- a/valadoc/tests/Makefile.am
++++ b/valadoc/tests/Makefile.am
+@@ -22,7 +22,6 @@ check-TESTS: $(TESTS)
+ 	G_DEBUG=fatal_warnings $(builddir)/driver
+ 
+ AM_CFLAGS = \
+-	-DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \
+ 	-DPACKAGE_VERSION=\"$(VERSION)\" \
+ 	-DTOP_SRC_DIR=\"$(abs_top_srcdir)\" \
+ 	-I$(top_srcdir)/libvaladoc/ \
+@@ -36,6 +35,12 @@ AM_CFLAGS = \
+ 	$(LIBGVC_CFLAGS) \
+ 	$(NULL)
+ 
++if ENABLE_UNVERSIONED
++AM_CFLAGS += -DPACKAGE_DATADIR=\"$(libdir)/valadoc\"
++else
++AM_CFLAGS += -DPACKAGE_DATADIR=\"$(libdir)/valadoc@PACKAGE_SUFFIX@\"
++endif
++
+ BUILT_SOURCES = driver.vala.stamp
+ 
+ check_PROGRAMS = driver
+-- 
+2.20.1
+
diff --git a/dev-lang/vala/metadata.xml b/dev-lang/vala/metadata.xml
index 5f429420cb76..a6cf4ba175a4 100644
--- a/dev-lang/vala/metadata.xml
+++ b/dev-lang/vala/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-  <email>gnome@gentoo.org</email>
-  <name>Gentoo GNOME Desktop</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="valadoc">Installs valadoc documentation generation tool</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-lang/vala/vala-0.40.13.ebuild b/dev-lang/vala/vala-0.40.13.ebuild
new file mode 100644
index 000000000000..bebbf4102931
--- /dev/null
+++ b/dev-lang/vala/vala-0.40.13.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="Compiler for the GObject type system"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1"
+SLOT="0.40"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="test valadoc"
+
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/vala-common-${PV}
+	valadoc? ( >=media-gfx/graphviz-2.16 )
+"
+DEPEND="${RDEPEND}
+	!${CATEGORY}/${PN}:0
+	dev-libs/libxslt
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+	test? (
+		dev-libs/dbus-glib
+		>=dev-libs/glib-2.26:2
+		dev-libs/gobject-introspection )
+"
+
+PATCHES=(
+	# From master
+	"${FILESDIR}"/0.40-Allow-disabling-the-build-of-valadoc.patch
+	# Add missing bits to make valadoc parallel installable
+	"${FILESDIR}"/0.40-valadoc-doclets-data-parallel-installable.patch
+)
+
+src_configure() {
+	# https://bugs.gentoo.org/483134
+	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
+
+	# weasyprint enables generation of PDF from HTML
+	gnome2_src_configure \
+		--disable-unversioned \
+		$(use_enable valadoc) \
+		VALAC=: \
+		WEASYPRINT=:
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/dev-lang/vala/vala-0.42.5.ebuild b/dev-lang/vala/vala-0.42.5.ebuild
new file mode 100644
index 000000000000..1339fc0c6a54
--- /dev/null
+++ b/dev-lang/vala/vala-0.42.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="Compiler for the GObject type system"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1"
+SLOT="0.42"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="test valadoc"
+
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/vala-common-${PV}
+	valadoc? ( >=media-gfx/graphviz-2.16 )
+"
+DEPEND="${RDEPEND}
+	!${CATEGORY}/${PN}:0
+	dev-libs/libxslt
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+	test? (
+		dev-libs/dbus-glib
+		>=dev-libs/glib-2.26:2
+		dev-libs/gobject-introspection )
+"
+
+PATCHES=(
+	# From master
+	"${FILESDIR}"/0.40-Allow-disabling-the-build-of-valadoc.patch
+	# Add missing bits to make valadoc parallel installable
+	"${FILESDIR}"/0.40-valadoc-doclets-data-parallel-installable.patch
+)
+
+src_configure() {
+	# https://bugs.gentoo.org/483134
+	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
+
+	# weasyprint enables generation of PDF from HTML
+	gnome2_src_configure \
+		--disable-unversioned \
+		$(use_enable valadoc) \
+		VALAC=: \
+		WEASYPRINT=:
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}