gentoo resync : 25.08.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
commit: 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree: c513fe68548b40365c1c2ebfe35c58ad431cdd77 /x11-libs
parent: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
75 files changed, 1173 insertions, 573 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index e8e5cf9d35d6..f4d9de4b059e 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index e7add9102b93..79b600dafa4f 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -5,7 +5,6 @@ AUX cairo-1.16.0-pdf-add-missing-flush.patch 914 BLAKE2B 6277dccf5e6fc70d885548b
 AUX cairo-1.16.0-strings.patch 690 BLAKE2B 2509bdb3d6592c9606c92730f1e052c0ce5dbbd557daaeb5955b998b8d89184063f15c583ea745fc16c07185cfe06e5f8ef9c18f749d35341918d626ceadd2b3 SHA512 90c9595698b30cceecc17ca186e7936d7884c382a23b8d536bdb10b912e6f1640037fc55326833a4977f332e02fc88d967ded751e50543c68dd80763b5fc43fe
 AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0fd4981a07a25122387c2f1b6ca4cd89a830360357953706dee62e4233126cd0630e4622f0682f6782cd27fa31f20ecc SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e
 DIST cairo-1.16.0.tar.xz 41997432 BLAKE2B aa37edf7fdf0c952484fd0adc9281724227db93958d6e4919216b30e9017fab670bc2340e3b975737080f1f67dec24025fe0e4680e275ab7703cfb9235eb1fe0 SHA512 9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
-EBUILD cairo-1.16.0-r3.ebuild 3893 BLAKE2B 98e15a4b9625b26914e80598b84f47b7f8b85e8ab9a786f65f0fb78e96f407d814dd93e93da446b1ffbb6727df9d26f4b914151df174cefeae3754d8dc900ad8 SHA512 053b0d82dcba55dde60a6ffb9f7cefc018a511009c72ee27247575661274ad43483c3194c8cdbc68be2d3edbf33d58d6214bd3e715d706faed4ce0f062039c21
-EBUILD cairo-1.16.0-r4.ebuild 3936 BLAKE2B d8945f862c312e904d22990d68ebf2aab4b9fa1b118ad7aca7bd58c2e72209871f63dd19389a44c91da08fc54ac34b6ee01e3c85e707b1ac8c0d35337935f23f SHA512 9105ed5abbe388eb6a1b5bcb345b4fa89ae6d61a2d71e651d04bebd8ed6f61f6b37edde743a5a9fcac0cc9c40fafa22c7c946fed23d53de93c08b614c75b605b
+EBUILD cairo-1.16.0-r4.ebuild 3927 BLAKE2B d7aceb5380a64539af97bfefc5c24554c7860b46f61028ad8e4e210bde398216375ce04eb47fc4027189e5b09453e1b8506c70873001fac103230d9f1a7aae6c SHA512 3ca945059e7c6a6aface10be7fe7043f6ef6d23f62a4ad4bdb3ff5b7e70218973a784f598d36c5da8bc6934f6473ddc1a10daffe3fb99619afd74244b8a463aa
 EBUILD cairo-9999.ebuild 3775 BLAKE2B 881817b40ccafbf1b08d8625c14726e6cf4ef830a5db0db4ceb33184eb5281df9984ee8a878cd56817dd0cffd9b5c2f5cbd8f02584ae336462db73c7be6a11ce SHA512 b1a2b120987ca449367491559bb16af21e8b78ce0c4dc94f1284bc17068c04f387d816f6c8d15ccb0a822751260386f8e7b7640233b23fc57a6b6e9383d543db
 MISC metadata.xml 709 BLAKE2B 7cdfba4d24004ca9d45af33b49ec0f27344306a42d2269010957d085f527a8ef6e95b521f00344e3280852b1b57d06f4f84ead4b5e149baac7a2c5a48de44d14 SHA512 5ff7d97521b43486f6a9d51fe36c7546e229a66deeb308d9f5f84b5473678f5db869d3f58634d044fddc00af499a8e03699b22bca0582290b3a322dd6ae66b1b
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
deleted file mode 100644
index 541a19e9c301..000000000000
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic autotools multilib-minimal
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
-	SRC_URI=""
-else
-	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo"
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-IUSE="X aqua debug gles2-only +glib opengl static-libs +svg utils valgrind"
-# gtk-doc regeneration doesn't seem to work with out-of-source builds
-#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
-
-# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
-RESTRICT="test"
-
-BDEPEND="
-	virtual/pkgconfig
-	>=sys-devel/libtool-2"
-RDEPEND="
-	>=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
-	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
-	sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
-	gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	opengl? ( >=media-libs/mesa-9.1.6[egl,X(+),${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
-#	doc? (
-#		>=dev-util/gtk-doc-1.6
-#		~app-text/docbook-xml-dtd-4.2
-#	)"
-
-REQUIRED_USE="
-	gles2-only? ( !opengl )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
-	"${FILESDIR}"/${PN}-respect-fontconfig.patch
-	"${FILESDIR}"/${P}-pdf-add-missing-flush.patch
-	"${FILESDIR}"/${P}-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
-)
-
-src_prepare() {
-	default
-
-	if has_version ">=sys-libs/binutils-libs-2.34"; then
-		eapply "${FILESDIR}"/${PN}-1.16.0-binutils-2.34.patch
-	fi
-
-	# tests and perf tools require X, bug #483574
-	if ! use X; then
-		sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
-	fi
-
-	# Slightly messed build system YAY
-	if [[ ${PV} == *9999* ]]; then
-		touch boilerplate/Makefile.am.features
-		touch src/Makefile.am.features
-		touch ChangeLog
-	fi
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myopts
-
-	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
-
-	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
-
-	# [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_with X x) \
-		$(use_enable X tee) \
-		$(use_enable X xlib) \
-		$(use_enable X xlib-xrender) \
-		$(use_enable X xcb) \
-		$(use_enable X xcb-shm) \
-		$(use_enable aqua quartz) \
-		$(use_enable aqua quartz-image) \
-		$(use_enable debug test-surfaces) \
-		$(use_enable gles2-only glesv2) \
-		$(use_enable glib gobject) \
-		$(use_enable opengl gl) \
-		$(use_enable static-libs static) \
-		$(use_enable svg) \
-		$(use_enable utils trace) \
-		$(use_enable valgrind) \
-		--enable-ft \
-		--enable-interpreter \
-		--enable-pdf \
-		--enable-png \
-		--enable-ps \
-		--enable-script \
-		--disable-drm \
-		--disable-directfb \
-		--disable-gallium \
-		--disable-qt \
-		--disable-vg \
-		--disable-xlib-xcb \
-		${myopts}
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
-	einstalldocs
-}
diff --git a/x11-libs/cairo/cairo-1.16.0-r4.ebuild b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
index d9108285f736..672498559bf3 100644
--- a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~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 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index 4b122c4c8532..326542835d8b 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -3,11 +3,12 @@ AUX fltk-1.3.3-fltk-config.patch 374 BLAKE2B 586aed22e1661424b6221df46827c552045
 AUX fltk-1.3.3-makefile-dirs.patch 230 BLAKE2B 517999f39b9de4f1f4f447e1d394ad562ead6354a94cf8a20e572182ab8f1e2e567406e07da365cc175ed427d9c94495f2287322cc6f6dc4ab24ffd43360472e SHA512 725cdbfa46b691a2adb55bb76fa44dc62cc1d8b83ad79c272bfee9dec9ec116cd1f974eba880e8f2a0d68365639cc4b65c40ca92304080f9cb73ce34a7f5df90
 AUX fltk-1.3.3-visibility.patch 781 BLAKE2B 7e909b6ec4ac6d915ac7dbab69a86b63166d002f23c51b770f6342d02cc0ea6d6bf1574aa40c25ed6cb5b2bc97c141f0787c67fa283ca8ef5b0753473d977713 SHA512 b9bf0ba24d27210702a98da3e5dbd4db7a36301a163ed8214362aaaa218bcc184d708fe1e249b5be4fd35e481dc5b85b2bf11db3e005436e57ad4436da2819df
 AUX fltk-1.3.4-conf-tests.patch 2259 BLAKE2B cb689918b807d75401ad3621deed635a883629c1e52ad0f797d77fb9e04aa28c9e9331399543f7d7fb63ca150f91d17ad0f7e71afef4364c505bf143bf3a7973 SHA512 a7ffb1c82e9a2c7bcfc7ffc1bfbf9fbf40daf4c5ca1ccb20c6e6d901846636de4c9166de8a63e739a730f4dc28c4527bec2c7390828611dc0b00b6c3e547b72e
+AUX fltk-1.3.5-AR.patch 291 BLAKE2B ffbca85e658a3e5615bd69ab10a6f2e740746fd2c56d0d4675edc37ab1866ba5c100fe33e6bf00897f17facd5e2ee806395869739a50e1c9f21d220ed36b4045 SHA512 4a10020e145466974aa624cdbc1b175507ecda5e733a0ec1fb6525f953bc474a4f942916fda49c3b04eb5bfc3197547f2c5c2535d61672206087a6d89cc4c8d9
 AUX fltk-1.3.5-cmake.patch 975 BLAKE2B d8f068c7773522683797e2ad2059019abdaff79b0457f376b7e856419d1b1f7132de2215fbfa32cb00c5216cc7dd8f52df31ddf8c035e7c723474a3ad3b328d9 SHA512 bf67629bbc7a00b6b10a59028b56b69bb253510d0dce63a530b622e8caf71a7e3d84fae2100ffcbf8207990f61031bc5c330a239dd928440825564a8cae102de
 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 4438 BLAKE2B 5acedca36b04560ac847112b0282c8d02a0aa7a68bdb0c525c5bc537864bbc0787f73c02af7bd1800f6f8a5da3769c5cd49ea238d477afe295bd655b34874bf7 SHA512 ff36a591984590fd580775a01d276ee5aa8ecc4bd663057262b3c6a92a1e741994b1e0bad000953539facba513d9d5533484a0b7c3d69a0ab906658f4464ae21
+EBUILD fltk-1.3.5-r4.ebuild 4474 BLAKE2B a8ee3868ed644172238fa4cd2746d1f2567f1fd7414a965da678544db4efc47349f097b7e72499fa60356b9446767e4ea128c4d811035065d2b86696c4f185bf SHA512 5c390545cb7dd434ad34029deb5aa9a69c03d380c97f3e90077934026fb7a877ba0bbb76ce61d75ba72fedfc1d9c1be649a0be9c545d04ee1fe867fc0431f328
 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/files/fltk-1.3.5-AR.patch b/x11-libs/fltk/files/fltk-1.3.5-AR.patch
new file mode 100644
index 000000000000..34dbc8769f09
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.5-AR.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -430,7 +430,7 @@ AC_PATH_PROG(DOXYDOC,doxygen)
+ 
+ dnl How do we make libraries?
+ AC_PROG_RANLIB
+-AC_PATH_TOOL(AR, ar)
++AC_CHECK_TOOL(AR, ar)
+ 
+ if test "x$AR" = "x:"; then
+     AC_MSG_ERROR([Configure could not find the library archiver, aborting.])
diff --git a/x11-libs/fltk/fltk-1.3.5-r4.ebuild b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
index 56edcb354e2f..bcc3ab8584a9 100644
--- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
@@ -66,6 +66,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.4-conf-tests.patch
 	"${FILESDIR}"/${PN}-1.3.5-cmake.patch
 	"${FILESDIR}"/${PN}-1.3.5-optim.patch
+	"${FILESDIR}"/${PN}-1.3.5-AR.patch
 )
 
 src_prepare() {
diff --git a/x11-libs/gl2ps/Manifest b/x11-libs/gl2ps/Manifest
index abe90e7467a7..c9209c252fe5 100644
--- a/x11-libs/gl2ps/Manifest
+++ b/x11-libs/gl2ps/Manifest
@@ -1,6 +1,9 @@
 AUX gl2ps-1.3.8-cmake.patch 2410 BLAKE2B 044a2b9cfd4b108e5e766f062123fec8ea9fe0ca51518419a76f70915501d5ba2e20301a80e92803dccdf90d33a086365e75b0b040bc5cd42ad0a7c9517e1b64 SHA512 9ae64f280ff72e88cccd8daedec283ffef3403a02dbfa5872ec8991a1b6f0c6e0afaa1ff5009ada99cf9a3bb051dccf61614a77947728140b516081de8a624bd
+AUX gl2ps-1.4.2-cmake.patch 1959 BLAKE2B 28725bdca4ec50c4cdb19100d30d3af4fe5705709b0aad92c79ca9d732da862170d922e037da29a43e174bf16b773d9ec73c2034a5f67803dd9e3c97dbc2f4d5 SHA512 a76a7649e8b2b62de6669f1bf1d3f4797708ae659ba8cdf9b3da21319dbc56035876d1b233c5b8934ee93a6b3d1b6562376734c6ef1da8764910a30b8849fe17
 DIST gl2ps-1.3.9.tgz 294907 BLAKE2B b8473f9f3fc6cefa2374f6fdd94fb98d73ea79b9c0087ccc573f6b66eafe11098fc4312d8ff121abe2a8d6c9a3474f69dcb321ef978f8777b6dc077e5504621f SHA512 e6770c27d4832a300b4e16a9f98deb8557e7875460e7aa7e655fdb796f5dfffd5eccdc8b15f5a3ae151713fc46f97dacad48ee7550c41373b6fc8cfd21a437cb
 DIST gl2ps-1.4.0.tgz 300339 BLAKE2B bda8742dea6c1b4eb3e3a3492e6f38229feb6480131ce69e3512e9c558f7817a34bc76985311c3879cfcec5f715f36f0b8300300dd26025cdb7e72478802aa7d SHA512 420b21a5b4397c9a9a2323a8686b8635c2683354c94762d2d0172c661fc36c4298042498dd8ef2323adf32f45aa4e0a3dba146058ccde597e5a46c2027cbf7ce
+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
 MISC metadata.xml 722 BLAKE2B 357dece0405ffb4a0714a534246c0f119a6b19d08b0d9867695d178af5e68bdf40b55824d35817c44ae85094f1900368ddf167752bc97c184cde687fca631a84 SHA512 0cd6f7dc51149def7310418cf775980f8287b9e40bde438e03dde020623f19b49648662f12e06233be7686eda4a5b75f79e92730dfdfd1a3ae6da80d6413efc9
diff --git a/x11-libs/gl2ps/files/gl2ps-1.4.2-cmake.patch b/x11-libs/gl2ps/files/gl2ps-1.4.2-cmake.patch
new file mode 100644
index 000000000000..9865c439aa78
--- /dev/null
+++ b/x11-libs/gl2ps/files/gl2ps-1.4.2-cmake.patch
@@ -0,0 +1,58 @@
+--- a/CMakeLists.txt	2020-07-08 17:53:51.133105546 +0200
++++ b/CMakeLists.txt	2020-07-08 17:58:02.652237439 +0200
+@@ -50,4 +50,6 @@
+ option(ENABLE_ZLIB "Enable compression using ZLIB" ON)
+ option(ENABLE_PNG "Enable PNG support" ON)
++option(ENABLE_DOC "Enable documentation" OFF)
++option(ENABLE_EXAMPLES "Build and install examples" OFF)
+ 
+ set(GL2PS_MAJOR_VERSION 1)
+@@ -140,6 +142,4 @@
+ 
+ if(OPENGL_FOUND)
+-  add_library(lib STATIC gl2ps.c gl2ps.h)
+-  set_target_properties(lib PROPERTIES OUTPUT_NAME gl2ps)
+ 
+   add_library(shared SHARED gl2ps.c gl2ps.h)
+@@ -152,5 +152,5 @@
+         COMPILE_FLAGS "-DGL2PSDLL -DGL2PSDLL_EXPORTS")
+   endif()
+-  install(TARGETS lib shared RUNTIME DESTINATION bin
++  install(TARGETS shared RUNTIME DESTINATION bin
+                              LIBRARY DESTINATION lib${LIB_SUFFIX}
+                              ARCHIVE DESTINATION lib${LIB_SUFFIX})
+@@ -160,15 +160,16 @@
+   set(GL2PS_DOC .)
+ else()
+-  set(GL2PS_DOC share/doc/gl2ps)
++  set(GL2PS_DOC ${CMAKE_INSTALL_DOCDIR})
+ endif()
+ 
+ install(FILES gl2ps.h DESTINATION include)
+ install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION ${GL2PS_DOC})
+-install(FILES ${CMAKE_SOURCE_DIR}/COPYING.LGPL DESTINATION ${GL2PS_DOC})
+-install(FILES ${CMAKE_SOURCE_DIR}/COPYING.GL2PS DESTINATION ${GL2PS_DOC})
++install(FILES ${CMAKE_SOURCE_DIR}/TODO.txt DESTINATION ${GL2PS_DOC})
++
++if(ENABLE_EXAMPLES)
+ install(FILES ${CMAKE_SOURCE_DIR}/gl2psTest.c DESTINATION ${GL2PS_DOC})
+ install(FILES ${CMAKE_SOURCE_DIR}/gl2psTestSimple.c DESTINATION ${GL2PS_DOC})
+ 
+-if(GLUT_FOUND)
++if(GLUT_FOUND AND BUILD_TESTING)
+   add_executable(gl2psTest WIN32 gl2psTest.c)
+   target_link_libraries(gl2psTest lib ${EXTERNAL_LIBRARIES})
+@@ -176,5 +177,7 @@
+   target_link_libraries(gl2psTestSimple lib ${EXTERNAL_LIBRARIES})
+ endif()
++endif()
+ 
++if(ENABLE_DOC)
+ find_package(LATEX)
+ if(PDFLATEX_COMPILER)
+@@ -195,4 +198,5 @@
+   endif()
+ endif()
++endif()
+ 
+ set(CPACK_PACKAGE_VENDOR "Christophe Geuzaine")
diff --git a/x11-libs/gl2ps/gl2ps-1.4.2.ebuild b/x11-libs/gl2ps/gl2ps-1.4.2.ebuild
new file mode 100644
index 000000000000..d97b83f7cc60
--- /dev/null
+++ b/x11-libs/gl2ps/gl2ps-1.4.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake
+
+DESCRIPTION="OpenGL to PostScript printing library"
+HOMEPAGE="http://www.geuz.org/gl2ps/"
+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"
+IUSE="doc png zlib"
+
+RDEPEND="
+	media-libs/freeglut
+	x11-libs/libXmu
+	png? ( media-libs/libpng:0= )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-tex/tth
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.4.2-cmake.patch )
+
+src_prepare() {
+	cmake_src_prepare
+	sed '/^install.*TODO\.txt/d' -i "${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DENABLE_DOC="$(usex doc)"
+		-DENABLE_PNG="$(usex png)"
+		-DENABLE_ZLIB="$(usex zlib)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		install_name_tool \
+			-id "${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib \
+			"${D}${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib || die
+	fi
+}
diff --git a/x11-libs/goocanvas/Manifest b/x11-libs/goocanvas/Manifest
index d58dcdb3e769..7108b94c1429 100644
--- a/x11-libs/goocanvas/Manifest
+++ b/x11-libs/goocanvas/Manifest
@@ -2,5 +2,5 @@ AUX goocanvas-1.0.0-gold.patch 848 BLAKE2B 5d808bc92fa4acedd0be7610e8b75030a3593
 DIST goocanvas-1.0.0.tar.bz2 570552 BLAKE2B 00b1a3d59448cc2f40dd20b0c97977cfc477a6656f32e2106b3f3bd5c42b8b625e270d9f96de44f30caf83b744b331699e7c6385b5269bf7b22e3bb25a879948 SHA512 fef4364b57dc777b6dcceb026f940121a24a8a3792e8d37d320eb47b7747ab0d54d8d7911b4ff77c21ca2b251937c9312da04221bbc246a07bbf4062689de644
 DIST goocanvas-2.0.4.tar.xz 584272 BLAKE2B 027ab47c1e9c241f74509001426367e86025ec8ea5901cf64c2014f8c32b83ce60870ca754dd15e8982a7023b77d3856b39dbbbdd636de6da47d361cb15a940e SHA512 e57dfd59d9b9cb64deadfeac193c11a89347c7f0e966377cfb98afcc2b46be13fe05d253a96e63dc7e6981c75e6e871040b83d8d0aee95cb62b79965d6be5688
 EBUILD goocanvas-1.0.0.ebuild 1266 BLAKE2B 6a55137d0ae30995f922cd70525420f3bf7fb351ef0091728ded8d59646e30f825e7f82d3e5f96eb06cd8d8b0dcacadcb90f1f5c108c1de009a20c73f453a06d SHA512 584d3fccd213dff57f61b25d57a37fdbdf5c3c6ade0ef400cccd83cc8b724aa76d02d482643412b5fa42117658d3c85233ff6d0174fdbbcd8999b9d2d28ef2b4
-EBUILD goocanvas-2.0.4.ebuild 1621 BLAKE2B 80a626c3d7bb409b262c5e7757d4c3095fc7b5a68f76f777a98a2a95ae4bf692bd6a6d8ca791ac01c967b9d28fa1afcf0762da8d647102dea51fd7092a475eb1 SHA512 e773c3f8fc4d2f19efadea630557d278e1a7159d2d1c239ab5828cb8843b378c5bdeb94eabfd018b2e6037d36d16d736f706cf0323895dfc60193774a70ef220
+EBUILD goocanvas-2.0.4-r1.ebuild 1220 BLAKE2B 35c7574ee407549c50c6629a000230dc42d0e2a2605b4f5a319ab65425c2fe073a7af7706403c589cdf4bdb2c1076cb580d585303bd4d7ea28501ba95df08aa3 SHA512 0865ed79174460fd99aeb0cfdf3d4f8d502a231b56df84c530ab445b5c86450019474a44c77bfe3f06b0d4a1e5a37d4e0e9eae2e6f9bfb0259be2e6925d5d85c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/goocanvas/goocanvas-2.0.4.ebuild b/x11-libs/goocanvas/goocanvas-2.0.4-r1.ebuild
index ebee51dd3a38..ecf7cebb1173 100644
--- a/x11-libs/goocanvas/goocanvas-2.0.4.ebuild
+++ b/x11-libs/goocanvas/goocanvas-2.0.4-r1.ebuild
@@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 )
 
