gentoo resync : 20.03.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
commit: 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree: 356496503d52354aa6d9f2d36126302fed5f3a73 /x11-libs
parent: fcc5224904648a8e6eb528d7603154160a20022f (diff)
61 files changed, 316 insertions, 1104 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 569c3efd1561..209e31058f98 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index e15d39f26ef2..7e12322d21c9 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,10 +1,10 @@
 AUX cairo-1.12.18-disable-test-suite.patch 390 BLAKE2B 49db479ddcb636e80483357b291d66ae563d8dfeabde2f7b017fda4cb272cee856e9d29dfddcc22e3cfcb3e2ff62c9eba802ace0e5ef1e49aeeef26002482ec9 SHA512 097c1a32e007fb6852a0df1ad7f7eab6d00a422247055edf140d3f2b819122b16a9c09e21b9a601766a7facda1961262e68b078944877cab0b3b234eff149783
-AUX cairo-1.16.0-binutils-2.34.patch 587 BLAKE2B f2a5ffb4bdb4f2b63f07d0135e63704629093008d8479b19353d790012e8f1cc93707694ee79f71cc6e81c008505e1a069694231357748b54dc45c8bb2e94bba SHA512 ad01c6f651fc66d9a2853fc95f2402b9413d71e6353fdce609e0849a3477abbb2128e460a9c166adbd9c3da80786b2382b884a1249ccf22b8600ab4930d2b0c7
+AUX cairo-1.16.0-binutils-2.34.patch 2332 BLAKE2B a0df3d0f99b26a867ac554ee515c7e435f02f49c97806bd7d2684a8d6fd737014560c2451761273641b88d9892fb4f5d00f9ca22a1b021e4edece442e7cd7425 SHA512 ca05ea37273c17d4e6b3076f23defb028d25ad96cf99e65937c3e59f5cf9e63a35cb8374a8e0d4037b03f889f338628c9303686cbc6dd2d695505fdde2119c95
 AUX cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch 751 BLAKE2B 9b693598ac8fec28c0479544cc02dfbd1daab171b88bf7b1eb6ee353fdd32ee4228f24723d3b4937b3f30838d68d2a9a6f87b40d08896b59d36345d7e9447a32 SHA512 33d8454b2173c5be1f53576c143781f2b802ee961cef496d6fec5ba58554f4302ea6c351dc64f133d93c5495dacb3d387b8a201bfc415d54f8c77e41e877d319
 AUX cairo-1.16.0-pdf-add-missing-flush.patch 914 BLAKE2B 6277dccf5e6fc70d885548b4814253084c5ba7946b29ee5c5209c2c207721d9699d9fbab83e40f6d10394e89fe7a23ea5dc194cfcb2495e3ac2b075e22fa83bb SHA512 569cc28538333cdd907e3c9f26dd6512e48188dcb761284f2414936d60d4239d7ac15a5836f1f390d4881cce71bfb62a0679e097386116ecf807ecd03bf0f03f
-AUX cairo-1.16.0-strings.patch 690 BLAKE2B 2509bdb3d6592c9606c92730f1e052c0ce5dbbd557daaeb5955b998b8d89184063f15c583ea745fc16c07185cfe06e5f8ef9c18f749d35341918d626ceadd2b3 SHA512 90c9595698b30cceecc17ca186e7936d7884c382a23b8d536bdb10b912e6f1640037fc55326833a4977f332e02fc88d967ded751e50543c68dd80763b5fc43fe
+AUX cairo-1.16.0-strings.patch 1379 BLAKE2B 60b63e80ae35385a0c2cbbface46379e76ad8cbc472d76fd68803330e42c49f9c71d662b1824ebf16fbd1bde794ec12a34b8e311758d6e639411e35cd1f34f97 SHA512 d9d9e95b80a0aaee703ff4f58526455db5ac57bce35237826ef4730c54f58b6752756ab92f23e36343e056b0e84269c4b692dfc40cc7836afad3b44fc46c2e26
 AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0fd4981a07a25122387c2f1b6ca4cd89a830360357953706dee62e4233126cd0630e4622f0682f6782cd27fa31f20ecc SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e
 DIST cairo-1.16.0.tar.xz 41997432 BLAKE2B aa37edf7fdf0c952484fd0adc9281724227db93958d6e4919216b30e9017fab670bc2340e3b975737080f1f67dec24025fe0e4680e275ab7703cfb9235eb1fe0 SHA512 9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
 EBUILD cairo-1.16.0-r5.ebuild 3873 BLAKE2B b3678e94ccef9af83c353e6f2cb3f1f02260277a8ddf5bad33f086ed4675d5aa5ae43dc177c12879469392258fedcf0f2303287cfed590a8e10243d04f129cc9 SHA512 12f69610664fe3e6bfc6ce96c2a80961667c752e3703f91656d27226eeefe706b93455993804b07d44fc299d7915f6918ee986d60942675b245a6d979f4ab31b
