gentoo resync : 25.11.2020

93 files changed, 861 insertions, 1341 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 4fc78bc11caa..1bc44b94aac4 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index 326542835d8b..13c1cf8cdfba 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -8,7 +8,7 @@ AUX fltk-1.3.5-cmake.patch 975 BLAKE2B d8f068c7773522683797e2ad2059019abdaff79b0
 AUX fltk-1.3.5-optim.patch 198 BLAKE2B 1fc6df1d2932d8c792802e437c60c6f02f9e50be5a997e60f2017796e0f5ec8c40886af1946c9269b0c5a2e8ca40be92dd499e373f02be6a62eb59d56c0d3993 SHA512 839cb0d543187bbaabb916eeb33a96e14808e65c7e6e1aaed61f33efa1f56857757f48d9b4852c711fb296c3e480175449dd0dc5167f589975220276d05e6a67
 AUX fltk-1.3.9999-conf-tests.patch 2259 BLAKE2B cb689918b807d75401ad3621deed635a883629c1e52ad0f797d77fb9e04aa28c9e9331399543f7d7fb63ca150f91d17ad0f7e71afef4364c505bf143bf3a7973 SHA512 a7ffb1c82e9a2c7bcfc7ffc1bfbf9fbf40daf4c5ca1ccb20c6e6d901846636de4c9166de8a63e739a730f4dc28c4527bec2c7390828611dc0b00b6c3e547b72e
 DIST fltk-1.3.5-source.tar.gz 5261324 BLAKE2B df05989d6581b570c689e29e9f31e5fc85fa91dee1296d70b5f5c3b4aab527749850ea78bec3ef5947151b21598c3bb04e52f78b5e6db179e7fd922627862b5e SHA512 db7ea7c5f3489195a48216037b9371a50f1119ae7692d66f71b6711e5ccf78814670581bae015e408dee15c4bba921728309372c1cffc90113cdc092e8540821
-EBUILD fltk-1.3.5-r4.ebuild 4474 BLAKE2B a8ee3868ed644172238fa4cd2746d1f2567f1fd7414a965da678544db4efc47349f097b7e72499fa60356b9446767e4ea128c4d811035065d2b86696c4f185bf SHA512 5c390545cb7dd434ad34029deb5aa9a69c03d380c97f3e90077934026fb7a877ba0bbb76ce61d75ba72fedfc1d9c1be649a0be9c545d04ee1fe867fc0431f328
+EBUILD fltk-1.3.5-r4.ebuild 4473 BLAKE2B 0769301ce2b261b45b7b22868bf0fb703101ad2d99caf9579bdd9d0656a9ccef8a3d849139a81b54a4a3922437039a241e7e75f7f3b1bc9ff430aede7846049f SHA512 3680906bb43e350504cfaca7c3f95dcd7dd20941714b5ebafb15fdcd4aac8dc343c918f9c72b5997fd10b2089b12e302a25f0744b7cd3b775bf2c1ac644a6a5c
 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
diff --git a/x11-libs/fltk/fltk-1.3.5-r4.ebuild b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
index bcc3ab8584a9..63067421100b 100644
--- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
 
 SLOT="1"
 LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
 
 RDEPEND="
diff --git a/x11-libs/gdk-pixbuf-loader-webp/Manifest b/x11-libs/gdk-pixbuf-loader-webp/Manifest
index f06cec098aa7..db22a2a739c8 100644
--- a/x11-libs/gdk-pixbuf-loader-webp/Manifest
+++ b/x11-libs/gdk-pixbuf-loader-webp/Manifest
@@ -1,2 +1,2 @@
 EBUILD gdk-pixbuf-loader-webp-20160328234507.ebuild 767 BLAKE2B 478f4903194f44aef8fb8ea2bb75cff166c440eb27f9386579a762b715c1ad7adde770d408ffc359fb8d7dd931529e47b81dc302317a714073891ae410034532 SHA512 0232872cbbf2b1faa1adca1b4a562aee13d16bd637013ff271b49bfaa05afd99bfa8ebca99d08010d72c32a0a86d364e6ccd84e7208d6ebcfd80b9bd0c38e23b
-MISC metadata.xml 256 BLAKE2B 148acc60ba5999bd340afe793cd756b1f5bb5d7b7767f8e7a51bbe54b226394c504c721d38ce634ac012be3928e07057b8062b34e5eebdf3cb5e618fd3eb400e SHA512 bb9ddc448dcf7af4d62c19e5522cfccbd052b6e1bb939a32d7b7576b088c9c3b46dc706504617444842b6cf0b1ef91341548b71cf930ea36a10b248719fbd2aa
+MISC metadata.xml 342 BLAKE2B 3036cc963c273eb086246302156ff0dd4ebefa7e97bd9a46096a9c73944064b8b2daad8cefccbce2501d5b430d2d450bfe1c94de6464ef26bc095985a3ccd955 SHA512 b41ff0807862bd1305a98f53193cae55b62c66c2c8400d2e42f46dc44f5e7cf053f591dcf3a965aeda43c57c6239b3a559f0c234a43c96ee60977489d1f5b4cc
diff --git a/x11-libs/gdk-pixbuf-loader-webp/metadata.xml b/x11-libs/gdk-pixbuf-loader-webp/metadata.xml
index bad62cee6a19..4c2fa98245b3 100644
--- a/x11-libs/gdk-pixbuf-loader-webp/metadata.xml
+++ b/x11-libs/gdk-pixbuf-loader-webp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">aruiz/webp-pixbuf-loader</remote-id>
 	</upstream>
diff --git a/x11-libs/gdk-pixbuf-xlib/Manifest b/x11-libs/gdk-pixbuf-xlib/Manifest
new file mode 100644
index 000000000000..24da105909cb
--- /dev/null
+++ b/x11-libs/gdk-pixbuf-xlib/Manifest
@@ -0,0 +1,3 @@
+DIST gdk-pixbuf-xlib-2.40.2.tar.bz2 52418 BLAKE2B 95c01aef9cafa80171e1ca2d6eb372a3d4e13bdb8d098a1da9259d6cc881494da1954936d20c24d06a38ec5258323e3fc4f6dc4cfc5a9f1ad6e50bc5861e65c6 SHA512 b9831bd1b4db8718b35ed96057496824696e311ce1661394397306ea9d544e6113aaa6865cdd1c1a250bc3617515fd81e3f45d997531507d2592fe294cbde01c
+EBUILD gdk-pixbuf-xlib-2.40.2.ebuild 1049 BLAKE2B 23f3f8b3d84ed58f0841dd035852434804c768871035d77b2ce8a19b4d3268fb70ef51722a99fbf8bae2207ce58b75c08f504184b2958df05435431a5d5e87b3 SHA512 55c6f39496f1dc7c3741a48383af70c9e1f7d17fac109795d5184cb88b49514976261824d17f123d7c2299fedb763ff421cd6b32325cbee21c5b2a544e97cef0
+MISC metadata.xml 336 BLAKE2B b741dfbd8af9655d14c9d5794d0a421a0309b66a13c2d8e5800749b1acb3b68bc8084599fdb76a652e5cb2892d2206eb92a4d2915281089ad0e46022b59d3b1b SHA512 1af76541baa1ab105fa434b4caef8a0ca5e5caaad5be33823a7885f850836a195666f98e453e1c90e06aa3d869feba1383e49b3629a3672c4e5f4e8cdc344962
diff --git a/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild b/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild
new file mode 100644
index 000000000000..e846536da7e5
--- /dev/null
+++ b/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson multilib-minimal
+
+DESCRIPTION="Deprecated Xlib integration for GdkPixbuf"
+HOMEPAGE="https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib"
+SRC_URI="https://gitlab.gnome.org/Archive/${PN}/-/archive/${PV}/${P}.tar.bz2"
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="gtk-doc"
+
+RDEPEND="
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.42.0[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.3
+		>=dev-util/gtk-doc-1.20
+	)
+"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgtk-doc="$(multilib_native_usex gtk-doc true false)"
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/x11-libs/pangox-compat/metadata.xml b/x11-libs/gdk-pixbuf-xlib/metadata.xml
index 39980802b1da..b92ed12f95c8 100644
--- a/x11-libs/pangox-compat/metadata.xml
+++ b/x11-libs/gdk-pixbuf-xlib/metadata.xml
@@ -5,4 +5,7 @@
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnome:gdk-pixbuf-xlib</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 8a5de0f5c1e0..a31fb2eed362 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.40.0.tar.xz 5512160 BLAKE2B 26049a9ede60e7a50bdc5e9a731136e4bc6de031d01abd42667a0bf92617c36bcdc61d2dc18beb3c5223e32eab461ddb9fc9880a014ac1154763d3b7ee3e7200 SHA512 6512befd379494dbfd89a16fc4c92641842eb7b82fc820ec83a5b057526209947db646570db1124c073b0ef69c117bdf0f8d3fea807e302a4950db39187c35aa
+DIST gdk-pixbuf-2.42.0.tar.xz 6510964 BLAKE2B 1299d050620a08582cb80d3d726713a1c005de3148e6e24a425248ea85f705ee741199c8ab445e4de4c3338904bf37c7a4ff0e61fee4fb23d68a93489b972b84 SHA512 c9962d42e5bf13514091234342e259be1e06b2c4dea2936e16104a3b58f0b6837f070224c04be9541d75f5ea34d1da398f178a1eed1f9059f6429faf5c223e34
 EBUILD gdk-pixbuf-2.40.0.ebuild 3859 BLAKE2B 6323340183ab63df29d32bc7f207714e59fe85269fa12005189a2004f6e8f08137c0555de2a06cc6b53e7744ded3bc6968f30b71e3973da0c4ebd90dd7d96d74 SHA512 916e1b6f5dc694533109a32f343ecca40602e752e4c38ae16d19d53a961aa8857cd624fa99787818cbfab1ab7c73ac38f182a655556d7502e707b579f5bce86b
+EBUILD gdk-pixbuf-2.42.0.ebuild 3467 BLAKE2B 2e167e5693c88106ee260555b1e7443c68c51de7b50fad721efbe1a00248ab8c5bc7507d246fc2c22bd0b80ad6a06519b629c530b52628f17a87be8c177a6253 SHA512 e9d4dffcede96becb14265a841f9c846a8bc2fdcbf0f9043b8c00ec80e72ba00f2e37750cddee58058456ab4ea88c7ffa3648642796de7f697b53b515910973e
 MISC metadata.xml 424 BLAKE2B 07b31586e47af1803baf8ce93c9e61334fbe566e8fae5bcc9d442d09b3ddfc51b06be8f02ffebf663b0307130c57e94b63ff57a83856ebec755704b8d3b232bd SHA512 3ef93327d28195a186bcc16c8acbb931c2cedcc7893173ca76af0db90eb088a838f5cb1c2f43f4b72fcf9067f6c483c96a5549c57c3542cccbb70450cce485bd
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.0.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.0.ebuild
new file mode 100644
index 000000000000..4bbdfcaa31a4
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2020 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+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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/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
+"
+
+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/gl2ps/Manifest b/x11-libs/gl2ps/Manifest
index c9209c252fe5..e54a8861e716 100644
--- a/x11-libs/gl2ps/Manifest
+++ b/x11-libs/gl2ps/Manifest
@@ -5,5 +5,5 @@ DIST gl2ps-1.4.0.tgz 300339 BLAKE2B bda8742dea6c1b4eb3e3a3492e6f38229feb6480131c
 DIST gl2ps-1.4.2.tgz 301134 BLAKE2B 43c93f93d09dd7a6af0711819647f5f82c0853a80822dbc600b7502f2c86612f5cb2edc31729c67abbab44cc8fec7aa1fa7e13f0d115b0d79c7a7d45fa1a3079 SHA512 46652e1b3825ace61dbd77c4b0bf451e7671c248eb18bbd3369e2fac00056ea4cd5d2578561984313c239e3b02f78b9d9a76d963c935af65a13bc2abfc538620
 EBUILD gl2ps-1.3.9.ebuild 1245 BLAKE2B 4aceedc95a5adb17de36248fff3cb41e4439e2ce3624c396c52667352630fb865fb09b56b13277fcb3e4bf2bcb22f33a9106710b9d702dfe76c29f0c50a9c7e2 SHA512 3a8d32deec6854b23401e3068cd1174c13951c71c918791b4c82a5b81e58e1ceb701474a9c6fbb1856c932aafc6dae5c4bfed6ac9150c89b1c46646dbdfa5d14
 EBUILD gl2ps-1.4.0.ebuild 1240 BLAKE2B f367ea59dae36e5406444df3a8e8160c614ee30e742a7a7e471cade787996ce4fd0aec6bec00267df983e2f2492979e78e71085638db3a3a1c05888834c29a55 SHA512 7e1f233e1f6ec156aa1c7b7cb93f69287b2a2793266aa2b8a6c17fe2c00313336ce73f3e80eb315433e5a68fcabf6a4a615cac06d3ee4bda52449e66544069a8
-EBUILD gl2ps-1.4.2.ebuild 1185 BLAKE2B 73f830a9d5bd1a8ec5376e8d4ab7426340b65ebef8f09441e0b51943a0e78608bf2a5cb032563986688213cdfc5b349fcfa9afc680426cd8f45089cd0f59441f SHA512 a585d0be41f686e7694f75aeecc9057319571ce43a3bf02446baf1c88284c99dc70524ad164b456591bc04198fbe4679049fbcee1ea2dc794e5c786332be4ec1
+EBUILD gl2ps-1.4.2.ebuild 1190 BLAKE2B 50fa5c07fc6fba2a77b5f0147d9a59c124c459642851e77e12e4f754d2cf343d3ee4e1f13141195b0d18f4956be96000bf818626f0160c4e0917cc38ef7c30af SHA512 64ce53255b45d2ddbf2b57e25dc0e90709b622d845584c711d25e94a33a9091731c7b0fe516309ae74a3ad15a27362b48c2596d7b2fe798a7dce4d0aa4404e52
 MISC metadata.xml 722 BLAKE2B 357dece0405ffb4a0714a534246c0f119a6b19d08b0d9867695d178af5e68bdf40b55824d35817c44ae85094f1900368ddf167752bc97c184cde687fca631a84 SHA512 0cd6f7dc51149def7310418cf775980f8287b9e40bde438e03dde020623f19b49648662f12e06233be7686eda4a5b75f79e92730dfdfd1a3ae6da80d6413efc9
diff --git a/x11-libs/gl2ps/gl2ps-1.4.2.ebuild b/x11-libs/gl2ps/gl2ps-1.4.2.ebuild
index d97b83f7cc60..3a1ddec1798b 100644
--- a/x11-libs/gl2ps/gl2ps-1.4.2.ebuild
+++ b/x11-libs/gl2ps/gl2ps-1.4.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://geuz.org/${PN}/src/${P}.tgz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc png zlib"
 
 RDEPEND="
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index aa043fbe0d30..c180c32d87cc 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -6,15 +6,9 @@ AUX gtkrc 627 BLAKE2B 57af25dcadfa09ea784ac485db383753deda23c42ce22582f03041abf7
 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.16.tar.xz 20417592 BLAKE2B a0b18c72cd91ddb6533577efad7327df60870b5424409076698ce2b8cbe68a4382a12d947d7c60243ddf4eebe0e14ae9986d5b82a11bef64f1f0287949354986 SHA512 181d31dea038016357cd0eba5b9e8a17056bc061f4ae2ebc713bceee46cd30787993cec463aae658faddc57b9071549fa196f6a2a1f67c314d99e4365f50a0cb
