gentoo resync : 28.04.2021

167 files changed, 1148 insertions, 1516 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 2f2f5ffb0c30..169c3a23387d 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/c++-gtk-utils/Manifest b/x11-libs/c++-gtk-utils/Manifest
index 6fe9a9b0c15c..3cd17e711b12 100644
--- a/x11-libs/c++-gtk-utils/Manifest
+++ b/x11-libs/c++-gtk-utils/Manifest
@@ -4,4 +4,4 @@ DIST c++-gtk-utils-2.2.20.tar.gz 3085409 BLAKE2B 2b0ca2a3beb3ee82416cb1d731704f4
 EBUILD c++-gtk-utils-2.0.34.ebuild 746 BLAKE2B dd431696a569a2ac39d9d8d4bf2a750bcffc2fdf7ea4f40e82d88c557a3f873eae4545fdb07c99a2155e07df9741639c8a1d07a8528c6da0740b096062bd723b SHA512 08807c989f800413730a0591b1803c6295a960619eb5af48f4deae7b1da70d9d6aa2358e8329e7e1ae2f080ca7fcbd3831d1f4dc91e1cdb93515482df9f30d8a
 EBUILD c++-gtk-utils-2.2.19.ebuild 746 BLAKE2B 7e03e1d22caa067619be45fe7551551f34969f64011b25170f432c00f621e6e63a2a82b703b73ac715b43db3c78468574f8f515118cc2c030a610d073cc4112f SHA512 680c25fc481028baf29f172274824cc5960c13fa0e5be9ebc5ea95cf6e3e9dac8bcdfdad329e9fdfd1494b5fdb26f2cbf709d1e4088c6b8f73cb7b0348ec88d8
 EBUILD c++-gtk-utils-2.2.20.ebuild 748 BLAKE2B 5614bd2c8872e1964c91ad5f1a5ae7686f2d4aec937bd8b9fdf5df7328ab795a313ec4bb4c08e7ab1d2a6cb3bc26f1ebf5be52452068c60fd69891436eef711f SHA512 7292990a733375947a06dc28f00b8a887e4e74204edd5bfb2a530179982b1f02767f52204ed82716a7db6645c8fbdd050cd1ef4c2692d21ea0f9a59650b58480
-MISC metadata.xml 435 BLAKE2B 361605abaf7edb08f9d13c55f070ab30f3fd5fd49668ac0010e87d32d338e485a78aa2136728ef5935bb1f01ad79ded96fa97005cd11517f6a5aa493b828e419 SHA512 250f66f08fa7b4644cae285f78156ede515132f443ed591843a1d1bfa3e8b8e3739de0085732341d6464d9dfd9663acbe047c337c1e4483d9a7185779eb374a4
+MISC metadata.xml 326 BLAKE2B b51a3121700fbdd344226185544ad1ec113331afc17b622bfb31772619e9127f3acbb707741856f431762a71cea0e92bc7e51f286cd7b7cc4bf492cd6b875704 SHA512 ae8aad42f470349ad2a6a75190bce56720c71c5b06ce00ba6b479b6024a34c1674ed2382de222be783ef4ea9595f6991d82a7b6991e4ba41cd4ee374625867db
diff --git a/x11-libs/c++-gtk-utils/metadata.xml b/x11-libs/c++-gtk-utils/metadata.xml
index 4213bf121d9b..8d8ad9973abd 100644
--- a/x11-libs/c++-gtk-utils/metadata.xml
+++ b/x11-libs/c++-gtk-utils/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">cxx-gtk-utils</remote-id>
 		<changelog>http://cxx-gtk-utils.sourceforge.net/2.2/ChangeLog</changelog>
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 8591ec4d9078..990e013fed28 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -5,6 +5,6 @@ AUX cairo-1.16.0-pdf-add-missing-flush.patch 914 BLAKE2B 6277dccf5e6fc70d885548b
 AUX cairo-1.16.0-strings.patch 690 BLAKE2B 2509bdb3d6592c9606c92730f1e052c0ce5dbbd557daaeb5955b998b8d89184063f15c583ea745fc16c07185cfe06e5f8ef9c18f749d35341918d626ceadd2b3 SHA512 90c9595698b30cceecc17ca186e7936d7884c382a23b8d536bdb10b912e6f1640037fc55326833a4977f332e02fc88d967ded751e50543c68dd80763b5fc43fe
 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-r4.ebuild 3927 BLAKE2B 4eca62659e251919db851469d75706478f2d9d01f9a83e02a0335330afad1b4e90cff100a35ddd9f61e012d1eb27f7f67bf62c79d9541416f6ff016d50c40472 SHA512 c27e3ac165439599b8b37161bcf41495b56fecbf02e783f48b1284129672082e6e906da49c701b296321d10e4f5ba1845cb1671bb146dbdff0fdd8dc3790cad3
+EBUILD cairo-1.16.0-r4.ebuild 3928 BLAKE2B d04b7d787e2da853859b31c0c375649d1020e6cb48dfe3a8a8a31835e07805b4ef62cbd2b3d3bcff322231f13483390e8d2fa55e4080f4f7b65fd4601bbdf208 SHA512 92bb5abb2dcf5b632b026ab38e442120d7cf1cc39f263ac576028afc9e5d20eae7e69a37668da85874b1b09b6a44d11db070b91d10f35aa55e0ca487c173f4e3
 EBUILD cairo-9999.ebuild 3768 BLAKE2B 9dfc837b6dc7865285a918a56dd334b9898a4ed08b7c2fcc482813622e763e183705c954c88bd368b7277f6ec183da9ef9da97591417df8322a1115ce5428797 SHA512 0be0f7370eb817eaf4cdd8b4946cd0d4e44dc61eae299a1e760892a0efcf7d65b752fb94520b0f48f8934a2ec89f525495ec9648fe5b567e966269bea5cb0b56
 MISC metadata.xml 709 BLAKE2B 7cdfba4d24004ca9d45af33b49ec0f27344306a42d2269010957d085f527a8ef6e95b521f00344e3280852b1b57d06f4f84ead4b5e149baac7a2c5a48de44d14 SHA512 5ff7d97521b43486f6a9d51fe36c7546e229a66deeb308d9f5f84b5473678f5db869d3f58634d044fddc00af499a8e03699b22bca0582290b3a322dd6ae66b1b
diff --git a/x11-libs/cairo/cairo-1.16.0-r4.ebuild b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
index ad47d14ae82a..d5b20a6b4204 100644
--- a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/colord-gtk/Manifest b/x11-libs/colord-gtk/Manifest
index be969714353c..325e903c61ed 100644
--- a/x11-libs/colord-gtk/Manifest
+++ b/x11-libs/colord-gtk/Manifest
@@ -1,6 +1,4 @@
 AUX colord-gtk-0.2.0-optional-introspection.patch 1471 BLAKE2B 3d4ce65f6241538fc4f8b6114c95ef229654093dabed26ebf1c66aabda2d5039749cce8580a4974c70afdd49e127b791a561a04202338c9b6512870804bce4db SHA512 a49618d773acb377c8015243ac6657e17b65e1f0f54228c391617118ae61199662a6d6398d5c5cd02ceb4cc74dc2b4cedf6488536fbe418768480285c5500773
-DIST colord-gtk-0.1.26.tar.xz 280380 BLAKE2B 6ddd52b81726f21a2c376b1ab0c773f7670859882f3e5fe6038bf8728d5a9f3308b469b4e563dc784873b5b9cbed8ca671552e9bcb9cbccfaf28cd8f85e0b5bd SHA512 14f59110e2bc100c542323a68566102e9fb5ab44b679da21bf29101960dae38e646e926d884e14f1838a5991e6ebe15af72d5338723265868eadd5f026545c3d
 DIST colord-gtk-0.2.0.tar.xz 20480 BLAKE2B 73bbb349e84e5bfd28358cbe22609de84b86f90eb96a3fedc6e30a1764d9c667cd82408116cdf65591496ab4e2f59f2b415cd1aa8f995fe2162ee4d649c5d496 SHA512 797eebfd4451fcae4cf70835f5de3d9bdc9e8401ddb82a2fef2310002f28bf523b599c587ff35eb89ceff38a245a6311129ad90b107f837ac4f42f268c9aad97
-EBUILD colord-gtk-0.1.26.ebuild 1653 BLAKE2B c846669f9fbf6e1a563437112243ab6fe96cbb8524439f3dd788b825bfd0b15e15600399a43661b23291afbefb30d53035c65a953c66febd939ffd2561306212 SHA512 bf9c41a78a92e03e9e7f5570e9a3ca0a981b499a87a6d62bd31e6b8f8a4bc7066697fcbad4cd13712c9675fef547b776574e8f4182e495ae7afaaeda08dd7694
-EBUILD colord-gtk-0.2.0.ebuild 1344 BLAKE2B fc88042c54130cedc36853cddd02445657e0bf35c2c47989768b004384dfcf03f234e66bd7844689ba3982fd476ff9ef6a1b9ef556ad5471ce74ab4b3aecc38a SHA512 3788fed631f85c9ca87c9bc7a8002259645658f357e2e9b67c9faf1cbd5629c8c51390ad39b5eb6061643b17eee086bf2d6ced925d69449058392f5ff3e392e5
+EBUILD colord-gtk-0.2.0.ebuild 1342 BLAKE2B 2e16b3335d5c913125630be0a3eed24eef278c333bcfdfa4b348d880634d9324291c73ddac1b7c0c11305502c3ca9641d02306fb249a68e8c5e6b68d74e0b710 SHA512 740e81dac17722912f243241ac1491af9a494a04198ad26b54a52c14c612e0f2e85bd6c7fbbe2a4582c8bab01575f1cd15ffb7576ef3c43a269eb3e689e218e3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild b/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild
deleted file mode 100644
index 03df30c3a140..000000000000
--- a/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 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="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
-
-# We still need to build gtk-doc, https://bugs.freedesktop.org/show_bug.cgi?id=69107
-IUSE="doc +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.28:2
-	>=media-libs/lcms-2.2:2=
-	x11-libs/gdk-pixbuf:2[introspection?]
-	x11-libs/gtk+:3[X(+),introspection?]
-	x11-misc/colord:=[introspection?,vala?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
-"
-# ${PN} was part of x11-misc/colord until 0.1.22
-RDEPEND="${COMMON_DEPEND}
-	!<x11-misc/colord-0.1.27
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		>=dev-util/gtk-doc-1.9
-	)
-	vala? ( $(vala_depend) )
-"
-
-RESTRICT="test" # Tests need a display device with a default color profile set
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-gtk2 \
-		--disable-static \
-		$(use_enable doc gtk-doc) \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
-
-src_compile() {
-	if use doc; then
-		MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_compile #482542
-	else
-		gnome2_src_compile
-	fi
-}
diff --git a/x11-libs/colord-gtk/colord-gtk-0.2.0.ebuild b/x11-libs/colord-gtk/colord-gtk-0.2.0.ebuild
index 4f5d8d29d964..76e8886fef6c 100644
--- a/x11-libs/colord-gtk/colord-gtk-0.2.0.ebuild
+++ b/x11-libs/colord-gtk/colord-gtk-0.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
 
 LICENSE="LGPL-3+"
 SLOT="0/1" # subslot = libcolord-gtk soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 IUSE="doc +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index 73b70ef31dbc..3de942e3d2fe 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -11,4 +11,4 @@ DIST fltk-1.3.5-source.tar.gz 5261324 BLAKE2B df05989d6581b570c689e29e9f31e5fc85
 EBUILD fltk-1.3.5-r4.ebuild 4463 BLAKE2B abc7134d4b7e7aa702a0c40f78b24ef7a6676271b60b29de9046a1d539555e35dee26b03038e2c8030b956087a28ed7c0cbc079f618654172545f0d5ebaadceb SHA512 7d4e6c3e4972f387b01ae7e82a5d67fc99ed70b90c53145e1b109b103d4a4f0e55232902a82ea7b7a6911b2603cd819f8eb0a72fe31ec56d5132fec61d93a600
 EBUILD fltk-1.3.9999.ebuild 4473 BLAKE2B 3ae316ba98fcd88c7344db7c78ca497620283eadc7419146af71e421862c6fdf30d02ef2e51e9a4d3e7bfb09dcaccb1496b1529e38aa20849bf29f3f959d2617 SHA512 ec27297bad9358c6ed4339c138fe38e69be71c386f0d0ac550999d1f31b4f713203d36cc2498b986c3e1aee82ffc8a1df4e8d61a93d1ff44d4109809f360bbf7
 EBUILD fltk-1.4.9999.ebuild 4506 BLAKE2B 3891ff70b01adc480baf56abe5de071d177893d0718cb7901b2fec1afdb4a3149644d5c77bdb7c126c890215711c3f17b261fcb686c3c80f4de803a302ba9610 SHA512 2b737473c748d04424a41657875096d78dfef7f96853c27f77554f41b963883ef4d25e82ff415da25be3f7372e5eaba65e707e310c131913ac85f0dc469efb46
-MISC metadata.xml 698 BLAKE2B 5289c4920b3345c4cfb1bd9151974c40b6d45f6ec605c7c1d766ed3c5118d562d645094ea64b4b0baeb83cf7872ff1fe762e0a427d53899b3d8f517233a9665f SHA512 05565c7e9fe48f03536bdb10f0396c4d609ae7e52ecf6e1a04e956a3f8fa9ad68e2a79827ace0e51b60111859a4482054680b361fe7b391b824ebd39bdfbd24f
+MISC metadata.xml 585 BLAKE2B 49cb19e3e7e999c3d23df448b84cc787e1309aee01f578ab9e23174951148f12e22187741eb86dd369e1907cf87d45c58992adbb447a83696db20367102cad51 SHA512 68123ace52b69fc68114b8becf1913297bc82dfa97eb4493711524b19ed256206e296993c7757fd5506dff3349decdade23cd9501d1f792ddfa265f135bc6c26
diff --git a/x11-libs/fltk/metadata.xml b/x11-libs/fltk/metadata.xml
index 19be30c1abeb..4fef3c8a856d 100644
--- a/x11-libs/fltk/metadata.xml
+++ b/x11-libs/fltk/metadata.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>desktop-misc@gentoo.org</email>
-  <name>Gentoo Desktop Miscellaneous Project</name>
-</maintainer>
+	<!-- maintainer-needed -->
 <longdescription>
-  The Fast Light ToolKit is a cross-platform C++ user interface
-  toolkit for X and OpenGL. FLTK (pronounced "fulltick") provides GUI
-  functionality and supports 3D graphics via OpenGL and its built-in
-  GLUT emulation. FLTK also includes a UI builder called FLUID that
-  can be used to create applications.
+	The Fast Light ToolKit is a cross-platform C++ user interface
+	toolkit for X and OpenGL. FLTK (pronounced "fulltick") provides GUI
+	functionality and supports 3D graphics via OpenGL and its built-in
+	GLUT emulation. FLTK also includes a UI builder called FLUID that
+	can be used to create applications.
 </longdescription>
 <use>
-  <flag name="games">Builds and installs some extra games</flag>
+	<flag name="games">Builds and installs some extra games</flag>
 </use>
 </pkgmetadata>
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 45acafd87be4..978cc90d3acf 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,4 +1,6 @@
 AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e7c95c59ec0b8d5f65f72c1675186b0c0cc105be5537e7b4660730dce3799227217a582a64f295afbd33a8cf52071f5fe8c4e153c0d3 SHA512 0a3e51c52f947d6231b472525b11e13fdc752b8eaa34c95ec3c76cfb0faf33ef3109c8381189261e8ebae76a4070af24e58c373bebc69bbb6b69399bf833395d
-DIST gdk-pixbuf-2.42.2.tar.xz 6514352 BLAKE2B 1230378ee1843f7a861772e708eba64d80a55379104c64b45efa35617aa6d9f0b49ea7996762d91ba1223172162b2b7c1209a53d906c1be43448163f9e230e08 SHA512 f341d032ea410efed7a35f8ca6a7389bf988f663dae16e774d114d6f11611e9e182c835e90d752b71c258c905cc5c4c785ea697feed5e6921a2a676c9deaa5f2
-EBUILD gdk-pixbuf-2.42.2.ebuild 3481 BLAKE2B e3edbf8f557b864a3d554d6ddba5d3317f86df57736328ac773293780fd7a58aae37c00e4248f8a5d6eb95a978216d97a15ea524382b55be5d24218c8374af78 SHA512 083cf034b5da34f44abf678e358158b879be7554fbc2259e38aa9763ede7b3f69ca582eeb085adda5c48f883488fd72ba245532be9a72d188c0e6dfc6f8f5e09
+DIST gdk-pixbuf-2.42.4.tar.xz 7534896 BLAKE2B 87224c13a83848616ef52e65580239fcb4b81ccf2ab9e9cfdb55621c8b2a5b5c97ee152a83cbd1774bf3f868c6ce3779838c72877d2a5aa14d6cafad19f2d022 SHA512 b1eca16719e749d111c33592892ab18e2a1dc5f69a16762860bb54e0c97f535d7049fc388ce9daa025153ff2af56a367d8b164fa4025ee9a0131825a6108f772
+DIST gdk-pixbuf-2.42.6.tar.xz 7708484 BLAKE2B 003b1de915ce8f17a987059bd9b2679127a08032dc70567ea169aa0dcdcc194216f66d03f35f5580e70e1c05fa15f08b18c86a72e9bcefc2bd6ed59abdb24b82 SHA512 02e6d89de6cb6c9768d5173dada88c038e2454b4345ebc6f7b012d484303c08e53b58f085e872290555e1ccb74a478fa6cef4623a75f2e1f05c27bfc4e986f4d
+EBUILD gdk-pixbuf-2.42.4.ebuild 3499 BLAKE2B 0f98c7904937371c7f1d0c440f23b30593359ef9c60a682e3ab7287bcc446832ed4c3780b5bf7179638ab3b0192d720a959028a1a35744f5e4c477570b14a833 SHA512 4ed468699ed3e374df1c1544d2e3de694aff367f5dd2f27b95ae24ceb1fae5f9dcb32dbaf923d91dca7f4eb4553d058ccab22f2a5ff5bfafa6290e315d379922
+EBUILD gdk-pixbuf-2.42.6.ebuild 3507 BLAKE2B 9b9d6d1769cdc11440fd018d184f8dd01859ae7cfb41e65f828afe33cb707684a497b34aedb343ee5e0b8d2031ccda3ecf0c27e9f4f8cd97fe90b8d76a94d0f8 SHA512 1d53ae5536e5845ce8cafce4c5e6dc4a4ea9896312a181658e45be1003204d3bf3ab3803e25c7a136a5454639ad38960cf02f9561f79eaa10b7e30627b9b232e
 MISC metadata.xml 331 BLAKE2B 4d198ee50a72d8d34a4cce94c2c7fecccf3fd4918b3100e182bdea1b80132f6773ac7d741ce5d55faef04c22158f8ea6b6ebff10908b8ffcc1f6d1e0caa15837 SHA512 3fe8410456df610566e862c010f9f5a3eb407fb72a842ab22e77d9400c7be98798296d2eab93ab2c97042779c0c5a19df1ad7e6c4ba71f82e17901cefcc4fff4
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.4.ebuild
index 69e98307b562..e4871e78b3c3 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.2.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="gtk-doc +introspection jpeg tiff"
 
 # TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
@@ -27,6 +27,7 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="
 	app-text/docbook-xsl-stylesheets
