gentoo resync : 04.05.2021

7 files changed, 4 insertions, 498 deletions

diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 82cddc562f95..2b7ce467f51f 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -1,18 +1,12 @@
-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
 AUX 0.44-valadoc-doclets-data-parallel-installable.patch 6063 BLAKE2B d27b69ab82a789f73e9ba02ef10d3865452a5d5532215e44533012be29d36d40496346a0557ee90831fbe2cf1da9e77e56b30c3f1e988c051b97142d12952931 SHA512 d5174b6dbc887f25f90e400ae569152a998da3df3e9ca4ea5f450240b1982b7a118ddbce7814b98e966e384b956c02389b34200b6a1ecbf4e634fdc07421809a
-DIST vala-0.36.20.tar.xz 2918672 BLAKE2B 9c2c46992444fafd173f767a4a10ac185b0c49db0ede3cb52dec10da08ab3370adb4445087b24c91c9126e8586418a149ac783b3de92cac6c4badd488f3dc56f SHA512 21ca0573a2f9d945a362f7f15da7db25532fd7b19a0aa0442243b95df0568b7a88ae94d0659af44f6f57e364f4370de361102e7e46a070487985e7cb5d81277c
-DIST vala-0.40.24.tar.xz 3484308 BLAKE2B eb31444099c55b41ac2a2aa5be40eb3bc767e08d0670f2a36d51317cfd39a4a601578561863687385b8a922232909b5d8fb85a842e414aace077290070044100 SHA512 c10e9e51b5854d2f0087ce8a9eac561fbc22785bb719bf96936c69187550b2cb92ceafb5fd9df85b4eaa49f5c1f77c660de305d0cee944c216850c80c5f4cc65
 DIST vala-0.44.11.tar.xz 3370248 BLAKE2B c111b6175e6339148e30bedc77f62a9ef3ec912ad0621c9303fc5dba31694173b49ccc433d3681303d64a1e442ed9b7b064f27931369cb13fa028bfc25ffa3c9 SHA512 6111699039ed37084426d7603b82dfa9bd497c66ba7353ee22e8541bf15a2cbb634d315593c093f18c20bac877ae34884e5b570cd25237ce12aa73e941c4c540
 DIST vala-0.46.13.tar.xz 3434196 BLAKE2B 49b7e0b776e185653c1b8c00747a150ceb42cf89006fd55d37e3efd0824dace379d2c72cdb45d481b0545d0b4b37299bc6161b2d083d3221d2d8d8ca7c10d6dc SHA512 6d8d1acebf4706346d5dc986f5c900cfda929ca59ca3f3907cff56892a496bf524b1f74032ac6c8587b236a473124e15c6f83f949636e28141a55c8abeddf004
 DIST vala-0.48.12.tar.xz 3492200 BLAKE2B 0a401ac4349dc1c628fa608b5a89504583d6d2bb05ca74eb507e766cca418121e14adfe6e8cfeb8f42212c717280b9b91426309df415d869896654be626c46c5 SHA512 da7becf8b92985a07b139651c14bd41ec86aed3e2b610029d2b376f70335c98607f39de4a1fa4efe9d51e6088edd4c13d22431cada389679d55f684ad548f4d1