-DIST gtk+-3.24.18.tar.xz 21292668 BLAKE2B 4d06789d027f9b9e070093460daa579afa88a14b9d5a3c028db3dbf20dfadbaab671ae56a9820eef5b2244a00f09f4be4413f1c06b11ac4db6c1044f824a01f6 SHA512 51ba13ae3cd0db9b62462ba399f08738885648adcb545bf0852c4e5b04bc2a1dd88629fafefc282f6a200daa8330e7606f22a70bd2ce6fde32a992a6cd7a0950
 DIST gtk+-3.24.20.tar.xz 22726768 BLAKE2B 75daa850275d55758503fa98055ca4deb9adca172e0f38c39ca4d5e7f8179398ca8753a759b0d3afc1ad1712ac6e3aa2cc1bce29e2a8fff4198a7f2d70002b11 SHA512 bda8eeacf721afcff4565756fe45857cbf8b053494d1d747ca9b97c899e9fe21fddef6871ecd5ec9a7a0f87b0a3ede2f9d6b5e5712de10a845100d82464a4556
-DIST gtk+-3.24.21.tar.xz 21353740 BLAKE2B 9fd612d586a09a7f2cd766c91db765138a03c2be1bb866f6a570aaad6d7e61287bf19fc2951a2772dad5db51c81dda8868a0cd95bad1db0a1106700677e0e590 SHA512 97ed88e69d9002279869044772e5aebc1ac4ed6f4a8afc1586a349710a1d414fc735e1257d5f34f6300914a0ca7c7ede073bd9429ee16077aa83f3594784c60e
 DIST gtk+-3.24.22.tar.xz 21349784 BLAKE2B 03dac82b3928a77beab1b4fcfcb9fdeb5e458fae13f7ff5459c2c65c7acdd6b255e62cbeaace02ec19ab4a41ff3ba2003dc004bcbaa4ee8206986e35fd7d1084 SHA512 ac653438a0a818885f2aa46a131b1ab0038a57b438406724a674313d8bf4325b1d2e87e4e8c77a92d0cfa8f8d6eaac46ba6890830290e9a9e598c978144861a2
 EBUILD gtk+-2.24.32-r1.ebuild 9957 BLAKE2B 9f5b89755fa452b5b2ca075093f703b1ca0e904de6848a24644a5662bbfe0edd1dad0d1a4732e268d7878a2702b4432a39ed22f33b6c45f44e4fffd0e7dc648f SHA512 e8f2dc31fa4ba63128bad6f2b7130a872344d86562d38675011661baff8cf16c56efe375933b5ef67d33555dca2ea963b54d66827a179132cd56532b77974a89
-EBUILD gtk+-3.24.16.ebuild 7267 BLAKE2B 14118fd199adbe0538854f9052864eadd94c10d42a5ec467c5820ea267d22994b95e0d15317a4549b84d597a9931866fba0777e5fb8f0664aeff15f85975a684 SHA512 032b54fd90d4dfa92fcb970b6a1c11e1767c9723d142b0476aa22362885c1fc32d1cc8cf89d1562dc48cd34539d885656e5b7bda13fe1a89aabf8b93ec77c046
-EBUILD gtk+-3.24.18.ebuild 7275 BLAKE2B 56a9c7d5ce48c0e3141375fd11646d4e5c39bd1536f2464b67d63fafb0d4befd3f5d918596b624618ed1279f19da26a1d359bef6edf8cd19ee6f865eb2029e82 SHA512 c5694653f9abb7b565c9f7657d21e92c58d94af8f521a3325b8373ebe6b949231238955b0bfe0baf97c8459c9742ad636bfb0541822894cc4c436abed7201d3b
 EBUILD gtk+-3.24.20.ebuild 7267 BLAKE2B 14118fd199adbe0538854f9052864eadd94c10d42a5ec467c5820ea267d22994b95e0d15317a4549b84d597a9931866fba0777e5fb8f0664aeff15f85975a684 SHA512 032b54fd90d4dfa92fcb970b6a1c11e1767c9723d142b0476aa22362885c1fc32d1cc8cf89d1562dc48cd34539d885656e5b7bda13fe1a89aabf8b93ec77c046
-EBUILD gtk+-3.24.21.ebuild 7275 BLAKE2B 56a9c7d5ce48c0e3141375fd11646d4e5c39bd1536f2464b67d63fafb0d4befd3f5d918596b624618ed1279f19da26a1d359bef6edf8cd19ee6f865eb2029e82 SHA512 c5694653f9abb7b565c9f7657d21e92c58d94af8f521a3325b8373ebe6b949231238955b0bfe0baf97c8459c9742ad636bfb0541822894cc4c436abed7201d3b
-EBUILD gtk+-3.24.22.ebuild 7270 BLAKE2B 3d58b21f2f3abd54306721d29363b8f313a699886f1a1cde96fd519769960c4407c3b23c61dd87b4c6f5d64309fbce00d2f82c0d67d0d87a7fdea723d55f4152 SHA512 7dd3b007b00bbb424438022cfbae8e16a37791e016207788de972a18dc3b168aa6db07a21c031232213792d3535860783edecc71f2f80fc68fbfa68c16cf58b2
+EBUILD gtk+-3.24.22.ebuild 7267 BLAKE2B 14118fd199adbe0538854f9052864eadd94c10d42a5ec467c5820ea267d22994b95e0d15317a4549b84d597a9931866fba0777e5fb8f0664aeff15f85975a684 SHA512 032b54fd90d4dfa92fcb970b6a1c11e1767c9723d142b0476aa22362885c1fc32d1cc8cf89d1562dc48cd34539d885656e5b7bda13fe1a89aabf8b93ec77c046
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-3.24.16.ebuild b/x11-libs/gtk+/gtk+-3.24.16.ebuild
deleted file mode 100644
index ed300aa27ff8..000000000000
--- a/x11-libs/gtk+/gtk+-3.24.16.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2020 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 ~x86-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.18.ebuild b/x11-libs/gtk+/gtk+-3.24.18.ebuild
deleted file mode 100644
index 476dca8c34fd..000000000000
--- a/x11-libs/gtk+/gtk+-3.24.18.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2020 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 ~x86-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.21.ebuild b/x11-libs/gtk+/gtk+-3.24.21.ebuild
deleted file mode 100644
index 476dca8c34fd..000000000000
--- a/x11-libs/gtk+/gtk+-3.24.21.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2020 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 ~x86-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.22.ebuild b/x11-libs/gtk+/gtk+-3.24.22.ebuild
index d6ff19b1322d..ed300aa27ff8 100644
--- a/x11-libs/gtk+/gtk+-3.24.22.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.22.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index bd6a6f6349f6..71e8b8ac49f9 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -3,11 +3,8 @@ AUX 4.6-gentoo.lang 3898 BLAKE2B a47c411fa650a53cb9176c3b670b5189ea9ee0c268d0944
 AUX gtksourceview-2.10.5-G_CONST_RETURN.patch 6799 BLAKE2B e3276c433d2bb6286ea8f6d5b45fc602a798c0261d12e065e8c5e1ed132f686bba93e450db7aa13a155f09841939733208dbcff9d2517f698536df1b7099b1ac SHA512 1a36c45a067cf999494b14f30d3322aa596343b5f77e54e337a382f6fc9857803cdf2f97a44433e4c055a0dc235fa270d335b6536fc682f0d952f06a2ce44546
 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.4.0.tar.xz 1105776 BLAKE2B ef4ed4ed15435daba60795598ba41624b2680b0518246d5d6ade3630cb96e2bac96fea08105e72db7b5a07e714f9270ce27c11e9448fd1b21e8d3942989b2255 SHA512 068e723525290c5356c5ce3f5e5b5b8ecc9f7b1ff2f8234da247d1a84bed63ff5601cad6550981720859286e107705ec25cc7793b754ada164ec6569df0df9eb
 DIST gtksourceview-4.6.1.tar.xz 1162024 BLAKE2B 41f84dade9e48cc958fecbf887f4c733cb1631557be34e52ca5af39802455f115e9920d368406314299aad35b1d18995c4e403f0ec3a9b3a27254fd1952f37e3 SHA512 3341e6248a0abba6373a79742b4348d8aff58ca6a4b9093729d0d1fe2579ab8acbc61f1ecc6d350000edae60c963eeca866fa659b3f3d6ec320cdbf1ed21fdec
 EBUILD gtksourceview-2.10.5-r3.ebuild 1347 BLAKE2B 906f89f5840c70e6b971f5ee4d4a84cdce5ad71081d1762c434d34ebf6534eff74450ae81bc796201fb74c20537eaec76a97774d9f5eb1a6cb2c65a20a29b4f0 SHA512 c864e339c432308d99a494da8a3366de9c299cad4c109fa2d96aea4ae82a3f7be9453a5c5ab1f8648233d922f90343fcf5ad85b33defb3f0e37f3937d1bbb7ef
 EBUILD gtksourceview-3.24.11.ebuild 1272 BLAKE2B d606bbfed3a72adf6478175516be05045a5ccdeace5b4f6e36c1f9cce337e01f27ab680f1da56462c187b5085a543cfe272088f3dc9ca385ee1c3b28af2ea2e1 SHA512 f54f0e0a88a3e5310c75f985eee92ff3cfe0db3b930c7eb520879b519d214394604c84155c3ee9fef23a12477b81d4de1848ee1c29aa6c352af986b0247b3489
-EBUILD gtksourceview-4.4.0.ebuild 1729 BLAKE2B 35d5b3c27652d73df5968a62721e8de720eab4519491d9416076e3b40d9ccb8fbfe919da4e65e8c4350bb179621c9b8ece601592f8e68b6748343fc91c4a32b5 SHA512 4df46bc6ee781206e15e57d79285052bcb7d0ed48d11eac641529f45515ab83a83592062cd04f51d1c9d2d844044b21b7369f914737b6862a21b042eeec3b3ef
-EBUILD gtksourceview-4.6.1-r1.ebuild 1743 BLAKE2B f687637afa2238f5f0d7df7ad60f842f4519c5234e2ba111bcdeb3d8b640f4a8bb021484a513afcddd0bc3923f45698fa55ecd329972a3030bcae43615ff0ec9 SHA512 6a563a1b0e9422d6995a79edd0d0e64f52bc9b632636fa84d819b8a708f1eaaf3a8f79e81d1a43a05277ec06d16a1a7960921848a63e9c877543a2b6705a64a3
-EBUILD gtksourceview-4.6.1.ebuild 1731 BLAKE2B 2cecc61b07eacf60ede14fdaad3f86f8799a62001ad5e93bcd0ee6b07697fc6582d929114503e6cb3a3515f525410506383bbff767e4c581f2a1650e05d30fb2 SHA512 560df5a55b48e0a61952bee2456b7b0c094157c62d4e2c01bb62915274a0dd6371578ce8322c3bea2133a2bd61c150cd74e676cbd7f2e0e8cc3b87e69399d2a4
+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-4.4.0.ebuild b/x11-libs/gtksourceview/gtksourceview-4.4.0.ebuild
deleted file mode 100644
index 8ba52ced7064..000000000000
--- a/x11-libs/gtksourceview/gtksourceview-4.4.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson vala virtualx xdg
-
-DESCRIPTION="A text widget implementing syntax highlighting and other features"
-HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
-
-LICENSE="LGPL-2.1+"
-SLOT="4"
-
-IUSE="glade gtk-doc +introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.48:2
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	>=dev-libs/libxml2-2.6:2
-	glade? ( >=dev-util/glade-3.9:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
-	>=dev-libs/fribidi-0.19.7
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.25
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use glade glade_catalog)
-		-Dinstall_tests=false
-		$(meson_use introspection gir)
-		$(meson_use vala vapi)
-		$(meson_use gtk-doc gtk_doc)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /usr/share/${PN}-4/language-specs
-	doins "${FILESDIR}"/2.0/gentoo.lang
-
-	# Avoid conflict with gtksourceview:3.0 glade-catalog
-	# TODO: glade doesn't actually show multiple GtkSourceView widget collections, so with both installed, can't really be sure which ones are used
-	if use glade; then
-		mv "${ED}"/usr/share/glade/catalogs/gtksourceview.xml "${ED}"/usr/share/glade/catalogs/gtksourceview-${SLOT}.xml || die
-	fi
-}
diff --git a/x11-libs/gtksourceview/gtksourceview-4.6.1-r1.ebuild b/x11-libs/gtksourceview/gtksourceview-4.6.1-r1.ebuild
index a82938f8e6f1..92fcd8bafb7b 100644
--- a/x11-libs/gtksourceview/gtksourceview-4.6.1-r1.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-4.6.1-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="4"
 IUSE="glade gtk-doc +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.48:2
diff --git a/x11-libs/gtksourceview/gtksourceview-4.6.1.ebuild b/x11-libs/gtksourceview/gtksourceview-4.6.1.ebuild
deleted file mode 100644
index bdfd63a50a4b..000000000000
--- a/x11-libs/gtksourceview/gtksourceview-4.6.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson vala virtualx xdg
-
-DESCRIPTION="A text widget implementing syntax highlighting and other features"
-HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
-
-LICENSE="LGPL-2.1+"
-SLOT="4"
-
-IUSE="glade gtk-doc +introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.48:2
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	>=dev-libs/libxml2-2.6:2
-	glade? ( >=dev-util/glade-3.9:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
-	>=dev-libs/fribidi-0.19.7
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.25
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use glade glade_catalog)
-		-Dinstall_tests=false
-		$(meson_use introspection gir)
-		$(meson_use vala vapi)
-		$(meson_use gtk-doc gtk_doc)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /usr/share/${PN}-4/language-specs
-	doins "${FILESDIR}"/2.0/gentoo.lang
-
-	# Avoid conflict with gtksourceview:3.0 glade-catalog
-	# TODO: glade doesn't actually show multiple GtkSourceView widget collections, so with both installed, can't really be sure which ones are used
-	if use glade; then
-		mv "${ED}"/usr/share/glade/catalogs/gtksourceview.xml "${ED}"/usr/share/glade/catalogs/gtksourceview-${SLOT}.xml || die
-	fi
-}
diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest
index 7feca8bdbdd1..09c8ed68aa84 100644
--- a/x11-libs/libSM/Manifest
+++ b/x11-libs/libSM/Manifest
@@ -1,4 +1,3 @@
 DIST libSM-1.2.3.tar.bz2 362595 BLAKE2B 20b7327cd16e066bd2a81eae60f52cab7499dd92d65786d0e5726faa64c2055376749562ff2158777f83711e1517b90b2dc94670892b787889b3950c0a975b68 SHA512 74c42e27029db78475e62025b4711dbac5e22d2f8e8a24be98a1c31b03c0fc4afe859928f851800ea0b76854f12147900dc4f27bbfd3d8ea45daaaf24b70a903
-EBUILD libSM-1.2.3-r1.ebuild 1716 BLAKE2B 3a62548d9ac42a4db4ebc152f531ecb782332257176e17b7b9a5dfdf447ab1c584b12b42e219842f8261e8e34e53e944a43f802d5655c1100affc10879448816 SHA512 5ecdbdbe45572ecc6ce0a457d9e829a989c18c8fad3772d9997544472a822778f1bbb941c533af806533c69d17eabd8adbb74c6ce721ba4d650c48eadec38de5
-EBUILD libSM-1.2.3.ebuild 1701 BLAKE2B 80de3f03ca0d9153efd44adb945754ab913641371c6e92d7c27ff613d1f54c46b078900f27b31cc7f77b9eb0c407c4ea9a8d117cab3ff2d1123defe15a9b6ccd SHA512 dd3cb2c239fae12ac931afc4f50e8113c101cb838df02dc653b3c1acba7b747cb93450783e40904725159bcf3923a7433dcaafc863ec4cd125e0871a71b0b7d2
+EBUILD libSM-1.2.3-r1.ebuild 1707 BLAKE2B 19f0a04f58b4cd0bf57eee41d09fbbe176bccf5f1c74fbdf2470d324aa6bcb11d67ba3b3779b3622f62007a27551e5bce73fc772a24dbb55396eee8cba338702 SHA512 2e69e99401055f5dd553a483b7d133ca61992c5d32b2c9563323843087f1f6a8bd36bff75606a94d49c34f570258b145ba6b28c8feb1e98536ad79fa556b205d
 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 557451f174c4..6be5b0ade224 100644