-EBUILD cairo-9999.ebuild 3713 BLAKE2B 579cf46822a7a7ede03d8d4cc7ca0a6f6ef0eea7aded1b23f98538a54b385c330b4b7fd1a183aef81f8bad3ff046e99648b21f1b83263d6635f9e34820f4dc46 SHA512 240ee225f56afd65e767dbc137f3ca19a0b3f3d16d814d05c457daa1a838d0fd7bd4b5a88982a812a35fd925783367f7843773005bf200151977f1910c2abc06
+EBUILD cairo-9999.ebuild 3501 BLAKE2B 136a331173d878461a0e827dc74bf42e24fa8d2dc9e907a3c76cc1e12f3ca3f06dddcd4dd7f2fba418a219dfd96c1c696a983ea9f5306e15be72edac35aaf180 SHA512 929ec8991c487415aa7f18760f86276a7b128e44eb8396c48a0018c8c24d49402ca8d56a07b26aa27b4db6b0e9bed8700a310e46c6007ed389a800983335268e
 MISC metadata.xml 710 BLAKE2B 11585ec0ac0ad56eb192f84388ab9fb7ce751ae29555fb366cd8966ec38fceace4978a2b6cad310073484eae51539dcbbe68323205b2b8e97217bc1b87f62b48 SHA512 1021784a9a6db6290fa57e2e5ed356131860820a114a601c8e77fab77eb7b075b81f1288e5df97cad8fe2d86b7aeb67a712f8fd9c5ed775d607d50d6a589dc01
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index f2e78b07a7b0..0c5c1384ad56 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -65,10 +65,6 @@ PATCHES=(
 src_prepare() {
 	default
 
-	if has_version ">=sys-libs/binutils-libs-2.34"; then
-		eapply "${FILESDIR}"/${PN}-1.16.0-binutils-2.34.patch
-	fi
-
 	# tests and perf tools require X, bug #483574
 	if ! use X; then
 		sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
@@ -115,11 +111,6 @@ multilib_src_configure() {
 		--enable-png \
 		--enable-ps \
 		--enable-script \
-		--disable-drm \
-		--disable-directfb \
-		--disable-gallium \
-		--disable-qt \
-		--disable-vg \
 		--disable-xlib-xcb \
 		${myopts}
 }
diff --git a/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch
index 03daac0eca4b..a10cad5ee553 100644
--- a/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch
+++ b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch
@@ -1,6 +1,55 @@
+From e30259f6237571c61992433c110bc6e1ef900244 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
+Date: Tue, 23 Feb 2021 11:36:24 +0000
+Subject: [PATCH] cairo-trace: fix build with newer versions of bfd
+
+And update configure/meson checks to check for the new function.
+
+Drop libiberty.h check since it's only needed by backtrace-symbols.c
+which we're about to remove.
+
+Closes #391, #460
+---
+ Makefile.am                        |  1 +
+ configure.ac                       |  8 +++++++-
+ meson-cc-tests/bfd-section-flags.c |  9 +++++++++
+ meson.build                        | 11 ++++++-----
+ util/cairo-trace/lookup-symbol.c   |  7 +++----
+ 5 files changed, 26 insertions(+), 10 deletions(-)
+ create mode 100644 meson-cc-tests/bfd-section-flags.c
+
+diff --git a/configure.ac b/configure.ac
+index 18e4a305f..6444a3da3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -826,7 +826,13 @@ CAIRO_ENABLE(interpreter, cairo-script-interpreter, yes, [
+ AC_CHECK_LIB(bfd, bfd_openr,
+ 	 [AC_CHECK_HEADER(bfd.h, [have_bfd=yes],
+ 	 [have_bfd=no])], [have_bfd=no])
+-AC_CHECK_HEADER(libiberty.h,, [have_bfd=no])
++dnl bfd_section_flags is an inline func so we don't bother with linking the lib in
++AC_LINK_IFELSE([AC_LANG_PROGRAM([
++  #include <bfd.h>
++  asection *s;
++],[
++  return bfd_section_flags(s) == 0;
++])],[],[have_bfd=no])
+ if test "x$have_bfd" = "xyes"; then
+     AC_DEFINE([HAVE_BFD], [1], [Define to 1 if you have the binutils development files installed])
+     BFD_LIBS=-lbfd
+diff --git a/util/cairo-trace/lookup-symbol.c b/util/cairo-trace/lookup-symbol.c
+index f9665b36f..9af0b5944 100644
 --- a/util/cairo-trace/lookup-symbol.c
 +++ b/util/cairo-trace/lookup-symbol.c
-@@ -145,14 +145,14 @@ find_address_in_section (bfd *abfd,
+@@ -65,7 +65,6 @@
+ 
+ #if HAVE_BFD
+ #include <bfd.h>
+-#include <libiberty.h>
+ 
+ struct symtab {
+     bfd *bfd;
+@@ -145,14 +144,14 @@ find_address_in_section (bfd *abfd,
      if (symbol->found)
  	return;
  
@@ -18,3 +67,6 @@
      if (symbol->pc >= vma + size)
  	return;
  
+-- 
+2.34.1
+
diff --git a/x11-libs/cairo/files/cairo-1.16.0-strings.patch b/x11-libs/cairo/files/cairo-1.16.0-strings.patch
index ee72f9dec7ce..2c4742887e36 100644
--- a/x11-libs/cairo/files/cairo-1.16.0-strings.patch
+++ b/x11-libs/cairo/files/cairo-1.16.0-strings.patch
@@ -1,4 +1,21 @@
-https://bugs.gentoo.org/726200
+From 23b6e8bb5798c77550da613fadc3da8b3be14573 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sun, 14 Jun 2020 09:58:52 +0100
+Subject: [PATCH] build/aclocal.float.m4: detect 'strings' with AC_CHECK_TOOL
+
+This way all binutils tools are detected with $CHOST prefix
+if exist. And strings is allowed to be substituted with
+STRINGS environment override, so 'llvm-strings' (or other)
+alternative can be used.
+
+Bug: https://bugs.gentoo.org/726200
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ build/aclocal.float.m4 | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/build/aclocal.float.m4 b/build/aclocal.float.m4
+index f92db03e6..d9728c123 100644
 --- a/build/aclocal.float.m4
 +++ b/build/aclocal.float.m4
 @@ -31,10 +31,13 @@ int main() { return 0; }
@@ -17,3 +34,6 @@ https://bugs.gentoo.org/726200
    if test "$ax_cv_c_float_words_bigendian" = unknown; then
      ax_cv_c_float_words_bigendian=no
    else
+-- 
+2.34.1
+
diff --git a/x11-libs/colord-gtk/Manifest b/x11-libs/colord-gtk/Manifest
index 1883de41afb1..a8aff5920abe 100644
--- a/x11-libs/colord-gtk/Manifest
+++ b/x11-libs/colord-gtk/Manifest
@@ -1,4 +1,6 @@
 AUX colord-gtk-0.2.0-optional-introspection.patch 1471 BLAKE2B 3d4ce65f6241538fc4f8b6114c95ef229654093dabed26ebf1c66aabda2d5039749cce8580a4974c70afdd49e127b791a561a04202338c9b6512870804bce4db SHA512 a49618d773acb377c8015243ac6657e17b65e1f0f54228c391617118ae61199662a6d6398d5c5cd02ceb4cc74dc2b4cedf6488536fbe418768480285c5500773
 DIST colord-gtk-0.2.0.tar.xz 20480 BLAKE2B 73bbb349e84e5bfd28358cbe22609de84b86f90eb96a3fedc6e30a1764d9c667cd82408116cdf65591496ab4e2f59f2b415cd1aa8f995fe2162ee4d649c5d496 SHA512 797eebfd4451fcae4cf70835f5de3d9bdc9e8401ddb82a2fef2310002f28bf523b599c587ff35eb89ceff38a245a6311129ad90b107f837ac4f42f268c9aad97
+DIST colord-gtk-0.3.0.tar.xz 21768 BLAKE2B e6fe56dfa969f18bd406d481dd13e83b689a820aeddaf1482ec97e89a3f78d4228544c79849d330962f3d45e3506f1c0b2540ed7bfab36ede04008877d503b94 SHA512 95ea9e8925d56462b8e5230a6737ca8e75d2273b2803e00f7aa2f933d22f88373194dccc00117fce85579274cc0daf88876fa265510580b1610734bb45220896
 EBUILD colord-gtk-0.2.0.ebuild 1349 BLAKE2B dcffb41a0c1a73a35a1c507a5003006e2a229eb2172226e8f7b0ecd3aca7d47b4d871ca7a607ba3149af15dcf60a9dd3bc3bff5a20fafb6636c65a50ced0b030 SHA512 367aa2ec128152ec52e99724945dc1edef7c327b048fb7bc2dc976439456b9a144b84ff59d8c7d360a23106027f1d3d345f9b0022fe0a3e0a5896c2b7d0442a7
+EBUILD colord-gtk-0.3.0.ebuild 1328 BLAKE2B 161b6c7e464ac60cfa5ea0e6b4e2d7f08af4e1223e1b8a4b56a6a986dc4f3b02d1914fe6e2bc752c0313b7f3a425363862b98bdd33db6b899e17c970fd3a3c29 SHA512 a1297515b7454fb6a429e8e75990e7f4d6e47cced288befc8a337c2c60e88d23c216d9c341ecc8ab17894552590fb950f217ea0140adf9900d14315509d872b8
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/x11-libs/colord-gtk/colord-gtk-0.3.0.ebuild b/x11-libs/colord-gtk/colord-gtk-0.3.0.ebuild
new file mode 100644
index 000000000000..656c769a9861
--- /dev/null
+++ b/x11-libs/colord-gtk/colord-gtk-0.3.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit meson vala
+
+DESCRIPTION="GTK support library for colord"
+HOMEPAGE="https://www.freedesktop.org/software/colord/"
+SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0/1" # subslot = libcolord-gtk soname version
+KEYWORDS="amd64 ~arm arm64 ~mips ~ppc64 ~riscv x86"
+
+IUSE="doc +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+DEPEND="
+	>=dev-libs/glib-2.28:2
+	>=x11-misc/colord-0.1.27:=[introspection?,vala?]
+	x11-libs/gtk+:3[introspection?]
+	>=gui-libs/gtk-4.4:4[introspection?]
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		>=dev-util/gtk-doc-1.9
+	)
+	app-text/docbook-xsl-ns-stylesheets
+	introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
+	vala? ( $(vala_depend) )
+"
+
+RESTRICT="test" # Tests need a display device with a default color profile set
+
+src_prepare() {
+	use vala && vala_src_prepare
+	default
+}
+
+src_configure() {
+	local -a emesonargs=(
+		-Dgtk4=true
+		-Dgtk3=true
+		-Dgtk2=false
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+		-Dtests=false
+		-Dman=true
+		$(meson_use doc docs)
+	)
+	meson_src_configure
+}
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index 2ff6a23d0452..e85a414da746 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,5 +1,3 @@
-DIST goffice-0.10.50.tar.xz 2430608 BLAKE2B 0b06da8d58c4407465266f8c5421331d5d05731038bca191afdd1823950dde07439d458c0ddb93e0641ff81e727f055313be3c8af29bdf32214ed8b2c2cafc0b SHA512 1117540d9162d45059150281b03941ff9b6df1929dcbd7e5aa6e28010d3bb5a46902c30b6f1d35fd5b60f9afe73b58f132aa686aa1712332ea18635d5a79bd0c
 DIST goffice-0.10.51.tar.xz 2432992 BLAKE2B 89da3c4707516884c13fed15f3ea04a60f871888469c7a119d42654f1470001bbcbc5a67bd46fcdb6af458ded0cb951a132cc60cd7861d6ebb762bdab1cf4311 SHA512 4d0e6c4c4c6c2f18b1e22c2b24d4034a693c1f6698e58589b83a956b9ff52d1ce05f1e7fdaab5c22c8c6f1d93b53c202f2505bdf9fddba646ef34c75fdb2f520
-EBUILD goffice-0.10.50.ebuild 1426 BLAKE2B 04420f6fe5beda22005e0abc5a773e2d2692b3df8d591c82d1c4d2a5ee0b66395ede2e6515bdd2cf2040354f6e631a90ee52aeec96aacdb4a33df3f7456f5088 SHA512 90f756fe773b544b1f360736fb3eaab06164c5cac40f9ad3129f8c1053fd3924cbf01fa64cb453805a09d9b663852aa7b4cabe5bf029e9be9e77581116aa1c1e
-EBUILD goffice-0.10.51.ebuild 1427 BLAKE2B 3524f72f80da0d858b23d8598d34d4b987b49d73bc33990489634696266471eb8332d9fceaf0af0ba477efe05b0271efddb8d7115e621be2e9fb4eb410888809 SHA512 7d3d4b895e36936e05c126861993f529fe84236deb6ede9426f80ee4b1439d0f672dbead9b619c550b0efb7a11120b9dbb7556efa0fb03fee6607b04c311df49
+EBUILD goffice-0.10.51.ebuild 1426 BLAKE2B c26a2b63209d72e576da5e60899e2e30351530a819e060d6adb5451660a1d5557b5a511030d7bffabf106d7dfe843b391b71b361c4691a00b515e58533daedca SHA512 97e0490875f3698a4405cc203fa87a7eaa3c7e336f6d71bb7de0cf411e24afc59a304fab9d45f9c16952af6f77269c3296fb6525cc97002a99e7432806d8a1dd
 MISC metadata.xml 547 BLAKE2B d4d95fec4ee5b452af722544aeab368219ecd832def2458af565639cbed6e37807a8fd54dc388070bef89f6f277ac323f27cc397f9b469f60e02e001e12a91fb SHA512 b5b72cea3a76b2ce768510f32e7e4ac77a4af086671304a52f19897c54a3e8af1f36b625e590498bbb51da5c267af66ed979c8a27d9e0d6c4f4bfc7f78390326
diff --git a/x11-libs/goffice/goffice-0.10.50.ebuild b/x11-libs/goffice/goffice-0.10.50.ebuild
deleted file mode 100644
index f50270aea1db..000000000000
--- a/x11-libs/goffice/goffice-0.10.50.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org libtool
-
-DESCRIPTION="A library of document-centric objects and utilities"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/"
-
-LICENSE="GPL-2"
-SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="+introspection"
-
-# FIXME: add lasem to tree
-RDEPEND="
-	>=app-text/libspectre-0.2.6:=
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/libxml2-2.4.12:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.22:2
-	>=gnome-extra/libgsf-1.14.24:=[introspection?]
-	>=x11-libs/cairo-1.10:=[svg]
-	>=x11-libs/gdk-pixbuf-2.22:2
-	>=x11-libs/gtk+-3.20:3
-	>=x11-libs/pango-1.24:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	introspection? (
-		>=dev-libs/gobject-introspection-1:=
-		>=gnome-extra/libgsf-1.14.23:=
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.12
-	>=dev-util/intltool-0.35
-	virtual/perl-Compress-Raw-Zlib
-	virtual/perl-Getopt-Long
-	virtual/perl-IO-Compress
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-gtk-doc \
-		--disable-maintainer-mode \
-		--without-lasem \
-		--with-gtk \
-		--with-config-backend=gsettings \
-		$(use_enable introspection)
-}
-
-src_install() {
-	default
-	dodoc MAINTAINERS
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/x11-libs/goffice/goffice-0.10.51.ebuild b/x11-libs/goffice/goffice-0.10.51.ebuild
index 2bcc131cd893..d5051f0e3b5c 100644
--- a/x11-libs/goffice/goffice-0.10.51.ebuild
+++ b/x11-libs/goffice/goffice-0.10.51.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/"
 
 LICENSE="GPL-2"
 SLOT="0.10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="+introspection"
 
 # FIXME: add lasem to tree
diff --git a/x11-libs/goocanvas/Manifest b/x11-libs/goocanvas/Manifest
index e160c90e5b9f..c6101e0865b8 100644
--- a/x11-libs/goocanvas/Manifest
+++ b/x11-libs/goocanvas/Manifest
@@ -1,6 +1,5 @@
 DIST goocanvas-2.0.4.tar.xz 584272 BLAKE2B 027ab47c1e9c241f74509001426367e86025ec8ea5901cf64c2014f8c32b83ce60870ca754dd15e8982a7023b77d3856b39dbbbdd636de6da47d361cb15a940e SHA512 e57dfd59d9b9cb64deadfeac193c11a89347c7f0e966377cfb98afcc2b46be13fe05d253a96e63dc7e6981c75e6e871040b83d8d0aee95cb62b79965d6be5688
 DIST goocanvas-3.0.0.tar.xz 556832 BLAKE2B 4ee632a614b6b881000bbee8d5e21a166151a94667c603c92b94c5e076fab78a6df44fe1d45fb4d7c4d65c0e060b599abf3970313542836a63efbca33d6a075b SHA512 a53839af4d98afdfc0f92531bdb09013dd71e964185dc2670af077bb7b41b9ff5c75f2801f6e77c99055b38f3603d8cf197f84affb8d7c3196526ce824b228e3
-EBUILD goocanvas-2.0.4-r1.ebuild 1289 BLAKE2B 6b0a74060e137eaacee6a6402fec2277d6ef9cbbcc7a765f249316e1d48c3c7fcfc9e0442f607bf7dc11687f5264222617a902da815530216e9c72ad80f3b7fc SHA512 7b87bdf8645a9090eaddec1bdf4e9ed151eb8e377a3e0c8094a281374855657f0e05312a4c22c5990c5f5ceb179deb0d053a33595aa8da765a9e0873d724b49b
-EBUILD goocanvas-2.0.4-r2.ebuild 1282 BLAKE2B d39ce74332a8f817b8774b49a6a411b524e964f04cc375965107cf4674d02681684c37b8f15e41ad319b635d169052dcb1996a226a31d6fd8fbf632d766f6df5 SHA512 6ee2c7caa4de06e935ec86d887a9494badd4cac4a53d86625257d3bed22ee4ef247957e6451342e94b34fff1940916ae4f03649b040cf4144abe46ea32219520
-EBUILD goocanvas-3.0.0.ebuild 1282 BLAKE2B e040b8dcf262c63b80dbb4c4b0e867c0a19596fafdbcf5100931ea0de41288d89323b98141f3a587a2fb227970cf5497967897e362a960e5ef2dc293aaa990b4 SHA512 b4e555ea8033ce6455873b511777fb2f1514877563d1f4a9f6bcd80101c5b11f736592824fc7652c4fd43bfc692eee4fd47242c8c4be0cee10943052d3248ed2
+EBUILD goocanvas-2.0.4-r2.ebuild 1284 BLAKE2B 65f623c6906304058c117ba722b9bb621fb43a70440c37727f9ba73ab584cc1b3747f13e6910db813d6c9655ae62162ad4a20a01952085f383f37eb35e34e200 SHA512 d85177cda1f6c36088e00e0b08d6e8bf7f062e5096aae047e96335d6fa61819355413d922d2f8352e2a19312f3e0c0fc299e4c2e44bfb82c1e2bdd078e91471c
+EBUILD goocanvas-3.0.0.ebuild 1289 BLAKE2B c87ad4dbad0c3c33aaeec8659c2e978b44cdf7e352c2a37d3f17eaefd0a98835834a6b62bf5053537b8970fe874026656fd252001a3de6a454eb1a6d977c9a78 SHA512 990c9f904b32bf26de79ffc59c08e009cf7133824854c7366013b0db1ed5b7116f89fd483118e3d1a2e8db5af4009442f4b39829d4d555d79b1029a65684b468
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/x11-libs/goocanvas/goocanvas-2.0.4-r1.ebuild b/x11-libs/goocanvas/goocanvas-2.0.4-r1.ebuild
deleted file mode 100644
index 4560a2d0c3ce..000000000000
--- a/x11-libs/goocanvas/goocanvas-2.0.4-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{7..9} )
-inherit gnome2 python-any-r1
-
-DESCRIPTION="Canvas widget for GTK+ using the cairo 2D library for drawing"
-HOMEPAGE="https://wiki.gnome.org/GooCanvas"
-
-LICENSE="LGPL-2"
-SLOT="2.0"
-KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="examples +introspection"
-
-RDEPEND="
-	>=x11-libs/gtk+-3.0.0:3
-	>=dev-libs/glib-2.28.0:2
-	>=x11-libs/cairo-1.10.0
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.16
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Do not build demos
-	sed -e 's/^\(SUBDIRS =.*\)demo\(.*\)$/\1\2/' \
-		-i Makefile.am Makefile.in || die "sed failed"
-
-	# Python bindings are built/installed manually, but not at all anymore (py2).
-	sed -e "/SUBDIRS = python/d" -i bindings/Makefile.am bindings/Makefile.in
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-rebuilds \
-		--disable-static \
-		$(use_enable introspection) \
-		--disable-python
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use examples; then
-		insinto "/usr/share/doc/${P}/examples/"
-		doins demo/*.[ch] demo/*.png
-	fi
-}
diff --git a/x11-libs/goocanvas/goocanvas-2.0.4-r2.ebuild b/x11-libs/goocanvas/goocanvas-2.0.4-r2.ebuild
index 73563a3e29f3..3b03adcbc8ff 100644
--- a/x11-libs/goocanvas/goocanvas-2.0.4-r2.ebuild
+++ b/x11-libs/goocanvas/goocanvas-2.0.4-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/GooCanvas"
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="examples +introspection"
 
 RDEPEND="
diff --git a/x11-libs/goocanvas/goocanvas-3.0.0.ebuild b/x11-libs/goocanvas/goocanvas-3.0.0.ebuild
index 16b18094e850..57df1d4f1b4e 100644
--- a/x11-libs/goocanvas/goocanvas-3.0.0.ebuild
+++ b/x11-libs/goocanvas/goocanvas-3.0.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/GooCanvas"
 
 LICENSE="LGPL-2"
 SLOT="3.0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="examples +introspection"
 
 RDEPEND="
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index b796d02b9d5e..5b4c631f88fb 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -6,9 +6,9 @@ AUX gtk+-3.24.25-update-icon-cache.patch 4770 BLAKE2B 57d80da1fdb365130dd18ea4f2
 AUX gtkrc 627 BLAKE2B 57af25dcadfa09ea784ac485db383753deda23c42ce22582f03041abf7a061e70eced09592ab0750786bea3555d760febc913762b8369b50b327fbd03d918279 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4
 AUX settings.ini 96 BLAKE2B dd0ffe58f3c702d0518e1ad59930a511f98fd1b6e7139b2b2293a3dc8b0419a63a14260ba75b30dc9197f0423a375c675b4f3b34d593ce12828192d18e539fbb SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418
 DIST gtk+-2.24.33.tar.xz 12661828 BLAKE2B f3488b220aaee54bf36fa77e2112d060152e57938845d240014a7d43a5743b1d4de19cc09c683d9d238fd1967cd67cc3c493f2475e4e481f6709f5cdc652c65c SHA512 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5
-DIST gtk+-3.24.30.tar.xz 22407016 BLAKE2B 42e357b066ff40aae2827bc1f8fa821a8b8c8c4f4c09b0c0735e51ea358c1763eda7e8cc3bc70300d66e37af424087d50644cba1406530c15ee721e6b2fd1796 SHA512 4164559f3e14501b9f9330a76535ebf5e26961d436f65e65ea609998cb120fcbcc5d9591453a64e1d414248499857288e5758274d03a7f75e9ae76cbf8c68ff9
 DIST gtk+-3.24.31.tar.xz 22449112 BLAKE2B 2a09b199ad88ab8006e8d768ff6d2c5ddbdd22f84aa7d661e8e25f87a7436135edf0116202574a092536d3293800d83d9dcf1affff27e9baedeb27d31291e6a5 SHA512 e7f8e5003a919e297bd3e616acccbc5cc9bf9c9d41377c108c24db51817fcccec919abc12d05c0ed585d49526d52f0395a1c0f3ed9d9ef816bb0c4b2aa615f9b
+DIST gtk+-3.24.32.tar.xz 22443900 BLAKE2B 0a07f4159d8c09dc46b22a98398020bf164a0a29ff4bc41aea158d697d95362b74558c9605eaafab366500cfeade9b8794baa980dd3023f71336ae8c49e1e4d7 SHA512 326640621b8aca59e9e46282c19b7a88f15469436e39bde7b845028014f245f23fef482db3589a7dbded20fcc82ec3adac66b837472f2b8c3016d285d38582c4
 EBUILD gtk+-2.24.33.ebuild 9805 BLAKE2B e24f2718c012a86e34aec536e34afe919ad526721fc5cc2e9e5df3f92e3820c416a871110ea8f819838f44564d30dc4ff43cd0e4884ec9e8754a6e9ead006de5 SHA512 9cfbfdd0a24c78471d9917478685402706c9db097bf4c898db851afa61cc5335e6cf57c2c06e53a827d55ad5c1e1dbdf2d03b6003a517447dbf7e52249b49a8c
-EBUILD gtk+-3.24.30.ebuild 7201 BLAKE2B 232dc92faff1c3b1842194d2a0b7e22274dfd58f5ac11d92d5cd8cbf33f3050394339183b92722a0784353cb42e3d88722614209b16f6d3562468c6b722ad97f SHA512 369e423272d626e74b1f9a6aa92e98a309148b4403d664ec62f698420306437093fe083c1345ef87a95e4b76f95329787474e6c2e1d7a7e91f8a8f82b1de8054
-EBUILD gtk+-3.24.31.ebuild 7211 BLAKE2B 79d8cf2baeaa79731fb74c2de6d17662cf952ddd0975b4e64ea45e28dd789a29c47cd3bf713228600ccce03a46a392ef3ef73bda600213a30a59cc94f0468f21 SHA512 d0cc7ebd356d006a41f085e98cfad987f9e95dba5983d575fa82914a1e3c8c2225f67258296b2c9b805f9fb4232882c9c002d4047c5d5d6eda9e8cb0d52600da
+EBUILD gtk+-3.24.31.ebuild 7203 BLAKE2B 7ad891b9fa23e198e2f76273cb60bcfd5a8d9acb24fcfe9b1d28ac7d87cf2e4f608d64c73b1efbea57cd7d99d094990f8b112e17a4202a4123df6438c85efd4c SHA512 54c803ca8a4fae72e45726dbaa570bbc050ec4d081f424953a883fc6e4a8414139851c05c86cb21f0035c979f440e8106997569104a98c1c9139b96c4f56ff8e
+EBUILD gtk+-3.24.32.ebuild 7211 BLAKE2B 79d8cf2baeaa79731fb74c2de6d17662cf952ddd0975b4e64ea45e28dd789a29c47cd3bf713228600ccce03a46a392ef3ef73bda600213a30a59cc94f0468f21 SHA512 d0cc7ebd356d006a41f085e98cfad987f9e95dba5983d575fa82914a1e3c8c2225f67258296b2c9b805f9fb4232882c9c002d4047c5d5d6eda9e8cb0d52600da
 MISC metadata.xml 875 BLAKE2B 40b9f97f4db18f276bb80587843146c5227b5b803306da704ad99f8c7c34fb22cddbfb9f1df3395e2288ed258970851cb9d100f40b846f95d414e2b47ab78f99 SHA512 02b9c2674783308f54bde4d983185d36b372f64f1ee5d9d2cd797fe1158e3653a1edb8ece51a0be143775e9b85d71d4375769e2682778a9286fff42cbf18836b
diff --git a/x11-libs/gtk+/gtk+-3.24.31.ebuild b/x11-libs/gtk+/gtk+-3.24.31.ebuild
index 52be7e73169b..4a67c000408c 100644
--- a/x11-libs/gtk+/gtk+-3.24.31.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.31.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/gtk+/gtk+-3.24.30.ebuild b/x11-libs/gtk+/gtk+-3.24.32.ebuild
index 080f6f3b9528..52be7e73169b 100644
--- a/x11-libs/gtk+/gtk+-3.24.30.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.32.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
@@ -30,12 +30,12 @@ COMMON_DEPEND="
 	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
 	>=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}]
 	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-0.9:=
+	>=media-libs/harfbuzz-2.2.0:=
 	>=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
 	virtual/libintl[${MULTILIB_USEDEP}]
 	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
 	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.41.0[introspection?,${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.44.0[introspection?,${MULTILIB_USEDEP}]
 	x11-misc/shared-mime-info
 
 	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
@@ -57,7 +57,7 @@ COMMON_DEPEND="
 		x11-libs/libXdamage[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]
 		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.8[${MULTILIB_USEDEP}]
 		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
 		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
 	)
diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
index af6e2fa5bf2c..52b28deeea81 100644
--- a/x11-libs/libICE/Manifest
+++ b/x11-libs/libICE/Manifest
@@ -1,3 +1,3 @@
 DIST libICE-1.0.10.tar.bz2 393116 BLAKE2B 2089cbddab679f8565f0b7bf0313616b71f33cd403aea2cb84032a247c1e1d01de343058c31be73214bd6dea7fc167fa6a0f81704c960bc279d904bdf4bf804f SHA512 2f1ef2c32c833c71894a08fa7e7ed53f301f6c7bd22485d71c12884d8e8b36b99f362ec886349dcc84d08edc81c8b2cea035320831d64974edeba021b433c468
-EBUILD libICE-1.0.10.ebuild 678 BLAKE2B 8ac95d6c8dd230c6f3c344e677f8c01ce9720b73da0189f4d430e94746a8b7e90d95a89ba209ed3df4f896787d4f2377c552e639fcf1b664f93ff2d3938920d6 SHA512 464b002a282055b33ac93370b4c05b5d34366db937004bfd1e68d43d9388d7143d3dee3418a9b1aefeb12e1b7ef86a88f84214b5d76f986d38ab4e9d8dd3c950
+EBUILD libICE-1.0.10-r1.ebuild 698 BLAKE2B 0c3d3a16347e13e86dc3dc416114fd5f704d5fa01da01bd340004d2defb8c9d1701c838a8b2022f2185e80a02c5ee7e1a51e7a321b868453bce738b42a25ec22 SHA512 9ea37c728cbd5c8314517aaa846e68e3eccf5a1d718b72632161e09e3f3cec2423cf91cdc24494475a3a03ff85e465c140a79ff8921cd3eabb4009621c8bb97b
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libICE/libICE-1.0.10.ebuild b/x11-libs/libICE/libICE-1.0.10-r1.ebuild
index d296a6c49b06..8375f1dbefdd 100644
--- a/x11-libs/libICE/libICE-1.0.10.ebuild
+++ b/x11-libs/libICE/libICE-1.0.10-r1.ebuild
@@ -14,7 +14,7 @@ IUSE="ipv6"
 DEPEND="x11-base/xorg-proto
 	x11-libs/xtrans"
 RDEPEND="${DEPEND}
-	elibc_glibc? ( dev-libs/libbsd )"
+	elibc_glibc? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )"
 
 src_configure() {
 	local XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 458619f757c0..339767286b9a 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,5 +1,3 @@
-DIST libX11-1.7.2.tar.bz2 2392982 BLAKE2B ce64bd8172fcf4f5bf0783c4f25f4d220fa0eceb211b7a852802256f7241f543769565f70a59c1ff14e0bb1ae7d3f05914f8f0b1bd423dcb20181cfb2227c70d SHA512 d01e5c1848c76218605e5af2d353de6b301a251555b52a38dbe930e6635d5e8a92d1486eb6d328ad5d42a5939e0d16868ffa19a75e5a7863d1a32e0d0727bdc7
 DIST libX11-1.7.3.tar.xz 1861304 BLAKE2B e0f647ef55567b1d7eff74bc053b8e73f8c696be6f233c2ff6f64dee65c1b40b746683ea7a6fafb4304eba4dec43301b4b3506e2ec6fac1d4c89d664b516bbdd SHA512 abc70837d19f7e104a5db1e6d2cfa1256625332c0b53fec44a0a39916a60a430bb53fd436207892aabe4199ac7a0f9287a06588fcd27e0eed54d45d67bbe1294
-EBUILD libX11-1.7.2.ebuild 932 BLAKE2B c33dfd62b0d452169d5e242c8f455586ece1155204b0c3d1d018625fcf7c272fd27b7de44e338d3a865db47152fb28480118bb327a97da9333fb6ce0029b0844 SHA512 3a6f0e3ef002cfc6514724f5b08c7527d25e8b3347703155392e63393f20b0e8bfbbb52cf124f2a83838f0ce1708f2151261e40da46c250e3e19a8e84e8111fe
 EBUILD libX11-1.7.3.ebuild 931 BLAKE2B d27af79560a6b919d117482959f3b33602025477821be40a1f1a63a53114608d726cdc561ca1c774341c9100949bd534a044dc3366d2a1fb422f15fd817b5c85 SHA512 d37cfe03fc06a48e09812118671f3fb9070ab388ba95025fdfd8bb35c68e0bcd775285aa22b5d07e62454639abe7c3ee773ea087b31a27313adcbbd005f6a5cd
 MISC metadata.xml 312 BLAKE2B 297d68d5585ee7fe053a0b9d1e4758d1c8538fbfa6037cddfefa84f5b757c1c768d4ab072f6198e19c1b9bf4d21120440db61e5a9690cc6cfd387ee9d2add736 SHA512 4b5fc7ba8a7c24241e7ab5dd68677ccba15f5e89a76482679f18139faea4ff1555759066041afbf51c65d1870ec0d999a772c340f1e934a6aba0135b8da28d18
diff --git a/x11-libs/libX11/libX11-1.7.2.ebuild b/x11-libs/libX11/libX11-1.7.2.ebuild
deleted file mode 100644
index c50508e8170d..000000000000
--- a/x11-libs/libX11/libX11-1.7.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit toolchain-funcs xorg-3
-
-# Note: please bump this with x11-misc/compose-tables
-DESCRIPTION="X.Org X11 library"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="ipv6 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
-	!<x11-base/xorg-proto-2019.2
-	x11-misc/compose-tables"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/xtrans"
-BDEPEND="test? ( dev-lang/perl )"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-		$(use_enable doc specs)
-		$(use_enable ipv6)
-		--without-fop
-		CPP="$(tc-getPROG CPP cpp)"
-	)
-	xorg-3_src_configure
-}
-
-src_install() {
-	xorg-3_src_install
-	rm -rf "${ED}"/usr/share/X11/locale || die
-}
diff --git a/x11-libs/libXdmcp/Manifest b/x11-libs/libXdmcp/Manifest
index 286c9363d54d..75a2504300df 100644
--- a/x11-libs/libXdmcp/Manifest
+++ b/x11-libs/libXdmcp/Manifest
@@ -1,3 +1,3 @@
 DIST libXdmcp-1.1.3.tar.bz2 332795 BLAKE2B 0c9df30450857dd2703c4bf54972d5a26c1b6f8e216b4f3173491def650cc32742554eee04c883670e783eb5f476df94ed2c0c52274a51e2bc54d45e5dcb8c77 SHA512 cb1d4650f97d66e73acd2465ec7d757b9b797cce2f85e301860a44997a461837eea845ec9bd5b639ec5ca34c804f8bdd870697a5ce3f4e270b687c9ef74f25ec
-EBUILD libXdmcp-1.1.3.ebuild 669 BLAKE2B eee2be4867519959b176926c20c37e3f934a4df43bb64a6a06507bd284c35d48c42d86620238edcb66dff320e880d1001015d7dd0273660f0109a3da91093291 SHA512 61577006919f98a3f07303febc0e57377e2ca3bd17d431db335f242d8232017608b2e7efe912c340b1fc3a8af5d8b712067e2d8ff42a8eb217786c13a9404e77
+EBUILD libXdmcp-1.1.3-r1.ebuild 689 BLAKE2B c1b863285de8d5b0497db607061aa2186458a0e74ffe007e45fca958607566eda90a5adc7486249904b776421019dd799ec831fdb6c4186e95aa43f59fefea38 SHA512 87eca23383d310a1ca63b4681da21746ff72b61ad72698a875800d16693795eb47c45c7c1e921ec3f6516d33688571a83bcd4cda135538242512f0db473b69dd
 MISC metadata.xml 311 BLAKE2B 21ffdd3bae13784b216398e0dafd6d9dab3b46647ff72d248d559dbd768c7b640a368f49af1d84148321172815bfb961660192f5ae2adf87f2d801afd3d830f0 SHA512 b3961e5c23283feb98fccc70e0a69ca8c4813a76ee029633731a6a651266673378c5e1fc95c1a079c9983da98dc41f574b41c808b52a63db325b00b5171f21cf
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.3-r1.ebuild
index 387662fc2a8c..dc445429439e 100644
--- a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.3-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="X.Org X Display Manager Control Protocol library"
 
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
-RDEPEND="elibc_glibc? ( dev-libs/libbsd )"
+RDEPEND="elibc_glibc? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
diff --git a/x11-libs/libdlo/Manifest b/x11-libs/libdlo/Manifest
index 97bf6cea36cf..e12b9d5402ac 100644
--- a/x11-libs/libdlo/Manifest
+++ b/x11-libs/libdlo/Manifest
@@ -1,4 +1,4 @@
 AUX disable-testprogram.patch 832 BLAKE2B d0658618b0042f51e0f85efbff77933e62efc2acf571bbc539f908a771d290834d5b60f3840cac317d56f378f0c3b1c457fb966782df417d8d3af33c6dee88c5 SHA512 b07a0ddd5eca10f13e82039690c3d310981cdafebc38a9e632a55be38c5c8ff22b7dddffcf0ab0f9795e650e61f9079ff1d9c12b3ddaad8d018f060c377aecd3
 DIST libdlo-0.1.2.tar.gz 476865 BLAKE2B b2391b58046e1f403b7e0d1eb915a46aa17c47e8ad804246f12f3b94f9ffb4dbc811e5d08aac29c2f4196b5d384e7244bddad3193adff5d5e890a7463a503fbb SHA512 6df69bebcf3142e0a87f66bb9d690fd78b96e08c2ae5d46fe0f3d91bc135364d5f5dd0c3a481705c3cd90c78a0a076757220fbcc3b0ad4343cdddb54501e3f2f
-EBUILD libdlo-0.1.2-r1.ebuild 1162 BLAKE2B df9077140343d43520acbd26c355d5f3068f44830f089499162a83f952446d946a5c4c6ed3a532a0114f4eb581d690f77d03dd56f1b36cc2034668ce9cb6d624 SHA512 356e537db2805770b73280720b355e5548f09e121515cb74b7e73e1e79b126810e1a024c8dac9a21147978fb1607d1072d800500a3225b2ab13b09986992cdfa
+EBUILD libdlo-0.1.2-r2.ebuild 1162 BLAKE2B 2c44217504420f940c290a97b4dc03e78ed386d1a6fc09a9157bb50ddd1e4a63bc846337ab7e950bbcb0ed37346982bf067777d3028421e19e576298f2ee7c99 SHA512 530b80b81ff4080be54f6c52318e408cd1de52b48b42ae8d69db965b2451650b79e60bb0d683267235c6f2524e481bd065cad72113ddc993d6cef608b5e83385
 MISC metadata.xml 689 BLAKE2B 255579139111aafe22e215602b3e2b6c7e902a67007d7f432d142483531a5937f0bbc5980f3a93f65b53ccdd219dbd5e750c0254c66b23ca3ad8520030681563 SHA512 8c2bdbbca5a225033e679ce8c8dc6f24d2953b8ae7f6b66698f82f894317ffcc8737a325e7b3a32d139f824677d2099e5a02500930bff82bb7abc69940607909
diff --git a/x11-libs/libdlo/libdlo-0.1.2-r1.ebuild b/x11-libs/libdlo/libdlo-0.1.2-r2.ebuild
index bded69069db1..5854396239bc 100644
--- a/x11-libs/libdlo/libdlo-0.1.2-r1.ebuild
+++ b/x11-libs/libdlo/libdlo-0.1.2-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
diff --git a/x11-libs/libdockapp/Manifest b/x11-libs/libdockapp/Manifest
index bc9c2d42b327..7cb6b96056dd 100644
--- a/x11-libs/libdockapp/Manifest
+++ b/x11-libs/libdockapp/Manifest
@@ -1,3 +1,3 @@
 DIST libdockapp-0.7.3.tar.gz 387507 BLAKE2B 83c11c81701b2be5eb197cf54ecb9ff34ad5d6cd730b2538a6ec8176dbf3728a98ff635a2da4ba2cc9238b559f1f6fe59126f9880e11099541a1e2d6e0faf246 SHA512 38d35599675fc8a8e9d14b0f059a0d1585106ed870210712f53f315d0442e98ad1df40a74b9f00e3f22656cb859d03fc93793b6042b9432394e572b89c58a815
-EBUILD libdockapp-0.7.3.ebuild 848 BLAKE2B 439652cf10378c58800546a364a0ed3974a7dbc5f04b8331bbd10a99141d8d9daff147cc1a6ec70dad75163ac5cb3df234021963e9032510d4815652b4a6aca0 SHA512 48e8946308e6fd8e61827c9326856b88c65fcace048b7c6e6d2e919d3f28d2ddc4b78bfb4f00b4f150eb480977c822cb0fc47cf82b44ded93591c81742915cb6
+EBUILD libdockapp-0.7.3.ebuild 838 BLAKE2B 868bd90c0848729dece265eab56ed4279c933843c4895813bc17a7b074b75034260063c0d9d2471d6b1c1b7ec533fdad0be9f0704ad89493ff32bc53de841a8d SHA512 dff47541befa928726da8a9ada2fab5c2ce9e6fb5f59f0f5231073b01afc5791895c7e43826eefbc3b8a491d212d44d57a4ac50a54e418ae3aa8b6c2c8ec64c4
 MISC metadata.xml 250 BLAKE2B 3d69a837b82fe334630573d6bf123718a3eac254377bc2ca86a2268f210cbcef9922db631e91954bceacc28828b54ad567d0568a4df655545ac56a4a54151d76 SHA512 ee587c14474743ca118c5468d1cd04ce5e3533ea29550ae74a7d517f092c895fa18c7edc7e9ffe7757b62c214dda7abf5352ee838a6dbd7d1079d60d2762732f
diff --git a/x11-libs/libdockapp/libdockapp-0.7.3.ebuild b/x11-libs/libdockapp/libdockapp-0.7.3.ebuild
index bc39205a880b..c4abdc8a2259 100644
--- a/x11-libs/libdockapp/libdockapp-0.7.3.ebuild
+++ b/x11-libs/libdockapp/libdockapp-0.7.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools font
+inherit font
 
 DESCRIPTION="Window Maker Dock Applet Library"
 HOMEPAGE="https://www.dockapps.net/libdockapp"
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 3f0d2fa6ad52..aa556d1bf0b6 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,10 +1,6 @@
-DIST libdrm-2.4.106.tar.xz 418176 BLAKE2B b0f935297239560179ec8994b62c7161494d4c1aa33bbfdc4d5e4ecff97d252f7556575391ebf486e24257c365415e656b9f84ac883dc9d56baf39e79ff8c5f2 SHA512 33140e579906ab54b716149056af500c628ce41cd9ae3b0c33496693d2f5903fbcfccee8a942dd1560e1591111ed240da42612d5af5e75558db6f6a85d14617d
-DIST libdrm-2.4.107.tar.xz 425612 BLAKE2B a685cd9a6549c7bdf1efb4e7ebddd0ea49554fa718f8328c868a1f245e7c072933e49546591c056ba7ece8d8841b8138e4247dd8697238a18c2cd92fe5446341 SHA512 c7542ba15c4c934519a6a1f3cb1ec21effa820a805a030d0175313bb1cc796cd311f39596ead883f9f251679d701e262894c5a297d5cf45093c80a6cd818def0
-DIST libdrm-2.4.108.tar.xz 432492 BLAKE2B 943107e4ece51336c2cec690b2805cac3ebe4502c548401ba7add1b1cdcb6c9959e4a9fe75890438e0b30646f8dde1b322585544aa33abb5257a23cc3eeed3ab SHA512 6a841dc3eb8eae7d75e1d35d23a14d51aff758e5a251dbcf6fc8c28d973d935a4a2f6751b405e956b2777d93c651721199ac80c3cd14b87d021668120d6bc974
 DIST libdrm-2.4.109.tar.xz 433708 BLAKE2B 99c612a4f9a8e9068debbecfc428f4af530705fca47df9c8e6f0fe6ed740610ded1db0d0e37a063ae893e1697c2f8c4dcc8e15b8909d8ba7c66cd941d7400d24 SHA512 45194bb28207421afcff3e247930d2eeab77a5fea58e6be22f67525f2e0aab2f410a9ae0ab315b55ef56b80c481bba40b1660468b7cda539758b2bbb8e814fd8
-EBUILD libdrm-2.4.106.ebuild 1742 BLAKE2B 85694c5857f949f178042878f79b04cb0c190d5f452c88cb7d7454e705510d0a0f3d871ecf45bb52ddb17b8c77585c3c56bcae2fbe27a13655b92338f20787f1 SHA512 45d320a9af316e549c9e38260cc994c6f8812834a8c426a5ad9cb4735159d9dc6c4eeb944b571575ae62ce6359d3d02e00fafc0991002ad7ad99a9d84e9160c9
-EBUILD libdrm-2.4.107.ebuild 1958 BLAKE2B 5a9c0b7f38715a5d9ca657df44b6509569749519d0a8d297c0991af32d1aaec36f74785d80cfaafedfa285c6ed825986015115c7c7956611c3beb6a939f7513e SHA512 3c24a14847a59dc0d13d87d016aa623f2743d3297622301d6a8df583a10972a787fe8b76a415dadd99e84e4e4936783472f9dfd92171deeb2891f1f563417528
-EBUILD libdrm-2.4.108.ebuild 1966 BLAKE2B 54d431322199e68cb172a9bfdddfb5901cc9cd482d7d6126efe6157a9ebaa5abe189180fcc23e12692dc93edf4e6a4e14ffc55d0969df0d392f9095019dc9c58 SHA512 ea18789d0813cb14a91ba3a5bc1fb8005ef530dbe34b77d9b643790e43dfe6cee26f29a2c9ea566a1b59273d834b72a67711bd27fa91e312abefeb5c5a23e159
+DIST libdrm-2.4.110.tar.xz 436372 BLAKE2B 0d5f8bfe47bdcc96ef7dbe3ecf2da0b21262bae4396fa1e73c0f728d970d041a9925082c4526bc71e00f110c2eb0ba94313d9a7c27a2d4676073fdbc3708c628 SHA512 52f92ef1fe4c218a1d7dba53ef43334dbfca80e3209afe59f3a32c4bf67473126534e990df07a931a12d46a3b997c21ef17c1c4d8a0c88d44d5c6c040e3b6be3
 EBUILD libdrm-2.4.109.ebuild 1964 BLAKE2B 773409a81dd537f1fdb79422c25639f1a9e3ac222a413099a6de3cadd0b3cbe44141b3563d9dfbfc37e5fe034bc71b4aabcb4f4d990bac7d86e11cdaeb9d93f8 SHA512 be75aab37f19d08cb71cc8efacb0def1a086db3b88a4b53e6658da064c4c1d879b5eda0ba1fbdf7f74a1718b65206b17e00aaeb9906b9662c3f8317bdaa48317
+EBUILD libdrm-2.4.110.ebuild 1972 BLAKE2B d1c94cb310f25d91e2ce7907488a19175780a3b326abf5a2a7662cd057af379eb3645a8c649dd06b6a82bec1ee510b755b99ee3c186bafd026fe226814790509 SHA512 38ea25a0bf6cd75f77b85e7b7ee433390e4412bb32fb9765d8dc60b618a155df4590e3f67fab21f2352a290d6620730f4e66b36dc471ea3196aba994cfa19cfd
 EBUILD libdrm-9999.ebuild 1966 BLAKE2B 54d431322199e68cb172a9bfdddfb5901cc9cd482d7d6126efe6157a9ebaa5abe189180fcc23e12692dc93edf4e6a4e14ffc55d0969df0d392f9095019dc9c58 SHA512 ea18789d0813cb14a91ba3a5bc1fb8005ef530dbe34b77d9b643790e43dfe6cee26f29a2c9ea566a1b59273d834b72a67711bd27fa91e312abefeb5c5a23e159
 MISC metadata.xml 407 BLAKE2B 1ec724640ea057ea29a6c84f3dcd34cb6a3f4bd7731c00d486688c9ec1dce393133e58b86ade00e51f91c80fe521e8829cfb796bd7cdc2e3d8c7be450d4c4188 SHA512 b54da0a8739fda9bb388e9893d992323247df89d9e97d20f29c62e64b189bf38092615cf113ae5048ce223270ebfaa128bb6b5fa119e5e8c8cdf2bda76a64769
diff --git a/x11-libs/libdrm/libdrm-2.4.106.ebuild b/x11-libs/libdrm/libdrm-2.4.106.ebuild
deleted file mode 100644
index 218b87fe7031..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.106.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} meson-multilib
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
-RESTRICT="test" # see bug #236845
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-multilib_src_configure() {
-	local emesonargs=(
-		# Udev is only used by tests now.
-		-Dudev=false
-		-Dcairo-tests=false
-		$(meson_use video_cards_amdgpu amdgpu)
-		$(meson_use video_cards_exynos exynos)
-		$(meson_use video_cards_freedreno freedreno)
-		$(meson_use video_cards_intel intel)
-		$(meson_use video_cards_nouveau nouveau)
-		$(meson_use video_cards_omap omap)
-		$(meson_use video_cards_radeon radeon)
-		$(meson_use video_cards_tegra tegra)
-		$(meson_use video_cards_vc4 vc4)
-		$(meson_use video_cards_vivante etnaviv)
-		$(meson_use video_cards_vmware vmwgfx)
-		$(meson_use libkms)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		-Dvalgrind=$(usex valgrind auto false)
-	)
-	meson_src_configure
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.108.ebuild b/x11-libs/libdrm/libdrm-2.4.108.ebuild
deleted file mode 100644
index c34f20fb240d..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.108.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
-PYTHON_COMPAT=( python3_{8..10} )
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} python-any-r1 meson-multilib
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
-RESTRICT="test" # see bug #236845
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')"
-
-python_check_deps() {
-	has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		# Udev is only used by tests now.
-		-Dudev=false
-		-Dcairo-tests=false
-		$(meson_use video_cards_amdgpu amdgpu)
-		$(meson_use video_cards_exynos exynos)
-		$(meson_use video_cards_freedreno freedreno)
-		$(meson_use video_cards_intel intel)
-		$(meson_use video_cards_nouveau nouveau)
-		$(meson_use video_cards_omap omap)
-		$(meson_use video_cards_radeon radeon)
-		$(meson_use video_cards_tegra tegra)
-		$(meson_use video_cards_vc4 vc4)
-		$(meson_use video_cards_vivante etnaviv)
-		$(meson_use video_cards_vmware vmwgfx)
-		$(meson_use libkms)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		-Dvalgrind=$(usex valgrind auto false)
-	)
-	meson_src_configure
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.107.ebuild b/x11-libs/libdrm/libdrm-2.4.110.ebuild
index a4ec5f0969d2..15d2707a6f52 100644
--- a/x11-libs/libdrm/libdrm-2.4.107.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.110.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index 2dcfc7ed31d8..9a42581af7aa 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -1,19 +1,7 @@
 AUX libva-intel-media-driver-20.2.0_x11_optional.patch 458 BLAKE2B 22670f925729ab9e02a4b3ef753911f4e12867da2a0bad90c835ba3291ae139c65327dfdf1e236dd47cd66f943380bb20428d587c9fea57265c1287f31015ca7 SHA512 a235a4c18e388e0564c2ffa1fb4bdd86a05ae8622efdc03bd556b51361478e735330182f4310fd44c275d55759a48fc1ebef8384335daf5160d39b46642c3070
-AUX libva-intel-media-driver-20.4.5_custom_cflags.patch 4078 BLAKE2B 59c525f39ce9ab5546c384641fe8aba017a5cdfe0a4f48dd5acd5d48dc7c6469731c81bb8781ae3be77baaf673e3bee1787fa6623e1ded8b2c3578ff41ba1292 SHA512 0b53bc5a809b305eae939b4ee3a173d59eb433ecb66f67f8c168f4c098689f972fab807e9ee227ca9eac2f80855ad048d45ed262063f031d85ff79813500c643
 AUX libva-intel-media-driver-20.4.5_testing_in_src_test.patch 1724 BLAKE2B a4820733470396b42152b8d3863c45946307c3d6e62b16a90a199a29e1564fbb56c044f07c895b2e6d12ecd5ef235db054d87ee49fcf5c2ced2b9242fd11ebe9 SHA512 02edb8803be4dd4608e8ee970c5472c2c6e6c7dfd2ca5c33b2807900cba49f0ef6d65440c7ca7b978abc368b56bfb7a163c3671aead68512b879fbd446475319
-AUX libva-intel-media-driver-21.2.2_custom_cflags.patch 1557 BLAKE2B 81286ec21894db132ae406b67f11678540d663cc74163b6dbbba3e888b54fbc4678041322d34bab61ce418f6050718a209c78c7121aa2f9d430dca27699becb9 SHA512 d790162f5a327b237e472a404ba761f24db62d08f23b669839a5793bc19e96868522484bc30460a8c0d7d575983d9c488855766834c828775b59273ad24da8bb
 AUX libva-intel-media-driver-21.4.2-Remove-unwanted-CFLAGS.patch 1473 BLAKE2B d3303d8cf11e99fc08b01cb4a12b1500afba27920e52a47cdf2d3cacc0b2cbea72e417ca4c118793c1149659cf1e51b619c0a81ca5103505a25994d9a0fee00a SHA512 41cd3cefd7a6aa6482c4d06b912cf441879e6fd14cee93380b081021e344d6555791e80d0925f66f59178d1b2d5ee15ff1f2deb4835d72f7fb74673912fc6b9e
-DIST intel-media-20.4.5.tar.gz 22437981 BLAKE2B 136be5280b463879e47ce8a1dae1befbe3907a2429b799b972dffbdcb8b21512e3161dc209abf7b4dfb0d3695512963c40cdd85fb6fb2f3158bee12e8e42ddcd SHA512 dfd70dc83eae181830844f9055ad728d91a51a55ea29ea5d272b154f16a92dfba86568d9b4e8f8c56d500582056b73602c999d2e877386fcf46df1633fc5e2ea
-DIST intel-media-21.3.5.tar.gz 23110985 BLAKE2B 1dbbc1efa9ae2c8f3b4a34596c71173101f8a43591bf9e07d269a8499b7a57969d9af5c1d4ffb7774a6947947e572b441f871760d3ca695335bfa2976ac2cf6f SHA512 e7836b19050677e81aa34ce5d7cea661ca3b5ac55d73d5aa0bab93f1daba8ee010d84b1c585f62fcec65a4361ef2b7f14ed574858f56b85b4c4d59840ecb6cb6
-DIST intel-media-21.4.0.tar.gz 23116624 BLAKE2B d913e379c4990bd0f5a5d07654baeb374d3b4f7adbe607338a96ac6555631560005d6124fb0124bafe5e94107b54acdfd0fbcfdabc820210b453ebb61c828c36 SHA512 e338e645677d90d4c2e91d5096a9002b87cec602ec354283b67e4ee31fcd6a2454918c4e179b86189126d30742ab2814bc8400072fb1d06638c3bc0bf66385e4
-DIST intel-media-21.4.2.tar.gz 23185132 BLAKE2B 257f1a8a65928aee897d84ed8df69a129958bcf5fd6ea263283e1f2341a845651a86367cff7988c0d4b04accf48664dbd4d1e0bd106883e92feff095e5f88225 SHA512 1b906ce75ef70395e36296de1e1e4b39d4a82c8b8532497faf47bcb101cf2103bba67a125da7ea1be9f901699288520f704b43fef01339a1f1b7691040d7618e
-DIST intel-media-21.4.3.tar.gz 23192939 BLAKE2B d013b60c330df97dc29e51a95a78bd91a38c789c4690fde12c304e1bf0695024e5488d0485b60fa603e8490b932210163aec590bcfca031c1f19d7b16161b420 SHA512 d2e2db1ddc2cbdc022273f53d873f2156e992420d382285de0b9559340d912e847a4780ed2adfe67f06a7c4bcac83aadca1104cf051b9a3d43b3ffd931a3db22
 DIST intel-media-22.1.0.tar.gz 26188730 BLAKE2B 7ade4b25d2fe50ed6c3498c37f0fb39ecf7241ba21485c423a4a8769628b78d8134471639aad12bcac79a7d107682e36cb5954227528601eb5253be5ce00acac SHA512 dd444608fd15fc7f05a0d2c9e6e2c8be3a588a1253ac014c045c207d5d59c9d172c89d248e94688078097a224f57025c11e86b9392271cd111bb9dce6d07617e
-EBUILD libva-intel-media-driver-20.4.5-r2.ebuild 1491 BLAKE2B 9c1c9e9d4c753fd6e840fe9aec5db9e994e427440c31335c2e3e579abb1e29b66261a03b1cb77cf2d863d99b2fadb24954450a9c8016ea7a18626a86f50155c5 SHA512 ed9b086e5dc379953a629f227aa9561accba7dfc3422242603df06872d00c571fd1a544d999595dc17b4ce6f80748e2c959c79199161278fdfab5cc9868ffa70
-EBUILD libva-intel-media-driver-21.3.5-r2.ebuild 1518 BLAKE2B 5c2a4591ce1a3b6af4827f0c2eec03767d80f825704abd2e6c589b97ec55d6e76d0e8516bb2993cbae492eceddd4071cb07b605b28fa17c8b5acdba4e3e5c115 SHA512 fe936016b71e4203bcea37a1deb8c5812469b9d6fb756b76aa844a959a0883710dec2775a43f2f07b80c02b9254d5fdc17f5424cd0cf3bb625fe42acf7258406
-EBUILD libva-intel-media-driver-21.4.0-r2.ebuild 1519 BLAKE2B b6fa5f05746270f6c458022c914d08edda6fcb5edb5e28612df4543561e3cf5df6ebd7a71a76b9504d1bd94f8b8cc1391e08481a69fff54b7a3129712b8cff28 SHA512 fd08f731552148367c900c030c8731388e8a273de8823f38c630b08731ce4e53f7d8826f83c2b9ea1bf574bd4d27d9b43eece32f24c0cb891b5f809b235a772e
-EBUILD libva-intel-media-driver-21.4.2-r2.ebuild 1392 BLAKE2B 7412f822b7459314494014cd5d2ad795ad4ce0564e19ff53bc2a2f00701b082ef20ef3ff6253192fca802e1b805fef2bac2554591e879125baa5b0a7f89bc484 SHA512 68e29ddab24decacf5e21377f11e1b404e449cdf76b78037f46c340654b22b35098253941957c75a13466856a3db6b851919b40847e89116df62bb85ec5a7bc3
-EBUILD libva-intel-media-driver-21.4.3.ebuild 1391 BLAKE2B c0dbde34b716e8b1573a1caac3c0f68226ca5e046a92ce53e0476ae01dbf2dacec9444aa7321249fe91fc5830734499b56f76aac8119dc59d6b0c27ea2b934c6 SHA512 28d3538a2e32bf65042c81ccfcce092bceb4437527fd579412934e85fe2c98fda2c940fb741ddd57fc5d0b90944c5c05fb3df1cd05a150845c34f20383fbfb6f
-EBUILD libva-intel-media-driver-22.1.0.ebuild 1369 BLAKE2B 6629037820176d3beaf10be676db7d705d2b3b4329bd2682b3ff11e5ef47369585b3de1d246c4fec4589224068ac9146a1d6df86a4d2b9eff6dd74a995229bb1 SHA512 8abc05bd597ed110fd115f203d05f8847a7b25bc5f7764d6a6d46f5d27e4836b061a4c45dbb33fadf3d9d2a043369ffa1b9fa3a4314a8fca7328e44688ceb0de
+EBUILD libva-intel-media-driver-22.1.0-r1.ebuild 1368 BLAKE2B 5f58f95f23416c6dfa77cd61e311c59448a5b1dadd3280115d17176bb392607320d3b4b00324cf80c7bfd953cf8365edeaed562edc7117ecf3a3f94c7577a00b SHA512 b24aa898bb3c48126c0e85f886cc564eee38f611d8ffb21ecc163b070814e526262892b7dc6d99fbec302345d2788b98c335734f82258d68a0357c0de9c8ca38
 EBUILD libva-intel-media-driver-9999.ebuild 1369 BLAKE2B 6629037820176d3beaf10be676db7d705d2b3b4329bd2682b3ff11e5ef47369585b3de1d246c4fec4589224068ac9146a1d6df86a4d2b9eff6dd74a995229bb1 SHA512 8abc05bd597ed110fd115f203d05f8847a7b25bc5f7764d6a6d46f5d27e4836b061a4c45dbb33fadf3d9d2a043369ffa1b9fa3a4314a8fca7328e44688ceb0de
-MISC metadata.xml 770 BLAKE2B 6ab4ad71025ad0e2130613c3c4a06c0d337be0388f994f9e02042214228e105dfde10943efe80aef0d3e0656038a35c9bab01ad907f05826059a809f76add8e3 SHA512 c4cfbacc4218176b4a18bb3afe428a46a09d2fc7f7b13e6a12fa5f028e8d9d498c29e0e654ee51591eb62eff2e4d4addaa2a3a63c45706dba46f447c3b013027
+MISC metadata.xml 506 BLAKE2B 22e3db4e87af8f032b2f02d18937c894524ede02e6a408cee8f8fddf492cfd2ebc8de6ebe8e2e1786ec81f119a09d3abb50dd2617c7651ff2082986d66421760 SHA512 5f7ebdec168766dc148294d92b1a6f6a355293a78ff8c879d1de94dca283ecfb9136bb0f124f41af15256f31832c2b034452a2b4d0ea0616a36b2576b7d8da58
diff --git a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_custom_cflags.patch b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_custom_cflags.patch
deleted file mode 100644
index 436e2fe892e6..000000000000
--- a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_custom_cflags.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-    Prevent overriding of user-define CFLAGS, including -march flag.
-
-    The flag -msse4.1 is required otherwise compile will not be able to inline sse4.1 code.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,6 +52,8 @@ option (BUILD_CMRTLIB "Build and Install cmrtlib together with media driver" ON)
- 
- option (ENABLE_PRODUCTION_KMD "Enable Production KMD header files" OFF)
- 
-+option (OVERRIDE_COMPILER_FLAGS "Override user compiler FLAGS and use lib defaults" ON)
-+
- include(GNUInstallDirs)
- 
- if (BUILD_CMRTLIB)
-
---- a/cmrtlib/linux/CMakeLists.txt
-+++ b/cmrtlib/linux/CMakeLists.txt
-@@ -33,15 +33,19 @@ endif()
- 
- # Set up compile options that will be used for the Linux build
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all -Werror")
-+if (OVERRIDE_COMPILER_FLAGS)
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1")
- endif()
-+endif()
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2")
- set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all -Werror")
-+if (OVERRIDE_COMPILER_FLAGS)
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.1")
- endif()
-+endif()
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2")
- set(CMAKE_C_FLAGS_DEBUG   "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0")
- 
-
---- a/media_driver/cmake/linux/media_compile_flags_linux.cmake
-+++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake
-@@ -36,7 +36,10 @@ set(MEDIA_COMPILER_FLAGS_COMMON
-     -Werror=format-security
-     -Werror=non-virtual-dtor
-     -Werror=return-type
-+)
- 
-+if (OVERRIDE_COMPILER_FLAGS)
-+    list (APPEND MEDIA_COMPILER_FLAGS_COMMON
-     # General optimization options
-     -march=${UFO_MARCH}
-     -mpopcnt
-@@ -44,23 +47,33 @@ set(MEDIA_COMPILER_FLAGS_COMMON
-     -msse2
-     -msse3
-     -mssse3
--    -msse4.1
-     -msse4.2
-     -msse4
-+)
-+endif(OVERRIDE_COMPILER_FLAGS)
-+
-+list (APPEND MEDIA_COMPILER_FLAGS_COMMON
-+    -msse4.1	# SSE4.1 support is required to build the library
-     -mfpmath=sse
-     -finline-functions
-     -funswitch-loops
-     -fno-short-enums
-     -Wa,--noexecstack
-     -fno-strict-aliasing
-+)
- 
-+if (OVERRIDE_COMPILER_FLAGS)
-+    list (APPEND MEDIA_COMPILER_FLAGS_COMMON
-     # Common defines
-     -DUSE_MMX
-     -DUSE_SSE
-     -DUSE_SSE2
-     -DUSE_SSE3
-     -DUSE_SSSE3
-+)
-+endif(OVERRIDE_COMPILER_FLAGS)
- 
-+list (APPEND MEDIA_COMPILER_FLAGS_COMMON
-     # Other common flags
-     -fmessage-length=0
-     -fvisibility=hidden
-@@ -68,16 +81,26 @@ set(MEDIA_COMPILER_FLAGS_COMMON
-     -fdata-sections
-     -ffunction-sections
-     -Wl,--gc-sections
-+)
- 
-+if (OVERRIDE_COMPILER_FLAGS)
-+    list (APPEND MEDIA_COMPILER_FLAGS_COMMON
-     # -m32 or -m64
-     -m${ARCH}
-+)
-+endif(OVERRIDE_COMPILER_FLAGS)
- 
-+list (APPEND MEDIA_COMPILER_FLAGS_COMMON
-     # Global defines
-     -DLINUX=1
-     -DLINUX
-     -DNO_RTTI
-     -DNO_EXCEPTION_HANDLING
-     -DINTEL_NOT_PUBLIC
-+)
-+
-+if (OVERRIDE_COMPILER_FLAGS)
-+    list (APPEND MEDIA_COMPILER_FLAGS_COMMON
-     -g
- )
- 
-@@ -90,6 +113,7 @@ if(${UFO_MARCH} STREQUAL "slm")
-         -mtune=atom
-     )
- endif()
-+endif(OVERRIDE_COMPILER_FLAGS)
- 
- if(${ARCH} STREQUAL "64")
-     set(MEDIA_COMPILER_FLAGS_COMMON
-@@ -206,9 +230,11 @@ include(${MEDIA_EXT_CMAKE}/ext/linux/media_compile_flags_linux_ext.cmake OPTIONA
- if(${PLATFORM} STREQUAL "linux")
-     #set predefined compiler flags set
-     add_compile_options("${MEDIA_COMPILER_FLAGS_COMMON}")
-+if (OVERRIDE_COMPILER_FLAGS)
-     add_compile_options("$<$<CONFIG:Debug>:${MEDIA_COMPILER_FLAGS_DEBUG}>")
-     add_compile_options("$<$<CONFIG:Release>:${MEDIA_COMPILER_FLAGS_RELEASE}>")
-     add_compile_options("$<$<CONFIG:ReleaseInternal>:${MEDIA_COMPILER_FLAGS_RELEASEINTERNAL}>")
-+endif(OVERRIDE_COMPILER_FLAGS)
- 
-     foreach (flag ${MEDIA_COMPILER_CXX_FLAGS_COMMON})
-         SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
-
-
diff --git a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.2.2_custom_cflags.patch b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.2.2_custom_cflags.patch
deleted file mode 100644
index c0f598ce6cd0..000000000000
--- a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.2.2_custom_cflags.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-    Prevent overriding of user-defined CFLAGS.
-
-
---- a/media_driver/cmake/linux/media_compile_flags_linux.cmake
-+++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake
-@@ -51,16 +51,26 @@ set(MEDIA_COMPILER_FLAGS_COMMON
-     -fdata-sections
-     -ffunction-sections
-     -Wl,--gc-sections
-+)
- 
-+if (OVERRIDE_COMPILER_FLAGS)
-+    list (APPEND MEDIA_COMPILER_FLAGS_COMMON
-     # -m32 or -m64
-     -m${ARCH}
-+)
-+endif(OVERRIDE_COMPILER_FLAGS)
- 
-+list (APPEND MEDIA_COMPILER_FLAGS_COMMON
-     # Global defines
-     -DLINUX=1
-     -DLINUX
-     -DNO_RTTI
-     -DNO_EXCEPTION_HANDLING
-     -DINTEL_NOT_PUBLIC
-+)
-+
-+if (OVERRIDE_COMPILER_FLAGS)
-+    list (APPEND MEDIA_COMPILER_FLAGS_COMMON
-     -g
- )
- 
-@@ -73,6 +83,7 @@ if(${UFO_MARCH} STREQUAL "slm")
-         -mtune=atom
-     )
- endif()
-+endif(OVERRIDE_COMPILER_FLAGS)
- 
- if(${ARCH} STREQUAL "64")
-     set(MEDIA_COMPILER_FLAGS_COMMON
-@@ -189,9 +200,11 @@ include(${MEDIA_EXT_CMAKE}/ext/linux/media_compile_flags_linux_ext.cmake OPTIONA
- if(${PLATFORM} STREQUAL "linux")
-     #set predefined compiler flags set
-     add_compile_options("${MEDIA_COMPILER_FLAGS_COMMON}")
-+if (OVERRIDE_COMPILER_FLAGS)
-     add_compile_options("$<$<CONFIG:Debug>:${MEDIA_COMPILER_FLAGS_DEBUG}>")
-     add_compile_options("$<$<CONFIG:Release>:${MEDIA_COMPILER_FLAGS_RELEASE}>")
-     add_compile_options("$<$<CONFIG:ReleaseInternal>:${MEDIA_COMPILER_FLAGS_RELEASEINTERNAL}>")
-+endif(OVERRIDE_COMPILER_FLAGS)
- 
-     foreach (flag ${MEDIA_COMPILER_CXX_FLAGS_COMMON})
-         SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5-r2.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5-r2.ebuild
deleted file mode 100644
index 00f2befa1f19..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${PV}"
-	KEYWORDS="amd64"
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE="+custom-cflags set-as-default test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-20.4.1:=
-	media-libs/gmmlib:0/0
-	>=x11-libs/libva-2.10.0[X?]
-	>=x11-libs/libpciaccess-0.13.1-r1:=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
-	"${FILESDIR}"/${PN}-20.4.5_custom_cflags.patch
-	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
-		-DMEDIA_RUN_TEST_SUITE=$(usex test)
-		-DBUILD_TYPE=Release
-		-DPLATFORM=linux
-		-DUSE_X11=$(usex X)
-		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
-		-DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use set-as-default ; then
-		echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
-		doenvd "${T}/55libva-intel-media-driver"
-	fi
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5-r2.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5-r2.ebuild
deleted file mode 100644
index 05829c3b4ed6..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	MY_PV="${PV%_pre}"
-	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
-	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="amd64"
-	fi
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE="+custom-cflags set-as-default test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-21.3.1:=
-	media-libs/gmmlib:0/0
-	>=x11-libs/libva-2.13.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
-	"${FILESDIR}"/${PN}-21.2.2_custom_cflags.patch
-	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
-		-DMEDIA_RUN_TEST_SUITE=$(usex test)
-		-DBUILD_TYPE=Release
-		-DPLATFORM=linux
-		-DUSE_X11=$(usex X)
-		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
-		-DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use set-as-default ; then
-		echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
-		doenvd "${T}/55libva-intel-media-driver"
-	fi
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.0-r2.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.0-r2.ebuild
deleted file mode 100644
index 5573b2b96933..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.0-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	MY_PV="${PV%_pre}"
-	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
-	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="~amd64"
-	fi
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE="+custom-cflags set-as-default test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-21.3.1:=
-	media-libs/gmmlib:0/0
-	>=x11-libs/libva-2.13.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
-	"${FILESDIR}"/${PN}-21.2.2_custom_cflags.patch
-	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
-		-DMEDIA_RUN_TEST_SUITE=$(usex test)
-		-DBUILD_TYPE=Release
-		-DPLATFORM=linux
-		-DUSE_X11=$(usex X)
-		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
-		-DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use set-as-default ; then
-		echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
-		doenvd "${T}/55libva-intel-media-driver"
-	fi
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.2-r2.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.2-r2.ebuild
deleted file mode 100644
index 5ce014edf7eb..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.2-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	MY_PV="${PV%_pre}"
-	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
-	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="~amd64"
-	fi
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD redistributable? ( no-source-code )"
-SLOT="0"
-IUSE="+redistributable test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-21.3.1:=
-	media-libs/gmmlib:0/0
-	>=x11-libs/libva-2.13.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
-	"${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch
-	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
-		-DMEDIA_RUN_TEST_SUITE=$(usex test)
-		-DBUILD_TYPE=Release
-		-DPLATFORM=linux
-		-DUSE_X11=$(usex X)
-		-DENABLE_NONFREE_KERNELS=$(usex redistributable)
-		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
-	)
-	local CMAKE_BUILD_TYPE="Release"
-	cmake_src_configure
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.3.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.3.ebuild
deleted file mode 100644
index 8da9f2236e58..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	MY_PV="${PV%_pre}"
-	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
-	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="amd64"
-	fi
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD redistributable? ( no-source-code )"
-SLOT="0"
-IUSE="+redistributable test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-21.3.1:=
-	media-libs/gmmlib:0/0
-	>=x11-libs/libva-2.13.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
-	"${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch
-	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
-		-DMEDIA_RUN_TEST_SUITE=$(usex test)
-		-DBUILD_TYPE=Release
-		-DPLATFORM=linux
-		-DUSE_X11=$(usex X)
-		-DENABLE_NONFREE_KERNELS=$(usex redistributable)
-		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
-	)
-	local CMAKE_BUILD_TYPE="Release"
-	cmake_src_configure
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.1.0.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.1.0-r1.ebuild
index b0004515b354..d35edb899163 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.1.0.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
 	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
 	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="~amd64"
+		KEYWORDS="amd64"
 	fi
 fi
 
diff --git a/x11-libs/libva-intel-media-driver/metadata.xml b/x11-libs/libva-intel-media-driver/metadata.xml
index 706003d80004..df5d13fb7264 100644
--- a/x11-libs/libva-intel-media-driver/metadata.xml
+++ b/x11-libs/libva-intel-media-driver/metadata.xml
@@ -10,7 +10,5 @@
 	</maintainer>
 	<use>
 		<flag name="redistributable">Install redistributable media kernel binaries (no source code) files (primarily needed for video encoding support)</flag>
-		<flag name="set-as-default">Override libva automatic driver selection and set this (iHD) driver as default one.</flag>
-		<flag name="custom-cflags">Do not override user CFLAGS like -02, -march, -msse and similar with lib defaults. Not tested by upstream.</flag>
 	</use>
 </pkgmetadata>
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 709dfd853a73..7c36feed18da 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -1,5 +1,6 @@
 DIST libva-2.13.0.tar.gz 256724 BLAKE2B 97dd51bf488dc88027125973399e17dedcce03b7bf5104fd9bf17156c5013e1e9d46f2bf78c16431141294f75549a00fed3542b4f79dd31b032f4505c11d07d7 SHA512 226d09956754c9942348ed289f210268bad64dbba95d948b33ae063f7ecb276af9da083a48c03c3c79ad4305716d203898bc75a109945d064a5fe6fb43398dea
-EBUILD libva-2.13.0-r1.ebuild 2219 BLAKE2B edefe41042978eb61e2d0f75c2c4befab859ddc267a3b9a5719eaaefb38a3c88f58b3bb09f1c69345acb6df72858add5ac443ca076d0f8262daa3ca17469aa39 SHA512 afb649de60b6760ab1a2ff67b2d88c5cf0b09bfa5405258268e91aa987324dbf005e36f76236cb2ae441c2d7b693f6e949585026a2296c67a809927285d80f24
+DIST libva-2.14.0.tar.gz 266254 BLAKE2B 1ad504dc7f72b15bb35b486a5fcb327c14663b80068791aa983f2d46876b1504b8330888430b85d2fb309bd5aa2a11c4a34589b68fa140e10b27cb952e3eb5c7 SHA512 8d87b49c7242174d05dca709bd79e6e45cea6e6060d12f5cf7636433be587c2b3a6c3183f632fb0ff49b19f31f915a2a62818c26f57c3a8f40741aa1ab8270b4
 EBUILD libva-2.13.0-r2.ebuild 2211 BLAKE2B d32d23548a690da4d07760074c77a981da21f139e39cf9b8f53a7b5317459c6f3c4a72328edfaaa9bdf5002fd17db4b66d6cff9ced7fd38527d2c67d6f34c561 SHA512 08396b6f8359cecb707ed63b25d0b1de37955cbddb82fe18cede7f2af7b582c947da3079079222fc7c614b4341aec29e849d63f4d1f56abe6504339323fc0c5a
-EBUILD libva-9999.ebuild 2215 BLAKE2B 19525e8b1bf0faa249b24f0cc9ad3cbdedb21d14a50b3f2d453fa33597f6e95296da9cf4abbc4542310c61a1566101bf232339a9a2e8b606705b50c294a928e6 SHA512 bbcde8d3a33debd1ff5b8765a673b8a3be97edeb1b151796f8f8c39d922e524b229a98d5c6ecbe4d317db4d7b2307d105cc25aa99d00d04cf4d8f7d2535bcf68
+EBUILD libva-2.14.0.ebuild 1710 BLAKE2B d181248d43c1258afeb9ca09948a3c4e0555430ceb29328a33e7e9117a4199076bdb235c120df2e70e5653e069e256accc593b100383710a7666dec93cf8f80a SHA512 962ae7b977868fe9bf93ea4bed2d26e3e19dfa84855b8e154e2dae4721c9c971856383d27922d662a19dcc67811c87722a2e9a8c5548e4ccec009e00a248f5ca
+EBUILD libva-9999.ebuild 1710 BLAKE2B d181248d43c1258afeb9ca09948a3c4e0555430ceb29328a33e7e9117a4199076bdb235c120df2e70e5653e069e256accc593b100383710a7666dec93cf8f80a SHA512 962ae7b977868fe9bf93ea4bed2d26e3e19dfa84855b8e154e2dae4721c9c971856383d27922d662a19dcc67811c87722a2e9a8c5548e4ccec009e00a248f5ca
 MISC metadata.xml 470 BLAKE2B d9df0ced571b8afa6cecda8dafb7165d142c3fd1c0fff21526d5624edb530e0ac705a36a7fa1a17d18583805a267652dfb77850a70aa47dcceb4794636821e9e SHA512 66f62980ed7d876f681bc77cb47cf43940fe056db6577557cf518604885c54ad94a17680c6749eb81937b44e21d7df9cad3ede05fdf74be88dcb6d21e271491e
diff --git a/x11-libs/libva/libva-2.13.0-r1.ebuild b/x11-libs/libva/libva-2.14.0.ebuild
index a3eb6a58e73b..572eb16bd958 100644
--- a/x11-libs/libva/libva-2.13.0-r1.ebuild
+++ b/x11-libs/libva/libva-2.14.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools multilib-minimal optfeature
+inherit meson-multilib optfeature
 
 DESCRIPTION="Video Acceleration (VA) API for Linux"
 HOMEPAGE="https://01.org/linuxmedia/vaapi"
@@ -13,26 +13,22 @@ if [[ ${PV} = *9999 ]] ; then
 	EGIT_BRANCH=master
 	EGIT_REPO_URI="https://github.com/intel/libva"
 else
-	# SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2"
-	# The upstream provides periodically tarball with pre-built 'configure'.
-	# To simplify updates, portage use tarballs without pre-build 'configure'
-	# which are always available.
 	SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1)"
-IUSE="+drm opengl utils wayland X"
+IUSE="+drm opengl wayland X"
+REQUIRED_USE="opengl? ( X )"
 
 RDEPEND="
 	>=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}]
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
 	wayland? (
 		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
-		dev-util/wayland-scanner[${MULTILIB_USEDEP}]
 	)
 	X? (
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
 		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
@@ -40,14 +36,9 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	wayland? ( dev-util/wayland-scanner )
 	virtual/pkgconfig
 "
-PDEPEND="utils? ( media-video/libva-utils )"
-
-REQUIRED_USE="|| ( drm wayland X )
-	opengl? ( X )"
-
-DOCS=( NEWS )
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/va/va_backend_glx.h
@@ -57,26 +48,17 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/va/va_glx.h
 )
 
-src_prepare() {
-	default
-	eautoreconf
-}
-
 multilib_src_configure() {
-	local myeconfargs=(
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
-		$(use_enable opengl glx)
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable drm)
-		--enable-va-messaging
+	local emesonargs=(
+		-Ddriverdir="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+		-Ddisable_drm=false
+		-Dwith_x11=$(usex X)
+		-Dwith_glx=$(usex X)
+		-Dwith_wayland=$(usex wayland)
+		-Denable_docs=false
+		-Denable_va_messaging=true
 	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
+	meson_src_configure
 }
 
 pkg_postinst() {
diff --git a/x11-libs/libva/libva-9999.ebuild b/x11-libs/libva/libva-9999.ebuild
index e3ae90808c43..572eb16bd958 100644
--- a/x11-libs/libva/libva-9999.ebuild
+++ b/x11-libs/libva/libva-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools multilib-minimal optfeature
+inherit meson-multilib optfeature
 
 DESCRIPTION="Video Acceleration (VA) API for Linux"
 HOMEPAGE="https://01.org/linuxmedia/vaapi"
@@ -13,25 +13,22 @@ if [[ ${PV} = *9999 ]] ; then
 	EGIT_BRANCH=master
 	EGIT_REPO_URI="https://github.com/intel/libva"
 else
-	SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2"
-	# The upstream provides periodically tarball with pre-built 'configure'.
-	# To simplify updates, portage use tarballs without pre-build 'configure'
-	# which are always available.
-	# SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1)"
-IUSE="+drm opengl utils wayland X"
+IUSE="+drm opengl wayland X"
+REQUIRED_USE="opengl? ( X )"
 
 RDEPEND="
 	>=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}]
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
 	wayland? (
 		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
 	)
 	X? (
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
 		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
@@ -42,12 +39,6 @@ BDEPEND="
 	wayland? ( dev-util/wayland-scanner )
 	virtual/pkgconfig
 "
-PDEPEND="utils? ( media-video/libva-utils )"
-
-REQUIRED_USE="|| ( drm wayland X )
-	opengl? ( X )"
-
-DOCS=( NEWS )
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/va/va_backend_glx.h
@@ -57,26 +48,17 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/va/va_glx.h
 )
 
-src_prepare() {
-	default
-	eautoreconf
-}
-
 multilib_src_configure() {
-	local myeconfargs=(
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
-		$(use_enable opengl glx)
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable drm)
-		--enable-va-messaging
+	local emesonargs=(
+		-Ddriverdir="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+		-Ddisable_drm=false
+		-Dwith_x11=$(usex X)
+		-Dwith_glx=$(usex X)
+		-Dwith_wayland=$(usex wayland)
+		-Denable_docs=false
+		-Denable_va_messaging=true
 	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
+	meson_src_configure
 }
 
 pkg_postinst() {
diff --git a/x11-libs/libvdpau/Manifest b/x11-libs/libvdpau/Manifest
index 8dc168926d38..53382792b484 100644
--- a/x11-libs/libvdpau/Manifest
+++ b/x11-libs/libvdpau/Manifest
@@ -1,4 +1,5 @@
 DIST libvdpau-1.4.tar.bz2 139504 BLAKE2B de2b9251060f10e3126b59f44595c3b9cc65c3f5bc719133809414ed51362fb1f90fa67d0351007a178455329493f929d0983a2a7e67c29022ff351ea1f5adfc SHA512 68f502f53f4a95c9af571bd5a3f5048dd1afe30d7576f7e80751c7f29450ef8cb226c1281562b616079d6c177830ec67391d0fae33348a4627ca8c113990cd01
+DIST libvdpau-1.5.tar.gz 152838 BLAKE2B c3d76c1e46b718d71daff74232f2de9efb989c496cef7fa1016ec76d751530be39b5b6ad6354819579043f23744a647492d5d52b5ab93cae89dd82fb17d08289 SHA512 cebe0e0d9411b87238fa2adec40516881c61a67f33f80c22372f514e672e2dff839687291ab0b01d47af811c254fa65da579f360fcded3f65e382720548d3ea5
 EBUILD libvdpau-1.4.ebuild 1028 BLAKE2B f63cfa2124df8ba2aaf07ae483e14da0b42d7bcc6bf4761f299ee61207fa57eec2fa16fcbbc3a2b7190497fad44ee0c8357269255f38ad8f4fa8176f26d7ffac SHA512 a5f0e95051d22a30b5f013826fb42c856e9300a304ae5ee651902383a5a5db3a3fde002d79ffea6f2c71a02752c93f8e303f9e58175f5d1a6b44e43d8ebb27f2
-EBUILD libvdpau-99999.ebuild 984 BLAKE2B fa50879c53fc97416694af3ba7e2cfd20bc50f52206cf0aae8ac7cde334ebc2c7f910a914529c65223635c3cad4cd0947b5c6768e60878e28941514ae0fae9ea SHA512 370f7c80450503e798097acb85769362130b8488b065bda0dd9e4651b8bd713858fcaa2b78e55137d9596c4f64ee57ee7ab5a02b8452f3278cbcfce4d46130dd
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+EBUILD libvdpau-1.5.ebuild 937 BLAKE2B 2f83e41eb8cec7193beb68d76d5e0dfb80ce5674006d860f9ccee34d0b9fbfd4d9a28f6252f5bb99df9f1fa6e8aecf00979b0786724052c5a8d095c6371288cd SHA512 8ff2c0f311962df290712688bff9a9d711cb2e2e31d228507080cdbcf396f6c1626512963cb0e590a00c7094203a4dfe3ec4c8f771c5db6461e1c80d6ae3024b
+MISC metadata.xml 246 BLAKE2B a512e6e8ffd8a998f89ea9dbf8a29dd4bb2d6db435e4ac0ef3182fc23996e04a6e87c1771975d835038ad86d6cb61e4a1aea8b80286666d64ad0b511c9d8f163 SHA512 d827f64596500d61c0f24c9d2a69fa3ca2f8b52e5f5815106d7db2837482172f0518d99677e6332a69fd4c34289ef817203a5047363ea7d2c10372b09f9e0618
diff --git a/x11-libs/libvdpau/libvdpau-99999.ebuild b/x11-libs/libvdpau/libvdpau-1.5.ebuild
index 2817d03b9638..6e035344ce97 100644
--- a/x11-libs/libvdpau/libvdpau-99999.ebuild
+++ b/x11-libs/libvdpau/libvdpau-1.5.ebuild
@@ -1,46 +1,45 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-VIRTUALX_REQUIRED="test"
-inherit flag-o-matic git-r3 meson-multilib virtualx
+EAPI=8
+
+inherit meson-multilib virtualx
 
 DESCRIPTION="VDPAU wrapper and trace libraries"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU"
-EGIT_REPO_URI="https://gitlab.freedesktop.org/vdpau/${PN}/"
+SRC_URI="https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm64 ~riscv ~x86"
 IUSE="doc dri"
 
 RDEPEND="
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	dri? ( >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dri? ( x11-base/xorg-proto )
-"
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	dri? ( x11-libs/libXext[${MULTILIB_USEDEP}] )"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
 BDEPEND="
 	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen
 		media-gfx/graphviz
 		virtual/latex-base
-	)
-"
+	)"
 
 src_prepare() {
-	sed -i -e "/^docdir/s|${PN}|${PF}|g" doc/meson.build || die
 	default
+
+	sed -i "/^docdir/s|${PN}|${PF}|" doc/meson.build || die
 }
 
 multilib_src_configure() {
-	append-cppflags -D_GNU_SOURCE
 	local emesonargs=(
-		$(meson_use dri dri2)
 		$(meson_native_use_bool doc documentation)
+		$(meson_use dri dri2)
 	)
+
 	meson_src_configure
 }
 
diff --git a/x11-libs/libvdpau/metadata.xml b/x11-libs/libvdpau/metadata.xml
index 115e9d64a669..06d84e396dc3 100644
--- a/x11-libs/libvdpau/metadata.xml
+++ b/x11-libs/libvdpau/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index 50d684fab9af..f0498fef846c 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -1,7 +1,5 @@
 DIST libwnck-2.31.0.tar.xz 630792 BLAKE2B 8201537d3c9a8a0a8668fc16d33a8eaa05c14312401f1c763c922402df04ef03260dd259f5c46508f85390f7aefd551e83143e654b24b412272dddb7c7c4bd62 SHA512 54262a08882021f08f3ba7f2ddfa33fc1f02e391a0f61cf999a50a089e0d277dfe13ab133c1a46e9abf0599bd24c21dacff80b51013cbb1375d2cd71ac9abbe9
-DIST libwnck-3.36.0.tar.xz 447760 BLAKE2B c61098362c57c3de879170d3104472b0a7f3c16da163c5d740d7a42bd545cfdaecd96804108834d5b7de5028e847f9b0557f015d08f50f9459a896f1d5f84431 SHA512 b7bf5d935327f61634a898594cf20a270e1b403c8df6c74e6ac20e22eea2845ac8c3007b31994728b74953e40c1015373efe10ed64243cf5e85fd210654aecb3
-DIST libwnck-40.0.tar.xz 455216 BLAKE2B 7ebadb2a57cd0ce6bccac265427cc31e9a84460219c2f19f9dd14c5e6175da19a2e8ab2309902e098686fb40bf277ae8b815d60b29b541de9992e0b1538f6777 SHA512 059f2a2add3f95feb7759e827072905652a4dc9c6756d526743319b5016ee36191b5c9a4fb5204f85a13049c2bd1bb3d01b2456ddb3ddc8f76148a0ee1651696
+DIST libwnck-40.1.tar.xz 455624 BLAKE2B dd069cba299b9006a10de3311da87958f14a9defcc02a936cb0be38431eda9210aa8cff36ae63858235380a75c1d5266ce0612b5f93f47de21d48a5324af8a6d SHA512 50ba20547e95280d10f1f66f36eea6c649b59d385da7a9217c295150520099585a5ff43c08a552afb8b0db3ee7305bbb2c38d0baed84cc6dc0942f3ca1e43e29
 EBUILD libwnck-2.31.0-r1.ebuild 1209 BLAKE2B 5bf316bc3ab03afbc54fbcf4095804721f86b24c81be44e416d5e1107d65954b9142a739e8d46ff07a27657b174b078a364e52640cec50a8676cdb7916f34888 SHA512 adcd8a2024f44730082de7a27bea6fdea598f3ba5495fe18f86df09e23d21218cf9fa4403a4ad665d0ca218e2aa5d1187643bb68cc57187e9825a9f558cd4eba
-EBUILD libwnck-3.36.0.ebuild 1423 BLAKE2B deb4f4d8a43f40a7e4aea5c12550492a2a4fd6d5d485ef60070a95117d3eb47b9593a95632e787cb9cedec9ca15549acf36036a94c0ee703bfb818dd66fd03fa SHA512 50560b1e74b937803c44cae0f21d3f513d3e27e0ac4905242b4e7308da2916274659655d4e7eeadef182e2ad5da93a0b7a92e50ac97157f41edf6ecc7e3bb6f3
-EBUILD libwnck-40.0.ebuild 1417 BLAKE2B 229d54ed01832f6469bebbad49822f59df6a5c5c80b4e032ef2194fdc17bd813a54773edbf98762153c252aa684aa52c23469c8fffcc3bb218a62210fec6f21a SHA512 42fec50639ef9df96602eba6a3ff9d329a0c0a2de5536f0b7c5a2fc9627278c6db518acf39522fcac39809a3184c8516cd6ef4d156d8f3bfe1ac722333fff549
+EBUILD libwnck-40.1.ebuild 1410 BLAKE2B 41de94e5d9c92e57414d6af7496862b6db655d175778c599ed29e456077713ba0c51000b15b75f8d28a0641d10e0091279df653affdcd8b569ef9bdf19ca109c SHA512 153b9a15843562614b0b1732a94696eb917c71f20504e16b215ff37113de04a4e8879f95d9f631406d6c522379ad7cb1eda6a09d00f1b4b7db3e57b13a34d0d2
 MISC metadata.xml 365 BLAKE2B a7be92726d84fa9db42339b18e8ce7cafcf36a19c7573295c5b833c6ab1fcde222bcb43a645ae5c581d8fbe71e52073381f73203c89009dc9088aa4d11c9a1dd SHA512 d7fccc45d93efd6f83a0af12a1b8816a4a9d45c379f247f0728e7bcc7c4b6d8e193649ac83df6070fac2841b42708181829393cc424075067ef49496eb1f9f54
diff --git a/x11-libs/libwnck/libwnck-40.0.ebuild b/x11-libs/libwnck/libwnck-40.0.ebuild
deleted file mode 100644
index b8eedfea78f3..000000000000
--- a/x11-libs/libwnck/libwnck-40.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson xdg
-
-DESCRIPTION="A window navigation construction kit"
-HOMEPAGE="https://developer.gnome.org/libwnck/stable/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
-
-IUSE="gtk-doc +introspection startup-notification tools"
-
-RDEPEND="
-	x11-libs/cairo[X]
-	>=dev-libs/glib-2.44:2
-	>=x11-libs/gtk+-3.22:3[X,introspection?]
-	startup-notification? ( >=x11-libs/startup-notification-0.4 )
-	x11-libs/libX11
-	x11-libs/libXres
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-"
-# libXi header used by wnckprop.c, which is compiled even with USE=-tools (just not installed then)
-DEPEND="${RDEPEND}
-	x11-libs/libXi"
-BDEPEND="
-	gtk-doc? ( >=dev-util/gtk-doc-1.9
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Don't collide with SLOT=1 with USE=tools
-	sed -e "s|executable(prog|executable(prog + '-3'|" -i libwnck/meson.build || die
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddeprecation_flags=false
-		$(meson_use tools install_tools)
-		$(meson_feature startup-notification startup_notification)
-		$(meson_feature introspection)
-		$(meson_use gtk-doc gtk_doc)
-	)
-	meson_src_configure
-}
diff --git a/x11-libs/libwnck/libwnck-3.36.0.ebuild b/x11-libs/libwnck/libwnck-40.1.ebuild
index 2600377be1ee..fc95a99f6e79 100644
--- a/x11-libs/libwnck/libwnck-3.36.0.ebuild
+++ b/x11-libs/libwnck/libwnck-40.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit gnome.org flag-o-matic meson xdg
+inherit gnome.org meson xdg
 
 DESCRIPTION="A window navigation construction kit"
 HOMEPAGE="https://developer.gnome.org/libwnck/stable/"
@@ -16,7 +16,7 @@ IUSE="gtk-doc +introspection startup-notification tools"
 
 RDEPEND="
 	x11-libs/cairo[X]
-	>=dev-libs/glib-2.34:2
+	>=dev-libs/glib-2.44:2
 	>=x11-libs/gtk+-3.22:3[X,introspection?]
 	startup-notification? ( >=x11-libs/startup-notification-0.4 )
 	x11-libs/libX11
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index 556f9addcaef..e669c7246a05 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,3 +1,5 @@
 DIST libxkbcommon-1.3.1.tar.xz 471036 BLAKE2B c46d39876bd4477fe838e17e744ed04388417cfae8bb77c7de48237d31f51fe230d2705733dc0873253b48c61530fbe932e4da7317217c31a7897702fa1d03b4 SHA512 3b2cf6ae9ba4dc8b6fe702ac1fa700034fbc9bd147c73bd2cd93546bcfb71865734b3e46bad35a8fd618ed97266a02dad1dc966c63e6b10404a64919459d933e
+DIST libxkbcommon-1.4.0.tar.xz 471948 BLAKE2B 5b0a155a3a47adb7302db01f3daa0ef81993a9754b032b01f1cdbd53af74d15df95dc6c9334860211a28272b246f66978ad6e409db74a242afb13c17dc25b76e SHA512 7dd86952c036a6a78455b1ba05b53fcff9d6f133bb01c83fa860b4eaec3fc26bb0b5535948bcc2dafbd27204c3c91d01404ca9fc52896cc36af509384797d4f1
 EBUILD libxkbcommon-1.3.1.ebuild 1474 BLAKE2B 6fad57ab223145b1f966714970d6e21bc16841405a569e68a505587c7ac2fedaab111be7b58d0d99bc700c4dc8c6e3723e49b1594e2d6033519a640530908515 SHA512 1e78ed395916ed6e9c2691ae7113ba90cdb0123e9ca2d675ff3ea6d22da9dfbe91771131a6ef8a7a1ac6fcbee6238ff88761180ee3ea7e60da066d549b9aab21
-MISC metadata.xml 326 BLAKE2B d18efe3aa2e5fef21aac673bf0c7e951e4e998a9182f1372a343aea035be05252e195d62d991677c90d78dd8ffd89b77c45e4235c3c757e85399c064db7af9e0 SHA512 b6f5d79d6a1243c3bf0511d95748a943545e143242feae120c6932559f003caf3e15de1f56f12f177dba9c00ccbbfb3f8080c7ee95856e401561e67ad0a0a0ea
+EBUILD libxkbcommon-1.4.0.ebuild 1545 BLAKE2B d2a04e235709b1fc5c259ecf529eb87a5824bbdc3057741b4cd09b81ca2ec1e1a79b71185282a61ab08049ec4cd2e961827f8e85c2034fb1ac281ad86722c225 SHA512 88dbedf85c6bc890e3c345d5e2ec57245d4e164bc539a5658e449b6410d7c96f90cf19d0d0813c80e057a7f837e92aec7d493253acff758f9c453bb435411726
+MISC metadata.xml 392 BLAKE2B 387cc216299e7c312552b0fa7abdd744203daff7bc5a51ef5b7d2bcfd39b83904308c8bb2b66f2459f77f593e18fc8ade017491fa45e698e8e6bfce03a819df8 SHA512 0ab9850b467605c1050d70ca526d2a4c2957e3ec9f56113fcabeb9d4a79cb8636ab077f66e17c7e05b79aad6948a7e89a83e5d8c48197ab016a7f5b2f2886f42
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.4.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.4.0.ebuild
new file mode 100644
index 000000000000..91654e01156c
--- /dev/null
+++ b/x11-libs/libxkbcommon/libxkbcommon-1.4.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = *9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
+else
+	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson-multilib ${GIT_ECLASS} python-any-r1 virtualx
+
+DESCRIPTION="keymap handling library for toolkits and window systems"
+HOMEPAGE="https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/"
+LICENSE="MIT"
+IUSE="doc static-libs test tools wayland X"
+RESTRICT="!test? ( test )"
+SLOT="0"
+
+BDEPEND="
+	sys-devel/bison
+	doc? ( app-doc/doxygen )
+	test? ( ${PYTHON_DEPS} )
+	wayland? ( dev-util/wayland-scanner )
+"
+RDEPEND="
+	X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP},xkb] )
+	wayland? ( >=dev-libs/wayland-1.2.0 )
+	dev-libs/libxml2[${MULTILIB_USEDEP}]
+	x11-misc/compose-tables
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	wayland? ( >=dev-libs/wayland-protocols-1.12 )
+"
+
+pkg_setup() {
+	if use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddefault_library="$(usex static-libs both shared)"
+		-Dxkb-config-root="${EPREFIX}/usr/share/X11/xkb"
+		$(meson_native_use_bool tools enable-tools)
+		$(meson_use X enable-x11)
+		$(meson_native_use_bool doc enable-docs)
+		$(meson_use wayland enable-wayland)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	virtx meson_src_test
+}
diff --git a/x11-libs/libxkbcommon/metadata.xml b/x11-libs/libxkbcommon/metadata.xml
index 9527efe6ae50..045195581cc6 100644
--- a/x11-libs/libxkbcommon/metadata.xml
+++ b/x11-libs/libxkbcommon/metadata.xml
@@ -5,6 +5,9 @@
 		<email>x11@gentoo.org</email>
 		<name>X11</name>
 	</maintainer>
+	<use>
+		<flag name="tools">Build the xkbcli tools</flag>
+	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:xkbcommon:libxkbcommon</remote-id>
 	</upstream>
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 949775d86a71..ac72410e39cb 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -2,9 +2,9 @@ AUX 1.42.4-CVE-2019-1010238.patch 1088 BLAKE2B 7517b2b4c3502546a554d3b592c8c48af
 AUX 1.42.4-pango-view.1.in 2771 BLAKE2B 6cc529600d8bc0479a972046c0680139d1910fbeb1629ca66e9d50a80d6c805db1dc8bb1c6de77e73197f98b2b5ec8b8afeb4128ab588b155019fd287cee3105 SHA512 e26c20b889784a3f7aea0287ced559e25fdd23fd915949ab9c538f10d0a6c7200457132ed48061d2c47e004858f7307cf4c7c1027d6b2abd642911f5e81f72c6
 DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B ec3f1a6a4de30e0864e7f0bf0950cb7a7b4bada8c3db496a8e5b1e770f221ae72b43167178445ea9cd0d6b88e51d2af49e7fdf27b2e792997fe7c37e55d429c1 SHA512 b7654c3493931e3c6d3cbd40ee49c5cbebaf403954bae75dea80e9f03e12dd5082548aff6a9e778821b8f935e227a7efaad4c1b980fa108e7258042221cadfc1
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
-DIST pango-1.48.10.tar.xz 2071736 BLAKE2B 68bca7e8307fc7ddb49830c84b17e95fbb1f2e1afbe04d26d04d9bd9f48f0767b80cb7446a22150a7f3d5650614d6652d7b20be102d533b4c78adf58574c57d1 SHA512 f9acdfb3fde50e8fb4b3dfad329624754ef7cb1c6ff6d80485c1fc7a24d92095b7e9053cd8713a291fbee68cd1cd699dcdb8110265b44e97a34c5b4ef0c06390
-DIST pango-1.50.3.tar.xz 4093644 BLAKE2B 7bcdde6e3fa6d2951fea017516b5f245b5b02dfaf6ab1303a6db4da8f216f948414b0cb528dca4012f046598082a6d9128d5f87c9a03a088cb393158fc0bc7f7 SHA512 6b31690ce9746b47fd8ea2f30f26c242d85cc836c812dba273a4d3e43df5484e7b3450b11de019136781dfd3dcac41f1e34189324e4700583eec1fb757763d33
+DIST pango-1.50.4.tar.xz 4290504 BLAKE2B 310a7be79ebf693b3a7775fa86557539bf4ea682b0903266248ab2812504e805024b14a917531e71ad9b5637d4d3f3c1a06b84188eb01aeed37fdcc7d11679a9 SHA512 b44cf9bd7afd633fab326e70b69dcb9f00cc26dcc36361793d3654b5ae798a303d4e63e173370f396c4fa474a4118c53076927fe7cc944fc35a32adf3a656806
+DIST pango-1.50.5.tar.xz 4291708 BLAKE2B 90a1fc927ee1e06eb76ea6b82e9851e3381d5393a1992db0d3da4d3a934b5bf08f4485b40a9eef58aa906e3f0b74e71f491d947ae00310130ec5e23bde47d836 SHA512 6e898945ca9682ad113cea8a5702068d6141d39bc51a27093c6c1627c10825005155c73778cb5acab99551689dd1b47069f7d5ea102db11f00416ddcf747b8c6
 EBUILD pango-1.42.4-r2.ebuild 2310 BLAKE2B 6068b613ba19c35420774bfff3ff2f292d67430ca167246e8b7c4132f34f5165ad2e4f24df5080ce7c8f677f45d5e48ba555e04eefcb8c751243ed2354d2bf6a SHA512 5c05c5db53a1127119981966f9f144e95fa04c07dccde5df9341a24aef0479a6cddf3b0e7bae0f339f32737618efbd89f367d6f512ed0a01715008226ecc640a
-EBUILD pango-1.48.10-r1.ebuild 2281 BLAKE2B 47ab13c343ad4f2d09a7c258164eeb9b06eb7566e44a18c6bbbbf73e838e90a601ca8c609bf47dab83cd2b9e3e2a2c86d492cc9b902056cc5d35f2c6dc8bb667 SHA512 994205edb3352d026a51f64f1d16db4a8e2a9b903be551be501fbbc529111c488a50c14fba6bfaf518496b624708541e623622f388723eb59e589d52cf0d6050
-EBUILD pango-1.50.3.ebuild 2272 BLAKE2B b41b796171eae910753492ddf0e91ad7ebbb3cffa544fa676b69bb0972bf332c532ff3ce8264b85f44df2da46132123afd5e9cccfa4c937390437c2f7db815f7 SHA512 ca9d78e71fd8434e654a930cb5373a326592d3ad5f4fc562c46b0134754be18e637134d99e271214207bf89e37aa09efe86ad002b8263dbcc530b8f4b33fa39d
+EBUILD pango-1.50.4.ebuild 2264 BLAKE2B d506d18f028db1a83bd38485a60706f7563f08f1b4bf5256a8e2d3a1be097030281d60a4946b8812b89c55d19c3d5a2dd4e3d11a7b24827a2fa0201c75c58d69 SHA512 769ba222582a9cd3c4b3bbacb2b27d5c5cc5cdb752a93ea8d94036ce35c9b31e0a1614c5b4384ca320edcfcc681204e2a4fff37b75adbdb56ed99ab2ab3073de
+EBUILD pango-1.50.5.ebuild 2272 BLAKE2B 5c1fa2368a5f1fe99f4e50cac03851c0cb28ec7fca9318d614257583df94182d07ef754990911466aafd75b0122c839106e51c90c5cc4a04bbdddf85bf8f9ce5 SHA512 f07c6b8ce20b9855790a3fcd075480294646be56ce1184b72125784f6c5717ac94f3fdd02f73e13137d6ad136c2780cd5d190ff9fffddbc426284bffc50031ea
 MISC metadata.xml 523 BLAKE2B 623788e7504fe89c7d8604eaa2a6b1ab5fb022965eaa3044dd2a94b6f68638453011257659c0f17b7ced9b6945acb3eb4767f9fd3ce9686b69b3b60b867dcdfb SHA512 a60feab6e4e50cb9b477f388d4534eed4616fac6aca4f6eae450fac42bfa9ca0d7382e36b98a159732f9c6926162cb2ea55d72a644bc77629ff09fd0097226eb
diff --git a/x11-libs/pango/pango-1.48.10-r1.ebuild b/x11-libs/pango/pango-1.50.4.ebuild
index c83171f103b0..92c1485a0b64 100644
--- a/x11-libs/pango/pango-1.48.10-r1.ebuild
+++ b/x11-libs/pango/pango-1.50.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic gnome2-utils meson-multilib toolchain-funcs xdg
+inherit flag-o-matic gnome2-utils meson-multilib xdg
 
 DESCRIPTION="Internationalized text layout and rendering library"
 HOMEPAGE="https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango"
@@ -18,8 +18,8 @@ IUSE="debug +introspection sysprof X"
 RDEPEND="
 	>=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}]
 	>=dev-libs/fribidi-1.0.6[${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-2.2.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-2.6.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.13.0:1.0=[${MULTILIB_USEDEP}]
 	>=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
 	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
diff --git a/x11-libs/pango/pango-1.50.3.ebuild b/x11-libs/pango/pango-1.50.5.ebuild
index b756a9e7e501..13c9fd367584 100644
--- a/x11-libs/pango/pango-1.50.3.ebuild
+++ b/x11-libs/pango/pango-1.50.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 91795ba62406..0cb01c51bb88 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -4,11 +4,8 @@ AUX vte-0.28.2-repaint-after-change-scroll-region.patch 3817 BLAKE2B d57f2041519
 AUX vte-0.30.1-alt-meta.patch 2490 BLAKE2B b5046bea09bb7fee5f03eaaa0c88f88a9e05c3d4f97fa8d6b4ecfbaec8a35bf1989c0461c1ec1d31e1b22c9d35688775a30f34134028bcd4fdcae1b7d40129c4 SHA512 69ed3038f3dcbbd09709667caff5692e4e11e30926bc7692cdbbdef2bb1ae4584ef64b824b5afcb3c57c237a3c0db4d9588ec36778d0994a546b1e6f74c2e430
 AUX vte-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch 1375 BLAKE2B 27ee298761155789aba19b77dcad97abbf2524a69de4540c38b814fa566e8f3e4003925570a12b75d85f56cb1b047c1895eb8c74df8c81f8334785dfc5055913 SHA512 983c7f4ab44417a5ca0e00f428882650b8a5c250aba328e8255bffb25cdff0505f0fa3a635d722a27467ac44e4e2880f8631b7ff3b20a35ea4e57db9537807ab
 DIST vte-0.28.2.tar.xz 962340 BLAKE2B 1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9 SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6
-DIST vte-0.64.1-command-notify.patch.xz 4880 BLAKE2B d6ff5f4acac161980c8c18245e65795c7f0ea3d0819748894b055306ecd731d698cac578eff2750795a9180a9b17d79f220e814083012d5a04f4f351ff2a0e36 SHA512 174397aeca00399b138286fd4cc88941add041a1f2596fd42222d44c886c2e35b2a33041b58a102ee3acbcddc0cc40fcfde39d72ec46b640ee1db22d8ae684c4
-DIST vte-0.64.2.tar.bz2 486837 BLAKE2B 3e127d61e4018607ca2df170108aef65b224a48df4d57545c98cbdb9753cbe7b9821e91a5bccd09d8c39af95d747a2ff01c69320e9245f5a82e7887b62c32c97 SHA512 6cbc1ee25a0ef2b00bcf26c07042eccc14fdea323e4445123db9fad05bf2e799579d723f6147c08712aec9b94e17003ce8f9e6ebe65278fdb3832cf77cba5be5
 DIST vte-0.66.2-command-notify.patch.xz 9672 BLAKE2B 8153a250f571f491845041627029065029bd32ab63c127aacc0852f42abee0834c716d63248120a49011857901d775b75fc0c31a513cfb113563e8ffb599e478 SHA512 d491f8332fbd21e8dfe225636ca035339ab1da3bd7dc74436cdd2f3de3c5f24f609f9825c4eb0b816c9f60862da62b97f36381c5cc5af0203b3698d56fc77d3e
 DIST vte-0.66.2.tar.bz2 503503 BLAKE2B 174a0d9bfdaf2318255e62041ed94aa53f8fc110ed55f3e7b24baa70dd01a4851306ac47cc3f1d6699341c9ab41f85aee57c460b9f96bfd14618f0f40e4bd657 SHA512 6e9e2cc03b72c2d04aa3d7633dcf86649dcef39fdfecbe7a0c4b063eaccdb2ea83207f592edf348fad5a36f091d9261cc46fd0a4e9e5db6006fcecb0d01a6ccc
 EBUILD vte-0.28.2-r209.ebuild 1864 BLAKE2B 61c287edd403d36a67fa2b45987bcb7a5ee446516df9c84a2ae10bcdcf8318795a98683a702e868aa4f6178d7dfd8c59afdc1a4a412544c52a01131ad2a41bc6 SHA512 c5ea6ab70fc89c5ddb4f097c5ee699829d96c98bc0fe4430b8aa3bf8e5767fcd5aff112304d8ea680f92a8b6ceccc1bbdd29ebce10c126f9b329ad5869da246b
-EBUILD vte-0.64.2.ebuild 2639 BLAKE2B 322c4e933b99409d8b09e59d89cb21933ce60c0bdf510691aaf241940cf964697376668374eec45222fa24a37f374ef54bceec96adb0867afbd13c380b321359 SHA512 94cc0c4a20feae35be06efd81eddb148b8c739c0ddfa5046331e20224d7bad6f88e3f92af968dba347fdccda094833560dff085d5bbde8668a419d189278a3af
-EBUILD vte-0.66.2.ebuild 2682 BLAKE2B 052274b5a7efe08a5d8ebe0aa762cad2febae31d6fdf73bc68303199ed2b46a99be392b0980bf0bb6fb31565e052d26451dd4621c2e0c4b0a383378a07a43714 SHA512 5eb18244cf9668b2dde732d2697f7bb8b40b42ae6b7ed409034ad96259803bfb4786e7f39400cceaa921a8e8c74bde30b6e32cf353d9f1268e2b312f03b090ca
+EBUILD vte-0.66.2.ebuild 2675 BLAKE2B 8e3e1e9f26f9c3d1d361b41071a906bc4b8b2946ba75d6fec3fff045826440ebd4b8655de5b926afc830a86c56a8c79dc73d9b33567d7b703716129dae7d19a9 SHA512 061cbe889760615a2aceb5ec2a9618b444cb92bc490aaf1293afce4f9cacde9690bd900f0538e05616a87bf53e6f097dda365831bd51def75e63e5ccb6318960
 MISC metadata.xml 519 BLAKE2B e34530c7e9882f9d61b6c1fe9cc1d523037bcc05034e3f98351ff33bb543a0a25d96c0debdd1572cfeb0d2166b41a324c7fdfed38482c11cbe053db96b312ef8 SHA512 313a0af6b28d47bf385594a9306f38476bbfcc44517d7219ba1d0a8ddee224a37cd4ee8f7c4f8aed8bd7eae0ad2b3461bc4ae49c5eb8b08bc61459c76bf7a5ef
diff --git a/x11-libs/vte/vte-0.64.2.ebuild b/x11-libs/vte/vte-0.64.2.ebuild
deleted file mode 100644
index 21873ac96c91..000000000000
--- a/x11-libs/vte/vte-0.64.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.32"
-
-inherit gnome.org meson python-any-r1 vala xdg
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
-
-# Once SIXEL support ships (0.66 or later), might need xterm license (but code might be considered upgraded to LGPL-3+)
-LICENSE="LGPL-3+ GPL-3+"
-SLOT="2.91"
-IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-REQUIRED_USE="vala? ( introspection )"
-
-# Upstream is hostile and refuses to upload tarballs.
-SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2"
-SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.64.1-command-notify.patch.xz )"
-
-RDEPEND="
-	>=x11-libs/gtk+-3.24.22:3[introspection?]
-	>=dev-libs/fribidi-1.0.0
-	>=dev-libs/glib-2.52:2
-	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
-	icu? ( dev-libs/icu:= )
-	>=x11-libs/pango-1.22.0
-	>=dev-libs/libpcre2-10.21
-	systemd? ( >=sys-apps/systemd-220:= )
-	sys-libs/zlib
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-	x11-libs/pango[introspection?]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.13
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch
-)
-
-src_prepare() {
-	if ! use vanilla; then
-		# Part of https://src.fedoraproject.org/rpms/vte291/raw/f31/f/vte291-cntnr-precmd-preexec-scroll.patch
-		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
-		eapply "${WORKDIR}"/${PN}-0.64.1-command-notify.patch
-	fi
-
-	# -Ddebugg option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter
-	sed -e '/ggdb3/d' -i meson.build || die
-
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Da11y=true
-		$(meson_use debug debugg)
-		$(meson_use gtk-doc docs)
-		$(meson_use introspection gir)
-		-Dfribidi=true # pulled in by pango anyhow
-		-Dglade=true
-		$(meson_use crypt gnutls)
-		-Dgtk3=true
-		-Dgtk4=false
-		$(meson_use icu)
-		$(meson_use systemd _systemd)
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die
-}
diff --git a/x11-libs/vte/vte-0.66.2.ebuild b/x11-libs/vte/vte-0.66.2.ebuild
index 5d00801b3f56..2bd427c804f6 100644
--- a/x11-libs/vte/vte-0.66.2.ebuild
+++ b/x11-libs/vte/vte-0.66.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 PYTHON_COMPAT=( python3_{8..10} )
 VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.32"
+VALA_MIN_API_VERSION="0.48"
 
 inherit gnome.org meson python-any-r1 vala xdg
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE https://gitlab.gnome.org/GNOM
 LICENSE="LGPL-3+ GPL-3+"
 SLOT="2.91"
 IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 # Upstream is hostile and refuses to upload tarballs.
diff --git a/x11-libs/xcb-util-xrm/Manifest b/x11-libs/xcb-util-xrm/Manifest
index ac47d384a0b6..9a7ab7544f62 100644
--- a/x11-libs/xcb-util-xrm/Manifest
+++ b/x11-libs/xcb-util-xrm/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-xrm-1.3.tar.bz2 327586 BLAKE2B 06ba03ba22c9a51cad5045024b63d48f32e5ad38d2cf03035bd1132a04ef4906a71d89030141b407329bd8ec04cb131846be2cb3a95e755a57c2841a45b58fa4 SHA512 ebca5d92c9e2363f58485970a0c3a948b13652ce7acdd51dff918fc2e8bc7fcb69892eb3fc8b5f7eaf721ccd8dc2db42727d206bc5155481ec5e7e41d0c7f304
-EBUILD xcb-util-xrm-1.3-r1.ebuild 599 BLAKE2B 0ddff47872f7c75df4e6414273e7c30645c9e51ef510965eec30cacaef37cda64c31179f3a6cb7b22c9b5c9e38e96033e4794cbaa9975c7920ee8ae9a179f305 SHA512 429470c71e244bbd072e8398cf3f7c87ec0e861d35436ba008ca77baee221acbe36a33813a58647cd967cd6d2b41639b4b7c298c99de6908fc8276e82805006a
+EBUILD xcb-util-xrm-1.3-r1.ebuild 642 BLAKE2B ba9438856da607f494a49000a6cf10f60a85c070113231b7aa0e1fbca075987bb7af95ec9402741f2b6bcb13efcc0334180c0f16dddc39ec6babbb7aa1205122 SHA512 dfc5468b2dd9c898a7c7421e025519f8621f6bd7e8c934eca32190a99ba847e0d5a91ce457b22e58c6b499f9f241e432a1f4162e5f4fbb72073892da8dd28b7d
 MISC metadata.xml 785 BLAKE2B c63bbc5ce0f5b19664cf75747a5fe7b46713a574b5e9cab75d01dac327649fd120ca530a969057e19c89adc5baaf659e7d89697c8e24bb2162afc6d130edc446 SHA512 5925b279d4e10fdda9455e653471a4f0a89f4bef285c6f75f1f72552c988372755505a51d7f7c3a7d0e8c616e84085d90fbf99b8d784072fd72336c6a01d371e
diff --git a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3-r1.ebuild b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3-r1.ebuild
index ae0801471647..8bda1a04bbb9 100644
--- a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3-r1.ebuild
+++ b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,5 +15,6 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
 	x11-libs/xcb-util[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
 	x11-base/xorg-proto
 	x11-libs/libX11[${MULTILIB_USEDEP}]" # Only for tests, but configure.ac requires it
author	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
commit	4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree	356496503d52354aa6d9f2d36126302fed5f3a73 /x11-libs
parent	fcc5224904648a8e6eb528d7603154160a20022f (diff)