gentoo resync : 21.06.2020

32 files changed, 417 insertions, 120 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 0b1e61f62a96..8b266ac2ae6e 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 2e83dff7cfce..e7add9102b93 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -2,8 +2,10 @@ AUX cairo-1.12.18-disable-test-suite.patch 390 BLAKE2B 49db479ddcb636e80483357b2
 AUX cairo-1.16.0-binutils-2.34.patch 587 BLAKE2B f2a5ffb4bdb4f2b63f07d0135e63704629093008d8479b19353d790012e8f1cc93707694ee79f71cc6e81c008505e1a069694231357748b54dc45c8bb2e94bba SHA512 ad01c6f651fc66d9a2853fc95f2402b9413d71e6353fdce609e0849a3477abbb2128e460a9c166adbd9c3da80786b2382b884a1249ccf22b8600ab4930d2b0c7
 AUX cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch 751 BLAKE2B 9b693598ac8fec28c0479544cc02dfbd1daab171b88bf7b1eb6ee353fdd32ee4228f24723d3b4937b3f30838d68d2a9a6f87b40d08896b59d36345d7e9447a32 SHA512 33d8454b2173c5be1f53576c143781f2b802ee961cef496d6fec5ba58554f4302ea6c351dc64f133d93c5495dacb3d387b8a201bfc415d54f8c77e41e877d319
 AUX cairo-1.16.0-pdf-add-missing-flush.patch 914 BLAKE2B 6277dccf5e6fc70d885548b4814253084c5ba7946b29ee5c5209c2c207721d9699d9fbab83e40f6d10394e89fe7a23ea5dc194cfcb2495e3ac2b075e22fa83bb SHA512 569cc28538333cdd907e3c9f26dd6512e48188dcb761284f2414936d60d4239d7ac15a5836f1f390d4881cce71bfb62a0679e097386116ecf807ecd03bf0f03f
+AUX cairo-1.16.0-strings.patch 690 BLAKE2B 2509bdb3d6592c9606c92730f1e052c0ce5dbbd557daaeb5955b998b8d89184063f15c583ea745fc16c07185cfe06e5f8ef9c18f749d35341918d626ceadd2b3 SHA512 90c9595698b30cceecc17ca186e7936d7884c382a23b8d536bdb10b912e6f1640037fc55326833a4977f332e02fc88d967ded751e50543c68dd80763b5fc43fe
 AUX cairo-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-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-r4.ebuild b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