--- a/x11-libs/libSM/libSM-1.2.3-r1.ebuild
+++ b/x11-libs/libSM/libSM-1.2.3-r1.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Session Management library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="ipv6 +uuid"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libSM/libSM-1.2.3.ebuild b/x11-libs/libSM/libSM-1.2.3.ebuild
deleted file mode 100644
index e54c21ed13d1..000000000000
--- a/x11-libs/libSM/libSM-1.2.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Session Management library"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="doc 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}] )
-	) ) )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local withuuid=$(use_with uuid libuuid)
-
-	# do not use uuid even if available in libc (like on FreeBSD)
-	use uuid || export ac_cv_func_uuid_create=no
-
-	if use uuid ; then
-		case ${CHOST} in
-			*-solaris*|*-darwin*)
-				if [[ ! -d ${EROOT}usr/include/uuid ]] &&
-					[[ -d ${ROOT}usr/include/uuid ]]
-				then
-					# Solaris and Darwin have uuid provided by the host
-					# system.  Since util-linux's version is based on this
-					# version, and on Darwin actually breaks host headers when
-					# installed, we can "pretend" for libSM we have libuuid
-					# installed, while in fact we don't
-					withuuid="--without-libuuid"
-					export HAVE_LIBUUID=yes
-					export LIBUUID_CFLAGS="-I${ROOT}usr/include/uuid"
-					# Darwin has uuid in libSystem
-					[[ ${CHOST} == *-solaris* ]] &&	export LIBUUID_LIBS="-luuid"
-				fi
-				;;
-		esac
-	fi
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable doc docs)
-		$(use_with doc xmlto)
-		${withuuid}
-		--without-fop
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 50cbf7211649..1245148781f9 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,3 +1,5 @@
 DIST libX11-1.6.12.tar.bz2 2376498 BLAKE2B a2c6c76d5d4a15073f7837e6a72ecd8b7711dfcec48c54da538a6100a4afa01334a9456376633f1a2365717e03231c6b777c5683e462d10564065dc2437da39a SHA512 79df7d61d9009b0dd3b65f67a62189aa0a43799c01026b3d2d534092596a0b67f246af5e398a89eb1ccc61a27335f81be8262b8a39768a76f62d862cd7415a47
+DIST libX11-1.7.0.tar.bz2 2409144 BLAKE2B 1eb6aa8f2fe50ddb2f6d324429b3d9cecfb48833c3f52f22ae8e32846be614c8db63c57d25e2b1c46612b6b333ff61ceab8ac0b605b117bcea1224f918af8e6d SHA512 f661ca90350fd8a94f054b00f12f5122cea068ebff706acfd399462236c189a296a2358d17d16166635101cf56cc19303dd407873a159932d093c9f33556f9fb
 EBUILD libX11-1.6.12.ebuild 739 BLAKE2B e6cd8b1efb69830827eb1da03aa9d787b476cbedc9365aed49e73fea393f8cc976f66a48a8dafdc919f2df3b8d17cd3e975ffd4302a4b932939ba435643fa20c SHA512 ad71978aaae6e2827d79815147fb22ee2e3d4224ada3ba4a0c48d3cf8f204c936136bf601b4d57b03a7eecb5cac44f7eccaff4c7fc2e0354d1e1debd62bf7944
+EBUILD libX11-1.7.0.ebuild 850 BLAKE2B ae62f3086b5562601b7655b34648d279f07669279becb174a5ee1d8a66cdeb482256af317ec3d271cd8a53a948b70aa4bfbc4a065ecc003e77061c1128af9442 SHA512 c5c03912402202e8aa5fc1942f374af3d36106e8a6673461ceefad9a30ffb99133c36bd7d742736c6f4de6e3f21fc13ff0e1275311445e87629dd51753937591
 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
new file mode 100644
index 000000000000..b074ab686443
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.7.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit toolchain-funcs xorg-3
+
+DESCRIPTION="X.Org X11 library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="ipv6 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
+	!<x11-base/xorg-proto-2019.2
+	x11-misc/compose-tables"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/xtrans"
+BDEPEND="test? ( dev-lang/perl )"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc xmlto)
+		$(use_enable doc specs)
+		$(use_enable ipv6)
+		--without-fop
+		CPP="$(tc-getPROG CPP cpp)"
+	)
+}
+
+src_install() {
+	xorg-3_src_install
+	rm -Rf "${D}/usr/share/X11/locale"
+}
diff --git a/x11-libs/libXau/Manifest b/x11-libs/libXau/Manifest
index fa7e1193df39..8d0b348dc7a4 100644
--- a/x11-libs/libXau/Manifest
+++ b/x11-libs/libXau/Manifest
@@ -1,3 +1,4 @@
 DIST libXau-1.0.9.tar.bz2 322650 BLAKE2B 0bc9eb01b99f13a8f978edd7ff63d76f89071ac27f1cd946f9ebc96165a892e7ba7cdcdc52f73e8ed6d5b3d672f8a29a24582195fe14d1d24730a797a592cdd3 SHA512 3ca454ba466a807ea28b0f715066d73dc76ad312697b121d43e4d5766215052e9b7ffb8fe3ed3e496fa3f2a13f164ac692ff85cc428e26731b679f0f06a1d562
+EBUILD libXau-1.0.9-r1.ebuild 454 BLAKE2B 8171a899a0cb4952e7210b3abc8a6c6696a93336d25917a2b7fd7f5f81fa9ca26dfef2dc3fae2f8d23f7137b1bba769e314bb5cee28bd16dcf4cfe3ca1a4ebe3 SHA512 8fb3a37d24c78949fe9e3d5846a45530660fb3ddc78d503a91a9f1249c575fcea0d1d1477427563c6f359d23ee16a701dca07acf4363ae8022e21f4a2c213190
 EBUILD libXau-1.0.9.ebuild 474 BLAKE2B 9f7b74e6f5c183b91cf92b892df357407d1898132aa386b72b1c30b2bcca87b2b84b68f4884ec62f3a982dc23a90f478de45d87e5712410fdc1a2740f5732794 SHA512 a92a61c1abf46a69ff83d7ef342742e61005ef6278406a62201a78f3d39f55775a8d14687d99b057124915acf98184e2989f5dbaa6d1a5cb13205d5398e5a2f4
 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
new file mode 100644
index 000000000000..6a8a2be263d7
--- /dev/null
+++ b/x11-libs/libXau/libXau-1.0.9-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org X authorization library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 302b8e92f2a8..a4ad5c52a366 100644
--- a/x11-libs/libXaw/Manifest
+++ b/x11-libs/libXaw/Manifest
@@ -1,4 +1,3 @@
 DIST libXaw-1.0.13.tar.bz2 674140 BLAKE2B e141a135d1a45edfb71687951542a31d838bf560997a631b3590db0581f94768a8cc77ebd86c7cff60668e9843b1258a9eb60383a4d25b704ce9dc91fc6d0bdf SHA512 d768a39f7111802493fa1df1b80d858e4139ceeb883d45ff13ce3b7a0e775a7d2834b7ad157c8330117f04c32f38979795332dd7a119adb2344fcb1aa9cf1e2f
-EBUILD libXaw-1.0.13-r1.ebuild 876 BLAKE2B f580b1fa6791ea8f0e5444bf7c5a392a155b06e1717165914a0fbfd0c5825d78a9dffc1a8dc85aa0068c3f933679b1823186acea0b4ba2b2f82932d3bd15568c SHA512 daf10e307f9071c9812f5f6661a60bbef1af69bc9685bd7f792d4adc3fce37799be23239beafe1ef9400936e420b366eae76ba39830f247161920374f9363f45
-EBUILD libXaw-1.0.13-r2.ebuild 891 BLAKE2B a6c957321d621974e077e656e62dca3277653bf377775753a4e217ef17473493084209be5edd0f8b4f512e3b54e27763806de5f1b251e22a2d5961ba0d03f1c0 SHA512 51d721e8bb67d93d7aa26f34396a753f99a442f12ac9b0e458e636dbbfebdc6d89028b146288e552be0c49246e6df8fb516a82b6be70c1439376321db3b1e61f
+EBUILD libXaw-1.0.13-r2.ebuild 882 BLAKE2B 4e97ed1691141b6725fc4648a5336a9aa8241ae52500f1119c98a277d05bdc688c81d2296ecd8d6a6db179b6cabfe20d9aec2990f938634dfdea68337ec9c424 SHA512 e172c05de85fa36ce9eb8901ae02e783c97359af661690211ef0dd3e2ab35be8025e89e00d744d16821557ba9dae58a4a1fa7d89b5b0557bb9752378961ef617
 MISC metadata.xml 308 BLAKE2B c8b1bdf11408b82ade3364323648bf367d76ddec0711a46f3662f4fe34aec46918c7acc617a782312725ab0169e82c25d480194a2ff22bc3429f5f3c1d4e434d SHA512 331203494a47823877466669591ec0de413400dc18f51e96c18a06b7bece2fe56a73055cd7f1e4ffcf6cc9cc9bdd488a7a5ce2830def9ce5a6ae187c52dad364
diff --git a/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild b/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild
deleted file mode 100644
index 4f65e1ca4a4a..000000000000
--- a/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xaw library"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable deprecated xaw6)
-		$(use_enable doc specs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libXaw/libXaw-1.0.13-r2.ebuild b/x11-libs/libXaw/libXaw-1.0.13-r2.ebuild
index a7fcece439b2..25d01c55fbc9 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 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="deprecated"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXfixes/Manifest b/x11-libs/libXfixes/Manifest
index 2fab21e44ccc..77c812d4785a 100644
--- a/x11-libs/libXfixes/Manifest
+++ b/x11-libs/libXfixes/Manifest
@@ -1,4 +1,3 @@
 DIST libXfixes-5.0.3.tar.bz2 294400 BLAKE2B b9a6ce65bef20c24cd75985d7518ab19d7874419d508f4ca6767fe804adfd0e3baebaab69aa9c201901192b8ff5067f5de8d10362ef5c9b6ec12363553389639 SHA512 72d5ee496e5c0520c95ef6bbb52deff1ee4c29792f11aa17aeb25c8ec5eb992ca502de040c77ad95835d1b1432f315b6cb7a3308b434847c28b9c2c6f9d1ac10
-EBUILD libXfixes-5.0.3-r1.ebuild 489 BLAKE2B a2acaa7b4adfe1a04cb01419f773cdbf1b9b62c1d3a3398dd07e2cecbec58dc5cbc29d93c1a0f51be924ca2bc23e52121bf6f31c830425abad4610f76d1ab8a0 SHA512 3ba58b1623f986908f0e57864d5d98eefde2bc838c2164a62f1832c78b73618c21022fc61cdd862ed9360ddc295908fbf9d30f840c63f8d563d2ddf80e5190cd
-EBUILD libXfixes-5.0.3-r2.ebuild 490 BLAKE2B f08b387cdce932ed745870f4d5fe4c5f2cfa13e79b9b5282bf09f64ec66b0159bc79d0244df5b05cc156f31494ae8ac6306552204e49795a74bdf14ceac0bbca SHA512 4138efd2dbdb76cf7ac21425a87e9e3fd05a7335c683c17b6b30781ae2dbe7f0596b29e3df353f5bd6632670ccfaa4f57f98621a49f984b7bf6ec8899e11157b
+EBUILD libXfixes-5.0.3-r3.ebuild 496 BLAKE2B e767825558fd64005480522d766433363d2bdeca77e8561a351dd8d960423a4d8e20a2359e63a364209401846e689b8b0b949494d1b19d9e2ac0f886485c8fba SHA512 f8bf14fefb4db6d84b52f5589e7ed67fdf668523821026b8e71a643d98bf8e6f312621e09496ad088d43a1d10b766709340d34ea0af9dbe11bd4d956e145bc42
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXfixes/libXfixes-5.0.3-r2.ebuild b/x11-libs/libXfixes/libXfixes-5.0.3-r2.ebuild
deleted file mode 100644
index d797dc4d0971..000000000000
--- a/x11-libs/libXfixes/libXfixes-5.0.3-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org Xfixes library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild b/x11-libs/libXfixes/libXfixes-5.0.3-r3.ebuild
index b5970c8e602f..944f00f05770 100644
--- a/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild
+++ b/x11-libs/libXfixes/libXfixes-5.0.3-r3.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
+XORG_DOC=doc
 XORG_MULTILIB=yes
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="X.Org Xfixes library"
 
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
 
-RDEPEND="x11-base/xorg-proto
+RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-libs/libXinerama/Manifest b/x11-libs/libXinerama/Manifest
index fb18a890316e..d7d5938d5158 100644
--- a/x11-libs/libXinerama/Manifest
+++ b/x11-libs/libXinerama/Manifest
@@ -1,4 +1,3 @@
 DIST libXinerama-1.1.4.tar.bz2 287162 BLAKE2B 9e27f9776eb200a430875e4ea3a9a559f205822b5dcea59e4207a58889e8c7b67b2014e9ceed5b3cedd311c47fa023b4a8f1a17faa511fb0041382c7467527d9 SHA512 cff777ad942614fbf6bc6d8529f399e62debf3ecbf6cc0694a94e38c022bf929ffd5636fb59f55533c394d89b23af3ea51fa5128927f12a85787e16239330f14
-EBUILD libXinerama-1.1.4-r1.ebuild 499 BLAKE2B 85a70cc543c347f4c319bb647d91a3cadce08efd61cb04a3f1e9b3e53ef457af5dc5c4d2f164807e9090e8c0ed5e0097abfb6a5a78e8a3fee1154217364eb4d3 SHA512 721e8a341770182398d132d60624e3b140ec559c7a29a3313c5d89c24a71617d6148e15715c6febd5a38aa371e80c469fb1bd3c947b0a515d112ea26d5b8e961
-EBUILD libXinerama-1.1.4.ebuild 498 BLAKE2B 76b64a264c312f5d75945b79cfbe04231a88fb18ef487c38631bcaf87597e00b38897ec2a07747456fd253f2bd9a4c2a5440ff806a2ec710b1920a2c213f8b97 SHA512 1672fb8b0df66e205b8c74c1de922f3cf9d8ef95b1b5d5b27531d610b12537b7c3d1514d8b3e8e6b068de7d1394817a9f1cfa8aa1365ecf8d7e1bd5fdf7ec0e5
+EBUILD libXinerama-1.1.4-r1.ebuild 503 BLAKE2B d40c8fb75fe533df7b0ebf2f03796724faf0568770b94c9b59280997acf023994a91f39089125daeba1e4cde42ba52fde10785e650f65268feaed465b555f1de SHA512 373bd271f30bd318f9025551fd8f0516521cbe2216dcee389706477998037cdc8f38ab8e07f4779f5e2ef975086ef35c5a8b2db6fed567cdc8a60f8ab8d31831
 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 9a06ed748f3e..aa3c91d585e1 100644
--- a/x11-libs/libXinerama/libXinerama-1.1.4-r1.ebuild
+++ b/x11-libs/libXinerama/libXinerama-1.1.4-r1.ebuild
@@ -3,12 +3,13 @@
 
 EAPI=7
 
+XORG_DOC=doc
 XORG_MULTILIB=yes
 inherit xorg-3
 
 DESCRIPTION="X.Org Xinerama library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-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/libXinerama/libXinerama-1.1.4.ebuild b/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
deleted file mode 100644
index 7b17509be5c0..000000000000
--- a/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xinerama library"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXrender/Manifest b/x11-libs/libXrender/Manifest
index 95d031527507..bf62c7fe2118 100644
--- a/x11-libs/libXrender/Manifest
+++ b/x11-libs/libXrender/Manifest
@@ -1,4 +1,3 @@
 DIST libXrender-0.9.10.tar.bz2 308318 BLAKE2B c9e250e16118a4878e7439fdb37549596abfd6a17f50e4e88242579fc285d0ef5b0c8d5d0fb592c7dbcd6e77c5fb284e6644e4edf9b12118cbfc0f179e274313 SHA512 16ea0cf638b32d7df54b270457ef8c9d9a80da27fa845b105b560cb31027b4c7fe799cf23d6b6bac492be5961264e96d7845d316a9af4de9ff38bf40885ea6fe
-EBUILD libXrender-0.9.10-r1.ebuild 490 BLAKE2B c46a62f2506e765d239db0ccaa8ee1691b2da1991ce7d06cbfc622f67fabbba423aedf6bd1f9c48a89faed3d816bf5ac20306513e38f39a6c6e10c89a136bbf9 SHA512 c58fe7e1ba93d268db6d657ac5635e6a7788e24ce0dc7ba7c38e7772fefb0e625da38af2caf95f56bcb99df5853ae1060d45c7132487bd30cfe21b2f3cf09e96
-EBUILD libXrender-0.9.10-r2.ebuild 491 BLAKE2B e3698d3d21def8937135bdd4533596ef80023f1e98782ccfbb90706410e03971a682de89b45f21b935f6581c837deec309a542eb315e48b3ac23d0e8d2c3caf3 SHA512 6b9012280a7f4d5ff4f4ff2ed58c25a612342abdd05406782418f3d22097b6a2098aae369bab380fc6febf39825358aa77ce3c3c789566e1fce3ce7411405b7e
+EBUILD libXrender-0.9.10-r2.ebuild 482 BLAKE2B ad912e2bd7dad13fce618c65413468d714e6426aee283986101d334a31ff854072995defa4c0bfd994bc938648b3589aa4b6b7b28db03891918187143cdf78a5 SHA512 82882faf0a96e6535578360628208926d40c5680c077dfcaae6d3e852da806b6a4f1df49e28ba4033df4a52f483a3de1d31bc54771a82bbcacb0415ddfad3e71
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild b/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild
deleted file mode 100644
index fb3071e83370..000000000000
--- a/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xrender library"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild b/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild
index 9550200a6aa9..3905c482d417 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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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/libXtst/Manifest b/x11-libs/libXtst/Manifest
index dcd58d319dce..bf1804736848 100644
--- a/x11-libs/libXtst/Manifest
+++ b/x11-libs/libXtst/Manifest
@@ -1,3 +1,4 @@
 DIST libXtst-1.2.3.tar.bz2 321819 BLAKE2B 92a75d6ea9000fa7736093ce479d275c57a4a5bf849df2d6afae9478a53a07ba395013ba6676c2ea7dcb6a1f34475967ed6508b7c304b887f83ec44a611b8e6c SHA512 6f6741fd3596775eaa056465319f78c29c91b3893a851a4899df651a2023a4d762497b112a33d7d3e8865fe85d173d03e4b49daef76a66af1ae1eaab82a12765
 EBUILD libXtst-1.2.3-r1.ebuild 632 BLAKE2B 33f69bdcdbf010adc1069371f43524f89171d133b1aa8990c3405933aab707ebee6a741fd34ab416bcbeb5dcf443fe688cbf63308fef10228b236f0bbd89d11e SHA512 070db687b4d5f18229bf030bdc2de3c0d1dae482749605a7153d22ddcac0706851c337afcf4af0068ec78e28439eec2e0e7bdc4f08cd43301c42207496b5d613
+EBUILD libXtst-1.2.3-r2.ebuild 631 BLAKE2B a4159595425b287c2df3bfc79b6ffe3f60e3b624822d1a4812940df1d7ada8f4a727b874b618b2a6c7421cf65c01d38f4641875b9fb0f6202eb65e1ac8a6f71e SHA512 5395f9dac97ab5db2ec83c36a886bff8f83ed8d8bc92877a657a0c5c67db3ee74aa5b177f63f3b2e6cf29895686b877e417877eb7c2d77288df0b3b0e33ca76d
 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
new file mode 100644
index 000000000000..0488094a9e1e
--- /dev/null
+++ b/x11-libs/libXtst/libXtst-1.2.3-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 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 Xlib-based client API for the XTEST & RECORD extensions library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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}]
+	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-libs/libXv/Manifest b/x11-libs/libXv/Manifest
index 172671a79d1a..e9c9ebfc5da3 100644
--- a/x11-libs/libXv/Manifest
+++ b/x11-libs/libXv/Manifest
@@ -1,4 +1,3 @@
 DIST libXv-1.0.11.tar.bz2 317921 BLAKE2B 3c656e1f5cd02c936813b3e10a359d23e7a8643a45ade42ddd584084ba04d09cafbefcc68ab9356b78c1a716a050637062e956c7f50a03a522d28ff7aa31c3b0 SHA512 97cb3ab06cedc87799d06e1affd5cee32ed0e551903fa5c915f79e7ed92eded867e3220b4a663822f7ebd86fdc71b09943b7077d98f1200019992e8d24144e58