-DIST vala-0.50.2.tar.xz 3514208 BLAKE2B f2f7e86b90ac1245d593ba82204667a830843e2fdb8e9a5afaa44453a146461f0ce2b9f9338ef4743bc6055bbce6c023ae92f0bf2ca66757cddd7fc3d7a4db63 SHA512 77069b53037adcd4c3fed2dc4a5c740216b950c52e8a0ed777a5cf9a5d9f078d0abbc4dbce08e122817cd3de0ac75ebd150b0f6f0b0cf4a09cb4a46f96bf4c3e
-DIST vala-0.52.2.tar.xz 3573764 BLAKE2B 88340f7142518a0c17ab2347cd76853d18c00f86ed030cdcdbe726d92dc165ce2c83d07301f77c08f839f1d6b0da05c77e19671817483786fa57ed5bbcd240cc SHA512 c30b64f6899c53eb852128b95265ccec99d27a14388525829da1e5f5ff229c695a1e67b9e3bcc8fef751221c8923aa853bd2065ec0cfbc9b19d6c04007ed4110
-EBUILD vala-0.36.20.ebuild 803 BLAKE2B 1180a074166131d6f99f72fd921a0a76584880e6e72278ef826699cf089b6f09c9fadc0779e4cb9dcabe3fe181822a9164030bd0f3363918392eb4ec3ac0a98f SHA512 d31b573a8e88b52c5cfb4c4348eb0a38418ede0610b3236eb9b875437234f32a246d616da132a0d42fc65216396af6c170eeb2ca3b9fa489d441e6341eeafa30
-EBUILD vala-0.40.24.ebuild 1189 BLAKE2B ab30f22b6aa52a0a9ee356e9752d194bc55f1172ec28daf1644c6b4ddab7d2e24112caace0a123910aa306f1823542958fab87b36bcc6e7f8a633b6cd22a589e SHA512 f87cc175d52cfe5a9350aac5a1602c0b2f42a3d36d6f6583e118c95e6161d70a6afe51c82a84a8e1fe391bd2cc7f67cbfed437f20dbaa587d56fd4e6422df000
+DIST vala-0.50.7.tar.xz 3540048 BLAKE2B 4f3abdfe7f0448846f22a4d822b803484afd1a2371604d63cd7092e2854dbfdb15169ac74226404ca572bc8ac29d5262c6e39346271704003138b9881bd99b30 SHA512 50c4c257e0be020f45270b07fef3646712dc1556dd43ae9d54f164b97056b26779b3559deab9fe96afa11e2e97a13aa2cce348a34cf5d72ea6a3be4a8d7efc94
+DIST vala-0.52.3.tar.xz 3575936 BLAKE2B bef10fdca6af1db5d8ff7b01b624fee5879d82ceb35ccc84d847f9ce26445194d4fc7ec8c3f8177534c0144e9027633ed1b00793e4e2edbe3df51f55f29129cb SHA512 5b757c6a9d1a2e9615fddb014c64a92f6a7c231ba964e449a43e9ad19293d415b66642625aad98d18e436ab438a4530d00bb670c7c7eaae56f43b407f4035bd9
 EBUILD vala-0.44.11.ebuild 1112 BLAKE2B 481c622dead6198dfbc11fb7562b71e6504ab65e3ea354b4a575d138f4a881a8f1f1ae79a0071c7c965bd18c58afde0f79e37d9ba7947858236b408d72e38e18 SHA512 61983430919c70f1524f399cb2d45370f3efb2bd7f6ca347a4bb637062fa71b64cd8507fad5e10b1d6e9a9b2f70808e4cea3c93a2364421a888cbbd719f4110a
 EBUILD vala-0.46.13.ebuild 1305 BLAKE2B 4855220ceb0594546be128b16092270a4d21459d6243c3510e36e556e5e075ab1caffbf579b2a661bbe6470eb24480879928714529a5f82b9d83b0dcbdfd8df7 SHA512 af281ba4479a81ce7e825df237d55e7db552a2f341fe27e0d41de4a0796d0e3e153f9eb01f7ed0ae2b070b5a2ccee6bc7ab32d890ba0ab99d6cadbc3ee14b33e
 EBUILD vala-0.48.12.ebuild 1305 BLAKE2B 486479be7fc63ca09465495fcfc6dbda8f8f24f249f29fe43d4165d252ac29058624964b9a6d6310144aaef5d93c6deca2210a7b2bc97557403b1d22003cad05 SHA512 718197b4d6a6de87201b4764c03c4427e8cea5446d155ca250fbe827bcf5b1d3ebef63c56f49ffcda84ebbab33fb6fcb57db8cc6ecff6a7c5d6993b51bf8b566