-inherit gnome2 python-r1
+inherit gnome2
 
 DESCRIPTION="Canvas widget for GTK+ using the cairo 2D library for drawing"
 HOMEPAGE="https://wiki.gnome.org/GooCanvas"
@@ -12,18 +11,13 @@ HOMEPAGE="https://wiki.gnome.org/GooCanvas"
 LICENSE="LGPL-2"
 SLOT="2.0"
 KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="examples +introspection python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="examples +introspection"
 
-# python only enables python specific binding override
 RDEPEND="
 	>=x11-libs/gtk+-3.0.0:3
 	>=dev-libs/glib-2.28.0:2
 	>=x11-libs/cairo-1.10.0
 	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-2.90.4:3[${PYTHON_USEDEP}] )
 "
 DEPEND="${RDEPEND}
 	dev-util/glib-utils
@@ -37,7 +31,7 @@ src_prepare() {
 	sed -e 's/^\(SUBDIRS =.*\)demo\(.*\)$/\1\2/' \
 		-i Makefile.am Makefile.in || die "sed failed"
 
-	# Python bindings are built/installed manually.
+	# Python bindings are built/installed manually, but not at all anymore (py2).
 	sed -e "/SUBDIRS = python/d" -i bindings/Makefile.am bindings/Makefile.in
 
 	gnome2_src_prepare
@@ -54,14 +48,6 @@ src_configure() {
 src_install() {
 	gnome2_src_install
 
-	if use python; then
-		sub_install() {
-			python_moduleinto $(python -c "import gi;print gi._overridesdir")
-			python_domodule bindings/python/GooCanvas.py
-		}
-		python_foreach_impl sub_install
-	fi
-
 	if use examples; then
 		insinto "/usr/share/doc/${P}/examples/"
 		doins demo/*.[ch] demo/*.png
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index d719a9e4d8d0..ae557a6bda8a 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -9,8 +9,12 @@ DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169
 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 7269 BLAKE2B aeed59528e0e4888b17c6bb6319ec4e5b123d512b2eb995919457ae85ba161824c34a01ac68974bf688c948fd54ce77671d6067438fcf7ac5bad0364b7eeec8b SHA512 55510a28cedf956a8068eedf46c7703e560f8b6c2a3185e95acbd03257b048a69acc26215b13747ed92fe8ba1ae1d9efc1fd3a35bba3d5b70bf175d6934dd56b
+EBUILD gtk+-3.24.21.ebuild 7275 BLAKE2B 56a9c7d5ce48c0e3141375fd11646d4e5c39bd1536f2464b67d63fafb0d4befd3f5d918596b624618ed1279f19da26a1d359bef6edf8cd19ee6f865eb2029e82 SHA512 c5694653f9abb7b565c9f7657d21e92c58d94af8f521a3325b8373ebe6b949231238955b0bfe0baf97c8459c9742ad636bfb0541822894cc4c436abed7201d3b
+EBUILD gtk+-3.24.22.ebuild 7275 BLAKE2B 56a9c7d5ce48c0e3141375fd11646d4e5c39bd1536f2464b67d63fafb0d4befd3f5d918596b624618ed1279f19da26a1d359bef6edf8cd19ee6f865eb2029e82 SHA512 c5694653f9abb7b565c9f7657d21e92c58d94af8f521a3325b8373ebe6b949231238955b0bfe0baf97c8459c9742ad636bfb0541822894cc4c436abed7201d3b
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-3.24.21.ebuild b/x11-libs/gtk+/gtk+-3.24.21.ebuild
new file mode 100644
index 000000000000..476dca8c34fd
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.24.21.ebuild
@@ -0,0 +1,245 @@
+# 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
new file mode 100644
index 000000000000..476dca8c34fd
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.24.22.ebuild
@@ -0,0 +1,245 @@
+# 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+extra/Manifest b/x11-libs/gtk+extra/Manifest
index e4c9ea9ad7dc..549e4d10f07e 100644
--- a/x11-libs/gtk+extra/Manifest
+++ b/x11-libs/gtk+extra/Manifest
@@ -1,5 +1,3 @@
-DIST gtkextra-3.3.3.tar.gz 1503817 BLAKE2B dc99923ad962348d617b8db2171b99e925d0dc06501110d805f166ba25cff72094c02031e3375304ddfd96cc7d3f76a1b06d56b196aec1d1868f10d154acfc8e SHA512 864fa2e957941a05a9c4b4a4283ae48e733d72ab334e2fb8440fc884166b0d1ad34d381924184f7a88f829d00bbd857d5f3f32d89f159e0133dd89233a8a93e9
 DIST gtkextra-3.3.4.tar.gz 1542795 BLAKE2B 5a6d5b72f34c8373db615961728a01d0c27005726f316c1233b0b4c4dba688022a53236cc3abe090891a53441d910322ea938ea864a13933a5cea87f18e3426b SHA512 fd61bce7070cf4f28129b47a6c0b01e974101d96b525be9ce1bc4b40ce94197f3c411d17fd8954f5549075c4cdd7ac58a6aaa6faa2f5d3013b761391559e570b
-EBUILD gtk+extra-3.3.3.ebuild 879 BLAKE2B 71b3eca32db12de4dea51e16220b1b27f588dd9fe8d143b3b74e3959e2f504ceac00b9de0e0282d95fca9e9ce11f2a68312be62c51040ae0c31bb19194239362 SHA512 bfd32583e4842b00261e039f5635e883de68093b0cee4d3adfcf41ab52dc0a2992705579da501636486f47f2977d5d9529f8b8000f2dbb16618393e3656dd4d4
 EBUILD gtk+extra-3.3.4.ebuild 879 BLAKE2B ebe515d1d19ae0fe080ac310714b4337e4b97ee52ca4415cde354f99a622d7c686826267b2ce990cfe50374baa268a71f881e09a693c6c1d330bac221c961016 SHA512 3f86454600324ea8c766b27b01f1758d9200ce8f55fe00e82c700c37d9631b7a960b69f1e6282a12cd5dfe67ba286d743f17aae97feff2c5813bccf0cca529eb
 MISC metadata.xml 331 BLAKE2B aba9451bf53641f26c08773cf5146351d4bce301ae44d153dfe6650de8523ca85144e850e1ad3363094afd27b592d54b551f02c92e3de58bf6b5733752a43fe8 SHA512 af4ad9c00fe60299ada4ee678335173a37696f53b35fb9409b477622952b9b952d897168eed5c1bdb18d11d1797a9a80b6cce3782f3b6dd487a7cb682bfe127c
diff --git a/x11-libs/gtk+extra/gtk+extra-3.3.3.ebuild b/x11-libs/gtk+extra/gtk+extra-3.3.3.ebuild
deleted file mode 100644
index ae91f559dbfc..000000000000
--- a/x11-libs/gtk+extra/gtk+extra-3.3.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Useful Additional GTK+ widgets"
-HOMEPAGE="http://gtkextra.sourceforge.net"
-SRC_URI="mirror://sourceforge/gtkextra/gtkextra-${PV}.tar.gz"
-
-LICENSE="FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=x11-libs/gtk+-2.12.0:2
-	dev-libs/glib:2
-	introspection? ( >=dev-libs/gobject-introspection-0.6.14:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-# dev-libs/gobject-introspection-common needed for eautoreconf
-
-S="${WORKDIR}/gtkextra-${PV}"
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-glade=no \
-		--disable-man \
-		$(use_enable introspection) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests)
-}
diff --git a/x11-libs/libQGLViewer/Manifest b/x11-libs/libQGLViewer/Manifest
index 6e25da847c88..f1c6adbeecc3 100644
--- a/x11-libs/libQGLViewer/Manifest
+++ b/x11-libs/libQGLViewer/Manifest
@@ -1,3 +1,5 @@
 DIST libQGLViewer-2.7.1.tar.gz 3078737 BLAKE2B 0374c60374af0f4594ee79fafd53440654e9bb5114cef38e50deba86584cc55eef03d2177b5d54829f5b111d4d029384fff19f8a5bebf750cac1ab8cfe6afaa5 SHA512 1f597d737614f07682bde0d886c9c2eee57f478607a4caeac40922f66a6310ff30ea32e8ab44de0b23e0d1e5db2e6deea8c4fe3bc2cddc78ed5b971f638b09bd
+DIST libQGLViewer-2.7.2.tar.gz 3135146 BLAKE2B a46df06a135821fcb7895d4d037ee422cd9041695c57601cb7dccad3e1c4905ccbcacad91e47a79aa4adc85550db572adbb2311b1254d8779aba12d8fb36b255 SHA512 888695e413aa42b62d029efd1313f8aa101b4529f51edcea6416b58f6281715f8cdf27289d8f60cf1b0cdceba204e43e8477d30166350f8d3e090e6a93d8d595
 EBUILD libQGLViewer-2.7.1.ebuild 1285 BLAKE2B 9ce932050319d865cadff1ee5d8521774f5391fe761e61bda3af5566e4d26d1a3ffacc9e68e6d899bfb569d71bd7ddd4f96383f0437b3870d000b6c8a92af48c SHA512 db5405f9bde9c3a516dc27a17f1041b3b3ea499ab4f63428d03a1142e00cbdfa3b04d8264ba0ddbefb3b2dc41eda0983e4878370d165f6a7cb832dc5501184e5
-MISC metadata.xml 337 BLAKE2B d41f3f134ae930728e76d4924cd145a6a958482a008c047deda9e0ac8864496ceed43f939792583cc49bb572785a4924fb3e44da738b6ea2c84e43ca592844f4 SHA512 a699f6197293d6a53643064a2bcb524626e70c2f9557e8599ceadcf16b8d0fceeb98da2eb3691ed4b2fae0385416b1c238b3eff76228c3f420995b1d62f05e4e
+EBUILD libQGLViewer-2.7.2.ebuild 1285 BLAKE2B 06005ae54ef4375ee390449745fed5eb312ffd21b7a3aa593fd3f0c0369d660e0dfd9c85c15c4d50bf981fba22053d11b5aa7efbc1c091a71411420b35e750e3 SHA512 73c35b848d1e0a2c8dbb14c17b6c6eff3d3c07507617bfd3165fc36df2e6ac33c226778dbf815f989739e4c620421b6bd3fd0d2d1b72e7a8b8e5a5cc1f66b060
+MISC metadata.xml 432 BLAKE2B 58d3748670c672fff92a07043eb08f43e325f29e1b0e62bdda00070cc601910ce39c2239402594fdad94e9a60ccef55a383e57bce785c888669ef3abb82901e2 SHA512 9949df8d5472e624fdd4c1607cf1a4602764a4fc41553a0c7d48f6c46c60509c606abdc9947514ef08d442474c4837d87d59795c1ae02027f46dce1a414d518e
diff --git a/x11-libs/libQGLViewer/libQGLViewer-2.7.2.ebuild b/x11-libs/libQGLViewer/libQGLViewer-2.7.2.ebuild
new file mode 100644
index 000000000000..ac6ea56e5114
--- /dev/null
+++ b/x11-libs/libQGLViewer/libQGLViewer-2.7.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic qmake-utils
+
+DESCRIPTION="C++ library based on Qt that eases the creation of OpenGL 3D viewers"
+HOMEPAGE="http://www.libqglviewer.com"
+SRC_URI="http://www.libqglviewer.com/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/qt5"
+KEYWORDS="~amd64 ~arm"
+IUSE="designer examples"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	virtual/glu
+	virtual/opengl
+"
+RDEPEND="${DEPEND}
+	designer? ( dev-qt/designer:5 )
+"
+
+src_configure() {
+	append-ldflags "-LQGLViewer"
+	sed -e 's#designerPlugin##' -i ${P}.pro || die
+	use examples || sed -e 's#examples examples/contribs##' -i ${P}.pro || die
+	eqmake5 ${P}.pro \
+		PREFIX="${EPREFIX}/usr" \
+		LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
+		DOC_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+	if use designer ; then
+		cd "designerPlugin" || die
+		eqmake5 designerPlugin.pro
+	fi
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc README
+
+	if use designer ; then
+		cd "${S}/designerPlugin" || die
+		emake INSTALL_ROOT="${D}" install
+	fi
+
+	if use examples ; then
+		exeinto /usr/bin/${PN}-examples
+		doexe $(find "${S}/examples" -type f -executable ! -name '*.vcproj')
+	fi
+}
diff --git a/x11-libs/libQGLViewer/metadata.xml b/x11-libs/libQGLViewer/metadata.xml
index 6f836ff48534..9bc94015e4e3 100644
--- a/x11-libs/libQGLViewer/metadata.xml
+++ b/x11-libs/libQGLViewer/metadata.xml
@@ -8,4 +8,7 @@
   <use>
     <flag name="designer">Installs <pkg>dev-qt/designer</pkg> plugin.</flag>
   </use>
+  <upstream>
+    <remote-id type="github">GillesDebunne/libQGLViewer</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 89fd7f8ad215..290f1902ad61 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,3 +1,7 @@
+DIST libX11-1.6.10.tar.bz2 2294095 BLAKE2B de615b3fb95e709f3e7b4f91c21b7f29adedb591afd76d8e631ea1d88a54530d799c840de6f5ee1af2a5aa48dfb87bc20dcbed2a2902d707ea3c198ec24d8d86 SHA512 ad384d8896fbe587f7fd99b0d3cc56fac6e2facbab52fa99174200d06b19dd163a483c998acf3834b3a4a3aa4de0dbbe13919a1c80e6797afe467c7075b403ff
+DIST libX11-1.6.11.tar.bz2 2389687 BLAKE2B 996cd32d4d408b15c400fa9472cba884513d78d278282434a85983171f7b3205ed1eb720fa39e49668e036cbbe06523c29c6cb49895f4465fc5f8cecb9a6237f SHA512 2cb4e215c1e3ccb327e02586844f8c426068536a0f472a39f12191feace607f61a6a08586f03758248199678c2f6897a984b0f1222bc0d68fd2e02702f4ce0bf
 DIST libX11-1.6.9.tar.bz2 2283814 BLAKE2B 00fb965b9cd19bde79c4e598c677d21058c85a8ac37d9addab7fb0b2faf67e3d65b91e1864bcd7180e5fd8b0ab7ec3cf68ae7f95ac8e82a049529b5a139b43bd SHA512 fc18f0dc17ade1fc37402179f52e1f2b9c7b7d3a1a9590fea13046eb0c5193b4796289431cd99388eac01e8e59de77db45d2c9675d4f05ef8cf3ba6382c3dd31
-EBUILD libX11-1.6.9.ebuild 693 BLAKE2B 9c679aa628f39b4fddc4141f10b26be3a01d2ee5fa477bc80e6eaf0891a5c2cf5815e5c25556b370b31dfcd6846973c45e6b56ce5b73d5d1ff64a755a00be4ed SHA512 5114bb518dd2bb22cb6a43d8425f20e14a13344d6e0a235a573dfe077e07e96fecdb65d79006731b7948299be0c8af5898d06fc78ee7905f7b7cc7a9ea70e926
+EBUILD libX11-1.6.10.ebuild 748 BLAKE2B cbac32722674f88cd9c61ad37160a9244d7465ca3dd36fa4b7bb100abbefaf445a0eb81cac7893cf9babe419a22f8b769cbd0d967c1e3b10d1fbb54091214786 SHA512 34245a9233cfa4a2ca504fcb9f0ae89410104162e3e20a7353c78f27a4e971f5bff6b9e1b3f7d82a09b330b4e0363da22aee3c1a3a3e2d59b87dabc05a51a1e6
+EBUILD libX11-1.6.11.ebuild 741 BLAKE2B d7d5899eb21d4f54475a0d69d5de7f9d35f916ab79955027cbe97c42615b7da9301a03fc3ec27899f293add7bb238d39649adb79a59a531f0a519e03ea19dc2d SHA512 58e6041fd4b570578c5df2014ed8783492c4788d3ebc4bc45ce383423f5ab7a791ec116144c114cf2cd729e998ef52a5a88c83207648596f468b728bea6e14b1
+EBUILD libX11-1.6.9.ebuild 739 BLAKE2B e6cd8b1efb69830827eb1da03aa9d787b476cbedc9365aed49e73fea393f8cc976f66a48a8dafdc919f2df3b8d17cd3e975ffd4302a4b932939ba435643fa20c SHA512 ad71978aaae6e2827d79815147fb22ee2e3d4224ada3ba4a0c48d3cf8f204c936136bf601b4d57b03a7eecb5cac44f7eccaff4c7fc2e0354d1e1debd62bf7944
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.6.10.ebuild b/x11-libs/libX11/libX11-1.6.10.ebuild
new file mode 100644
index 000000000000..332f2c8108d0
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.6.10.ebuild
@@ -0,0 +1,31 @@
+# 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"
+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)"
+	)
+}
diff --git a/x11-libs/libX11/libX11-1.6.11.ebuild b/x11-libs/libX11/libX11-1.6.11.ebuild
new file mode 100644
index 000000000000..08b737574216
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.6.11.ebuild
@@ -0,0 +1,31 @@
+# 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"
+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)"
+	)
+}
diff --git a/x11-libs/libX11/libX11-1.6.9.ebuild b/x11-libs/libX11/libX11-1.6.9.ebuild
index 10c68c7a868a..54f5a229c4a2 100644
--- a/x11-libs/libX11/libX11-1.6.9.ebuild
+++ b/x11-libs/libX11/libX11-1.6.9.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 XORG_DOC=doc
 XORG_MULTILIB=yes
-inherit xorg-3
+inherit toolchain-funcs xorg-3
 
 DESCRIPTION="X.Org X11 library"
 
@@ -26,5 +26,6 @@ pkg_setup() {
 		$(use_enable doc specs)
 		$(use_enable ipv6)
 		--without-fop
+		CPP="$(tc-getPROG CPP cpp)"
 	)
 }
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index abe5f20a6650..9b49b33868c9 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,4 @@
-DIST libdrm-2.4.100.tar.bz2 855793 BLAKE2B ba2c631de860b8e2a8bb34d8ac0ba2ed11c05cc98a156bb81ffafa0395e22f79878b9936efd1ae33c31049c2a5cc281586a867a974eeb4018dd713a8481ed269 SHA512 4d3a5556e650872944af52f49de395e0ce8ac9ac58530e39a34413e94dc56c231ee71b8b8de9fb944263515a922b3ebbf7ddfebeaaa91543c2604f9bcf561247
 DIST libdrm-2.4.102.tar.xz 408844 BLAKE2B f3a5ddb96130d175e860984412949713cd30145a3a9e453f666b650ec9b7eedb1c8e230aa7c5769331a330d833fdeba3da28b339150d81c17716a96935267178 SHA512 386afd228efd809fe32776a6ff5d9dd95d1409a6a6a89b3806a3b42ed27e84f1e090f3b7834973f834d6b0d1342b7034447fe8690d072f85f03292d7795c3e0c
-EBUILD libdrm-2.4.100.ebuild 2120 BLAKE2B 97b0766f1a0b6bd1b796d4049891323c7442bc2d05f3f58bfab236d335b21c76c0cf4312702e3b0d57f6de3fae681bc3eeec97ae17e80a0b6783a11c23921e1d SHA512 e136099e103664353af667600f77f2bdeb8594395cc15f27a5e06b85f18ca28962ac81e955b886e0db157e5e8caf1b59c6ffe952d2286e5d3c9131d5ea9d71a3
-EBUILD libdrm-2.4.102.ebuild 1988 BLAKE2B d8456210498cfd377691e05d37ef8abb1412de0f3fc871f7ffc4cc141a34a95b196ec843ce0939719e3d9fee6d6dffd46de6fdae4b6d1426235d591ff9268022 SHA512 9ed3335d53489a17d895493c948c7ae44ec645c07ea6b8d1271deb62203a02c8b38120d0a717c15de3e8061098a7ad57f5b6f2ee96ebebd06bdf37758975e801
+EBUILD libdrm-2.4.102.ebuild 1980 BLAKE2B 521ae5ff9a2b781e3fc22f089e4276a0f739bfae842e4379e3f332bdff0f6d0ff0a2bfe52d6346f3f4c6a81586878c2acd574441ca1cc43bab5db46353bde3ce SHA512 37b69924e37465600c6f48455646c3ca8fae6d0563581a0316e534a0671280c989b37fd9bd1b3d64c80f7655d21d68ed5a9b93f684dbdadca1d11deecb16ab64
 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.100.ebuild b/x11-libs/libdrm/libdrm-2.4.100.ebuild
deleted file mode 100644
index 83a5eaf7240b..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.100.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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.bz2"
-	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="elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[${MULTILIB_USEDEP}] )
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		# Udev is only used by tests now.
-		-Dudev=false
-		-Dcairo-tests=false
-		-Damdgpu=$(usex video_cards_amdgpu true false)
-		-Dexynos=$(usex video_cards_exynos true false)
-		-Dfreedreno=$(usex video_cards_freedreno true false)
-		-Dintel=$(usex video_cards_intel true false)
-		-Dnouveau=$(usex video_cards_nouveau true false)
-		-Domap=$(usex video_cards_omap true false)
-		-Dradeon=$(usex video_cards_radeon true false)
-		-Dtegra=$(usex video_cards_tegra true false)
-		-Dvc4=$(usex video_cards_vc4 true false)
-		-Detnaviv=$(usex video_cards_vivante true false)
-		-Dvmwgfx=$(usex video_cards_vmware true false)
-		-Dlibkms=$(usex libkms true false)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		-Dvalgrind=$(usex valgrind auto false)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.102.ebuild b/x11-libs/libdrm/libdrm-2.4.102.ebuild
index 46ea35c8a426..d20191fc0514 100644
--- a/x11-libs/libdrm/libdrm-2.4.102.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.102.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	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"
diff --git a/x11-libs/libfakekey/Manifest b/x11-libs/libfakekey/Manifest
index ce1e7645dc6f..803ae3b3df3a 100644
--- a/x11-libs/libfakekey/Manifest
+++ b/x11-libs/libfakekey/Manifest
@@ -1,4 +1,4 @@
 AUX libfakekey-0.3-ac.patch 764 BLAKE2B 733cdb11da016a2d3b9e196943d6c0a948404ed15de0684d8bf7bba28d700a5cc83a3cb0ed5b82ca95ed2d7c531136362f0373c87bab3c979a33ce8c2f613e64 SHA512 8cfe2a3185580e26c5d76d6b392003b96b73a1aabb15255b1aab54a777b3759e496d4c0323b18ee2a67a5537e68388b9c67f6d885bd791f62b42b39e37fb635c
 DIST libfakekey-0.3.tar.bz2 9672 BLAKE2B 1cd86581148e218879b14ff52fb085fd20248a475ccf00a08918d64db811b21bbba3632e799d798077a197298da4d976be3180c060a6016c396428519d1aaef2 SHA512 b0502dbb01839009de7120f8ca939c839850e7c3c88678b52d6df9f4205cbec20769cedd61c9307e8307f6bf789eee25b20d4fe20c25e7285318f5ea1334555a
-EBUILD libfakekey-0.3-r1.ebuild 1215 BLAKE2B 9f3a332e1a41b24ee153568ffbb55282018a02bee80e29be287daa76706cb280ef0c5fd888a6fffc93b99b32d91b6611174bbbc3387ac4cc5cf1318be340496a SHA512 f6dfa5dea8ba8cbef23a769b776f13bb951abeb174196b80727f2e3eb9b68667d30ecd3998e7578ce53c9967675fd4e2ad7e106c80aaea31bfde9d93f01df74e
+EBUILD libfakekey-0.3-r1.ebuild 1214 BLAKE2B 06e24e986b7a5ce1cbe57942d111e58d3adfa18a0d3239ee6ac4bde95ab3140f7404f07f74fc8d15c70b871e9139f4ac05b876384eeb5eba21756f270c334af1 SHA512 7c5e3ba63ad9ca18436ae5752d35cef93261f2a583e71a14e83b11a9d72c2142d031b7820c82bd712c38315ad9cb16a3475bb108dab130369c54f97d0ad48f38
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/x11-libs/libfakekey/libfakekey-0.3-r1.ebuild b/x11-libs/libfakekey/libfakekey-0.3-r1.ebuild
index cf6438886573..298324e02288 100644
--- a/x11-libs/libfakekey/libfakekey-0.3-r1.ebuild
+++ b/x11-libs/libfakekey/libfakekey-0.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.yoctoproject.org/cgit/cgit.cgi/${PN}/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86"
 IUSE="debug doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/x11-libs/libfm-qt/Manifest b/x11-libs/libfm-qt/Manifest
index a60a3522c5d5..0fe6daa41d8a 100644
--- a/x11-libs/libfm-qt/Manifest
+++ b/x11-libs/libfm-qt/Manifest
@@ -1,8 +1,4 @@
-AUX libfm-qt-0.14.1-phantom-desktop-files.patch 4871 BLAKE2B 9466f517953a8733f72296bda5c8b0081828fceda505f1603b7d5db193fb7bf72b6ce7c3c007877558b8f1a4295fa73a496e0b279790126a5859bdbd246b07c4 SHA512 19b3803704dba01da16725f1cc20b4cbb6b50210fcc7f0aea397dd8061cff55f9a0e57838b48f59649d6b8e4cc53dfb992b6160687cfa0b8f46b2dda6d431021
 AUX libfm-qt-0.15.1-update-runtime-colours.patch 1921 BLAKE2B 6adc0a2fc8a807adb865216406893aa35c2cd192daf004f71cddb62d8d4dfa357d6d79ee9d11bbd52567bca11e1d3a5225230b6350d46ae50eb9f4dc64978f79 SHA512 a3aa7bc3569c33299ce0bacb8fabd597ddbd2180138c6da2b99124893f7db486636234312cb1d8d0a63e08ddabfda0dc100ca6a4480aba7d60ab87cd48b92880
-DIST libfm-qt-0.14.1.tar.xz 328192 BLAKE2B ff229256d3232eabc046da1fed3e4b4e51a09c3d1f2815fa726bad62f3fc53111e5d7f003e82e383dde4fe910584644e66613cbc1803ad0e11f7b6bdb2e30cfe SHA512 a265f6831a077ccb78a994828e6c69a22f2f6432b1f6ed6f404af41f013112870f7aee98067f2c466bec6cdfea040c10c7ce7e0f0ed977e5d266ec38e543d2a7
 DIST libfm-qt-0.15.1.tar.xz 337396 BLAKE2B 619787039857f0b67245ff86f4c8de1b5305909bbf1dc07f20ab53f07a955d541853066a9011bb76d04a49006732ea23c4100e94fe3c61de77f1edbbbdef5854 SHA512 9bd3f61d830e4f7ba3e72d84e3ff1a07544f6f461d6eea7ecf2b31056020e08d47d83ef920b6e1a481a470dadfb995a6b3e3b57a13574d6abca617a84c71bdf5
-EBUILD libfm-qt-0.14.1-r2.ebuild 891 BLAKE2B dbcefdec629df0704f774e9bb62f4469edcc8ba402299a50f0aa96fedb620736ce669bc8f30f4b294ae858204aa7f43ce29052b2fcb83a984a8354d9b1dee775 SHA512 a5e69d0ef73ee74fe74217ae55b2937ca42d6b70d52abeaad0f47649ebf409cb0a03c51b81ab417c86842272735d10b15bd00e6853ea45cdc0f825e8079fb31b
-EBUILD libfm-qt-0.15.1-r1.ebuild 972 BLAKE2B c439999d322ec90b3bb35a8a61676ce3471a1decb3f70efc3bf1cc4bf2dbb3e88b1ccf0238ca5bd3f0dad9e78fe1a516c5b0e4e780953195bbc0103b56dfbf69 SHA512 88cc807873337f7eac71c5eee48d51572af07eb8964be5ea8f7867009fd3c636623c6da0c7039eac82f5781794b67cd51bfb81785fde7f8c40092796fc1bf598
-EBUILD libfm-qt-0.15.1.ebuild 903 BLAKE2B 18b712e1adcf4cad1b8dbfd8c7466431c5fae102d285fb9d412688092dd7e30b54eef42f7bbca89a65cc0991021f66c1a7c40f0f7c1b414e7b452af1e2a4ef20 SHA512 3c01045c648f1fc33602e74a7fa8538c0144f8421858afa556dac933c41bda1707b4b62592ef98da2664778ca5f5571ffc2c4bbc25ff22cc325aaf9ea25253f7
+EBUILD libfm-qt-0.15.1-r1.ebuild 970 BLAKE2B 842346064e7a6964eaf3fae8cf4b067baf1b70c965b31abc694f6b2c949fef04e57368638ae7a9ca5a7268b6a1861053ad3bb9390aaa0f298edd267b3acb6ce2 SHA512 47189888a0ade9e0ffd7723e9f8065e448e2945ace6aee7e83177df955415209e5ab0ac0c6d777ea9d5b03797f534d7e18cfc844f8c7084d5fc184a08a072822
 MISC metadata.xml 314 BLAKE2B a40b71c62066cf524406556206999869edecf714d898236a8f277132e8b3752fec298cf9407e9010a1037bc757fafcbae32abec9b52a68492d414acd529c176a SHA512 edaddf48fd7cef23284164b7046e0e6b5ce1442847d3353ee8175177f00b06973d6588811b166dacbd7a1182942128792858a43e029d6aa874c1b8625b5e78f3
diff --git a/x11-libs/libfm-qt/files/libfm-qt-0.14.1-phantom-desktop-files.patch b/x11-libs/libfm-qt/files/libfm-qt-0.14.1-phantom-desktop-files.patch
deleted file mode 100644
index b9edab299cd4..000000000000
--- a/x11-libs/libfm-qt/files/libfm-qt-0.14.1-phantom-desktop-files.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From f944be7d2447d5c579a57fb5519ee5e2dece5871 Mon Sep 17 00:00:00 2001
-From: Tsu Jan <tsujan2000@gmail.com>
-Date: Sun, 21 Apr 2019 14:11:14 +0430
-Subject: [PATCH] Don't ignore creation-deletion sequences
-
-Fixes https://github.com/lxqt/pcmanfm-qt/issues/944
-
-Previously, if a file was in addition queue and then it came into the deletion queue, its addition and deletion were both ignored. That was wrong and could result in showing nonexistent files because addition can also happen in directory list job before being processed by file info job.
-
-Also process accumulated changes only after finishing the current info job and don't clear all deletion paths after processing them (because, logically, only those paths that can be deleted should be removed).
----
- src/core/folder.cpp | 60 +++++++++++++++++++++++----------------------
- 1 file changed, 31 insertions(+), 29 deletions(-)
-
-diff --git a/src/core/folder.cpp b/src/core/folder.cpp
-index 6c2b27d..2385a8b 100644
---- a/src/core/folder.cpp
-+++ b/src/core/folder.cpp
-@@ -228,16 +228,6 @@ void Folder::onFileInfoFinished() {
-         return;
-     }
- 
--    // process the changes accumulated during this info job
--    if(filesystem_info_pending // means a pending change; see "onFileSystemInfoFinished()"
--       || !paths_to_update.empty() || !paths_to_add.empty() || !paths_to_del.empty()) {
--        QTimer::singleShot(0, this, &Folder::processPendingChanges);
--    }
--    // there's no pending change at the moment; let the next one be processed
--    else {
--        has_idle_update_handler = false;
--    }
--
-     FileInfoList files_to_add;
-     FileInfoList files_to_delete;
-     std::vector<FileInfoPair> files_to_update;
-@@ -271,6 +261,16 @@ void Folder::onFileInfoFinished() {
-         Q_EMIT filesChanged(files_to_update);
-     }
-     Q_EMIT contentChanged();
-+
-+    // process the changes accumulated during this info job
-+    if(filesystem_info_pending // means a pending change; see "onFileSystemInfoFinished()"
-+       || !paths_to_update.empty() || !paths_to_add.empty() || !paths_to_del.empty()) {
-+        QTimer::singleShot(0, this, &Folder::processPendingChanges);
-+    }
-+    // there's no pending change at the moment; let the next one be processed
-+    else {
-+        has_idle_update_handler = false;
-+    }
- }
- 
- void Folder::processPendingChanges() {
-@@ -314,21 +314,24 @@ void Folder::processPendingChanges() {
-     }
- 
-     // process deletion
--    if(!paths_to_del.empty()) {
--        FileInfoList deleted_files;
--        for(const auto &path: paths_to_del) {
--            auto name = path.baseName();
--            auto it = files_.find(name.get());
--            if(it != files_.end()) {
--                deleted_files.push_back(it->second);
--                files_.erase(it);
--            }
-+    FileInfoList deleted_files;
-+    auto path_it = paths_to_del.begin();
-+    while(path_it != paths_to_del.end()) {
-+        const auto& path = *path_it;
-+        auto name = path.baseName();
-+        auto it = files_.find(name.get());
-+        if(it != files_.end()) {
-+            deleted_files.push_back(it->second);
-+            files_.erase(it);
-+            path_it = paths_to_del.erase(path_it);
-         }
--        if(!deleted_files.empty()) {
--            Q_EMIT filesRemoved(deleted_files);
--            Q_EMIT contentChanged();
-+        else {
-+            ++path_it;
-         }
--        paths_to_del.clear();
-+    }
-+    if(!deleted_files.empty()) {
-+        Q_EMIT filesRemoved(deleted_files);
-+        Q_EMIT contentChanged();
-     }
- 
-     if(pending_change_notify) {
-@@ -404,13 +407,12 @@ void Folder::eventFileDeleted(const FilePath& path) {
-     bool deleted = true;
-     // qDebug() << "delete " << path.baseName().get();
-     // G_LOCK(lists);
--    if(std::find(paths_to_add.cbegin(), paths_to_add.cend(), path) != paths_to_add.cend()) {
--        // if the file was going to be added, just remove it from the addition queue
--        paths_to_add.erase(std::remove(paths_to_add.begin(), paths_to_add.end(), path), paths_to_add.cend());
--    }
--    else if(std::find(paths_to_del.cbegin(), paths_to_del.cend(), path) == paths_to_del.cend()) {
-+    /* WARNING: If the file is in the addition queue, we shouldn not remove it from that queue
-+       and ignore its deletion because it may have been added by the directory list job, in
-+       which case, ignoring an addition-deletion sequence would result in a nonexistent file. */
-+    if(std::find(paths_to_del.cbegin(), paths_to_del.cend(), path) == paths_to_del.cend()) {
-         paths_to_del.push_back(path);
--        // the update queue should be cancelled for a file that is going to be deleted
-+        // the update queue can be cancelled for a file that is going to be deleted
-         paths_to_update.erase(std::remove(paths_to_update.begin(), paths_to_update.end(), path), paths_to_update.cend());
-     }
-     else {
diff --git a/x11-libs/libfm-qt/libfm-qt-0.14.1-r2.ebuild b/x11-libs/libfm-qt/libfm-qt-0.14.1-r2.ebuild
deleted file mode 100644
index 57a6caf855e8..000000000000
--- a/x11-libs/libfm-qt/libfm-qt-0.14.1-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Qt port of libfm, a library providing components to build desktop 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://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/5"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.6.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
-"
-
-PATCHES="${FILESDIR}/${PN}-0.14.1-phantom-desktop-files.patch"
diff --git a/x11-libs/libfm-qt/libfm-qt-0.15.1-r1.ebuild b/x11-libs/libfm-qt/libfm-qt-0.15.1-r1.ebuild
index b820cada88ec..f7b601350e68 100644
--- a/x11-libs/libfm-qt/libfm-qt-0.15.1-r1.ebuild
+++ b/x11-libs/libfm-qt/libfm-qt-0.15.1-r1.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then
 	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"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="BSD GPL-2+ LGPL-2.1+"
diff --git a/x11-libs/libfm-qt/libfm-qt-0.15.1.ebuild b/x11-libs/libfm-qt/libfm-qt-0.15.1.ebuild
deleted file mode 100644
index d22a9ffd9ab0..000000000000
--- a/x11-libs/libfm-qt/libfm-qt-0.15.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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.7.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/libfm/Manifest b/x11-libs/libfm/Manifest
index 0de846bddb0b..9a34be27f690 100644
--- a/x11-libs/libfm/Manifest
+++ b/x11-libs/libfm/Manifest
@@ -4,4 +4,4 @@ DIST libfm-1.3.1.tar.gz 1290374 BLAKE2B 3df27fc6b4afd089e51cd36db0f764e9359b0c63
 EBUILD libfm-1.2.5.ebuild 3651 BLAKE2B 3a5a6b83cbc6449e57ee866aa27efaee76b027849a4e8bb4ea310f5b3e427e7689a4e925a657200c7f9d581164dcd24b601203a5e948b7f52c4a9a7f5a0e0b75 SHA512 de52c77cde4bb2b336e2470864d9a7e817b4e9194cd776981c8cdd181bb9e2d5c734f874b5e25d134ef67cc9ed2ce6ef053e56bed52b41415522f991b1debf9c
 EBUILD libfm-1.3.1.ebuild 3581 BLAKE2B 22e53ea769b94fb70010ffc84070af37d73f4b5910fca3f03f945faaf741bda44650075bd47950e09b475138afad4e907bd61152fb387bdf0f0e26d47e8bc3dc SHA512 6ccfcf5e1b80a64335873ce5d0f7c11ef71c1cb2799f0feebce24aa84d2d4adc02321d78b903adff38942ea7be73d5f5e8608906d7ee40e6270b73c416f10547
 EBUILD libfm-9999.ebuild 3384 BLAKE2B ad18db8685c9b695490b2f22423c8513b9cbc545f212d7218ed3ed4ba6bfb64e2ae22bc2332be70a4430fa315e11e6ae5f701556e1d7007a6898f0dbe867168b SHA512 cb7d45eabf3084fb530ab1dd359bf1c91391e9dc699f0423a210d28e69bdd3e93617156028dd982c25decb6968b495bc828eb56fdf44971f28741597265d0d7c
-MISC metadata.xml 656 BLAKE2B f3496af8311a14fa2d3d763e47b6a47592f2cfaba2deb1b96403ba0580515d1728d373b73808cf4a9439395fa334370e670249d94a5e7159202697ba4ce84e1e SHA512 d5fe41fd0b54c714dafe7a2e7ad482cb77e80b4f5313572be7b97dc1f0a697a931dadb173bc67f7e327eb7fb178c5587f8089de96d04fda31fdda287a6c985fd
+MISC metadata.xml 582 BLAKE2B 3e314b2f5accbb454ae1021d646393d30332919509ce60a48aa37a3285c4787a502315d74950f083f746eae9b5a7f1302a457418b3d6197195de88e0f390939a SHA512 eab4b456ea5035d3b0c358b6f871710bb3a69be67d918ed135c1acb199234d87bd2e8b1d426485490bb0b7cd9cbb66b6daaef43b39d3219a0fcf40145349dd62
diff --git a/x11-libs/libfm/metadata.xml b/x11-libs/libfm/metadata.xml
index 1798db6cc201..c6faec3664b2 100644
--- a/x11-libs/libfm/metadata.xml
+++ b/x11-libs/libfm/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>lxqt@gentoo.org</email>
-    <name>LXQt</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="vala">Support custom actions in menus</flag>
     <flag name="udisks">Use libfm's udisks-based volume monitor implementation instead of using the one from gvfs</flag>
diff --git a/x11-libs/libgxim/Manifest b/x11-libs/libgxim/Manifest
index 3da1a9fbb380..c30647afedde 100644
--- a/x11-libs/libgxim/Manifest
+++ b/x11-libs/libgxim/Manifest
@@ -1,3 +1,3 @@
 DIST libgxim-0.5.0.tar.bz2 469547 BLAKE2B 183ea514b990b93efcf41a56704385e8b84b18d1f4f992ddaa8f7481a74b132f05b56322450258d53bc1fbcaf42d2528d297922ae042f5831010d58540974982 SHA512 ca143e16e8ddd8e3cea01cc0857cb0e665f9cf397462e2fd9ed714b825eaa06056dae4115aacd117f8113e815f11184d9dd9f239259a1eee691d0b120db580f7
-EBUILD libgxim-0.5.0.ebuild 1323 BLAKE2B 70485834fe30e8b3d359788f4612f8d61ce509c963469dc542eb5dd124e02319e4ad854c98af3ff2dcf205364be88da2e9ac0d844a6c8ad6ce2aa52fb6909e3d SHA512 afc611c1cbe4a89c5657cb59d1c2c69fa4134ef495636361b5c057b3781b79c26c7d5a32abb1bf974c6270a41ce1e043309bce2acba5bd70a0419d4747c185c0
-MISC metadata.xml 325 BLAKE2B 842e0838af5a3aa081c0cd65b5ffda14736b9d597c8f9117d8e61be977078741a61edec36a1eaf11d3dd8883ab9c821e664194dd298aab39ebee684e20c8e757 SHA512 20ad59c0776da8a8541052eed41f71d8e40604056ffab37a1899d822880d8423d26395ef46d581d71c10128d943a5ad5b45b26f126bd446790c1ba72e33356c0
+EBUILD libgxim-0.5.0.ebuild 1333 BLAKE2B 5bb602b29f408b6031e05917879877277db19f9d7842721bc32f294d29532eba112eb2ba5b882d876931f112067ef058b74ac2b240a4e953574b97b96fa84cc6 SHA512 2c7f1de20ec4286c5f691af0195fd835ad2aa98c0dee7974a41315534707f392a2b4052a55875038df27b363ee7274df45fbc5a189b833f612ffab9e073af407
+MISC metadata.xml 315 BLAKE2B 9980262548c33ca403e90e13a2006c5cf6fb4d918767c6f0f0bdaf1392bf9fb17e1058d16e2375c35af56261cf76a748d715e728d718d0b805e2ddfcdd9c8ed6 SHA512 6b946c002528eb660b579ab36b43ccc997927877aee7dbe18fcf3ade0fe6f5d940c097b5d6eea5cca85b945f29e311c721154759fb33aeaa7c1b5bb0e224646c
diff --git a/x11-libs/libgxim/libgxim-0.5.0.ebuild b/x11-libs/libgxim/libgxim-0.5.0.ebuild
index 20ed63f1a541..5f7418aac956 100644
--- a/x11-libs/libgxim/libgxim-0.5.0.ebuild
+++ b/x11-libs/libgxim/libgxim-0.5.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-USE_RUBY="ruby24 ruby25 ruby26"
+EAPI="7"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 inherit autotools ruby-single
 
@@ -10,7 +10,7 @@ DESCRIPTION="GObject-based XIM protocol library"
 HOMEPAGE="https://tagoh.bitbucket.io/libgxim"
 SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
 IUSE="${USE_RUBY//ruby/ruby_targets_ruby} static-libs test"
@@ -22,8 +22,8 @@ RDEPEND="dev-libs/dbus-glib
 	virtual/libintl
 	x11-libs/gtk+:2
 	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	${RUBY_DEPS}
+DEPEND="${RDEPEND}"
+BDEPEND="${RUBY_DEPS}
 	dev-util/glib-utils
 	dev-util/intltool
 	sys-devel/autoconf-archive
diff --git a/x11-libs/libgxim/metadata.xml b/x11-libs/libgxim/metadata.xml
index 412816b73f03..f6aaeea5bffe 100644
--- a/x11-libs/libgxim/metadata.xml
+++ b/x11-libs/libgxim/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="bitbucket">tagoh/libgxim</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">tagoh/libgxim</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-libs/libva-intel-driver/Manifest b/x11-libs/libva-intel-driver/Manifest
index 1e5e438edf07..38592adb5068 100644
--- a/x11-libs/libva-intel-driver/Manifest
+++ b/x11-libs/libva-intel-driver/Manifest
@@ -1,6 +1,8 @@
 DIST intel-vaapi-driver-2.3.0.tar.bz2 2901075 BLAKE2B 606635c2b4ad05119a3fe1269354e2a27b944c56117360b5c4171b679506f3aa10d48057f1c99957efa1cff3b625a315138ac93e616aa14d30d20d540a3bb6a8 SHA512 60f37c09269e6ae07e55ecfc2c046ae7b6321abe71647625310ea7c75627ea875b94ed8e14813a36ec068bbd605c6d447dfa2c3bd692eb7953a58a871064fd5b
 DIST intel-vaapi-driver-2.4.0.pre1.tar.bz2 2888363 BLAKE2B fc7861e5d7625ed598feadc3b5649335c4f6bc0cacd66bdc38a58bbe4d95909c27c9b84478abdda687725070fa9fea850b3d86925ae6a7ea821a168e2bb98a13 SHA512 f637ca24b34573ae022f24f0352be8a6e2904a703ccfa005fb84da00c54e9e02ff0282e882312b86dd7e2d1a1611fba3eef37909ac66a3c2beb056d8cba6019f
+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-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
new file mode 100644
index 000000000000..07f80f8d2c00
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="intel-vaapi-driver"
+if [[ ${PV} = *9999* ]] ; then # Live ebuild
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/intel/intel-vaapi-driver"
+fi
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="wayland X"
+RESTRICT="test" # No tests
+
+RDEPEND="
+	>=x11-libs/libdrm-2.4.52[video_cards_intel,${MULTILIB_USEDEP}]
+	>=x11-libs/libva-2.4.0:=[X?,wayland?,drm,${MULTILIB_USEDEP}]
+	wayland? (
+		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	eapply_user
+	sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(use_enable wayland)
+		$(use_enable X x11)
+	)
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index 99fc6c411cb2..d1245b4523a5 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -1,8 +1,10 @@
 DIST intel-media-18.3.0.tar.gz 14422845 BLAKE2B 07da8e78d069de091bd4f29beb0699c97f007ff0f6543baa40d35923488d6152cb0a921cbe16006b045be973d5651ee01dc98ead0b79d4c779ed39e7a8fb38d9 SHA512 96ee85c087994d1e46666b6bbd5fca8e558d9169f8b7c130fdb4571ecd4dcbb31fe4a73607cc1b055918f27e90dbb25843d851bb8a1e2557733b4795e937479d
 DIST intel-media-18.4.1.tar.gz 14657816 BLAKE2B eb0be7c756e290bf5318987e375e9ad531fb4e318e4bf83f6c5d68106112a06d505ed7f8abc5ecb277b4430883d2153fe6c68ba683241253cb0d32853bb8dab2 SHA512 ed5d4116ab4af36761a0a819105f4ff5551d437e3f1ab8c1b2ea20a89a1792b7558bacd1ea8f082f595fce21d72810f806820b8543e1cbfcd2de7e28e649a536
 DIST intel-media-20.1.1.tar.gz 21788401 BLAKE2B 53f2ebf5941c487253d02d0e23229cd408eb3b53ef37cfdefb1a874e5a6c9b051b69ccda513c2d1d9bb9cc03814bc3db40a40241eb3c7a0a78edba3ba7e9bf01 SHA512 696f3b82d155e472285150b476daf9195ec6cbad0526f017fd0c57c1fb02618210b3e96eb13351ee286f3502df4970a22a940c3476877fa1f5c23dc85a646c25
+DIST intel-media-20.2.0.tar.gz 21860711 BLAKE2B df5ebb4ec603902dd34aca6915dab5bec4ad6237e5810d0e04349f7269adf62505afaed8456d1ad6a3544525bdb2012294e6b92e68dc3f0338f6fab54aa934bd SHA512 0f4817b66f4e2d752d5a34cc1c8974dd09b4fe4f6d8bf3df896887542c229088edc406a9b2a68a9b353214aa7ffa4cd8917cdb6695dbe2e316af6c444822b15b
 EBUILD libva-intel-media-driver-18.3.0.ebuild 892 BLAKE2B fd24321a622354cab7622f05b377b284d0ec301fb4a3e223413b991034ae93ff62b9d7d0bcc59d6dc13e9fad17619d5b448114eff8fd002d2595de32cbe19672 SHA512 f921231ce8251b7fc990f3a2ddc666d0a72035e8e9c3e80e632a0298c040872cb30c3e6e556f022e08dd0b75f7eb2e73f88f97e6308f0121a2c6684d6088f555
 EBUILD libva-intel-media-driver-18.4.1.ebuild 892 BLAKE2B efb6cbcf1340852a3ca27f5e763be43175e9d6c870877beb4a794f1da03d1e47c8d08668274b9e8dc26f4ef3674581e4bb6518547515c984bff7a6767d011ce1 SHA512 ace25c724f3434ddc08884d7bed8f944e78364d8f72c54b33f1f6f5919596a7a81581b369a0f0b9024858cc274a43df3095a76643a9433fc4a3d54ee1abb1d23
 EBUILD libva-intel-media-driver-20.1.1.ebuild 868 BLAKE2B 1925faeccacca0f6d0c3f75ffe081be5d9b140a10d6632468af645fa604b4c802840fe48741298af3a3f1b1657e0236ad7b96adadf7d207c36c62c787d7fd61a SHA512 6ec6ec8361808bb617d8c24a2c1830b644b18861ce463ecedc3c61960e5174644e531718cd8486741aa77353065ed48d630ffa037791188dd7f5c10e21d1f4e6
-EBUILD libva-intel-media-driver-9999.ebuild 868 BLAKE2B 1925faeccacca0f6d0c3f75ffe081be5d9b140a10d6632468af645fa604b4c802840fe48741298af3a3f1b1657e0236ad7b96adadf7d207c36c62c787d7fd61a SHA512 6ec6ec8361808bb617d8c24a2c1830b644b18861ce463ecedc3c61960e5174644e531718cd8486741aa77353065ed48d630ffa037791188dd7f5c10e21d1f4e6
+EBUILD libva-intel-media-driver-20.2.0.ebuild 869 BLAKE2B f060ace5837fa81761fd7a416d2c82647656691e7a356d4d5b1f5f74c06e417cbf8386429762d1a4b9ee63debaaa99efc5a55e6e333f372fe763848040f9e9bd SHA512 65233a25a88643d2d1b6d6d2381ba333a8c28716b178646471b191d691179ddfc45322a25564d189b266f3ee1c5c72ab5014bf374c9f1e6dd6f34b73e7ff8d53
+EBUILD libva-intel-media-driver-9999.ebuild 868 BLAKE2B 5aa009941c3516207c19f8c5679d79402ab93ec36bf7832ddec6df3331a531910912689e71cc44404263f052d5fdd8d64f4771f099c5bc098a442b31b2826218 SHA512 76c362b91437b7a0a57c2361ca1b646093b1c2bc84eeef2e55743218bf6cbf6beab9098145e93af9cfdedae9271d134587e45a264d8f66e131daea72ba6a6a4b
 MISC metadata.xml 220 BLAKE2B 84f977d8ddafd6841e5bb33f6184f7bbba42eca7a00feae5a214221a0a6b37ddd3dc13d3dac223c8285daba53629fb9ef2f278675d51ce5b3da8dda6f419867b SHA512 33be2ee02959063935caf88639b7b116430ccacd420b40f9aee5708f081a8cec58d82b9bcbef803e6a4e0084d6f2dccd75cfd3144f15dacfbd783a52397765c3
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.2.0.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.2.0.ebuild
new file mode 100644
index 000000000000..6d16c9dd9598
--- /dev/null
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+else
+	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz"
+	S="${WORKDIR}/media-driver-intel-media-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+
+LICENSE="MIT BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=media-libs/gmmlib-20.2.2
+	>=x11-libs/libva-2.8.0
+	>=x11-libs/libpciaccess-0.13.1-r1:=
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
+		-DMEDIA_RUN_TEST_SUITE=OFF
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
index 3c1a6331fa39..eac6f1060ed2 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
@@ -25,7 +25,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND=">=media-libs/gmmlib-${PV}
-	>=x11-libs/libva-2.7.1
+	>=x11-libs/libva-2.8.0
 	>=x11-libs/libpciaccess-0.13.1-r1:=
 "
 RDEPEND="${DEPEND}"
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 76fef7e1687d..818fe91b726f 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -1,10 +1,10 @@
 DIST libva-2.5.0.tar.bz2 459677 BLAKE2B d6e5bf94bcbda0a724634164bd8cf91efbdbe36120e62e7e7eefcd749afffec1950d8904318b472c81ae07490c559c68b0853725c654a08592457118cd5d6a83 SHA512 ffaeb9cf8ed1f93073c1cb3e58f5b3d3612e81622d02f8e428c089f625d4370b496b7681ac2fc2823c48670c9fd3da50893b1db51de768cf0f5d866e2ee78106
 DIST libva-2.6.1.tar.bz2 466497 BLAKE2B d4ea6e6d0102722206d94725932f0b3cf650bab3f02235f4c627dc83e5417b786f9524430d793f1067d002a0c9d7cbc92a7c740383c698d225a14946e1bb90ba SHA512 b57f0c0dda5ebadc92f56bc7fb835c2931cafffca9413fb4d244ea1dd47b603376323e6bebf144ccb2d2cf3499c64b101f8e03ff1809bd81242718d224d2d17d
-DIST libva-2.7.0.tar.bz2 477326 BLAKE2B 4ec99cebe3be8de46a7663b36cf5cededc271dc3ce6f6a42a2e861043c3bc3a1cb93ea31c4a2b7a1e5d7789de128066728b7d910bf19eceab107fe3b12966126 SHA512 4922d7c0d706d160b6885a045ca585e822275f04e66142d963b0e8e3efcf2ada81edc1255d0eb334c46c51b994e35c080d8ced10bf29a153cabe5c6991de3a68
 DIST libva-2.7.1.tar.bz2 477933 BLAKE2B 261e608af3f1427bed0244d4ebbc0d3ffe5681669ecb3583a8910568bc96817b8da079ffe80915ecf1002f9ac247eea5e44f8f7ce305313719fc1a4f1c5892b3 SHA512 f4b88ca0216f0ea4d934edcd322b8f741833b5a50ee2f34a3ecf60d635082b29e2dd032734c2f9d2a680e3b9c98e61a8b9432ea639a9fd5389761e04782c1126
+DIST libva-2.8.0.tar.bz2 478734 BLAKE2B b11393a9b9ec7ef4cf91d20d4005d42ad3d0e6a4a8e4d8cda67816bc5b9d3b23900754b5e8af92386dcf99a11e53af70fc4723ffecc715328c8fbf3d40486098 SHA512 329c5fc2262a6f4fddfcb13bd9644589248be6ae18fa1481cccc6b33874b91b60ad3f16a1777712f7a4817ba576db984834aa8735e6ad13d99b2f5aa13e9ddfa
 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.0.ebuild 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3ce8755f0a8c62382eec24a97de2ed5286250884b117e6ecf2fb356835f0397f73773b865f21e9de1d2bb098e SHA512 57f80b7e4047c098437ffbff25883716bd46452f5b3162f14804dd732e01a1ca497a50dc4f3fb53cb04442c31129ca880559d2680e9d0bc35e1eb9cba695ebd1
 EBUILD libva-2.7.1.ebuild 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3ce8755f0a8c62382eec24a97de2ed5286250884b117e6ecf2fb356835f0397f73773b865f21e9de1d2bb098e SHA512 57f80b7e4047c098437ffbff25883716bd46452f5b3162f14804dd732e01a1ca497a50dc4f3fb53cb04442c31129ca880559d2680e9d0bc35e1eb9cba695ebd1
+EBUILD libva-2.8.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.7.0.ebuild b/x11-libs/libva/libva-2.8.0.ebuild
index 016d79e6442e..016d79e6442e 100644
--- a/x11-libs/libva/libva-2.7.0.ebuild
+++ b/x11-libs/libva/libva-2.8.0.ebuild
diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index 417170e65487..a914710a6064 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -1,5 +1,7 @@
 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 1434 BLAKE2B bf638af6fde614d7fa3c08258c4ae9d3e1bdf6b83f2067b605c5764758e0967875495e4b069284689aef6061424cfb9fd67209bb3b91c21784e663f6e97aa90c SHA512 748f3e779ce8617379b4111b5592481710d4da4cc8e865bb0ae73042df59072da29434a10455f86f152bf76f6dd2bf67600db0a1335c2320b1d63646812a2da1
 MISC metadata.xml 364 BLAKE2B c8583191e40b2bf98262fbd4401a0ac47e53ec64294178a919499695b014f3ae8ee623de803cfffde58b4d63eda4572035703c5f1d550f14f4dcc974e9035c65 SHA512 47cae64c0f13376c312169703c6213582e37ccc70f00599754d7fa3daf0511e5da4221cd659e9ad98fe90d7791b0d513db45d2d0b7f1d833ef125f64ba40f2ce
diff --git a/x11-libs/libwnck/libwnck-3.36.0.ebuild b/x11-libs/libwnck/libwnck-3.36.0.ebuild
new file mode 100644
index 000000000000..e78364b3ebad
--- /dev/null
+++ b/x11-libs/libwnck/libwnck-3.36.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org flag-o-matic meson xdg
+
+DESCRIPTION="A window navigation construction kit"
+HOMEPAGE="https://developer.gnome.org/libwnck/stable/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+IUSE="gtk-doc +introspection startup-notification tools"
+
+RDEPEND="
+	x11-libs/cairo[X]
+	>=dev-libs/glib-2.34:2
+	>=x11-libs/gtk+-3.22:3[X,introspection?]
+	startup-notification? ( >=x11-libs/startup-notification-0.4 )
+	x11-libs/libX11
+	x11-libs/libXres
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+"
+# libXi header used by wnckprop.c, which is compiled even with USE=-tools (just not installed then)
+DEPEND="${RDEPEND}
+	x11-libs/libXi"
+BDEPEND="
+	gtk-doc? ( >=dev-util/gtk-doc-1.9
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Don't collide with SLOT=1 with USE=tools
+	sed -e "s|executable(prog|executable(prog + '-3'|" -i libwnck/meson.build || die
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddeprecation_flags=false
+		$(meson_use tools install_tools)
+		$(meson_feature startup-notification startup_notification)
+		$(meson_feature introspection)
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index b42febcc2d51..2861d2771984 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,4 +1,3 @@
 DIST libxkbcommon-0.10.0.tar.xz 383788 BLAKE2B 0e2cc110c35a4d07cfd55a46a4cc30038bc296f74522beb97b72d0318799adb76fa514427640f286254de7aa59fb8b8c26de5d8fd52f7e09c5ba3521febb97bd SHA512 58c523b42a8ea0cae7322d453fbc5d4624374221246cb067074e2ff9820eef3ceea8686283136432cdf0842acfc0858c7b2d3954de234b6501092ae1d27c9e79
-EBUILD libxkbcommon-0.10.0-r1.ebuild 1292 BLAKE2B 58b41eb81edce585c966a1ef1041ac7236da6565b90a2a514e12a729937400e542fe113230cf2a2dde1e348b3f38796809f661dd6c2b3ece4af2d362a5d0ec4e SHA512 dece8d99a0018f03604153358549cddf09a4a4a6853b32229080d17fe3ef7616f13e989c76c03c3af35d2548e55f1c790954f1b4dd5244d28f738ede9d42dc81
-EBUILD libxkbcommon-0.10.0.ebuild 1218 BLAKE2B 3b48076803a2d153b2ed82b24c28839deebf1de52d1ca2f1b830ffd774a0dcf4d29a8a5701ea3d7795d374b516fab4303225aacbd499cf2e9e15402a78d2c05c SHA512 9700d6fcfb3e0580d0e6b3c01d20b8778f5363f3b6bdd67e5014b846980786c7a68537ba5e71a177e5c2a3b05322fc28b46992efece09a1be62faeb04d81dbe0
+EBUILD libxkbcommon-0.10.0-r1.ebuild 1284 BLAKE2B d43d05a9366fe8a92d62f714a532d5f2b372443971c0a5f496387faecbfd91ab83841372977f4de853e0ac569545c2deab9828f4dccca580ca0539c406bc884c SHA512 fd009357bf396f4f9bdbcc86febef8536a84095a880bdd5d5dc135e59981113db959d909edd6340e5c6908163e939ae032307228f76219d7972b577f209e6224
 MISC metadata.xml 325 BLAKE2B db764fac0ca1f4359bcd129dc165f78592535dee40bc25b6f2d7c662bdce43e01cc66b362765607665a75fc5b1703de204cf90eecae4f8d285cfaefcebc614b8 SHA512 ca2a116a574783f7b3c6191759c902e2cb059ec135456cef989b81be07fecc48f9ff56e02845d18c2376c99be3dd9711f39ad91394e421fa36d8fd6453c0a121
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.10.0-r1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.10.0-r1.ebuild
index 15fdecd2c429..f98d9ab2f2a3 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-0.10.0-r1.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.10.0-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	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"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 inherit meson multilib-minimal ${GIT_ECLASS}
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.10.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.10.0.ebuild
deleted file mode 100644
index 356f8a40eb76..000000000000
--- a/x11-libs/libxkbcommon/libxkbcommon-0.10.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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 test"
-RESTRICT="!test? ( test )"
-SLOT="0"
-
-BDEPEND="
-	sys-devel/bison
-	doc? ( app-doc/doxygen )"
-RDEPEND="X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP},xkb] )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-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/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index a83bf4210e2f..4d1cccb9cce7 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,5 +1,5 @@
 DIST QScintilla-2.11.4.tar.gz 3007719 BLAKE2B b0f88a15a3636a0056d3bdac6e5d5bb05a065461c7de7fe0d5ad1740e87ca78a47bc1fd1af90a8751b553e8e326c830088a4cb38c9ebcad6be8bf9ebdb49bad0 SHA512 90fc2427121ca9ae55e34cf636460099bbdadd844318d9ef05f86790a36e25fb64528264bb7bb99e46b7add96378eff0cc69bb692940c6a1bddfadf86a9abdbd
 DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304 SHA512 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
 EBUILD qscintilla-2.11.4.ebuild 1961 BLAKE2B 86dfccd17bcf5d2aa8b20209aced0009fde39020466a7424f81f434a7bea536c72a93d9a82db006fcc9f65aedd29a757712f40c5131a501550b8bfc1cd4ca106 SHA512 cb82aa14bfdfb8f986ba9c28a0e0697ce969d433ad08eff97e4919506db36ad618c4bbad81839d0e2387e9c09269bf611d9695e986b10aa89f8ccff5c92c0659
-EBUILD qscintilla-2.11.5.ebuild 1964 BLAKE2B d7b1627cc76f089054a76cfb01263cd78278b2ff17295dcac245bea8cbf3ca5ea0830a8e30ea8e3ba69b968f0cf8ecbdbae6a82972ea3f0cd085cb8c54807dca SHA512 3f69bb7fb27ac4c0d3c5292dc98d219f938c10ff73bb78eb62972b5f2f80b66fd9f717ce0b3cae0d3e43f4d2929fc1bc2fc8b12533ac3b0429eb6f0dd3d5938b
+EBUILD qscintilla-2.11.5.ebuild 1962 BLAKE2B 1359467de37c871df7c4887c03a40e187f44cc63645dd046c06111156e6fc291508a22c00359a8fdab50eb3a59d81192d8a864a7fd44e53b0b6b0b515f6fae80 SHA512 22865f2a5bc0ffc95aabbeca57ff62e5b0716b24a7c807f205471fa0a1a32c2bb7fc3256ed38a02f2fc3aea9253516084cc4126766d6b0a5d7f9eefcd15e3d6f
 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 82d8a6e8e812..740916d1c6b0 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 d231d6c3950c..5150f2442b93 100644
--- a/x11-libs/qtermwidget/Manifest
+++ b/x11-libs/qtermwidget/Manifest
@@ -1,6 +1,6 @@
 DIST qtermwidget-0.14.1.tar.xz 178952 BLAKE2B ae266dedc717da7de0b74c4fed2e89c6047f3d8d7e70c553ed5150ba8507e0b634978304105843009069240e09aabf153288a6c86e9874f9043b63f85f12d3d1 SHA512 6b6d4abd6fc21f10f5323321f26132c0ff5b9682d09a086e265e57976deb60fca8db9a9906a29a0ed8d0e7b83417d5852df55d0118936d5f7a1342a9c2cb6410
 DIST qtermwidget-0.15.0.tar.xz 181284 BLAKE2B a862821d30831c829e2391f33348e1499e80b515d23226f06070bd8bb82b383d51ea73f0784f04e5a30630db5176564af35995641b3958d60a206f82fecd680f SHA512 95f44c77d0b678b1a204b559a7adb2fb68b2e82b2357d89239e9fc1c6f445346d84ec7f395d58f17a2ef7b42e58c02590f637683193eae4f7efbd001b61857c7
 EBUILD qtermwidget-0.14.1.ebuild 651 BLAKE2B ffe5762f8b8a6fdf86915371391831c7f5595ac9da8044baf8f400a92b6d7b3c109619d0308abecc9067fd088dbff79d6e1e9c4525592c76dc9ce0325e9def8b SHA512 1778f1ed57ca6e295a510ebb0c6fc6fca0be35dbbc43fe1c8663caf9ecaec1b8645fde0215653ada1cc501a248b71b55a3bf318fbfb13b26922a35712b3a8ab6
-EBUILD qtermwidget-0.15.0.ebuild 635 BLAKE2B c1a7ace3b67de65be4f5ab7600b5bb1dfcc5f26d6d9cab78d31a9d47de94cee02fb3f372dd382f0a55221a3f54d92f4c49d66a32c24cf3732558ed6420c256b4 SHA512 208c7d506d6d738d8a827701840964278d71b4275ee7e9ad8a922677f4200fbe4fd93071c4912175bfd64de19e23e44794c1412b60251cd1035f8767b7161723
+EBUILD qtermwidget-0.15.0.ebuild 633 BLAKE2B 361ec82bc6d6428358972d52ae7e40b99dba35f17494b1b76926bcd16249f76de8092052b1fcb29a4ede0198abef84ec8f6a9d48668276c4e8bcc7639a631b8e SHA512 22efdd7fcf770f8b51cfea207bc02a0e04e90ef5ac857f51fccdc1274e3bb5bb30afcb680aa32dcede12a9bd2abf642be7d0b81bc4248b48d9c26e38e79aab2f
 EBUILD qtermwidget-9999.ebuild 635 BLAKE2B c1a7ace3b67de65be4f5ab7600b5bb1dfcc5f26d6d9cab78d31a9d47de94cee02fb3f372dd382f0a55221a3f54d92f4c49d66a32c24cf3732558ed6420c256b4 SHA512 208c7d506d6d738d8a827701840964278d71b4275ee7e9ad8a922677f4200fbe4fd93071c4912175bfd64de19e23e44794c1412b60251cd1035f8767b7161723
 MISC metadata.xml 602 BLAKE2B fb54623b5c5e38a3eda61f4bc5f116c6da5f7f58dff1a65b2b43b3b4c5f8596ec4fbf4fb93e1705b4d97a5231fe75d23aa1705308523ef125ea81933ed3cad72 SHA512 30175f7c45f4102fdb38223065d4e143bebc2ecef84e2e148900d8510c9c393d8feb7d6787f9593b90f1e4054b5016444e02f17c6a8a51082e7b8cb8294d9d31
diff --git a/x11-libs/qtermwidget/qtermwidget-0.15.0.ebuild b/x11-libs/qtermwidget/qtermwidget-0.15.0.ebuild
index 2f1859de6b24..78a8ce05b3ff 100644
--- a/x11-libs/qtermwidget/qtermwidget-0.15.0.ebuild
+++ b/x11-libs/qtermwidget/qtermwidget-0.15.0.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then
 	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"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="BSD GPL-2 LGPL-2+"
diff --git a/x11-libs/tslib/Manifest b/x11-libs/tslib/Manifest
index 5fbac298e5f2..b95312736a43 100644
--- a/x11-libs/tslib/Manifest
+++ b/x11-libs/tslib/Manifest
@@ -1,4 +1,4 @@
 AUX tslib-1.21-optional-utils.patch 610 BLAKE2B 0f25c58205f5bbddc62f278827d9689e58c88323d6c2797d3f36d165c5dcfc8fe18574225dab106eb9c01d3a7f54a3f7c3797be0853dd3b144bbb61529ea83eb SHA512 3c061d34e5a2f89c61754331d9a8efa9ffeb492169d3c0082b29107f03442adc75f6a39f289577c3902df2a9efc4166f9ac610867742989f09f10a8bfd69230d
 DIST tslib-1.21.tar.xz 349216 BLAKE2B e19623c9390688b0aa85e6547a57542d2e10498c8ebbb30f840157d240dc9975c3e6735814a5e6f02fb71c273a52f860695cf4772fef28522e74c5781cdcb02a SHA512 66c5e5dc4e2314277e19af29b5dce1181573579f13b0e79fa43e658838d4c19a77feb978b60d7c6458337e8d6100ee54a42fc4af3a99fd8d6840cccafa6323c4
-EBUILD tslib-1.21.ebuild 1539 BLAKE2B ba3adc3479f9dbaae520a8f6228ab36ee5e23ee768ac1882d5abc92120609981394ef78ed066dc5c3bbe80dea988f314aabc029fdabf289c8abda7999c90ebef SHA512 2208273e73145a8c983ea019c84feb832e9d50452b1d294550592ae8797073fb3c139fe4abbd9449423c6821a4cb19ed591f2f73ca6cff3d444b525d8763c53b
+EBUILD tslib-1.21.ebuild 1538 BLAKE2B 313b7abb54de106f4020407b2669bf076be3b93a95a44144729cd6b7091ace381a2e4144d80cb48e57fb744393e5b433edb1740485250b9a664350cab29f6c1b SHA512 232cafeedeec1034c42b5a08b688e236140be7ccd2d471f0eeeda5a5b418cb480b190a80cd113d9e6b03e027fb9a0b6cd4b185df6f4640f9e326a57e70f24911
 MISC metadata.xml 476 BLAKE2B 60986e648e86b87a797224b40bcb510af598d2aeafdc497850c714872d844b86c27d7f3c24cbbdad92ec91c8803fd1a8aeb9e06ffea5700ce3c42a2b3d3d8587 SHA512 f5b0def5c198a78dd8bebfb3e9b022ab37dc6466e1a3af7a7b0497f4133be7d155a205da190d63f98c4e10bc7fca6ee84e6aaa6e46e74e1ed0d8c2ac387a15e5
diff --git a/x11-libs/tslib/tslib-1.21.ebuild b/x11-libs/tslib/tslib-1.21.ebuild
index 85369585a3b0..785d56f95cdc 100644
--- a/x11-libs/tslib/tslib-1.21.ebuild
+++ b/x11-libs/tslib/tslib-1.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libts/tslib/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2 uinput? ( GPL-2+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="evdev sdl uinput"
 
 BDEPEND="
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 8c9b5e035aa0..7199857245dc 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -5,6 +5,9 @@ AUX vte-0.30.1-alt-meta.patch 2490 BLAKE2B b5046bea09bb7fee5f03eaaa0c88f88a9e05c
 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-r208.ebuild 2948 BLAKE2B 24401f7eb05692d9e546e11e5f47862a43a7e86664078a6210c0f2f1899e4d5dcddcef89a1da5014adbcbaa57739d006bfe003a4163b9bf7672ad13e218cdd1b SHA512 73bcd40d14e4d7443af62f104865002c6a3938d62473da99fffa455dd0dbd231eadfa2618ba4a335b1c63eb8d0a4d13cf3264694b78116653832e3b878f30a9c
-EBUILD vte-0.58.3.ebuild 2073 BLAKE2B 4ea96a364684e0e1a42e4ce142d342b4f37632f1610f10a69b40f9264a281bebb3a7f899d48bd1a61dbdd02be769a661eac2df43e0473671eb48054aaa90eb7a SHA512 e8daf18157b0979a5bf702aa21a23b76737b151ec7fafbac0767678a464d729a8d54c5c13a35ea266d855bbed7868ad8d814ac6a78c9e8c5fc4fa20f9daecd46
-MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
+EBUILD vte-0.58.3.ebuild 2072 BLAKE2B 56ac1b16fe5ae050c9a0604c8b66bb8a1d90e16d43d38b833e796f46eeb8032211cae9f0ac97fa9882dfa678a5830eb8fbde1a422a7e6ff0bdb36c8067f02ca1 SHA512 127732d569d2119149056e220818050e944a48c155c7e2ce6af453d7a68751a811011122321bb5dfd9e2f5402a1ba29d432d7a96dd4025294d13d220b859db93
+EBUILD vte-0.60.3.ebuild 2209 BLAKE2B 2c805243729d95368fb7965e869aa3f4bcfd7e6ebc7867f5002a0baf93ec6901d18eb833cde98a78fb0ffcee0fd76e40e89c0f7bbdbb87896e945da9416ba7f3 SHA512 886a2bce0a73704735c6862e5cde45548727673057359cc5ef91c9ee651cee982a02671d88fd107311cdf5f0b89e41e2774060e9606fa555c831c152c2868332
+MISC metadata.xml 518 BLAKE2B c7e4aeabaea85722d8f81e1cdf7428a3ab30e38fd03c6e2bfaf81b21468d00d63d8aca53c90b50292075259bc8498a51785e1034874f3c8a9fa42d13b90d6d87 SHA512 c76435d37b54d53bdcd66dded770858b8801c15bfcda607529039928d5009635902d320ba14840e731618ebf8e0eafc2437d74cc0243ccf7a515e4f7efcdb338
diff --git a/x11-libs/vte/metadata.xml b/x11-libs/vte/metadata.xml
index 996e7cacd217..4a1550c34ade 100644
--- a/x11-libs/vte/metadata.xml
+++ b/x11-libs/vte/metadata.xml
@@ -5,4 +5,9 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
+	<use>
+		<flag name="icu">Enable legacy charset support using <pkg>dev-libs/icu</pkg></flag>
+		<flag name="systemd">Support moving terminal child processes to their own systemd user scopes
+			to avoid terminal getting killed due to child causing OOM</flag>
+	</use>
 </pkgmetadata>
diff --git a/x11-libs/vte/vte-0.58.3.ebuild b/x11-libs/vte/vte-0.58.3.ebuild
index dd8884b718f5..c542b20541ae 100644
--- a/x11-libs/vte/vte-0.58.3.ebuild
+++ b/x11-libs/vte/vte-0.58.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 +introspection +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.58.3-command-notify.patch.xz )"
diff --git a/x11-libs/vte/vte-0.60.3.ebuild b/x11-libs/vte/vte-0.60.3.ebuild
new file mode 100644
index 000000000000..debb3451f7ff
--- /dev/null
+++ b/x11-libs/vte/vte-0.60.3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.32"
+
+inherit gnome.org meson vala xdg
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
+
+LICENSE="LGPL-3+ GPL-3+"
+SLOT="2.91"
+IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+REQUIRED_USE="vala? ( introspection )"
+
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-0.60.3-command-notify.patch.xz )"
+
+RDEPEND="
+	>=x11-libs/gtk+-3.24.14:3[introspection?]
+	>=dev-libs/fribidi-1.0.0
+	>=dev-libs/glib-2.52:2
+	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
+	icu? ( dev-libs/icu:= )
+	>=x11-libs/pango-1.22.0
+	>=dev-libs/libpcre2-10.21
+	systemd? ( >=sys-apps/systemd-220:= )
+	sys-libs/zlib
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+	x11-libs/pango[introspection?]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.13
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	if ! use vanilla; then
+		# Part of https://src.fedoraproject.org/rpms/vte291/raw/f31/f/vte291-cntnr-precmd-preexec-scroll.patch
+		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
+		eapply "${WORKDIR}"/${PN}-0.60.3-command-notify.patch
+	fi
+
+	# -Ddebugg option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter
+	sed -e '/ggdb3/d' -i meson.build || die
+
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Da11y=true
+		$(meson_use debug debugg)
+		$(meson_use gtk-doc docs)
+		$(meson_use introspection gir)
+		-Dfribidi=true # pulled in by pango anyhow
+		$(meson_use crypt gnutls)
+		-Dgtk3=true
+		-Dgtk4=false
+		$(meson_use icu)
+		$(meson_use systemd _systemd)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die
+}
diff --git a/x11-libs/xcb-util-cursor/Manifest b/x11-libs/xcb-util-cursor/Manifest
index fc92cf501c06..5914812ff028 100644
--- a/x11-libs/xcb-util-cursor/Manifest
+++ b/x11-libs/xcb-util-cursor/Manifest
@@ -1,3 +1,4 @@
 DIST xcb-util-cursor-0.1.3.tar.bz2 295224 BLAKE2B 7a1a89c0f326f4ac0768110c4aa5a7818ddace1f231f6a0dcfacaf8b157a2d6aae53f5278a02cb945822d83eccb8a01ebb14ab98e8828d8f1d506e42f51431ba SHA512 be5eee7b268b18f356d6aae04820a7e1c51397dac9020d876df379e833200255b5194269541c245a9b4ac286edad4cfe44dae8e4fcfd16a4726dd7553c104c21
 EBUILD xcb-util-cursor-0.1.3-r2.ebuild 1373 BLAKE2B a562ea63ae7d0ab61737a1da2b4aa2e178630ff385fa92c50f8ba8bc75215749b4d217e0a8f3c5ebe6b1f311607601d7869a3ef5a42c5dd62bacd7a523429c14 SHA512 d790475278909a5163af2e1c9dbda90adc1d68e6998ac14c2ce5be456dee42bf221af55d0565ab2abf7de3531fce32af303a801f2d43f3535c39bd85a11bd7d8
+EBUILD xcb-util-cursor-0.1.3-r3.ebuild 1043 BLAKE2B 9ab2707f8a7eefb107b1a9d17bbe5a090a3a49c51517048b29dd8a6f6a726194419da3ea55e3c503ab9adf1161d754a462786a40973d1f127bec1589c3536012 SHA512 46e7239faf488c0cc9cfbae55c7d406f20c6e28279ba1b455da802b8662c6edaafa23a2a1efe791c5bebb03fa09b154cd5bcb1327cd7da83e4bcc7e50aa8e1d9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r3.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r3.ebuild
new file mode 100644
index 000000000000..c992d55d7ccc
--- /dev/null
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r3.ebuild
@@ -0,0 +1,24 @@
+# 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 C-language Bindings sample implementations"
+HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+
+RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=x11-base/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}]
+	x11-base/xorg-proto"
+BDEPEND=">=dev-util/gperf-3.0.1"
+
+XORG_CONFIGURE_OPTIONS=(
+	--with-cursorpath='~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps'
+)
diff --git a/x11-libs/xcb-util-image/Manifest b/x11-libs/xcb-util-image/Manifest
index 4def7e73dc0f..487c0603c179 100644
--- a/x11-libs/xcb-util-image/Manifest
+++ b/x11-libs/xcb-util-image/Manifest
@@ -1,3 +1,4 @@
 DIST xcb-util-image-0.4.0.tar.bz2 327891 BLAKE2B 022536e7b7410ba1ed129f9efc2ad48fda26d9a69e79e54fe6fd4510df38d1e957289d249dc1a5beb4385116b0808f3282ad496b3f2a246bc6f5762bbe8c7e36 SHA512 9b7202c054e1160f9ca97a86be1210d9fb47f2119f89ca85f15f20909cca884bfe0cb88e3e71c75b65e1a0a72b980066ccac810e41a91db895c74dde77440d4f
 EBUILD xcb-util-image-0.4.0-r1.ebuild 972 BLAKE2B e7763db6a983e1f1a77061f1892083f76ace5af13b5140844a5ab7e914fbd1ef6cd6b8d9b542a4bf5bf725cb54f68ffcf3e65a0aa3cf054b042c038faeecc002 SHA512 578ef56dece7935557e778d79f6373a59fe7ce0caf55a28e4eeb1c7033ca14362b587c3752a1dd007b80b94004da8e054b0a949d346b273de1724e005e2a076c
+EBUILD xcb-util-image-0.4.0-r2.ebuild 606 BLAKE2B d12da65ccb59d0e3fb60b8b29527863e8f61657f76d8ece00fd5ff6ffa82a2a60c0be76e6967bcfb65b76d5c8bcd90a8b5804033c05bd9f0c331428638584bea SHA512 200fae04eacef7e44059914431386f9d1fd4de5d104ca7bfe405c0b0a7ba8654d69667d178c86545ace33e8227753f771df02f27a8c21be7f314c4dde6d91f2e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r2.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r2.ebuild
new file mode 100644
index 000000000000..1b4e4ac32399
--- /dev/null
+++ b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r2.ebuild
@@ -0,0 +1,17 @@
+# 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 C-language Bindings sample implementations"
+HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-image"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+
+RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-${PV}:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-libs/xcb-util-keysyms/Manifest b/x11-libs/xcb-util-keysyms/Manifest
index c0d899b7c38f..2c875cb09b2a 100644
--- a/x11-libs/xcb-util-keysyms/Manifest
+++ b/x11-libs/xcb-util-keysyms/Manifest
@@ -1,3 +1,4 @@
 DIST xcb-util-keysyms-0.4.0.tar.bz2 289880 BLAKE2B 5f55706fc74ed5c096ca0e8a8411ba392a023ab7f3c8185088c31570e5873345e16d72b693596b0983011350ecdb7cb30ae5fca118f4758710ee2fc2441883ca SHA512 b14b3100c3ae2379f9df799c0780a1ee39267101e58e4c1c6f390f039348ca2b370bb1df203b9bc68a170d664188d9c73e3553a7ba24d98abea3ed353e8dc0c4
 EBUILD xcb-util-keysyms-0.4.0-r1.ebuild 919 BLAKE2B 2397ac2d3cd413f73a4c03064a3cea2a135cd096a9756c1d25c0a5f4e1bc363ac1dd1992b097cffeb620078477f9b7c3577f404579b601cbb0b80b26d8b00059 SHA512 11adeedddac342108bd08c6bbcc3589e0729cc47daa9e1865eac69b42e6fc926766c786fcd861665cc58dfe80741dca19d96b270dcd14bfc669dd68d12ddd8a4
+EBUILD xcb-util-keysyms-0.4.0-r2.ebuild 551 BLAKE2B 68a8c86bdccaf7c64d9d0ada7fdc21d18ba288ec1914d2b84efc4936fa9ad47df8d5219ae21e132c6f28811bed683ccd00582cdf3ec8280b7c5f0f92cc2dc981 SHA512 2fff3def1261d708b10b042934a160c7c8f6e722d3cc3ae4e86098d87cb4d88d14d2a0024c85efac75837281846ca120068a0df8f9624ff088cf78ad970b16d9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r2.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r2.ebuild
new file mode 100644
index 000000000000..937b98cd265d
--- /dev/null
+++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r2.ebuild
@@ -0,0 +1,16 @@
+# 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 C-language Bindings sample implementations"
+HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+
+RDEPEND="x11-libs/libxcb:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-libs/xcb-util-renderutil/Manifest b/x11-libs/xcb-util-renderutil/Manifest
index 8e3584b76f98..03fea67a07c7 100644
--- a/x11-libs/xcb-util-renderutil/Manifest
+++ b/x11-libs/xcb-util-renderutil/Manifest
@@ -1,3 +1,4 @@
 DIST xcb-util-renderutil-0.3.9.tar.bz2 292898 BLAKE2B 8de259f918f1ffcd82d054bd751baf3f0fe3514da86bc736b68c74ca1f285fb41dca364ca49153e1464691c10fb65f16a53eec0ec8102c1abade9ad7c80629e4 SHA512 24b567992ecde7e69a406efd0ffb62266610d73b4dc0e5c71093221090fa134c14b850680d1d28dc1f8f4a6f497b4118491e1894ec7c73d2c6ce959d106771cc
 EBUILD xcb-util-renderutil-0.3.9-r2.ebuild 939 BLAKE2B ba23a8e39462d745bb748f3f1b9bc131e433d016d47ae3cc0491edf54d8063b80dfbc5fb4f56ef4e412387da30237a003dfb9b834b904766e7470421ec7bcc6b SHA512 d7be2a7f1ca40ec0a9de97ded92158912ac2dbf6af07a7f463c15383b2ccc4d2d8390e06eaa14e6445d6aedfacac0fcafa691b9d750036bc7ee2230095261cf5
+EBUILD xcb-util-renderutil-0.3.9-r3.ebuild 563 BLAKE2B 59220c25610494f1988c160efee4d843ea58dd3b649b6c2f25627ebb5ec282d5c31c02101a03e2720a91f5fe1c2e7c5d4471376bbe77b5ad795b99aac61da6c5 SHA512 4a8ecb05b5c12aefde06d61b1acf5d5fa5d83f91211c0e3400194688c832f17420c15339d569ed68e0cd0916531b5ad278be0c643ab6a7045e4565e577e50bea
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r3.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r3.ebuild
new file mode 100644
index 000000000000..b5bfb3081530
--- /dev/null
+++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r3.ebuild
@@ -0,0 +1,16 @@
+# 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 C-language Bindings sample implementations"
+HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+
+RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-libs/xcb-util-wm/Manifest b/x11-libs/xcb-util-wm/Manifest
index 6c8889b74f2e..50cb373a9910 100644
--- a/x11-libs/xcb-util-wm/Manifest
+++ b/x11-libs/xcb-util-wm/Manifest
@@ -1,3 +1,4 @@
 DIST xcb-util-wm-0.4.1.tar.bz2 321855 BLAKE2B 095d1f39e4b42e85790830b46c1faeeb8ac3bd7b792c3db8dca15a998a0ce835fd4fa148e8ed896c81d82e2113d1b9650e35de7741e9629883908d3b81b927f3 SHA512 cd1b3bcf9fcfc52e329ddc42b370d50dcf7d473c8e94f01cf7ea7fdbe0dc9176790890214eecb2a8ac43405f4938c121e38d282ae988cd8e90a6610d214ef326
 EBUILD xcb-util-wm-0.4.1-r2.ebuild 920 BLAKE2B 5762a21acb7c3278af572aa5922ce15956ec81a2822c64de241a22b27692557222f3f496b28330c6ef6fed5250478f505d9fc4dc1355e710360d035dd1ca5227 SHA512 1fbadcfb495abb85f78e38acd1d5f890af7002d1847381af1ea3b0cfe124c717b22610e8a33b9f925d4b6b9264864f9e8a29220f83fd6abde7ee211c18661e09
+EBUILD xcb-util-wm-0.4.1-r3.ebuild 554 BLAKE2B 2ea9a68adbff3bfc0381062142318eff6ad86dc3980da1fee97a2465dc448a78fab7d7e0ec966a047e15a01efb63cc24cca26bcc927d8b924141425db90f7802 SHA512 41128625e8b42eba9b02731df50e03948daff88678ba5c8e46cd70ccdd2248e3c6eee5833bd3d0e056aab0257451825060b57917e5b9891c293464cccf4ff43a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r3.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r3.ebuild
new file mode 100644
index 000000000000..ad6032bc4010
--- /dev/null
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r3.ebuild
@@ -0,0 +1,16 @@
+# 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 C-language Bindings sample implementations"
+HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-wm"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+
+RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-libs/xcb-util-xrm/Manifest b/x11-libs/xcb-util-xrm/Manifest
index f0a745ad0435..8d4ac1af04cd 100644
--- a/x11-libs/xcb-util-xrm/Manifest
+++ b/x11-libs/xcb-util-xrm/Manifest
@@ -1,3 +1,4 @@
 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
 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
new file mode 100644
index 000000000000..d442dae06839
--- /dev/null
+++ b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3-r1.ebuild
@@ -0,0 +1,19 @@
+# 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 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"
+
+RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
+	x11-libs/xcb-util[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libX11[${MULTILIB_USEDEP}]" # Only for tests, but configure.ac requires it
diff --git a/x11-libs/xcb-util/Manifest b/x11-libs/xcb-util/Manifest
index d14982e50b17..7f200599225a 100644
--- a/x11-libs/xcb-util/Manifest
+++ b/x11-libs/xcb-util/Manifest
@@ -1,3 +1,4 @@
 DIST xcb-util-0.4.0.tar.bz2 297412 BLAKE2B 55970cddd8d4bfb313f5d6e4ea82a169a90311c1c0bb5ebf796ac1ceb1d1e1baea4268dc37bd8adf557514a752eec9f957ad3e3e0747384f2cf6e1985f26247f SHA512 e60aaa6f582eacd05896c5fd7c8417938318a1288146f3a5b339f77eed24e211c6099963f8813daa621c94173d2934228936b491c0ed79b09a8a67d835867d0e
 EBUILD xcb-util-0.4.0-r1.ebuild 1193 BLAKE2B 963f6060498a3f40ab19fcfd27247528ca60317c822daff96c854a879d21cd64e6db9f71d6e8a8a0c6f86ef3913b804b156a18b707b53fb1f84f22bef39ebf7d SHA512 1ef915863bd04a4ddde1b5f1c28e59256612b8db727c972a9c25f4733ee7587e50c3740043a8caf1bb89babc66a41d194949ff2f63c68738636e46ac000041d4
+EBUILD xcb-util-0.4.0-r2.ebuild 849 BLAKE2B ab3661e1424a02bd0cfa93b1814b6ab5f173398971156761a101e1a44f6c251a2d1552df718c88a2910d9326bdd2837d6ea7ba4269a6c0dc8f9c698a79330e7a SHA512 a89e5f0d734fb2a72171e761343971ed4fee850b96a4149e6d393bdf0d8582428513c23521933279d18817d2adbf647bd086b8a449c3f7bac55ba7f3636f2453
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util/xcb-util-0.4.0-r2.ebuild b/x11-libs/xcb-util/xcb-util-0.4.0-r2.ebuild
new file mode 100644
index 000000000000..8a42590c5db8
--- /dev/null
+++ b/x11-libs/xcb-util/xcb-util-0.4.0-r2.ebuild
@@ -0,0 +1,24 @@
+# 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 C-language Bindings sample implementations"
+HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-util"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+
+RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+PDEPEND="
+	>=x11-libs/xcb-util-cursor-0.1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-image-${PV}:=[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-keysyms-${PV}:=[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-renderutil-0.3.9:=[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-wm-${PV}:=[${MULTILIB_USEDEP}]
+"
author	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
commit	3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree	c513fe68548b40365c1c2ebfe35c58ad431cdd77 /x11-libs
parent	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)