new file mode 100644
index 000000000000..d9108285f736
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
@@ -0,0 +1,135 @@
+# 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
+	"${FILESDIR}"/${P}-strings.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/files/cairo-1.16.0-strings.patch b/x11-libs/cairo/files/cairo-1.16.0-strings.patch
new file mode 100644
index 000000000000..ee72f9dec7ce
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.16.0-strings.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/726200
+--- a/build/aclocal.float.m4
++++ b/build/aclocal.float.m4
+@@ -31,10 +31,13 @@ int main() { return 0; }
+ 
+ ]])], [
+ 
+-if strings -a conftest$ac_exeext | grep noonsees >/dev/null ; then
++# allow users to override default 'strings' with 'llvm-strings'
++# or ${CHOST}-strings.
++AC_CHECK_TOOL(STRINGS, strings)
++if $STRINGS -a conftest$ac_exeext | grep noonsees >/dev/null ; then
+   ax_cv_c_float_words_bigendian=yes
+ fi
+-if strings -a conftest$ac_exeext | grep seesnoon >/dev/null ; then
++if $STRINGS -a conftest$ac_exeext | grep seesnoon >/dev/null ; then
+   if test "$ax_cv_c_float_words_bigendian" = unknown; then
+     ax_cv_c_float_words_bigendian=no
+   else
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 568664dd0903..c0b9a5fc270b 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -9,8 +9,8 @@ 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
-EBUILD gtk+-2.24.32-r1.ebuild 9984 BLAKE2B 1f74417932cb9d97cced4e6974c75cb2157d283babb180a8f1f257e030a7db069fe0e6a1bd3540db6b88098df388b1e399bf96047e3b6be70882c5aea6bd7c7d SHA512 623ec582aa1e47f7a31612c6ef99e38a2b3c09b58c0033c6c0089bb180b24bc26a20bc7c73c08da93f0643e5e872e9945df4b531ba358ea90a905fad4078800e
-EBUILD gtk+-3.24.16.ebuild 7287 BLAKE2B eaea927928505ca1726ac2d1d0b5afc8a9d6ee8693309b8246d25fc793e7ddb25e4b516199d16d9ac5111c551ce90c5a0a266402b15c20283ac7f7864539dae5 SHA512 7925a2da1f33db5e03660d98920b1ccede6f620788ede140ec8c059dfde421778d21cc1e9dc24598d84b5a62fb830be79354c95d3935559fe25e22711760f818
-EBUILD gtk+-3.24.18.ebuild 7295 BLAKE2B 700c76d31cc2c33e4de1231ac69bce933fe4e017a3b66f123fdbab118f88315f2ffa45529fd665ba66c68500128d27fc2a44e11e6b1ab6442a6008e204a25fb0 SHA512 27306c420e6e12d32e96201f450b74428b226e57fe8b6f3d25207b4b95e7506d399b9d9ccb3c4c3fc5cf2aeca39c2f0999ab3e130e8cbb054e9802e8fb8418b2
-EBUILD gtk+-3.24.20.ebuild 7295 BLAKE2B 700c76d31cc2c33e4de1231ac69bce933fe4e017a3b66f123fdbab118f88315f2ffa45529fd665ba66c68500128d27fc2a44e11e6b1ab6442a6008e204a25fb0 SHA512 27306c420e6e12d32e96201f450b74428b226e57fe8b6f3d25207b4b95e7506d399b9d9ccb3c4c3fc5cf2aeca39c2f0999ab3e130e8cbb054e9802e8fb8418b2
+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 7275 BLAKE2B 56a9c7d5ce48c0e3141375fd11646d4e5c39bd1536f2464b67d63fafb0d4befd3f5d918596b624618ed1279f19da26a1d359bef6edf8cd19ee6f865eb2029e82 SHA512 c5694653f9abb7b565c9f7657d21e92c58d94af8f521a3325b8373ebe6b949231238955b0bfe0baf97c8459c9742ad636bfb0541822894cc4c436abed7201d3b
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
index 4e81883be6ca..d409d7878f89 100644
--- a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
@@ -60,7 +60,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.20
 	>=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}]
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	!aqua? ( x11-base/xorg-proto )
 	test? (
 		x11-themes/hicolor-icon-theme
diff --git a/x11-libs/gtk+/gtk+-3.24.16.ebuild b/x11-libs/gtk+/gtk+-3.24.16.ebuild
index d477b0005f60..ed300aa27ff8 100644
--- a/x11-libs/gtk+/gtk+-3.24.16.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.16.ebuild
@@ -75,7 +75,7 @@ DEPEND="${COMMON_DEPEND}
 	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[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	X? ( x11-base/xorg-proto )
 	test? (
 		media-fonts/font-misc-misc
diff --git a/x11-libs/gtk+/gtk+-3.24.18.ebuild b/x11-libs/gtk+/gtk+-3.24.18.ebuild
index ddb924517c94..476dca8c34fd 100644
--- a/x11-libs/gtk+/gtk+-3.24.18.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.18.ebuild
@@ -75,7 +75,7 @@ DEPEND="${COMMON_DEPEND}
 	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[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	X? ( x11-base/xorg-proto )
 	test? (
 		media-fonts/font-misc-misc
diff --git a/x11-libs/gtk+/gtk+-3.24.20.ebuild b/x11-libs/gtk+/gtk+-3.24.20.ebuild
index ddb924517c94..476dca8c34fd 100644
--- a/x11-libs/gtk+/gtk+-3.24.20.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.20.ebuild
@@ -75,7 +75,7 @@ DEPEND="${COMMON_DEPEND}
 	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[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	X? ( x11-base/xorg-proto )
 	test? (
 		media-fonts/font-misc-misc
diff --git a/x11-libs/gtkglext/Manifest b/x11-libs/gtkglext/Manifest
index 4451992b6910..8153147e2d7d 100644
--- a/x11-libs/gtkglext/Manifest
+++ b/x11-libs/gtkglext/Manifest
@@ -1,5 +1,5 @@
 AUX gtkglext-1.2.0-gcc8-fixes.patch 791 BLAKE2B d0f17c83bccd6e92c640383fecdce384cd0ecb92868f3f70d87b16aed8a85357e9391134c3c233549f7471d64e02416bde03ff92028d8d2f19eacd3802542875 SHA512 b6240ce1f293e3bd37d71a09233417c4acfa2a7fce05ba65ba364181e6075f86fc72797586b93fb81e057ab8de2191ad345415bd6cc6e29e38945cfb4362f3cb
 AUX gtkglext-1.2.0-gl-configure.patch 11350 BLAKE2B ad0cadfa12bda13866da64433935520bcbb77a9fb430640d31c66b14ffb867a1ae1cb236e459b9d13c0493279185dbe8c8eddafce86abd14b2ab4b2d0a59a0f9 SHA512 b164b8e64ff8fbe6d9b3437100c35d1352056094c4395fc1df4a40d8c91edf7543317ec05e3a05af1da9fe432817e312e7a8fc80fd3343824365d4579046f8fb
 DIST gtkglext-1.2.0.tar.bz2 703821 BLAKE2B 985d84cf1b87a23cfebcf536cecb087bbfd050f5131cf70b2a09e9a2e556e7f2549ed1b4b26ec6eccf790a383e3530d27171a553145614b641437c7c2d8462b5 SHA512 c5452b7594195da3c1428dc3021a041d70bb8079a514b7310fe7b66f638748ad2399adead36047b52b60b033757581e72f0532c0301e033019bf909f7365071d
-EBUILD gtkglext-1.2.0-r4.ebuild 1560 BLAKE2B 8aadd1c7a5866351ef59d81e65e0e31980f0cf73d34493792fdddd80cee09eaa17587d285bb330b3b5696d6f215eec2ce83f19f84adf4ef1d65ecf6e21f1287b SHA512 b7d40290c1683dd0e71560f2922ee7bf179af3d6ee254f9003d4f0d24c27158b8701ba5e0c759f966e9b717e6854e20aa7ed1c7951d86f808f913f896f5759b3
+EBUILD gtkglext-1.2.0-r4.ebuild 1533 BLAKE2B 824e5814537b06fff7d44d0068448b00af03a043ccc1e58933193d8086178a7a1c060f64bdf3f2aafa8b0810dc2bd4bb5e36bd8cf3b1384d90be877a82c45a9c SHA512 f3909ca1c5cb2f8ad1623eea9ede9e025f5c19fc207bbedef888041b751fbe1e61cc1b17e9b1a0c8314fc1061022e1b7e73d3cbcf00b00eb49145a4c17a59c63
 MISC metadata.xml 331 BLAKE2B 214f9245eccb98bed5314d370a2e16d8605c46629c656c05a22c1a037e7aeeb9d3255f24203405b148fc73276241db48243303a86abea879c08a944025cc51b4 SHA512 8c9768b7a27485752cb816de376d4e9e352e6522e42eb489d41aab48f0fd47541483913c7fec9ec4bbdfea3aa846c35bedab83ac2524901635337a7111f14ab9
diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
index e37df52431b7..b8b0a33c60ab 100644
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-util/glib-utils
 	>=sys-devel/autoconf-archive-2014.02.28
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 "
 
 src_prepare() {
diff --git a/x11-libs/libdockapp/Manifest b/x11-libs/libdockapp/Manifest
index 9a2a466839a0..e9a8566d484a 100644
--- a/x11-libs/libdockapp/Manifest
+++ b/x11-libs/libdockapp/Manifest
@@ -1,6 +1,8 @@
 AUX libdockapp-0.7.2-fno-common.patch 775 BLAKE2B 33d2f778c6e68ff4b8d4a198ffaa0dcd575711b999811b201cf54625eabea928e7512551fbd9234105c07b39b8d9f109ed39b9ed686a166a748ef72fa5bb365a SHA512 ee7b9b097ddddc47f1600a5cefae756a2ddb9f7e1e6a559baef090cdd60450f5f1ad7e8c705ecc87958957959574828fe6cc8dc5bf7ff992813a7a96192fe624
 DIST libdockapp-0.7.2.tar.gz 40462 BLAKE2B 8d4d2e3d9b1856875a275661cba809852e7c91867ffae33052bc472208db911c19caf1b77b16e367f007e1606be6add6d9bc5a1e76ea8fa2b8616163e922f21e SHA512 a2f216ac1105abe0efbea191691bae986b6022510f96c78b08c1b809cff131794c81810197af7d1321f9b248202376cc7092e79a4d4afa3fb93e9ed8000c9d79
+DIST libdockapp-0.7.3.tar.gz 387507 BLAKE2B 83c11c81701b2be5eb197cf54ecb9ff34ad5d6cd730b2538a6ec8176dbf3728a98ff635a2da4ba2cc9238b559f1f6fe59126f9880e11099541a1e2d6e0faf246 SHA512 38d35599675fc8a8e9d14b0f059a0d1585106ed870210712f53f315d0442e98ad1df40a74b9f00e3f22656cb859d03fc93793b6042b9432394e572b89c58a815
 EBUILD libdockapp-0.7.2-r2.ebuild 892 BLAKE2B e5af18f8d50ac9ff2fd3c410867bc2d4469f30addc9d47e3f248c20f5babd751414318acfd63ee0ada89565a48b2740c4d9d1f54b3008499250d44e8d7ca9c0c SHA512 4db9eb1c9b743aafd5640a5ae4ee0f820adbbb8544d6101c8fd561663056a41d80e5a09dd87f859303ac0bf5548999db14c5fa72c5373973d630261cba242f04
 EBUILD libdockapp-0.7.2-r3.ebuild 950 BLAKE2B 50c1fc75e84db318238a6f8b9ab4c24505420615f811e4b978fa6d63cffb095b5d095b823a1f90fc7046aca1150f934a26c525d9dffd41d1449038818cd332d1 SHA512 a1aaa8e15cac4a74f7ad9a1adb1f0798b89c234948163586bb3f06ea88e0cd2e063d3a8076333e65223b8e40b805aa642e7948bf4ce0a8ea983788946098a36b
 EBUILD libdockapp-0.7.2.ebuild 830 BLAKE2B aaec8142bd21ced4cbff4e9e229dd6384a853822b2daaaa1b9053c8637c813408fc150c2088f049ab7eeb71ededdfdb932adc8c0978417a3bfb1fbc600a3a417 SHA512 ce7f15c60ee3dc001fd2bad5366193c0d41cfeb0b3b1a4291a0454cf5ed5d53f78e3933259f61240b3e2339825a0d8321662bc1ba0cbb625502199235cdcf1cc
+EBUILD libdockapp-0.7.3.ebuild 853 BLAKE2B 5d5bff0c204677f16b363f01ff1ec6026ab5663b2c0ea60b027e826607e5c9be7737a334047f6d2b92a5ff4691e6536aa2e04e849a091eac21495dbc7e8e7625 SHA512 23049b04908267ea88e51b9394fcaf0dd95f1b9252ca1f9aa781bcd368e0f66ab3af4cfe4bf135ee0225741bd33b372544182b21aa65cfe0b3eefefc1efdfe19
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-libs/libdockapp/libdockapp-0.7.3.ebuild b/x11-libs/libdockapp/libdockapp-0.7.3.ebuild
new file mode 100644
index 000000000000..63179fb7e4c1
--- /dev/null
+++ b/x11-libs/libdockapp/libdockapp-0.7.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools font
+
+DESCRIPTION="Window Maker Dock Applet Library"
+HOMEPAGE="https://www.dockapps.net/libdockapp"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="MIT public-domain"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+# X required for font eclass
+IUSE="+X static-libs"
+REQUIRED_USE="X"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+FONT_S=${S}/fonts
+FONT_SUFFIX="gz"
+DOCS="README ChangeLog NEWS AUTHORS"
+
+src_configure()
+{
+	# Font installation handled by font eclass
+	econf \
+		$(use_enable static-libs static) \
+		--without-font \
+		--without-examples
+}
+
+src_install()
+{
+	emake DESTDIR="${D}" install
+	font_src_install
+}
diff --git a/x11-libs/libfm-qt/Manifest b/x11-libs/libfm-qt/Manifest
index e6c020a47da2..a60a3522c5d5 100644
--- a/x11-libs/libfm-qt/Manifest
+++ b/x11-libs/libfm-qt/Manifest
@@ -1,6 +1,8 @@
 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
 MISC metadata.xml 314 BLAKE2B a40b71c62066cf524406556206999869edecf714d898236a8f277132e8b3752fec298cf9407e9010a1037bc757fafcbae32abec9b52a68492d414acd529c176a SHA512 edaddf48fd7cef23284164b7046e0e6b5ce1442847d3353ee8175177f00b06973d6588811b166dacbd7a1182942128792858a43e029d6aa874c1b8625b5e78f3
diff --git a/x11-libs/libfm-qt/files/libfm-qt-0.15.1-update-runtime-colours.patch b/x11-libs/libfm-qt/files/libfm-qt-0.15.1-update-runtime-colours.patch
new file mode 100644
index 000000000000..850cd16a05ac
--- /dev/null
+++ b/x11-libs/libfm-qt/files/libfm-qt-0.15.1-update-runtime-colours.patch
@@ -0,0 +1,57 @@
+From ecb0face63bfa593ce12caef4285d20cbf7f3f41 Mon Sep 17 00:00:00 2001
+From: Tsu Jan <tsujan2000@gmail.com>
+Date: Mon, 1 Jun 2020 23:33:37 +0430
+Subject: [PATCH] Update text color of places view if style changes in runtime
+
+Otherwise, if the style is switched between dark and light in runtime (which will soon be possible in LXQt), the text color will not change and might not have enough contrast with its background.
+---
+ src/sidepane.cpp | 14 ++++++++++++++
+ src/sidepane.h   |  3 +++
+ 2 files changed, 17 insertions(+)
+
+diff --git a/src/sidepane.cpp b/src/sidepane.cpp
+index 73e74e7..d45adf9 100644
+--- a/src/sidepane.cpp
++++ b/src/sidepane.cpp
+@@ -19,6 +19,7 @@
+ 
+ 
+ #include "sidepane.h"
++#include <QEvent>
+ #include <QComboBox>
+ #include <QVBoxLayout>
+ #include <QHeaderView>
+@@ -51,6 +52,19 @@ SidePane::~SidePane() {
+     // qDebug("delete SidePane");
+ }
+ 
++bool SidePane::event(QEvent* event) {
++    // when the SidePane's style changes, we should set the text color of
++    // PlacesView to its window text color again because the latter may have changed
++    if(event->type() == QEvent::StyleChange && mode_ == ModePlaces) {
++        if(PlacesView* placesView = static_cast<PlacesView*>(view_)) {
++            QPalette p = placesView->palette();
++            p.setColor(QPalette::Text, p.color(QPalette::WindowText));
++            placesView->setPalette(p);
++        }
++    }
++    return QWidget::event(event);
++}
++
+ void SidePane::onComboCurrentIndexChanged(int current) {
+     if(current != mode_) {
+         setMode(Mode(current));
+diff --git a/src/sidepane.h b/src/sidepane.h
+index 7218f6a..79b27a9 100644
+--- a/src/sidepane.h
++++ b/src/sidepane.h
+@@ -111,6 +111,9 @@ class LIBFM_QT_API SidePane : public QWidget {
+ 
+     void hiddenPlaceSet(const QString& str, bool hide);
+ 
++protected:
++    bool event(QEvent* event) override;
++
+ protected Q_SLOTS:
+     void onComboCurrentIndexChanged(int current);
+ 
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
new file mode 100644
index 000000000000..b820cada88ec
--- /dev/null
+++ b/x11-libs/libfm-qt/libfm-qt-0.15.1-r1.ebuild
@@ -0,0 +1,49 @@
+# 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
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.15.1-update-runtime-colours.patch" )
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+}
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 0c9afac84b77..e32a6fa5a510 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -4,6 +4,6 @@ AUX pango-1.44.7-tests-test-break.c-Only-test-Thai-breaks-with-libtha.patch 1148
 DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B ec3f1a6a4de30e0864e7f0bf0950cb7a7b4bada8c3db496a8e5b1e770f221ae72b43167178445ea9cd0d6b88e51d2af49e7fdf27b2e792997fe7c37e55d429c1 SHA512 b7654c3493931e3c6d3cbd40ee49c5cbebaf403954bae75dea80e9f03e12dd5082548aff6a9e778821b8f935e227a7efaad4c1b980fa108e7258042221cadfc1
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
 DIST pango-1.44.7.tar.xz 521384 BLAKE2B 9917efc1bcc9115331149d77eb9b15373d4331ed6a8e5542a97fbbbb480eb0557736d4f1817c0fd56262f442e4b3c2c68607baacdd38b1684def1af58a583bfb SHA512 6e0a3d5cd32c209fd71a2ce5f705a60db318c2133bcca07360a047a73892f642a1661c1f0fb90353fc43e75336dfc22909bf4969f1bd03324c9689344af08350
-EBUILD pango-1.42.4-r2.ebuild 2333 BLAKE2B ad0587b093dc85e34d2cd2ece07112537ba0c1028d1f264afe56a6f626208ac7c18b4a2eb7ba0fa2ba7f789e8e7858824c44f552cd8b202a39b1d0bea806608b SHA512 2c7cc219bb0be4b7afd5e26f3df8c7bb60f1c7cb1ed6cf552150f7021df27400d5c0b1dd8524132ec55ccf8ca000259c3e9e58282af4d810d3b810206a71aa56
-EBUILD pango-1.44.7.ebuild 2126 BLAKE2B 525f326870ff30dd33938dccda5372901b2fb245e81bb3055323222e47a9367ac4731425e718560e78fa880dc94c580cd56fbb384d672d29f6381d755836b473 SHA512 4214755838a5c5e9a907d9d13d6c21022a53ed50397354ccc6532b41f0016c675bf7d4320dfbde17eccd235e83505996dbbfdc6f7776580964fb7c09971b5def
+EBUILD pango-1.42.4-r2.ebuild 2313 BLAKE2B 7033a5e1443b105bb5ef50759db0a5cf4d4388ec93007c29fb3f4f6bdcacc83bd017cda5d0381649aefab8fc67761584b558633a4c988f5b29e262c708fc326e SHA512 1e1608ba07ab876272185f5872057a2dd66daf418419492569bd27b86151bb63e433079d9aab8d796a595003b6f8308f679af1e5ed531e92191ae1a13d892aed
+EBUILD pango-1.44.7.ebuild 2106 BLAKE2B 342d7eafe208bfd38c8174ed34c358802ce7300398aa4a9b1afaf702c78b739a0b60416d3fde82fae6ab35961d18bbd6bb2ede4df338042aadcdb41df050a2df SHA512 4c18ef86e9339fac4f2a57275556f3eb4c7471aae1bd1ef550be2e2c29d9617447977ee305a594e8e3c18a51742c6ada9368747a60df5e96ce3cc6802187f745
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/pango-1.42.4-r2.ebuild b/x11-libs/pango/pango-1.42.4-r2.ebuild
index 96d5811c15c3..e00510e6dd7e 100644
--- a/x11-libs/pango/pango-1.42.4-r2.ebuild
+++ b/x11-libs/pango/pango-1.42.4-r2.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.20
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	test? ( media-fonts/cantarell )
 	X? ( x11-base/xorg-proto )
 	!<=sys-devel/autoconf-2.63:2.5
diff --git a/x11-libs/pango/pango-1.44.7.ebuild b/x11-libs/pango/pango-1.44.7.ebuild
index 7100e6c4679d..2f4853c526e9 100644
--- a/x11-libs/pango/pango-1.44.7.ebuild
+++ b/x11-libs/pango/pango-1.44.7.ebuild
@@ -35,7 +35,7 @@ DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 "
 BDEPEND="
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	gtk-doc? (
 		>=dev-util/gtk-doc-1.20
 		app-text/docbook-xml-dtd:4.2
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index 0bfec6e64b5d..0b4b09c332ac 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,6 +1,6 @@
 DIST pixman-0.38.4.tar.gz 897926 BLAKE2B 2c27069411e709391a1cc0af6c37acf2f06b4fad433a3197e24a0636d5d828ddbf1ca339d91470514d75e126452bc2300d14a2b862671bd11a8b85057d86b31c SHA512 b66dc23c0bc7327cb90085cbc14ccf96ad58001a927f23af24e0258ca13f32d4255535862f1efcf00e9e723410aa9f51edf26fb01c8cde49379d1225acf7b5af
 DIST pixman-0.40.0.tar.xz 634752 BLAKE2B 29b71f5eb6c3df0318c7a6153c6abbce29748b0b578697916414a869a029635fe5e0bab06b8f701a764c95e475c115ed12eb4f93c751d234b5868f4c4196d7db SHA512 8a60edb113d68791b41bd90b761ff7b3934260cb3dada3234c9351416f61394e4157353bc4d61b8f6c2c619de470f6feefffb4935bfcf79d291ece6285de7270
 EBUILD pixman-0.38.4.ebuild 1729 BLAKE2B ce0f18be74b4586a2227b3b517af19aa0029d478c9a50a1d83c2d07a222dfc70395316853366a3a4f22395ccde57b4faff6488755c7046877b671fb5b5cfefb6 SHA512 412d23d206071fc1357940328f4f8697cbcf7bf0d5cc9d20e033304d376dff3b92a0e8256af0e5d5bced1e30a8af8101a3d00cb4088ad7cd341f64a05eaa2e3d
-EBUILD pixman-0.40.0.ebuild 1791 BLAKE2B 269eebe1da7f127311d09a4e0fae271324a51deb494123a35a44d4b3b1d5c4f166bda201d40f318115045942213605cf4fba6049027fef18818e9bea3cb59464 SHA512 e3c4e3374dc265f3d92f0eddeb142eb6c194103ec69f63c877182cf762b8021d836c06e8fb7b951e43c5ed690aa25e47630cea8657488c0b338179a63502abf1
+EBUILD pixman-0.40.0.ebuild 1784 BLAKE2B 57b1f39d4925d1b29045487e62714d513dbc23238fec2fb1114babf1e80086f5ead1a0b7d13339e03b8544e3ef5fd560b2fc01ce6f8c9977e7a3b9f9e619960f SHA512 914f9f0c17eb82ac100c41034ad03e7ec004dab9e1032295d1199b75cf178d3bfdb2415261a803aa53a31cc5ed45ed3a46267b294cf81e1e639f8360a3add891
 EBUILD pixman-9999.ebuild 1791 BLAKE2B 269eebe1da7f127311d09a4e0fae271324a51deb494123a35a44d4b3b1d5c4f166bda201d40f318115045942213605cf4fba6049027fef18818e9bea3cb59464 SHA512 e3c4e3374dc265f3d92f0eddeb142eb6c194103ec69f63c877182cf762b8021d836c06e8fb7b951e43c5ed690aa25e47630cea8657488c0b338179a63502abf1
 MISC metadata.xml 391 BLAKE2B 201ddfb7a766c48fb4e5b48d67564de3b6ef85847a8369cd56acdce186716872be35ddd8501604fce1d30502eb5ea4c328c01406837bb0e0d90c81655a859233 SHA512 3e9dfb3f70cd8c7dfa763bae9fb3415c276bf0104822122f72cf6df47bdc7926a654ddd653321e5ec4bd04ed7f0dd1335a4924e23d1ac37f63c05a536c1defbc
diff --git a/x11-libs/pixman/pixman-0.40.0.ebuild b/x11-libs/pixman/pixman-0.40.0.ebuild
index 9c15b1e09657..9ca0bf375385 100644
--- a/x11-libs/pixman/pixman-0.40.0.ebuild
+++ b/x11-libs/pixman/pixman-0.40.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz"
 fi
 
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 7f302e668c28..a83bf4210e2f 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,3 +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
 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
new file mode 100644
index 000000000000..82d8a6e8e812
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.11.5.ebuild
@@ -0,0 +1,82 @@
+# 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="Qt port of Neil Hodgson's Scintilla C++ editor control"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
+
+MY_PN=QScintilla
+MY_P=${MY_PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0/15"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="designer doc"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	designer? ( dev-qt/designer:5 )
+"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	default
+
+	# Sub-slot sanity check
+	local subslot=${SLOT#*/}
+	local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro || die)
+	local major=${version%%.*}
+	if [[ ${subslot} != ${major} ]]; then
+		eerror
+		eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${major}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+}
+
+qsci_run_in() {
+	pushd "$1" >/dev/null || die
+	shift || die
+	"$@" || die
+	popd >/dev/null || die
+}
+
+src_configure() {
+	if use designer; then
+		# prevent building against system version (bug 466120)
+		append-cxxflags -I../Qt4Qt5
+		append-ldflags -L../Qt4Qt5
+	fi
+
+	qsci_run_in Qt4Qt5 eqmake5
+	use designer && qsci_run_in designer-Qt4Qt5 eqmake5
+}
+
+src_compile() {
+	qsci_run_in Qt4Qt5 emake
+	use designer && qsci_run_in designer-Qt4Qt5 emake
+}
+
+src_install() {
+	qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install
+	use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install
+
+	DOCS=( ChangeLog NEWS )
+	use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
+	einstalldocs
+}
diff --git a/x11-libs/tslib/Manifest b/x11-libs/tslib/Manifest
index 88496a45d27f..5fbac298e5f2 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 1559 BLAKE2B f0ff88b979032b3c81a40e881e2d3b414ca009fca5f8e1f35bf86ffbab0630ac4996860b2e6753b494ee652f81e3b9e4f30f3cb47a07d708cd2f2cd6d9f07e09 SHA512 a0bb7ba84a2c8715d3f9abe75d92c6c5e2cf29100cd6138cf66f05274f8888aacabc45cdcc10d57b1b1d92f2537d08747e33b06d2a38b4c1c51af6f13fece68e
+EBUILD tslib-1.21.ebuild 1539 BLAKE2B ba3adc3479f9dbaae520a8f6228ab36ee5e23ee768ac1882d5abc92120609981394ef78ed066dc5c3bbe80dea988f314aabc029fdabf289c8abda7999c90ebef SHA512 2208273e73145a8c983ea019c84feb832e9d50452b1d294550592ae8797073fb3c139fe4abbd9449423c6821a4cb19ed591f2f73ca6cff3d444b525d8763c53b
 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 bd2fc9d88d55..85369585a3b0 100644
--- a/x11-libs/tslib/tslib-1.21.ebuild
+++ b/x11-libs/tslib/tslib-1.21.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x8
 IUSE="evdev sdl uinput"
 
 BDEPEND="
-	evdev? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	evdev? ( virtual/pkgconfig )
 "
 DEPEND="
 	evdev? ( dev-libs/libevdev[${MULTILIB_USEDEP}] )
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 450d4e771b40..8c9b5e035aa0 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -3,11 +3,8 @@ AUX vte-0.28.2-limit-arguments.patch 1477 BLAKE2B 329e8eb93156244526ebe3ccb3c2a7
 AUX vte-0.28.2-repaint-after-change-scroll-region.patch 3817 BLAKE2B d57f20415193bf9bc283399bcae4e3c2a23ff7f2f8ffee08e8a67c3af2956b137f788322e26bf2537e785c0d0ce6266b56269abe5a18e2e881ea548b5c1b4625 SHA512 46a54c96889c3a0c5a293a097f777dd2e24e5a3025b808d7fb0bbfe71e8938f7d30ba26a05e67cb6b63ad59719eace57d0f6e0ff9f2860fbe9f12c36e022b8ec
 AUX vte-0.30.1-alt-meta.patch 2490 BLAKE2B b5046bea09bb7fee5f03eaaa0c88f88a9e05c3d4f97fa8d6b4ecfbaec8a35bf1989c0461c1ec1d31e1b22c9d35688775a30f34134028bcd4fdcae1b7d40129c4 SHA512 69ed3038f3dcbbd09709667caff5692e4e11e30926bc7692cdbbdef2bb1ae4584ef64b824b5afcb3c57c237a3c0db4d9588ec36778d0994a546b1e6f74c2e430
 DIST vte-0.28.2.tar.xz 962340 BLAKE2B 1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9 SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6
-DIST vte-0.54.1-command-notify.patch.xz 3428 BLAKE2B 75b0c22720276300be2e49e8444aa68fed77fb7a6cc6b0e93a5c2d41257626bd60ff1084d68579769cb3d85e7ec567927591746de48e860b138d0c1f24f64cc7 SHA512 a53da569f8168c8e9e21e186dcfc00bf9fdb78a0c767ba35033c1c1e4f836406b4d9bf70ee3e071f6c749fd6f72101a6960d201617bd0bc23021e1eeaac6fd0c
-DIST vte-0.56.4.tar.xz 1100952 BLAKE2B 3c3ec69f4078bdb07a4501df4aeb31aaeb7f9fa5a4631152d486fbb2c950362612cd9dff4abe25b93da6c712a37a20ccbf050ad33d96ec7b997bb1409189f60b SHA512 5a6c79b30f07c1f5848ef59028864d893cc605b9ad8f49ae819958aaed962d2ff96baad379f126381b8bf00015003c5a6dc28c792e4e050ba35090338bd7dabb
 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
 EBUILD vte-0.28.2-r208.ebuild 2948 BLAKE2B 24401f7eb05692d9e546e11e5f47862a43a7e86664078a6210c0f2f1899e4d5dcddcef89a1da5014adbcbaa57739d006bfe003a4163b9bf7672ad13e218cdd1b SHA512 73bcd40d14e4d7443af62f104865002c6a3938d62473da99fffa455dd0dbd231eadfa2618ba4a335b1c63eb8d0a4d13cf3264694b78116653832e3b878f30a9c
-EBUILD vte-0.56.4.ebuild 2278 BLAKE2B 347a664688e8445ff35923e39a11db7910959b5430622da6c950b7f1c9b83a182fe12d596106a38e149ad3b96fffaefaeef77b1b138b964bf795d1410a6a9dd4 SHA512 04a3aa68daabc18b652d29cd4438f863121900761964c6553bcb4e36e978e5d0138ebb45f892690cd2c8ae2ced98aa1e1aa54f54420f385ef5f8ed3765625a27
-EBUILD vte-0.58.3.ebuild 2074 BLAKE2B c18f90ec97a5937f664074687a5ac5825822b393fa80874ea4cb48f78dffd348529c5462d540a0ef0ba43d3c4e5c43a4aaa25167339dc2af2d754148766cbf6c SHA512 991fccd4bdd4041417fbfd0c424eabdf3a5999ea06f27d41290fac7dd4ed5edc1ef025cbcf3345630b44bcdff6fa13ff66d38aad266eb1b9e6a3bd128c888f38
-MISC metadata.xml 348 BLAKE2B 3bf56ab8eced6c72e3d4dcb9979464b9652010b09d6576da3f1b9061f92b508d9bfa11ae081083ff07b2d7ec05c8e72123e25d6ec8c6edfa738b241a9f4339cb SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4
+EBUILD vte-0.58.3.ebuild 2073 BLAKE2B 4ea96a364684e0e1a42e4ce142d342b4f37632f1610f10a69b40f9264a281bebb3a7f899d48bd1a61dbdd02be769a661eac2df43e0473671eb48054aaa90eb7a SHA512 e8daf18157b0979a5bf702aa21a23b76737b151ec7fafbac0767678a464d729a8d54c5c13a35ea266d855bbed7868ad8d814ac6a78c9e8c5fc4fa20f9daecd46
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/x11-libs/vte/metadata.xml b/x11-libs/vte/metadata.xml
index e72feac7249e..996e7cacd217 100644
--- a/x11-libs/vte/metadata.xml
+++ b/x11-libs/vte/metadata.xml
@@ -5,7 +5,4 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="glade">Provide integration with <pkg>dev-util/glade</pkg>.</flag>
-	</use>
 </pkgmetadata>
diff --git a/x11-libs/vte/vte-0.56.4.ebuild b/x11-libs/vte/vte-0.56.4.ebuild
deleted file mode 100644
index c9fc52ee3441..000000000000
--- a/x11-libs/vte/vte-0.56.4.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.32"
-
-inherit gnome2 vala
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
-
-LICENSE="LGPL-2+"
-SLOT="2.91"
-IUSE="+crypt debug glade +introspection +vala vanilla"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-REQUIRED_USE="vala? ( introspection )"
-
-SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-0.54.1-command-notify.patch.xz )"
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libpcre2-10.21
-	>=x11-libs/gtk+-3.16:3[introspection?]
-	>=x11-libs/pango-1.22.0
-
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-
-	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
-	glade? ( >=dev-util/glade-3.9:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	vala? ( $(vala_depend) )
-"
-RDEPEND="${RDEPEND}
-	!x11-libs/vte:2.90[glade]
-"
-
-src_prepare() {
-	if ! use vanilla; then
-		# Part of https://src.fedoraproject.org/rpms/vte291/blob/f30/f/vte291-cntr-ntfy-scroll.patch
-		# Patch distfile for 0.54 series is re-used, as only git hashes and co changed in patchset.
-		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
-		eapply "${WORKDIR}"/${PN}-0.54.1-command-notify.patch
-	fi
-
-	use vala && vala_src_prepare
-
-	# build fails because of -Werror with gcc-5.x
-	sed -e 's#-Werror=format=2#-Wformat=2#' -i configure || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		myconf="${myconf} --disable-Bsymbolic"
-
-		# interix stropts.h is empty...
-		export ac_cv_header_stropts_h=no
-	fi
-
-	gnome2_src_configure \
-		--disable-static \
-		--with-gtk=3.0 \
-		--with-iconv \
-		$(use_enable debug) \
-		$(use_enable glade glade-catalogue) \
-		$(use_with crypt gnutls) \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		${myconf}
-}
-
-src_install() {
-	gnome2_src_install
-	mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die
-}
diff --git a/x11-libs/vte/vte-0.58.3.ebuild b/x11-libs/vte/vte-0.58.3.ebuild
index 338067e35d3e..dd8884b718f5 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/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 9194a83ebe86..5b891c14b3ad 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -4,6 +4,6 @@ AUX wxGTK-ignore-c++-abi.patch 1657 BLAKE2B 5d865c83174f2540b798a2930f8d5ae8336f
 DIST wxGTK-3.0.4_p20190713.tar.xz 53640 BLAKE2B 89eabc44660f8f9b19fc850717eb83244a746f2f8c28bcec89fa9ccd1828f103df114bce24406ff14875220de86276f9e51870d58e716f0c94d310707f7eae4c SHA512 44a4e92ccc9c143a0e70e015116e952b0529001a3a1e23193d501826720a505259ead6feaa08de75b4a7a8753f8b16f5cc14e4bff5d15585870066ccd1de53b9
 DIST wxWidgets-3.0.4-docs-html.tar.bz2 24122986 BLAKE2B ffd38d50e6cb44077f346597863a8dfb1cb5172b9380995082acb23b5b5dae060bc1e3d14307a1146ccd93b5ae9c4fd8fb206346c8d5aced5a535cd3d7f8961a SHA512 2b4cefc98f5f034a8c36237c4979bd02e8b0ed60aaeb31946d8661fb8e5297172cec807e45c96fe2939b012f093950721cda8bf9f750697b50e3741711011ccd
 DIST wxWidgets-3.0.4.tar.bz2 20204622 BLAKE2B 97b9f3f44f080104cae290bc3e162b51ce27a96fb22b191d52f30db1f1dc7951defcc220afc4dcb8417cfe23490762c2a25f62164ac21809f73ccf442dd19347 SHA512 c9e6b35d541a99921c54cfdac260843f574f146b27f924a7a0fca5007344fa99865a96ded95e6802329ad9221b4880d62b92277a1b4c1ce71420acb672ad9158
-EBUILD wxGTK-3.0.4-r2.ebuild 4018 BLAKE2B e73f952d16dc6f4b3cff0836d0625ed82ae5cc3e070a84682e6ba417f6bbf5c2048067b5db4444810f520f1170cc961a62c4a2a9a3d22b59faf00123eca799f0 SHA512 136676187e6839c45ab28d58b8345c91af27d41b111986eb493438b9eef299b37ae711bfc4f9bc200a64fa792559f5a6bbec647a389e3cac9e3f49dfa2b4b859
-EBUILD wxGTK-3.0.4-r302.ebuild 5242 BLAKE2B 10936a8d077d8db01bb9f676a893ab1229baa2d024296779949dc4f0d743ab93bf2bbcc732bf31f03a76a97c79f797700b4e32089ba813ff1b8bc14fe7ff4328 SHA512 c6a303eef25b149157bc17f4920f381e8110c04347596c97971cc4db1e9aa8f071240abbd3dd22b89040d0e63c36047167989e8f16c4f226fbabdda1f54fd907
+EBUILD wxGTK-3.0.4-r2.ebuild 3998 BLAKE2B bff28ffba00c70512a40c2fd572e9ac939f3c6dd5a38a994cfccadfd18d38882aed9ed7f4e483a65783b6534e7721bf75343f49b047e0f3e68a9a8202afab55e SHA512 e17742568eee16141232a62acf57f251767708190aa75ea99ef285c56ff34e3335ca94d0b95a190a09f8c73682b2a138a75730230bc0c53a20d6e9d0c70a1d0a
+EBUILD wxGTK-3.0.4-r302.ebuild 5222 BLAKE2B 328217b29a315cb572e54bd590a0cabf31ebd3a07dea5de294472ef570aaa1e05ec4e36a6cb6752ac4bb023604bf3a8737a6f9436cacbe50477df8c389596ca4 SHA512 bb20c9048b4d3f17df1f5b94a5d89b755abdf3f8a02538da58472fad290a859363a7d9f0fa7ddff7b3a20093640922605b3d3fee35e28a3a2165fae47b744490
 MISC metadata.xml 759 BLAKE2B 4bafb6bd1d082eae5773d84fb116779f337e662090c4d01e22296f891114458de4a50f1f10775b61f06f22c6db7d4288c66c0c59836cc362298c23fecef499af SHA512 a7bf3b8cecf7ffba0dbfded9884fb7df3866c1a00c473f9ecb2d3fc1c84c5713dcde949f6acc35ee688741efb2da74fc189ed9c58b24bd2874c7e95908eb1f60
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
index c7da89e676d4..f2f9f516fd36 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
 		)"
 
 DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
 	X? ( x11-base/xorg-proto )"
 
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
index e081aaad649e..dbac81cd1d5a 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
@@ -51,7 +51,7 @@ RDEPEND="
 		)"
 
 DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
 	X? ( x11-base/xorg-proto )"