-EBUILD libXv-1.0.11-r1.ebuild 512 BLAKE2B b92b867454b81f310384eb946b62464e27cd6f84b9d7bbb3907c5f3a59cc2bef64281799e407e2435b715b7026521c71bfbfa1b99d68149274f47f012e7f43ee SHA512 f4207d9f725f75c5569d1680b6e665a6f87463fe83b757f3f0225850e3c723116508ab72f6905b90f4c1645a6289aadfa833a69b3d924781dcb0e13ef6e05627
-EBUILD libXv-1.0.11-r2.ebuild 513 BLAKE2B 4e7139d27a888a0159af3dcb79a6489ab32d517197acc9bbd878399935fa45d4fdd000339b8bc554a512bc7004f2068a16ce9164fcbdbd41eab756d9919a0fe7 SHA512 2c73762b2d9dde7ca25977ac1439522a070895bcecc23f4dfe0222f4a87bbd7138bc53e401c24ee3b2e92aa52d6bf85303f4f8fec71d767e8498dedcbe4fe387
+EBUILD libXv-1.0.11-r2.ebuild 504 BLAKE2B 0a86366f5664a05e85d642ba2adea31ad2277a7f8581b352df3824d607fd80e44e45427d45fcf0ce1ac6a20c9fc91a697258097701e4157574408013015fff84 SHA512 6c426db655884d419eac63875f358071f753adfff5bcf970421474642e0691b9cf1252e3edf668122e1a5a9b7432a967f3f221c640a2dc5a2dcd22f98bf40031
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXv/libXv-1.0.11-r1.ebuild b/x11-libs/libXv/libXv-1.0.11-r1.ebuild
deleted file mode 100644
index 542f6414c7b9..000000000000
--- a/x11-libs/libXv/libXv-1.0.11-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xv library"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXv/libXv-1.0.11-r2.ebuild b/x11-libs/libXv/libXv-1.0.11-r2.ebuild
index 56a885cc12a9..7157e6107917 100644
--- a/x11-libs/libXv/libXv-1.0.11-r2.ebuild
+++ b/x11-libs/libXv/libXv-1.0.11-r2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xv library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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/libXxf86vm/Manifest b/x11-libs/libXxf86vm/Manifest
index 7683a2b260ff..e01efffca1a1 100644
--- a/x11-libs/libXxf86vm/Manifest
+++ b/x11-libs/libXxf86vm/Manifest
@@ -1,4 +1,3 @@
 DIST libXxf86vm-1.1.4.tar.bz2 295346 BLAKE2B 22698db5beb0ac06663e9163e13f8afd99597afc6dbc9f9d4fb232682df6b41a155d63fc1beb58da3d83bd0e420872c457671696246dbf39a6451454a6e24b9e SHA512 c5f92d86e143db02ebb36bcd25618acaa2cb2831f5a23800a06dd431cd73b6702d95de8fe7407ce626336bf614c288d5256f4d87ea7781fad2ab6c517cbf09e0
-EBUILD libXxf86vm-1.1.4-r1.ebuild 517 BLAKE2B 38382ee1b5d771f6e193fb4b62c557323a3af31096523c8802f4e37eb46ab2b29bab09fc0bdd4a5618304b841391ef44e6ff259856afe3c37eb9066234958b69 SHA512 31a5f830acd96c23405b003c3d8cb3d2bc8c6793b4ba313adefaffd85188b02ef0feefaed50557bd423eda23b31397ee0a2dfe9b0d2f116f8a4ac805a8d9a211
-EBUILD libXxf86vm-1.1.4-r2.ebuild 518 BLAKE2B ebfe7f1785e86b000e4baec84e57d3b79a7770f956b9bda02f4a3b2cc5cfd202b553570944e85cc94f5fe48c6d2cba455fde7361bce11f6c88f5fc8655eb2b0c SHA512 d80b601eb68cd752016c6cff6d4b9ea0a622081c317af7e72f1c0a24c24282eab4dec7b409cbc8fb36d194693d177ba7245a0622a44a8814bddc3669ed63f117
+EBUILD libXxf86vm-1.1.4-r2.ebuild 522 BLAKE2B 7b13746ee20215aadf0fe3301165de18f8888d91965f6d571faa1df39f701b68f6b59f11d53930ed132c8ad624059fa9c0b57ea20c026eeb9eea3bcb9a8b229e SHA512 060c77ad72ba51b7d221ab1c237ba5de0076fef7ba53d4ca70ced9920d6e3ecbf8e58742743fcc76f03e13a99117ab3d8c6ca5bbc480dcd1692f109853b5323b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild
deleted file mode 100644
index 5136c718ee31..000000000000
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xxf86vm library"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
index 1ec9b5d9a7fd..e075bca881ba 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
@@ -3,12 +3,13 @@
 
 EAPI=7
 
+XORG_DOC=doc
 XORG_MULTILIB=yes
 inherit xorg-3
 
 DESCRIPTION="X.Org Xxf86vm library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-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/libast/Manifest b/x11-libs/libast/Manifest
index fade53e01c22..fdbf9333873b 100644
--- a/x11-libs/libast/Manifest
+++ b/x11-libs/libast/Manifest
@@ -1,3 +1,3 @@
 DIST libast-0.7.tar.gz 508654 BLAKE2B 0c5bf31d5b73fe11d4665bc0d8e1c9a987b944fcdcd89106a47ebf01eb90c2895b3e74e39874b360e91f027b8beaf5698363e9920ad879bfd241b13ef0232870 SHA512 0af1d508af88ce0a2f29fe7841e23759be7c6540a1e2698980c289245ba284fdbf76c593e457c0cd6cfc54dcb6d891b01a3fd4d4a6ecc511fb2de698c9a3046d
-EBUILD libast-0.7-r2.ebuild 922 BLAKE2B 5928ced96113c14f0b012db40aa1f05eb08685ac42c850c6efdc18990e47d839d78aa86e29564d3e4d43e8721b4ff671de8ea824cec346bd5496a8c8b97d1f72 SHA512 8a8ba4ea69de12571753d41e941d45d0063febc6bd3931c06e8d68fa750d6d153c923154abb41fdc006bb29e3c27026e86ccbc61403d1aa8130f6faeb7c37431
+EBUILD libast-0.7-r2.ebuild 885 BLAKE2B 60286e498f292d84e8b529f8ede7c9a1f3db4345677d52e5d407092a969fbee6ed349dc042d582f1b28b978cb93ff05d38cc73169295137bd8fed45fea887392 SHA512 a65e395ee3be878cc6981962ae8c95d26ecd463ead3a6f52bb6103d39b0bc36e0506f544e53ebbb9778ce4c4ef269f8e1816a90bbb94981502370387d31924b3
 MISC metadata.xml 736 BLAKE2B 603c1752552864610f08d8b3144503837feb5c7bddb3ebfe108f4d090e25d38fee56ed63f392c98f5468c69b6bc47ecb65e53bed8c335e6996351522e4257df0 SHA512 a2fd1a0875f0a0c866845b4fcc63d0ab715ad73fdd1cde271e6174606180ee5e1f4924270171c08074a0ffc7af52fb9299dcd32a5f057c1548175bf638598acc
diff --git a/x11-libs/libast/libast-0.7-r2.ebuild b/x11-libs/libast/libast-0.7-r2.ebuild
index 1d705a9e46f5..15f7036f2454 100644
--- a/x11-libs/libast/libast-0.7-r2.ebuild
+++ b/x11-libs/libast/libast-0.7-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="LIBrary of Assorted Spiffy Things"
 HOMEPAGE="http://www.eterm.org/download/"
@@ -22,22 +22,19 @@ RDEPEND="
 	media-libs/freetype
 	imlib? ( media-libs/imlib2 )
 	pcre? ( dev-libs/libpcre )"
-
 DEPEND="${RDEPEND}"
 