-EBUILD vala-0.50.2.ebuild 1312 BLAKE2B 507ce10645273e1b88b85552e019ac819425b5b483fb0ae2d711d8632e4d6c01da13b9a263455e876634aa9671713dc3b88ec7abe7c8187da3d7430ee75f7d29 SHA512 2d85349c7a4ad95d79e44f4c4fb259edbe4f83e44ceda05ad22d74f2fab9d5d745465537aa6f1a06e771f062a4f19d72f597ede88c4efa52bae9627d60c565e3
-EBUILD vala-0.52.2.ebuild 1325 BLAKE2B c22b1e6b1bac1cde9957bafa7d4a6db9500d502e3c0cae0665d5371b62fac47d96c1db1ec7f070cc26a5d800421079c4e35e9d63ebfa0d461f9a5b4b355ee6cd SHA512 53cbb0363281f5938bc350a3546fbdfaaa94096bbed408aa49335f836ea12053f86eaf73af9e581e57a4fef4cf97fe07295b7111dff3964070a78b84284878e6
+EBUILD vala-0.50.7.ebuild 1312 BLAKE2B 507ce10645273e1b88b85552e019ac819425b5b483fb0ae2d711d8632e4d6c01da13b9a263455e876634aa9671713dc3b88ec7abe7c8187da3d7430ee75f7d29 SHA512 2d85349c7a4ad95d79e44f4c4fb259edbe4f83e44ceda05ad22d74f2fab9d5d745465537aa6f1a06e771f062a4f19d72f597ede88c4efa52bae9627d60c565e3
+EBUILD vala-0.52.3.ebuild 1325 BLAKE2B c22b1e6b1bac1cde9957bafa7d4a6db9500d502e3c0cae0665d5371b62fac47d96c1db1ec7f070cc26a5d800421079c4e35e9d63ebfa0d461f9a5b4b355ee6cd SHA512 53cbb0363281f5938bc350a3546fbdfaaa94096bbed408aa49335f836ea12053f86eaf73af9e581e57a4fef4cf97fe07295b7111dff3964070a78b84284878e6
 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
deleted file mode 100644
index 55bcb7d63b05..000000000000
--- a/dev-lang/vala/files/0.40-Allow-disabling-the-build-of-valadoc.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-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
deleted file mode 100644
index 1c9b44677e1e..000000000000
--- a/dev-lang/vala/files/0.40-valadoc-doclets-data-parallel-installable.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-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/vala-0.36.20.ebuild b/dev-lang/vala/vala-0.36.20.ebuild
deleted file mode 100644
index 109cbd7c8710..000000000000
--- a/dev-lang/vala/vala-0.36.20.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Compiler for the GObject type system"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1"
-SLOT="0.36"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/vala-common-${PV}
-"
-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 )
-"
-
-src_configure() {
-	# weasyprint enables generation of PDF from HTML
-	gnome2_src_configure \
-		--disable-unversioned \
-		VALAC=: \
-		WEASYPRINT=:
-}
diff --git a/dev-lang/vala/vala-0.40.24.ebuild b/dev-lang/vala/vala-0.40.24.ebuild
deleted file mode 100644
index 06f7e854eeaf..000000000000
--- a/dev-lang/vala/vala-0.40.24.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 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 sparc x86 ~x86-linux"
-IUSE="test valadoc"
-RESTRICT="!test? ( test )"
-
-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() {
-	# 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.50.2.ebuild b/dev-lang/vala/vala-0.50.7.ebuild
index c1a73c907f81..c1a73c907f81 100644
--- a/dev-lang/vala/vala-0.50.2.ebuild
+++ b/dev-lang/vala/vala-0.50.7.ebuild
diff --git a/dev-lang/vala/vala-0.52.2.ebuild b/dev-lang/vala/vala-0.52.3.ebuild
index d3cf852fc947..d3cf852fc947 100644
--- a/dev-lang/vala/vala-0.52.2.ebuild
+++ b/dev-lang/vala/vala-0.52.3.ebuild