+	dev-libs/glib:2
 	dev-libs/libxslt
 	dev-util/glib-utils
 	gtk-doc? ( >=dev-util/gtk-doc-1.20
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild
new file mode 100644
index 000000000000..bf0ae307ff33
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson multilib multilib-minimal xdg
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="gtk-doc +introspection jpeg tiff"
+
+# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
+DEPEND="
+	>=dev-libs/glib-2.56.0:2[${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	!<x11-libs/gtk+-2.90.4:3
+"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/glib:2
+	dev-libs/libxslt
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.20
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	>=dev-util/meson-0.55.3
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
+)
+
+PATCHES=(
+	# Do not run lowmem test on uclibc
+	# See https://bugzilla.gnome.org/show_bug.cgi?id=756590
+	"${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	# This will avoid polluting the pkg-config file with versioned libpng,
+	# which is causing problems with libpng14 -> libpng15 upgrade
+	# See upstream bug #667068
+	# First check that the pattern is present, to catch upstream changes on bumps,
+	# because sed doesn't return failure code if it doesn't do any replacements
+	grep -q "foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]" meson.build || die "libpng check order has changed upstream"
+	sed -e "s/foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/foreach png: \[ 'libpng', 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/" -i meson.build || die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dpng=true
+		$(meson_use tiff)
+		$(meson_use jpeg)
+		-Dbuiltin_loaders=png
+		-Drelocatable=false
+		#native_windows_loaders
+		-Dinstalled_tests=false
+		-Dgio_sniffing=true
+	)
+	if multilib_is_native_abi; then
+		emesonargs+=(
+			$(meson_use gtk-doc gtk_docs)
+			$(meson_feature introspection)
+			-Dman=true
+		)
+	else
+		emesonargs+=(
+			-Dgtk_doc=false
+			-Dintrospection=disabled
+			-Dman=false
+		)
+	fi
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make sure loaders.cache belongs to gdk-pixbuf alone
+		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
+
+		if [[ -e ${EROOT}/${cache} ]]; then
+			cp "${EROOT}"/${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+
+	multilib_foreach_abi multilib_pkg_preinst
+	gnome2_gdk_pixbuf_savelist
+}
+
+pkg_postinst() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	xdg_pkg_postinst
+	multilib_foreach_abi gnome2_gdk_pixbuf_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		rm -f "${EROOT}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+	fi
+}
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index e6c44ae1020a..7460051ab2ed 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,3 +1,5 @@
 DIST goffice-0.10.48.tar.xz 2413400 BLAKE2B dce2a4fe1aa7399ce28974383f382f7a46a4b84ee2e8106ad72cf9631926767d59784ce14b2cfec9abea2367b026f83d4bf488464ca87af961f66f6e0243036b SHA512 90ce49c666a164205f8f78dca9fa40c81ddf0312b1b7f76808b8813d168868b5ce46c307fd5405a1314b0a475a4e52e95ab379b2dc751c1626e085ecf846d0f3
+DIST goffice-0.10.49.tar.xz 2430256 BLAKE2B 64ef27ab729f02b42742b2ae8da43c59b560d016caa707c6dccb3dc6f23eaab13b40367f145b83b1c728c9884dff164118f4a4d6f9ac5accb07596173b127271 SHA512 a185f9fc814ecd2a6e69d026ac150c38e30e1a440f7640bcfc3bfd1939b924621eabf2faafa2837e2d1835418f5481a0d0d7980f4a669e7ca1b93907b17a303a
 EBUILD goffice-0.10.48.ebuild 1440 BLAKE2B 0fac9a8296d2ec38cea48e618be127bd48263c1e56a0f6b78792a82cce873fff65ad613152ed115247c8e60d014d4d7f977795adc1b9fd68977f8b6acfc08795 SHA512 5299d0c6cbb87efb14cebed00b550f113ba015f0403c7d7dabf10e6742c3d8bb1eb694b57d8b7ead31be091ad31538a12aeac267774ff23a5e42a63e68dd3fd3
+EBUILD goffice-0.10.49.ebuild 1421 BLAKE2B 2deabb9817080a9e684e2d87ed423d1a2921a1a47b1c2a9a50ed6782d2761a8b98b3d0fdec5b70fbdff4fd4442525a29d9f86a44574ca03cad027d1751e1b9ac SHA512 faaa54513d7666a724dc03d6611e6026a21de35f0ca8f94ca05659bd6f671e555448fa9f97b29bfeac1473246e1827c4c14b9ee79df49353433ce14f7662222a
 MISC metadata.xml 441 BLAKE2B d1239d813165b887ed43610e0b9a09afd739164ecf52a0b6a94e957550b5dec5e18dbf5777e4b7bf8e1d665edf89bc5777ad90ebd93caeab5af6fc2882eb3469 SHA512 69e822f6c8ecb89ae952b30074c2527e8283eeabe32ac6555d043576b21d0f5a40b968b0211574ce8b1836dac85370070ee86905551bdd8cf2418cdc2ac6c3ce
diff --git a/x11-libs/goffice/goffice-0.10.49.ebuild b/x11-libs/goffice/goffice-0.10.49.ebuild
new file mode 100644
index 000000000000..33a766b3e012
--- /dev/null
+++ b/x11-libs/goffice/goffice-0.10.49.ebuild
@@ -0,0 +1,65 @@
+# 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 ~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/goocanvas/Manifest b/x11-libs/goocanvas/Manifest
index 0cb2c3882c36..22dc2a10597c 100644
--- a/x11-libs/goocanvas/Manifest
+++ b/x11-libs/goocanvas/Manifest
@@ -1,6 +1,6 @@
 AUX goocanvas-1.0.0-gold.patch 848 BLAKE2B 5d808bc92fa4acedd0be7610e8b75030a35934ade2b9a361b648aa119816d90fb0fa24b2ac148ebfa6b06df985ebd19ab0c4bfe7b091d559a7dc859652052f5c SHA512 8e61ca8a0e9d673bc77a90e9c8f8a5107717df32d094b34aed04ea2bb56383fd2a018e3fd3a4ece5b18a754adc83d29095a80fb0a34e24db0cd900a6fa8cefea
 DIST goocanvas-1.0.0.tar.bz2 570552 BLAKE2B 00b1a3d59448cc2f40dd20b0c97977cfc477a6656f32e2106b3f3bd5c42b8b625e270d9f96de44f30caf83b744b331699e7c6385b5269bf7b22e3bb25a879948 SHA512 fef4364b57dc777b6dcceb026f940121a24a8a3792e8d37d320eb47b7747ab0d54d8d7911b4ff77c21ca2b251937c9312da04221bbc246a07bbf4062689de644
 DIST goocanvas-2.0.4.tar.xz 584272 BLAKE2B 027ab47c1e9c241f74509001426367e86025ec8ea5901cf64c2014f8c32b83ce60870ca754dd15e8982a7023b77d3856b39dbbbdd636de6da47d361cb15a940e SHA512 e57dfd59d9b9cb64deadfeac193c11a89347c7f0e966377cfb98afcc2b46be13fe05d253a96e63dc7e6981c75e6e871040b83d8d0aee95cb62b79965d6be5688
-EBUILD goocanvas-1.0.0.ebuild 1266 BLAKE2B 6a55137d0ae30995f922cd70525420f3bf7fb351ef0091728ded8d59646e30f825e7f82d3e5f96eb06cd8d8b0dcacadcb90f1f5c108c1de009a20c73f453a06d SHA512 584d3fccd213dff57f61b25d57a37fdbdf5c3c6ade0ef400cccd83cc8b724aa76d02d482643412b5fa42117658d3c85233ff6d0174fdbbcd8999b9d2d28ef2b4
-EBUILD goocanvas-2.0.4-r1.ebuild 1227 BLAKE2B 12bef2421c5bd19913c73add1a63d84af9089b674bce4acde45359bc447f6acad6617975d18d4edb7275911dfce17c8405f218152cd192c19479321655d1a9a1 SHA512 2af1fa1d870da814e9911ef24d34c6e016ad947fc38916284c5176630055f2ec04a05b9c80e92c1d0896bc8010b75a9ea9ec4c3231079160437bf0ea5d029a7c
+EBUILD goocanvas-1.0.0.ebuild 1258 BLAKE2B 1a466faf66e1b7fe831505e640047e315e9eec0d77ddab5034f8d7960aa0f67711f68c130abef202e1edc61d62f938cd04db1a74940f2065682387d81477fe93 SHA512 84717f486487855421b2cb7dc88638d0182573d47dcb02b28732aedf81df3f684576bdd75b8feedbdfdb182b734f3395a196554e7a239f6884daa34da39df954
+EBUILD goocanvas-2.0.4-r1.ebuild 1289 BLAKE2B 6b0a74060e137eaacee6a6402fec2277d6ef9cbbcc7a765f249316e1d48c3c7fcfc9e0442f607bf7dc11687f5264222617a902da815530216e9c72ad80f3b7fc SHA512 7b87bdf8645a9090eaddec1bdf4e9ed151eb8e377a3e0c8094a281374855657f0e05312a4c22c5990c5f5ceb179deb0d053a33595aa8da765a9e0873d724b49b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/goocanvas/goocanvas-1.0.0.ebuild b/x11-libs/goocanvas/goocanvas-1.0.0.ebuild
index 21cdeed5f8d9..f59677deb0f6 100644
--- a/x11-libs/goocanvas/goocanvas-1.0.0.ebuild
+++ b/x11-libs/goocanvas/goocanvas-1.0.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
+
 GCONF_DEBUG=no
 GNOME2_LA_PUNT=yes
 GNOME_TARBALL_SUFFIX="bz2"
-
-inherit eutils gnome2 libtool
+inherit epatch gnome2
 
 DESCRIPTION="Canvas widget for GTK+ using the cairo 2D library for drawing"
 HOMEPAGE="https://wiki.gnome.org/Projects/GooCanvas"
diff --git a/x11-libs/goocanvas/goocanvas-2.0.4-r1.ebuild b/x11-libs/goocanvas/goocanvas-2.0.4-r1.ebuild
index 81583d0cb590..4560a2d0c3ce 100644
--- a/x11-libs/goocanvas/goocanvas-2.0.4-r1.ebuild
+++ b/x11-libs/goocanvas/goocanvas-2.0.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
-inherit gnome2
+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"
@@ -20,6 +20,7 @@ RDEPEND="
 	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
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 5a8e913625ad..e588aec97e1c 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -2,19 +2,13 @@ AUX gtk+-2.24.24-out-of-source.patch 1487 BLAKE2B f322f3872c8e1f02f6d1d52cdfdb4b
 AUX gtk+-2.24.31-update-icon-cache.patch 2504 BLAKE2B 29a8874e81e287356f230e355117aabd9c3e9dfd1a810eaa8dc7e60dbe3fb65a73719c272dc1ba2058dae95b3988d86f09fa8587963df34a7486b50e68e79732 SHA512 c2a55a410019502b0af3fa5152fc372ce8a555bd63b5cf7f9574ebe5058f3b95e21dc5f14b5b8867d52105e4f6ebca3336a59935c3a7269bfd41aa91edadab48
 AUX gtk+-3.22.20-libcloudproviders-automagic.patch 1904 BLAKE2B ed4e774a5641a8e857ae63b83cd481479f3562de3471b5c662eb5b110e583a0a84e7defe272c2fdc6fba58649763b3e97a7e453f83e4693f40a051c8565de7b5 SHA512 3981e3d0dd9a7422b41918a6e426fe36715c6a80c7a46a241edbd1ea364381ac34fa0ae6240bc59980dd56bb816cead55dd4d29437ff288d78b90c139cb5807f
 AUX gtk+-3.24.25-update-icon-cache.patch 4770 BLAKE2B 57d80da1fdb365130dd18ea4f2752d42dde343228c92144fa6194d19474735dc597818933433b1a33029f03d1cc42576621d381d8993d9d1da48e924a3eb154e SHA512 25ba99662299cbd9fb2427b3361dff9ae72c65d49aa14e90c367410908b8dd365f62c971f17cb24b2742d152d22b9d80789d707ba3841b21781c69207ea70f10
-AUX gtk+-3.24.8-update-icon-cache.patch 5523 BLAKE2B 648018f807cb1f3d057e986a1422e3fbeb0cf1c050f19569f4a93a9d7e71577370b79f01133e0be048282259af8218f03511c39c8e73b3b912c2c86e91ab935b SHA512 70fa68b08dd140eea1dfa80f2b67d4c6d3d5bd1b5374eda57bd827f9727e89bbd0e2d775676da2dc5d852d3c2f55cbb07d9d791a99a6d90f5f63864a0479fe13
 AUX gtkrc 627 BLAKE2B 57af25dcadfa09ea784ac485db383753deda23c42ce22582f03041abf7a061e70eced09592ab0750786bea3555d760febc913762b8369b50b327fbd03d918279 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4
 AUX settings.ini 96 BLAKE2B dd0ffe58f3c702d0518e1ad59930a511f98fd1b6e7139b2b2293a3dc8b0419a63a14260ba75b30dc9197f0423a375c675b4f3b34d593ce12828192d18e539fbb SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418
 DIST gtk+-2.24.32-patchset-r1.tar.xz 13364 BLAKE2B 15e5429b11cc4ccef1bf44105c790b5325e833ab12f393fe718c06470b90f3e4004bea4b51076a725f4bb10bcfd0c48b7063d9b9b021919ad0367d1b981be980 SHA512 1a15dce7578a914585981426d2e5d1cc45866866a70c3f443d1867ab1c0c28fb279bde6c3117b28eec2758a62c1b54bb6fb1b382ad6e9a7cf0114b13f2afd858
 DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
-DIST gtk+-3.24.22.tar.xz 21349784 BLAKE2B 03dac82b3928a77beab1b4fcfcb9fdeb5e458fae13f7ff5459c2c65c7acdd6b255e62cbeaace02ec19ab4a41ff3ba2003dc004bcbaa4ee8206986e35fd7d1084 SHA512 ac653438a0a818885f2aa46a131b1ab0038a57b438406724a674313d8bf4325b1d2e87e4e8c77a92d0cfa8f8d6eaac46ba6890830290e9a9e598c978144861a2
-DIST gtk+-3.24.24.tar.xz 21341240 BLAKE2B a48024c008061b7e9c6ce8fe787e6c2f734923f5f17f818d2284afa6ea9ac080a55d358afcd0b73f3a124d57959c7a07a90c479b784fc881a3c9a0b9e354454f SHA512 f4e22d7c78d7c641ac7c3beeb3181000b72b025c65074bab6bd51b9a86ec4f6a2e25f06ad7671a908be421c064f4c26e2185febb424f310a2530561aebde8520
-DIST gtk+-3.24.25-patchset.tar.xz 8884 BLAKE2B 34531ebe0c2ca96d276071bed6b512ccffae4eb8f50263985af3c9c3e74f252690d5fdf354a6bca4cd2e54f7aa2636b2ab676fca13554901b221f1284de7b13e SHA512 11ca6bc40199a11875a31624e29d2d36800ae67ae596d145a146b0fff835f02b7864f46aef3689a7108f53e5db18b4855e34ff1dad1a201937320a51a97716cb
-DIST gtk+-3.24.25.tar.xz 21417428 BLAKE2B 3a5ac2a453a6067bba43c2b712925dea150d1e5d5783d05ff5c1e01db5d04cee3bced6d327f66dcdcfbdd992ecadfe03e1ac1c545280bef4a4bb4d3d4afaff2e SHA512 e476e7900d5694ca538a5b0acce088a1485560dd697efb8839be93741e0c1ddda90c9cc73fc64af68d7ffacbf9b5cf9a74ab08454d684f182beda9fd09b6132b
 DIST gtk+-3.24.26.tar.xz 21404732 BLAKE2B 8260b684b4d508af6b9a5060e47847254ae6bf647ae1dfa131bdbb35f2eaeb3f45ba749e9ad6e1920c05dab660d78424e38d974070928c56e91fc422a62d87db SHA512 d3023e9cd0c1f0de384266c4bd4549a7006ff475de82617de16378617a4a669645ad355cbabfe2ff43b19dddfbba7b9413ec98c14ed0f5ee3a61466b3d6eff76
-EBUILD gtk+-2.24.32-r1.ebuild 9834 BLAKE2B 75f9eb737608fc5ffe7748c68b6592bb96f1cad3d5f326f5567a906222dbe2db96beeacbb32e89499d5f3122b84d4b81cdbcd2fb5f253fc7f6721725e1978c8f SHA512 0a04b09bc637fda2d76c5be5b1807f6cba88af36bab11279d55dfdb8639272df743a9e717ae5916f500e7bff6f24bb017a75c95e0fbbfb905f5f9b50fb7a715a
-EBUILD gtk+-3.24.22.ebuild 7256 BLAKE2B 4ef2d43f69c935f272c9f6644138ffc8be51e0f2538a6203082926261c2a8204aa9b84289922026c925dba40e7765cdc7459663f18f7c3dc2e63da1a0fe4e284 SHA512 ec9d464d131e09ef295f2cd9f947eccbf67785878b2552c02cd313d1ca5d3953e9bf4a26a5a075401ad5e9c4d9fe61e9d79b5e43778ab24d9843d7830ba853c7
-EBUILD gtk+-3.24.24-r1.ebuild 7301 BLAKE2B 104a0450e1a5743f69c664a44ba8860c281ee5312f01979794bc1f3e2e087a91d98a609dd69d605907767360a1f21decc6b52e57e757e98545214ee696b0d755 SHA512 0d1931b9432b9a3a16ba374bfdb88c9e4dd5bf5725088c66372aa4490900889d5e9ba7b2478fae466e69e88f40b3ed534c69bceb27241161a88d8d3c68d28c29
-EBUILD gtk+-3.24.25.ebuild 7475 BLAKE2B d8f366cc92d969e2f57bd1a3b72b26965c804884ddaa0d4f38599f9f54ccb96b2f4fcd96bde04e6436db64cde99fd94471941b79e0f80634a5702c4af6d86e20 SHA512 f6b27d5fcfbb1c50f7ecc16028b74da6a75bb9610ab61f8ecb96b59dddf188cf442711bb0c9563f9e2ea4885aa8d1988578857c93108033fdb74ae3438c2ac9c
-EBUILD gtk+-3.24.26.ebuild 7309 BLAKE2B 875985f2b459c9689d119d0cb3f09e05052e51b863c4a1d191de3fadbb6108bcb40ffa51c07b9278891c439a48797f5e65f0e9a4d5864b2fca151365b6d663ac SHA512 b8a9f0c14a802204f07dcff92aa499d783310f17c416b5dcdd1fd977255cbe01e3f794f4dd1e64600b2107876fa94abd31703a688a0f78b0cd24ec7222815dfb
+DIST gtk+-3.24.28.tar.xz 22783312 BLAKE2B b0a8dd5619feacf44880bb1ef168fce5431802c401fbb31408a4a4a9822755ca76cc309eb0f271e98cce63ad7f5cbec4d0d6c947a631843bfbe509a81836778b SHA512 65856ae06e4a863c56b3718c0cc3d0ca9f61a62a02ddef30904432300cd455851efee3fa1e5661659eaacbdfca45650ee7c8a2d4eca004ad2936c1e26c720c15
+EBUILD gtk+-2.24.32-r1.ebuild 9837 BLAKE2B 73bfdd872a661f1e1385541d72ca41d459f8308bcc8b1ee0872091d38cd849a0bb7f301508f027eb7e4b3f50cb4bdeb134dd5698d45e5729361ec5b1518dcf40 SHA512 88477844a33d88bf0310bc065bc784a560fba01391a6eb17df991da347deab396e8a6909bf0e8de5332d25c741670d8e8cfcf3d835ad14221a454419af913ca8
+EBUILD gtk+-3.24.26.ebuild 7341 BLAKE2B 367ae9178237627f14d27617000c872814a7502d4fb81006d49314858ac089496220a53a9c0203b943c2d2361fb53849a3eb9811523a83c188be7a9158394de2 SHA512 430cdf514cf1b2ae6f215032a55e2b1b38237ba960eecdfe196ce5de542d0788568a68fb3f2f77daf35930d055fa5946e60048e3894bcf18bd0ed92cbfb0882d
+EBUILD gtk+-3.24.28.ebuild 7347 BLAKE2B 123f7b653d1410eecfbd2ea925faf17849efb427dd74b97e415064f1a949e3b4479ea2d91ce44229dae03992aa0233dbf97950a9b249af44217926eab03ae134 SHA512 6a77270475e499cb762a969a8ea4d25fba6acdcab4d9f3a57e9f8e7a766af0776e760863f07632294ed46d274356bb19a665e14959a5deadd37e86c2b3e4343a
 MISC metadata.xml 947 BLAKE2B 9024c57cf454b89700ce48a267162ce4672c1cd486f3b6218bfb2334154a1abdbe7c446cbe5c96e5d3abeed887891579c56ad26675e3ee833c5c3691fc4fc7ed SHA512 60065a6e79ea076dbe4b06e6ddcf222c9498ba755e7d5a214ac5401c4a9c7b61d170989c64771de69898524b0cc040aa036592a3cbeeb452e1dc5406b93e09fb
diff --git a/x11-libs/gtk+/files/gtk+-3.24.8-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.24.8-update-icon-cache.patch
deleted file mode 100644
index 6fcbb5c07ba4..000000000000
--- a/x11-libs/gtk+/files/gtk+-3.24.8-update-icon-cache.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From 87693de873b15194b122e98438b3bc1bf37f6d0b Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 1 Nov 2016 15:24:22 +0100
-Subject: [PATCH] Always use external gtk-update-icon-cache
-
-Check for gtk-update-icon-cache to install demos, otherwise it is not
-used when building.
----
- configure.ac                     |  2 ++
- demos/gtk-demo/Makefile.am       |  2 +-
- demos/widget-factory/Makefile.am |  2 +-
- docs/reference/gtk/Makefile.am   |  1 -
- gtk/Makefile.am                  | 44 --------------------------------
- 5 files changed, 4 insertions(+), 47 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f700616649..e3604fef05 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1003,6 +1003,8 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
- 
- AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
- 
-+AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, [gtk-update-icon-cache], [no])
-+
- ########################################
- # Windowing system checks
- ########################################
-diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
-index c8529e5bf7..b2924fc081 100644
---- a/demos/gtk-demo/Makefile.am
-+++ b/demos/gtk-demo/Makefile.am
-@@ -171,7 +171,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.sy
- dist_appsicon48_DATA = data/48x48/gtk3-demo.png data/48x48/gtk3-demo-symbolic.symbolic.png
- dist_appsicon256_DATA = data/256x256/gtk3-demo.png data/256x256/gtk3-demo-symbolic.symbolic.png
- 
--update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
-+update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force
- 
- install-data-hook: install-update-icon-cache
- uninstall-hook: uninstall-update-icon-cache
-diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am
-index 62c156aa09..7aad079dcd 100644
---- a/demos/widget-factory/Makefile.am
-+++ b/demos/widget-factory/Makefile.am
-@@ -47,7 +47,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png data/32x32/gtk3-widget
- dist_appsicon48_DATA = data/48x48/gtk3-widget-factory.png data/48x48/gtk3-widget-factory-symbolic.symbolic.png
- dist_appsicon256_DATA = data/256x256/gtk3-widget-factory.png data/256x256/gtk3-widget-factory-symbolic.symbolic.png
- 
--update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
-+update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force
- 
- install-data-hook: install-update-icon-cache
- uninstall-hook: uninstall-update-icon-cache
-diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
-index abdea7fb59..0ee826c31e 100644
---- a/docs/reference/gtk/Makefile.am
-+++ b/docs/reference/gtk/Makefile.am
-@@ -502,7 +502,6 @@ EXTRA_DIST += version.xml.in gtk3.types.in
- 
- man_MANS = 				\
- 	gtk-query-immodules-3.0.1	\
--	gtk-update-icon-cache.1		\
- 	gtk-encode-symbolic-svg.1	\
- 	gtk-launch.1			\
- 	gtk3-demo.1			\
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index e556e9d3af..4d7973f3b1 100644
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -1653,7 +1653,6 @@ endif
- #
- bin_PROGRAMS = \
- 	gtk-query-immodules-3.0	\
--	gtk-update-icon-cache \
- 	gtk-encode-symbolic-svg \
- 	gtk-builder-tool \
- 	gtk-query-settings \
-@@ -1666,9 +1665,6 @@ gtk_query_immodules_3_0_LDADD = 		\
- 	$(GMODULE_LIBS)				\
- 	$(GTK_DEP_LIBS)
- 
--gtk_update_icon_cache_SOURCES = updateiconcache.c
--gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
--
- gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c
- gtk_encode_symbolic_svg_LDADD =			\
- 	$(GDK_PIXBUF_LIBS)			\
-@@ -1693,46 +1689,6 @@ gtk_launch_LDADD =				\
- 	$(top_builddir)/gdk/libgdk-3.la		\
- 	$(GTK_DEP_LIBS)
- 
--if OS_WIN32
--
--# Workaround for UAC silliness: programs with "update" in their name
--# are believed to be installers and require elevated privileges to be
--# used... Embed a manifest file into executable to tell Windows that
--# gtk-update-icon-cache.exe doesn't require any special privileges.
--
--GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
--GTK_UPDATE_ICON_CACHE_RC = gtk-update-icon-cache.rc
--GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT = gtk-update-icon-cache_manifest.o
--
--$(GTK_UPDATE_ICON_CACHE_MANIFEST):
--	(echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' ; \
--	 echo '<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">' ; \
--	 echo '  <assemblyIdentity version="1.0.0.0"' ; \
--	 echo '     processorArchitecture="'$(EXE_MANIFEST_ARCHITECTURE)'"' ; \
--	 echo '     name="gtk-update-icon-cache.exe"' ; \
--	 echo '     type="win32"/>' ; \
--	 echo '  <!-- Identify the application security requirements. -->' ; \
--	 echo '  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">' ; \
--	 echo '    <security>' ; \
--	 echo '      <requestedPrivileges>' ; \
--	 echo '        <requestedExecutionLevel' ; \
--	 echo '          level="asInvoker"' ; \
--	 echo '          uiAccess="false"/>' ; \
--	 echo '        </requestedPrivileges>' ; \
--	 echo '       </security>' ; \
--	 echo '  </trustInfo>' ; \
--	 echo '</assembly>' ) >$@
--
--$(GTK_UPDATE_ICON_CACHE_RC):
--	(echo -e '#include <winuser.h>\nCREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST '$(GTK_UPDATE_ICON_CACHE_MANIFEST)) >$@
--
--$(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT): $(GTK_UPDATE_ICON_CACHE_RC) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
--	$(WINDRES) --input $< --output $@ --output-format=coff
--
--gtk_update_icon_cache_LDADD += $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT)
--
--endif
--
- .PHONY: files
- 
- files:
--- 
-2.17.0
-
diff --git a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
index 769df00ef490..314ce203961e 100644
--- a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	xinerama? ( !aqua )
 "
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1
@@ -160,7 +160,7 @@ src_prepare() {
 		# UI tests require immodules already installed; bug #413185
 		if ! has_version 'x11-libs/gtk+:2'; then
 			ewarn "Disabling UI tests because this is the first install of"
-			ewarn "gtk+:2 on this machine. Please re-run the tests after $P"
+			ewarn "gtk+:2 on this machine. Please re-run the tests after ${P}"
 			ewarn "has been installed."
 			sed '/g_test_add_func.*ui-tests/ d' \
 				-i gtk/tests/testing.c || die "sed 2 failed"
diff --git a/x11-libs/gtk+/gtk+-3.24.22.ebuild b/x11-libs/gtk+/gtk+-3.24.22.ebuild
deleted file mode 100644
index 1c4e24f58d1c..000000000000
--- a/x11-libs/gtk+/gtk+-3.24.22.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit flag-o-matic gnome2 multilib virtualx multilib-minimal
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	xinerama? ( X )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 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
-RESTRICT="test"
-
-# FIXME: introspection data is built against system installation of gtk+:3,
-# bug #????
-COMMON_DEPEND="
-	>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	>=media-libs/libepoxy-1.4[X(+)?,${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}]
-	>=media-libs/harfbuzz-0.9:=
-	x11-misc/shared-mime-info
-
-	cloudprint? (
-		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
-		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
-	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
-	wayland? (
-		>=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.14
-		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
-		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
-		media-libs/mesa[X(+),${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-		x11-libs/libXdamage[${MULTILIB_USEDEP}]
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-libs/gobject-introspection-common
-	>=dev-util/gdbus-codegen-2.48
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.20
-	gtk-doc? ( >=dev-util/gtk-doc-1.20
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
-"
-# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
-# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-3
-	!<gnome-base/gail-1000
-	!<x11-libs/vte-0.31.0:2.90
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	gnome-base/librsvg[${MULTILIB_USEDEP}]
-	>=x11-themes/adwaita-icon-theme-3.14
-	vim-syntax? ( app-vim/gtk-syntax )
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
-)
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
-	if ! use test ; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
-
-		# the tests dir needs to be build now because since commit
-		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
-		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
-		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
-	fi
-
-	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
-	eapply "${FILESDIR}"/${PN}-3.24.8-update-icon-cache.patch
-
-	# Fix broken autotools logic
-	eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(use_enable aqua quartz-backend)
-		$(use_enable broadway broadway-backend)
-		$(use_enable cloudprint)
-		$(use_enable colord)
-		$(use_enable cups cups auto)
-		$(multilib_native_use_enable gtk-doc)
-		$(multilib_native_use_enable introspection)
-		$(use_enable wayland wayland-backend)
-		$(use_enable X x11-backend)
-		$(use_enable X xcomposite)
-		$(use_enable X xdamage)
-		$(use_enable X xfixes)
-		$(use_enable X xkb)
-		$(use_enable X xrandr)
-		$(use_enable xinerama)
-		# cloudprovider is not packaged in Gentoo yet
-		--disable-cloudproviders
-		--disable-papi
-		# sysprof integration needs >=sysprof-3.33.2
-		--disable-profiler
-		--enable-man
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog
-		# need libdir here to avoid a double slash in a path that libtool doesn't
-		# grok so well during install (// between $EPREFIX and usr ...)
-		# TODO: Is this still the case?
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
-	)
-
-	if use wayland; then
-		myconf+=(
-			# Include wayland immodule into gtk itself, to avoid problems like
-			# https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a
-			# user overridden GTK_IM_MODULE envvar
-			--with-included-immodules=wayland
-		)
-	fi;
-
-	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		local d
-		for d in gdk gtk libgail-util; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-	GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-	# Skip README.{in,commits,win32} that would get installed by default
-	DOCS=( AUTHORS ChangeLog NEWS README )
-	einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make immodules.cache belongs to gtk+ alone
-		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-	multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_query_immodules_gtk3 \
-			|| die "Update immodules cache failed (for ${ABI})"
-	}
-	multilib_parallel_foreach_abi multilib_pkg_postinst
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-3.24.24-r1.ebuild b/x11-libs/gtk+/gtk+-3.24.24-r1.ebuild
deleted file mode 100644
index e15bc77b2c75..000000000000
--- a/x11-libs/gtk+/gtk+-3.24.24-r1.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2 multilib multilib-minimal virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	xinerama? ( X )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~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
-RESTRICT="test"
-
-# FIXME: introspection data is built against system installation of gtk+:3,
-# bug #????
-COMMON_DEPEND="
-	>=dev-libs/atk-2.32.0[introspection?,${MULTILIB_USEDEP}]
-	>=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/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-misc/shared-mime-info
-
-	cloudprint? (
-		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}]
-		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
-	)
-	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
-	sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.17
-		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
-		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.15.1[${MULTILIB_USEDEP}]
-		media-libs/mesa[X(+),${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXdamage[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc
-	)
-	X? ( x11-base/xorg-proto )
-"
-# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
-# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-3
-	!<gnome-base/gail-1000
-	!<x11-libs/vte-0.31.0:2.90
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	gnome-base/librsvg[${MULTILIB_USEDEP}]
-	>=x11-themes/adwaita-icon-theme-3.14
-	vim-syntax? ( app-vim/gtk-syntax )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/gobject-introspection-common
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.48
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.20
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-	gtk-doc? (
-		app-text/docbook-xml-dtd:4.3
-		>=dev-util/gtk-doc-1.20
-	)
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
-)
-
-PATCHES=(
-	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
-	"${FILESDIR}"/${PN}-3.24.8-update-icon-cache.patch
-
-	# Fix broken autotools logic
-	"${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
-)
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
-	if ! use test ; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
-
-		# the tests dir needs to be build now because since commit
-		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
-		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
-		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
-	fi
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(use_enable aqua quartz-backend)
-		$(use_enable broadway broadway-backend)
-		$(use_enable cloudprint)
-		$(use_enable colord)
-		$(use_enable cups cups auto)
-		$(multilib_native_use_enable gtk-doc)
-		$(multilib_native_use_enable introspection)
-		$(use_enable sysprof profiler)
-		$(use_enable wayland wayland-backend)
-		$(use_enable X x11-backend)
-		$(use_enable X xcomposite)
-		$(use_enable X xdamage)
-		$(use_enable X xfixes)
-		$(use_enable X xkb)
-		$(use_enable X xrandr)
-		$(use_enable xinerama)
-		# cloudprovider is not packaged in Gentoo yet
-		--disable-cloudproviders
-		--disable-papi
-		--enable-man
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog
-		# need libdir here to avoid a double slash in a path that libtool doesn't
-		# grok so well during install (// between $EPREFIX and usr ...)
-		# TODO: Is this still the case?
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
-	)
-
-	if use wayland; then
-		myconf+=(
-			# Include wayland immodule into gtk itself, to avoid problems like
-			# https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a
-			# user overridden GTK_IM_MODULE envvar
-			--with-included-immodules=wayland
-		)
-	fi;
-
-	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		local d
-		for d in gdk gtk libgail-util; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-	GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-	# Skip README.{in,commits,win32} that would get installed by default
-	DOCS=( AUTHORS ChangeLog NEWS README )
-	einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make immodules.cache belongs to gtk+ alone
-		local cache="/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}${cache}" "${ED}${cache}" || die
-		else
-			touch "${ED}${cache}" || die
-		fi
-	}
-	multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_query_immodules_gtk3 \
-			|| die "Update immodules cache failed (for ${ABI})"
-	}
-	multilib_parallel_foreach_abi multilib_pkg_postinst
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-3.24.26.ebuild b/x11-libs/gtk+/gtk+-3.24.26.ebuild
index f3e43d0e35e9..38265afc5a0f 100644
--- a/x11-libs/gtk+/gtk+-3.24.26.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.26.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 ~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
@@ -94,6 +94,7 @@ BDEPEND="
 	>=dev-util/gdbus-codegen-2.48
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.20
+	wayland? ( dev-util/wayland-scanner )
 	>=sys-devel/gettext-0.19.7
 	virtual/pkgconfig
 	gtk-doc? (
diff --git a/x11-libs/gtk+/gtk+-3.24.25.ebuild b/x11-libs/gtk+/gtk+-3.24.28.ebuild
index e878b6859cfe..54b60dc29ad0 100644
--- a/x11-libs/gtk+/gtk+-3.24.25.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.28.ebuild
@@ -8,7 +8,6 @@ inherit gnome2 multilib multilib-minimal virtualx
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="https://www.gtk.org/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="3"
@@ -78,7 +77,6 @@ DEPEND="${COMMON_DEPEND}
 # gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
 RDEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-update-icon-cache-3
-	!<gnome-base/gail-1000
 	!<x11-libs/vte-0.31.0:2.90
 "
 # librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
@@ -95,8 +93,10 @@ BDEPEND="
 	>=dev-util/gdbus-codegen-2.48
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.20
+	wayland? ( dev-util/wayland-scanner )
 	>=sys-devel/gettext-0.19.7
 	virtual/pkgconfig
+	x11-libs/gdk-pixbuf:2
 	gtk-doc? (
 		app-text/docbook-xml-dtd:4.3
 		>=dev-util/gtk-doc-1.20
@@ -113,9 +113,6 @@ PATCHES=(
 
 	# Fix broken autotools logic
 	"${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
-
-	# origin/gtk-3-24 imcontext regression fixes up to commit 5f13ee0afe0
-	"${WORKDIR}"/patches
 )
 
 strip_builddir() {
diff --git a/x11-libs/gtkdatabox/Manifest b/x11-libs/gtkdatabox/Manifest
index 64888ae7b593..8544c9b589b0 100644
--- a/x11-libs/gtkdatabox/Manifest
+++ b/x11-libs/gtkdatabox/Manifest
@@ -1,3 +1,3 @@
 DIST gtkdatabox-0.9.3.0.tar.gz 2883977 BLAKE2B d9d5de1c4d07bd01940ea6f75f2b2f455b46cf018dbae67bcb643f523353e675e1a97cfc10b696fe16aa0391cb006e5e866bef52cefcdd8ca4de057589164e6e SHA512 5c2464dafcf9cdd4ee11bec6f8e627533c0270fe28d736e1be45ad084c42d430a50c39cf08531138627cc59ab034a191ecd7b97ccfce633467ff99e6e9cd593a
-EBUILD gtkdatabox-0.9.3.0.ebuild 1294 BLAKE2B 4c632f5659b5162b81e6e132ffa5b95441bcfc630b194c4955050cf53af64b49b5aefb32bd583a3834d69d3c0943bddbc5a6134c192ef3fd7ae5445fa35e2713 SHA512 71a3b090c7452bbf87356c2e969abfabff50c8ce8749713090c80b2c4e446e42201dc87614fedc6c047c55af922dbe773dc13110539b84121ce4abae8ca8dad6
+EBUILD gtkdatabox-0.9.3.0.ebuild 1274 BLAKE2B f19ca74d01218bb7a2567ea3b1ca50f37b9c68ad0bbec2dfac9a041c442149f6fee754d3c17878a43a9968fce477f8f9f676b8a3bde2be8539ebc0525fab0fe3 SHA512 6f6bf5c70d4b0cabd1e11e42d921580f6eb1d9434e3e062daa4bfd0ea6a27e44317aa75b3d2f4feb6438148bc65a5c8838e9618b25ef838cdd4c245b3ad73882
 MISC metadata.xml 488 BLAKE2B 2684f70597bb353cc8a07bf0cc363a5365e08253a62a5e94afe33cac0653a08cc469075170e271b6ffff491e7751dd2da98a918032b7935e816d60f103a94e2e SHA512 1e8878c79a986781c6279369b3143c20757c421a6a6df7ad76e53212c1239a26fe535052d9a58a9c991603d6566b5ce831f50e67c696e3bb1b9d9d5be9a469e3
diff --git a/x11-libs/gtkdatabox/gtkdatabox-0.9.3.0.ebuild b/x11-libs/gtkdatabox/gtkdatabox-0.9.3.0.ebuild
index 7e3cc26ba97b..7262b803969b 100644
--- a/x11-libs/gtkdatabox/gtkdatabox-0.9.3.0.ebuild
+++ b/x11-libs/gtkdatabox/gtkdatabox-0.9.3.0.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils ltprune
-
 DESCRIPTION="Gtk+ Widgets for live display of large amounts of fluctuating numerical data"
 HOMEPAGE="https://sourceforge.net/projects/gtkdatabox/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -12,14 +10,14 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="examples +glade static-libs test"
+IUSE="examples +glade test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="x11-libs/cairo
 	x11-libs/gtk+:2
 	x11-libs/pango
 	glade? ( gnome-base/libglade )"
-DEPEND=${RDEPEND}
+DEPEND="${RDEPEND}"
 
 src_prepare() {
 	default
@@ -37,7 +35,7 @@ src_configure() {
 	econf \
 		$(use_enable glade libglade) \
 		--disable-glade \
-		$(use_enable static-libs static) \
+		--disable-static \
 		$(use_enable test gtktest) \
 		--enable-libtool-lock
 }
@@ -45,9 +43,10 @@ src_configure() {
 src_install() {
 	default
 
-	prune_libtool_files
+	find "${ED}" -type f -name '*.la' -delete || die
 
 	dodoc AUTHORS ChangeLog README TODO
+
 	if use examples; then
 		docinto examples
 		dodoc "${S}"/examples/*
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index e297126d909b..4ad288f08544 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -4,7 +4,7 @@ AUX gtksourceview-2.10.5-G_CONST_RETURN.patch 6799 BLAKE2B e3276c433d2bb6286ea8f
 DIST gtksourceview-2.10.5.tar.bz2 1253321 BLAKE2B 810a3eeca69bab4356b21c64129bb852e00d02c7937ad4a2ce3af9e48700da943d8d6834efcce9810dd49a54f39d4a074dc086a557128da51a593b2f23e58d48 SHA512 6f64acef6196bfc5953e0b148d7e460d366073b5e21367c01b01fc4d1c86ffe8aca71ecd77cf0814e47d8fc3085495f25bbbdc69e746987b02fd02fcda64886d
 DIST gtksourceview-3.24.11.tar.xz 1438232 BLAKE2B a25762255a12887c8151465689e3acbd5864a6638044500acd087832888a092b8aad5d885d31c9dbe057ce183510afa2342bccb2a2675719dbba7e82be72368a SHA512 3490b34c6432a2e2ef292ad5bf982fdd22d33b1472434549b4ea8ddae0fc8808e128ef947e4d0dcb41e8de5e601b202f52532bbbbfa11d35050acfc42f9936b2
 DIST gtksourceview-4.6.1.tar.xz 1162024 BLAKE2B 41f84dade9e48cc958fecbf887f4c733cb1631557be34e52ca5af39802455f115e9920d368406314299aad35b1d18995c4e403f0ec3a9b3a27254fd1952f37e3 SHA512 3341e6248a0abba6373a79742b4348d8aff58ca6a4b9093729d0d1fe2579ab8acbc61f1ecc6d350000edae60c963eeca866fa659b3f3d6ec320cdbf1ed21fdec
-EBUILD gtksourceview-2.10.5-r3.ebuild 1346 BLAKE2B a9864ca00a2efd783c093c4842c86b3d8aca608926cc2cf1dcd6cfa41cd924e7a01907738fef31e913f508e062907a4f2724c3ede9dec6565d086e3234675166 SHA512 eb3e6a72c29af22c5184e8cacba0c50fd0100b03c27afa264cdd2a6ddb2e4250af5ddcc2a92f81e715adfe70ff89f89dca6cb9217a0de02deb0977bbcc844245
+EBUILD gtksourceview-2.10.5-r3.ebuild 1317 BLAKE2B 80f626e2a5ded1e372760139354bc61a36c64620a2476c385f24e44d8711536ab162ed299b016fa1e4734afea2a48aa1346507b0c265440857bba8b0740bf406 SHA512 796445765875a51c6467d3a80a20007d892f40c0d71a5c8b768dcc2738f091b46f24e37d9fb45715152a72bfb709b6fa272c9f973ce22eafecbf5fa01a20e15e
 EBUILD gtksourceview-3.24.11.ebuild 1272 BLAKE2B d606bbfed3a72adf6478175516be05045a5ccdeace5b4f6e36c1f9cce337e01f27ab680f1da56462c187b5085a543cfe272088f3dc9ca385ee1c3b28af2ea2e1 SHA512 f54f0e0a88a3e5310c75f985eee92ff3cfe0db3b930c7eb520879b519d214394604c84155c3ee9fef23a12477b81d4de1848ee1c29aa6c352af986b0247b3489
 EBUILD gtksourceview-4.6.1-r1.ebuild 1741 BLAKE2B f5867f5eb784c3bf19117a5e6556146ecbd30b5d011bb84006a0a30252111654b15b6393ff07b0bd387c770207b196d9c19ed101f6e8559638f4df3a9b90bc02 SHA512 a44dcb68b000b6346f2063181f92591f00f7b065c6d5868e3c9fc8c11abe194935e9ae2a1d575b49213f3374be7d0c1cfacb8942621097eaa796e3e4b5ecc403
 MISC metadata.xml 318 BLAKE2B 63b73a76e8f01503afd3f29f3329056ce6b95614aceef233ee4308ab7589dd5f0f35b84f317ecdf5829847a01bdf18987ca87e345ea7e92bf9556d81b15dde1f SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5
diff --git a/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild b/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
index 85b4ce8dd568..48c23be47828 100644
--- a/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
+EAPI=7
 
-inherit eutils gnome2 virtualx
+GNOME_TARBALL_SUFFIX="bz2"
+inherit gnome2 virtualx
 
-DESCRIPTION="A text widget implementing syntax highlighting and other features"
+DESCRIPTION="Text widget implementing syntax highlighting and other features"
 HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="GPL-2+ LGPL-2.1+"
@@ -21,7 +19,8 @@ RDEPEND="
 	>=dev-libs/libxml2-2.5:2
 	>=dev-libs/glib-2.14:2
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/glib-utils
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40
@@ -29,19 +28,19 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+DOCS=( AUTHORS ChangeLog HACKING MAINTAINERS NEWS README )
+
+# Patch from 3.x for bug #394925
+PATCHES=( "${FILESDIR}/${P}-G_CONST_RETURN.patch" )
+
 src_prepare() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README"
+	gnome2_src_prepare
 
 	# Skip broken test until upstream bug #621383 is solved
 	sed -i -e "/guess-language/d" tests/test-languagemanager.c || die
 
 	# The same for another broken test, upstream bug #631214
 	sed -i -e "/get-language/d" tests/test-languagemanager.c || die
-
-	# Patch from 3.x for bug #394925
-	epatch "${FILESDIR}/${P}-G_CONST_RETURN.patch"
-
-	gnome2_src_prepare
 }
 
 src_configure() {
@@ -49,7 +48,7 @@ src_configure() {
 }
 
 src_test() {
-	Xemake check
+	virtx emake check
 }
 
 src_install() {
diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
index 0020cd8f4045..821693088fa4 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 640 BLAKE2B 91ff4a2dadc92e45df8579fd54b6e440451066c8d5d67c7ea059c5da420463eff899bdecceb13b93e2f7bbd3d65589af85812431e6a32152cc9dcaf11576d52e SHA512 d14cef9aa419a55a0dac0eb3f10b13150212704dcb41634fe7c9a4af8d88a5baff113daaa8c1232caf56fbcbe8d81793f33bfd40c6d4401bdda7f9a429c967d5
+EBUILD libICE-1.0.10.ebuild 641 BLAKE2B 50d02a382e1416e9ec49430b09842d2fcc3e4685c2a5d36ad159b52026358c8691641804d08de2d35e3b40906293b3a74f64058fec318076f11ec7dc2a7ce7bd SHA512 625b37be8b6c6a166fec10d6656f88e52dad08e3cf0210e5efebf9a5013c8461b75d69c48ee4e0fb36e027f939c74b5a007e92baef265e9d316b51f10020484d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libICE/libICE-1.0.10.ebuild b/x11-libs/libICE/libICE-1.0.10.ebuild
index 27e32298e669..6b3d3f96ab55 100644
--- a/x11-libs/libICE/libICE-1.0.10.ebuild
+++ b/x11-libs/libICE/libICE-1.0.10.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Inter-Client Exchange 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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"
 IUSE="ipv6"
 
 DEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest
index 40807f3e661d..7b07408a39e2 100644
--- a/x11-libs/libSM/Manifest
+++ b/x11-libs/libSM/Manifest
@@ -1,3 +1,3 @@
 DIST libSM-1.2.3.tar.bz2 362595 BLAKE2B 20b7327cd16e066bd2a81eae60f52cab7499dd92d65786d0e5726faa64c2055376749562ff2158777f83711e1517b90b2dc94670892b787889b3950c0a975b68 SHA512 74c42e27029db78475e62025b4711dbac5e22d2f8e8a24be98a1c31b03c0fc4afe859928f851800ea0b76854f12147900dc4f27bbfd3d8ea45daaaf24b70a903
-EBUILD libSM-1.2.3-r1.ebuild 1695 BLAKE2B 834920beb9ea97043ba2db4056a3927e36ceca7679ae708ce9759c4e382d896442c73ef2c47d5398f7e909f03a503a732121b540c4f674e327c982000fa416de SHA512 ce156b67f8c5acafa29a561c7fe262033aa3d6746339b0f31cc65ffa86edddcca25c1553d4c85fd4ab65344290595a18b7d2da3baaa5c45dc6173423d1c1d3bc
+EBUILD libSM-1.2.3-r1.ebuild 1742 BLAKE2B 8fd7b5b0ab671a27955ef784b14fda206f43a5e74d585a4cde87e5adb28bd44c070fe1caf9e6f1cd94495e66f551572bfcc98191c8806d4685f414c4bac16f85 SHA512 ffc55d455040057e17a4f867d6bf3e758a8e2b9777394b024e7f8205fe3d7451dda07beb92f8c9c2edc0f19405c309606c5ea82654737f735f7115366f7bd060
 MISC metadata.xml 348 BLAKE2B 475822d6499e8c44bda145b3fb4d72b0f462c03ddddf44cdfb8359a2b0a0e44917a0004a53ace75218efa01c25491fd66e52c1bc0c7e392c88ba9cdbbe414e54 SHA512 4fa0439dc05b56a6fc0280c020ccbc52438ba0d22a4a9b8c0e4830844fa50bc6af8096498336b0d9752687b6e30dce581a24b4b67a812d2e7a62783e37af86d5
diff --git a/x11-libs/libSM/libSM-1.2.3-r1.ebuild b/x11-libs/libSM/libSM-1.2.3-r1.ebuild
index cfaaad3a6de9..f53cb5e85b63 100644
--- a/x11-libs/libSM/libSM-1.2.3-r1.ebuild
+++ b/x11-libs/libSM/libSM-1.2.3-r1.ebuild
@@ -9,15 +9,18 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Session Management 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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"
 IUSE="ipv6 +uuid"
 
 RDEPEND="x11-base/xorg-proto
 	>=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
 	x11-libs/xtrans
-	!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? (
-		uuid? ( >=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}] )
-	) ) )"
+	uuid? (
+		elibc_Darwin? ( sys-libs/native-uuid )
+		!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? (
+			>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
+		) ) )
+	)"
 DEPEND="${RDEPEND}"
 
 src_configure() {
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index c20d90a142fa..ebe6400e7cb2 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,3 +1,3 @@
 DIST libX11-1.7.0.tar.bz2 2409144 BLAKE2B 1eb6aa8f2fe50ddb2f6d324429b3d9cecfb48833c3f52f22ae8e32846be614c8db63c57d25e2b1c46612b6b333ff61ceab8ac0b605b117bcea1224f918af8e6d SHA512 f661ca90350fd8a94f054b00f12f5122cea068ebff706acfd399462236c189a296a2358d17d16166635101cf56cc19303dd407873a159932d093c9f33556f9fb
-EBUILD libX11-1.7.0.ebuild 839 BLAKE2B a0926c05c9130fbe22210628283f9f5a653d8b53b631ab65782ed8214512f42a41fbffd418cb8d0d058835a49403881d78b9d3624b35aafb99df3f7fccbca3bb SHA512 fc2fb18369b5cc5b803d1f0df823321151213d25df42f4f2ac2f9949f7877c0a9b31b7191af9b91108751548379162f9c20303148fd03f5bdba7b530ab7990ae
+EBUILD libX11-1.7.0.ebuild 840 BLAKE2B 43d552e470b842d74c5e0ffa1d18b96816fa1ddff57328d3fd8f116ff8e49aed7b63abe0f882c47716a34d6cdca8f4a26788a0cd416df09733f2490630d498aa SHA512 57831c89dac9f6bcda040d96a40fc97cb7780f3d49e92581c6d8e977cf89b3432211ae4cb4512f6ce255eb7661c57ed4f1bc3a2c7d12763c6f87c1954618e81a
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.7.0.ebuild b/x11-libs/libX11/libX11-1.7.0.ebuild
index 3881d061f725..caba9f751d6a 100644
--- a/x11-libs/libX11/libX11-1.7.0.ebuild
+++ b/x11-libs/libX11/libX11-1.7.0.ebuild
@@ -9,7 +9,7 @@ inherit toolchain-funcs xorg-3
 
 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"
+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 )"
 
diff --git a/x11-libs/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest
index 75acc18a2df6..716a8f4d1343 100644
--- a/x11-libs/libXScrnSaver/Manifest
+++ b/x11-libs/libXScrnSaver/Manifest
@@ -1,3 +1,3 @@
 DIST libXScrnSaver-1.2.3.tar.bz2 291465 BLAKE2B 03864811a3bb34521d9e27ec2ce363cb015ee3484a27cce6fed4e6b16499b441dc7336229cc926da7bbbb8366e03780f9f4eba0e725083b8f362ef45c43e8633 SHA512 7ea628324a11b25ee82c7b11c6bf98f37de219354de51c1e29467b5de422669ba1ab121f3b9dc674093c8f3960e93c5d5428122f5539092f79bc8451c768354a
-EBUILD libXScrnSaver-1.2.3.ebuild 484 BLAKE2B 8e7332482c3854fecebef24981c06527232e11a642dac9c583710f4344d8316b0a404ddabac3a8301b1d8cbf1855fee546bb3775d11006995afd09841e60746e SHA512 2311db4a090358bb1d187f9422887a6077c2234d032cd5dd18e445ba67dc90de669fafd0d22dff07cf5fa9116c5289badfb877f11eb6a087c8bf1cef2ad18457
+EBUILD libXScrnSaver-1.2.3.ebuild 485 BLAKE2B a233026b03c318aeb41c5ad877045fb131330366369a378687589a3b129ddd6e1010b30866ed91c0a8f5388bd6588ea5e4abdff52fcdbb8fa7ab7191b8249ef7 SHA512 fb1be2e99761ec5259d651ba5bf3c95a5ec5eca2a1e1a305834b0acb9a5dfb297e23b2f4878ccc66b98c77e4dbe7c037d66f94e8380c1b879fe0e16e158d7e2c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
index d7591e403978..5176136ebc5a 100644
--- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org XScrnSaver library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXau/Manifest b/x11-libs/libXau/Manifest
index 38d7b4752a5e..de915648e054 100644
--- a/x11-libs/libXau/Manifest
+++ b/x11-libs/libXau/Manifest
@@ -1,3 +1,3 @@
 DIST libXau-1.0.9.tar.bz2 322650 BLAKE2B 0bc9eb01b99f13a8f978edd7ff63d76f89071ac27f1cd946f9ebc96165a892e7ba7cdcdc52f73e8ed6d5b3d672f8a29a24582195fe14d1d24730a797a592cdd3 SHA512 3ca454ba466a807ea28b0f715066d73dc76ad312697b121d43e4d5766215052e9b7ffb8fe3ed3e496fa3f2a13f164ac692ff85cc428e26731b679f0f06a1d562
-EBUILD libXau-1.0.9-r1.ebuild 446 BLAKE2B 7ad734521ba4dcf683837a16ba44b57e9048cdf21fcb8a6f0897582befe79ffef95822731dcda485e40f8948977741b82317ce445171e948822dfda48f8cf4cc SHA512 ace248ca638c2b76ea7743ff60fb82d837dfe855c38633f43c8dd51ae3f2f44a77251463ba24b498dce9bee7ff190a4f3dd7061f2f061115a5e4f391d117261d
+EBUILD libXau-1.0.9-r1.ebuild 447 BLAKE2B fd83c5901ba91047cf526442d6bd289edb8537a40ec6137fdab592e474353dba4aab770bdaceabdc030f72e4b77b40c7e71c3e6aa7b31cc8adf2265d28b595f3 SHA512 ca6b6a70c12d5900b12716c76807394f866dc1ab814777dde863a540bb348843ac3d1eda2778adfc8f66001628b83cd8f72e04cd2fd7182ace4ed16ef8107262
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXau/libXau-1.0.9-r1.ebuild b/x11-libs/libXau/libXau-1.0.9-r1.ebuild
index 9dff3b61ae35..b5e091454221 100644
--- a/x11-libs/libXau/libXau-1.0.9-r1.ebuild
+++ b/x11-libs/libXau/libXau-1.0.9-r1.ebuild
@@ -9,6 +9,6 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X authorization 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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"
 
 DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/libXaw/Manifest b/x11-libs/libXaw/Manifest
index 79f6a3d92fe8..a30d282a7568 100644
--- a/x11-libs/libXaw/Manifest
+++ b/x11-libs/libXaw/Manifest
@@ -1,3 +1,5 @@
 DIST libXaw-1.0.13.tar.bz2 674140 BLAKE2B e141a135d1a45edfb71687951542a31d838bf560997a631b3590db0581f94768a8cc77ebd86c7cff60668e9843b1258a9eb60383a4d25b704ce9dc91fc6d0bdf SHA512 d768a39f7111802493fa1df1b80d858e4139ceeb883d45ff13ce3b7a0e775a7d2834b7ad157c8330117f04c32f38979795332dd7a119adb2344fcb1aa9cf1e2f
-EBUILD libXaw-1.0.13-r2.ebuild 870 BLAKE2B b8f7d1665cb89f0de78c765ec5771e4e7e443832cbdbd207761a6a6881af2277c19a7891cf81f20c149f2b0e5aecbd3aaaa7b2bac2bfe38b85c747361e59bfff SHA512 170c13f220c66412245ab8a120849b6598735f8af69c6a494680ef0bb2459e4e176d7d1c09feac27ad33b2f0c19325ce6020c2b8d4332604aad449d1ff319011
+DIST libXaw-1.0.14.tar.bz2 690994 BLAKE2B 9beaf5ad47b300b3bd57c85ce4c54996db824cb10377472bab8b4ec446458ce162b21e19c4e3ed8d48f10d0bddb695509e73d3274326bdd59916dfbb3c63120e SHA512 29d1c151369523ae6cb418e636b0b7b39ccccc35462a0b394dbeb46d5b6d780badd2eb872a55d9fbba1ee1af034e76c0463f40f8d8a7be2c336d08b3b1bf81d4
+EBUILD libXaw-1.0.13-r2.ebuild 871 BLAKE2B 8b1bd20e66dceae418240160675e38758f41b22ab697b29dd612ce0eb560bd100f4617208a09d4025b852ee5936e510303c4dee30bf81ca93b1543c081646f81 SHA512 a74310a5cccf652f3996eb3b27c1dbbcd1dabc054c28a51cce17d6dc1503e3493fb8e9dc501589d0988430bb3cbb443d9446ed5ba76ace9b3b345a63e0e359a1
+EBUILD libXaw-1.0.14.ebuild 878 BLAKE2B 0e30da4ac305c4dc6703378816ed168341a10422c6520a7a5f66091ce193b97df0ad9720b9256244ad54b87ccf8b13de138102f48e2baf41ae175c77ad0f845e SHA512 e17da132363e24e6f9249dddbaa8ba4763ce0b0fca7d835a951cef09ef69d34592ee9302be7841b915c6dbd8137530448be3ede552d82b2a0036c0b4cc120043
 MISC metadata.xml 308 BLAKE2B c8b1bdf11408b82ade3364323648bf367d76ddec0711a46f3662f4fe34aec46918c7acc617a782312725ab0169e82c25d480194a2ff22bc3429f5f3c1d4e434d SHA512 331203494a47823877466669591ec0de413400dc18f51e96c18a06b7bece2fe56a73055cd7f1e4ffcf6cc9cc9bdd488a7a5ce2830def9ce5a6ae187c52dad364
diff --git a/x11-libs/libXaw/libXaw-1.0.13-r2.ebuild b/x11-libs/libXaw/libXaw-1.0.13-r2.ebuild
index a54fd6e7b14c..7d459d2bd178 100644
--- a/x11-libs/libXaw/libXaw-1.0.13-r2.ebuild
+++ b/x11-libs/libXaw/libXaw-1.0.13-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xaw 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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"
 IUSE="deprecated"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXaw/libXaw-1.0.14.ebuild b/x11-libs/libXaw/libXaw-1.0.14.ebuild
new file mode 100644
index 000000000000..0bd5d0ab7b05
--- /dev/null
+++ b/x11-libs/libXaw/libXaw-1.0.14.ebuild
@@ -0,0 +1,31 @@
+# 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 xorg-3
+
+DESCRIPTION="X.Org Xaw 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="deprecated"
+
+RDEPEND="x11-base/xorg-proto
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_enable deprecated xaw6)
+		$(use_enable doc specs)
+		$(use_with doc xmlto)
+		--without-fop
+	)
+	xorg-3_src_configure
+}
diff --git a/x11-libs/libXaw3dXft/Manifest b/x11-libs/libXaw3dXft/Manifest
index 9f1f09a817c0..cecfd427803c 100644
--- a/x11-libs/libXaw3dXft/Manifest
+++ b/x11-libs/libXaw3dXft/Manifest
@@ -1,3 +1,5 @@
 DIST libXaw3dXft-1.6.2d.tar.bz2 584670 BLAKE2B cde040659a90edb50ac5aa374e8ec04442479ae1c06fe3d5b1387bd3e02c1a0b40ff286ad40f0ae7841544d1244648e34905570e5827dc0efe60a62da3261c9a SHA512 ac434b7f055d20ceb0bd17851d8ba69976ec562a60cb8012a259045e52c038278f0a8b25b52a61befab3aa169b74fd919278c671f1b6e282efb404e089772740
+DIST libXaw3dXft-1.6.2h.tar.bz2 593436 BLAKE2B e0e5c3a3e5b4564d58bb059ad7eb594d1a46cc37e0e21799ea11892d206a57f3f11a46d7413310d2a43738f03e001f5dc6f8c3b86bbe806fbc651661e9f720db SHA512 bc9b6de80379bdc82c7f5cd46ac78a422282b018eed979ef5548d0382f43e53619a6ebaf40c6b9ae264d597536022dc1daf023c1d1a04e948d4b4658bc6479ca
 EBUILD libXaw3dXft-1.6.2d.ebuild 737 BLAKE2B 7588db2950c7574fb799a1c067ba2ee916a28d473e1dae53f2bd942e437a3565028b3beaccd63a6e4fad7ff13d4f7fdbf71260ee8cc8b26fabb6bfdddb8a7066 SHA512 b2cacfb2d2dc7975d8f5e16b6391a32100b515e656947faceb42203d1455f5e8eec7648515ccf13007bec2b2d2db7db6596a537945b783e01a97decc71038fe9
-MISC metadata.xml 246 BLAKE2B fdb264ea0fcdffe3b15f288ef6958a743a7c88bc85f82e13d20af443e93182007ffcf8ccfd62071b57660a668f9c25753c12baa7a409c9d42a408293c21f482c SHA512 be42da502b805b08126629fdde43bd1473535fc5588faf7c65c05e923736fb18f0249fe61ac5c18c4de1619bd52e4865449d1f02ec19f2c2581f6c2e23a5ed4c
+EBUILD libXaw3dXft-1.6.2h.ebuild 739 BLAKE2B 48f4e4210b98ba309466a206960754f77a4e4f0c02977fd1bcaac2f8013ec462d3f0c52e528877acdd9452086e2f1b7936133b97e295db520b2c3b6d209aecee SHA512 0a746e83ee7b7d4beafb6bbff10eae96535fff2bb6532dd72dc54737c61a312726409b6223b3a264c8abfb7f99db3c5624937410d8ff27332bb4f2c6f3cb76fb
+MISC metadata.xml 481 BLAKE2B 3d867f37532e6b3f0033f9697c7f38a0b39ece17c9e890e309dcc60b80172c4483a411c0e0811efcbd73de4210cdcdbc9d39fea8731e9bd765182ff13aefd336 SHA512 707b9a3ae30cbad1d0b505a9466fa79dc687250887b600beb1b90caa32552bef6354871b3ffe4ab05c3e75f7154ee27681944edeb0b0111d7724e977cf87c5ef
diff --git a/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2h.ebuild b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2h.ebuild
new file mode 100644
index 000000000000..3c771bc204fd
--- /dev/null
+++ b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2h.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="Xaw3dXft library"
+HOMEPAGE="https://sourceforge.net/projects/sf-xpaint"
+SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="unicode xpm"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXmu
+	x11-libs/libXt
+	xpm? ( x11-libs/libXpm )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc"
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_enable unicode internationalization)
+		$(usex xpm "--enable-multiplane-bitmaps" "")
+		--enable-arrow-scrollbars
+		--enable-gray-stipples
+	)
+	xorg-3_src_configure
+}
diff --git a/x11-libs/libXaw3dXft/metadata.xml b/x11-libs/libXaw3dXft/metadata.xml
index 9809f23e9c1a..9ed9d563686e 100644
--- a/x11-libs/libXaw3dXft/metadata.xml
+++ b/x11-libs/libXaw3dXft/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>ceamac.paragon@gmail.com</email>
+		<name>Viorel Munteanu</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sf-xpaint</remote-id>
 	</upstream>
diff --git a/x11-libs/libXcomposite/Manifest b/x11-libs/libXcomposite/Manifest
index 190faa2416c6..abadba9b6ca0 100644
--- a/x11-libs/libXcomposite/Manifest
+++ b/x11-libs/libXcomposite/Manifest
@@ -1,3 +1,3 @@
 DIST libXcomposite-0.4.5.tar.bz2 316993 BLAKE2B 4dc01b4c3fd85bdaad1ab9d9da0668caa162957056284fe864dacfcad302ddacf32a3ca233efe191592121a42783e04d5844277ef8ede21951e890114120ba22 SHA512 502fd51fd9097bb3ca72174ac5b25b9d3b1ff240d32c4765199df03d89337d94b4ddea49e90b177b370862430089d966ce9c38988337156352cfeae911c2d3d5
-EBUILD libXcomposite-0.4.5.ebuild 594 BLAKE2B e8d676d7712216237c4c157607acf19dffbbacea18f3761076f1430503b536d38918f3c8fe87bbbc683734150ffc72781b5d04b37e4df8d5646501a832f73e7b SHA512 eec354aefe21c9f7a73c046c9c5f95504a7df8cb5fbf1f0d46e5bb548213040b788d3c821a6ce21a5cb858a905ba2fff381888acbf0570a36fe0ef68be1f7949
+EBUILD libXcomposite-0.4.5.ebuild 595 BLAKE2B 76110f01744da8187bfc3aa6e1d95fe407a3ca3c878ee1a3ad745e81326afde521eb4809a7c8379bdcb2b101c4e3d747dd3d3cc37ee7dabeace70913a504294a SHA512 d9fe3931c9f114dc23ebd0da98a7cb7d8dad41b1a80b424d2707fc468a4624e3ecfedc3f1a779a2b07726c74500326dd9efe97256a63e4de5c715fa0a07dbca2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
index af8d2b271b59..7e6f997b3ec2 100644
--- a/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
+++ b/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xcomposite library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 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 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest
index e26d0f8bea54..f846e70c505d 100644
--- a/x11-libs/libXcursor/Manifest
+++ b/x11-libs/libXcursor/Manifest
@@ -1,3 +1,3 @@
 DIST libXcursor-1.2.0.tar.bz2 334144 BLAKE2B d1dc7f09b88bc570653e615ec5e854b7cd9362a8429e90dc36e1d7efe26fd9c0eb9a38ae8d18a308e1912bb1765e2adbf13f36a265500be2f787d60017091898 SHA512 2b12d0fd17e311ce269dbba58588698885815eb07aa44d48525ed5cd9e5f379bb90138a792a191e2f74888ab10b3ca9a4f507f21de0984ed79748973ab927a03
-EBUILD libXcursor-1.2.0.ebuild 862 BLAKE2B 22b8de6c1b3654c5666b09338e17efb158e8004a0e6d2b197975e81b15697dc69d236f896d012a7db733a01e4a3202af5bba5f5d6d3cef40fd91b80bd9729eaa SHA512 d41471ace2d27a44bc98e5f7989ad53b6c00cc24782fe1bfbcac10c8c8719247077d1aef8aac4f66d044f876e2d7246d5889ba61eaaf5100b0ac6b6f3ba01122
+EBUILD libXcursor-1.2.0.ebuild 863 BLAKE2B 5bd194b269afef89626efb4f40744a55cb35913eb6c370c7c4519f312b0b0cb3a25a6a0cfcf1e0f82208ca01fae1026e5982e6ecac108070ac570e5e713cc809 SHA512 53ab28fbd17175c1cdd3212bcf1601d55ce0558fcb3aaf20fad32918849d4b7f42b60f13d98ed477025d95904c319dd28c394812d85c953fac196ed5edae3ac0
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
index 4198367f8cad..81bf3e51b438 100644
--- a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
+++ b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xcursor library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXdamage/Manifest b/x11-libs/libXdamage/Manifest
index 7ef267db2d56..0fbfe85c9a5d 100644
--- a/x11-libs/libXdamage/Manifest
+++ b/x11-libs/libXdamage/Manifest
@@ -1,3 +1,3 @@
 DIST libXdamage-1.1.5.tar.bz2 303750 BLAKE2B 78cb593365cc842cbc6fcb4dec94aa28293c385ad7ecfef032117d19e98c7b3f252c53b79559096b1c0b259d24a59220e9af7fb60d55c55f4474a33d117958de SHA512 a3ca6cc33b1727f717a3e2aa5593f660508a81a47918a0aa949e9e8fba105e303fe5071983b48caac92feea0fe6e8e01620805e4d19b41f21f20d837b191c124
-EBUILD libXdamage-1.1.5.ebuild 509 BLAKE2B a20e92610c6c07a5e3c55e2383f3f28cd163a319a1d090207fd2a8dfaa7a4652edf4e578a0d623876a88c55fd3106a4f88d02ff1a9c9474d9ff732c18b05eb00 SHA512 9c8c705811a8753130cefa9fa433fa30e3e1d218a699d6208a22a8f8d7156d06fdee405a3d7c88419c3db5e9b4ee41a7092018418ad29b3c3b38cf2d13e9f5c0
+EBUILD libXdamage-1.1.5.ebuild 510 BLAKE2B 27049a65fc144c7b5b4502e2f65186d45ea9f119bd3f79ac2098b0b083af5e4682ca1f9154b08d64a04a9a74d81c1cbd8f7bc029cbdbf4843789f4b0362816e5 SHA512 d9c41c853b37418db497ebe2d270fa03de1f3d14adf93d4463f13302da9f2647624c628f61cd2196133b20900c88fa0dca98da3d4c9314159e987e50adfaad6d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXdamage/libXdamage-1.1.5.ebuild b/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
index 34988a59c866..08f830f3af2e 100644
--- a/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
+++ b/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xdamage library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libXdmcp/Manifest b/x11-libs/libXdmcp/Manifest
index 4263541cef3f..1f3e78c4d503 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 639 BLAKE2B ee3e840637205a5de1b2c896eb9b37afb50f4e29d13fc5179f6cac469a60169c29fb1a388710c113c316b59d362ca4b2f1d63947a068d3b2e1ade89cd76db41c SHA512 03cff56455fb2e8cfd24e76c1137fab7a16551b45b8766b9cde26e78ccc16790c2891d8aedfffdfe0eed8033f2619d0566c93a7fcc7d7c0dacc08569aa930ee9
+EBUILD libXdmcp-1.1.3.ebuild 640 BLAKE2B fc1e40770eec2168d56c101667dde3d26dd2e68da11a6d9bf01cb5953acedc4e66ad4fd1174f58c7d34c8806accc3555083b1e5a6f7b1a37baf6730a8a6ee987 SHA512 27a2fb790aa3522d04ce3a394849224562bd99e50be68cdfef0b3590fbe9df9859453b8fb77aa9aca61f6b77c3e1d1e9ebc7d7e4711bf2a388bdb9899c61ed71
 MISC metadata.xml 310 BLAKE2B d30b368c138282f71b307e21c101bceac3df72c78519e9a20b124602e84d46d19f18c781e29ed797329122c63459602d56c2be4c5ad62e255e3586865a9a0c99 SHA512 fcfd052b3bd6c53658fea8bf241ca82753c12be1d0850536b02f700d9f9d830304296fee70a3b551ffd0c5d9378e13119c3bb12fd986764c940a644f3ac96656
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
index 7cdd79ac2fa6..b1bacc30fa75 100644
--- a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X Display Manager Control Protocol 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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"
 IUSE=""
 
 RDEPEND="elibc_glibc? ( dev-libs/libbsd )"
diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest
index 007739791ef0..b747bf890bdc 100644
--- a/x11-libs/libXext/Manifest
+++ b/x11-libs/libXext/Manifest
@@ -1,3 +1,3 @@
 DIST libXext-1.3.4.tar.bz2 389114 BLAKE2B 941ebf63583a05f40063ec0d2350a40ccc656c6463e58a347489f7dcd8dc5ae5c3b24b561d74a0af2661c2e3c941bd4ffd90295273c248f22e52f23e8d7c0ec9 SHA512 09146397d95f80c04701be1cc0a9c580ab5a085842ac31d17dfb6d4c2e42b4253b89cba695e54444e520be359883a76ffd02f42484c9e2ba2c33a5a40c29df4a
-EBUILD libXext-1.3.4.ebuild 623 BLAKE2B cc0e560677bbf48f2f10bde55acf28d52448491626e4f771f0f0324e5a19bafafe01a2f99c0ab8658c546bbdc750aea8d4e039a133016dffd5526424d37af3d0 SHA512 90b00c836e9433e774803c3b7a403a0879f4e706c5ee34c0879b13f374f5bd1238ea112cc13c642ff890eeba2c2ca4025787aebfcd126d1f9daf939479c22d77
+EBUILD libXext-1.3.4.ebuild 624 BLAKE2B fae67f5cad77e8588275f5a4a7f7ef4a90a48804d867467a06435578e6be860d7835dfe117496710e095cca136e331c2680c1a5d89bad942f0b67c15c0b04003 SHA512 bb17a7fc0fad76f94f846de5578213bff2cd01527ce63b07f7ac12332b9c260dad1c9a37fe03b872fbddc00c75c40fa8adbdf8e0e39b7099fbe903196988dcf3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXext/libXext-1.3.4.ebuild b/x11-libs/libXext/libXext-1.3.4.ebuild
index 57e4afac809f..b813cc143a9a 100644
--- a/x11-libs/libXext/libXext-1.3.4.ebuild
+++ b/x11-libs/libXext/libXext-1.3.4.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xext 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libXfixes/Manifest b/x11-libs/libXfixes/Manifest
index 813807cd329b..b350e9be076f 100644
--- a/x11-libs/libXfixes/Manifest
+++ b/x11-libs/libXfixes/Manifest
@@ -1,3 +1,3 @@
 DIST libXfixes-5.0.3.tar.bz2 294400 BLAKE2B b9a6ce65bef20c24cd75985d7518ab19d7874419d508f4ca6767fe804adfd0e3baebaab69aa9c201901192b8ff5067f5de8d10362ef5c9b6ec12363553389639 SHA512 72d5ee496e5c0520c95ef6bbb52deff1ee4c29792f11aa17aeb25c8ec5eb992ca502de040c77ad95835d1b1432f315b6cb7a3308b434847c28b9c2c6f9d1ac10
-EBUILD libXfixes-5.0.3-r3.ebuild 493 BLAKE2B d0a1b042d47e0841619457955279513f8d7a91c0ab2d6043a50a3fa4d8d39d7fef74d6031820ba151ffb65d74cc8c28731e8a37cec19d5224988e86716566e30 SHA512 873c216fe8260ff5f74b3aab95181705488a96e0426a817b82ac863937082a43b9bdcd44b1ec450e1ed71d11a29499c1841e329dd0225df95aea4cdb11272951
+EBUILD libXfixes-5.0.3-r3.ebuild 494 BLAKE2B 767cf1d5d2958ac1a0bdb2522ab3c06bd08e1f996d92b420f1cc69cbbde7d2c028f52e76ba95fd4d6fb8b4729269acf90ebdf6af7ef8f35ef6a7270e387e812d SHA512 c9924ddb7264d36ed7223359baf2e79859af91e1ddee96d5c2de2fd61b84923bf5fb99b13463d852a387a0289f2f6eb679d3d6a1451d1511cca6ae43501f9ab5
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXfixes/libXfixes-5.0.3-r3.ebuild b/x11-libs/libXfixes/libXfixes-5.0.3-r3.ebuild
index 833e7594c892..bb712bb9da89 100644
--- a/x11-libs/libXfixes/libXfixes-5.0.3-r3.ebuild
+++ b/x11-libs/libXfixes/libXfixes-5.0.3-r3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xfixes library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libXfont2/Manifest b/x11-libs/libXfont2/Manifest
index 099733d5a0f7..e6a6ceb9839b 100644
--- a/x11-libs/libXfont2/Manifest
+++ b/x11-libs/libXfont2/Manifest
@@ -1,4 +1,4 @@
 DIST libXfont2-2.0.4.tar.bz2 513167 BLAKE2B 924cf8462a8fc593755080866b63d6cca6e58b5d875f1d25b95271a56d883e983445f72f8950adf1964e0bf10ca5b8bb2ddfe0c56d4395086e460952a5933bd7 SHA512 7cf6c58e520e48e24fc4f05fec760fcbeaaac0cedeed57dded262c855e1515cc34cd033222945a0b016f6857b83009fc2a6946c7d632c2f7bb0060f8e8a8a106
-EBUILD libXfont2-2.0.4.ebuild 785 BLAKE2B 651ad348bdf7da1bc5fbf9ac61c68663fe4873ec9fe868f4cf00f6643c74dde6da058d271b7b89f43806d2e5027ca24c5923fd5d530aa35354a40207ab289458 SHA512 a0868d51c10a49c1f8b793b7d4bef39f160ea947d5929784323f6285e4e8022394cb71e044063128c5564b19049f6bd7084a2bc1b4883809c529b86d3391e1a0
+EBUILD libXfont2-2.0.4.ebuild 786 BLAKE2B 49eb210943c875e3cd93f2b5df20bb409b654cfe8dd3c31edf2164a3f25d36012213c7291d6f9de548e0d057ad083a4c26e08a099787edf3503a55a5ffe6e3ea SHA512 f55f351181f62897ceaab895d70a6ed709fa1d756cb5d4251cca7d974a2ba0ba2d6179423ae55c405e2cb030790999609fdeeede47a0c49e493216586a727002
 EBUILD libXfont2-9999.ebuild 626 BLAKE2B 2ff0a44a208e81f4ef7d6dd1b60e0c906e7d2e002cc58f9238c76feedbfb5a0eb7398063d6932c02bcde407f3dd2b0dbdf4a1305c8e3ab59715e420cd7884a92 SHA512 74f8f3bb14f814d9ce9f8630eb398bafeda87c28a15f95e6f7c3c1a306dc5ac6352bcaec48743510d102e31a31e983b3f969d94b16be69224cd7bc69a1d123b7
 MISC metadata.xml 475 BLAKE2B 8a544df9e1c34c23726d094b23cb1dc11e643dd6d9467840494a6aeeddd252a9ff41eaaf664879804e52344718f91a6e562ec0a397b2b81b3cb6fc0357f5ea99 SHA512 11c5f77e0ad6453c90b4403b7f336449ca7d72cd0f61bab37f14357710173bda280895736f098674ca0cb48b969bcd5d2a9c166161c1c717a036e09b777f7852
diff --git a/x11-libs/libXfont2/libXfont2-2.0.4.ebuild b/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
index d05a1a3f65df..22ade10fa26c 100644
--- a/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
+++ b/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xfont library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-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 ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 ipv6 truetype"
 
 RDEPEND="sys-libs/zlib
diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest
index 33713f4a0aad..81d7a4f32f67 100644
--- a/x11-libs/libXft/Manifest
+++ b/x11-libs/libXft/Manifest
@@ -1,3 +1,3 @@
 DIST libXft-2.3.3.tar.bz2 353465 BLAKE2B 05a91225d09b5e1800a8272c72f7220d9987e3828591bf73d8307a9c4fca1ce7c4c62b36805f44e385c3a4269ebaafdaed70d3b2006208e860f8e982b53c975f SHA512 28fdaf3baa3b156a4a7fdd6e39c4d8026d7d21eaa9be27c9797c8d329dab691a1bc82ea6042f9d4729a9343d93787536fb7e4b606f722f33cbe608b2e79910e8
-EBUILD libXft-2.3.3.ebuild 704 BLAKE2B ac74a86187817fcecca1cd956fac5e6ce6a5be1d8bcc6ee0a7af009dbbbcfdcfdb46a6f17ba1c77220268cfd2b32a6abdd96e8c62ff4cb8b5f3a99a9553e6534 SHA512 36174e949e3792454a933fb4a9ab7f28c5b76f8ebf9dfe937147b91ccd792c8cc0360fc9a6d226a7c9f09ab3c21e14055e1bb14dc3825405f3e4100e26e3244d
+EBUILD libXft-2.3.3.ebuild 705 BLAKE2B ad8c0dd550a1936c798cc84cbd4fff1a1a0f39a711adf5cfdd1050ea1753077ad11dba2802c68fd106865642694534eda0aa9a6820f414d65ab5e42a3320d478 SHA512 16af99878c9e63030753500da2d21dda6413a4a8b2cf1bd430df2c09f66063c13eac923626ffe3fb4d6f1c7e767536507edd10bb446211a91396a89c16b9208d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXft/libXft-2.3.3.ebuild b/x11-libs/libXft/libXft-2.3.3.ebuild
index 7091c3992178..8087fa12d344 100644
--- a/x11-libs/libXft/libXft-2.3.3.ebuild
+++ b/x11-libs/libXft/libXft-2.3.3.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xft library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc"
 
 RDEPEND=">=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index ee31b9e8b4f7..61b1d5e58a79 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1,3 +1,3 @@
 DIST libXi-1.7.10.tar.bz2 484519 BLAKE2B b4a3a090045d65c351d21a65fdf2f3d252e11546a5eaba9bf5f22c837b84ee758fe325eff39b32df55f65ab3d6cdc0d2c7ac7e134fec0983baeb0103d109c810 SHA512 591f0860bf5904897587c4990d6c852f3729a212d1ef390362d41242440e078221877c31db2232d5cc81727fe97f4e194b077f7de917e251e60641bbd06ee218
-EBUILD libXi-1.7.10.ebuild 729 BLAKE2B 9592b2f8f617ec44c4ad45eab8fc713e5dabef4801d91d573bbb6adcd3b568c87244d9f47d85df38a2ecf250b902298a4cbd5d1ec7192ac27eeae7dc485e1b2c SHA512 ad77ca02854937c4a48f00a06ba9265556ee7da68bc720df8d29c02de0d0dfc23c668ee68f1ce73225c45a7b83957e46fe0a00c679f36b4516f840c06b5a17ca
+EBUILD libXi-1.7.10.ebuild 730 BLAKE2B ea8571e8007eea0c786e923830348a6df33d1d541545a291eb337dd987dcab5e34371556eb1d970e55a7dcaf5534bdb283e556767b9197768d44f4aa1935b2aa SHA512 e1e817a0fec81f29c5e39d954785a9322942b64d24b1916503fc4d494018eb9e0f5a938629e2be40095d81a3a1f497f962aebd35e449a02f72e1ec661bd183bb
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXi/libXi-1.7.10.ebuild b/x11-libs/libXi/libXi-1.7.10.ebuild
index 4c7db2cfcc4e..8b48636b5798 100644
--- a/x11-libs/libXi/libXi-1.7.10.ebuild
+++ b/x11-libs/libXi/libXi-1.7.10.ebuild
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 DESCRIPTION="X.Org Xi library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libXinerama/Manifest b/x11-libs/libXinerama/Manifest
index a55b93851644..b2b0a82ffaa1 100644
--- a/x11-libs/libXinerama/Manifest
+++ b/x11-libs/libXinerama/Manifest
@@ -1,3 +1,3 @@
 DIST libXinerama-1.1.4.tar.bz2 287162 BLAKE2B 9e27f9776eb200a430875e4ea3a9a559f205822b5dcea59e4207a58889e8c7b67b2014e9ceed5b3cedd311c47fa023b4a8f1a17faa511fb0041382c7467527d9 SHA512 cff777ad942614fbf6bc6d8529f399e62debf3ecbf6cc0694a94e38c022bf929ffd5636fb59f55533c394d89b23af3ea51fa5128927f12a85787e16239330f14
-EBUILD libXinerama-1.1.4-r1.ebuild 500 BLAKE2B 7742acb318593bdd0dad1099f47d8f9fa43c7d2d0547cbbf5e2f3bf968ea4521ac16f33f23cec062746c81c937a038149dd47de66bb129b84405098f952621af SHA512 139f9945bbb74f0b8e38ef5f3a73c007db0d6e5e114228711a9bc9b78708c8f0e3f7f656760e6b9d5faf78c0b53f0f5125cfcce5e7bdb77169420afe12d27d23
+EBUILD libXinerama-1.1.4-r1.ebuild 501 BLAKE2B 2b62a78840132c6b4d59ac109d8c7a41e52c62366ebfd55da17459509bc0db78a78b633618b0066fbbc8179047691bea00f75b8360daf8c1131d0889cf7186d5 SHA512 105298b512833e4d019345ac33faae20b7c4f75bc0702565012d81afde518cfafc9d3f7d77913d0104703858a4c3b0f0a1069b837ea9ec95f639f5189c912353
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXinerama/libXinerama-1.1.4-r1.ebuild b/x11-libs/libXinerama/libXinerama-1.1.4-r1.ebuild
index 449d7364df91..aa19c2ed3839 100644
--- a/x11-libs/libXinerama/libXinerama-1.1.4-r1.ebuild
+++ b/x11-libs/libXinerama/libXinerama-1.1.4-r1.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xinerama library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-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 ~x64-solaris ~x86-solaris"
 
 RDEPEND="x11-base/xorg-proto
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest
index 59d56e6907db..47919ee67faa 100644
--- a/x11-libs/libXmu/Manifest
+++ b/x11-libs/libXmu/Manifest
@@ -1,3 +1,3 @@
 DIST libXmu-1.1.3.tar.bz2 394330 BLAKE2B 5bbc4345f32588a8b1e196fef39a636b9a765a2d22a12cc30bc7f5528b004c1f73370d25b023b68772081f1c58b4813293971f8f08ca8f2b9508adb4c3925c94 SHA512 8c6cc65b22aa031ad870dd92736681a068a0878a425a53dbed909943da1136c4a24034d467cfd3785c3a8d78f66850b69f1ebe1eb24aaf9bc176b1d171a5c762
-EBUILD libXmu-1.1.3.ebuild 725 BLAKE2B af431828eca28b95de6e07626c83c5633ed0c19116ba5f75d69d3bee6cbd5d2c7fd6ffa3a6860f2b4cde33d100271a0efc12ce549cd3ce5831f7947b1b78abb6 SHA512 8e859fbd9c5c919c46c59931ccbe3e947c6e894ecbfae2ebb54e47003bd83c0040cabdd7e5efca8373338e81b04c4989840a22b4e27cdfb347ca1beec2815088
+EBUILD libXmu-1.1.3.ebuild 726 BLAKE2B 4a4c82bbacbb269dbbabdb090943032e1142c1e478d73f948e5bb1cdfc097e7e99bfaef91923dbafdad6cba186fd5d67d9478abe196bb20b05a6a4837531545f SHA512 60a6623c8ec6fe1a05c9f60c6b566a3d069774adea4e060567743cdfb853c4679cd40f208198cfdc2f5851071c047363ce6b1113b3b69c9e894bc1f4ab9b3510
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXmu/libXmu-1.1.3.ebuild b/x11-libs/libXmu/libXmu-1.1.3.ebuild
index 9bb50426755e..314d30206083 100644
--- a/x11-libs/libXmu/libXmu-1.1.3.ebuild
+++ b/x11-libs/libXmu/libXmu-1.1.3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xmu 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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"
 IUSE="ipv6"
 
 RDEPEND="
diff --git a/x11-libs/libXpresent/Manifest b/x11-libs/libXpresent/Manifest
index 09e8b7446b40..87ef76405533 100644
--- a/x11-libs/libXpresent/Manifest
+++ b/x11-libs/libXpresent/Manifest
@@ -1,4 +1,4 @@
 AUX libXpresent-1.0.0-add-depends-to-pkgconfig.patch 1021 BLAKE2B c7fd8665f66cffbf33ccbf010d0517c9b697f576fbafd55c57aa2263ca93ad748c8d36c93834323ff9a78b1352b9003ba4b96c3a8b3f4acafae744b7e025bc9c SHA512 fbcbc0a5839a2b1976aad4edf318fa3b47868763d5262ef8537ed6dccf911a2f9fad2b2182a90b4be578eb8850fe29403cbd52cc29ee8f0f09f9c85a7883a9c4
 DIST libXpresent-1.0.0.tar.bz2 263461 BLAKE2B bc35477c5f0d8bb3403c00650f94a6625994e857f249b24d59e434dbac9696bc4403d14fc82a8aa2f27c3c3c818ebb0665612305873f1ad49bb3bb1e08e7de5a SHA512 e88b4ec4fcbc0417a0cbecc0ecd73f8085c496dc6d1a4902b6550750a69a1cb8bb76c436c7941ee3bf3c61ffc85bbd8f8327fca30f14815dbef1cd53bb8db16b
-EBUILD libXpresent-1.0.0-r1.ebuild 600 BLAKE2B db7cf276100f5cfdfb3f98839f8edd7aaad67d1e2633a6b5960ce4ef12ef338461257e2b526c9a56f21871775e4db756714dc2ab33adadc0ec817615f98abb58 SHA512 8d68e265fe5cd7b9c3d849f0a470a41ac8419f0636a86cdb131f76c55f65d8b7dd4397a78dd8e8e7592210370c1a0c7bce4fb33a52dab1a0d101394ea6ccc96a
+EBUILD libXpresent-1.0.0-r1.ebuild 599 BLAKE2B 0c0930b3ab54464d0648847e388cc2965252dd7001d9dcaa0a2f32dd9d6ccab2ea6777cd3ea95cfffc8072e6a4dde1ed977d5e53e3c5d753893f3ed3f1028047 SHA512 a4cb9204c008298e2ea05c00f0a4ef49d198f58f455bd625afcd87ee2cdddb2f73335fa6e508fb1e6c832a89ec5199a7a95ef3c8e65157a5c4c76b8641ca4d94
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild b/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild
index f2fffc3694da..ab1a5f2af60b 100644
--- a/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild
+++ b/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X Present Extension C Library"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	x11-libs/libX11[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXrandr/Manifest b/x11-libs/libXrandr/Manifest
index 20f03db69cbd..f11724cd8a34 100644
--- a/x11-libs/libXrandr/Manifest
+++ b/x11-libs/libXrandr/Manifest
@@ -1,3 +1,3 @@
 DIST libXrandr-1.5.2.tar.bz2 330726 BLAKE2B 2d91e4cd2d7af6b79ee952a0d51b0c61d64251c61f862677b47065f2eda811650a5e3bb3185d09a6401291b5a8bb30e8d29cf7aaf1699ac3f49b838ef7b1208d SHA512 fcd005f9839e7ef980607128a5d76d7b671cc2f5755949e03c569c500d7e987cb3f6932750ab8bf6e2c1086ec69dde09d5831f0c2098b9f9ad46be4f56db0d87
-EBUILD libXrandr-1.5.2.ebuild 586 BLAKE2B e753cdd81ec5996f80ece7edd2cb6657518eb62fe1efbae466bba8f6bb4bbfc1394e26b7e20e55dd715108860c49466599d168120f5b5328b011665ae8c9f763 SHA512 0ba44d40117d43cef11ddf607c8da99288dad454255af7b4822fe502489d7fa9adae6932a6e58b0e6798780b7c067864f22a6259f53eb132bb4936d13cd8b965
+EBUILD libXrandr-1.5.2.ebuild 587 BLAKE2B 1673b9ee62a602182ccb3452381574971f4a5d90a8b9ed9a40d3aaff2fd78e71a8f224b552c9e807acb50c06f01fbe17b1965251cd23087d2d89313d513ec1a1 SHA512 14b6c962c890799a105ef1d4ebc9aa60955224bf2bccbe38f9ff4dbe349b524e1d9f74e29c0461c0523fe19bdc2e44312b51d910132631683f59b671e2d1ae66
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXrandr/libXrandr-1.5.2.ebuild b/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
index 87e3d4b9237b..a28dfeb4eaa8 100644
--- a/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
+++ b/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xrandr library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc"
 
 RDEPEND="
diff --git a/x11-libs/libXrender/Manifest b/x11-libs/libXrender/Manifest
index c5fd7cbf309d..b5d1556d9e68 100644
--- a/x11-libs/libXrender/Manifest
+++ b/x11-libs/libXrender/Manifest
@@ -1,3 +1,3 @@
 DIST libXrender-0.9.10.tar.bz2 308318 BLAKE2B c9e250e16118a4878e7439fdb37549596abfd6a17f50e4e88242579fc285d0ef5b0c8d5d0fb592c7dbcd6e77c5fb284e6644e4edf9b12118cbfc0f179e274313 SHA512 16ea0cf638b32d7df54b270457ef8c9d9a80da27fa845b105b560cb31027b4c7fe799cf23d6b6bac492be5961264e96d7845d316a9af4de9ff38bf40885ea6fe
-EBUILD libXrender-0.9.10-r2.ebuild 479 BLAKE2B 11caf9c7ec9a56bcb3e2977fa8ef7a8bacc27e924d5248a4ed787a21b9e8bed3f982410b41f49cfd128b4dbc67693f69b4eaf316be88d75d31738e6b5a0d200a SHA512 4c81dd9f120d08797c30347a85c1ed112e5ebd641816f3253c7a30ccc3cfc4da43ff768cfa9a022eb1fc2b7ac45aac7d5c4b2577c630b4ed3a0046ba1cc0135f
+EBUILD libXrender-0.9.10-r2.ebuild 480 BLAKE2B fc10694f42df53bba2aa0227c4f518d2734f193414e87e4fe0e87fde05ed4f6f819c47649b7638d42710eb2a3025b93d77c16a1df6e85feeb6b978eb076ccce3 SHA512 a09f24fcba1893b31753d1bab3bcb927044b88f9758fc84248a11c752b76857eebefa84a40585edb2172534cd682dcb284d78dd482423fc38cfb964db68c79a5
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild b/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild
index fa5f4e24a22c..c6af1e489a88 100644
--- a/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild
+++ b/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xrender library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="x11-base/xorg-proto
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libXres/Manifest b/x11-libs/libXres/Manifest
index b4a6b0ab49cc..706b4f323503 100644
--- a/x11-libs/libXres/Manifest
+++ b/x11-libs/libXres/Manifest
@@ -1,3 +1,5 @@
 DIST libXres-1.2.0.tar.bz2 286635 BLAKE2B 0c0813118c7ecd5851b075a4001e0e34fa3df92bd8367717eee42ec20352cab3443d232715c1d40c5df313f6508d2dddc779980d11744a1f897cc7511bfdfdf4 SHA512 8eb5a36b1f030eb4e27e676cc4befcc073da66a7bce2b39089314e1facb629d13b087bb53ca2c95fe5291857da7ff9f80c6ab28fb3e245eeb9e0344937900172
-EBUILD libXres-1.2.0-r1.ebuild 422 BLAKE2B 0ce9f9565654dc81073199ece2b5f9e5f5e48f24f132144eeed2356678560eee811275588b0c69e82df8170986dda58c3383f43eadc600833703831724ca8a6f SHA512 61faeee5c79d50c77a61763ded9208625a873dac512710a62b19c7d5ff1d24b3c4c2d80b15a1ce06292feee0b684a485b713f67f18dc9528cd12e50bdac7d963
+DIST libXres-1.2.1.tar.bz2 311025 BLAKE2B f1ecc2397547cd6bcd37dc94968bacc378ab67d004fc31f02890b26bf169057bda61f6a08559ec23eb70bee5910f200e9d1016add3ca816fc4dd49115e718256 SHA512 c17d28406e17e305dc4976f095e88059735f5bd8c600adf2e556523c9e0dd7fa01dcbf7a9d28a642e77e49a5b30f54bb9b2fc34bfbedce467ee2a020bba5cdf1
+EBUILD libXres-1.2.0-r1.ebuild 423 BLAKE2B 3cb1acbf1cedd871c0f14d8e8fd6e198c24d0b66c981dc0a53d3cea0b6e724958ece633b2bbe90738fb9978179b996d198cf23528e9b74196adba679c1b3c214 SHA512 d2e7871be20ffafd4a564ed2b5771de6926c2fa7e7d0e04a1de4faa73dfe91a5ef8e53c1233143199ce41ce37b1a1d189e5634c6b26e4c280446fdf66415d70a
+EBUILD libXres-1.2.1.ebuild 430 BLAKE2B 89ebf4c29d2089752139a60996c4f673e61cc332024da7fdfb5e6e6abccc3b0177ef37fa48218bb95e6df5ad000be0d82f2b11c36b886e9a103ab00a0db25a76 SHA512 31a2343edc53d63474414d5c05cd238be1e6d7ab67eb8d2479d9eacde6f744a821f85d525e1321e7942084b1924514e696a3fbb1a8e2b7955cb8da2c82127518
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXres/libXres-1.2.0-r1.ebuild b/x11-libs/libXres/libXres-1.2.0-r1.ebuild
index 326864d2d86f..be385fa681a8 100644
--- a/x11-libs/libXres/libXres-1.2.0-r1.ebuild
+++ b/x11-libs/libXres/libXres-1.2.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org XRes library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-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 ~x64-solaris ~x86-solaris"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext"
diff --git a/x11-libs/libXres/libXres-1.2.1.ebuild b/x11-libs/libXres/libXres-1.2.1.ebuild
new file mode 100644
index 000000000000..f647c8c56371
--- /dev/null
+++ b/x11-libs/libXres/libXres-1.2.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DOC=doc
+inherit xorg-3
+
+DESCRIPTION="X.Org XRes library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest
index cf76b2502df3..9c961bd30f78 100644
--- a/x11-libs/libXt/Manifest
+++ b/x11-libs/libXt/Manifest
@@ -1,5 +1,5 @@
 DIST libXt-1.2.0.tar.bz2 810521 BLAKE2B dc60b8fb126f465122eec4df287d5a0d12e483457ba20abbd04a17a8a5fb8a1073d8765236b8020353ec3c5f472b1580ba7a99d6896ce5fcdabaed5f4fbc6753 SHA512 06248508b6fe5dfba8ceb4518475f656162351d78136eeb5d65086d680dabe9aca7bba3c94347f9c13ef03f82dab3ac19d0952ee610bc8c51c14cee7cf65f0b1
 DIST libXt-1.2.1.tar.bz2 784610 BLAKE2B 69a1446a22acb50e625ab4a7b24b5db634d47a540d4543a3f58459dbb380d61aa4bbbde50328c76b2c31eaae3662a1c71cdbcf9bd3a0c915ae4e587f63fbee7a SHA512 6877af61ba91eeed6b6f80471b84f354ad0ec0827249c7ee0a00c13508063fe8d2696dd400a4bdbc6ca2ff67cbe1317ad5ac24522fd96099dc56535e33ca052c
-EBUILD libXt-1.2.0.ebuild 842 BLAKE2B d2f36c5d474d7327e45a55aa42420cc7b7a738b0bf0fcf5bf7cf5af0512ad61af5f33fd9c4091ed3487b0d1447f4467451f6caa38beabd625f25352c2e3b647e SHA512 60131554510d1e9f4e2231cf3f36b544586f82fe51e6df4b2e01cb22666be91c1ea89d1101c95cd9cfc8bca940b7183db05d38f2c9a6f38de29781f1bc224df3
+EBUILD libXt-1.2.0.ebuild 843 BLAKE2B 4fe50a60cfa90bec1bf2ed560ce281923816409e966984e8693b57ec7e792c61374021cbd184f06b579928533ded6bff124db05f130fe1a419a48f8122212fce SHA512 59ad452b50115158cfdd27a029597a4a14f37ddbb9280622183a62ed7b0fdec7e9c0350409c6b3894ab0b5fc2674e8062094f3c1098e6462de642bc713d503b2
 EBUILD libXt-1.2.1.ebuild 843 BLAKE2B 4fe50a60cfa90bec1bf2ed560ce281923816409e966984e8693b57ec7e792c61374021cbd184f06b579928533ded6bff124db05f130fe1a419a48f8122212fce SHA512 59ad452b50115158cfdd27a029597a4a14f37ddbb9280622183a62ed7b0fdec7e9c0350409c6b3894ab0b5fc2674e8062094f3c1098e6462de642bc713d503b2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXt/libXt-1.2.0.ebuild b/x11-libs/libXt/libXt-1.2.0.ebuild
index 5fa09a11fd38..c3537018691f 100644
--- a/x11-libs/libXt/libXt-1.2.0.ebuild
+++ b/x11-libs/libXt/libXt-1.2.0.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X Toolkit Intrinsics 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libXtst/Manifest b/x11-libs/libXtst/Manifest
index d8e93d42a5ba..bad5f5ed9c37 100644
--- a/x11-libs/libXtst/Manifest
+++ b/x11-libs/libXtst/Manifest
@@ -1,3 +1,3 @@
 DIST libXtst-1.2.3.tar.bz2 321819 BLAKE2B 92a75d6ea9000fa7736093ce479d275c57a4a5bf849df2d6afae9478a53a07ba395013ba6676c2ea7dcb6a1f34475967ed6508b7c304b887f83ec44a611b8e6c SHA512 6f6741fd3596775eaa056465319f78c29c91b3893a851a4899df651a2023a4d762497b112a33d7d3e8865fe85d173d03e4b49daef76a66af1ae1eaab82a12765
-EBUILD libXtst-1.2.3-r2.ebuild 619 BLAKE2B b27911c93c70c6f1777493afc0e36e0147b7366188efb1d35d5410d2c3d34045eb43b483499440c91ddede8ed9f98bc6e838ca550a288493ec9fadcf76d83434 SHA512 9c8fef2884037d6959aef0c3552c20511dc4efbdcba496919322534e064410d2d32a1436e9f0150def10b6c69652183084a25872aa5879c47e44e7ccf0a93bdc
+EBUILD libXtst-1.2.3-r2.ebuild 620 BLAKE2B 99d611a1956853d0dd28d3fcc65cac8a07e3c2e21f94439fd98c03af65b3f18cfb04565d34ffbeceda430cf47ba5adc5623ee3fb1b556a8a9c558dceb221c915 SHA512 dc6d0340b688327593e43aaa7861d2ef57bb2f9a288b642daa000f7d3d5264af62006a74b83ec65c88bc5b7d4c2bdb573062f812fea20c8362087443d223565a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXtst/libXtst-1.2.3-r2.ebuild b/x11-libs/libXtst/libXtst-1.2.3-r2.ebuild
index b491b536cc3b..a154b568a086 100644
--- a/x11-libs/libXtst/libXtst-1.2.3-r2.ebuild
+++ b/x11-libs/libXtst/libXtst-1.2.3-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xlib-based client API for the XTEST & RECORD extensions library"
 
-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 ~x86-winnt"
+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 ~x86-winnt"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXv/Manifest b/x11-libs/libXv/Manifest
index b2784baff6ba..febd653238f6 100644
--- a/x11-libs/libXv/Manifest
+++ b/x11-libs/libXv/Manifest
@@ -1,3 +1,3 @@
 DIST libXv-1.0.11.tar.bz2 317921 BLAKE2B 3c656e1f5cd02c936813b3e10a359d23e7a8643a45ade42ddd584084ba04d09cafbefcc68ab9356b78c1a716a050637062e956c7f50a03a522d28ff7aa31c3b0 SHA512 97cb3ab06cedc87799d06e1affd5cee32ed0e551903fa5c915f79e7ed92eded867e3220b4a663822f7ebd86fdc71b09943b7077d98f1200019992e8d24144e58
-EBUILD libXv-1.0.11-r2.ebuild 505 BLAKE2B cf2322563ab48e1f200737520507a1877f9b295eae0feb3dcf5cbc29844aa1a452e673f253aa3aa7879e295727ac217c27414393e07665b752cfc3cb242a9ab2 SHA512 008236d414189153825e94dd855207a7730da59050b3a2c379f326e0c05e5d17f56901109482f6a236552631f5a3b4690b7e5ca1ba620a8dba5ac45081c9b892
+EBUILD libXv-1.0.11-r2.ebuild 506 BLAKE2B b987d69a91ba3859f3320419bff13a9a9c9170d01d1d838e013591e4a51d5aab9029243a5d15e5a1d280ca692e29643db8f77051e5a66f39721aae8db94058d4 SHA512 57ba2e79baf356e97cc5e63e26e8127bf3a92e3506f49907bbef079772dbb7ed7f3e930c1c38fa2610d8c399874d0bb3cee69c15c7f28e925f9131ec74922eff
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXv/libXv-1.0.11-r2.ebuild b/x11-libs/libXv/libXv-1.0.11-r2.ebuild
index 451fa0fad8bd..982285c959d6 100644
--- a/x11-libs/libXv/libXv-1.0.11-r2.ebuild
+++ b/x11-libs/libXv/libXv-1.0.11-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xv library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-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 ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="x11-base/xorg-proto
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXxf86dga/Manifest b/x11-libs/libXxf86dga/Manifest
index 326721323bb8..7fb2e10e0310 100644
--- a/x11-libs/libXxf86dga/Manifest
+++ b/x11-libs/libXxf86dga/Manifest
@@ -1,3 +1,3 @@
 DIST libXxf86dga-1.1.5.tar.bz2 301685 BLAKE2B 8c70299e52cd2f34b4dbfa0d56707df20f7b368ab92321cf9e8c0fe15402a3b4e1b8eb62d0e53fd3321e95521bb4f35479493e412710a74779ac98ffaef966bd SHA512 0e77c4003aeba737b10c17d55aeefa935fc57c4ba9e8f79a834f3f8c690d6a1d98f69ad707eded784346c1cf40c41829719d257283b5eae3207147fb4c79ed89
-EBUILD libXxf86dga-1.1.5.ebuild 468 BLAKE2B 2480243a40823ca183666e0f155ba1773448bc9980f40cececf7857d138179df93ab123c8939b0bef86a957906ecb3a00547697d2375ced9178f250520301cec SHA512 c2e46a2ab491ce3824495fc523409d11b98d19a55236ab4c4cf1495fc201f3c76fcc3b2d8bac1eed7df49f7619d8aa53180e9010d2efa14cb9840e0f1e1e2806
+EBUILD libXxf86dga-1.1.5.ebuild 469 BLAKE2B d81ea93feec4d70d4cd8a352284f7a5c151c3169102c2d756f4b0e38c7f749923e39a62d1bc3c5e1f3f3b0a0f5794fec0fc0c23a4435c4391bc6b23d49d3c8ac SHA512 35143a33ca85f84a469bcbe9f682452cb8be9fcbe92a51f6e1c7a99326be35dc9d4de1fa5c3be69d90f1eec7a50e07b014a7f1eeeead27af0ec1b21771351dfc
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild b/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
index c1c889e6e876..1db7cfb3b571 100644
--- a/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
+++ b/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xxf86dga library"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="doc"
 
 RDEPEND="
diff --git a/x11-libs/libXxf86vm/Manifest b/x11-libs/libXxf86vm/Manifest
index fc1941d24359..cdbd8101b102 100644
--- a/x11-libs/libXxf86vm/Manifest
+++ b/x11-libs/libXxf86vm/Manifest
@@ -1,3 +1,3 @@
 DIST libXxf86vm-1.1.4.tar.bz2 295346 BLAKE2B 22698db5beb0ac06663e9163e13f8afd99597afc6dbc9f9d4fb232682df6b41a155d63fc1beb58da3d83bd0e420872c457671696246dbf39a6451454a6e24b9e SHA512 c5f92d86e143db02ebb36bcd25618acaa2cb2831f5a23800a06dd431cd73b6702d95de8fe7407ce626336bf614c288d5256f4d87ea7781fad2ab6c517cbf09e0
-EBUILD libXxf86vm-1.1.4-r2.ebuild 510 BLAKE2B 73166de83eb56c5e3586e1c2066c108f0f281033164775b848429b8cd272c8c4df492d92dd60956c492e8cba8fb123e55a24d967168410999c27a0dfeacff227 SHA512 8b03059fa810d8bf0697c8b568cea24a7d0052c7a0986572113b1c3a9631c8661d232a191b087970bc6f53a3dbcdfb7904e8dc4f1fb9714b17d7d1208600eee2
+EBUILD libXxf86vm-1.1.4-r2.ebuild 511 BLAKE2B 4d9729faef9108d8b2be8d9731c7421252be2eaf0a34b5f56b4fad92a99adb4874c70e5a4c96398c4011b96b3c707a0d3036a707370addd3b948b1da74731a16 SHA512 e62cb76a5e10748085502b448c8a5302fb0835332f22ceae24e2beae5ce389c92202332ff9c3643a248e362b518f6d333f18b619493b68d466cf90ebe90c63c5
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
index 1fce4cd50a93..26bba73312eb 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xxf86vm library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="x11-base/xorg-proto
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libclxclient/Manifest b/x11-libs/libclxclient/Manifest
index 8d706261f9e8..01629eedeb73 100644
--- a/x11-libs/libclxclient/Manifest
+++ b/x11-libs/libclxclient/Manifest
@@ -1,5 +1,5 @@
 AUX libclxclient-3.9.2-Makefile.patch 1130 BLAKE2B a4d811b7bb964f2339d99838f3caa9088e4469bc8cd0ec18de1a4d0d87e53b1c62c797b239a3b1172a673c7d2f87c05f829fc72e4cb32c7d69a02bf31ddb64e6 SHA512 fe2d6bc14d5746786314792ddaaadac5f4d6e977cdf4e34ec58288e867c854082c93120e06002da17daf0c9709eb2074aa53603b2c99b8ad8bd9a1e9efe1eefd
 AUX libclxclient-3.9.2-enumip-include-fix.patch 310 BLAKE2B e0218f39b551978be1cf9318f21e53146c8e75826afd7e5f0cefcf43c434e3b64f3fb373386efd13b085b9b02bb631b5826b7441f9b73256097147dbb23c7b63 SHA512 3ff284c85635ea04b45f4640ab5a89a4d13b7933dc66bdb0310d5a4e1283b32d2d9078a9bf74f70f31636fb085d6ff8123d743d1750012cdf7549d8b1ad065e0
 DIST clxclient-3.9.2.tar.bz2 29991 BLAKE2B ffd56894e0bcf09e2b6e4c882830e3c3a3a88f3778fe6a2c8b2ceb9336f8ce9cf28193da8e8c86987475e95e3ea2c07319bd82e88ad820b39167cfba9eefd7c3 SHA512 38c2782e58df24c2dfcb936fc9cfe4d44016055fb1aa52ef8e789bf8ec327f45f2f7a91f18012e4b0c6f253f6f10329d6d1e9fc341017ace3f2b6fa050592049
-EBUILD libclxclient-3.9.2.ebuild 1077 BLAKE2B bfdf38cd8a5031996235e9510cbb530cda8fc01830e65ff266043bd338e891d147ca9df8e6c5537f98d2a68bdb8d05a76666ee50f62b83e1feead1c92b782191 SHA512 3ef66ccd0c78d398ee6e698abeee79bc03b84e2091f455118d8b296653eadff2a88f6e5ee6b56cdddb03980ab621cec2153889282a5c2e8d55555b5013d11b95
+EBUILD libclxclient-3.9.2.ebuild 1105 BLAKE2B 3e03c3029abaa1846233262888b6f51cb248020be22400e88eae00053fce6b29f0e2baaff6859096b433b64c510501de6b54269ac447315d47e246bc5d9633d9 SHA512 43b45473f7100d01af072cfd4c17e1d657d8b28245d1201b6efa6ad8f517a7571488a607fa87712c5ad28ee68ac27acb062e41e123d004e2ab260b142d4f4412
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/x11-libs/libclxclient/libclxclient-3.9.2.ebuild b/x11-libs/libclxclient/libclxclient-3.9.2.ebuild
index 5baa5183f222..b257be17e7c2 100644
--- a/x11-libs/libclxclient/libclxclient-3.9.2.ebuild
+++ b/x11-libs/libclxclient/libclxclient-3.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,6 +22,7 @@ CDEPEND="
 "
 RDEPEND="${CDEPEND}"
 DEPEND="${CDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/clxclient-${PV}"
 
diff --git a/x11-libs/libdmx/Manifest b/x11-libs/libdmx/Manifest
index cbe94dc7aad0..406fb974fc3f 100644
--- a/x11-libs/libdmx/Manifest
+++ b/x11-libs/libdmx/Manifest
@@ -1,3 +1,3 @@
 DIST libdmx-1.1.4.tar.bz2 316517 BLAKE2B bede1dcf554fba15257277419c1a458125ab962365a4ae679b22a98d6a1e31584087fe09fc1a2e5a7e9b212c0fd332438cdf5c56c8a9d32b6ea755091026b6b0 SHA512 77aba6cadfd17db0cc7e1bc26f14d908223a0fdb135d46f86c3be34e3bc7e2f843f08d4d0ef773357e83b17122bffe56a0442d12908378c05a22177b10ae10e9
-EBUILD libdmx-1.1.4.ebuild 333 BLAKE2B a80d3a224c2f411d8ed912aa4510c0f5f60a85c073b3e322a3293ba62bb968895015b9b590a94c426c9b62a31f12a11d1eb92d170d4f1f0ce29dea587fe7cba3 SHA512 07ee061e326ef680631206c0675b4670ba70565411096ad0662a0a4a3ac2a604152481e496a648c1025221d082dac7f84092429f1fd1b262c5520f1323de1d4d
+EBUILD libdmx-1.1.4.ebuild 334 BLAKE2B 829e8e7d9804aa9cf3df589022c6fd10e03d7c56ac7b6d3645b15bc803a7a1b1513d3f996a82cabde7fc21dc7dc11dfc8770037f9af2448db495e038d1a5e38f SHA512 35322cbd027fd0e2f19e0974c3bfcb56c8606267ec18fbbd569c4f9ca9cb78e2b057b7ede68776cb9a1eab15cc847fa899413ca19f582b30875bafb638a4fba6
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libdmx/libdmx-1.1.4.ebuild b/x11-libs/libdmx/libdmx-1.1.4.ebuild
index 4af9be3851ce..ab393c538099 100644
--- a/x11-libs/libdmx/libdmx-1.1.4.ebuild
+++ b/x11-libs/libdmx/libdmx-1.1.4.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="X.Org dmx library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	x11-base/xorg-proto
diff --git a/x11-libs/libdockapp/Manifest b/x11-libs/libdockapp/Manifest
index 19b0891e6f24..e0ac7e94e841 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 a971c0f7f9a56e3d6d8f9296e93a83b885e787182d9b5f487ba39e0bd8f6c2507fbd83adb65e93307ef95d70edef02bf36eace053c3cdd9f3775e6474046a6d7 SHA512 479bdcfae7a274d92abe3cbc876c516276abcdf797d434a65409354ca210590a0f455764b3181c4ed41b4ae87ddc1e52b15d93e4038c9ea64789364834be2906
+EBUILD libdockapp-0.7.3.ebuild 848 BLAKE2B 439652cf10378c58800546a364a0ed3974a7dbc5f04b8331bbd10a99141d8d9daff147cc1a6ec70dad75163ac5cb3df234021963e9032510d4815652b4a6aca0 SHA512 48e8946308e6fd8e61827c9326856b88c65fcace048b7c6e6d2e919d3f28d2ddc4b78bfb4f00b4f150eb480977c822cb0fc47cf82b44ded93591c81742915cb6
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-libs/libdockapp/libdockapp-0.7.3.ebuild b/x11-libs/libdockapp/libdockapp-0.7.3.ebuild
index c5efd97e5a7d..bc39205a880b 100644
--- a/x11-libs/libdockapp/libdockapp-0.7.3.ebuild
+++ b/x11-libs/libdockapp/libdockapp-0.7.3.ebuild
@@ -26,8 +26,7 @@ FONT_S=${S}/fonts
 FONT_SUFFIX="gz"
 DOCS="README ChangeLog NEWS AUTHORS"
 
-src_configure()
-{
+src_configure() {
 	# Font installation handled by font eclass
 	econf \
 		$(use_enable static-libs static) \
@@ -35,8 +34,7 @@ src_configure()
 		--without-examples
 }
 
-src_install()
-{
+src_install() {
 	emake DESTDIR="${D}" install
 	font_src_install
 }
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 77b6e9783aa3..5909471302d8 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,8 @@
 DIST libdrm-2.4.103.tar.xz 412796 BLAKE2B 64904bebb923d79b83fbe1949aa24c697cff2a258f415c4633991f938772980e985df19f44df881d10b14268ea414ff99220c8f003ad09ac1decdc6c85249240 SHA512 15b098b962008271400692b6b15ecb7e22676f8698e0220ad969735ac2315ccc737d19558afb6abda82bae15117e5f306c048184a2369f434b85ecaa670ca885
 DIST libdrm-2.4.104.tar.xz 419372 BLAKE2B 4f9c1d88e8e13e12b192b822aaddcbb01716771b85445f7468129600df3214a9dd3559539830eeec4df61f03c187fa88a6d0bb2d5278a5125d2aa11cef6805ea SHA512 0fdbef53e0e7c441c805c95ac55ca2c94f11e8fa18e36b4dc7534c22e2b5bc8eca7283fdf41785da753f98d0b589023111abdba70db7e79837729b1540253d6e
+DIST libdrm-2.4.105.tar.xz 420376 BLAKE2B 1443dd378263358e7af64ee63ac6d25d2c5efaacaf2f76be1a0021f03dd08ce4580ef8531af076504c5a29e538d5c66d1773fb0439dd8bc312f3a038535dd07d SHA512 083a04af7208e58be21b89c6ebdbe2db3ba00cd29f0d271bd38bfe97dfca741edafddaaf9b5b95c20fac2c9b700434ea5b21397de26f7073169ad6f5b090f715
 EBUILD libdrm-2.4.103.ebuild 1988 BLAKE2B 29c991df7e6d39b70b48b4e6056d944f12f630ab320d788b3e9560cf6e3b5e99b55c8aa100c475149b697a07e42a0fa27c22fa264f8aca5579e24b8c7792d79d SHA512 1247f74f71ed34d8b1cc7f5a1199e4d6f0bf0dfcf387db636c0ca2c0e179dc1e8ac757379bc584f4f489e559e73a92aa26391f38c58a6bd3d21b399be5b53982
 EBUILD libdrm-2.4.104.ebuild 1988 BLAKE2B cfb94eaf9f6bc949b597d915556b52f9de85d0c10aa20aca571a27f99500f9543dc368771ee61c59b89e18f5d9ecbd72eb17f716b9a7ecea35a6d7b4f9b18efd SHA512 32c0df2d09c9088ff2fd2dcfff73ebd78355c8132e2f042413300b31e63b4ffb878f57cc513733da190b6e19b241b5c2a0cba5b7aaf7d5f46d3f5358664ffa8f
-EBUILD libdrm-9999.ebuild 1995 BLAKE2B 48cca4911319a37b520a953c67935dfb49103445b91726876f3391434697aa5526628579b9abfc38c93953f99a08bd8d62136dd1fb9066f670b9576680b9171b SHA512 0f3db3dd331867ad523ba4f783fed48ebc57b48eb9198164573c830ca5cb07d4b1d9f826f7ab526254ecd4a2d9a8f537dec637880bb39197fc96db5ed48b2474
+EBUILD libdrm-2.4.105.ebuild 1995 BLAKE2B 1785382e25415793ed04d7d677cbca02a25b1b99cf3f725f484702045e5495f268d1e21336261aec4bc02902522212847eabdac6ddf240a0b9f36643db1bb99b SHA512 4150f030c174192d4c29b14a5bd2a1328bd6ec02fed3eef3d1be9ef9684d8445212df93c919c018a12eef8702709f153f39388d715ff8d73663b6e70e024f7ae
+EBUILD libdrm-9999.ebuild 1995 BLAKE2B 1785382e25415793ed04d7d677cbca02a25b1b99cf3f725f484702045e5495f268d1e21336261aec4bc02902522212847eabdac6ddf240a0b9f36643db1bb99b SHA512 4150f030c174192d4c29b14a5bd2a1328bd6ec02fed3eef3d1be9ef9684d8445212df93c919c018a12eef8702709f153f39388d715ff8d73663b6e70e024f7ae
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.105.ebuild b/x11-libs/libdrm/libdrm-2.4.105.ebuild
new file mode 100644
index 000000000000..370a65ea93cc
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.105.ebuild
@@ -0,0 +1,71 @@
+# 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-minimal
+
+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
+		-Damdgpu=$(usex video_cards_amdgpu true false)
+		-Dexynos=$(usex video_cards_exynos true false)
+		-Dfreedreno=$(usex video_cards_freedreno true false)
+		-Dintel=$(usex video_cards_intel true false)
+		-Dnouveau=$(usex video_cards_nouveau true false)
+		-Domap=$(usex video_cards_omap true false)
+		-Dradeon=$(usex video_cards_radeon true false)
+		-Dtegra=$(usex video_cards_tegra true false)
+		-Dvc4=$(usex video_cards_vc4 true false)
+		-Detnaviv=$(usex video_cards_vivante true false)
+		-Dvmwgfx=$(usex video_cards_vmware true false)
+		-Dlibkms=$(usex libkms true false)
+		# valgrind installs its .pc file to the pkgconfig for the primary arch
+		-Dvalgrind=$(usex valgrind auto false)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index 48e056d6a358..370a65ea93cc 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/x11-libs/libfm-extra/Manifest b/x11-libs/libfm-extra/Manifest
index 7e9ad5b11a5a..3ccf58015160 100644
--- a/x11-libs/libfm-extra/Manifest
+++ b/x11-libs/libfm-extra/Manifest
@@ -1,6 +1,4 @@
 AUX libfm-extra-1.3.2-buildsystem.patch 1691 BLAKE2B 25ac36d6e12b1d4cd0675730654aa19167928c450abb58a9ec58bf7364821377e11b3a76093a125b61096770e1e486987e473f7081fddf2a106ae6205989edb4 SHA512 20c435dc45fb51f269323b45a549a59ef4721864bb13c2e384eb1b60fc8cb4cd8045f8e6e94d32f29b92640d02d72e903cc119f6783099c1843fd1c4dec07491
-DIST libfm-1.3.1.tar.gz 1290374 BLAKE2B 3df27fc6b4afd089e51cd36db0f764e9359b0c6373e0ff484aa7cd2ee99170530fb60f5757ade9263a5bdd1d6be9917debb66a19cc8e13c505431050b6f3a901 SHA512 82bbcb1b9c7d4543bcb075906bdc1554462b041ad936e2f0334ae478302b19808cdbfe6d0c86a039bbd72a2491f2d2ada61a324fe3933a8dde16a03d93bef2bc
 DIST libfm-1.3.2.tar.gz 1295152 BLAKE2B 80b2110610aac9e8cb37502c3e69e425256ff22565ba15b5806e30c3bed5ad141c38cac1eda91f846e14eca6b783bea3d715b3b467ae7d37b036e3f19cadc3f8 SHA512 905c5eca66e1acb8ab2ed20de9f10e43d38eae304d1d986dd9961469141f9156130602c060754a5161672208c37a3969489bb40fd9c941281817852ca38500a6
-EBUILD libfm-extra-1.3.1.ebuild 2539 BLAKE2B b954e207f3f82911839f57a5104b630b970b0945359d0091d3f546f8d21717cfd268803f3155f1a15b37855eaf061b9b55ac6683c23e0cfc10e586c3287a598d SHA512 4a743ba0be2b59c439e96c219b50db2eb7fa701dc88a0577d7de54f275b250e74ab897172b8191ef95e13285b35f94449fc8c422b9dcc6ca7606fc82af9f7907
-EBUILD libfm-extra-1.3.2.ebuild 2241 BLAKE2B e9a2096d9d9229832b9819d492587aca66d01f7f27523ff9f1e5afbeaac5654c802dc928c2ca2d4d2cf3352aa5d9f4778bf3541ab8f26925f42d2e4377d10def SHA512 1c0c4fcb266ed0a0c8bafb68d2c86337430daa919fd087d0f5baaf43a3be5775d1f9076f2fa876d3345cca70092671bae88e6a2b75854d72dfc64a5962bee8ec
+EBUILD libfm-extra-1.3.2.ebuild 2236 BLAKE2B 6b8e0e8de0ae2ca4c692ef4742c1a81b251144f8f3a17a03189948a2d751de7a66c957360db0aced719b5331104587b6560f165b3a0217ff4a1793304a4601e5 SHA512 ea71136d566dfd375668b00d58b888c0cbc1c4d45beeec94304c2031ea3910954c20e6b8655e60485bee9dc03265612aa802c6427bbac57364dcf4b5d4196f7d
 MISC metadata.xml 375 BLAKE2B 2df77024ebe8730d3640fc9abaa87a294758eee8bfb162679445da76973520cfa2dd4bcb1482ef64e9b49d722682d5a8c2ba14097a789c61ce9a122c9736126a SHA512 05aec39fac12a183440f723dfc6909da9f2961487c207a758333b9aedc146a82bc0100ecf81c132ce3de231c5acc6b9c8026de9bf079284e60f0150d31f18f23
diff --git a/x11-libs/libfm-extra/libfm-extra-1.3.1.ebuild b/x11-libs/libfm-extra/libfm-extra-1.3.1.ebuild
deleted file mode 100644
index a2d9c22061b0..000000000000
--- a/x11-libs/libfm-extra/libfm-extra-1.3.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools xdg-utils
-
-MY_PV=${PV/_/}
-MY_PN="libfm"
-MY_P="${MY_PN}-${MY_PV}"
-DESCRIPTION="A library for file management"
-HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
-SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-SLOT="0/5.2.1" #copy ABI_VERSION because it seems upstream change it randomly
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.18:2"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext
-	dev-util/gtk-doc-am
-	!!<=x11-libs/libfm-1.2.3"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
-	sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
-	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
-		configure.ac || die "sed failed"
-
-	#disable unused translations. Bug #356029
-	for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
-		progress;do
-		echo "data/ui/"${trans}.ui >> po/POTFILES.in
-	done
-	#Remove -Werror for automake-1.12. Bug #421101
-	sed -i "s:-Werror::" configure.ac || die
-
-	# subslot sanity check
-	local sub_slot=${SLOT#*/}
-	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
-
-	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
-		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	eautoreconf
-	rm -r autom4te.cache || die
-	eapply_user
-}
-
-src_configure() {
-	econf --disable-static --with-extra-only
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-	# Sometimes a directory is created instead of a symlink. No idea why...
-	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
-	# symlink to it.
-	if [[ -h ${D}/usr/include/${MY_PN} || -d ${D}/usr/include/${MY_PN} ]]; then
-		rm -r "${D}"/usr/include/${MY_PN}
-	fi
-}
-
-pkg_preinst() {
-	# Resolve the symlink mess. Bug #439570
-	[[ -d "${ROOT}"/usr/include/${MY_PN} ]] && \
-		rm -rf "${ROOT}"/usr/include/${MY_PN}
-	if [[ -d "${D}"/usr/include/${MY_PN}-1.0 ]]; then
-		cd "${D}"/usr/include
-		ln -s --force ${MY_PN}-1.0 ${MY_PN}
-	fi
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild b/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild
index dd331530d905..1dd6a3468cda 100644
--- a/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild
+++ b/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0/5.3.1" # copy ABI_VERSION because it seems upstream change it randomly
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.18:2"
diff --git a/x11-libs/libfm-qt/Manifest b/x11-libs/libfm-qt/Manifest
index 58eff0dd1457..839fa80cafc2 100644
--- a/x11-libs/libfm-qt/Manifest
+++ b/x11-libs/libfm-qt/Manifest
@@ -1,3 +1,5 @@
 DIST libfm-qt-0.16.0.tar.xz 348548 BLAKE2B 41c52efc5b71d924c06d55a5b94e7f9a1c4feda0a664d83b0de906479bdb644260a68136720baeb1958a48b08019b72de34b6066f51c19e5c5fb65afcd9e903c SHA512 5de63408a641b0e77cb319952e428aee9cd35db9ec3e6726a8327ebc53f5641cf66b28dbabd96797c64a253b1e41421dbe05dcb9f4bc7941bd92676bbfa9cc84
+DIST libfm-qt-0.17.1.tar.xz 363052 BLAKE2B 5931a5f06f0d085aedf0b178efe4f47ccc90d6e99dfa88955d692736d0dbc4fb8ebc9c5b834547b473b84ce815bb7e1e2e991fee38f390e7ff85c8a3effe8f26 SHA512 1e1781a01446f381625361a50f77422827e7ac5ab6039b4246369e2281edf78d3ccba866fa472667bcbb6737c44ebc350cb30a0055fc84d1f5d7e1c83e1241c1
 EBUILD libfm-qt-0.16.0.ebuild 901 BLAKE2B aafa398a6dd5477f7e70cf24ad5609912ef36eccde5598e48cc1ffc0406176e01a88d8099a8af3111e9e6be3a7102e3677c8031405a86fa4ad7167d553620e4c SHA512 57c07e9574fee97332747f98e3f6ea2a0f612b2a203f17ecdf234be41d4fe0ac1b58ec793212c957d428491d8767469c5147e36cf6447645c2819775dcaea345
+EBUILD libfm-qt-0.17.1.ebuild 880 BLAKE2B 57aa8392ac45025a51f1fa81ab73c645229234c15299ca9d45905a054e13384cb00ecf16d8dcac114318c60aa56c9e157e9dfabd02ed5e81dd9f284a9c89aa24 SHA512 a33ba3913e1caec22c95b7c2276b70373bad1e1e06ab6fdb8afb602776ebb8bdf6b071c59c44c69f64764e0ed011e5146e61e8787a4b4d58d9771934fd081c4c
 MISC metadata.xml 314 BLAKE2B a40b71c62066cf524406556206999869edecf714d898236a8f277132e8b3752fec298cf9407e9010a1037bc757fafcbae32abec9b52a68492d414acd529c176a SHA512 edaddf48fd7cef23284164b7046e0e6b5ce1442847d3353ee8175177f00b06973d6588811b166dacbd7a1182942128792858a43e029d6aa874c1b8625b5e78f3
diff --git a/x11-libs/libfm-qt/libfm-qt-0.17.1.ebuild b/x11-libs/libfm-qt/libfm-qt-0.17.1.ebuild
new file mode 100644
index 000000000000..e7f00d8d8c06
--- /dev/null
+++ b/x11-libs/libfm-qt/libfm-qt-0.17.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Qt Library for Building File Managers"
+HOMEPAGE="https://lxqt.github.io/"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="BSD GPL-2+ LGPL-2.1+"
+SLOT="0/7"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.9.0
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5=
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	>=lxde-base/menu-cache-1.1.0:=
+	media-libs/libexif
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+}
diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest
index baaf54c28f40..3f1c6277c0dd 100644
--- a/x11-libs/libfm/Manifest
+++ b/x11-libs/libfm/Manifest
@@ -1,6 +1,4 @@
 AUX libfm-1.3.2-buildsystem.patch 1098 BLAKE2B 63cde148b2ada201d290550769ae7714324f72617629d801ce362dbc3f33b1de7e6a712959a6e4e8629e880244ad361c054ebc898f2b089d4e19f348120e9635 SHA512 d2dc9c220e2ce70c33809ecb9ce4e85529990946537970a63d60fad33577f1ec444b066abcbbf346611035e9dac5d2750ddce84105a391040c1dc8b179ec0901
-DIST libfm-1.3.1.tar.gz 1290374 BLAKE2B 3df27fc6b4afd089e51cd36db0f764e9359b0c6373e0ff484aa7cd2ee99170530fb60f5757ade9263a5bdd1d6be9917debb66a19cc8e13c505431050b6f3a901 SHA512 82bbcb1b9c7d4543bcb075906bdc1554462b041ad936e2f0334ae478302b19808cdbfe6d0c86a039bbd72a2491f2d2ada61a324fe3933a8dde16a03d93bef2bc
 DIST libfm-1.3.2.tar.gz 1295152 BLAKE2B 80b2110610aac9e8cb37502c3e69e425256ff22565ba15b5806e30c3bed5ad141c38cac1eda91f846e14eca6b783bea3d715b3b467ae7d37b036e3f19cadc3f8 SHA512 905c5eca66e1acb8ab2ed20de9f10e43d38eae304d1d986dd9961469141f9156130602c060754a5161672208c37a3969489bb40fd9c941281817852ca38500a6
-EBUILD libfm-1.3.1.ebuild 3580 BLAKE2B f98125bf71279106353c324e618b9e9c0293b26960ef85c070702063aa683bb10689aff7fb6819ec08bfc0dcea8d7c0a812a0a9dbed7bc741f1ce7dfa23af644 SHA512 f7bb2cdf588eaa9e76f393028330a7933569b7308f65c48d7fe86c1c0e6f31c5155f17d6e27d98f2600ca41415ac6248e47c7d8e4dad3c38270289c392dd33a7
 EBUILD libfm-1.3.2.ebuild 3345 BLAKE2B 487b03ad1e84224c412d4a453563fcfa2d107cb0e0a2cb8fdec8de67cc971a79b0c13d00294c9cacee3bdd0efac642d6c57c447d94a1f8a89bc19c71f5411326 SHA512 3fbab2ddc7f25b09ea4603cf55509b7ff84d0ed84650b5c45912e7a8646002d676bd49018a0edf00b0071a839a0b61ba4a778a8c7c6adb0d5c444c43fcc7dc30
 MISC metadata.xml 582 BLAKE2B 3e314b2f5accbb454ae1021d646393d30332919509ce60a48aa37a3285c4787a502315d74950f083f746eae9b5a7f1302a457418b3d6197195de88e0f390939a SHA512 eab4b456ea5035d3b0c358b6f871710bb3a69be67d918ed135c1acb199234d87bd2e8b1d426485490bb0b7cd9cbb66b6daaef43b39d3219a0fcf40145349dd62
diff --git a/x11-libs/libfm/libfm-1.3.1.ebuild b/x11-libs/libfm/libfm-1.3.1.ebuild
deleted file mode 100644
index 4a92045e5400..000000000000
--- a/x11-libs/libfm/libfm-1.3.1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib vala xdg-utils
-
-MY_PV=${PV/_/}
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="A library for file management"
-HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
-SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-SLOT="0/5.2.1" #copy ABI_VERSION because it seems upstream change it randomly
-IUSE="+automount debug doc examples exif gtk udisks vala"
-
-COMMON_DEPEND=">=dev-libs/glib-2.18:2
-	gtk? ( >=x11-libs/gtk+-2.16:2 )
-	>=lxde-base/menu-cache-0.3.2:=
-	~x11-libs/libfm-extra-${PV}
-	udisks? ( dev-libs/dbus-glib )"
-RDEPEND="${COMMON_DEPEND}
-	!lxde-base/lxshortcut
-	x11-misc/shared-mime-info
-	automount? (
-		udisks? ( gnome-base/gvfs[udev,udisks] )
-		!udisks? ( gnome-base/gvfs[udev] )
-	)
-	exif? ( media-libs/libexif )"
-DEPEND="${COMMON_DEPEND}
-	vala? ( $(vala_depend) )
-	doc? (
-		dev-util/gtk-doc
-	)
-	app-arch/xz-utils
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext
-	dev-util/glib-utils"
-
-S="${WORKDIR}"/${MY_P}
-
-REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
-
-src_prepare() {
-	if ! use doc; then
-		sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
-		sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
-	fi
-	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
-		configure.ac || die "sed failed"
-
-	#disable unused translations. Bug #356029
-	for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
-		progress;do
-		echo "data/ui/"${trans}.ui >> po/POTFILES.in
-	done
-	#Remove -Werror for automake-1.12. Bug #421101
-	sed -i "s:-Werror::" configure.ac || die
-
-	# subslot sanity check
-	local sub_slot=${SLOT#*/}
-	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
-
-	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
-		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	eautoreconf
-	rm -r autom4te.cache || die
-	use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
-
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable examples demo) \
-		$(use_enable exif) \
-		$(use_enable debug) \
-		$(use_enable udisks) \
-		$(use_enable vala old-actions) \
-		$(use_with gtk) \
-		$(use_enable doc gtk-doc) \
-		--with-html-dir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-	# Sometimes a directory is created instead of a symlink. No idea why...
-	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
-	# symlink to it.
-	if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then
-		rm -r "${D}"/usr/include/${PN}
-	fi
-	# Remove files installed by split-off libfm-extra package
-	rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h
-	rm "${D}"/usr/$(get_libdir)/libfm-extra*
-	rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc
-}
-
-pkg_preinst() {
-	# Resolve the symlink mess. Bug #439570
-	[[ -d "${ROOT}"/usr/include/${PN} ]] && \
-		rm -rf "${ROOT}"/usr/include/${PN}
-	if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then
-		cd "${D}"/usr/include
-		ln -s --force ${PN}-1.0 ${PN}
-	fi
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest
index 9e107513b1a0..1f7640921482 100644
--- a/x11-libs/libfontenc/Manifest
+++ b/x11-libs/libfontenc/Manifest
@@ -1,3 +1,3 @@
 DIST libfontenc-1.1.4.tar.bz2 320492 BLAKE2B 34da17e220789f5078e870329390c0e3ee665598db3432ef5a33e78d1db4b12460c7467bcbcc1dad67e9f6ade0173f9fad915a2fbbee51f0be23feedc242e7bd SHA512 76fa851d00113241f15fdd5b5bb7e927b8d8b9a82ce3fcb0678b8c7e32cb5e8d898c4bda1d60dafb7748145049d3240627ac34a2360c64e98a7a912ea7c30582
-EBUILD libfontenc-1.1.4.ebuild 509 BLAKE2B 6fc90d5a72f85479ecf95fa595e7d28f19d278c3dd350ed0d815bd8e7a0c6112078a43c4e7122ea8732f919710508bc6e27c04b840d6a6d2f99bac83b0dee82e SHA512 315946ab7ec5814bca612bc30aa350259861e4a902e71038f5712071c28f4aadca71afcbb50dee140fc1a8e44c70c0cb912c3e1a3d7b78d2827e48495500deaf
+EBUILD libfontenc-1.1.4.ebuild 510 BLAKE2B acebf2e3240829a74042d68060537dcc2efec5c461079309d86217b32e27d058739fc47a418809939d110c684d1c9a0ec27826d1356ea7df2e4714ffa604e2f8 SHA512 72814189cdb2d0f541c977e68854a11c3f6092b6b77f90bff4540faa76dfb69df979e4f39a21cd79fcc27a7767b13c63c8317350edad8769f5c267b52ed4e3c3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libfontenc/libfontenc-1.1.4.ebuild b/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
index 6ec6434fdc20..e835d708f8a8 100644
--- a/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
+++ b/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org fontenc library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"
diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest
index 61c1032ee4a4..1ced5835b058 100644
--- a/x11-libs/libpciaccess/Manifest
+++ b/x11-libs/libpciaccess/Manifest
@@ -1,3 +1,3 @@
 DIST libpciaccess-0.16.tar.bz2 366603 BLAKE2B aab7d49887f7f21e0a6abf1e2aedc50159a47c7aef67eb8605a30e246463a14f9a9993db9cbd2705ef59c93d1ff41080668f8f3723557a927ab4d1edb5dfa4ad SHA512 2f250048a270dfc0823d4bdd613aa272c58a80eaafd922850f56c4b6f7a45a263ed4cf521b52b49f04484ea44ebefb7407d079aa058318a5751ffb181e38fed1
-EBUILD libpciaccess-0.16.ebuild 760 BLAKE2B 1ac85dd8d9d91eb84d4be0b705711af7604ea05abfb10171b066d490124f7778420da2e0ce572e1eaa8820303a000fbf69525b93e42ae3542391aa336d82e35a SHA512 d1b78d2d9de12765cb0db903717f1bc0b4ee2618d7c304bd0b179609c996fde8c0318eda65c13eb5e86a7873981deef79e7bd4e3b70e53dd53e6130afeb48f26
+EBUILD libpciaccess-0.16.ebuild 761 BLAKE2B a864f12bc4ff71136c2f72453ced77d3a3e70c0478d23d0866e8ce07eaf6505660cf9a79ec2061d2bdfeb936f6f43953fb65141f6d65ea54ff0354f400d4d8fd SHA512 b67c42ed3fb9a22b96041b3f806935a84ef61992f67f42c10305222023598f765122a186771662313a0c79047f1751a8e673a07cbf3606991a60067d73fae5f3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libpciaccess/libpciaccess-0.16.ebuild b/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
index 958bd5f5f287..934d5c999f02 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
@@ -8,7 +8,7 @@ XORG_EAUTORECONF=yes
 inherit xorg-3
 
 DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="zlib"
 
 DEPEND="
diff --git a/x11-libs/librfm/Manifest b/x11-libs/librfm/Manifest
index a8a4e5024abf..f13296dea373 100644
--- a/x11-libs/librfm/Manifest
+++ b/x11-libs/librfm/Manifest
@@ -1,3 +1,3 @@
 DIST librfm5-5.3.16.3.tar.bz2 3304424 BLAKE2B 6651ef8a3967956e1858d4c94af055bddee1b0f2278fe3c0323232e1824e77d8d5d56533d23af3770a9641a2c8ea64eea35157e2cd02cd73f6bcbddd99ea9da8 SHA512 e3d00b0337c9368bbe939bcb2d7f6b1c3f3b6b5a810074c5d6bc7afccd938c5284075231a0326b5be2b93436bee346871fb47ee30c130e6ce00756148d214000
-EBUILD librfm-5.3.16.3-r1.ebuild 903 BLAKE2B 550d0ae26936ba8d6f564f6f131e20a8a821eaa46f166a7408fb5683f7d259f64597af41f976ef9f48d7964a5bdaa60ec2532a2c2c56690aa407687c28777c74 SHA512 56dc528f21e0a41cdcb7e2a5b9db4ac9adb6b83dc5509c02bc8e0738770c67f44ff846d60e8dd3848594f78128fe2a89df67b70937d92ac81a75cb0d9d08855e
+EBUILD librfm-5.3.16.3-r1.ebuild 896 BLAKE2B 094ca3b083fa09e27aa96c7c5358f872e54d53232c08e5919fdc5bb5982f80be79fcc9b3b90d25a9c9eb57d347770111bd1c270687f30cd416df393b469ce33c SHA512 7dc0eb7e3f96a4a69de39485d0ea8dbfc0b96943928e1513f716b72c4506568cd7be94052e425c90960e37e25093450444283252f70d0ab7c7ffa57271b99c49
 MISC metadata.xml 239 BLAKE2B 3db5d07e4322fa5b0559623be6edcd78840caf77d64fcbd2bf4eb74d5fc2850e9e6287afbd59cc7d1a01ce4307462e37cb3158690de39be8f0294fe6e11f7201 SHA512 b0230e897c2fa3dfef69e8aca50d4775aeaa9f3c41986585ddd2f2fc0f8913221b2d6b57508aae6322b7b2916d05d2423f45de9dda9b9ef94d0fd753490ca248
diff --git a/x11-libs/librfm/librfm-5.3.16.3-r1.ebuild b/x11-libs/librfm/librfm-5.3.16.3-r1.ebuild
index 265bef469574..0ea4ffabe339 100644
--- a/x11-libs/librfm/librfm-5.3.16.3-r1.ebuild
+++ b/x11-libs/librfm/librfm-5.3.16.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils ltprune
+inherit autotools ltprune
 
 MY_P="${PN}5-${PV}"
 
diff --git a/x11-libs/libva-compat/Manifest b/x11-libs/libva-compat/Manifest
index cf598bb734d6..982a45da656c 100644
--- a/x11-libs/libva-compat/Manifest
+++ b/x11-libs/libva-compat/Manifest
@@ -1,3 +1,3 @@
 DIST libva-1.8.3.tar.gz 186915 BLAKE2B 10713e3bd7aaefc033490fc9ef6485ec50774f274f09e9e06fd1479b882b221791375533a6826e5db9a758f2acd74f913a478da61fe32250a3e2d9c0062739fc SHA512 f2f360876d8443a22a3434aa1ac7ec5aa6d4b3cc1f13f475ef74e716f5937acc43e02f9a8b858b5b7b6539da3731f763843d45664cc19c70e81d8b87e93659ea
-EBUILD libva-compat-1.8.3.ebuild 1991 BLAKE2B 7e0a7b2fb5f958320a270794e593ad3ae6c0acf934b471feea3753d9e065f5ff1fc705a60480e8d0b6458e994deda7df8978dd063632f7d23647b10f26c352cc SHA512 6c8eea6b2f6d66c342eacf31b15d78941026e4a24df64663f8aacad339dd169aefe9f71d9c6455a2315beef74a1ffff78a86bad8111c531ebee9cc3cd181aa33
+EBUILD libva-compat-1.8.3.ebuild 1992 BLAKE2B f33bb33643a71009baa8922d97982421f0bb1bbdbb29f22af5f44bb16312252e94437e2cfe1ab50526a5b87c9c8f08c7a2981aa5ccc5d7a2a72268a9c1d4a179 SHA512 f8becb98e04bfc0ad5f7cc787786019b6bf347991f591e46b1b35f7d61b17ef3cab287e9f54509d6cf245bc2a2d46e549468ba0e2489db44d715cb102dbdbfa3
 MISC metadata.xml 439 BLAKE2B 57fb312f206c07e728f5b6c591c83abbb5e881a409fd91989190237d8e803835af48f1a9860bf0b41777d47a96574c1164ef25ddd7ab4b3afd59aba3ec864ea1 SHA512 18884fd14172886b365c30633a20b262d13c2a279613be573425f9a3e88bd33b901e86af7d95693b4684ad2fa93ad269dc914b3570ea82c12185adf80a6d270c
diff --git a/x11-libs/libva-compat/libva-compat-1.8.3.ebuild b/x11-libs/libva-compat/libva-compat-1.8.3.ebuild
index 5b82b4eb8871..31cdf24dbf51 100644
--- a/x11-libs/libva-compat/libva-compat-1.8.3.ebuild
+++ b/x11-libs/libva-compat/libva-compat-1.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -68,5 +68,5 @@ multilib_src_configure() {
 
 multilib_src_install() {
 	emake -C va DESTDIR="${D}" install-libLTLIBRARIES
-	rm -v "${ED}"/usr/$(get_libdir)/*.{la,so} || die
+	rm -vf "${ED}"/usr/$(get_libdir)/*.{la,so} || die
 }
diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index 6fb83128b561..018dbdfc9b6b 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -6,9 +6,11 @@ DIST intel-media-20.1.1.tar.gz 21788401 BLAKE2B 53f2ebf5941c487253d02d0e23229cd4
 DIST intel-media-20.2.0.tar.gz 21860711 BLAKE2B df5ebb4ec603902dd34aca6915dab5bec4ad6237e5810d0e04349f7269adf62505afaed8456d1ad6a3544525bdb2012294e6b92e68dc3f0338f6fab54aa934bd SHA512 0f4817b66f4e2d752d5a34cc1c8974dd09b4fe4f6d8bf3df896887542c229088edc406a9b2a68a9b353214aa7ffa4cd8917cdb6695dbe2e316af6c444822b15b
 DIST intel-media-20.4.5.tar.gz 22437981 BLAKE2B 136be5280b463879e47ce8a1dae1befbe3907a2429b799b972dffbdcb8b21512e3161dc209abf7b4dfb0d3695512963c40cdd85fb6fb2f3158bee12e8e42ddcd SHA512 dfd70dc83eae181830844f9055ad728d91a51a55ea29ea5d272b154f16a92dfba86568d9b4e8f8c56d500582056b73602c999d2e877386fcf46df1633fc5e2ea
 DIST intel-media-21.1.2.tar.gz 22487027 BLAKE2B 819b7c4a4fc9295034af77f1e95d4b23ca974629f0ff70f14d84c881fa8ae2558708878e045b700fef30bb28a1af9ec61306854e91d0df4881e7d9dc229715b2 SHA512 046942ebedad2e40de3c592ed92bd7d266402f1f94d30ee7674adcb147774f6d90af18c56a19a8d16465144a7bded9cc7b6eeefdeb50f349c7d3ef6840c30ea4
+DIST intel-media-21.1.3.tar.gz 22507169 BLAKE2B 68962db57d6f4c11e50b5d44584adf0458d08a118234a091aa55734885ee9fab6449658a8736c4a23233be38b58311953492482c3d9b258dd2cf8008cf363f20 SHA512 a5a4c26d86191138245e0cc62304aeeccfb6627b04310e4b1d35cc2050b909d9b856b6176d868562336dd6342f93b1909b46fb481eb353ef02cc188eea5da121
 EBUILD libva-intel-media-driver-20.1.1-r2.ebuild 1182 BLAKE2B e453b09ac58040ab6e0da45768caf70d8cdace4b4683f94f8133904513212652e5fa7effa8392be7e495e00f8d6227163c465d4404f8628f804eebd9c0c3e3b4 SHA512 52b2221c79305305deda5a952314f8de487399f99f5840e0ec9a2d67ebce819cba2d8e31ee9de4e17300e758925d68ab5f3205ecec62631d19b0a1c7f213203c
 EBUILD libva-intel-media-driver-20.2.0-r2.ebuild 1225 BLAKE2B 195b1f1db03ad5bf2d42bae05cba99e9726a0ba3c682c993eb73b6cff6bf04b40004d15223d69fbd64fcae4b62bf1137f50911ec2b9c68bd9079d0302d682ba6 SHA512 a46e343c36dc51819c22b601b7eecc62f38c27b75cc4eafba844fdb32ce062047f3408e582b3daff9668a72df26d995d2a4909c7da98cf2fbc4a60682f41151b
 EBUILD libva-intel-media-driver-20.4.5.ebuild 1466 BLAKE2B 44ab893c79c0eace0f0e237c89a81636123733a51da2b71b4314f5707e98855a59696896cac73a783cfc0b646f9dd1b2e99bc555888d6b53ddd6a54d2e13dca7 SHA512 95749d2504f57449baddfe40b9f1595f45d5058e9afb3656b9ead1163a5dc8a899aef6e71c9bea3ffd5f452b181ca3eebbeae7943e563292be51be7bc24037e2
 EBUILD libva-intel-media-driver-21.1.2_pre.ebuild 1456 BLAKE2B f79a367b3f6329e5027ef47f1710526ed9fc4423aa053877b87819ba7b8b6e53777ed9a99c00e44d424be0eb47c6dc0e089bb2f30fba65bb4f14615e451af4b6 SHA512 84923929d65363bad83046606529c615c6e8eb2dd69872809ebb0724d86867247aba62b23d887e7ff6fbef2d66e1b70e1fda1d251679becb160ee09db5470dc6
-EBUILD libva-intel-media-driver-9999.ebuild 1456 BLAKE2B f79a367b3f6329e5027ef47f1710526ed9fc4423aa053877b87819ba7b8b6e53777ed9a99c00e44d424be0eb47c6dc0e089bb2f30fba65bb4f14615e451af4b6 SHA512 84923929d65363bad83046606529c615c6e8eb2dd69872809ebb0724d86867247aba62b23d887e7ff6fbef2d66e1b70e1fda1d251679becb160ee09db5470dc6
+EBUILD libva-intel-media-driver-21.1.3.ebuild 1456 BLAKE2B f8ff1a9fe54793928efce9c38edb8fdd4c84404f0ed65b4183f6b895ac5f81cf74a562e9dcf3d7b5aba643f8d2f7ece8b8029a834ec0898a40300786d44d602b SHA512 989275860dcc628b9568b956b95b81e8b5eeeafe0bd09ac46acb96dc0af61d421265c374fec3aa1fe33f66fe4da10abf1cd2fb6bfd1831dab547112a45b0129d
+EBUILD libva-intel-media-driver-9999.ebuild 1456 BLAKE2B f8ff1a9fe54793928efce9c38edb8fdd4c84404f0ed65b4183f6b895ac5f81cf74a562e9dcf3d7b5aba643f8d2f7ece8b8029a834ec0898a40300786d44d602b SHA512 989275860dcc628b9568b956b95b81e8b5eeeafe0bd09ac46acb96dc0af61d421265c374fec3aa1fe33f66fe4da10abf1cd2fb6bfd1831dab547112a45b0129d
 MISC metadata.xml 616 BLAKE2B e47d0c35b3aca0abfb57bbdc677e7e7f3bb45d92fa6af6d894291b370032e5d15d324aed4fc2752eb810b0f3603410eee91b20f368d64304e35cc5cbd827088f SHA512 3a546df85f009136e8e36c20c38ed61be10fb198cb1b443ef7b1ce3c43957aff2490e82fab0052f24067ff642ea8dc847770b08914721724b36db639ab24e53c
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.1.3.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.1.3.ebuild
new file mode 100644
index 000000000000..072d1d906b99
--- /dev/null
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.1.3.ebuild
@@ -0,0 +1,62 @@
+# 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}"
+	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-21.1.1
+	>=x11-libs/libva-2.11.0[X?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
+	"${FILESDIR}"/${PN}-21.1.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-9999.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
index d8a7364723b3..072d1d906b99 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
@@ -27,8 +27,8 @@ IUSE="+custom-cflags set-as-default test X"
 
 RESTRICT="!test? ( test )"
 
-DEPEND=">=media-libs/gmmlib-20.4.1
-	>=x11-libs/libva-2.10.0[X?]
+DEPEND=">=media-libs/gmmlib-21.1.1
+	>=x11-libs/libva-2.11.0[X?]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 764b89d6f9c2..c512e58d871d 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -1,17 +1,19 @@
 AUX libva-2.10.0-fix_wayland_build.patch 1018 BLAKE2B fac2b0f159fcd6ab671f36e0ce41a6fed7714a0d50dac8058d5858814fc06d330a111a96a810bb81709286f498a1cb6550987171badbcf4a1abacf9c99403d21 SHA512 51b1252e5923dcbd94d498048905400f0241302af5d52b6fdff8f0d62f8bfcadf05c36cf8f1acd222dbf9f3a11e2938d8fc9969fd66d4ef0aa77b001bd069f39
 DIST libva-2.10.0.tar.bz2 484741 BLAKE2B 9c3912d5337d3624af9ffc537a972479385285413712948159641d10b60a39b60754b3bc6467a0508a878df29be23c0e2bace488bdf9047f3e162ca0b573fa5f SHA512 9225120f17e0d935927cb0046c3a6086c776beac71a8ef7fd800d2c6a721d0e28a13be89221c5ef3cca1634317aaa2a513554ccf25a54f25b2a339603c4a11a1
+DIST libva-2.11.0.tar.gz 252204 BLAKE2B b56c47296493a9ecce7758661386d98d9a47082d8f16ab3b352f84591291e85aefc336a209433a901f7c4be1f54570221e9955666b22125740cc060542099394 SHA512 592df16bca06c93d252d27b2105032f020b0ca30f7937533918a497f385ec59b8a1e19c5d89047c197ddc1aab056128ab114b9ec29de3e968cb96bfa8d85f02a
 DIST libva-2.5.0.tar.bz2 459677 BLAKE2B d6e5bf94bcbda0a724634164bd8cf91efbdbe36120e62e7e7eefcd749afffec1950d8904318b472c81ae07490c559c68b0853725c654a08592457118cd5d6a83 SHA512 ffaeb9cf8ed1f93073c1cb3e58f5b3d3612e81622d02f8e428c089f625d4370b496b7681ac2fc2823c48670c9fd3da50893b1db51de768cf0f5d866e2ee78106
 DIST libva-2.6.1.tar.bz2 466497 BLAKE2B d4ea6e6d0102722206d94725932f0b3cf650bab3f02235f4c627dc83e5417b786f9524430d793f1067d002a0c9d7cbc92a7c740383c698d225a14946e1bb90ba SHA512 b57f0c0dda5ebadc92f56bc7fb835c2931cafffca9413fb4d244ea1dd47b603376323e6bebf144ccb2d2cf3499c64b101f8e03ff1809bd81242718d224d2d17d
 DIST libva-2.7.1.tar.bz2 477933 BLAKE2B 261e608af3f1427bed0244d4ebbc0d3ffe5681669ecb3583a8910568bc96817b8da079ffe80915ecf1002f9ac247eea5e44f8f7ce305313719fc1a4f1c5892b3 SHA512 f4b88ca0216f0ea4d934edcd322b8f741833b5a50ee2f34a3ecf60d635082b29e2dd032734c2f9d2a680e3b9c98e61a8b9432ea639a9fd5389761e04782c1126
 DIST libva-2.8.0.tar.bz2 478734 BLAKE2B b11393a9b9ec7ef4cf91d20d4005d42ad3d0e6a4a8e4d8cda67816bc5b9d3b23900754b5e8af92386dcf99a11e53af70fc4723ffecc715328c8fbf3d40486098 SHA512 329c5fc2262a6f4fddfcb13bd9644589248be6ae18fa1481cccc6b33874b91b60ad3f16a1777712f7a4817ba576db984834aa8735e6ad13d99b2f5aa13e9ddfa
 DIST libva-2.9.0.tar.bz2 481556 BLAKE2B 5509f3d7df11a11602331a3b6bb78d3a5d3dfbeff024eaa77594918c49cd48ec9e8ee017d8ac7b4aa1dbd3252a23caecce9a10a8a9e12ef4c483a8a34e028b20 SHA512 496358b73cd525d8c9dc1fcf3dbf992ec997ecc8f7be31f0e226ded173aecf29d8d4b60cc7cc5ee7beac538061659841145f67f449a03a04236a6ee7ae6f8323
 DIST libva-2.9.1.tar.gz 240934 BLAKE2B 76333a9ce78783c3d94798a19ea6a52d95768ca7e5a547094290313d4f5c610841787d4420d19e0553174933beaf5fbf68e7e849ad38682173f670de0d9a76e5 SHA512 79fd0b41795ac5de68bdd6470389fad6caf016fa4a44f2cd775c0a65d6d8f270a7e237d3b2e42a90376c103d2d2e2c010fe47835c7a15d79b94beaced02a2884
-EBUILD libva-2.10.0.ebuild 2285 BLAKE2B 14dd4a36d2384559e91e4c8a3330a73dbbc496a707db3336c2088064902ba0d6c77d332f1cffa0781ac4b02aafef627d6a9ff3e22d1b32e3836b0c90e3db753a SHA512 8dba4d622de7dc5bfc2c89f2c0defd97ff54778fa0710f77ff6acfbb1339ed3b621967895f64bb76646de6ed7cf8f0f573b71be874cf05106b7f93bd687336cf
+EBUILD libva-2.10.0.ebuild 2284 BLAKE2B 527bfb9b0531349f839a15a4f5e94a06642f009e897637d5203c801a86a19aa36b970c83694d3db43e1f8a1191dd238175d3e98725107fac4512c170daaf2938 SHA512 32f609b3de8f81238b31bc278082d48094df19349f6f3825bc1fd004d4b5542b5f55f92395848abe4eb45e938126d292eb0cd86170e43b1b13f0ba054fa03b08
+EBUILD libva-2.11.0.ebuild 2481 BLAKE2B d0744d77fbba87fb1ce8f470ece7ddd1d07c5a1dbbd3e5619759de9be0d62a93a4c9fef4e669649b3a23a1c21a8d4153798b72ce0a101d24f010902827a658de SHA512 e2534cc6d1c0635f3f71d8be64dfc610670690d8d077b73713b0dd2cf1e41c7a6c562a3b5f07f8a9622161f983434e155d66a05b00b9c851131a429a137ceb80
 EBUILD libva-2.5.0-r1.ebuild 2186 BLAKE2B 7c9a9dc3f979909e02812398551197938bce437f0092940361853613fff9813e2d06af44f4e09130cb27ac4313722eba8b869ec0a8681532f07c6449ee4c0078 SHA512 2d8f8705c68d3a1bda268a18e8e65dc3e8d8f0d73fdcea6f6e8e5908028598f1a0e3865818ef37643bc6843af9dcb3f4fa9a167d021dbf67772937af2df721ed
 EBUILD libva-2.6.1.ebuild 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3ce8755f0a8c62382eec24a97de2ed5286250884b117e6ecf2fb356835f0397f73773b865f21e9de1d2bb098e SHA512 57f80b7e4047c098437ffbff25883716bd46452f5b3162f14804dd732e01a1ca497a50dc4f3fb53cb04442c31129ca880559d2680e9d0bc35e1eb9cba695ebd1
 EBUILD libva-2.7.1.ebuild 2193 BLAKE2B 331542be784f71417c51fda406846e3613976a5639492e3715f02dbcd1ffb2e1236700c164cc519fec7b14112c5aa150905a2b680d5810a9211897a4ed854a43 SHA512 bb0aa7dfac518d3b1c60fa99315de482840d8b5840652576977d10065f41cab3df44db4e78a33c65ac932e4a3e4317896abcb2ccbaefcaaab31feccc6978c57b
 EBUILD libva-2.8.0.ebuild 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3ce8755f0a8c62382eec24a97de2ed5286250884b117e6ecf2fb356835f0397f73773b865f21e9de1d2bb098e SHA512 57f80b7e4047c098437ffbff25883716bd46452f5b3162f14804dd732e01a1ca497a50dc4f3fb53cb04442c31129ca880559d2680e9d0bc35e1eb9cba695ebd1
 EBUILD libva-2.9.0.ebuild 2203 BLAKE2B f17547730d5133eea144d8e6a582dc180284650cb47b1e76926644f9c95bba1d5b48caf21df4172f6d288157c056ed9a7b1a9ea1204279894d1b95f63666f891 SHA512 5e7a024dd37094c8c9726c5907a9feffbbb74a81693ba475b892d9377c0f52b9d58f78aa16b6781fa49b96529aa84473145f395ce975f77e047f8365416836ce
 EBUILD libva-2.9.1.ebuild 2536 BLAKE2B c454fcb746f256f118e638307e8e3214f6a9120b2843e1583b0f2ac46acf2c7a51bed11d2b047408bcc056e124837a385abb53b1ffc1a2c0b9d3782e271ff822 SHA512 9d6df49bb14d1cdf943cdf62a0a86a01f5a803099b4675f60327d92d5786f37d2fb643ea75e060daea44f12c5e38426d425955cbdb45afb2ead0f9d2f4fb29e3
-EBUILD libva-9999.ebuild 2547 BLAKE2B a5ad3a164861a344fa5ac0c2bfb0da1a2701b2e72e90366346f3ad2f12f3bad62d00354f66fc8e26ca792d2685969c778073eb426001ac8bfdc8fe01eb0641d9 SHA512 8eddaef78665a1e99f57e53bebaf538e11879b8d1d320d7dfabdc923fbc4a4d3dc81fa5a9d853b1137b5212c9f77889f8f875f242f95076799bc918d5a31d3d0
+EBUILD libva-9999.ebuild 2481 BLAKE2B 672e4ad86da4ec758657bf33ff7f3e59c3978defb6ec804c7b85271dca0578bd3a9d6b6c8d337c5aaa7343a5d4601acc63c85bd00907bc1718067ca04ef22100 SHA512 360f7690abd3b5ec87f9d7e5ca490c774f14d79abd3065615d5aaa598b519fef8d7ccfc478a494caad96f97370136169d35e8b147e6e169c1dc40bd518405c6f
 MISC metadata.xml 469 BLAKE2B bb59d0877431717ea6a387c793e39c1d810204f04619b92a9496f8d6e0f42f4455a54aae850da47b25cd133f97a9444043b64e46f539279325b806092c503d04 SHA512 e7ea387d560ce5b8e1b51d26e14b6ff8173e726124fb6d4e437ba3108f8d8f4c587730d9581e7a5ad8c844da9a9243cedbcc1ad554c724b4b78c3c7d2b70d95e
diff --git a/x11-libs/libva/libva-2.10.0.ebuild b/x11-libs/libva/libva-2.10.0.ebuild
index c8117c47fabd..e5936f8fb8a7 100644
--- a/x11-libs/libva/libva-2.10.0.ebuild
+++ b/x11-libs/libva/libva-2.10.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/intel/libva"
 else
 	SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/x11-libs/libva/libva-2.11.0.ebuild b/x11-libs/libva/libva-2.11.0.ebuild
new file mode 100644
index 000000000000..953e353bda47
--- /dev/null
+++ b/x11-libs/libva/libva-2.11.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+
+if [[ ${PV} = *9999 ]] ; then
+	inherit git-r3
+	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"
+fi
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1)"
+IUSE="+drm opengl utils vdpau wayland X"
+
+VIDEO_CARDS="nvidia intel i965 nouveau"
+for x in ${VIDEO_CARDS}; do
+	IUSE+=" video_cards_${x}"
+done
+
+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? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+	video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+	video_cards_intel? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
+	video_cards_i965? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
+	utils? ( media-video/libva-utils )
+"
+
+REQUIRED_USE="|| ( drm wayland X )
+	opengl? ( X )"
+
+DOCS=( NEWS )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/va/va_backend_glx.h
+	/usr/include/va/va_x11.h
+	/usr/include/va/va_dri2.h
+	/usr/include/va/va_dricommon.h
+	/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
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/x11-libs/libva/libva-9999.ebuild b/x11-libs/libva/libva-9999.ebuild
index 812111b4ebad..045f07425bd6 100644
--- a/x11-libs/libva/libva-9999.ebuild
+++ b/x11-libs/libva/libva-9999.ebuild
@@ -3,23 +3,21 @@
 
 EAPI=7
 
-inherit multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="Video Acceleration (VA) API for Linux"
 HOMEPAGE="https://01.org/linuxmedia/vaapi"
 
-inherit autotools
-
 if [[ ${PV} = *9999 ]] ; then
 	inherit git-r3
 	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"
+	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
 
@@ -33,9 +31,12 @@ for x in ${VIDEO_CARDS}; do
 done
 
 RDEPEND="
-	>=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+	>=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}]
 	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
+		dev-util/wayland-scanner[${MULTILIB_USEDEP}]
+	)
 	X? (
 		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
@@ -57,8 +58,7 @@ PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB
 REQUIRED_USE="|| ( drm wayland X )
 	opengl? ( X )"
 
-# CONTRIBUTING.md and README.md are avaialbe only in .tar.gz tarballs and in git
-DOCS=( NEWS CONTRIBUTING.md README.md )
+DOCS=( NEWS )
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/va/va_backend_glx.h
diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index de3233fb1a14..0e58491f8ff1 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -1,6 +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
-EBUILD libwnck-2.31.0-r1.ebuild 1216 BLAKE2B db9fba5c6f3eb5538aff34d97a1f673282683aa448dd88235d7efd33dfbf5cd9bc540ef43686fe6950b32838cb60114bcaad6d23820d9301d9dc53799d011608 SHA512 cc21b1e6ecb2da2f39db746d74fc00bd6757719e6838feadb3dbc28867e72473f49d6fec7d1f42601200911ae8234e1fe55f7bf0b95134c0e3409c558bacffdd
-EBUILD libwnck-2.31.0.ebuild 1242 BLAKE2B 4b13be2134e6b35b103afd00e3cca1acdacad4e9fe3f6b75a2e8cc89a81cf4b037367f43fe83689fa57f10a3a499173e74c68ab8bb3896a33b0ed1ec9445404b SHA512 eb2f6a1578a5352318edafc8a78c7317d1b9dbbdab6b0d337d3060e6964e199bbad76e57f144f6528815fd232a0f321395c08dd008c86d99ebf1c2568255ece9
+EBUILD libwnck-2.31.0-r1.ebuild 1209 BLAKE2B 5bf316bc3ab03afbc54fbcf4095804721f86b24c81be44e416d5e1107d65954b9142a739e8d46ff07a27657b174b078a364e52640cec50a8676cdb7916f34888 SHA512 adcd8a2024f44730082de7a27bea6fdea598f3ba5495fe18f86df09e23d21218cf9fa4403a4ad665d0ca218e2aa5d1187643bb68cc57187e9825a9f558cd4eba
 EBUILD libwnck-3.36.0.ebuild 1416 BLAKE2B 6ad29b8a650baedfda842e20f6ad28cc45f147d80c606f1c6b26d01a428a9dc62371d170cfa144e4e0aba1c9b519658f2eefe9dd6ef94de5781ca07eebe7ac21 SHA512 5ab1e243442bb061ed4dcbc72706ec8683247b8fb29e5ec3740173c80b235bcfb725654eabfcaf3630c1356960406e603aebb1434a7c282b36af0e4e0f9d42ee
 MISC metadata.xml 364 BLAKE2B c8583191e40b2bf98262fbd4401a0ac47e53ec64294178a919499695b014f3ae8ee623de803cfffde58b4d63eda4572035703c5f1d550f14f4dcc974e9035c65 SHA512 47cae64c0f13376c312169703c6213582e37ccc70f00599754d7fa3daf0511e5da4221cd659e9ad98fe90d7791b0d513db45d2d0b7f1d833ef125f64ba40f2ce
diff --git a/x11-libs/libwnck/libwnck-2.31.0-r1.ebuild b/x11-libs/libwnck/libwnck-2.31.0-r1.ebuild
index 392f0d732dea..2ed5aa52ec25 100644
--- a/x11-libs/libwnck/libwnck-2.31.0-r1.ebuild
+++ b/x11-libs/libwnck/libwnck-2.31.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="LGPL-2+"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 
 IUSE="+introspection startup-notification"
 
diff --git a/x11-libs/libwnck/libwnck-2.31.0.ebuild b/x11-libs/libwnck/libwnck-2.31.0.ebuild
deleted file mode 100644
index ab2c6fe9871b..000000000000
--- a/x11-libs/libwnck/libwnck-2.31.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="no"
-
-inherit flag-o-matic gnome2
-
-DESCRIPTION="A window navigation construction kit"
-HOMEPAGE="https://www.gnome.org/"
-
-LICENSE="LGPL-2+"
-SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
-
-IUSE="+introspection startup-notification"
-
-RDEPEND="
-	>=x11-libs/gtk+-2.19.7:2[introspection?]
-	>=dev-libs/glib-2.16:2
-	x11-libs/libX11
-	x11-libs/libXres
-	x11-libs/libXext
-	introspection? ( >=dev-libs/gobject-introspection-0.6.14:= )
-	startup-notification? ( >=x11-libs/startup-notification-0.4 )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# eautoreconf needs
-#	gnome-base/gnome-common
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-	# Regenerate pregenerated marshalers for <glib-2.31 compatibility
-	rm -v libwnck/wnck-marshal.{c,h} || die "rm failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_enable startup-notification)
-}
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 85ed2869e571..26a02abfa44f 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,4 +1,4 @@
 AUX libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch 5795 BLAKE2B 0a864b0fbd998fdc6c151b9f9cdb2a31797ac693b4ffa164a6f9a3c0fc1c5430454ec97be4c52ed48489cb08e820a998086fc588cdd2348b16da122bd483b8bc SHA512 e5148c7c310ca395b7e0f3b76ef98d79e50d0ac58935ad6df3c71bfd426166ce736ccfff4970e9523a2418820cd7cb2cba6e8818f23dd5cc21dac69accc1c3f9
 DIST libxcb-1.14.tar.xz 439404 BLAKE2B 63605e02dd32b4d26b3ac6d3b93b7383dbc30701b9a063e8efa5b387215c9325196451f80c7b0b357df1773c6fd1224eea8eeca2a456055a2cdc61082c726111 SHA512 b90a23204b0d2c29d8b115577edb01df0465e02d6a8876550fecd62375d24a5d5f872ddd5946772ddba077cadce75b12c7a6d218469dc30b5b92bc82188e8bc6
-EBUILD libxcb-1.14.ebuild 1428 BLAKE2B 46fa195c054deed81d71e8826d95eecb73f07951732e34088b3174722a3fc56dc32e95d35ebc035eaa879465da1ad96f64324f3e7d89b9185884a7e350e6a41c SHA512 6e0c05f8b5132705d87e30f6918e35f740f08f1cb11040c37b5a74d102cf6efeb7f56e011cc96fdcd1d2ef2fcf3c041bd76865dc4e46c17a6d30996ce49c5ff3
+EBUILD libxcb-1.14.ebuild 1429 BLAKE2B 7975bd295f195a7d313687d8287d179e5fa97337ce040e92539d38617884de9869ff4712216b7ec332a3b7622ebfebe18b93c8d4fdc8b33ffcc6d4489d6f71eb SHA512 fd6dc959413c4ad3772825b775ec3061cd44249a0bf8a59f738f1c4b7bd0a54bc7711e2300bf5c4cc8e98a45f87d5f5a1ed98745688cde7349f334139989745e
 MISC metadata.xml 400 BLAKE2B e4de0bffe9b79f7c4a715ade0014f14d85ae7389a3fa523572b4abed6ed6849250902ea479e9aa90745f104c9020d671742d0aec8bffa539e20f0bd7b48f2e64 SHA512 f9688e8ee148768a072e6da7f72985a7a3971a445117bbfa8448f2337ce1b601296501eda1da531c6bcb50a0d3106376e8cda0b98ef10219882c2f66fe02f40f
diff --git a/x11-libs/libxcb/libxcb-1.14.ebuild b/x11-libs/libxcb/libxcb-1.14.ebuild
index d9dd40baa8ea..c1b19d34ac13 100644
--- a/x11-libs/libxcb/libxcb-1.14.ebuild
+++ b/x11-libs/libxcb/libxcb-1.14.ebuild
@@ -15,7 +15,7 @@ inherit python-any-r1 xorg-3
 DESCRIPTION="X C-language Bindings library"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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"
 IUSE="doc selinux test +xkb"
 RESTRICT="!test? ( test )"
 SLOT="0/1.12"
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index 4766cb7caeef..50bf1a945936 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,5 +1,7 @@
 DIST libxkbcommon-1.0.3.tar.xz 432944 BLAKE2B 49dcefcc17cbbfe5623728e9852e700a623e07ad7e6df78c8d7c39784948eb230f9e141d8aaa1de94305cb552244fe54d384abbc8e57f5ec5846915b5ae484e3 SHA512 b05a2db0acd6628427baad1967979a161019dec90a078a926d41f4dfeffb84eab63e627803df1a401e42c8e48953d6c434ce08d7206eae21e890890f29b03d3c
 DIST libxkbcommon-1.1.0.tar.xz 439488 BLAKE2B ddccb9942af5f5d80b750bf8f02289e073615c99bed2a8f7ff1d03ca70bffdbe3b1fe15daef2346819887efe10a308d00f671fc2ae50e0fe33e76e4b748f6d01 SHA512 6137329653ada711abc0e093532627111ab1fb53e6b2b0d05ec4d77709cfc4368f094ebbf68b23c8e9af9a69826351b64466e81c11e6593eafa7e43cd3e7bf75
+DIST libxkbcommon-1.2.1.tar.xz 453172 BLAKE2B f8846befae348287032601f589607a9c899826135b325245824650d77435050fe7e300514cc9f16bd0f3c37693c9f8f08d78aa738c160676019338d72addcd80 SHA512 28de91166a289586a78068b725b904da46fca144936ea0677ec9234c7f0499b9ae321d79c57f15782b63c6e7a37b074fe44648673a2294bbde13110195567e3b
 EBUILD libxkbcommon-1.0.3.ebuild 1432 BLAKE2B 5514381f7eb6cc03053fb2544516395fc6c67a59d7e1c6fe7348167c6ebc719428aa28e6e5b37181fdb49cdf4f36167df8847f41ddc484f2c76a9f44eb0ffbd8 SHA512 44dd4acfa62d35cf1a0a8f0cf39c56872c4c589ef6a0c67d7b4e7bc09e0c77241f6cd8bf68632c864993feddc3fa72d5be7096992316956f115609795a3f8eca
 EBUILD libxkbcommon-1.1.0.ebuild 1484 BLAKE2B 1f2dc69b9799e90f1c0e10e1aea913badb6f9ed56eac8b1b2607992c89b8286d222344a6d96b4904523bf1325e1747c274ef5ae9edebb237ecca54eb29de68dd SHA512 50619d539aed08f4f3fa84b573814d3b51f79ed07b8cde27a85b31c00e5c738107d2bea6d2b1d5d53bfacadd090e3d69c78304dc78de07663e2a6bfb746d25d4
+EBUILD libxkbcommon-1.2.1.ebuild 1439 BLAKE2B 0e39989ff26c13f2c25501cde2b99df369ab325d9ee5a9a06a284f327d932f1f625d5cc9fed3662e5bb493a08579e3f36ca6f161728dd663f7c95dca510f921c SHA512 6eae5aafbbb1e12b193929ed6170647b1682ffd88e27a3d596c391db31b46f1a13e2a530c9580a4e227b3ba43122e18035d7fb5a7b5c0e94fcf9a0454516f3b4
 MISC metadata.xml 325 BLAKE2B db764fac0ca1f4359bcd129dc165f78592535dee40bc25b6f2d7c662bdce43e01cc66b362765607665a75fc5b1703de204cf90eecae4f8d285cfaefcebc614b8 SHA512 ca2a116a574783f7b3c6191759c902e2cb059ec135456cef989b81be07fecc48f9ff56e02845d18c2376c99be3dd9711f39ad91394e421fa36d8fd6453c0a121
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.2.1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.2.1.ebuild
new file mode 100644
index 000000000000..c34ea6d0be18
--- /dev/null
+++ b/x11-libs/libxkbcommon/libxkbcommon-1.2.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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_{7..9} )
+
+inherit meson multilib-minimal ${GIT_ECLASS} python-any-r1
+
+DESCRIPTION="keymap handling library for toolkits and window systems"
+HOMEPAGE="https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/"
+LICENSE="MIT"
+IUSE="X doc static-libs test"
+RESTRICT="!test? ( test )"
+SLOT="0"
+
+BDEPEND="
+	sys-devel/bison
+	doc? ( app-doc/doxygen )
+	test? ( ${PYTHON_DEPS} )
+"
+RDEPEND="
+	X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP},xkb] )
+	dev-libs/libxml2[${MULTILIB_USEDEP}]
+	x11-misc/compose-tables
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+
+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"
+		-Denable-wayland=false # Demo applications
+		$(meson_use X enable-x11)
+		$(meson_use doc enable-docs)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/x11-libs/libxkbfile/Manifest b/x11-libs/libxkbfile/Manifest
index 0d78e9720819..1a72bbd5d344 100644
--- a/x11-libs/libxkbfile/Manifest
+++ b/x11-libs/libxkbfile/Manifest
@@ -1,3 +1,3 @@
 DIST libxkbfile-1.1.0.tar.bz2 364678 BLAKE2B 577da1c43e6ce681630676f3f52f40b1f31d01862a891d4c1bd853056d90b03d9993299714c5e63a903b243165a1e299e1e014cd94614eacb50aeef363be8990 SHA512 1c6a57564e916ccdc3df3c49b9f3589f701df0cec55112c12ddc35ac3ed556608c28fe98e5ba0ac1962e9a65ed1e90eb7e6169b564951bf55a7cf3499b745826
-EBUILD libxkbfile-1.1.0.ebuild 478 BLAKE2B a8edcadb39afca5bab7284649104ab384feff3fe49adec018ac27a95421aa9aabcc5c6b7563e408443157b9d29a8091edeb59f52def1527707e6239439721f6f SHA512 de505dd4233c605c49c705df5adb761b7d13f365c1a2ad0098c428add4f305cd2ad0ff739687bb252b211baae8f8419209749048a5c31b46d1dd790dedf9de2d
+EBUILD libxkbfile-1.1.0.ebuild 479 BLAKE2B 8877752b801bcd37c1f5534b3e19b15057ff7d18ff2fedb463740ab835930015f912d0213f847d033d3b71a2628540103fce8ff317f2b017ef56fafa5352a08a SHA512 42dfb0a72f10b1764c424ec147f3c512dff5f173ad75c3d2ca1ed4e66a54b41494e7b6f4493668422d2c0754ba74e448e168dd1d3255725f08a3150df2761e9e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild b/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
index d158ab4c9074..15403f69d2f9 100644
--- a/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
+++ b/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xkbfile library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libxshmfence/Manifest b/x11-libs/libxshmfence/Manifest
index 6dff695d45db..a336b1f40ea4 100644
--- a/x11-libs/libxshmfence/Manifest
+++ b/x11-libs/libxshmfence/Manifest
@@ -1,3 +1,3 @@
 DIST libxshmfence-1.3.tar.bz2 308644 BLAKE2B 6e1e75fbe9d113cb258eb8f6a5106ea565f6749efd79bd3aa21222514063aadf8499d82d2a14bfcd0a69f7d4c4dce49a5efeb38d54d2019eb0c93345f0ba8a37 SHA512 c446e055f8fac62b9aa266132289a4cfc030282147974c45ce96d1768a98d1afb997470e58e4a68513174c404cbf373bdde2f0cd4b34abdbce1d89dd0b6fe2b7
-EBUILD libxshmfence-1.3-r2.ebuild 376 BLAKE2B 865c7510f1481e1883276e6eefb1437edd6c95652436fb6e87b2c8e3bf00fcfbe0a66af531f13a4490ea50d776db9b2d29b1597bd1db0e0812bfa44ec83047ee SHA512 3e9b31d929f8156cfdb123d50442046fc998498293f1c155cb39fdf266e4abb6bfeb4bd2a4052c83c02d19a9345ab71867783091e1b21bb7f445164ea7c69f51
+EBUILD libxshmfence-1.3-r2.ebuild 377 BLAKE2B 93dc1a5bb7a15dc8b8e02117ff18b9a0b61b424cb3e66923613ed62213bd807d2b111ad0e91ddf87569a781a3232d85d611e016c31d225c7c57d40501fec1001 SHA512 d645d0cc52e8b8a475bc831d51715a02a20df9fc0740b3a38337b2cdb5e2c1808502b37cfe19e2aea72d8153feae839e0dfaeb9426a942a3f86501853775ad81
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild
index 155e3e84881e..0ee4dd83fe9b 100644
--- a/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild
+++ b/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,6 +8,6 @@ inherit xorg-3
 
 DESCRIPTION="Shared memory fences using futexes"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/mx/Manifest b/x11-libs/mx/Manifest
index 835a40af4614..a23053068dce 100644
--- a/x11-libs/mx/Manifest
+++ b/x11-libs/mx/Manifest
@@ -1,4 +1,4 @@
 AUX mx-1.4.7-gl-types.patch 1730 BLAKE2B ecc907923c89bad0a52a311cfff92bcce8487e55170cce4cfb4bedc5e8b8af2385c1b32df80950050289c848e608f1d10f3bfe186d55ed3c8ca1f6e90efb1cab SHA512 bbb2e8fc95b054b23982ff031f6298b2a9addebec557ab234ef88ef6fe67ac4cc1bd35545c73aee162e59113b0c49f8337e5f98efcb997d22a6f4b2410fdbbfe
 DIST mx-1.4.7.tar.xz 939672 BLAKE2B 3f55018c6d282af95b80852748a6baa7a56ea1ea69e1b3740b6d936633818f3b18124f1bec2d5bc51596df75a5633d355362d1d22549c5a7e490e053fcca2bae SHA512 6870898548c947d43947ea6ded7c06d01d18aa721c81927fabf3ee0cfe20f65739e927d32277acce5c2e13968502828e29e043f9a8cf31af8f2bc20ec1ad0349
-EBUILD mx-1.4.7-r2.ebuild 1394 BLAKE2B eb31ecd25c69ddb0eb1123fb92284e040a17ffc639f97bff157006570404cfa81efa2c606ec11a00d2f76772ec70dbab1ddaa41106c1706151f560186c3a09e5 SHA512 93a89da21d6b95307a488cdeda86d1e361ad0b1849604f79a0313a301a531b3f3133067af9e9a4ff68d2f7bb75d9a1c91bcae58f05acc00d16415a194e44b54e
+EBUILD mx-1.4.7-r2.ebuild 1394 BLAKE2B 4f2ffae7e71105df495cab2201f843347c7fec8782183f57641a3bd4266a88e1c37284324721e899e64ed452754246719efb800b891767ac32b3692c3a908dda SHA512 b54cfee8d65663903667581513d5701cfde811cb67354322824fc848cea19d1a23b7e7a5db2dcc5d4b9803b5943e1458c31742afbf04d342766e1168ef12636e
 MISC metadata.xml 336 BLAKE2B fa952ba6aa8ff9649c6da50285fdeb59e1d1181c5e80ceb63849df9e674a009bdfd8f7ea5aa2bd711cdd6355e5c4adf331534c39663fe4a988689a38ee3ee1f0 SHA512 aeac1b46fd9bba7bfc87813dceffe14128763f931816e7b9e320c9e75631d383a097e499e73f0b50d3e6a6e375605fa30b147b1e8f2f8db972aa8a707e593249
diff --git a/x11-libs/mx/mx-1.4.7-r2.ebuild b/x11-libs/mx/mx-1.4.7-r2.ebuild
index ec626e9d6266..5a85ae7c71a7 100644
--- a/x11-libs/mx/mx-1.4.7-r2.ebuild
+++ b/x11-libs/mx/mx-1.4.7-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 GCONF_DEBUG="yes"
 
-inherit gnome2 eutils
+inherit gnome2 epatch
 
 DESCRIPTION="A widget toolkit using Clutter"
 HOMEPAGE="http://clutter-project.org/"
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 7855ad38665f..d8f990ecfa21 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -5,7 +5,9 @@ DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B ec3f1a6a4de30e0864e7f0bf0950cb7a7
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
 DIST pango-1.44.7.tar.xz 521384 BLAKE2B 9917efc1bcc9115331149d77eb9b15373d4331ed6a8e5542a97fbbbb480eb0557736d4f1817c0fd56262f442e4b3c2c68607baacdd38b1684def1af58a583bfb SHA512 6e0a3d5cd32c209fd71a2ce5f705a60db318c2133bcca07360a047a73892f642a1661c1f0fb90353fc43e75336dfc22909bf4969f1bd03324c9689344af08350
 DIST pango-1.48.3.tar.xz 565956 BLAKE2B 6860ae9df2b8629bdd1c5acf03453e1c6d62d8fd100752a6d5762ab1e0f2b3cbefb55e0f3476e53209d07541e7f8dffc680507378e94ab39b49601582a35e9a7 SHA512 769ceec71c5d64c08b91a0d78c5e39f6599fa199ae3f9d6dc4b94e5898a41e7f4b3d3f9c16a92f03d0e558778a4ef5bbe2967eefef17173211d53ffdb3d72041
-EBUILD pango-1.42.4-r2.ebuild 2309 BLAKE2B 56d92f7aa377aa8ea5d65613d1505f90161d48d5684a563a0f00ca1176eb288d7b550954b2c1a7414d3db585896a0b78d0444d4cebad8911f14400f8f5bf0a64 SHA512 d142a4d97648eb34bdf84531bf533182f88fb2d4a70e48556353db8ad13657a2d22afdd6a1a5f66bc5573938b9e4edae4282dee1808c3da9af41b0338c9b93f3
+DIST pango-1.48.4.tar.xz 1791332 BLAKE2B 281e1ba5b52b99c61bcd90dcefb3de64e45a6de0eec5a375e209cb4316562a03e81dea73e6fb8921a631ef854dca8b035e06b3cec7ff73bf8f0033151d2cd20b SHA512 ce754c5e915ed18ba0f0ec89d74a1094e5b235821514b247d16afba7b74ecf1d850ad2b7b7d0a43da83da126c74be1b2e4c4400dbcd447e388e75e6b3c8b4dbe
+EBUILD pango-1.42.4-r2.ebuild 2310 BLAKE2B 6068b613ba19c35420774bfff3ff2f292d67430ca167246e8b7c4132f34f5165ad2e4f24df5080ce7c8f677f45d5e48ba555e04eefcb8c751243ed2354d2bf6a SHA512 5c05c5db53a1127119981966f9f144e95fa04c07dccde5df9341a24aef0479a6cddf3b0e7bae0f339f32737618efbd89f367d6f512ed0a01715008226ecc640a
 EBUILD pango-1.44.7.ebuild 2095 BLAKE2B 9a07720373325ae342c1a11216270f79783cec72cffc5198a38af6877019688466bd6505692dab3c2e509c6bbed815ce0b7897c94c7263dab692d070dfec7758 SHA512 6194aaebf76ef26476ba68bd0ee5fee76e08efd5104c4c67cd4d6b6f766bb97391ec10e14b90a9dc18d4051b87299c5514dfd3bad733aeb9061e72060942aeec
 EBUILD pango-1.48.3.ebuild 2188 BLAKE2B f6dcf1c9543a28a04e6b08ef648d3706ea2777d41d4757fb80b4a434a30003d326cef89c20e6e8de3833fc1fd4c6a88f3765c3c1a54682f01d9dce4a93b88579 SHA512 9f2d1df16f2cbacd7d09ec66d435b794d6e5d5c11d5d3a8b7040d6614e29f62916b6f93448aefaaf4a90566298e3a4cbe839e3903249e0ed40318e290a2f9ee0
+EBUILD pango-1.48.4.ebuild 2188 BLAKE2B f6dcf1c9543a28a04e6b08ef648d3706ea2777d41d4757fb80b4a434a30003d326cef89c20e6e8de3833fc1fd4c6a88f3765c3c1a54682f01d9dce4a93b88579 SHA512 9f2d1df16f2cbacd7d09ec66d435b794d6e5d5c11d5d3a8b7040d6614e29f62916b6f93448aefaaf4a90566298e3a4cbe839e3903249e0ed40318e290a2f9ee0
 MISC metadata.xml 522 BLAKE2B 9e37b7287a6d6567d68daea4265ae5d13d3c336682408bdeb4f7ef92b9cd9907c4f69052fb52b59a8cd55eb40d04c660fedde562ac2a85e41844189810ed4fb8 SHA512 6af19288fc9a7e9f441f64df4e74f32ade7303df52e1c285275e41f34f0d7664b22167793c08e79e6667fe27f44afe5c1b8548d68f5878d63a432e293956fd82
diff --git a/x11-libs/pango/pango-1.42.4-r2.ebuild b/x11-libs/pango/pango-1.42.4-r2.ebuild
index 4bf698cf7c90..abe3639b94ad 100644
--- a/x11-libs/pango/pango-1.42.4-r2.ebuild
+++ b/x11-libs/pango/pango-1.42.4-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="LGPL-2+ FTL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X +introspection test"
 RESTRICT="!test? ( test )"
diff --git a/x11-libs/pango/pango-1.48.4.ebuild b/x11-libs/pango/pango-1.48.4.ebuild
new file mode 100644
index 000000000000..e35db085707d
--- /dev/null
+++ b/x11-libs/pango/pango-1.48.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson multilib-minimal toolchain-funcs xdg
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="https://www.pango.org/"
+SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz"
+
+LICENSE="LGPL-2+ FTL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# X USE flag is simply a stub until all revdeps have been adjusted to use X(+)
+IUSE="gtk-doc +introspection sysprof test +X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-2.0:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.10:=[X,${MULTILIB_USEDEP}]
+	>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+	x11-libs/libXrender[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	sysprof? ( dev-util/sysprof-capture:4[${MULTILIB_USEDEP}] )
+"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.20
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+	)
+"
+
+src_prepare() {
+	xdg_src_prepare
+	gnome2_environment_reset
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature sysprof)
+		-Dcairo=enabled
+		-Dfontconfig=enabled
+		-Dfreetype=enabled
+		-Dgtk_doc="$(multilib_native_usex gtk-doc true false)"
+		-Dintrospection="$(multilib_native_usex introspection enabled disabled)"
+		-Dinstall-tests=false
+		-Dlibthai=disabled
+		-Dxft=enabled
+	)
+	meson_src_configure
+}
+
+muiltilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index dd0f822df568..2f0c00d1efa2 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,4 +1,4 @@
 DIST pixman-0.40.0.tar.xz 634752 BLAKE2B 29b71f5eb6c3df0318c7a6153c6abbce29748b0b578697916414a869a029635fe5e0bab06b8f701a764c95e475c115ed12eb4f93c751d234b5868f4c4196d7db SHA512 8a60edb113d68791b41bd90b761ff7b3934260cb3dada3234c9351416f61394e4157353bc4d61b8f6c2c619de470f6feefffb4935bfcf79d291ece6285de7270
-EBUILD pixman-0.40.0.ebuild 1800 BLAKE2B 1729bba51105ae43cbddc0e55b7effaa2044cce77daa35f8deb7a552986ecbbd069c2872eb57dec9bf3a626d84424cd7aed20ab5542165cd8b777a036c7714e6 SHA512 71601f7d84303acc7896746440ee8baf4f5e088f4376369693c862dc754653afb8f92ca9c3f09c6ce2ce4c232e3b168d5892677670bb5330785a9fadf21efd11
+EBUILD pixman-0.40.0.ebuild 1801 BLAKE2B 4bc57aa82f61824eca7b8b4131461c7252411d5453c0923df1020dd2b4529725343c3d4568fc7f0d4fe30134230b0c73eb29e54bd9a3657d268c656fa8948c9c SHA512 e562a10444b1ace4a4690d497d29e186fd436dad42a428753ff8cca26112d20911faf5e3e69df3bd26d67706cde6e6e97b47400d4369f488f5a49f9099f69387
 EBUILD pixman-9999.ebuild 1802 BLAKE2B b45fa739a8bd44494c80c4efd3e7de7fcf625269913757a9992e659d95cd7178a3a7e26648b221df2bd24ebf21ccd6ca94196ef8949bda2152b90eb5968f8617 SHA512 42a1d3b48f1dca95b2f9fb1069bfa5f302dd8b22fc32a3960e34e12c0eb2dce25496e27f79f91c9bb4a97484c0f96ad05740a7e7ee6b8a4bb790f9108e519bfe
 MISC metadata.xml 391 BLAKE2B 201ddfb7a766c48fb4e5b48d67564de3b6ef85847a8369cd56acdce186716872be35ddd8501604fce1d30502eb5ea4c328c01406837bb0e0d90c81655a859233 SHA512 3e9dfb3f70cd8c7dfa763bae9fb3415c276bf0104822122f72cf6df47bdc7926a654ddd653321e5ec4bd04ed7f0dd1335a4924e23d1ac37f63c05a536c1defbc
diff --git a/x11-libs/pixman/pixman-0.40.0.ebuild b/x11-libs/pixman/pixman-0.40.0.ebuild
index c6e6516af00d..daac74216757 100644
--- a/x11-libs/pixman/pixman-0.40.0.ebuild
+++ b/x11-libs/pixman/pixman-0.40.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz"
 fi
 
diff --git a/x11-libs/qtermwidget/Manifest b/x11-libs/qtermwidget/Manifest
index b5ca30ddd316..d03476a3e64c 100644
--- a/x11-libs/qtermwidget/Manifest
+++ b/x11-libs/qtermwidget/Manifest
@@ -1,4 +1,6 @@
 DIST qtermwidget-0.16.1.tar.xz 182764 BLAKE2B ba041130d8d67c08db07b91a5eb513c6fee548df3abef3ac7d7ccc5114771f2a14fff3c3f01a762670d8e3d9887fd7f62e1c018ea98ee7cc8e68b77317871966 SHA512 689d067e259aa07b22e1d3344467180109e871a8d45551085625c04670f1422b821bbbf52caf2b67e10ce8e78214c8e65811e6eb4fc61dd246fc25598ed095c5
+DIST qtermwidget-0.17.0.tar.xz 187424 BLAKE2B 8053eae3674f12839a205b0686bdb42d83662604da1f43ee6c4feb60c35af6a2f7b65a095a89b64ffd9d2c3ac10e7c78df721862f15f401126fcab3d321fb92e SHA512 c8f75dcd5182a6eea933452c89126fbe64035b278e8e9817d6966693f741691244e5766c49046e83add8f38cb00ff08e2640d2fa149c5aa46b20d8a06a22e78f
 EBUILD qtermwidget-0.16.1.ebuild 633 BLAKE2B 5c7d1f9baeea398f98e6a451df22bcd8706edc46345fca21368ab702ab948286abe9f35729738e9af095a6bd12c29e2cb8dbce61661a6cc9e785cb2e89cc27a8 SHA512 88c2036dd7fef67ec0553652a89a8b53e4bc715663149a6ad47e6cdbd23945530d927f03ffd7a428813b481ac60fe362c13c32ee20e81c56b588ad5052edc1a7
-EBUILD qtermwidget-9999.ebuild 635 BLAKE2B bd3ea6e3166d6a08aa7b36fac143dcfef0144ed071f65ebbfce4c6b45f314456e5a4c626a106dfffafe1ccc9746562ff870dd57d2ecb8c8ece9dd1eef3a77065 SHA512 0f71788f9c75f21bd19dd8b4cd7aeef57eb6ae3f3dfe0600fc5b66c1c88e745fdcc6e9a0e36de91361f18cb5ea5efb6379884ef7bef577c34d2915da2d0351df
+EBUILD qtermwidget-0.17.0.ebuild 635 BLAKE2B 3129aee3f31e8924869a8c0be9638956e6222d1511c3b5d2eade676f0f39b3551239c25d563e64fd0b3defb9fce12069f22fcb195999c6b5a6131e6c959e674f SHA512 db6c0072be09d816d7ef12a0e99f14b8e74eeb42a1908fb32e7c533d07fb9c76e9cf14aaf82f319a11578c1dbf2ef919be89f020671e7c73cfeab8f244b29922
+EBUILD qtermwidget-9999.ebuild 635 BLAKE2B 3129aee3f31e8924869a8c0be9638956e6222d1511c3b5d2eade676f0f39b3551239c25d563e64fd0b3defb9fce12069f22fcb195999c6b5a6131e6c959e674f SHA512 db6c0072be09d816d7ef12a0e99f14b8e74eeb42a1908fb32e7c533d07fb9c76e9cf14aaf82f319a11578c1dbf2ef919be89f020671e7c73cfeab8f244b29922
 MISC metadata.xml 602 BLAKE2B fb54623b5c5e38a3eda61f4bc5f116c6da5f7f58dff1a65b2b43b3b4c5f8596ec4fbf4fb93e1705b4d97a5231fe75d23aa1705308523ef125ea81933ed3cad72 SHA512 30175f7c45f4102fdb38223065d4e143bebc2ecef84e2e148900d8510c9c393d8feb7d6787f9593b90f1e4054b5016444e02f17c6a8a51082e7b8cb8294d9d31
diff --git a/x11-libs/qtermwidget/qtermwidget-0.17.0.ebuild b/x11-libs/qtermwidget/qtermwidget-0.17.0.ebuild
new file mode 100644
index 000000000000..900e0ee37d49
--- /dev/null
+++ b/x11-libs/qtermwidget/qtermwidget-0.17.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Qt terminal emulator widget"
+HOMEPAGE="https://lxqt.github.io/"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="BSD GPL-2 LGPL-2+"
+SLOT="0/${PV}"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.9.0
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}"
diff --git a/x11-libs/qtermwidget/qtermwidget-9999.ebuild b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
index 8f022c1013f2..900e0ee37d49 100644
--- a/x11-libs/qtermwidget/qtermwidget-9999.ebuild
+++ b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ SLOT="0/${PV}"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.8.0
+	>=dev-util/lxqt-build-tools-0.9.0
 "
 DEPEND="
 	dev-qt/qtcore:5
diff --git a/x11-libs/rep-gtk/Manifest b/x11-libs/rep-gtk/Manifest
index 07ab348ce3ae..8b1b2a9c48bd 100644
--- a/x11-libs/rep-gtk/Manifest
+++ b/x11-libs/rep-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST rep-gtk_0.90.8.3.tar.xz 120616 BLAKE2B a0ada2bb13a8104d0dd532f35b64e6b049711284b60b4c4960b730909061ecce058a0ee79517cc508db95647d93f9af95c5ca73cf76e26b59467c8441064ac07 SHA512 d33de562c94731c0ce0fbca574952b9f36c2f2cb084783976486c8751daba5de0d20bc781a06ebd2005e541bbbec3f984453ef65ba6233bb7acfefa31b1acaac
-EBUILD rep-gtk-0.90.8.3.ebuild 981 BLAKE2B 4c51847b68e233f9b4039025d69becb5f5c33318e9b3a67c7e1657dd81ff90c73932103727927ad9bd641125bab47fa8859becc7ca2dfa7e2cab2db5c493f660 SHA512 b6a6f9c56bf39c539fe1ad4e8651c713f958f152b952ac126a3369ff78685a100710a7d1c5c80eaa06b52977a7fe2c621bc552ab24a3a5a318e5397b96efc241
+EBUILD rep-gtk-0.90.8.3.ebuild 974 BLAKE2B 3d98f379ac69a594e7e8d916896b79ae5410f78eecb530e91651bc650ee46f77033523df472b24244f686df921178c4fb1dad3312abcf65232947852b01f7010 SHA512 653c4735f50eb1d17bbac3698f0512280a84fc93a3a27f74b5bf376af28a843c366cded34f4c7a1d84da31d42c8008864397b66578e00852c402aec02eaf49d8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild b/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild
index 35cfab023dca..3a80f748f880 100644
--- a/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild
+++ b/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
 MY_P="${PN}_${PV}"
 DESCRIPTION="GTK+/libglade/GNOME bindings for the librep Lisp environment"
diff --git a/x11-libs/tslib/Manifest b/x11-libs/tslib/Manifest
index f7dac5899649..a21c1797623f 100644
--- a/x11-libs/tslib/Manifest
+++ b/x11-libs/tslib/Manifest
@@ -1,6 +1,4 @@
 AUX tslib-1.21-optional-utils.patch 610 BLAKE2B 0f25c58205f5bbddc62f278827d9689e58c88323d6c2797d3f36d165c5dcfc8fe18574225dab106eb9c01d3a7f54a3f7c3797be0853dd3b144bbb61529ea83eb SHA512 3c061d34e5a2f89c61754331d9a8efa9ffeb492169d3c0082b29107f03442adc75f6a39f289577c3902df2a9efc4166f9ac610867742989f09f10a8bfd69230d
-DIST tslib-1.21.tar.xz 349216 BLAKE2B e19623c9390688b0aa85e6547a57542d2e10498c8ebbb30f840157d240dc9975c3e6735814a5e6f02fb71c273a52f860695cf4772fef28522e74c5781cdcb02a SHA512 66c5e5dc4e2314277e19af29b5dce1181573579f13b0e79fa43e658838d4c19a77feb978b60d7c6458337e8d6100ee54a42fc4af3a99fd8d6840cccafa6323c4
 DIST tslib-1.22.tar.xz 351192 BLAKE2B 8cec9fe17b9aee7dac44bf54a78482b81a67072a7c1497b4c5a2a6703bb0e897a2481bc06df0fd91ca97fef3b4ebf17c475c3b717ce7f32fb677db5918630759 SHA512 8f51fc5e37bb1babb89e8d6d5302c7d7b712820525bed0253f980028a78b343e4100065bbe0ecafb828a7edf3a9b77f96929ab79205d516ebbf6c25b32af0008
-EBUILD tslib-1.21.ebuild 1539 BLAKE2B ba3adc3479f9dbaae520a8f6228ab36ee5e23ee768ac1882d5abc92120609981394ef78ed066dc5c3bbe80dea988f314aabc029fdabf289c8abda7999c90ebef SHA512 2208273e73145a8c983ea019c84feb832e9d50452b1d294550592ae8797073fb3c139fe4abbd9449423c6821a4cb19ed591f2f73ca6cff3d444b525d8763c53b
-EBUILD tslib-1.22.ebuild 1566 BLAKE2B 9c752864ecdd6358fe076155db96bded20583c936812b589ef33171cfc592c637bdcbe0694be0e11163b16b3cf916297f2c9edc6796030ca71073c45a6311c3d SHA512 679dad5f6bef3d2d8373e8fbf9fc73e0e1e47e3da02dbc23662b677ed4fa02da7874053b58ddfe75bc34dea5cf455096200e8613ec3ca976ad5d3808edbeb803
+EBUILD tslib-1.22.ebuild 1559 BLAKE2B 6bbc3021e41f844bd84925b618d77b262a0d66bc0f179cd60dc44e7bcb6d093680501ab91ef5c9cdf64fddbc0ec08c3f16fd7e602231eab691e079f5715b42ba SHA512 5ac3507ab244e70fcd8e04a99eba3364e6011a19c351c6d84072fac93c6da8546fe98288ef5c9fbfb4acdd41b1f00155de30e86cba930dede482c93f477c5dba
 MISC metadata.xml 476 BLAKE2B 60986e648e86b87a797224b40bcb510af598d2aeafdc497850c714872d844b86c27d7f3c24cbbdad92ec91c8803fd1a8aeb9e06ffea5700ce3c42a2b3d3d8587 SHA512 f5b0def5c198a78dd8bebfb3e9b022ab37dc6466e1a3af7a7b0497f4133be7d155a205da190d63f98c4e10bc7fca6ee84e6aaa6e46e74e1ed0d8c2ac387a15e5
diff --git a/x11-libs/tslib/tslib-1.21.ebuild b/x11-libs/tslib/tslib-1.21.ebuild
deleted file mode 100644
index 85369585a3b0..000000000000
--- a/x11-libs/tslib/tslib-1.21.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Touchscreen Access Library"
-HOMEPAGE="https://github.com/kergoth/tslib"
-SRC_URI="https://github.com/libts/tslib/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2 uinput? ( GPL-2+ )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="evdev sdl uinput"
-
-BDEPEND="
-	evdev? ( virtual/pkgconfig )
-"
-DEPEND="
-	evdev? ( dev-libs/libevdev[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS NEWS README{,.md} )
-
-PATCHES=( "${FILESDIR}/${P}-optional-utils.patch" )
-
-src_configure() {
-	my_configure() {
-		local mycmakeargs=(
-			-Denable-input-evdev=$(usex evdev)
-			-DENABLE_TOOLS=$(usex uinput $(multilib_is_native_abi && echo ON || echo OFF) OFF)
-			-DENABLE_UTILS=$(multilib_is_native_abi && echo ON || echo OFF)
-			-Denable-arctic2=ON
-			-Denable-collie=ON
-			-Denable-corgi=ON
-			-Denable-cy8mrln-palmpre=ON
-			-Denable-dejitter=ON
-			-Denable-dmc=ON
-			-Denable-dmc_dus3000=ON
-			-Denable-galax=ON
-			-Denable-h3600=ON
-			-Denable-input=ON
-			-Denable-linear-h2200=ON
-			-Denable-linear=ON
-			-Denable-mk712=ON
-			-Denable-one-wire-ts-input=ON
-			-Denable-pthres=ON
-			-Denable-tatung=ON
-			-Denable-ucb1x00=ON
-			-Denable-variance=ON
-		)
-		multilib_is_native_abi && mycmakeargs+=( -Dwith-sdl=$(usex sdl) )
-
-		cmake-utils_src_configure
-	}
-	multilib_parallel_foreach_abi my_configure
-}
diff --git a/x11-libs/tslib/tslib-1.22.ebuild b/x11-libs/tslib/tslib-1.22.ebuild
index 1fadd84c49a0..ea4cf2ff9605 100644
--- a/x11-libs/tslib/tslib-1.22.ebuild
+++ b/x11-libs/tslib/tslib-1.22.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libts/tslib/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2 uinput? ( GPL-2+ )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="evdev sdl uinput"
 
 BDEPEND="
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 14f11e1c9926..374ea5487799 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -3,15 +3,8 @@ AUX vte-0.28.2-limit-arguments.patch 1477 BLAKE2B 329e8eb93156244526ebe3ccb3c2a7
 AUX vte-0.28.2-repaint-after-change-scroll-region.patch 3817 BLAKE2B d57f20415193bf9bc283399bcae4e3c2a23ff7f2f8ffee08e8a67c3af2956b137f788322e26bf2537e785c0d0ce6266b56269abe5a18e2e881ea548b5c1b4625 SHA512 46a54c96889c3a0c5a293a097f777dd2e24e5a3025b808d7fb0bbfe71e8938f7d30ba26a05e67cb6b63ad59719eace57d0f6e0ff9f2860fbe9f12c36e022b8ec
 AUX vte-0.30.1-alt-meta.patch 2490 BLAKE2B b5046bea09bb7fee5f03eaaa0c88f88a9e05c3d4f97fa8d6b4ecfbaec8a35bf1989c0461c1ec1d31e1b22c9d35688775a30f34134028bcd4fdcae1b7d40129c4 SHA512 69ed3038f3dcbbd09709667caff5692e4e11e30926bc7692cdbbdef2bb1ae4584ef64b824b5afcb3c57c237a3c0db4d9588ec36778d0994a546b1e6f74c2e430
 DIST vte-0.28.2.tar.xz 962340 BLAKE2B 1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9 SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6
-DIST vte-0.60.3-command-notify.patch.xz 6108 BLAKE2B 1f96788c097b003a3f9041529a0ff8ad083fe60597920632450e65ce13ad7181cb3bd4f2713ee19ab7d15154e3546720cdd0a72fabb3710ea7149c63cb159a1f SHA512 070d17fa2dfeed5ccb5ad67687bfb65a6a9dd79db300bb6e00f7d35b8ab3563c331e5f48bbecc32f8037475db319fb71f35e72108f260b6446fd2dd8e1a2897e
-DIST vte-0.60.3.tar.xz 535504 BLAKE2B c5556fdb91d876aa681d2a9466fa4f4c0ee6be630d076949fbd01878baffdf319e50ec75575729c49c09484914d9ee103d4d491861aedb678b0e336cd4ddcc2e SHA512 3694fe711e0b3eb9d6ba37ad8036f5d3cca4265635ed7afcde750a8445b17f820d1c55b557d0ea1c8a5a45e5408915d8da2ffd65b4d397c6582f288812ae1f18
 DIST vte-0.62.1-command-notify.patch.xz 4844 BLAKE2B 22301fdc5f1969beb2ad9b316fea8972f696f0e54e1a24d5eceedec71162afc2991b7963a71ce8925a94f6c40e5303d3db760b872d0eebbdc6d05b22d3c59ecc SHA512 491e241b0f5aae50e59d25751e95579d40c47e7e4c7f2b279522347f7f2f7f00c92bdf5fa4a651e4146bcfa9439f03b6311b4061fb20c5679c09b97a4924dcf1
-DIST vte-0.62.1.tar.xz 444672 BLAKE2B 83cf49c8700792a149d572bae692d4909ada613b43a752b55cb658926dc37041b98d69364a88f813b1cc6d20f0667ea566f994e0f08bd1dd918731d20edb1376 SHA512 2f8f76953e0ea6c604357ab08630d3822a252051d8997cf7714553fec1688735468726bfd74e03f122dd1c8d0717e511ec7ec1e5463a086bd407afc6f7df91cf
-DIST vte-0.62.2.tar.xz 444888 BLAKE2B 07a9d302b3fe67fbc149f129da9e7482f516f3d8fb550bfcd2ddea000f059a24184e857b9f7c4c69c751e40a2b53c044d8596c990b722a22fa13b810a353414c SHA512 61ea130d43d60531dcaa8bddfecacfd4a934a2e868da69b598fad0a2feb04885fc0b5dd520dac4b0d3a4daf11ea70c5357066ed15759e36436346dae498e8ef8
 DIST vte-0.62.3.tar.xz 447152 BLAKE2B 2c55430490af577cdbad8bbcbb53902ccc4ab8d9643d5e8b3279e96b4285347e652e761644c957961732eeb50d12e33fa3d3c735be9899ad14c1e2f35377f2a7 SHA512 0475e2813b305bf1b5d48ece5959f2feb10e89b589fa3b75032ae466fd5254bf5c2fc6085dc296d65c5df84790a38892534ff401109843bf964ae62a8c540a81
 EBUILD vte-0.28.2-r209.ebuild 1864 BLAKE2B 61c287edd403d36a67fa2b45987bcb7a5ee446516df9c84a2ae10bcdcf8318795a98683a702e868aa4f6178d7dfd8c59afdc1a4a412544c52a01131ad2a41bc6 SHA512 c5ea6ab70fc89c5ddb4f097c5ee699829d96c98bc0fe4430b8aa3bf8e5767fcd5aff112304d8ea680f92a8b6ceccc1bbdd29ebce10c126f9b329ad5869da246b
-EBUILD vte-0.60.3.ebuild 2202 BLAKE2B dda1b10be7bd337e1e5159cd251315d51ae3fd17be6ff75f82402a462d7491313919f563b6bf5702f8e7ac2ea4d58cffb6834377ac35e22a573084ba77dfc152 SHA512 7caacb773b7f53d311899fcd6f56171e3e96d5be3c997304c6e870d95d11beaa2ce0b63d3d8876713798648621bc46bd7b491a7ad40845ceec929befec41bdf3
-EBUILD vte-0.62.1.ebuild 2211 BLAKE2B fae36ce3c256be5a24e76c05fa1b1f702648c2a242e0b7c5732fbb9d875235ce793ce17a6e4439e283abd4ffcb57765ef2d97807c42e8da70d4e9ae4e875d188 SHA512 49f2441870fceba0c6f93c21bb3d56728def7330a84e43b12fd02dbee7a53b4cd930bcde3ca830ecd3ff1ab0094c0f0f048351841ea1de4fe4b653b59e8391f4
-EBUILD vte-0.62.2.ebuild 2211 BLAKE2B fae36ce3c256be5a24e76c05fa1b1f702648c2a242e0b7c5732fbb9d875235ce793ce17a6e4439e283abd4ffcb57765ef2d97807c42e8da70d4e9ae4e875d188 SHA512 49f2441870fceba0c6f93c21bb3d56728def7330a84e43b12fd02dbee7a53b4cd930bcde3ca830ecd3ff1ab0094c0f0f048351841ea1de4fe4b653b59e8391f4
-EBUILD vte-0.62.3.ebuild 2209 BLAKE2B b9cec5efffc2410b51376973b6aa0cd7370a2802f19c1732fcd364e44c2998ae78466e99e5d07152d198d6de20c076bdc533bd3eccdb8e5d8556fe80255cb936 SHA512 324540be5c39a7968e7db00894801ad8b2888b3cf6225de8e7cc934e9c410adc40a162c52f15bfa88ef2f05ca6ff82ac14e6bd8171018ce7daaeb025516b0149
+EBUILD vte-0.62.3.ebuild 2204 BLAKE2B ee1cb85213d97e873afc657737d7a2f59caa7e5d8a229709aee2e3ef2a262772274f776f1408a3a3cf41e7c6b9cb7457cfbb7cc5c1216d4f95d79dc6ef22f813 SHA512 5143976afee177477ddadbbae0136a2eba5c83640ca96691582b00bfcca35276708f1a5bd00bc2d0663c73e4b726dafa819756b79bc0fa6d4cc21ef3659c81fe
 MISC metadata.xml 518 BLAKE2B c7e4aeabaea85722d8f81e1cdf7428a3ab30e38fd03c6e2bfaf81b21468d00d63d8aca53c90b50292075259bc8498a51785e1034874f3c8a9fa42d13b90d6d87 SHA512 c76435d37b54d53bdcd66dded770858b8801c15bfcda607529039928d5009635902d320ba14840e731618ebf8e0eafc2437d74cc0243ccf7a515e4f7efcdb338
diff --git a/x11-libs/vte/vte-0.60.3.ebuild b/x11-libs/vte/vte-0.60.3.ebuild
deleted file mode 100644
index fc9dae3f5f80..000000000000
--- a/x11-libs/vte/vte-0.60.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.32"
-
-inherit gnome.org meson vala xdg
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
-
-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 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-REQUIRED_USE="vala? ( introspection )"
-
-SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-0.60.3-command-notify.patch.xz )"
-
-RDEPEND="
-	>=x11-libs/gtk+-3.24.14: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="
-	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) )
-"
-
-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.60.3-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
-		$(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.62.1.ebuild b/x11-libs/vte/vte-0.62.1.ebuild
deleted file mode 100644
index 80301a89aacd..000000000000
--- a/x11-libs/vte/vte-0.62.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.32"
-
-inherit gnome.org meson vala xdg
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
-
-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 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-REQUIRED_USE="vala? ( introspection )"
-
-SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.62.1-command-notify.patch.xz )"
-
-RDEPEND="
-	>=x11-libs/gtk+-3.24.14: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="
-	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) )
-"
-
-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.62.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
-		$(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.62.2.ebuild b/x11-libs/vte/vte-0.62.2.ebuild
deleted file mode 100644
index 80301a89aacd..000000000000
--- a/x11-libs/vte/vte-0.62.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.32"
-
-inherit gnome.org meson vala xdg
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
-
-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 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-REQUIRED_USE="vala? ( introspection )"
-
-SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.62.1-command-notify.patch.xz )"
-
-RDEPEND="
-	>=x11-libs/gtk+-3.24.14: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="
-	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) )
-"
-
-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.62.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
-		$(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.62.3.ebuild b/x11-libs/vte/vte-0.62.3.ebuild
index e6c46e0c1d64..2d52a69a4dc3 100644
--- a/x11-libs/vte/vte-0.62.3.ebuild
+++ b/x11-libs/vte/vte-0.62.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 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 sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.62.1-command-notify.patch.xz )"
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index eb15934de24c..ac169c7e9d0d 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -2,9 +2,13 @@ AUX wxGTK-3.0-gtk3-translation-domain.patch 454 BLAKE2B fd0b6d6a0c1fe7f1dfbd7692
 AUX wxGTK-3.0.5-collision.patch 6298 BLAKE2B 711d7b94b6a0de4bdda21caa2bfcfd799c0d57a8d1d4a820e6da397768b075f415b8e438502167446b3be6b948420d1c1a31c401bd5e7bb2b549e3a95dcccad8 SHA512 62bbf952eac4a3485a2cfa3e6908b2272cb6f47632f17e60f413ad34b64e331423189a31c4259c8283120b4b1351f915e226f5c749787a5c69737779cc9edb59
 AUX wxGTK-ignore-c++-abi.patch 1657 BLAKE2B 5d865c83174f2540b798a2930f8d5ae8336f031214691fe7d5cd8c283faf9511fff260735d9dcd293e6377be0e96a6521e84ceae4560f2fef8fc7e7ed5642cd6 SHA512 649551eeacc9915f249ece1c3ed79959f0f0129e54373bfbe84ea5fbf2b8e0ba7778d6a22ac6f165e5d4e85a3ea4320274296b1b2a8e623acb11300fe44478f8
 DIST wxGTK-3.0.4_p20190713.tar.xz 53640 BLAKE2B 89eabc44660f8f9b19fc850717eb83244a746f2f8c28bcec89fa9ccd1828f103df114bce24406ff14875220de86276f9e51870d58e716f0c94d310707f7eae4c SHA512 44a4e92ccc9c143a0e70e015116e952b0529001a3a1e23193d501826720a505259ead6feaa08de75b4a7a8753f8b16f5cc14e4bff5d15585870066ccd1de53b9
+DIST wxGTK-3.0.5_p20210214.tar.xz 4560 BLAKE2B ac1815e679adfb2c36d74be0a4a9cc32d52e6b0b05a14393334bc5d30a8bc0da1386415a5b59a3f6dc4807d283272d36f033caa55a300c8c30cf0c402554b8bd SHA512 f1e34379b8bf594a68486bb6eccbd93f36dc2aeca37c0a7eb23de81c1c3825396437a65c43ed8d94673131e97414d49449ed51729970bf8b8e4608d36974a335
 DIST wxWidgets-3.0.4-docs-html.tar.bz2 24122986 BLAKE2B ffd38d50e6cb44077f346597863a8dfb1cb5172b9380995082acb23b5b5dae060bc1e3d14307a1146ccd93b5ae9c4fd8fb206346c8d5aced5a535cd3d7f8961a SHA512 2b4cefc98f5f034a8c36237c4979bd02e8b0ed60aaeb31946d8661fb8e5297172cec807e45c96fe2939b012f093950721cda8bf9f750697b50e3741711011ccd
 DIST wxWidgets-3.0.4.tar.bz2 20204622 BLAKE2B 97b9f3f44f080104cae290bc3e162b51ce27a96fb22b191d52f30db1f1dc7951defcc220afc4dcb8417cfe23490762c2a25f62164ac21809f73ccf442dd19347 SHA512 c9e6b35d541a99921c54cfdac260843f574f146b27f924a7a0fca5007344fa99865a96ded95e6802329ad9221b4880d62b92277a1b4c1ce71420acb672ad9158
+DIST wxWidgets-3.0.5-docs-html.tar.bz2 23844256 BLAKE2B f5b5bef129302ae1ded7a651e652b127ad9d548a00a498f06a4d4f868dc3bc33411ded2602c04c8329e927550d032bdbe633c2c7d1a7f89265874685d3cb3d9b SHA512 f839e67660f2b08aa28d1596a3b7af2c35f7c2c0505c6e6d45888845397212b3dd71c8d34115321e9a4347b9d92a0ce767bb76defd14c172e51c2a3df96cc3ac
+DIST wxWidgets-3.0.5.1.tar.bz2 19739206 BLAKE2B da270cb8e4fc22b8d892ba80fbb4cc71578f642ca07102006f914a80331a254e746de6c91e61b585c0b1ab3abadd17d80a0eaa3efd48a3d412cf7202101abc7a SHA512 0a789fc5e71d414e43f75b5c16076fe8b1bcd7671be0770e4269dcef66d830c1bc74e183f49db270b928862f13472666c283fe2aa98b9006681722e06100725d
 EBUILD wxGTK-3.0.4-r2.ebuild 3600 BLAKE2B 019f83f1fb028982123b691988bc1513fc7f71ef517e6fa696b693ca53baa88ce424c1c779c1904e75956d6629a5f42b1977a6ac2b1d78bd5a7533714cbc1976 SHA512 c687c3bcddaf4c934e1616651d982bd0b175db8eedb4babb6820a39503f1b6484dd2b219a685f12931f0937e427d2d068065d0247c364e6dfe55aae73655a66b
 EBUILD wxGTK-3.0.4-r302.ebuild 4824 BLAKE2B bc5a1a4266fe8dad373ed7efc86ed6b4df84e119047146b2aceb2ddd085399184ff38b9bdf7adf1b1543f907db56d210a271e67d8ba025331802d453ae603207 SHA512 9d3c39b3a9c5350eb75f35822898f29f1e7941bb449ec8e1221edfd75a4c51bfd4649128163827c3ba76b1c23eba03444e00e45f519d4929fc6b417897d7e6bf
 EBUILD wxGTK-3.0.4-r303.ebuild 4929 BLAKE2B a88b9b5f2425073d28503e48feaffde017b8740270f1ccb2b5de25c89dada239a8938bc6d85767043d071a739c376b2748ab6a15be8d0fd123fa5ca3e4f0e89e SHA512 535ba5ee43e62bb46050bedb0b399233746bb7d366660876af40f891a1793e6e6174373c837e8279dc3136fbe0701606bd1d807708bccccf02693c5d7c28bb6d
+EBUILD wxGTK-3.0.5.1.ebuild 4949 BLAKE2B 46d7da77412960327cdc9cfd9afcec77c2de2b5b20999de37cd4745dd4c043976942676948697b665ba794b5ab198e7ed6941308eeea7cf137ff3b33e4f3768c SHA512 4d937a1eba09175b3cf7286cc69c70bc75ec2e80afd49c4c54d2f2ca3936f82f0c542b7dfef61e767793af57ae7e9d154391aee8257ca1324908c8c353f7742e
 MISC metadata.xml 759 BLAKE2B 4bafb6bd1d082eae5773d84fb116779f337e662090c4d01e22296f891114458de4a50f1f10775b61f06f22c6db7d4288c66c0c59836cc362298c23fecef499af SHA512 a7bf3b8cecf7ffba0dbfded9884fb7df3866c1a00c473f9ecb2d3fc1c84c5713dcde949f6acc35ee688741efb2da74fc189ed9c58b24bd2874c7e95908eb1f60
diff --git a/x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild b/x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild
new file mode 100644
index 000000000000..e43f2597c1a0
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+WXSUBVERSION=${PV}-gtk3				# 3.0.5.1-gtk3
+WXVERSION=${WXSUBVERSION%.*}			# 3.0.5
+WXRELEASE=${WXVERSION%.*}-gtk3			# 3.0-gtk3
+WXRELEASE_NODOT=${WXRELEASE//./}		# 30-gtk3
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="https://wxwidgets.org/"
+SRC_URI="
+	https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
+	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.5_p20210214.tar.xz
+	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${WXVERSION}/wxWidgets-${WXVERSION}-docs-html.tar.bz2 )"
+S="${WORKDIR}/wxWidgets-${PV}"
+
+LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
+SLOT="${WXRELEASE}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+X doc debug gstreamer libnotify opengl sdl tiff webkit"
+
+RDEPEND="
+	>=app-eselect/eselect-wxwidgets-20131230
+	dev-libs/expat[${MULTILIB_USEDEP}]
+	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+	X? (
+		>=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
+		media-libs/libpng:0=[${MULTILIB_USEDEP}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+		virtual/jpeg:0=[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
+		x11-libs/libSM[${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+		x11-libs/pango[${MULTILIB_USEDEP}]
+		gstreamer? (
+			media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+			media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+		)
+		libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
+		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
+		tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+		webkit? ( net-libs/webkit-gtk:4 )
+	)"
+DEPEND="${RDEPEND}
+	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
+	X? ( x11-base/xorg-proto )"
+BDEPEND="
+	>=app-eselect/eselect-wxwidgets-20131230
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${WORKDIR}"/wxGTK-3.0.5_p20210214/
+	"${FILESDIR}"/wxGTK-${SLOT}-translation-domain.patch
+	"${FILESDIR}"/wxGTK-ignore-c++-abi.patch #676878
+)
+
+src_prepare() {
+	default
+
+	# Versionating
+	sed -i \
+		-e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
+		-e "s:\(WX_RELEASE_NODOT = \).*:\1${WXRELEASE_NODOT}:"\
+		-e "s:\(WX_VERSION = \).*:\1${WXVERSION}:"\
+		-e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \
+		-e "s:wxstd.mo:wxstd${WXRELEASE_NODOT}.mo:" \
+		-e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}.mo:" \
+		Makefile.in || die
+
+	sed -i \
+		-e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
+		utils/wxrc/Makefile.in || die
+
+	sed -i \
+		-e "s:\(WX_VERSION=\).*:\1${WXVERSION}:" \
+		-e "s:\(WX_RELEASE=\).*:\1${WXRELEASE}:" \
+		-e "s:\(WX_SUBVERSION=\).*:\1${WXSUBVERSION}:" \
+		-e '/WX_VERSION_TAG=/ s:${WX_RELEASE}:3.0:' \
+		configure || die
+}
+
+multilib_src_configure() {
+	# X independent options
+	local myeconfargs=(
+		--with-zlib=sys
+		--with-expat=sys
+		--enable-compat28
+		$(use_with sdl)
+
+		# Don't hard-code libdir's prefix for wx-config
+		--libdir='${prefix}'/$(get_libdir)
+	)
+
+	# debug in >=2.9
+	# there is no longer separate debug libraries (gtk2ud)
+	# wxDEBUG_LEVEL=1 is the default and we will leave it enabled
+	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
+	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
+	# http://docs.wxwidgets.org/3.0/overview_debugging.html
+	# https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
+	use debug && myeconfargs+=( --enable-debug=max )
+
+	# wxGTK options
+	#   --enable-graphics_ctx - needed for webkit, editra
+	#   --without-gnomevfs - bug #203389
+	use X && myeconfargs+=(
+		--enable-graphics_ctx
+		--with-gtkprint
+		--enable-gui
+		--with-gtk=3
+		--with-libpng=sys
+		--with-libjpeg=sys
+		--without-gnomevfs
+		$(use_enable gstreamer mediactrl)
+		$(multilib_native_use_enable webkit webview)
+		$(use_with libnotify)
+		$(use_with opengl)
+		$(use_with tiff libtiff sys)
+	)
+
+	# wxBase options
+	! use X && myeconfargs+=( --disable-gui )
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	cd docs || die
+	dodoc changes.txt readme.txt
+	newdoc base/readme.txt base_readme.txt
+	newdoc gtk/readme.txt gtk_readme.txt
+
+	use doc && HTML_DOCS=( "${WORKDIR}"/wxWidgets-${WXVERSION}-docs-html/. )
+	einstalldocs
+
+	# Stray windows locale file, bug #650118
+	rm -f "${ED}"/usr/share/locale/it/LC_MESSAGES/wxmsw30-gtk3.mo || die
+
+	# Unversioned links
+	rm "${ED}"/usr/bin/wx{-config,rc} || die
+
+	# version bakefile presets
+	pushd "${ED}"/usr/share/bakefile/presets >/dev/null || die
+	local f
+	for f in wx*; do
+		mv "${f}" "${f/wx/wx30gtk3}" || die
+	done
+	popd >/dev/null || die
+}
+
+pkg_postinst() {
+	has_version -b app-eselect/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
+
+pkg_postrm() {
+	has_version -b app-eselect/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
diff --git a/x11-libs/xcb-util-cursor/Manifest b/x11-libs/xcb-util-cursor/Manifest
index 1fa230f010ad..0fd1f90e3d5a 100644
--- a/x11-libs/xcb-util-cursor/Manifest
+++ b/x11-libs/xcb-util-cursor/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-cursor-0.1.3.tar.bz2 295224 BLAKE2B 7a1a89c0f326f4ac0768110c4aa5a7818ddace1f231f6a0dcfacaf8b157a2d6aae53f5278a02cb945822d83eccb8a01ebb14ab98e8828d8f1d506e42f51431ba SHA512 be5eee7b268b18f356d6aae04820a7e1c51397dac9020d876df379e833200255b5194269541c245a9b4ac286edad4cfe44dae8e4fcfd16a4726dd7553c104c21
-EBUILD xcb-util-cursor-0.1.3-r3.ebuild 1031 BLAKE2B 9eb56b09fbe156a8eb2c98f58af922fe8b312739969657c352e67176c2760cdc3dfeacc9606cb41f16f51015467a01a1dd830d8c4fef14e6cde38eba1c330a8c SHA512 dcb246346a4598c96345eaacf586b0de0404d1df58394087fe81b00431b9e777d3f5ef41870cf6df5eff5a0f12eb7ae45f6af06683b146061c9b8ce99519b911
+EBUILD xcb-util-cursor-0.1.3-r3.ebuild 1032 BLAKE2B 58f796ddd852100f08cd3329ba20b35d7dd90b4914ece9e9b66c80bf0cbed7c9620ad13e1b42a4f8762e45543d2504fb1fe62f3ee9240125a1278468a5a5873d SHA512 0dee0791220576b6d33185ec7a510b1e1d36b9628382f75301e0d35e2821c86aa70714f1ce1b720d00817eb24f3f8b1c8f78e777ec95a1f982d71a0dd07c1b71
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r3.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r3.ebuild
index cd7a6d4a43e4..85f17e5da11e 100644
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r3.ebuild
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
 	>=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
diff --git a/x11-libs/xcb-util-image/Manifest b/x11-libs/xcb-util-image/Manifest
index ac1606aaaa0b..5043b50467cf 100644
--- a/x11-libs/xcb-util-image/Manifest
+++ b/x11-libs/xcb-util-image/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-image-0.4.0.tar.bz2 327891 BLAKE2B 022536e7b7410ba1ed129f9efc2ad48fda26d9a69e79e54fe6fd4510df38d1e957289d249dc1a5beb4385116b0808f3282ad496b3f2a246bc6f5762bbe8c7e36 SHA512 9b7202c054e1160f9ca97a86be1210d9fb47f2119f89ca85f15f20909cca884bfe0cb88e3e71c75b65e1a0a72b980066ccac810e41a91db895c74dde77440d4f
-EBUILD xcb-util-image-0.4.0-r2.ebuild 594 BLAKE2B d62d5bcbae711da8b03f2c8f1b6c284f4d6a0ab03199b14c7ccc14f96a94c83be72138a5a9b2e45f7a68fc3e4c49c34688af0b2e11541062897bf1c6ff72ece2 SHA512 d0f69a3b9c5bd1a4015d77301df0c25198e32a52db0f2df11ed899a9a1c4ae882c09811c50a2247b6c1e9bc67a4f7c4068616a200d3e59f1ff5cfee6cb703da4
+EBUILD xcb-util-image-0.4.0-r2.ebuild 595 BLAKE2B 5c86f9bde978f8f5d1a26d7dd33f7f380e96367d50d839320d0581edfec7182ad335e437f5789b68727af5d10fb58431c6dc61859d19945a2a4b3cb91cbb2003 SHA512 30eb04f2a2b21d6cab4ef18178e51a7c1fbaf36970877c9dc15c29b942d027d6e99baf2212422b2f830c950229bd92815ff8507d256c802128c424ab4c3d1ada
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r2.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r2.ebuild
index c4839af8d2f3..fd67ff80ff37 100644
--- a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r2.ebuild
+++ b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-image"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
 	>=x11-libs/xcb-util-${PV}:=[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/xcb-util-keysyms/Manifest b/x11-libs/xcb-util-keysyms/Manifest
index 3446359aea60..885d6e6ebb18 100644
--- a/x11-libs/xcb-util-keysyms/Manifest
+++ b/x11-libs/xcb-util-keysyms/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-keysyms-0.4.0.tar.bz2 289880 BLAKE2B 5f55706fc74ed5c096ca0e8a8411ba392a023ab7f3c8185088c31570e5873345e16d72b693596b0983011350ecdb7cb30ae5fca118f4758710ee2fc2441883ca SHA512 b14b3100c3ae2379f9df799c0780a1ee39267101e58e4c1c6f390f039348ca2b370bb1df203b9bc68a170d664188d9c73e3553a7ba24d98abea3ed353e8dc0c4
-EBUILD xcb-util-keysyms-0.4.0-r2.ebuild 539 BLAKE2B 6f73330345cfaafa9ebdfb12cefb21021b88344b65ffb5dc6338756a496b21b865da13e5ab6f0efa07166d3a162617c2c5db5710250389a807cdb46e394d4bd5 SHA512 536369f5f311f25aa49be05771960452b28bcc16e21edfd19a068759c1d41686267241196368281dfdb37c7655fb1ee95912f8dcb1426e372f488614b0e64f4b
+EBUILD xcb-util-keysyms-0.4.0-r2.ebuild 540 BLAKE2B ebe6f5be47cb355e20ef51698146dd553334a439302c1e696d54a12d472926382feddf9a6a89c519da219039a812e3f89e04e2f34f7f7c99b264496abd81aef7 SHA512 c32b777dea3142217d24e0884ab8dc5fedd23403ad515077790130affcc4ca0819643e87cc2a77ed0741f6fbb6262548b8ed00ccd6cb19944e4b8d9d5761dd6f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r2.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r2.ebuild
index dd16257b3b28..7791bec83f74 100644
--- a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r2.ebuild
+++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND="x11-libs/libxcb:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/xcb-util-renderutil/Manifest b/x11-libs/xcb-util-renderutil/Manifest
index 318e86d23955..a7771d8ac300 100644
--- a/x11-libs/xcb-util-renderutil/Manifest
+++ b/x11-libs/xcb-util-renderutil/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-renderutil-0.3.9.tar.bz2 292898 BLAKE2B 8de259f918f1ffcd82d054bd751baf3f0fe3514da86bc736b68c74ca1f285fb41dca364ca49153e1464691c10fb65f16a53eec0ec8102c1abade9ad7c80629e4 SHA512 24b567992ecde7e69a406efd0ffb62266610d73b4dc0e5c71093221090fa134c14b850680d1d28dc1f8f4a6f497b4118491e1894ec7c73d2c6ce959d106771cc
-EBUILD xcb-util-renderutil-0.3.9-r3.ebuild 551 BLAKE2B 153a9b41aad4d5ddc79c24a2bccaa0c6da1c4b0d9cc4a745734e3a99408e9bcf1cf0cac596bdcee9c70d3bf17fad18c1b292d487d1d208c5dbcd9f174ff79bef SHA512 5510a58e30d3088ff8b7a56e3f0fb595a7fa05563a4c2c7c19e4f7164962bf696222a407845c5352c6822644cd329290a13b04c577e1478b4ceb6eeccdcb4521
+EBUILD xcb-util-renderutil-0.3.9-r3.ebuild 552 BLAKE2B dff24de1d4f8b4a1632a66909d4aef4d5f2d272479491c8d113d88c5f2514c338538a37306788f2638fe06fbcbf11e1badceffc07b3ab628d50abed099f17015 SHA512 db3c4e40c56344dd75074ce87b286707c7712c35abe785d6b044293a469e0fe2cc23a78c1b947e3dc442259668532ffe844397d7673b687b84145d35d43379ad
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r3.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r3.ebuild
index cb1715300e2c..ad2b141a271b 100644
--- a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r3.ebuild
+++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/xcb-util-wm/Manifest b/x11-libs/xcb-util-wm/Manifest
index 5d0354a8eb60..47d5fc872645 100644
--- a/x11-libs/xcb-util-wm/Manifest
+++ b/x11-libs/xcb-util-wm/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-wm-0.4.1.tar.bz2 321855 BLAKE2B 095d1f39e4b42e85790830b46c1faeeb8ac3bd7b792c3db8dca15a998a0ce835fd4fa148e8ed896c81d82e2113d1b9650e35de7741e9629883908d3b81b927f3 SHA512 cd1b3bcf9fcfc52e329ddc42b370d50dcf7d473c8e94f01cf7ea7fdbe0dc9176790890214eecb2a8ac43405f4938c121e38d282ae988cd8e90a6610d214ef326
-EBUILD xcb-util-wm-0.4.1-r3.ebuild 542 BLAKE2B 7902ef992c348fa5f611cd941de60bc1766f9183e608f6695c26a22c4cc68a7d1fa0c81bf82d9c24298284aac7ae18334068466d428027f3beb42cfa59c8146d SHA512 0a082485689ce5d65b83446cd01f2a1aec8bf853aef8795c05a016aa66721c08913cc48053fcc7d2e9e9e9132d988a73cd66b3abf31ffa30eb5f9892e0765c40
+EBUILD xcb-util-wm-0.4.1-r3.ebuild 543 BLAKE2B 08070d1f9a339fcde98828a4fd4a7c469d239dcd49837cbc114049aaa1f3f30db86e0b9c3db356d3d00fcc6e8c68f046300ba33edccd508c52f98699f0df891e SHA512 59f8be8716d21ebb6e3bf23ace539e8e31850fee2934ef8c1d0358e3967f46a3246786fcc242a4af81a9769b917b58ab88ecbc0f62b50be10119a66af359424e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r3.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r3.ebuild
index 0b203a89cfe6..e7e02cc41a34 100644
--- a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r3.ebuild
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-wm"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/xcb-util/Manifest b/x11-libs/xcb-util/Manifest
index 5c0d9f06d311..cc14fea0c071 100644
--- a/x11-libs/xcb-util/Manifest
+++ b/x11-libs/xcb-util/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-0.4.0.tar.bz2 297412 BLAKE2B 55970cddd8d4bfb313f5d6e4ea82a169a90311c1c0bb5ebf796ac1ceb1d1e1baea4268dc37bd8adf557514a752eec9f957ad3e3e0747384f2cf6e1985f26247f SHA512 e60aaa6f582eacd05896c5fd7c8417938318a1288146f3a5b339f77eed24e211c6099963f8813daa621c94173d2934228936b491c0ed79b09a8a67d835867d0e
-EBUILD xcb-util-0.4.0-r2.ebuild 837 BLAKE2B f78d12a842ddaab2d2f4a3c38cafe42932dc33196fdb251ce6ff0c69d24038869875843f25d8d5d478dc9ee9de7600c64fd5c4bdffe2dddcfc2483e00fdc8b0a SHA512 35b9adcd6889c00c4e871d3dd1467763510aa90c53fabea6e938830f2048e5b11777d8f3fd2bf33ac0bb9252752ed46c715b1b83283789c9e3d0dfa7c4b422df
+EBUILD xcb-util-0.4.0-r2.ebuild 838 BLAKE2B ea189b7b216bab4486673f3fc81c580a9e37d093f7e298ee109192953d3554688251a3cbc286d003054966ef496ee52365307f47df37ad9e956fa8c3d94c23a7 SHA512 944f6a929bc8a193393da285c53fb459fa87880bda76449e0b8511aa3bd1716116f2cc64d46c4ada8c3653aab22d85cae14ff75112593a4cba297da3e71de1f4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util/xcb-util-0.4.0-r2.ebuild b/x11-libs/xcb-util/xcb-util-0.4.0-r2.ebuild
index bc1ac0d72abb..1c10dcc1aae5 100644
--- a/x11-libs/xcb-util/xcb-util-0.4.0-r2.ebuild
+++ b/x11-libs/xcb-util/xcb-util-0.4.0-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-util"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest
index 11d8ad4351a3..757fc1a919bf 100644
--- a/x11-libs/xosd/Manifest
+++ b/x11-libs/xosd/Manifest
@@ -1,6 +1,6 @@
-AUX xosd-config-incorrect-dup-filter-fix.patch 520 BLAKE2B fe345fcb77c8fd5788ec55d2baac5bc0d2efa0242939c6d0dd2bbc63b65ea62eb9929af84d6645a5ae493313691670d3f9a46728c73d1b1809269d8647e25a6d SHA512 cd7726a0c616d11d20eabefca3ff4a63c76e49b1e725ddc5f3ab3452e64a46e94e5584e0779cdc4b23705fb1b17a8d2535bdbb22fd1b0ee88782bca1d4d5c248
+AUX xosd-config-incorrect-dup-filter-fix.patch 519 BLAKE2B 94990ecefbb09e341c62e1012f9cb6ca6dc40113046269c1aa0c2440267fb99b7cf49f0793d88cb096ac28a174e0fb871423332270d094127d2a6309b5a417c4 SHA512 c7baa2410a485300ad24c7a7ac52669a0790d289b2b5e71522ec1a81a122515f692e86e53b6dfa69b7a337ec83c6639adf4fae578ef6bec9813e1bcbc92cea5d
 DIST xosd-gentoo-m4-1.tar.bz2 5043 BLAKE2B c855a8c114911c2bec1bd582c19ef09f731a8df2c22a400a895d63ad5c4a32ad393330b47ee75fb7d8943a230df6d750094457e2021025035e91e5b1cf470e6b SHA512 fcf4d8a77cc80bc04a444a4faa9e072ea1e00950b3ce685b7944302d2ee3ebdfc5ec29ccb311495ee2e1fb5e61cc2d49350b303288d1d86430fa6bc8b3772483
 DIST xosd_2.2.14-2.1.debian.tar.xz 17276 BLAKE2B 77caf1f33ba66698ab7f1894da3da27e754fe5989814427de804b9797f71930e2d52ced403f72cdbac9522337876bec2c93fc83b0d97f7e0d05f8b78337d0b34 SHA512 ba5d86d2391e6dfdc6a2994e486f9c5ecd1934438815f4dc01c0633192d74a2fa2cabe647574052c4a87203e0c12b9bb8c38851975c36f19d113787dae3681ee
 DIST xosd_2.2.14.orig.tar.gz 418331 BLAKE2B 2f7b8fbc31a2341ede7bc85c35ede4209c1d3a74ce07dbc62f302aa6d81a00e5e0dd4880d8ac290c0ff0f3babfcdb8b5975f7375cdafdc87fa0747c8ed8295ad SHA512 3caf6d106d34488f4823e2a58fdff7a69b90f505b8da2443485167ff0362c6f27614c9a5019e738ff1f897d3c2249c934ff60953e3775566d66e8e9b30e4e473
-EBUILD xosd-2.2.14_p2_p1.ebuild 1279 BLAKE2B 19827ab402f39c742592f046948b918bc5be45355e48277afd4fa3fc7e6162b71d21230bbb0b6715c2f87ef3f490e245856fa0748a1c3f3ab18a5285f813fab6 SHA512 76acc63b1fff7afbf90ae53ea00fe975e59c6992198c6c0fb69065ffab0baf7d63e6f1dbe4c62ed6a20cef64057823f89d36cad30ef628bb40c18c8be78150d4
+EBUILD xosd-2.2.14_p2_p1.ebuild 1474 BLAKE2B f537f7836cdda97ba96538c7bdedcac13b683eba60c0fe6d37b897af9847fc92f75ee5bb0c6fe9c244a0dce289a700de1880e21d17bdad9a3100f386e48a9fd9 SHA512 08662d8194722857515fc66f9f0c724e99f2e857815a86591a361dbdcf09f75fcba7b4ff83fe1bb64794bbe5e133295520f06a84facd00321a7f52cb5131b875
 MISC metadata.xml 242 BLAKE2B 7363ed5aa4ab2d52ba96610654eeb5e2f2f8f0c2e5ca4f695f6ffa88af926130fcc9ea41257f281b542a45703848ecdf78ff99c89f1fbe51116d8e6234095782 SHA512 cf2d021687f90caa78f0f9738a07a81fb632ff35dd323dbe63b080f3985d9bcc665e5cf8549840e2369d1c4427f9831a0d61d20c4b65bab93794464a98f82519
diff --git a/x11-libs/xosd/files/xosd-config-incorrect-dup-filter-fix.patch b/x11-libs/xosd/files/xosd-config-incorrect-dup-filter-fix.patch
index 8446297f15ce..6aabea7b0d29 100644
--- a/x11-libs/xosd/files/xosd-config-incorrect-dup-filter-fix.patch
+++ b/x11-libs/xosd/files/xosd-config-incorrect-dup-filter-fix.patch
@@ -3,8 +3,8 @@ https://bugs.gentoo.org/show_bug.cgi?id=286632
 This patch disables reordering and duplicate removing for non-libs arguments, thus --param and alike gcc options may be used safe now.
 
 written by Andrew Savchenko
---- script/xosd-config.in.orig
-+++ script/xosd-config.in
+--- a/script/xosd-config.in
++++ b/script/xosd-config.in
 @@ -161,7 +161,6 @@
          fi;;
      *)
diff --git a/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild b/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild
index 2b11d58b4a9a..ff2f52b48e31 100644
--- a/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild
+++ b/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils autotools versionator
+EAPI=7
 
-MY_PV=$(get_version_component_range 1-3)
-MY_PATCH_MAJ=$(get_version_component_range 4)
-MY_PATCH_MIN=$(get_version_component_range 5)
+inherit autotools
+
+MY_PV=$(ver_cut 1-3)
+MY_PATCH_MAJ=$(ver_cut 5)
+MY_PATCH_MIN=$(ver_cut 7)
 
 DESCRIPTION="Library for overlaying text in X-Windows X-On-Screen-Display"
 HOMEPAGE="https://sourceforge.net/projects/libxosd/"
 SRC_URI="mirror://debian/pool/main/x/xosd/${PN}_${MY_PV}.orig.tar.gz
 	mirror://debian/pool/main/x/xosd/${PN}_${MY_PV}-${MY_PATCH_MAJ/p/}.${MY_PATCH_MIN/p/}.debian.tar.xz
 	http://digilander.libero.it/dgp85/gentoo/${PN}-gentoo-m4-1.tar.bz2"
+S="${WORKDIR}"/${PN}-${MY_PV}
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -24,22 +26,28 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXt
 	media-fonts/font-misc-misc"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
 
 DOCS=(
 	AUTHORS ChangeLog NEWS README TODO
 )
-S=${WORKDIR}/${PN}-${MY_PV}
 
-src_prepare() {
-	epatch "${WORKDIR}"/debian/patches/*.diff
+PATCHES=(
+	"${WORKDIR}"/debian/patches/20_underquoted_definition.diff
+	"${WORKDIR}"/debian/patches/25_fix_mangapges.diff
+	"${WORKDIR}"/debian/patches/30_aclocal.diff
+	"${WORKDIR}"/debian/patches/328676.diff
+	"${WORKDIR}"/debian/patches/35_beep_media_player.diff
+	"${WORKDIR}"/debian/patches/54_fix_man_makefile.diff
 	# bug #286632
-	epatch "${FILESDIR}"/"${PN}"-config-incorrect-dup-filter-fix.patch
+	"${FILESDIR}"/${PN}-config-incorrect-dup-filter-fix.patch
+)
 
-	eapply_user
+src_prepare() {
+	default
 
-	AT_M4DIR="${WORKDIR}/m4" eautoreconf
+	AT_M4DIR="${WORKDIR}"/m4 eautoreconf
 }
 
 src_configure() {
diff --git a/x11-libs/xtrans/Manifest b/x11-libs/xtrans/Manifest
index bdca481ce396..701f3226f09c 100644
--- a/x11-libs/xtrans/Manifest
+++ b/x11-libs/xtrans/Manifest
@@ -1,3 +1,3 @@
 DIST xtrans-1.4.0.tar.bz2 185371 BLAKE2B 15e5ff810f8df94fa6a050dab00158646003ecc7b200e199eb713d8bd6e7ca8df1769490ebc3d8b8920915bb5f2ede698f01a1a120ca09acfc85f225c4d618f8 SHA512 4fea89a3455c0e13321cbefa43340016dbb59bdd0dbdb5b796c1a6d2a6b1fd63cf1327b769ab426286b9c54b32ec764a50cd2b46228e4e43b841bda6b94de214
-EBUILD xtrans-1.4.0.ebuild 617 BLAKE2B 620a1b488a82e1fc9294663ab293851a4a16c011e03b6971a7dbc9d22473778a01c1964aa9d7bb76aeecdd565f7be0f99aa616b85c9c54cdca4df7702ceb8ff1 SHA512 300010e4f554d0e69714eb058d0f48bf7b43c9a9ab3e274f757c094b69340d44b59035978b7d24a3745f2f0e0742e84878a9eaff99d030706201180d527c89d4
+EBUILD xtrans-1.4.0.ebuild 618 BLAKE2B 71e3fa40e3c27cc5cc0c876e306b88bb8f2eb6e3219195206b8db5066841fc355198dd97c96ab5b7c389bef772c53e0464f57f548363d957ffabd52c6acd2e2e SHA512 a93b56f7697b40e7a984f74b230ed1bc231e13993b4ef3da3c83e7db4063c18725ebb92da0a32f63fcbfb03e9d4afa0ac1b85580818228f081a0508ed035b0fe
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xtrans/xtrans-1.4.0.ebuild b/x11-libs/xtrans/xtrans-1.4.0.ebuild
index fe2fd8a45255..6f7b1b960fa2 100644
--- a/x11-libs/xtrans/xtrans-1.4.0.ebuild
+++ b/x11-libs/xtrans/xtrans-1.4.0.ebuild
@@ -9,7 +9,7 @@ XORG_DOC=doc
 inherit xorg-3
 
 DESCRIPTION="X.Org xtrans 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"
+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"
 IUSE=""
 
 RDEPEND=""