-DOCS=( README DESIGN ChangeLog )
-
-src_prepare() {
-	default
-	local myregexp="posix"
-	use pcre && myregexp="pcre"
+src_configure() {
 	econf \
 		$(use_with imlib) \
 		$(use_enable cpu_flags_x86_mmx mmx) \
-		--with-regexp="${myregexp}"
+		--with-regexp=$(usex pcre pcre posix) \
+		--disable-static
 }
 
 src_install() {
 	default
-	emake DESTDIR="${D}" install
+	dodoc DESIGN
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 9b49b33868c9..4567d1e39a5e 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,4 +1,6 @@
 DIST libdrm-2.4.102.tar.xz 408844 BLAKE2B f3a5ddb96130d175e860984412949713cd30145a3a9e453f666b650ec9b7eedb1c8e230aa7c5769331a330d833fdeba3da28b339150d81c17716a96935267178 SHA512 386afd228efd809fe32776a6ff5d9dd95d1409a6a6a89b3806a3b42ed27e84f1e090f3b7834973f834d6b0d1342b7034447fe8690d072f85f03292d7795c3e0c
+DIST libdrm-2.4.103.tar.xz 412796 BLAKE2B 64904bebb923d79b83fbe1949aa24c697cff2a258f415c4633991f938772980e985df19f44df881d10b14268ea414ff99220c8f003ad09ac1decdc6c85249240 SHA512 15b098b962008271400692b6b15ecb7e22676f8698e0220ad969735ac2315ccc737d19558afb6abda82bae15117e5f306c048184a2369f434b85ecaa670ca885
 EBUILD libdrm-2.4.102.ebuild 1980 BLAKE2B 521ae5ff9a2b781e3fc22f089e4276a0f739bfae842e4379e3f332bdff0f6d0ff0a2bfe52d6346f3f4c6a81586878c2acd574441ca1cc43bab5db46353bde3ce SHA512 37b69924e37465600c6f48455646c3ca8fae6d0563581a0316e534a0671280c989b37fd9bd1b3d64c80f7655d21d68ed5a9b93f684dbdadca1d11deecb16ab64
+EBUILD libdrm-2.4.103.ebuild 1988 BLAKE2B d8456210498cfd377691e05d37ef8abb1412de0f3fc871f7ffc4cc141a34a95b196ec843ce0939719e3d9fee6d6dffd46de6fdae4b6d1426235d591ff9268022 SHA512 9ed3335d53489a17d895493c948c7ae44ec645c07ea6b8d1271deb62203a02c8b38120d0a717c15de3e8061098a7ad57f5b6f2ee96ebebd06bdf37758975e801
 EBUILD libdrm-9999.ebuild 1988 BLAKE2B d8456210498cfd377691e05d37ef8abb1412de0f3fc871f7ffc4cc141a34a95b196ec843ce0939719e3d9fee6d6dffd46de6fdae4b6d1426235d591ff9268022 SHA512 9ed3335d53489a17d895493c948c7ae44ec645c07ea6b8d1271deb62203a02c8b38120d0a717c15de3e8061098a7ad57f5b6f2ee96ebebd06bdf37758975e801
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.103.ebuild b/x11-libs/libdrm/libdrm-2.4.103.ebuild
new file mode 100644
index 000000000000..46ea35c8a426
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.103.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 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 ~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/libfm-qt/Manifest b/x11-libs/libfm-qt/Manifest
index 0fe6daa41d8a..b729df9915f2 100644
--- a/x11-libs/libfm-qt/Manifest
+++ b/x11-libs/libfm-qt/Manifest
@@ -1,4 +1,6 @@
 AUX libfm-qt-0.15.1-update-runtime-colours.patch 1921 BLAKE2B 6adc0a2fc8a807adb865216406893aa35c2cd192daf004f71cddb62d8d4dfa357d6d79ee9d11bbd52567bca11e1d3a5225230b6350d46ae50eb9f4dc64978f79 SHA512 a3aa7bc3569c33299ce0bacb8fabd597ddbd2180138c6da2b99124893f7db486636234312cb1d8d0a63e08ddabfda0dc100ca6a4480aba7d60ab87cd48b92880
 DIST libfm-qt-0.15.1.tar.xz 337396 BLAKE2B 619787039857f0b67245ff86f4c8de1b5305909bbf1dc07f20ab53f07a955d541853066a9011bb76d04a49006732ea23c4100e94fe3c61de77f1edbbbdef5854 SHA512 9bd3f61d830e4f7ba3e72d84e3ff1a07544f6f461d6eea7ecf2b31056020e08d47d83ef920b6e1a481a470dadfb995a6b3e3b57a13574d6abca617a84c71bdf5
+DIST libfm-qt-0.16.0.tar.xz 348548 BLAKE2B 41c52efc5b71d924c06d55a5b94e7f9a1c4feda0a664d83b0de906479bdb644260a68136720baeb1958a48b08019b72de34b6066f51c19e5c5fb65afcd9e903c SHA512 5de63408a641b0e77cb319952e428aee9cd35db9ec3e6726a8327ebc53f5641cf66b28dbabd96797c64a253b1e41421dbe05dcb9f4bc7941bd92676bbfa9cc84
 EBUILD libfm-qt-0.15.1-r1.ebuild 970 BLAKE2B 842346064e7a6964eaf3fae8cf4b067baf1b70c965b31abc694f6b2c949fef04e57368638ae7a9ca5a7268b6a1861053ad3bb9390aaa0f298edd267b3acb6ce2 SHA512 47189888a0ade9e0ffd7723e9f8065e448e2945ace6aee7e83177df955415209e5ab0ac0c6d777ea9d5b03797f534d7e18cfc844f8c7084d5fc184a08a072822
+EBUILD libfm-qt-0.16.0.ebuild 903 BLAKE2B c68ba5419f82060ca8b8093e61e974700ab44b8ccc892e899ae0cea4c0c3c620da918bc3eae9eff6cb4216e4c21f12a7cac8b88045808d4123963416ecf16c7e SHA512 e77a57211a997bc74deff5561b9b0c0fabe1722f7165504ffa8f295f5df818a51556c9cba321a7a25de19477a17d81a6678ee6140d1935a9625bb29db137853b
 MISC metadata.xml 314 BLAKE2B a40b71c62066cf524406556206999869edecf714d898236a8f277132e8b3752fec298cf9407e9010a1037bc757fafcbae32abec9b52a68492d414acd529c176a SHA512 edaddf48fd7cef23284164b7046e0e6b5ce1442847d3353ee8175177f00b06973d6588811b166dacbd7a1182942128792858a43e029d6aa874c1b8625b5e78f3
diff --git a/x11-libs/libfm-qt/libfm-qt-0.16.0.ebuild b/x11-libs/libfm-qt/libfm-qt-0.16.0.ebuild
new file mode 100644
index 000000000000..35be3618d54b
--- /dev/null
+++ b/x11-libs/libfm-qt/libfm-qt-0.16.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 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.8.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}
+	!lxqt-base/lxqt-l10n
+"
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+}
diff --git a/x11-libs/libva-intel-driver/Manifest b/x11-libs/libva-intel-driver/Manifest
index 38592adb5068..111ca40eda8f 100644
--- a/x11-libs/libva-intel-driver/Manifest
+++ b/x11-libs/libva-intel-driver/Manifest
@@ -3,6 +3,6 @@ DIST intel-vaapi-driver-2.4.0.pre1.tar.bz2 2888363 BLAKE2B fc7861e5d7625ed598fea
 DIST intel-vaapi-driver-2.4.1.tar.bz2 2889762 BLAKE2B 25888ac7a1a42233c4b0269bd910c5161f99bf22c932b46e20c8c77ed0404bf99702dd9f11b73bc0fd76a3b012ffa1de6c6133cbd7be880428235de9cfcc6ad8 SHA512 1e9dc81ecd0b3640fccd1fb827a0ade0a1e5bbabe375130df159849e47ce98c8e879c65ddaaae11d16e916be76b507be69bc0c813494e37e7fca86b0b897a94f
 EBUILD libva-intel-driver-2.3.0.ebuild 1308 BLAKE2B 2aed9e5ffb8b4c557fbe3fe405025a987653f308a9e87435b69270a0b3269d00341c4eb6087a3c118dc8027de17ff0516d90fc698948eaf8f8ea7b586e2e92ef SHA512 284c598bd7933a807ee0e63e782cb5a0e03c0a2e863e2df559605434e1679779774f636d9f963fa58cb492483853d49d70012b5ce29e66dcace78cf686b41736
 EBUILD libva-intel-driver-2.4.0_pre1.ebuild 1326 BLAKE2B 99e4ae3fa927ec988c9526d161464f256f88d71624cc760616d6e7e13c94c3096ec1a4a3f9a402680cd6778741e8e67314392a495ece792ca1a05b8e010ca213 SHA512 5d9e98f4565911b00ac59fa672f968eab8695dc9a9826314110107104d762286353e6fb0e65548692d83c7ca28f8e3b23adefa3b6d138943dfd6d08d0139ee7b
-EBUILD libva-intel-driver-2.4.1.ebuild 1314 BLAKE2B 1e1aff036e0aa07c3e920730583147e326226e1dc0c83fd60cbd7f6ca8774459efcc662ca9eb41084168b751751186e41799db7cfad1d4a18af002a444a02aa0 SHA512 a4cd442436b7b0db1f1b8705928b33d4e9e8341077ab5fa2b379d6e0fb7d606a6331b00439d5bdc93c5eaf1949d92fd547bf681bd06de6aa72967b9a8a857cbc
+EBUILD libva-intel-driver-2.4.1.ebuild 1312 BLAKE2B 2631a8b68421c285c1718c381b58f88367893b72894033f75230e7627a36a027af5fc4ab10088e5f91eb2f5e837b52e90b8f2fe272f895b97d30e603b3181238 SHA512 d1e5af4a00a0adf6c1bb04473d6bcf72144697e14f5e59c7b82cb5da855083084a3144e4974633c4d8ce2630fbf110a496e296ef82c8f78b035bf550772c7993
 EBUILD libva-intel-driver-9999.ebuild 1314 BLAKE2B 10eaf18d44d1e5a583e665c7e423caaede7909748fc62dfc270affcb3b0e9db3ce7ee8e9c00cfca3d5aa936857e50a019ec7295a28489281e28a80915393ec66 SHA512 225cacaa64b8a4dbdf2d1c7ea29e45d90422fd15fdf938d8957de1e3ccf2d60951e52663f9f5bee9a08e267ff60ca7595816f74d2829f29f5693e389b310ae84
 MISC metadata.xml 348 BLAKE2B dcf3a9c208ab7377f3e6e8fdb8e790f894cff749b32f5cd2840a2bb25aaa74ddb5a6260c8fa7cc332b8d49d3ab51277658d8a7d7814200839f9bd64f0d09ffc2 SHA512 438300201f9bef74270eff620b64bde08d4ad5952acd18adae4e73c20ee364e133f19fa885332aa1e14ae9a874669057c6fed8a10536ce5f9b2bc6c949da5ee0
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1.ebuild
index 07f80f8d2c00..b7af94433ccf 100644
--- a/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1.ebuild
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/intel/intel-vaapi-driver"
 if [[ ${PV} != *9999* ]] ; then
 	SRC_URI="https://github.com/intel/${MY_PN}/releases/download/${PV}/${MY_PN}-${PV}.tar.bz2"
 	S="${WORKDIR}/${MY_PN}-${PV}"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 20d02c9ab3c6..ee2c007c9ce8 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -2,9 +2,11 @@ DIST libva-2.5.0.tar.bz2 459677 BLAKE2B d6e5bf94bcbda0a724634164bd8cf91efbdbe361
 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
 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 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3ce8755f0a8c62382eec24a97de2ed5286250884b117e6ecf2fb356835f0397f73773b865f21e9de1d2bb098e SHA512 57f80b7e4047c098437ffbff25883716bd46452f5b3162f14804dd732e01a1ca497a50dc4f3fb53cb04442c31129ca880559d2680e9d0bc35e1eb9cba695ebd1
 EBUILD libva-9999.ebuild 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3ce8755f0a8c62382eec24a97de2ed5286250884b117e6ecf2fb356835f0397f73773b865f21e9de1d2bb098e SHA512 57f80b7e4047c098437ffbff25883716bd46452f5b3162f14804dd732e01a1ca497a50dc4f3fb53cb04442c31129ca880559d2680e9d0bc35e1eb9cba695ebd1
 MISC metadata.xml 469 BLAKE2B 86258c66689544ac1709503e76a23d84d090393d1358158b47ea2fd0936f5d3828c4be00ea8490a531f63956274b9411e3b698207899eaf98a6bcf2f88572145 SHA512 2ad27b3a2dadd6e89f2f6700cff4aa5a76ee2770f0daa8a3b523ec5c19718e333528fee6919c7df6d53c58368c67fcb3836aae256d61bf4d7e042d00ab9f74b4
diff --git a/x11-libs/libva/libva-2.9.0.ebuild b/x11-libs/libva/libva-2.9.0.ebuild
new file mode 100644
index 000000000000..016d79e6442e
--- /dev/null
+++ b/x11-libs/libva/libva-2.9.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+
+if [[ ${PV} = *9999* ]] ; then # Live ebuild
+	inherit autotools git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/intel/libva"
+	AUTOTOOLS_AUTORECONF="yes"
+else
+	SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~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.46[${MULTILIB_USEDEP}]
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.11[${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
+	[[ "${PV}" == *9999* ]] && 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)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/x11-libs/libvdpau/Manifest b/x11-libs/libvdpau/Manifest
index fd0e6e5bd761..403d6a1f6005 100644
--- a/x11-libs/libvdpau/Manifest
+++ b/x11-libs/libvdpau/Manifest
@@ -5,4 +5,4 @@ EBUILD libvdpau-1.2.ebuild 1073 BLAKE2B b6b30a1065a56c6c17ebe03db3667f3ee4098a26
 EBUILD libvdpau-1.3.ebuild 1160 BLAKE2B f8b155db62eee4a49ceaf03d399052673ad39cd932fefa9ae77f1f00113a7c64eb5edf3adc467c35f7b83e7dfc19ed4224248b9fed1f7993c0368f555e856137 SHA512 b399f7ed6b67a88cd372921c34bce9e0f21b2e7d5b279e84275ea2a03f44994659fc8861660a44fe4c98cd4f5f3365815abefa892f4b583b6fd84f01565c5e09
 EBUILD libvdpau-1.4.ebuild 1162 BLAKE2B 08a0544a4737c41f4605d35be93d590c4b1a851396360e87f5d8857654f9c85919b4efb07fb44f8eccc424769215bea0b10a1ff515e30593821dcb46d708221b SHA512 f74afcbccc4c7c52ce9915de0e0eaa4770fa4109658176a711eb3700bbadee5302e55b40d9ad35b835518e56fee89fb8e702845ea7aff777b8cc9c5bd875d7d4
 EBUILD libvdpau-99999.ebuild 1122 BLAKE2B b2e74c53c093e22e58257b67b91b59f51e98cc3715f68c67958a57e366df36bb660436e3bb7abdcb0fe11490f60d6a0c5bc8b2658c58d3979125385f6d7f7276 SHA512 8da6e8637191f4b8c198498e4f81fb4e7a0f5fa8108c16edf3ae89d52ee7ab360a2c2e505b3b5341076e7cfe18f1ad1093c251cad96f456ad81f134fdd940851
-MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-libs/libvdpau/metadata.xml b/x11-libs/libvdpau/metadata.xml
index f8bd6f3f34f9..7a38bb900964 100644
--- a/x11-libs/libvdpau/metadata.xml
+++ b/x11-libs/libvdpau/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index f343fcd09d8b..0cf56785389a 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -1,7 +1,5 @@
 DIST libwnck-2.31.0.tar.xz 630792 BLAKE2B 8201537d3c9a8a0a8668fc16d33a8eaa05c14312401f1c763c922402df04ef03260dd259f5c46508f85390f7aefd551e83143e654b24b412272dddb7c7c4bd62 SHA512 54262a08882021f08f3ba7f2ddfa33fc1f02e391a0f61cf999a50a089e0d277dfe13ab133c1a46e9abf0599bd24c21dacff80b51013cbb1375d2cd71ac9abbe9
-DIST libwnck-3.30.0.tar.xz 800296 BLAKE2B 5917ac8a69f6f1e0d639f301a77349015226ca6d0fc12e8b23c00a81e18f6e9dbb7716b01e50aceb15bdbd64b5b1a8295be5b931d513e120508cdf14d2d15a23 SHA512 79842e4645de828941ac030eeff9d232b18a51fe0d18baf5ceb2beaf897d328ee5bf3b297501e2b27e66c63d42f6546a7605a37c6d7d52ff76e9b2bc5c328128
 DIST libwnck-3.36.0.tar.xz 447760 BLAKE2B c61098362c57c3de879170d3104472b0a7f3c16da163c5d740d7a42bd545cfdaecd96804108834d5b7de5028e847f9b0557f015d08f50f9459a896f1d5f84431 SHA512 b7bf5d935327f61634a898594cf20a270e1b403c8df6c74e6ac20e22eea2845ac8c3007b31994728b74953e40c1015373efe10ed64243cf5e85fd210654aecb3
 EBUILD libwnck-2.31.0.ebuild 1254 BLAKE2B 1d8afcf0321cbe2a441c321217a3569a241f60dc34354f247641ede6c219be27b8e6a604079c64933443bed98e6a706bc24736b1d0fd6aa3a2b739809ae86999 SHA512 54786170bbde0e1142f60a9cb3aab7bd60e367c106a43e50a1817301ed49f014ff7304c4190c7b569e3d4ad691685f5906bc162ebf85d0198aaf06284e359eed
-EBUILD libwnck-3.30.0.ebuild 1128 BLAKE2B 5bdc7da7bcf9edbea78f5c12615caa119d5153e400fc8c5a54952eb5c9a04acdb335197a91d7a671e6fa423ccd7a7b8655296ab9be358943c26e35aaa32afe3f SHA512 e0e947c028ef2ded5a2f714f3daffd12b7420e9d07990957c80d922f28bee3ffc00c3819838b16cd936d47c484c0f40676a12ea060c46e731c0429846d7883ba
-EBUILD libwnck-3.36.0.ebuild 1430 BLAKE2B dcfde46dc67df18885290948227365f867c73ab50051e8d471a6fc83661a11f15c5989bb91417033cdd291f2a00708ac8c0a1924a63c5bf869e380f96095e67a SHA512 13b4700a20777413a045aae61478b434af88bf1fba677b8759a2ec2933f9d4bcf59d9def4069c27f50d2263bc5f7e713819dad25abc94e11405f4be6621367ca
+EBUILD libwnck-3.36.0.ebuild 1428 BLAKE2B c1c859a98b7bb13750d68f8733914fa5df03c95d6f5c1af18db7d7bc99f64237e00d0082a7f6e6e37f4585befa4e38b286ed2a415a6cdb3500b8bea66e5dcdf3 SHA512 358c20c72866c524a655d464b83566b4c9dc8a2b4bc36b50aa2ca28caa0875783753403906fb7c09cb6fcf108c176af031db110e1ec41e1e970cc219e9947821
 MISC metadata.xml 364 BLAKE2B c8583191e40b2bf98262fbd4401a0ac47e53ec64294178a919499695b014f3ae8ee623de803cfffde58b4d63eda4572035703c5f1d550f14f4dcc974e9035c65 SHA512 47cae64c0f13376c312169703c6213582e37ccc70f00599754d7fa3daf0511e5da4221cd659e9ad98fe90d7791b0d513db45d2d0b7f1d833ef125f64ba40f2ce
diff --git a/x11-libs/libwnck/libwnck-3.30.0.ebuild b/x11-libs/libwnck/libwnck-3.30.0.ebuild
deleted file mode 100644
index 716085618174..000000000000
--- a/x11-libs/libwnck/libwnck-3.30.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit flag-o-matic gnome2
-
-DESCRIPTION="A window navigation construction kit"
-HOMEPAGE="https://developer.gnome.org/libwnck/stable/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-IUSE="+introspection startup-notification tools"
-
-RDEPEND="
-	x11-libs/cairo[X]
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	>=dev-libs/glib-2.32: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/gtk-doc-am-1.9
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-"
-# eautoreconf needs
-#	sys-devel/autoconf-archive
-
-src_configure() {
-	# Don't collide with SLOT=1
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_enable startup-notification) \
-		$(use_enable tools) \
-		--program-suffix=-${SLOT}
-}
diff --git a/x11-libs/libwnck/libwnck-3.36.0.ebuild b/x11-libs/libwnck/libwnck-3.36.0.ebuild
index 6cd44bf42bb3..336cfd36d2d7 100644
--- a/x11-libs/libwnck/libwnck-3.36.0.ebuild
+++ b/x11-libs/libwnck/libwnck-3.36.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://developer.gnome.org/libwnck/stable/"
 
 LICENSE="LGPL-2+"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="gtk-doc +introspection startup-notification tools"
 
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index b0bf73af95a7..7d4e65e7e558 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,3 +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 1291 BLAKE2B 0e06425687545c28a3d6bcae02546b789d311d35af3ac64995c76084a33c4d07507847a38505716a10c9e3668e6fc78e303783657c2c8d44367abf5826bcab0d SHA512 0fa5b030cc8e53b7a53662627b6fb57e52a622447bb25447e63e06f2387123ddd1599dc5a5c8ac3730228e821579a21597cd024f0436290779141307c84305b5
+EBUILD libxcb-1.14.ebuild 1377 BLAKE2B 470d39085f4b4dbce2a936ce68e44d4e15bf30e309ac5a5ac13d6dd9a3505589b6fb00bef265f0223f3b7dcefc3a670028b5ad976284ea1958f19c0da3c13269 SHA512 635ed02a865f029738dd50033201b754de4563b8cbcb84b684ab58b61cd66f844024e2338be1e08d6c1fbd5091bd61651483a3289979137a207852df28460bc9
 MISC metadata.xml 400 BLAKE2B e4de0bffe9b79f7c4a715ade0014f14d85ae7389a3fa523572b4abed6ed6849250902ea479e9aa90745f104c9020d671742d0aec8bffa539e20f0bd7b48f2e64 SHA512 f9688e8ee148768a072e6da7f72985a7a3971a445117bbfa8448f2337ce1b601296501eda1da531c6bcb50a0d3106376e8cda0b98ef10219882c2f66fe02f40f
diff --git a/x11-libs/libxcb/files/libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch b/x11-libs/libxcb/files/libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch
new file mode 100644
index 000000000000..cc7f22ba4e9d
--- /dev/null
+++ b/x11-libs/libxcb/files/libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch
@@ -0,0 +1,86 @@
+From f01f3c378eb0168fbb055c7be1c2d08a7acd3752 Mon Sep 17 00:00:00 2001
+From: Ran Benita <ran@unusedvar.com>
+Date: Tue, 17 Nov 2020 23:43:06 +0200
+Subject: [PATCH] tests: don't use deprecated fail_unless check API
+
+It causes errors like this when running make check:
+
+check_public.c:40:24: error: too many arguments for format [-Werror=format-extra-args]
+   40 |   fail_unless(success, "unexpected parse failure %sfor '%s'", test_string[test_type], name);
+
+Closes: https://gitlab.freedesktop.org/xorg/lib/libxcb/-/issues/49
+Tested-by: Matt Turner <mattst88@gmail.com>
+Signed-off-by: Ran Benita <ran@unusedvar.com>
+---
+ configure.ac         |  2 +-
+ tests/check_public.c | 30 +++++++++++++++---------------
+ 2 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/tests/check_public.c b/tests/check_public.c
+index 2094bfe..aed40c8 100644
+--- a/tests/check_public.c
++++ b/tests/check_public.c
+@@ -37,18 +37,18 @@ static void parse_display_pass(const char *name, const char *host, const int dis
+ 		got_display = got_screen = -42;
+ 		mark_point();
+ 		success = xcb_parse_display(argument, &got_host, &got_display, &got_screen);
+-		fail_unless(success, "unexpected parse failure %sfor '%s'", test_string[test_type], name);
+-		fail_unless(strcmp(host, got_host) == 0, "parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
+-		fail_unless(display == got_display, "parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
+-		fail_unless(screen == got_screen, "parse %sproduced unexpected screen '%d' for '%s': expected '%d'", test_string[test_type], got_screen, name, screen);
++		ck_assert_msg(success, "unexpected parse failure %sfor '%s'", test_string[test_type], name);
++		ck_assert_msg(strcmp(host, got_host) == 0, "parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
++		ck_assert_msg(display == got_display, "parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
++		ck_assert_msg(screen == got_screen, "parse %sproduced unexpected screen '%d' for '%s': expected '%d'", test_string[test_type], got_screen, name, screen);
+ 
+ 		got_host = (char *) -1;
+ 		got_display = got_screen = -42;
+ 		mark_point();
+ 		success = xcb_parse_display(argument, &got_host, &got_display, 0);
+-		fail_unless(success, "unexpected screenless parse failure %sfor '%s'", test_string[test_type], name);
+-		fail_unless(strcmp(host, got_host) == 0, "screenless parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
+-		fail_unless(display == got_display, "screenless parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
++		ck_assert_msg(success, "unexpected screenless parse failure %sfor '%s'", test_string[test_type], name);
++		ck_assert_msg(strcmp(host, got_host) == 0, "screenless parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
++		ck_assert_msg(display == got_display, "screenless parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
+ 	}
+ 	putenv("DISPLAY=");
+ }
+@@ -79,18 +79,18 @@ static void parse_display_fail(const char *name)
+ 		got_display = got_screen = -42;
+ 		mark_point();
+ 		success = xcb_parse_display(argument, &got_host, &got_display, &got_screen);
+-		fail_unless(!success, "unexpected parse success %sfor '%s'", test_string[test_type], name);
+-		fail_unless(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
+-		fail_unless(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
+-		fail_unless(got_screen == -42, "screen changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_screen);
++		ck_assert_msg(!success, "unexpected parse success %sfor '%s'", test_string[test_type], name);
++		ck_assert_msg(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
++		ck_assert_msg(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
++		ck_assert_msg(got_screen == -42, "screen changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_screen);
+ 
+ 		got_host = (char *) -1;
+ 		got_display = got_screen = -42;
+ 		mark_point();
+ 		success = xcb_parse_display(argument, &got_host, &got_display, 0);
+-		fail_unless(!success, "unexpected screenless parse success %sfor '%s'", test_string[test_type], name);
+-		fail_unless(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
+-		fail_unless(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
++		ck_assert_msg(!success, "unexpected screenless parse success %sfor '%s'", test_string[test_type], name);
++		ck_assert_msg(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
++		ck_assert_msg(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
+ 	}
+ 	putenv("DISPLAY=");
+ }
+@@ -183,7 +183,7 @@ END_TEST
+ 
+ static void popcount_eq(uint32_t bits, int count)
+ {
+-	fail_unless(xcb_popcount(bits) == count, "unexpected popcount(%08x) != %d", bits, count);
++	ck_assert_msg(xcb_popcount(bits) == count, "unexpected popcount(%08x) != %d", bits, count);
+ }
+ 
+ START_TEST(popcount)
+-- 
+2.26.2
+
diff --git a/x11-libs/libxcb/libxcb-1.14.ebuild b/x11-libs/libxcb/libxcb-1.14.ebuild
index 24e099c8ef9e..979e3d9e1894 100644
--- a/x11-libs/libxcb/libxcb-1.14.ebuild
+++ b/x11-libs/libxcb/libxcb-1.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE=xml
 
 XORG_TARBALL_SUFFIX="xz"
@@ -34,6 +34,10 @@ BDEPEND="${PYTHON_DEPS}
 	$(python_gen_any_dep '>=x11-base/xcb-proto-1.14[${PYTHON_USEDEP}]')
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-tests-don-t-use-deprecated-fail_unless-check-API.patch
+)
+
 python_check_deps() {
 	has_version -b ">=x11-base/xcb-proto-1.14[${PYTHON_USEDEP}]"
 }
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index 08bf589b23bf..53a78948ab03 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,5 +1,7 @@
 DIST libxkbcommon-0.10.0.tar.xz 383788 BLAKE2B 0e2cc110c35a4d07cfd55a46a4cc30038bc296f74522beb97b72d0318799adb76fa514427640f286254de7aa59fb8b8c26de5d8fd52f7e09c5ba3521febb97bd SHA512 58c523b42a8ea0cae7322d453fbc5d4624374221246cb067074e2ff9820eef3ceea8686283136432cdf0842acfc0858c7b2d3954de234b6501092ae1d27c9e79
 DIST libxkbcommon-1.0.1.tar.xz 432692 BLAKE2B 151e9c2260b517e7e646defea8dfa1891af87aaeeebbf52d41d8e6b52c2c1d5079ca55da9e998300145c83718ce981be13c3fa35d8825bcde7846dcd330e9dfd SHA512 929be7b52fae360a696f01e0a8f3aa9b585ad99db975a88680ababf623e46f4d98e6f7590a2859c24060856f45b27e7249072702fbbf5a7bd0d4a10791e6d489
+DIST libxkbcommon-1.0.3.tar.xz 432944 BLAKE2B 49dcefcc17cbbfe5623728e9852e700a623e07ad7e6df78c8d7c39784948eb230f9e141d8aaa1de94305cb552244fe54d384abbc8e57f5ec5846915b5ae484e3 SHA512 b05a2db0acd6628427baad1967979a161019dec90a078a926d41f4dfeffb84eab63e627803df1a401e42c8e48953d6c434ce08d7206eae21e890890f29b03d3c
 EBUILD libxkbcommon-0.10.0-r1.ebuild 1284 BLAKE2B d43d05a9366fe8a92d62f714a532d5f2b372443971c0a5f496387faecbfd91ab83841372977f4de853e0ac569545c2deab9828f4dccca580ca0539c406bc884c SHA512 fd009357bf396f4f9bdbcc86febef8536a84095a880bdd5d5dc135e59981113db959d909edd6340e5c6908163e939ae032307228f76219d7972b577f209e6224
 EBUILD libxkbcommon-1.0.1-r1.ebuild 1333 BLAKE2B 1369a2e9b99ce80648ce8acfca823020fc00f8b1b62f4ed238bff9e728c01d0a4e69503a686a3d69fb20d9a904fb6eff5f7fa4fcb3b65afa9aca59c1be500cb8 SHA512 4a54be5605d1d850e9684f7ddfb7f914c2f52a4da7c74860efb0d2cafeff179750cc008d0166fe31604fd6a64156dc79b27a60d7de9e89d5b7f81759cd60745c
+EBUILD libxkbcommon-1.0.3.ebuild 1291 BLAKE2B 0c83c2f575ab2f52ee05b57c1c70c1b899114df7b6d24bdaff40c76efaa60c052d8b8b27d0f5d1ce467dcf9ca84492a56eec8f68f85e6d6b7d75e9b97c44db46 SHA512 e78c5fa4c5c4da5661fd4d8747b59a0da19e1a2db58404d6cc628c3e743f4170505b82463b49f015e3b344ce5c3de0e16734d06e446b3bf2f68a34ca97eefbd3
 MISC metadata.xml 325 BLAKE2B db764fac0ca1f4359bcd129dc165f78592535dee40bc25b6f2d7c662bdce43e01cc66b362765607665a75fc5b1703de204cf90eecae4f8d285cfaefcebc614b8 SHA512 ca2a116a574783f7b3c6191759c902e2cb059ec135456cef989b81be07fecc48f9ff56e02845d18c2376c99be3dd9711f39ad91394e421fa36d8fd6453c0a121
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.0.3.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.0.3.ebuild
new file mode 100644
index 000000000000..5a764624f083
--- /dev/null
+++ b/x11-libs/libxkbcommon/libxkbcommon-1.0.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 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 ~s390 ~sparc ~x86"
+fi
+
+inherit meson multilib-minimal ${GIT_ECLASS}
+
+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 )"
+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 )"
+
+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/libxshmfence/Manifest b/x11-libs/libxshmfence/Manifest
index 1019bc97cbb0..4642cc8f977a 100644
--- a/x11-libs/libxshmfence/Manifest
+++ b/x11-libs/libxshmfence/Manifest
@@ -1,3 +1,4 @@
 DIST libxshmfence-1.3.tar.bz2 308644 BLAKE2B 6e1e75fbe9d113cb258eb8f6a5106ea565f6749efd79bd3aa21222514063aadf8499d82d2a14bfcd0a69f7d4c4dce49a5efeb38d54d2019eb0c93345f0ba8a37 SHA512 c446e055f8fac62b9aa266132289a4cfc030282147974c45ce96d1768a98d1afb997470e58e4a68513174c404cbf373bdde2f0cd4b34abdbce1d89dd0b6fe2b7
 EBUILD libxshmfence-1.3-r1.ebuild 386 BLAKE2B bfdf3a185315e38828a9c03b287512b48a4d4ff6eeefb3a7f69569bbe0e62e718054415c4a3367d91f4b5aba07fba8ada6416ff7bc74645cfde1740f13edb4e5 SHA512 a71b58f12e9cd834cb86beb29b7fd02a43ad0de955d25c7be912fe9e90829f0e77e4854b43d1b0eb91795fd1efd5f8fce1fe6d8f9c22d6338d6f7f9de5b8df37
+EBUILD libxshmfence-1.3-r2.ebuild 377 BLAKE2B 09077038ebe22b7813e8a6a4639f28bee31c22de48f1981164f22e1d190f9737cdee8aed9c432286028800cae266877e2db7e608e45bd32dfdb5028ea22153b3 SHA512 1094131fc063b849949ff17beb8e49842c559520d2a15aca0d8cf31a26d040768a59521003edf6dded269bf473c5e314ee1d6f5bf33012e958ac0ff7a1049bd9
 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
new file mode 100644
index 000000000000..4561b71e07f1
--- /dev/null
+++ b/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="Shared memory fences using futexes"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/neXtaw/Manifest b/x11-libs/neXtaw/Manifest
index 5d4ed563d89c..3e330bf3c3b0 100644
--- a/x11-libs/neXtaw/Manifest
+++ b/x11-libs/neXtaw/Manifest
@@ -1,3 +1,3 @@
 DIST neXtaw-0.15.1.tar.gz 577459 BLAKE2B c38e8fe482bf0f51a2f387ab76d62666778d569982e153dbe32988d557dad91876122cfe4d0e8940e5c1d8ca7a8a3af09c09631b8ed656bd6a11db21d16ae331 SHA512 5250b2ac6fc746b8de19d0c2504e6c21e0b6c6ac4ef1a841a9793a2fd2dff082b86a987f54f68e0e35ed8f798900a701e6fd9c6cf7b1412a4bd53179fd07cbf1
-EBUILD neXtaw-0.15.1-r3.ebuild 714 BLAKE2B ba12167299da73bd99e741a721f1a952f7faa8b69b6adfed30acd66533ee5e4b4da1d24778dc700c93a67699ea89704d5d9a855b1bbef0452d80b28babfd0971 SHA512 393bb5c57a3723171b12e0828bf4517428ab6d824b3521dd3814daa7e1cfdc300323935ffc01a0806594651907b5cc1e6c4c33030165f84d0daa523c7ecea9dd
+EBUILD neXtaw-0.15.1-r3.ebuild 724 BLAKE2B dcbe03757c87fb376bda30bf5cec31f74fd6f7b3b14f98d7152bcb0195b8e974aee6f6832cb96cad5f535ef9f3323b7b951c9e988b45e628e26f4235b9541a13 SHA512 2ad578fc06131c03f036c17703472cf8c50fdc4b547a692dfc75bbc59ca916ea6ee494b0eaa0fe68c04a513475777ff14332e4210aa88d4c166391406c8da02b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
index cf5551a641aa..547227d7959f 100644
--- a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
+++ b/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Athena Widgets with N*XTSTEP appearance"
 HOMEPAGE="http://siag.nu/neXtaw/"
@@ -10,9 +10,9 @@ SRC_URI="http://siag.nu/pub/neXtaw/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE=""
 
-RDEPEND="x11-base/xorg-proto
+RDEPEND="
+	x11-base/xorg-proto
 	x11-libs/libICE
 	x11-libs/libXext
 	x11-libs/libXt
@@ -24,7 +24,11 @@ RDEPEND="x11-base/xorg-proto
 	!<x11-libs/neXtaw-0.15.1-r1"
 DEPEND="${RDEPEND}"
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index e32a6fa5a510..93389702cb34 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -5,5 +5,5 @@ 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
 EBUILD pango-1.42.4-r2.ebuild 2313 BLAKE2B 7033a5e1443b105bb5ef50759db0a5cf4d4388ec93007c29fb3f4f6bdcacc83bd017cda5d0381649aefab8fc67761584b558633a4c988f5b29e262c708fc326e SHA512 1e1608ba07ab876272185f5872057a2dd66daf418419492569bd27b86151bb63e433079d9aab8d796a595003b6f8308f679af1e5ed531e92191ae1a13d892aed
-EBUILD pango-1.44.7.ebuild 2106 BLAKE2B 342d7eafe208bfd38c8174ed34c358802ce7300398aa4a9b1afaf702c78b739a0b60416d3fde82fae6ab35961d18bbd6bb2ede4df338042aadcdb41df050a2df SHA512 4c18ef86e9339fac4f2a57275556f3eb4c7471aae1bd1ef550be2e2c29d9617447977ee305a594e8e3c18a51742c6ada9368747a60df5e96ce3cc6802187f745
+EBUILD pango-1.44.7.ebuild 2106 BLAKE2B 92cc5864d713932c81057925b2a4d028bef8a1ae54ea95489515203311e770c0bf3aaea2ed93ac492d277563547ffc7e039936af316e0c6984fb09307190a8c4 SHA512 981993537c06bea07f342cdee9204fc71885f9ce0299f8108fbff727cedbc0fe609295f55f8df5569392ed3ca4e34d4bbd94e8ec35e277306acc3044537156f5
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/pango-1.44.7.ebuild b/x11-libs/pango/pango-1.44.7.ebuild
index 2f4853c526e9..05b510f0d06f 100644
--- a/x11-libs/pango/pango-1.44.7.ebuild
+++ b/x11-libs/pango/pango-1.44.7.ebuild
@@ -31,10 +31,10 @@ RDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
 "
 DEPEND="${RDEPEND}
-	dev-util/glib-utils
 	x11-base/xorg-proto
 "
 BDEPEND="
+	dev-util/glib-utils
 	virtual/pkgconfig
 	gtk-doc? (
 		>=dev-util/gtk-doc-1.20
diff --git a/x11-libs/pangox-compat/Manifest b/x11-libs/pangox-compat/Manifest
deleted file mode 100644
index 1e5e6f5d77bb..000000000000
--- a/x11-libs/pangox-compat/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST pangox-compat-0.0.2.tar.xz 267396 BLAKE2B 364761c9610e497e3bc2c8a1d311cffa0298256b3cf68754c5ea4e31ce096d136cd50e2deca473d2b34aedf24e50577e8e8c37ca2556ed53c9210e4d3ff663c9 SHA512 fd3e257157d78c3d86c948e7909226fdebe52408d02a52432de8a295443b64b80b37cb795fe646d581515e6072bd278f2dcab0e43cf27b63b03a82c01eb6b9b3
-EBUILD pangox-compat-0.0.2-r1.ebuild 781 BLAKE2B 8a6a5c8eb7b34ba12833581be829705083614841165f9f6af85d0adf7c9be7ddd346d1d7bc53be8273dc126a993e55cb4c866dbde13479465e767853da49d700 SHA512 8596478fe1013220bc439ca6b43f36a930760024766990793c1ae38174e4dabd3bb9f9963cabd11a6f38bc5685cf3dc926776a1d3b6ac5698077953cd0de1a87
-EBUILD pangox-compat-0.0.2.ebuild 630 BLAKE2B 02fafde7a98b6e836ca725ec508ec5f25ad4d4bf970e6d1730175576ff5a56f05865def1a83092152d328fbf03c6fa49681f0129d5aa71e4f7ca1957d719510c SHA512 7752dc5eeaded0a3e4c58777f2b300a063ac21057aaf7f1781ac8897188540e8d2f7e4a334c2752e43b8e77434a28086c63fa87bb0ef7e4befb4f56975e93610
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild b/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild
deleted file mode 100644
index 9b8599f1f5f4..000000000000
--- a/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="PangoX compatibility library"
-HOMEPAGE="http://www.pango.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} gnome2_src_configure --disable-static
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild b/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild
deleted file mode 100644
index 5b7a845e893c..000000000000
--- a/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="PangoX compatibility library"
-HOMEPAGE="http://www.pango.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=">=dev-libs/glib-2.31:2
-	>=x11-libs/pango-1.32
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	G2CONF="${G2CONF} --disable-static"
-
-	gnome2_src_configure
-}
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index f5c48c74a3af..c649aaf9b7e5 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 1782 BLAKE2B 5611bd96da3c2cf69676cf6d3d1a73a5f049a9c2aae62dce9789bbcc9811eb435117abd6368db46fee849fe8f7a353cd6d5e14bdf0585e3046fd4be3a4f9fc8b SHA512 b2844fc06f7643c01a8f3c025f08f99452d1c39f99e441e2ab2c6d9897a6e7c43c1dc766fcfe8749b5916fe2e58c491227d405638c8d777d6bc1957bbf82d6c5
-EBUILD pixman-9999.ebuild 1791 BLAKE2B 269eebe1da7f127311d09a4e0fae271324a51deb494123a35a44d4b3b1d5c4f166bda201d40f318115045942213605cf4fba6049027fef18818e9bea3cb59464 SHA512 e3c4e3374dc265f3d92f0eddeb142eb6c194103ec69f63c877182cf762b8021d836c06e8fb7b951e43c5ed690aa25e47630cea8657488c0b338179a63502abf1
+EBUILD pixman-0.40.0.ebuild 1804 BLAKE2B 1218233405208ab2cb8f626cdb20619e3a0231ce0b7b61c0bf20eb79371b043536f3359f0efe603013d9c21629e8ae2c0e6b30dc8cbd24bacef879df6a4c971f SHA512 df853875fb3ec8d822561cc99407fcf7c4ed6636d640e36b9d9ee4a6828d3d433860523cb13553563a86bfbaa7376a16b1c8d9142fc11bedeeea3e5d3733fc20
+EBUILD pixman-9999.ebuild 1813 BLAKE2B d14a09ddc32bbf215546aebea7461b9edfaf0cc4cc4388ac96622dc86a54f879a6857be3476cf31a5a4304caca832398921805af1e9fed032933caa286861470 SHA512 7026e00bf929118e477cecfa1dc116d3d75a166c697cca0648d49d6bebf1f98ce6b095af907fb3adcfd27bb3d5f27d70a1ac245261be436243a906d1edd06c47
 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 d45108302210..51a3421ad1b7 100644
--- a/x11-libs/pixman/pixman-0.40.0.ebuild
+++ b/x11-libs/pixman/pixman-0.40.0.ebuild
@@ -51,7 +51,7 @@ multilib_src_compile() {
 
 multilib_src_test() {
 	export OMP_NUM_THREADS=$(makeopts_jobs)
-	meson test -v -C "${BUILD_DIR}" -t 100
+	meson test -v -C "${BUILD_DIR}" -t 100 || die "tests failed"
 }
 
 multilib_src_install() {
diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
index 9c15b1e09657..b614ed9cc15a 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -51,7 +51,7 @@ multilib_src_compile() {
 
 multilib_src_test() {
 	export OMP_NUM_THREADS=$(makeopts_jobs)
-	meson test -v -C "${BUILD_DIR}" -t 100
+	meson test -v -C "${BUILD_DIR}" -t 100 || die "tests failed"
 }
 
 multilib_src_install() {
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 7593105fa33b..e79a8f6653bf 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,3 +1,3 @@
 DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304 SHA512 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
-EBUILD qscintilla-2.11.5.ebuild 1961 BLAKE2B 86dfccd17bcf5d2aa8b20209aced0009fde39020466a7424f81f434a7bea536c72a93d9a82db006fcc9f65aedd29a757712f40c5131a501550b8bfc1cd4ca106 SHA512 cb82aa14bfdfb8f986ba9c28a0e0697ce969d433ad08eff97e4919506db36ad618c4bbad81839d0e2387e9c09269bf611d9695e986b10aa89f8ccff5c92c0659
+EBUILD qscintilla-2.11.5.ebuild 1959 BLAKE2B 66709df30efbbee01900254c1fbe9026155fc6a063b2bbc2dee69278c6600a258ba351155519db19588d6a032080be7bdbb2dc0ecad7dcacdd4eb017f2e5b542 SHA512 f786290e1496a6d1ff12f9c235269e5d72d4e5898fd5b57a787df74d84f33359b6eeff3530d96fb9037804e26be126abcd3cf84c9242f4c24238ea94898646b5
 MISC metadata.xml 604 BLAKE2B d353a492de987b1b7898a206a1d29fff43dc25ec7809d95fe8ddd816507c24b7fea26de43ce16cb0b939e31d663d280231202b787fcff2f6b79d4716c9a00713 SHA512 ff45db818793a808f2fee2a85fbf9d3a069bcf406f8d18c5a49f527d332002cad64295ae9b31f5297203610a4497db12e5aace0861069e55f127c736a4065580
diff --git a/x11-libs/qscintilla/qscintilla-2.11.5.ebuild b/x11-libs/qscintilla/qscintilla-2.11.5.ebuild
index b6721fffe964..301812495e56 100644
--- a/x11-libs/qscintilla/qscintilla-2.11.5.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.11.5.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
 IUSE="designer doc"
 
 RDEPEND="
diff --git a/x11-libs/qtermwidget/Manifest b/x11-libs/qtermwidget/Manifest
index 5150f2442b93..03b3544484db 100644
--- a/x11-libs/qtermwidget/Manifest
+++ b/x11-libs/qtermwidget/Manifest
@@ -1,6 +1,8 @@
 DIST qtermwidget-0.14.1.tar.xz 178952 BLAKE2B ae266dedc717da7de0b74c4fed2e89c6047f3d8d7e70c553ed5150ba8507e0b634978304105843009069240e09aabf153288a6c86e9874f9043b63f85f12d3d1 SHA512 6b6d4abd6fc21f10f5323321f26132c0ff5b9682d09a086e265e57976deb60fca8db9a9906a29a0ed8d0e7b83417d5852df55d0118936d5f7a1342a9c2cb6410
 DIST qtermwidget-0.15.0.tar.xz 181284 BLAKE2B a862821d30831c829e2391f33348e1499e80b515d23226f06070bd8bb82b383d51ea73f0784f04e5a30630db5176564af35995641b3958d60a206f82fecd680f SHA512 95f44c77d0b678b1a204b559a7adb2fb68b2e82b2357d89239e9fc1c6f445346d84ec7f395d58f17a2ef7b42e58c02590f637683193eae4f7efbd001b61857c7
+DIST qtermwidget-0.16.1.tar.xz 182764 BLAKE2B ba041130d8d67c08db07b91a5eb513c6fee548df3abef3ac7d7ccc5114771f2a14fff3c3f01a762670d8e3d9887fd7f62e1c018ea98ee7cc8e68b77317871966 SHA512 689d067e259aa07b22e1d3344467180109e871a8d45551085625c04670f1422b821bbbf52caf2b67e10ce8e78214c8e65811e6eb4fc61dd246fc25598ed095c5
 EBUILD qtermwidget-0.14.1.ebuild 651 BLAKE2B ffe5762f8b8a6fdf86915371391831c7f5595ac9da8044baf8f400a92b6d7b3c109619d0308abecc9067fd088dbff79d6e1e9c4525592c76dc9ce0325e9def8b SHA512 1778f1ed57ca6e295a510ebb0c6fc6fca0be35dbbc43fe1c8663caf9ecaec1b8645fde0215653ada1cc501a248b71b55a3bf318fbfb13b26922a35712b3a8ab6
 EBUILD qtermwidget-0.15.0.ebuild 633 BLAKE2B 361ec82bc6d6428358972d52ae7e40b99dba35f17494b1b76926bcd16249f76de8092052b1fcb29a4ede0198abef84ec8f6a9d48668276c4e8bcc7639a631b8e SHA512 22efdd7fcf770f8b51cfea207bc02a0e04e90ef5ac857f51fccdc1274e3bb5bb30afcb680aa32dcede12a9bd2abf642be7d0b81bc4248b48d9c26e38e79aab2f
-EBUILD qtermwidget-9999.ebuild 635 BLAKE2B c1a7ace3b67de65be4f5ab7600b5bb1dfcc5f26d6d9cab78d31a9d47de94cee02fb3f372dd382f0a55221a3f54d92f4c49d66a32c24cf3732558ed6420c256b4 SHA512 208c7d506d6d738d8a827701840964278d71b4275ee7e9ad8a922677f4200fbe4fd93071c4912175bfd64de19e23e44794c1412b60251cd1035f8767b7161723
+EBUILD qtermwidget-0.16.1.ebuild 635 BLAKE2B bd3ea6e3166d6a08aa7b36fac143dcfef0144ed071f65ebbfce4c6b45f314456e5a4c626a106dfffafe1ccc9746562ff870dd57d2ecb8c8ece9dd1eef3a77065 SHA512 0f71788f9c75f21bd19dd8b4cd7aeef57eb6ae3f3dfe0600fc5b66c1c88e745fdcc6e9a0e36de91361f18cb5ea5efb6379884ef7bef577c34d2915da2d0351df
+EBUILD qtermwidget-9999.ebuild 635 BLAKE2B bd3ea6e3166d6a08aa7b36fac143dcfef0144ed071f65ebbfce4c6b45f314456e5a4c626a106dfffafe1ccc9746562ff870dd57d2ecb8c8ece9dd1eef3a77065 SHA512 0f71788f9c75f21bd19dd8b4cd7aeef57eb6ae3f3dfe0600fc5b66c1c88e745fdcc6e9a0e36de91361f18cb5ea5efb6379884ef7bef577c34d2915da2d0351df
 MISC metadata.xml 602 BLAKE2B fb54623b5c5e38a3eda61f4bc5f116c6da5f7f58dff1a65b2b43b3b4c5f8596ec4fbf4fb93e1705b4d97a5231fe75d23aa1705308523ef125ea81933ed3cad72 SHA512 30175f7c45f4102fdb38223065d4e143bebc2ecef84e2e148900d8510c9c393d8feb7d6787f9593b90f1e4054b5016444e02f17c6a8a51082e7b8cb8294d9d31
diff --git a/x11-libs/qtermwidget/qtermwidget-0.16.1.ebuild b/x11-libs/qtermwidget/qtermwidget-0.16.1.ebuild
new file mode 100644
index 000000000000..8f022c1013f2
--- /dev/null
+++ b/x11-libs/qtermwidget/qtermwidget-0.16.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 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.8.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 2f1859de6b24..8f022c1013f2 100644
--- a/x11-libs/qtermwidget/qtermwidget-9999.ebuild
+++ b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
@@ -21,7 +21,7 @@ SLOT="0/${PV}"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.7.0
+	>=dev-util/lxqt-build-tools-0.8.0
 "
 DEPEND="
 	dev-qt/qtcore:5
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 1405362c5267..e3ca9fce0669 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -2,5 +2,7 @@ AUX qwt-6.0.2-invalid-read.patch 9447 BLAKE2B a3a9074113cee590bae03f0a55eb6cb280
 AUX qwt-6.1.1-pc-destdir.patch 498 BLAKE2B 4e3fefa36daebe0c173adaae02c33a622d70cefd626998f9baf65229291be87dcd5dff175961fb2b33d794e0b3f082a36209ce682434bd3f83de6fecc585137a SHA512 a2035e27af7110a2aaf4e28f316e2c6c49b6909345ceec01eb4793ac66445594bf362fa6939506ba6d0300bde9487c83ea770299af8c3ca8d71b162cbc71e769
 AUX qwt-6.1.4-qt-5.15.patch 8857 BLAKE2B 539dd05419d36428aee36a78f92a875c5067366dfe56289e491c70a79d6e94f761eab55c97cf7b34e495ed049d438810ad48dfc9e01dd4bc1078b9fc1b4fe192 SHA512 ed00c4f3a06fd17d0a0bf9540937824e5f4e8e0b8b2fb3bf6e16f18d6fec5415ebc5ac828127ecc7cda6e2de7e52086cc236152f53cb8c21e2f86f6b0d6f430a
 DIST qwt-6.1.4.tar.bz2 4227315 BLAKE2B dd7212adb3c8fda081b1feeeb9d59b3b087deb0ef56bdbc7bb95e01992e41d5d91065f0b8aaf3337e1c66d4ad431bfb313f9b04bb2e43915f4cb21fb65725e36 SHA512 6135ce47fd4f9ff5b705193fc1f7410cfd5a0b84931bb17db750f6a5486ae810c261dae32431bd52838c36eadee02487148e1efa71c465c63aa43062eec160da
+DIST qwt-6.1.5.tar.bz2 4408268 BLAKE2B 5f42e0cfc95a7dade8e376438234abded91390b52a793eba6aef21027379f12ab2441fd80121e05c1fba13ac1b526bb6c1a6c0e8442c87cb06dcf2c520269373 SHA512 0dd1a8278751f0bb26e33ccbf120a20e406109a440d314e4525ce9a2d6f1fc56dccff2dc11c500fe2cfcbd42f4a641e87a231f93f321edc588d9353ffaccbd22
 EBUILD qwt-6.1.4.ebuild 3220 BLAKE2B 4ee760fc99c9327dd5c6351eb157458c86441e18e5867f5cac3494d0f38f58ae0412267f458bfc4fb0ea0ba4fd964aa7380cd08c0385e2ba1d79e53a7f741615 SHA512 56e8887197a8e05accbc67be1765c08406a9bdf0c5f66df13913bdc08e4846c59336aa51533ee7d5b1fd1c5a1afef6c7bfb108056261124908173e2083f4fd1f
+EBUILD qwt-6.1.5.ebuild 3182 BLAKE2B 818218d8f43d64602ad44a762c781165263439d8b6614e6e8ba8d373aefebc24dff89efac8608153034e9bac9cf8b6bbebe29551d48ebdf6da8572cd4d8bb54a SHA512 0ff008f3c0cc84739dd3c0158b187f677e56a07a7a625e48ffcbd5c68618bfc385427449cb1cac5841d6b1531113811e9af5195a7afb34cd7ff9d30d83be9db5
 MISC metadata.xml 870 BLAKE2B 1e2262a74f86901bfdb2a897fb40885880391898e60ca6ddb001ea6f7a1bca4586e2cc2c3af28b8d3f455aac4d93204efb370d491ac6749207cf584c8b08f589 SHA512 53e10079699529613ece87ae1e2908e7f7144d041f62618512d00df0b6bf9ae2c5b70afc8309cef0523e10a6605126f3ce871589c3133d64ac52db9ff7346b43
diff --git a/x11-libs/qwt/qwt-6.1.5.ebuild b/x11-libs/qwt/qwt-6.1.5.ebuild
new file mode 100644
index 000000000000..4ea5805f7f0b
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.1.5.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+DESCRIPTION="2D plotting library for Qt5"
+HOMEPAGE="https://qwt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
+
+LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+SLOT="6/1.5"
+IUSE="designer doc examples mathml opengl svg"
+
+DEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	designer? ( dev-qt/designer:5 )
+	opengl? (
+		dev-qt/qtopengl:5
+		virtual/opengl
+	)
+	svg? ( dev-qt/qtsvg:5 )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGES-6.1 README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.2-invalid-read.patch
+	"${FILESDIR}"/${PN}-6.1.1-pc-destdir.patch
+)
+
+src_prepare() {
+	default
+
+	cat > qwtconfig.pri <<-EOF
+		QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
+		QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
+		QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
+		QWT_CONFIG += QwtPlot QwtWidgets QwtPkgConfig
+		VERSION = ${PV/_*}
+		QWT_VERSION = ${PV/_*}
+	EOF
+
+	use designer && echo "QWT_CONFIG += QwtDesigner" >> qwtconfig.pri
+	use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri
+	use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri
+	use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
+
+	cat > qwtbuild.pri <<-EOF
+		QWT_CONFIG += qt warn_on thread release no_keywords
+	EOF
+
+	echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri
+
+	cat >> qwtconfig.pri <<-EOF
+		QWT_INSTALL_PLUGINS   = "${EPREFIX}$(qt5_get_plugindir)/designer"
+		QWT_INSTALL_FEATURES  = "${EPREFIX}$(qt5_get_mkspecsdir)/features"
+	EOF
+	sed \
+		-e 's/target doc/target/' \
+		-e "/^TARGET/s:(qwt):(qwt6-qt5):g" \
+		-e "/^TARGET/s:qwt):qwt6-qt5):g" \
+		-i src/src.pro || die
+
+	sed \
+		-e '/qwtAddLibrary/s:(qwt):(qwt6-qt5):g' \
+		-e '/qwtAddLibrary/s:qwt):qwt6-qt5):g' \
+		-i qwt.prf designer/designer.pro examples/examples.pri \
+		textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_compile() {
+	default
+}
+
+src_test() {
+	cd examples || die
+	eqmake5 examples.pro
+	emake
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	if use mathml; then
+		sed \
+			-e "s: -L\"${WORKDIR}\".* -lqwt6: -lqwt6:g" \
+			-i "${ED}"/usr/$(get_libdir)/pkgconfig/qwtmathml.pc || die
+	fi
+
+	if use doc; then
+		local HTML_DOCS=( doc/html/. )
+	else
+		rm -r "${ED}"/usr/share/doc/${PF}/html || die
+	fi
+
+	einstalldocs
+
+	mkdir -p "${ED}"/usr/share/man/ || die
+	mv "${ED}"/usr/share/doc/${PF}/man/man3 "${ED}"/usr/share/man/ && \
+		rmdir "${ED}"/usr/share/doc/${PF}/man || die
+
+	if use examples; then
+		# don't build examples - fix the qt files to build once installed
+		cat > examples/examples.pri <<-EOF
+			include( qwtconfig.pri )
+			TEMPLATE     = app
+			MOC_DIR      = moc
+			INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
+			DEPENDPATH  += "${EPREFIX}/usr/include/qwt6"
+			LIBS        += -lqwt6
+		EOF
+		sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
+		cp *.pri examples/ || die
+		insinto /usr/share/${PN}6
+		doins -r examples
+	fi
+}
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 03e107433339..0426d790ce56 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -3,11 +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.58.3-command-notify.patch.xz 4964 BLAKE2B f8414d3bf124bd3de4c08e22a051feabdb11fbded7562a0bf9858fb8b8cf6327a3fdf7e18592eacd9f3608af5b720fe9a0cb598092a12c816d37d36899d88f6b SHA512 0de06ec0019127ec2729950228f8cae3e61a306207e177b8427789d4f6477f102d78232bd7f1a6e02cc218f507474427ad8366bc3c16c8a305b432dba96ba685
-DIST vte-0.58.3.tar.xz 514844 BLAKE2B 1f48e95ec81397937c8a5a3d34ea9a7d1835d6cacec6e1b90b78568505d509b375f55678462428dd01da00e7290e4543bbab2dbb0aea46a322788fbaf022427b SHA512 b0a38eb1cd7d923b0431af943dbdb89932833f9a2b0b8fc1fa9ee728c87418c1f5a424b2ccee661721093a80c569f3b41c721b0ba2302ba0c3a42d4c5e31aa9a
 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
 EBUILD vte-0.28.2-r209.ebuild 1865 BLAKE2B c5e05195cda70e92ecf2bf90b2d00094c8e3679d0cd8fe8ee3fb8f53a7a32671fe81c5daaaf5a60d3a511bb98cb09a95487931db519f5b28d1d3a935b1e60e8b SHA512 75e44dda5dfcccec43b57eaf2cf73667460700bfa91833b11e83d3cfcf8a2a84ba5ab239650b8f3276a8cd7341cfb3453317c01092f9a1c1623e9eaf287348b4
-EBUILD vte-0.58.3.ebuild 2072 BLAKE2B 56ac1b16fe5ae050c9a0604c8b66bb8a1d90e16d43d38b833e796f46eeb8032211cae9f0ac97fa9882dfa678a5830eb8fbde1a422a7e6ff0bdb36c8067f02ca1 SHA512 127732d569d2119149056e220818050e944a48c155c7e2ce6af453d7a68751a811011122321bb5dfd9e2f5402a1ba29d432d7a96dd4025294d13d220b859db93
-EBUILD vte-0.60.3.ebuild 2204 BLAKE2B 3d039a6cd2189f6ca40df31339cc3a97530c5d8c0629a9b933d099337451f23b26f0667c3070c1f86cd6d204816093251901871bb6bbe5661b8cd3645e258420 SHA512 6ad81b19eaafc6a148d1eeb30f98c95b1858766e8830788a4dd539a762d43fc819d59e8484e3158a8ba5a69958b69cc2dd95fde17bcc7ec79027d448a3331a06
+EBUILD vte-0.60.3.ebuild 2202 BLAKE2B dda1b10be7bd337e1e5159cd251315d51ae3fd17be6ff75f82402a462d7491313919f563b6bf5702f8e7ac2ea4d58cffb6834377ac35e22a573084ba77dfc152 SHA512 7caacb773b7f53d311899fcd6f56171e3e96d5be3c997304c6e870d95d11beaa2ce0b63d3d8876713798648621bc46bd7b491a7ad40845ceec929befec41bdf3
 MISC metadata.xml 518 BLAKE2B c7e4aeabaea85722d8f81e1cdf7428a3ab30e38fd03c6e2bfaf81b21468d00d63d8aca53c90b50292075259bc8498a51785e1034874f3c8a9fa42d13b90d6d87 SHA512 c76435d37b54d53bdcd66dded770858b8801c15bfcda607529039928d5009635902d320ba14840e731618ebf8e0eafc2437d74cc0243ccf7a515e4f7efcdb338
diff --git a/x11-libs/vte/vte-0.58.3.ebuild b/x11-libs/vte/vte-0.58.3.ebuild
deleted file mode 100644
index c542b20541ae..000000000000
--- a/x11-libs/vte/vte-0.58.3.ebuild
+++ /dev/null
@@ -1,76 +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 +introspection +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.58.3-command-notify.patch.xz )"
-
-RDEPEND="
-	>=x11-libs/gtk+-3.16:3[introspection?]
-	>=dev-libs/fribidi-1.0.0
-	>=dev-libs/glib-2.40:2
-	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
-	>=x11-libs/pango-1.22.0
-	>=dev-libs/libpcre2-10.21
-	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.58.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=(
-		$(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
-		-Diconv=true
-		$(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.60.3.ebuild b/x11-libs/vte/vte-0.60.3.ebuild
index 962bc35842ee..fc9dae3f5f80 100644
--- a/x11-libs/vte/vte-0.60.3.ebuild
+++ b/x11-libs/vte/vte-0.60.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/~leio/distfiles/${PN}-0.60.3-command-notify.patch.xz )"
diff --git a/x11-libs/xcb-util-xrm/Manifest b/x11-libs/xcb-util-xrm/Manifest
index 8d4ac1af04cd..8a1eff3ab602 100644
--- a/x11-libs/xcb-util-xrm/Manifest
+++ b/x11-libs/xcb-util-xrm/Manifest
@@ -1,4 +1,3 @@
 DIST xcb-util-xrm-1.3.tar.bz2 327586 BLAKE2B 06ba03ba22c9a51cad5045024b63d48f32e5ad38d2cf03035bd1132a04ef4906a71d89030141b407329bd8ec04cb131846be2cb3a95e755a57c2841a45b58fa4 SHA512 ebca5d92c9e2363f58485970a0c3a948b13652ce7acdd51dff918fc2e8bc7fcb69892eb3fc8b5f7eaf721ccd8dc2db42727d206bc5155481ec5e7e41d0c7f304
-EBUILD xcb-util-xrm-1.3-r1.ebuild 598 BLAKE2B 631c33ed9e8a30bf3635c2a0ff1d1d888e64eae43f9e485ac47221bb83fb20cd91245f583d65a32cff0803a49b02d3b82796f9fee33241bc669825c77ea43da1 SHA512 22a0b417a01542f725d903785c40ecd6dd7a33f221a134278d3862549622a6a518a668d9dece9c7164040b25d73bf547ebf3bcc76446aa12af239abe310b3d38
-EBUILD xcb-util-xrm-1.3.ebuild 696 BLAKE2B fd75ffdbf2a57ae132b8e109cc809af9d457895efff25affa555d6028fe53edfd5c2fefd55553fa7fb29cf4ce4b7d953a0195aa347e89510a0d4945fd10d3794 SHA512 e1f7f401b0f02976b284544e34dc6dc27e99357803595cd7e939525d06b19b4825e1b18c23762a89df3b102ba3901416db5ab27911a50bb78e07c2fbe658e593
+EBUILD xcb-util-xrm-1.3-r1.ebuild 593 BLAKE2B 46638c0a890ea5b15371301a87a722883a0226ae66542e14fa5d6f0a884d81c8a17bf824dd04350ceb42aab4924bba38480d4881ff4c4641c81e47655bdf84e1 SHA512 3829a3165361df4ff04ffe25c14f04a7a598848b832ad0f3db837e13d7cdeb8088fcdf1e13c4bb2dd3527a4773d4455de56e49eb55217070a9bfc5ea6ca79ed6
 MISC metadata.xml 784 BLAKE2B 802cbe25eb9804eb0fcf6332867c9028695327fc96577ecd6bb608a125fa2f47d90a0afe9f634878e7deae7362e83fb95c753138c28ab733e1b8b743ccd77bc3 SHA512 c9c5f617e17bd3d25005a5ebf3c394939055f0376ef0e4e68be19fdffa9716fe2bd57a4d5b912cbc4d908b0498e189d484266872dd7afa41e5dfa54570b75509
diff --git a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3-r1.ebuild b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3-r1.ebuild
index d442dae06839..792ab1a61177 100644
--- a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3-r1.ebuild
+++ b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/"
 SRC_URI="https://github.com/Airblader/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
 	x11-libs/xcb-util[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3.ebuild b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3.ebuild
deleted file mode 100644
index 97a2a94bdd05..000000000000
--- a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_BASE_INDIVIDUAL_URI=""
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="https://xcb.freedesktop.org/"
-SRC_URI="https://github.com/Airblader/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	x11-libs/xcb-util[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	x11-libs/libX11[${MULTILIB_USEDEP}]" # Only for tests, but configure.ac requires it
-
-src_configure() {
-	xorg-2_src_configure
-}