gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /x11-libs
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
65 files changed, 601 insertions, 1389 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 148d431e5300..a7f0610168f9 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 5d70ea0caf3c..743296dad640 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -3,6 +3,6 @@ AUX cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch 751
 AUX cairo-1.16.0-pdf-add-missing-flush.patch 914 BLAKE2B 6277dccf5e6fc70d885548b4814253084c5ba7946b29ee5c5209c2c207721d9699d9fbab83e40f6d10394e89fe7a23ea5dc194cfcb2495e3ac2b075e22fa83bb SHA512 569cc28538333cdd907e3c9f26dd6512e48188dcb761284f2414936d60d4239d7ac15a5836f1f390d4881cce71bfb62a0679e097386116ecf807ecd03bf0f03f
 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 3791 BLAKE2B b0f4ac3ca1029b8f601075f0ddc672bb4890c69cbe9c88e0678fd8f86a605855dc275db867dbead0be702707ca69ba655b4426d3fa1dc75b025957c41bce5c13 SHA512 24fc8bc6e543e89be069e556b304a592a7e6889f409b3edfd0024cfcfa09906e28f79067f4451a720b71c94f21bd3fb865a688fc1d6cdaa589c15332233d9332
-EBUILD cairo-9999.ebuild 3675 BLAKE2B 9c478f3c9a05ba8070fd952a52531a279066041ad7ed50a0da90f516e946ab2c7ccfc796672ee342cb02a83f46313db0ede84bb8199f7aa0d5dcaa22e975c591 SHA512 f590a7fabf8b67539752d41cf42586edb5c3ae471422bb794cf8927e16c1b5ca43dcf2c5323a74dbe701ba4d9fc794d039bb284df4fb7b63833870cc80c6b028
-MISC metadata.xml 704 BLAKE2B 25cce9fa8743e9f12ee5f41d189dfdb8850673c129f0ee1089922aead08d50a0eca451f926a9f58fcfe7fee256764db2102364968971d7f971a026f8f29fcfd1 SHA512 4c2c54b38569197ebbcb8145017b77c4f77fed2f6b6b6c4198386ee1e3f067b3ca4539cbf239bd7f3ead1e3d428992bae67b3e80edfbf8bcf48fad43d14256b1
+EBUILD cairo-1.16.0-r3.ebuild 3814 BLAKE2B d12420a860c616ea33e141583a7dbddf08c9987c5b7603e9e8f2f349f1d9ccb18936aa91df2754454c13d0f79c496b4fa85968d93d6fd3f026035154c9d11d46 SHA512 fec0544504037a1ae69c97555854e6aab30649708e26b57bbaf30b716d89f1974d6aa6eebb559d2fa783e92b25ba837ef176cd4cc95a48b257de4b145ca43212
+EBUILD cairo-9999.ebuild 3698 BLAKE2B 85e189c7eef5e3845716c58d01c4fda9f1b6b4cb7b4834d2d4beb57020c615cb0375942577ebc52e1b28761c615438bab48c8e77b262b165a4e11646eb3f1325 SHA512 8406d49f3c2c3fe2303054862e9366f1686a5ae56c4dc7b2f8574c303408f4422ad3218b853ce6dbdd4d07bd9b2fea4b529459af3e097437294432cffa365a9f
+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
index b759d2048053..5c4c80e79af3 100644
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils flag-o-matic autotools multilib-minimal
+inherit flag-o-matic autotools multilib-minimal
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -18,13 +18,16 @@ 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 +glib opengl static-libs +svg utils valgrind xcb"
+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}]
@@ -33,20 +36,16 @@ RDEPEND="
 	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? ( >=media-libs/mesa-9.1.6[gles2,${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}]
-	)
-	xcb? (
 		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
 	)"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-2
 	X? ( x11-base/xorg-proto )"
 #[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
 #	doc? (
@@ -55,7 +54,7 @@ DEPEND="${RDEPEND}
 #	)"
 
 REQUIRED_USE="
-	gles2? ( !opengl )
+	gles2-only? ( !opengl )
 "
 
 PATCHES=(
@@ -99,24 +98,24 @@ multilib_src_configure() {
 		$(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 glesv2) \
+		$(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) \
-		$(use_enable xcb) \
-		$(use_enable xcb xcb-shm) \
 		--enable-ft \
+		--enable-interpreter \
 		--enable-pdf \
 		--enable-png \
 		--enable-ps \
 		--enable-script \
-		--enable-interpreter \
 		--disable-drm \
 		--disable-directfb \
 		--disable-gallium \
@@ -127,6 +126,6 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 	einstalldocs
 }
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index f2e28c9ed364..d5022d1759a3 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils flag-o-matic autotools multilib-minimal
+inherit flag-o-matic autotools multilib-minimal
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -18,13 +18,16 @@ 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 +glib opengl static-libs +svg utils valgrind xcb"
+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}]
@@ -33,20 +36,16 @@ RDEPEND="
 	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? ( >=media-libs/mesa-9.1.6[gles2,${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}]
-	)
-	xcb? (
 		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
 	)"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-2
 	X? ( x11-base/xorg-proto )"
 #[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
 #	doc? (
@@ -55,7 +54,7 @@ DEPEND="${RDEPEND}
 #	)"
 
 REQUIRED_USE="
-	gles2? ( !opengl )
+	gles2-only? ( !opengl )
 "
 
 PATCHES=(
@@ -97,24 +96,24 @@ multilib_src_configure() {
 		$(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 glesv2) \
+		$(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) \
-		$(use_enable xcb) \
-		$(use_enable xcb xcb-shm) \
 		--enable-ft \
+		--enable-interpreter \
 		--enable-pdf \
 		--enable-png \
 		--enable-ps \
 		--enable-script \
-		--enable-interpreter \
 		--disable-drm \
 		--disable-directfb \
 		--disable-gallium \
@@ -125,6 +124,6 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 	einstalldocs
 }
diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml
index be776cc36965..4d03eec8d35e 100644
--- a/x11-libs/cairo/metadata.xml
+++ b/x11-libs/cairo/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="opengl" restrict="&gt;=x11-libs/cairo-1.10.0">Build the OpenGL backend</flag>
-		<flag name="gles2">Build the OpenGL ES 2 backend</flag>
+		<flag name="gles2-only">Build the OpenGL ES 2 backend</flag>
 		<flag name="glib">Compile with GLib Object System support</flag>
 		<flag name="utils">Build support for Cairo script and trace utilities</flag>
 		<flag name="valgrind">Built-in support to mark memory regions</flag>
diff --git a/x11-libs/fox/Manifest b/x11-libs/fox/Manifest
index 0d62b11d846b..5f8809edb28a 100644
--- a/x11-libs/fox/Manifest
+++ b/x11-libs/fox/Manifest
@@ -1,7 +1,6 @@
-DIST fox-1.6.49.tar.gz 4383152 BLAKE2B a3d626786086e6b46fc82ce4396bd42d060c234cedf8c182257406de4714c29aae64568bc00a3ad794848eb2faff1a904600f82e4815e9145bcfa87e09390ff2 SHA512 cd7dd5fd26bcdde6ed69d547e2b08582f0e88b66b6f1bac9b5cd2279b543edbf5b9a63cc2ed05f1a1fd7e7309ede96404cf7a5d2d8eb8763dc0fb41d613b0ee8
-DIST fox-1.6.50.tar.gz 4381855 BLAKE2B eef3bd77d6343a65adf4bcc3a59690b1d47d1e92faf81b01a347aa4fdc46053ab17d05ce4016fd147ee64b66c8e582754536c895b87d3c3e073e45435ab9d4ff SHA512 195751d223e9af7d76a3bd3192ae7566a129cfe254f0ba3035b4f7e189c68b43daa8276edad95ebf2b1b403b6212a755000eebf1716a11bb7f06845fde4aceae
-DIST fox-1.7.54.tar.gz 5384000 BLAKE2B 8970872d1c626d7ac5b0f944e8ea26a29bb757e4c646116016eaa1eccc2c0328c5047438e87fb6c2deab0a65e2b34cc91e8458150329a3e574e93608694a2dec SHA512 cf14a09f9a6a812ac87839a5df8fd68f693e59050695e8da5dbfe018676f29bc263e4f9208dc06419068e4140b826a0dcf70a8925fec379edf3e4d0d0b693795
-EBUILD fox-1.6.49.ebuild 988 BLAKE2B 73126b9060f5f0ac0c6f0d652b9796ca1b5aae48fe54deff87376f72d7a4692580354baaafeab75a1bdd4e0321fe6706c0a7eef3903d567c30ccb23a4d48657f SHA512 d87115e04521cd54c4272fee7675c67a1c134a488b5e472d20705b936e717db29a99be2100609d320bc748186f571d29355f041d92a5ebae1f8c0055fe2c2230
-EBUILD fox-1.6.50.ebuild 1006 BLAKE2B e9e8735407185025950ce1a2a7abda8cd1eddf10d44628d54932074bc27dabf4cfe867aac2e256ebe84171117f1e22d5f9dc8c3843d7b699352ca76119f6bc32 SHA512 8c6bfe0160549bf03178aacc1c7fa03fef129779da132bf530b9bb31b586e3b12acf78b0e69af9be6ac8c7b80d40f74e33373ff8a5bba87c70973bb0952669de
-EBUILD fox-1.7.54.ebuild 1296 BLAKE2B d5a19de333cfa6346b4e18532838c5c24295f443eddbb77810f8a7a7e55b1c59064913f828e61906e5215d5bc1d62e78b534aaca710977975e332cd6e461a3c1 SHA512 a9760a4ef8ff82d60b58592fc648ccb2de4d3c8e3ed3f1320f62eac8cae2a765a2ca7291486a32204ca6502c0345c25779c35e61c8c71afe46e62f68d4fb8785
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+AUX fox-1.7.67-no-truetype.patch 1660 BLAKE2B 73e67b75b851ea5dd0fa5ccb0c2b79e1b6f829170ee9bd969612e356ad2ee78854a58e886f837edb004e840a9750a3d7c86bde53f7722cf4de117ebc375faec6 SHA512 1908bf7c1aec24e3086c431518e5c8392cb4467e953091226da088e0768993caf358180aa330a140de334cb9378fa2425732045ca64abccdea3c09f602c57760
+DIST fox-1.6.57.tar.gz 4284018 BLAKE2B 3efbc6188225f9444fbd347359e8b4041a08fe654acb99c48e4966e501a2f72a44863f2e9b60ae810a259951f89cfc27b9a8b6341e029627066712e0dbf20e40 SHA512 e7b91054a9ea674818803415284cb61572935d22466e446cb37ef68344e2684e8acd567f7c8a6912f939dcbcc37455119ad6a01ac30513f460d0b3937b7e6087
+DIST fox-1.7.67.tar.gz 5689421 BLAKE2B 60f2d8e887a41f1e234cd31c1bd2702bcedae0f1b47cb7b9832c317e34a9b517cb603033d28e5ed66c4b97c85deaf3caa8dd40a508eaf715d63772e6ef0020b0 SHA512 a45db7ea9453e2afe0ff61ed6608925e94f9202dc1fbee5e2b88a5a1c16310019cb4611090f8234ad6ebc46a6519a36085683c4553d47bc9c21b8ef0c13ab540
+EBUILD fox-1.6.57-r1.ebuild 2517 BLAKE2B 262d0c514bbd6620b3fff9b9895014016fe38ff19a693d544971ad12e0b36dc6c49b1a3956d4fedfb5c91b16fea3f4f30d096844abd15bee7c92037d9cc2b450 SHA512 af4d7cc85a107f6b9d1f657edb2066f6b834fcf61bbc17358174306b458b720360bf268c4fe33ecf925ae63928f25d87a1778e348d227a3c3a4b792f5f60860a
+EBUILD fox-1.7.67.ebuild 2736 BLAKE2B fb890e94596bd3284229108b0d2e28ff2806a2fbdd7bea4054c1257bd3286fa34fa6076dffd48c2a74b4f76eb719298e367bf0df0d716cdbda8400a66a5cbf6f SHA512 975651b80cc72854d6ccdcfdff17228460590afcd54664b9c886b6eb5384b98e5eaaaf0ae62e1176722bf922c6ae8e81da3eb7eeecdd4f4dad09cd8b11f6481b
+MISC metadata.xml 352 BLAKE2B 92d42784403554fc3a6dc83627054123a5c717a1145ceb519715ed8b1644ade846b5e497fda557db631a0f6926eef23941597f09e1b272030d040422c1a91dba SHA512 adca24f9753e5f22122994f96ea42f9c11fc60b72d7e93386cfe168ba3ee36b226725c847974772cede33d576658849a3af5a2f7ea3fdca4092afe2eae893b34
diff --git a/x11-libs/fox/files/fox-1.7.67-no-truetype.patch b/x11-libs/fox/files/fox-1.7.67-no-truetype.patch
new file mode 100644
index 000000000000..6f91d9746a1e
--- /dev/null
+++ b/x11-libs/fox/files/fox-1.7.67-no-truetype.patch
@@ -0,0 +1,46 @@
+diff -ru fox-1.7.67/lib/FXFont.cpp /var/tmp/portage/x11-libs/fox-1.7.67/work/fox-1.7.67/lib/FXFont.cpp
+--- fox-1.7.67/lib/FXFont.cpp	2019-05-08 05:21:21.000000000 +0200
++++ /var/tmp/portage/x11-libs/fox-1.7.67/work/fox-1.7.67/lib/FXFont.cpp	2019-12-16 22:19:32.510138232 +0100
+@@ -829,26 +829,26 @@
+ 
+       // Weight
+       if(wantweight){
+-        dweight=Math::iabs(weight-wantweight);
++        dweight=Math::iabs((FXint)(weight-wantweight));
+         }
+       else{
+-        dweight=Math::iabs(weight-FXFont::Normal);
++        dweight=Math::iabs((FXint)(weight-FXFont::Normal));
+         }
+ 
+       // Slant
+       if(wantslant){
+-        dslant=Math::iabs(slant-wantslant);
++        dslant=Math::iabs((FXint)(slant-wantslant));
+         }
+       else{
+-        dslant=Math::iabs(slant-FXFont::Straight);
++        dslant=Math::iabs((FXint)(slant-FXFont::Straight));
+         }
+ 
+       // Set width
+       if(wantsetwidth){
+-        dsetwidth=Math::iabs(setwidth-wantsetwidth);
++        dsetwidth=Math::iabs((FXint)(setwidth-wantsetwidth));
+         }
+       else{
+-        dsetwidth=Math::iabs(setwidth-FXFont::NonExpanded);
++        dsetwidth=Math::iabs((FXint)(setwidth-FXFont::NonExpanded));
+         }
+ 
+       // Pitch
+@@ -900,7 +900,7 @@
+       // should be multiplied by (100/90).
+       else{
+         size=(yres*points)/res;
+-        dsize=Math::iabs(size-wantsize);
++        dsize=Math::iabs((FXint)(size-wantsize));
+         }
+ 
+       FXTRACE((160,"%4d: dweight=%-3d dsize=%3d dslant=%d dsetwidth=%d dscalable=%d dpolymorph=%d xres=%-3d yres=%-3d xlfd=\"%s\"\n",f,dweight,dsize,dslant,dsetwidth,dscalable,dpolymorph,xres,yres,fontnames[f]));
+
diff --git a/x11-libs/fox/fox-1.6.49.ebuild b/x11-libs/fox/fox-1.6.49.ebuild
deleted file mode 100644
index ef0f71f8e066..000000000000
--- a/x11-libs/fox/fox-1.6.49.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils fox
-
-LICENSE="LGPL-2.1"
-SLOT="1.6"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
-
-RDEPEND="x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/fox-wrapper
-	bzip2? ( >=app-arch/bzip2-1.0.2 )
-	jpeg? ( virtual/jpeg )
-	opengl? ( virtual/glu virtual/opengl )
-	png? ( >=media-libs/libpng-1.2.5 )
-	tiff? ( >=media-libs/tiff-3.5.7 )
-	truetype? ( =media-libs/freetype-2*
-		x11-libs/libXft )
-	zlib? ( >=sys-libs/zlib-1.1.4 )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt"
-
-src_prepare() {
-	sed -i -e 's/-lXft/-lXft -lfontconfig/' "${S}/configure.ac"
-	fox_src_prepare
-}
-
-src_configure() {
-	FOXCONF="$(use_enable bzip2 bz2lib) \
-		$(use_enable jpeg) \
-		$(use_with opengl) \
-		$(use_enable png) \
-		$(use_enable tiff) \
-		$(use_with truetype xft) \
-		$(use_enable zlib)" fox_src_configure
-}
diff --git a/x11-libs/fox/fox-1.6.50.ebuild b/x11-libs/fox/fox-1.6.50.ebuild
deleted file mode 100644
index 330f85c8a759..000000000000
--- a/x11-libs/fox/fox-1.6.50.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils fox
-
-LICENSE="LGPL-2.1"
-SLOT="1.6"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
-
-RDEPEND="x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/fox-wrapper
-	bzip2? ( >=app-arch/bzip2-1.0.2 )
-	jpeg? ( virtual/jpeg:= )
-	opengl? ( virtual/glu virtual/opengl )
-	png? ( >=media-libs/libpng-1.2.5:0= )
-	tiff? ( >=media-libs/tiff-3.5.7:0= )
-	truetype? ( =media-libs/freetype-2*
-		x11-libs/libXft )
-	zlib? ( >=sys-libs/zlib-1.1.4 )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt"
-
-src_prepare() {
-	sed -i -e 's/-lXft/-lXft -lfontconfig/' "${S}/configure.ac"
-	fox_src_prepare
-}
-
-src_configure() {
-	FOXCONF="$(use_enable bzip2 bz2lib) \
-		$(use_enable jpeg) \
-		$(use_with opengl) \
-		$(use_enable png) \
-		$(use_enable tiff) \
-		$(use_with truetype xft) \
-		$(use_enable zlib)" fox_src_configure
-}
diff --git a/x11-libs/fox/fox-1.6.57-r1.ebuild b/x11-libs/fox/fox-1.6.57-r1.ebuild
new file mode 100644
index 000000000000..3b8d8ad7645b
--- /dev/null
+++ b/x11-libs/fox/fox-1.6.57-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="C++ Toolkit for developing Graphical User Interfaces easily and effectively"
+HOMEPAGE="http://www.fox-toolkit.org/"
+SRC_URI="ftp://ftp.fox-toolkit.org/pub/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="1.6"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib debug doc profile"
+
+RDEPEND="
+	x11-libs/fox-wrapper
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	bzip2? ( app-arch/bzip2 )
+	jpeg? ( virtual/jpeg )
+	opengl? ( virtual/glu virtual/opengl )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-libs/freetype:2
+		x11-libs/libXft
+	)
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXt"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	default
+
+	local d
+	for d in utils windows adie calculator pathfinder shutterbug; do
+		sed -i -e "s:${d}::" Makefile.am || die
+	done
+
+	# Respect system CXXFLAGS
+	sed -i -e 's:CXXFLAGS=""::' configure.ac || die "Unable to force cxxflags."
+
+	# don't strip binaries
+	sed -i -e '/LDFLAGS="-s ${LDFLAGS}"/d' configure.ac || die "Unable to prevent stripping."
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--enable-$(usex debug debug release) \
+		$(use_enable bzip2 bz2lib) \
+		$(use_enable jpeg) \
+		$(use_with opengl) \
+		$(use_enable png) \
+		$(use_enable tiff) \
+		$(use_with truetype xft) \
+		$(use_enable zlib) \
+		$(use_with profile profiling)
+}
+
+src_compile() {
+	emake
+	use doc && emake -C doc docs
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		artdir="${EPREFIX}"/usr/share/doc/${PF}/html/art \
+		screenshotsdir="${EPREFIX}"/usr/share/doc/${PF}/html/screenshots
+
+	local CP="${ED}"/usr/bin/ControlPanel
+	if [[ -f ${CP} ]]; then
+		mv "${CP}" "${ED}"/usr/bin/fox-ControlPanel-${SLOT} || \
+			die "Failed to install ControlPanel"
+	fi
+
+	dodoc ADDITIONS AUTHORS LICENSE_ADDENDUM README TRACING
+
+	if use doc; then
+		# install class reference docs if USE=doc
+		docinto html
+		dodoc -r doc/ref
+	else
+		# remove documentation if USE=-doc
+		rm -rf "${ED}"/usr/share/doc/${PF}/html || die
+	fi
+
+	# slot fox-config
+	if [[ -f ${ED}/usr/bin/fox-config ]] ; then
+		mv "${ED}"/usr/bin/fox-config "${ED}"/usr/bin/fox-${SLOT}-config \
+		|| die "failed to install fox-config"
+	fi
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/x11-libs/fox/fox-1.7.54.ebuild b/x11-libs/fox/fox-1.7.54.ebuild
deleted file mode 100644
index 1d22508a8b86..000000000000
--- a/x11-libs/fox/fox-1.7.54.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit fox
-
-LICENSE="LGPL-2.1"
-SLOT="1.7"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
-
-# newish autoconf needed for working mmap check
-RDEPEND="x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/fox-wrapper
-	>=sys-devel/autoconf-2.67
-	bzip2? ( app-arch/bzip2 )
-	jpeg? ( virtual/jpeg:= )
-	opengl? ( virtual/glu virtual/opengl )
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0= )
-	truetype? ( media-libs/freetype:2
-		x11-libs/libXft )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt"
-
-src_configure() {
-	FOXCONF="$(use_enable bzip2 bz2lib) \
-		$(use_enable jpeg) \
-		$(use_with opengl) \
-		$(use_enable png) \
-		$(use_enable tiff) \
-		$(use_with truetype xft) \
-		$(use_enable zlib)" fox_src_configure
-}
-
-src_install() {
-	fox_src_install
-	CP="${ED}/usr/bin/ControlPanel"
-	if [[ -f ${CP} ]] ; then
-		mv "${CP}" "${ED}/usr/bin/fox-ControlPanel-${SLOT}" || \
-			die "Failed to install ControlPanel"
-	fi
-}
-
-pkg_postinst() {
-	fox_pkg_postinst
-
-	einfo "ControlPanel has been installed to 'fox-ControlPanel-${SLOT}' to avoid conflicts"
-	einfo "with other packages."
-}
diff --git a/x11-libs/fox/fox-1.7.67.ebuild b/x11-libs/fox/fox-1.7.67.ebuild
new file mode 100644
index 000000000000..46ddd5fdb5e2
--- /dev/null
+++ b/x11-libs/fox/fox-1.7.67.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="C++ Toolkit for developing Graphical User Interfaces easily and effectively"
+HOMEPAGE="http://www.fox-toolkit.org/"
+SRC_URI="ftp://ftp.fox-toolkit.org/pub/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="1.7"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib debug doc profile tools"
+
+RDEPEND="
+	x11-libs/fox-wrapper
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	bzip2? ( app-arch/bzip2 )
+	jpeg? ( virtual/jpeg )
+	opengl? ( virtual/glu virtual/opengl )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-libs/freetype:2
+		x11-libs/libXft
+	)
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXt"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=( "${FILESDIR}"/"${PN}"-1.7.67-no-truetype.patch )
+
+src_prepare() {
+	default
+
+	sed -i '/#define REXDEBUG 1/d' lib/FXRex.cpp || die "Unable to remove spurious debug line."
+	sed -i -e "s:windows::" Makefile.am || die
+	if ! use tools; then
+		local d
+		for d in adie calculator pathfinder shutterbug; do
+			sed -i -e "s:${d}::" Makefile.am || die
+		done
+	fi
+
+	# Respect system CXXFLAGS
+	sed -i -e 's:CXXFLAGS=""::' configure.ac || die "Unable to force cxxflags."
+
+	# don't strip binaries
+	sed -i -e '/LDFLAGS="-s ${LDFLAGS}"/d' configure.ac || die "Unable to prevent stripping."
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--enable-$(usex debug debug release) \
+		$(use_enable bzip2 bz2lib) \
+		$(use_enable jpeg) \
+		$(use_with opengl) \
+		$(use_enable png) \
+		$(use_enable tiff) \
+		$(use_with truetype xft) \
+		$(use_enable zlib) \
+		$(use_with profile profiling)
+}
+
+src_compile() {
+	emake
+	use doc && emake -C doc docs
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		artdir="${EPREFIX}"/usr/share/doc/${PF}/html/art \
+		screenshotsdir="${EPREFIX}"/usr/share/doc/${PF}/html/screenshots
+
+	local CP="${ED}"/usr/bin/ControlPanel
+	if [[ -f ${CP} ]]; then
+		mv "${CP}" "${ED}"/usr/bin/fox-ControlPanel-${SLOT} || \
+			die "Failed to install ControlPanel"
+	fi
+
+	dodoc ADDITIONS AUTHORS LICENSE_ADDENDUM README TRACING
+
+	if use doc; then
+		# install class reference docs if USE=doc
+		docinto html
+		dodoc -r doc/ref
+	else
+		# remove documentation if USE=-doc
+		rm -rf "${ED}"/usr/share/doc/${PF}/html || die
+	fi
+
+	# slot fox-config
+	if [[ -f ${ED}/usr/bin/fox-config ]] ; then
+		mv "${ED}"/usr/bin/fox-config "${ED}"/usr/bin/fox-${SLOT}-config \
+		|| die "failed to install fox-config"
+	fi
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/x11-libs/fox/metadata.xml b/x11-libs/fox/metadata.xml
index 7a38bb900964..a0084d6b4b7c 100644
--- a/x11-libs/fox/metadata.xml
+++ b/x11-libs/fox/metadata.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+		<name>Jason A. Donenfeld</name>
+	</maintainer>
+	<use>
+		<flag name="tools">Install adie, calculator, shutterbug, and pathfinder apps.</flag>
+	</use>
 </pkgmetadata>
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 99d09be49a9e..2e433e28d350 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,11 +1,4 @@
 AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e7c95c59ec0b8d5f65f72c1675186b0c0cc105be5537e7b4660730dce3799227217a582a64f295afbd33a8cf52071f5fe8c4e153c0d3 SHA512 0a3e51c52f947d6231b472525b11e13fdc752b8eaa34c95ec3c76cfb0faf33ef3109c8381189261e8ebae76a4070af24e58c373bebc69bbb6b69399bf833395d
-DIST gdk-pixbuf-2.36.12-bug753605-atsize.jpg 80850 BLAKE2B 17e414ca097b7aaf513241eacae97c5bc582f7ebd8870e8b67ce4af4e57134b8b4ae0ed579eb4cf0f57db2891e95a673d2129a1bafefe5ab8e2a8dd5f66da271 SHA512 d27197d2395446cd3c970841381958f7eb1b8df78913f7da70bec5f09af6edfc5dd74cd809c37ec8cf69f0eba504e0cc6354f1ec6ce3ec2192ad316cb64b69c9
-DIST gdk-pixbuf-2.36.12.tar.xz 5675768 BLAKE2B da9e18b5dc55ad13a1bdab76d9c63a6233da1b45235ae5eb620e6e3f83888a0cc846f1ba17f72cb3b5af1ccd59a69631b3403bf09e262c53e0149e6f26896a33 SHA512 5d3bd620cf464bf92079b15c78f8400db48c427053c6eeedc4ea9652a4c290a09a26310100cc7eb487daf4b565df9f7e3a6edf14685f81ddbff6a0652fb6b41b
-DIST gdk-pixbuf-2.38.1.tar.xz 5509328 BLAKE2B 9180e833b264e4eb1bec1ec92e6ee7cb07a208459a7b58da9edd3f1872cdc1a98a6d7c27a147674d5dbded1b74098a4b1f197479c7addd1a6b307ced82a2e4dd SHA512 e50badaad2ccb3c816ba0849be386ecb75ea3c7df203d0b0144541c463ad1ace86c0d190b7550e3f59f0cba9639acc5cc048b7127484287894e4df6d62777920
-DIST gdk-pixbuf-2.38.2.tar.xz 5509752 BLAKE2B f78ba049edc7b1a6c909746ec68948764b3602988e110ee2ad752d26d8b3a37c3f2957a91d3c8a5fe3455cf11b477eaa43d097554048e8988c563b4074bfd751 SHA512 b0f83cca9bfbe45dab200b19a5ec6231b628c09633fd41348f433c226d523c2f9b805d41e4d955e9fd65c5b6d24df59c7c94193032379d6f09b0472ae988a0c1
 DIST gdk-pixbuf-2.40.0.tar.xz 5512160 BLAKE2B 26049a9ede60e7a50bdc5e9a731136e4bc6de031d01abd42667a0bf92617c36bcdc61d2dc18beb3c5223e32eab461ddb9fc9880a014ac1154763d3b7ee3e7200 SHA512 6512befd379494dbfd89a16fc4c92641842eb7b82fc820ec83a5b057526209947db646570db1124c073b0ef69c117bdf0f8d3fea807e302a4950db39187c35aa
-EBUILD gdk-pixbuf-2.36.12.ebuild 4012 BLAKE2B 37df83a187e728f2d9796ef163a7b1dc87dad4804b6a245a5451b09c2e7bb0f5b75e81753fbcceaafeea24d902aa5f1e90c4a1f645d01db158738f1346acb107 SHA512 d3bdf7f546b3451c939aa62422a6673fbdf5b844718597895e9feadea017ebca8670ce47e4c5224b9239c40420c36382b79a324dbf92d87dd4ac819e406a8995
-EBUILD gdk-pixbuf-2.38.1-r1.ebuild 4019 BLAKE2B e504c2bf8227bd236f7f2a2de5166b396ec8edfaaa6592da40c6f63861e20add23f704ab2f57b53487d0ca424d3727820a3b9c9d93d02f7ff01084bd6943e6a4 SHA512 7716c02cc2b64cde65f434fa43f001a9b3fb4ab2608e4c575d50cac64b4a622c059ec158918a90eb1b329079c9aa78bd6613d139115ee6f145a3d8d938674fee
-EBUILD gdk-pixbuf-2.38.2-r1.ebuild 3863 BLAKE2B 664593a683237f7e987b5feeb8a13d713f0ee513a723dc41b16126c84388b3e7c2ac3132826a141393f91ffffc80e28ca8e6bf41e30cb408d34761fec782e7f3 SHA512 b9543eb2055d4c73cef3eafdfbc55b0d3c35f45e635737102463669e34f76f7eb444d1056d7d6fa12d33bcf66116d8d4d7973f61979e218154900fa9a5d41ed3
-EBUILD gdk-pixbuf-2.40.0.ebuild 3855 BLAKE2B e619040cb8ccd2c9fbe2cc499c189810b22e960dfbf840fda36b87b012cba00fdfabd89367063d9b7d62be7c407cdbab00ffd15f364a98c266f5088cadbaf843 SHA512 357356802c23016a0851bfd490e80a67d09fa882f1d8825d937750afce288097940c71d7e5a8328d024cf081f1bb6d36443de20c9d6fd3a688d99f5cd54460e1
+EBUILD gdk-pixbuf-2.40.0.ebuild 3852 BLAKE2B c10991c5f1fdd0fb9553d4c68e0abbb3263b01e3009e5af3460f30e17ad085b46f690e0023baff8bd7f7f278ea27d2b8a753b68c01bd95a170e1391cd66f1452 SHA512 154d9aabf933ce7dda3223ad3f4eec1a4d8a249a3639dd72a5ef6d26a9b555a188855ae709d76b9d0f2ec1db9250c0b7962a5d71e35a8c5276e147c938d4acc5
 MISC metadata.xml 424 BLAKE2B 07b31586e47af1803baf8ce93c9e61334fbe566e8fae5bcc9d442d09b3ddfc51b06be8f02ffebf663b0307130c57e94b63ff57a83856ebec755704b8d3b232bd SHA512 3ef93327d28195a186bcc16c8acbb931c2cedcc7893173ca76af0db90eb088a838f5cb1c2f43f4b72fcf9067f6c483c96a5549c57c3542cccbb70450cce485bd
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
deleted file mode 100644
index f3e6666b170a..000000000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit flag-o-matic gnome2 multilib multilib-minimal
-
-DESCRIPTION="Image loading library for GTK+"
-HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="X debug +introspection jpeg tiff test"
-RESTRICT="!test? ( test )"
-
-# Remove SRC_URI when gnome bug #795069 is fixed
-SRC_URI="${SRC_URI} test? ( https://git.gnome.org/browse/gdk-pixbuf/plain/tests/bug753605-atsize.jpg?h=2.36.12 -> ${PN}-2.36.12-bug753605-atsize.jpg )"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
-	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.20
-	>=sys-devel/gettext-0.19
-	virtual/pkgconfig
-"
-# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gail-1000
-	!<gnome-base/librsvg-2.31.0
-	!<x11-libs/gtk+-2.21.3:2
-	!<x11-libs/gtk+-2.90.4:3
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
-)
-
-PATCHES=(
-	# Do not run lowmem test on uclibc
-	# See https://bugzilla.gnome.org/show_bug.cgi?id=756590
-	"${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
-)
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=795069
-	if use test ; then
-		cp -v "${DISTDIR}"/${P}-bug753605-atsize.jpg "${S}"/tests/bug753605-atsize.jpg || die
-	fi
-
-	# This will avoid polluting the pkg-config file with versioned libpng,
-	# which is causing problems with libpng14 -> libpng15 upgrade
-	# See upstream bug #667068
-	# First check that the pattern is present, to catch upstream changes on bumps,
-	# because sed doesn't return failure code if it doesn't do any replacements
-	grep -q  'l in libpng16' configure || die "libpng check order has changed upstream"
-	sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
-	[[ ${CHOST} == *-solaris* ]] && append-libs intl
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	# png always on to display icons
-	ECONF_SOURCE="${S}" \
-	gnome2_src_configure \
-		$(usex debug --enable-debug=yes "") \
-		$(use_with jpeg libjpeg) \
-		--without-libjasper \
-		$(use_with tiff libtiff) \
-		$(multilib_native_use_enable introspection) \
-		$(use_with X x11) \
-		--with-libpng
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die
-	fi
-}
-
-multilib_src_install() {
-	# Parallel install fails when no gdk-pixbuf is already installed, bug #481372
-	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make sure loaders.cache belongs to gdk-pixbuf alone
-		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-
-	multilib_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-
-	multilib_foreach_abi gnome2_pkg_postinst
-
-	# Migration snippet for when this was handled by gtk+
-	if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
-		elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
-		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
-	fi
-}
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1-r1.ebuild
deleted file mode 100644
index e9a368ec3121..000000000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org gnome2-utils meson multilib multilib-minimal xdg
-
-DESCRIPTION="Image loading library for GTK+"
-HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="X gtk-doc +introspection jpeg tiff"
-
-# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
-COMMON_DEPEND="
-	>=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
-	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.20 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gail-1000
-	!<gnome-base/librsvg-2.31.0
-	!<x11-libs/gtk+-2.21.3:2
-	!<x11-libs/gtk+-2.90.4:3
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
-)
-
-PATCHES=(
-	# Do not run lowmem test on uclibc
-	# See https://bugzilla.gnome.org/show_bug.cgi?id=756590
-	"${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	# This will avoid polluting the pkg-config file with versioned libpng,
-	# which is causing problems with libpng14 -> libpng15 upgrade
-	# See upstream bug #667068
-	# First check that the pattern is present, to catch upstream changes on bumps,
-	# because sed doesn't return failure code if it doesn't do any replacements
-	grep -q "foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]" meson.build || die "libpng check order has changed upstream"
-	sed -e "s/foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/foreach png: \[ 'libpng', 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/" -i meson.build || die
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dpng=true
-		$(meson_use tiff)
-		$(meson_use jpeg)
-		-Djasper=false
-		$(meson_use X x11)
-		-Dbuiltin_loaders=png
-		-Drelocatable=false
-		#native_windows_loaders
-		-Dinstalled_tests=false
-		-Dgio_sniffing=true
-	)
-	if multilib_is_native_abi; then
-		emesonargs+=(
-			$(meson_use gtk-doc docs)
-			$(meson_use introspection gir)
-			-Dman=true
-		)
-	else
-		emesonargs+=(
-			-Ddocs=false
-			-Dgir=false
-			-Dman=false
-		)
-	fi
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make sure loaders.cache belongs to gdk-pixbuf alone
-		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-
-	multilib_foreach_abi multilib_pkg_preinst
-	gnome2_gdk_pixbuf_savelist
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-
-	xdg_pkg_postinst
-	multilib_foreach_abi gnome2_gdk_pixbuf_update
-
-	# Migration snippet for when this was handled by gtk+
-	if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
-		elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
-		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
-	fi
-}
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2-r1.ebuild
deleted file mode 100644
index 751e7ed0fff8..000000000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# TODO: EAPI-7 needs gnome2-utils fixes - ${EROOT%/} and co usage for EAPI-7 in gdk_pixbuf_*
-# TODO: functions and eutils inherit for emktemp or some other solution
-
-inherit gnome.org gnome2-utils meson multilib multilib-minimal xdg
-
-DESCRIPTION="Image loading library for GTK+"
-HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="X gtk-doc +introspection jpeg tiff"
-
-# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
-DEPEND="
-	>=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
-	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
-RDEPEND="${DEPEND}
-	!<gnome-base/gail-1000
-	!<gnome-base/librsvg-2.31.0
-	!<x11-libs/gtk+-2.21.3:2
-	!<x11-libs/gtk+-2.90.4:3
-"
-DEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.20
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
-)
-
-PATCHES=(
-	# Do not run lowmem test on uclibc
-	# See https://bugzilla.gnome.org/show_bug.cgi?id=756590
-	"${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	# This will avoid polluting the pkg-config file with versioned libpng,
-	# which is causing problems with libpng14 -> libpng15 upgrade
-	# See upstream bug #667068
-	# First check that the pattern is present, to catch upstream changes on bumps,
-	# because sed doesn't return failure code if it doesn't do any replacements
-	grep -q "foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]" meson.build || die "libpng check order has changed upstream"
-	sed -e "s/foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/foreach png: \[ 'libpng', 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/" -i meson.build || die
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dpng=true
-		$(meson_use tiff)
-		$(meson_use jpeg)
-		-Djasper=false
-		$(meson_use X x11)
-		-Dbuiltin_loaders=png
-		-Drelocatable=false
-		#native_windows_loaders
-		-Dinstalled_tests=false
-		-Dgio_sniffing=true
-	)
-	if multilib_is_native_abi; then
-		emesonargs+=(
-			$(meson_use gtk-doc docs)
-			$(meson_use introspection gir)
-			-Dman=true
-		)
-	else
-		emesonargs+=(
-			-Ddocs=false
-			-Dgir=false
-			-Dman=false
-		)
-	fi
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make sure loaders.cache belongs to gdk-pixbuf alone
-		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
-
-		if [[ -e ${EROOT%/}/${cache} ]]; then
-			cp "${EROOT%/}"/${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED%/}"/${cache} || die
-		fi
-	}
-
-	multilib_foreach_abi multilib_pkg_preinst
-	gnome2_gdk_pixbuf_savelist
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-
-	xdg_pkg_postinst
-	multilib_foreach_abi gnome2_gdk_pixbuf_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		rm -f "${EROOT%/}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache
-	fi
-}
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild
index b12ae08a0959..e28fc5ce9fd5 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh 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 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="X gtk-doc +introspection jpeg tiff"
 
 # TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 2ebcbb78744f..7f42c3360a19 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,7 +1,5 @@
-AUX 3.24.4-more-gtkswitch-fallback.patch 949 BLAKE2B 2af2408e41e28e390875ba717b82d013639e9cd4b7ca8ebc386f2f53ee13fa27f43182c61218867017fa2ffc0407ded0019d442c21805efd565763669eef2469 SHA512 ecdc03215ca72f884fc27c9c7cb27f16aa16869759d17fc75dda5d519abb1b31dc7a84efff8f7b5d9294f2496ea21326b814a07f9a1c2bd902e4d9908684a87f
 AUX gtk+-2.24.24-out-of-source.patch 1487 BLAKE2B f322f3872c8e1f02f6d1d52cdfdb4b42dad26d44bda2f1a9b36ee7dae0f8e7c072f5a8e492d01429bb4ae679f886b3ef0fb9952bef5a08e75720908f2e8d616d SHA512 794903f8254a49f7d0e24f9730658dc69184969bb450419bd34bc2a9e7065d99931df4ae5ecd93abc0a18bff546aeb6816aae47531e8a79dc5aef5beaf9b6aa2
 AUX gtk+-2.24.31-update-icon-cache.patch 2504 BLAKE2B 29a8874e81e287356f230e355117aabd9c3e9dfd1a810eaa8dc7e60dbe3fb65a73719c272dc1ba2058dae95b3988d86f09fa8587963df34a7486b50e68e79732 SHA512 c2a55a410019502b0af3fa5152fc372ce8a555bd63b5cf7f9574ebe5058f3b95e21dc5f14b5b8867d52105e4f6ebca3336a59935c3a7269bfd41aa91edadab48
-AUX gtk+-3.22.2-update-icon-cache.patch 5474 BLAKE2B fe374a5f50ffc69df0d09e5b50d8b5c22ec57eb8709d13270b53cc389f2a14a4fa145051e5c0d80e7eb0c9e6778a240fbd64e4299d36736500ca6695a1345b13 SHA512 46ac52f18c0e74f5e35101ef978d7708c42abb05985894b65e8a7f7a76f1934015ff35a912628a5ae2c6333916ffd00570aa19230108aabe3a20adc5e31d958e
 AUX gtk+-3.22.20-libcloudproviders-automagic.patch 1904 BLAKE2B ed4e774a5641a8e857ae63b83cd481479f3562de3471b5c662eb5b110e583a0a84e7defe272c2fdc6fba58649763b3e97a7e453f83e4693f40a051c8565de7b5 SHA512 3981e3d0dd9a7422b41918a6e426fe36715c6a80c7a46a241edbd1ea364381ac34fa0ae6240bc59980dd56bb816cead55dd4d29437ff288d78b90c139cb5807f
 AUX gtk+-3.24.8-update-icon-cache.patch 5523 BLAKE2B 648018f807cb1f3d057e986a1422e3fbeb0cf1c050f19569f4a93a9d7e71577370b79f01133e0be048282259af8218f03511c39c8e73b3b912c2c86e91ab935b SHA512 70fa68b08dd140eea1dfa80f2b67d4c6d3d5bd1b5374eda57bd827f9727e89bbd0e2d775676da2dc5d852d3c2f55cbb07d9d791a99a6d90f5f63864a0479fe13
 AUX gtkrc 627 BLAKE2B 57af25dcadfa09ea784ac485db383753deda23c42ce22582f03041abf7a061e70eced09592ab0750786bea3555d760febc913762b8369b50b327fbd03d918279 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4
@@ -10,9 +8,10 @@ DIST gtk+-2.24.32-patchset-r1.tar.xz 13364 BLAKE2B 15e5429b11cc4ccef1bf44105c790
 DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
 DIST gtk+-3.24.10.tar.xz 20958300 BLAKE2B 60a70341f15b59b95316cbce55cd18b54a6dff3735fb5f375c1bc21ca2591874b583d4879021d868d78fe1714bc037d80d44fb3384efd1167962b8c6e9588c5a SHA512 1f7980189f522fd3646fb480b965c21801cc30b3316eb8bad8ded1efd25d3054f62160ddbe9ea241628c11b24f746024fbc3d22b17b9bd61fa6c301ab91d6498
 DIST gtk+-3.24.11.tar.xz 20974300 BLAKE2B f338782d6141df64f83caae84649558296e11240ab082d4db129480a77e85cd26f86dee66e7f2650db48f13a30b0cb7191a8deb4bc545c9c7ee3b73796638a98 SHA512 15e33169030aa38e363730e5b19bbde614897b1a0de5db29c5292940a97e3613383b3eeb1c83ab8c09015a2a3f3ad425511bacd8fdbb79b30e0a47d4d4b57008
-DIST gtk+-3.24.4.tar.xz 21102236 BLAKE2B 1ef6445d582217a54538549fd63c59dd1e7f14832b33a41e971d2dd184a8887876d1eb599cb9fcbd590ec1a16ca29f0be92bc96344b1e7d2fdf88456d63c9a7f SHA512 d1cce6d0d7f1c5ef0f4e8988b88372a32b9d8a2924da4cfc46a80ede91cf8a2aacdcd87eec122dfab1369b36fc849d875832ac11d79426cf6884e1730e5d4dd1
-EBUILD gtk+-2.24.32-r1.ebuild 9986 BLAKE2B 59dbdb49cf5600fc37402663acba725096faaa2eafe7bda998c231f7057f7477e0857624fc422ecb0c5811e6dbfd10bb61bc7b6df5794063bec65c3680725f47 SHA512 814faa5bb885e55db9d24a74d7571b1f61da82005768b891b9a737af8870a9bbe4e74fbad2b218bdfcddeb3f5309843f0bf0755746aacf6e4dd9a73c01d88456
+DIST gtk+-3.24.13-patchset.tar.xz 57652 BLAKE2B deda8cb4e0026431b52c0299266d60c4d4be2a2c870bee06daf3d9f63918d47243b88c73c4441f9415c859116fd873f276496b7ea9c2243a9540351ca53c5897 SHA512 dc8abad0812c936f7316425ca456d5892f3438ca6f843ed49fd53258695958b2a52a1df878ff25547d176aa054ea48ae9fc1b971698afc4d4aedae9cb643feae
+DIST gtk+-3.24.13.tar.xz 23206464 BLAKE2B d58130d490d8886d0656a3106ddd4f24c0b83a512b6daa22cbb6cbfa6f0582a22a8f6e0063016c120e15b031a3c5585a557bd3dc94b1e55ac0ae553da871d64a SHA512 9129d4574cca258b4a517d8d65dad246a746fc3dc574b78e098db9aa9743956ce227efbf963f63e1e0f1a1a09810716150526b2bfe8015a5960bad38b0c88406
+EBUILD gtk+-2.24.32-r1.ebuild 9985 BLAKE2B 1e25f08b5f8bfc396c5b52bdda7c52e3fa8fc317f090226f86e7e518943447a2e47ae26cf4f49e1f845b0dec445aa4f666f064f1cac10b25eb29583009322202 SHA512 74dad47623d8851c20c84a89f7436b9dc52bef404ba61cce5cf4d1ae4ab7c53537397a8b29ad52b7a1ea5f00e28124ed7954848b84ca42edcf1ee86c09f8557a
 EBUILD gtk+-3.24.10.ebuild 7293 BLAKE2B de22448a92e0993ec1d1fa45e66ca4c5cd943348b52e0df3ac95f9659a3de20d03630d488b818d3d012f9caef033ad29b9723d4f7b82439b04c9c1efe62ad54f SHA512 819c2e3ca38a02cf4338121b17f03239375ef9464c8eefc6bedc9d352ec353143f451488bb4442d3b3a19b8bed146b3f1f23fff915eba05c7f62b08c8bfa1c5f
-EBUILD gtk+-3.24.11.ebuild 7326 BLAKE2B 85bc5f0477a8658335fe8490276ce3fde818ad1e3d6279bc52439ed2d41de0de394553c36f2a6374b170e9498b87873bb306e2378d6693514a5ee403daeb3963 SHA512 01cce72d8c70d9bcfb89dcf83982cf45c27da90f2d4586bfa57366dab0b0597ed96868ffb8eefe421190d4f67250d2b13d838ca4cbd3460c94bb11468a05e2c9
-EBUILD gtk+-3.24.4-r1.ebuild 7255 BLAKE2B 45402dc053928d65c2e6ebfe52d23038e3283fc543af7358b31fc543a7696d12cc6ae670aa915852ee62df827c1666bac98c2336012cbb0d019c0a4e79fe5ef5 SHA512 05a35c8edb716a2052527cfecd461af62ce256d6fc522669dbf475bc1c5f7115d90e62a4ec4c426c717ca28265920130d8cbbeae5cfa9635249c15c72e875429
+EBUILD gtk+-3.24.11.ebuild 7324 BLAKE2B c89d9b242fc6088aac4343cd47bff8561b5706c6f3f3d3abccb675a13bb3f7174a90b66dbfaf402965d190f2b262c37c13d41fd82f86e99c1187c69f6a9e85db SHA512 41bb636c45d2dd51fe8de5ebc2e47a8d2b872f68a15274e871e9ade19afe6029c0a6234594ba3b54d7e600a97a2dfb1aa96d6ad1fd2abda880cf27c815b8b654
+EBUILD gtk+-3.24.13.ebuild 7453 BLAKE2B cdf71c8d622137eefcf44bd7b62487a385cbff5549ec64cbd7d3c79f448f69b8ce63a6aad57839cd9a09b10a81d413ee9d9e7d30dd1c0848c5ecda259adc0573 SHA512 00b82778653436219ce675f3842b68b333267961e892d9d280e6348a78935c62eaf5e4037f5b02a449f14f28c72603d9d3b3919d8f145879b308e80cb0db6827
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/files/3.24.4-more-gtkswitch-fallback.patch b/x11-libs/gtk+/files/3.24.4-more-gtkswitch-fallback.patch
deleted file mode 100644
index 629a2d750e17..000000000000
--- a/x11-libs/gtk+/files/3.24.4-more-gtkswitch-fallback.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6a4ce55a69c5ecbbf06bc905ac0bfdd04f64bb66 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Wed, 23 Jan 2019 12:02:27 -0500
-Subject: [PATCH] switch: Avoid problems with glyph availability
-
-If none of the glyphs we want are available, fall
-back to using empty strings here, rather than causing
-critical warnings.
----
- gtk/gtkswitch.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c
-index 1d42f572a9..4c49e243ed 100644
---- a/gtk/gtkswitch.c
-+++ b/gtk/gtkswitch.c
-@@ -302,12 +302,14 @@ gtk_switch_create_pango_layouts (GtkSwitch *self)
-   const char *on_glyphs[] = {
-     "⏽", /* U+23FD POWER ON SYMBOL */
-     "❙", /* U+2759 MEDIUM VERTICAL BAR */
-+    ""
-   };
- 
-   /* Glyphs for the OFF state, in descending order of preference */
-   const char *off_glyphs[] = {
-     "⭘", /* U+2B58 HEAVY CIRCLE */
-     "○", /* U+25CB WHITE CIRCLE */
-+    ""
-   };
-   int i;
- 
--- 
-2.17.0
-
diff --git a/x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch
deleted file mode 100644
index fc1e86e997d0..000000000000
--- a/x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From 101b43f4a38904ee21070a3e2eb5ba03dfe17647 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 1 Nov 2016 15:24:22 +0100
-Subject: [PATCH] Always use external gtk-update-icon-cache
-
-Check for gtk-update-icon-cache to install demos, otherwise it is not
-used when building.
----
- configure.ac                     |  2 ++
- demos/gtk-demo/Makefile.am       |  2 +-
- demos/widget-factory/Makefile.am |  2 +-
- docs/reference/gtk/Makefile.am   |  1 -
- gtk/Makefile.am                  | 44 ----------------------------------------
- 5 files changed, 4 insertions(+), 47 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4f9f183..ecf99dc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -999,6 +999,8 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
- 
- AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
- 
-+AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, [gtk-update-icon-cache], [no])
-+
- ########################################
- # Windowing system checks
- ########################################
-diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
-index 8c15e16..5d774d2 100644
---- a/demos/gtk-demo/Makefile.am
-+++ b/demos/gtk-demo/Makefile.am
-@@ -171,7 +171,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.sy
- dist_appsicon48_DATA = data/48x48/gtk3-demo.png data/48x48/gtk3-demo-symbolic.symbolic.png
- dist_appsicon256_DATA = data/256x256/gtk3-demo.png data/256x256/gtk3-demo-symbolic.symbolic.png
- 
--update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
-+update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force
- 
- install-data-hook: install-update-icon-cache
- uninstall-hook: uninstall-update-icon-cache
-diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am
-index a6bfbdc..28a3be2 100644
---- a/demos/widget-factory/Makefile.am
-+++ b/demos/widget-factory/Makefile.am
-@@ -47,7 +47,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png data/32x32/gtk3-widget
- dist_appsicon48_DATA = data/48x48/gtk3-widget-factory.png data/48x48/gtk3-widget-factory-symbolic.symbolic.png
- dist_appsicon256_DATA = data/256x256/gtk3-widget-factory.png data/256x256/gtk3-widget-factory-symbolic.symbolic.png
- 
--update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
-+update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force
- 
- install-data-hook: install-update-icon-cache
- uninstall-hook: uninstall-update-icon-cache
-diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
-index 5a88a12..b51f3ac 100644
---- a/docs/reference/gtk/Makefile.am
-+++ b/docs/reference/gtk/Makefile.am
-@@ -504,7 +504,6 @@ EXTRA_DIST += version.xml.in gtk3.types.in
- 
- man_MANS = 				\
- 	gtk-query-immodules-3.0.1	\
--	gtk-update-icon-cache.1		\
- 	gtk-encode-symbolic-svg.1	\
- 	gtk-launch.1			\
- 	gtk3-demo.1			\
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 3b76b82..d4c5681 100644
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -1581,7 +1581,6 @@ endif
- #
- bin_PROGRAMS = \
- 	gtk-query-immodules-3.0	\
--	gtk-update-icon-cache \
- 	gtk-encode-symbolic-svg \
- 	gtk-builder-tool \
- 	gtk-query-settings \
-@@ -1594,9 +1593,6 @@ gtk_query_immodules_3_0_LDADD = 		\
- 	$(GMODULE_LIBS)				\
- 	$(GTK_DEP_LIBS)
- 
--gtk_update_icon_cache_SOURCES = updateiconcache.c
--gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
--
- gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c
- gtk_encode_symbolic_svg_LDADD =			\
- 	$(GDK_PIXBUF_LIBS)			\
-@@ -1621,46 +1617,6 @@ gtk_launch_LDADD =				\
- 	$(top_builddir)/gdk/libgdk-3.la		\
- 	$(GTK_DEP_LIBS)
- 
--if OS_WIN32
--
--# Workaround for UAC silliness: programs with "update" in their name
--# are believed to be installers and require elevated privileges to be
--# used... Embed a manifest file into executable to tell Windows that
--# gtk-update-icon-cache.exe doesn't require any special privileges.
--
--GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
--GTK_UPDATE_ICON_CACHE_RC = gtk-update-icon-cache.rc
--GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT = gtk-update-icon-cache_manifest.o
--
--$(GTK_UPDATE_ICON_CACHE_MANIFEST):
--	(echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' ; \
--	 echo '<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">' ; \
--	 echo '  <assemblyIdentity version="1.0.0.0"' ; \
--	 echo '     processorArchitecture="'$(EXE_MANIFEST_ARCHITECTURE)'"' ; \
--	 echo '     name="gtk-update-icon-cache.exe"' ; \
--	 echo '     type="win32"/>' ; \
--	 echo '  <!-- Identify the application security requirements. -->' ; \
--	 echo '  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">' ; \
--	 echo '    <security>' ; \
--	 echo '      <requestedPrivileges>' ; \
--	 echo '        <requestedExecutionLevel' ; \
--	 echo '          level="asInvoker"' ; \
--	 echo '          uiAccess="false"/>' ; \
--	 echo '        </requestedPrivileges>' ; \
--	 echo '       </security>' ; \
--	 echo '  </trustInfo>' ; \
--	 echo '</assembly>' ) >$@
--
--$(GTK_UPDATE_ICON_CACHE_RC):
--	(echo 'CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST '$(GTK_UPDATE_ICON_CACHE_MANIFEST)) >$@
--
--$(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT): $(GTK_UPDATE_ICON_CACHE_RC) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
--	$(WINDRES) --input $< --output $@ --output-format=coff
--
--gtk_update_icon_cache_LDADD += $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT)
--
--endif
--
- .PHONY: files
- 
- files:
--- 
-2.10.1
-
diff --git a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
index 3d5b08622f6d..839e7a1a6139 100644
--- a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
@@ -49,7 +49,7 @@ COMMON_DEPEND="
 		xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
 	)
 "
-# docbook-4.1.2 and xsl required for man pages
+# docbook-4.1.2 and xsl required for man pages
 # docbook-4.3 required for gtk-doc
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xsl-stylesheets
diff --git a/x11-libs/gtk+/gtk+-3.24.11.ebuild b/x11-libs/gtk+/gtk+-3.24.11.ebuild
index 718af42d9e93..8850b54760bd 100644
--- a/x11-libs/gtk+/gtk+-3.24.11.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild b/x11-libs/gtk+/gtk+-3.24.13.ebuild
index e3217afab7e0..fc1b2443d4e2 100644
--- a/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.13.ebuild
@@ -9,6 +9,7 @@ inherit flag-o-matic gnome2 multilib virtualx multilib-minimal
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="https://www.gtk.org/"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="3"
@@ -18,7 +19,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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
@@ -28,7 +29,8 @@ RESTRICT="test"
 # bug #????
 COMMON_DEPEND="
 	>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.53.4:2[${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}]
@@ -41,11 +43,11 @@ COMMON_DEPEND="
 		>=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-1.2[${MULTILIB_USEDEP}] )
+	cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] )
 	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
 	wayland? (
 		>=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.12
+		>=dev-libs/wayland-protocols-1.14
 		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
 		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
 	)
@@ -71,7 +73,8 @@ DEPEND="${COMMON_DEPEND}
 	>=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 )
+	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}]
 	X? ( x11-base/xorg-proto )
@@ -122,13 +125,11 @@ src_prepare() {
 		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
 	fi
 
-	# Add fallback to no glyph for GtkSwitch, so if no glyph for some reason is found, it at least doesn't mess things up completely
-	# gtk+-3.24.5 replaces these with CSS gadget icons, but we include this simpler version in revbump as a stable candidate without
-	# the Adwaita theme changes found in 3.24.5
-	eapply "${FILESDIR}"/${PV}-more-gtkswitch-fallback.patch
+	# Select patches from origin/gtk-3-24 on 2019-12-25
+	eapply "${WORKDIR}"/patches
 
 	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
-	eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch
+	eapply "${FILESDIR}"/${PN}-3.24.8-update-icon-cache.patch
 
 	# Fix broken autotools logic
 	eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
@@ -137,33 +138,46 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	# need libdir here to avoid a double slash in a path that libtool doesn't
-	# grok so well during install (// between $EPREFIX and usr ...)
-	# cloudprovider is not packaged in Gentoo
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(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) \
-		--disable-cloudproviders \
-		--disable-mir-backend \
-		--disable-papi \
-		--enable-man \
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+	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
@@ -186,8 +200,8 @@ multilib_src_install() {
 multilib_src_install_all() {
 	insinto /etc/gtk-3.0
 	doins "${FILESDIR}"/settings.ini
-	# Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
-	DOCS=( AUTHORS NEWS README )
+	# Skip README.{in,commits,win32} that would get installed by default
+	DOCS=( AUTHORS ChangeLog NEWS README )
 	einstalldocs
 }
 
diff --git a/x11-libs/libXpm/Manifest b/x11-libs/libXpm/Manifest
index edd78fc9b1a3..753297057834 100644
--- a/x11-libs/libXpm/Manifest
+++ b/x11-libs/libXpm/Manifest
@@ -1,5 +1,5 @@
 DIST libXpm-3.5.12.tar.bz2 430736 BLAKE2B 738838f37643e4e8ce489d34adf33d2459e7bcd7b1eafb21415cd44620c3d4eb18750381a80d1e2c9a2f44ccf00159a029df18164ea7a7834dfee8d104303783 SHA512 a5707d5f758d577414101b0723af334fc8ac223e5b9f869994765735e1cbd8dafed48ea2851ebc479fecaf84381bfd5fbef842ec971a487f7fa9e77d54d3a17e
 DIST libXpm-3.5.13.tar.bz2 463251 BLAKE2B eb8a390802f13ffdd8199e21f5f18d4d17141783d7259c6b558dbaddd2dce05f7cb27306dd5cb73e27d01cffa62f5e4808c143b72974dae443e958069e70cd17 SHA512 3b8f6e926272f39b1d95135c2274c00f5aaee1f9fb2ef79f71628df5edeb7ba20158819ef6a778101cc4092493a3b5b613c53634fdccadcc0fc85f0605e5e9a5
 EBUILD libXpm-3.5.12-r1.ebuild 909 BLAKE2B a0d4a798ade6ef57afda0b10910ef82429c4c0b33d4183901107830a64aa2c4e560931d719953a76ee608d7a7f060c846c2f1d034850b209f5c130120326bd78 SHA512 8c69439be41fe1dcf9ddaac7e7ab67e8d039e28d28dae97a65c3c3e33d07ae104a739fef50ccc603df51c1f7b4744c918e74e287e054356e4cd711a77e79b7f6
-EBUILD libXpm-3.5.13.ebuild 627 BLAKE2B bac3eb5c9b8bdd711f834bcba47be9ac5959434190b4078e4227606dfc3277d8ce51036deef6ab00081c040ebe9930d017a941e76f77330123c42af485e92c5e SHA512 f6e62776a4a04d2e27dc997d4672677c8774de4a9fa7112907d431b0bbb7bbb378e283f6ad097d3f887853223325c9bf8c19c3cffbfd6e9f7638cec8ec10eb46
+EBUILD libXpm-3.5.13.ebuild 618 BLAKE2B 9ca38dde45d221aa0b7ea0ed1d40e7fce61055898a538aa038c32d9107eb59e03f4b356fbd895ac3cb7d09b64ac42353ca088302f19a4945d294de7a59b09baa SHA512 e612674dc80a061cd179539b8975d7399bd9707d79c239e94707398278b4d272005f8627f1465416e5155ac62e5cd8e346b477961db0b3dfcea5cfcd4d74bbbf
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXpm/libXpm-3.5.13.ebuild b/x11-libs/libXpm/libXpm-3.5.13.ebuild
index 8d0022af7a2e..c8c5a92e65fd 100644
--- a/x11-libs/libXpm/libXpm-3.5.13.ebuild
+++ b/x11-libs/libXpm/libXpm-3.5.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xpm library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libclxclient/Manifest b/x11-libs/libclxclient/Manifest
new file mode 100644
index 000000000000..8d706261f9e8
--- /dev/null
+++ b/x11-libs/libclxclient/Manifest
@@ -0,0 +1,5 @@
+AUX libclxclient-3.9.2-Makefile.patch 1130 BLAKE2B a4d811b7bb964f2339d99838f3caa9088e4469bc8cd0ec18de1a4d0d87e53b1c62c797b239a3b1172a673c7d2f87c05f829fc72e4cb32c7d69a02bf31ddb64e6 SHA512 fe2d6bc14d5746786314792ddaaadac5f4d6e977cdf4e34ec58288e867c854082c93120e06002da17daf0c9709eb2074aa53603b2c99b8ad8bd9a1e9efe1eefd
+AUX libclxclient-3.9.2-enumip-include-fix.patch 310 BLAKE2B e0218f39b551978be1cf9318f21e53146c8e75826afd7e5f0cefcf43c434e3b64f3fb373386efd13b085b9b02bb631b5826b7441f9b73256097147dbb23c7b63 SHA512 3ff284c85635ea04b45f4640ab5a89a4d13b7933dc66bdb0310d5a4e1283b32d2d9078a9bf74f70f31636fb085d6ff8123d743d1750012cdf7549d8b1ad065e0
+DIST clxclient-3.9.2.tar.bz2 29991 BLAKE2B ffd56894e0bcf09e2b6e4c882830e3c3a3a88f3778fe6a2c8b2ceb9336f8ce9cf28193da8e8c86987475e95e3ea2c07319bd82e88ad820b39167cfba9eefd7c3 SHA512 38c2782e58df24c2dfcb936fc9cfe4d44016055fb1aa52ef8e789bf8ec327f45f2f7a91f18012e4b0c6f253f6f10329d6d1e9fc341017ace3f2b6fa050592049
+EBUILD libclxclient-3.9.2.ebuild 1077 BLAKE2B bfdf38cd8a5031996235e9510cbb530cda8fc01830e65ff266043bd338e891d147ca9df8e6c5537f98d2a68bdb8d05a76666ee50f62b83e1feead1c92b782191 SHA512 3ef66ccd0c78d398ee6e698abeee79bc03b84e2091f455118d8b296653eadff2a88f6e5ee6b56cdddb03980ab621cec2153889282a5c2e8d55555b5013d11b95
+MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/x11-libs/libclxclient/files/libclxclient-3.9.2-Makefile.patch b/x11-libs/libclxclient/files/libclxclient-3.9.2-Makefile.patch
new file mode 100644
index 000000000000..e79dce5764e8
--- /dev/null
+++ b/x11-libs/libclxclient/files/libclxclient-3.9.2-Makefile.patch
@@ -0,0 +1,35 @@
+diff --git a/source/Makefile b/source/Makefile
+index 177115f..c8fa0f5 100644
+--- a/source/Makefile
++++ b/source/Makefile
+@@ -24,16 +24,16 @@ SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86
+ PREFIX ?= /usr/local
+ INCDIR ?= $(PREFIX)/include
+ LIBDIR ?= $(PREFIX)/lib$(SUFFIX)
++PKGCONFIG = pkg-config
+ 
+ MAJVERS = 3
+ MINVERS = 9.2
+ VERSION = $(MAJVERS).$(MINVERS)
+ 
+ 
+-CPPFLAGS += $(shell pkgconf --cflags freetype2) 
++CPPFLAGS += $(shell ${PKGCONFIG} --cflags freetype2) 
+ CPPFLAGS += -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS $(PCONFCFL)
+-CXXFLAGS += -Wall -O2 -fPIC 
+-CXXFLAGS += -march=native
++CXXFLAGS += -Wall -fPIC 
+ LDLIBS +=
+ 
+ 
+@@ -55,8 +55,8 @@ install:	$(CLXCLIENT_MIN)
+ 	install -d $(DESTDIR)$(LIBDIR)
+ 	install -m 644 $(CLXCLIENT_H) $(DESTDIR)$(INCDIR)
+ 	install -m 755 $(CLXCLIENT_MIN) $(DESTDIR)$(LIBDIR)
+-	ldconfig
+-	ln -sf $(CLXCLIENT_MIN) $(DESTDIR)$(LIBDIR)/$(CLXCLIENT_SO)
++	ln -sf $(CLXCLIENT_MIN) $(DESTDIR)$(LIBDIR)/$(CLXCLIENT_MAJ)
++	ln -sf $(CLXCLIENT_MAJ) $(DESTDIR)$(LIBDIR)/$(CLXCLIENT_SO)
+ 
+ uninstall:
+ 	rm -rf $(DESTDIR)$(INCDIR)/$(CLXCLIENT_H)
diff --git a/x11-libs/libclxclient/files/libclxclient-3.9.2-enumip-include-fix.patch b/x11-libs/libclxclient/files/libclxclient-3.9.2-enumip-include-fix.patch
new file mode 100644
index 000000000000..710baac0db53
--- /dev/null
+++ b/x11-libs/libclxclient/files/libclxclient-3.9.2-enumip-include-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/source/enumip.cc b/source/enumip.cc
+index 0873da8..1cdac0d 100644
+--- a/source/enumip.cc
++++ b/source/enumip.cc
+@@ -19,7 +19,7 @@
+ // ---------------------------------------------------------------------------------
+ 
+ 
+-#include <clxclient.h>
++#include "clxclient.h"
+ #include <X11/keysym.h>
+ 
+ 
diff --git a/x11-libs/libclxclient/libclxclient-3.9.2.ebuild b/x11-libs/libclxclient/libclxclient-3.9.2.ebuild
new file mode 100644
index 000000000000..5baa5183f222
--- /dev/null
+++ b/x11-libs/libclxclient/libclxclient-3.9.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="C++ wrapper library around the X Window System API"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/index.html"
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${PV}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE=""
+
+CDEPEND="
+	dev-libs/libclthreads
+	media-libs/freetype:2
+	x11-libs/libX11
+	x11-libs/libXft
+"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+S="${WORKDIR}/clxclient-${PV}"
+
+DOCS=( AUTHORS )
+
+PATCHES=(
+	"${FILESDIR}/${P}-Makefile.patch"
+	"${FILESDIR}/${P}-enumip-include-fix.patch"
+)
+
+src_compile() {
+	tc-export CXX
+	local prefix="${EPREFIX}/usr"
+	cd "${S}/source"
+	emake INCDIR="${prefix}/include" LIBDIR="${prefix}/$(get_libdir)" PKGCONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	default
+
+	local prefix="${ED}/usr"
+	cd "${S}/source"
+	emake INCDIR="${prefix}/include" LIBDIR="${prefix}/$(get_libdir)" PKGCONFIG="$(tc-getPKG_CONFIG)" install
+}
diff --git a/x11-libs/libclxclient/metadata.xml b/x11-libs/libclxclient/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/x11-libs/libclxclient/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libfakekey/Manifest b/x11-libs/libfakekey/Manifest
index 0101417a423c..8230c4b04062 100644
--- a/x11-libs/libfakekey/Manifest
+++ b/x11-libs/libfakekey/Manifest
@@ -1,7 +1,4 @@
-AUX libfakekey-0.1-ac.patch 746 BLAKE2B 01bcc6cabd6f138eaeb6fba8452a3c7348e1ad7a6e91b6676bf8d7a29a05004af4b295d134072697bb6d34370f9a3cfffa1358c774f785a4c05652feaa06412d SHA512 b1cabad39d87d8df492f48b2afff78e182e64167d5253a40abf74ab786c8598bb1ee6e24ee62f394c787e08e5f7740e23864ccc82624efa9d2a533b9a37877cf
 AUX libfakekey-0.3-ac.patch 764 BLAKE2B 733cdb11da016a2d3b9e196943d6c0a948404ed15de0684d8bf7bba28d700a5cc83a3cb0ed5b82ca95ed2d7c531136362f0373c87bab3c979a33ce8c2f613e64 SHA512 8cfe2a3185580e26c5d76d6b392003b96b73a1aabb15255b1aab54a777b3759e496d4c0323b18ee2a67a5537e68388b9c67f6d885bd791f62b42b39e37fb635c
-DIST libfakekey-0.1.tar.bz2 203504 BLAKE2B f3e51a1ff38dd95238a1035617045f728177c9dca96d760dfe3c4485511b500944e6f64aeb5acb3e65db3badc4c189ae25ea50f42f58a927f3ec1899c4778751 SHA512 1fda0548cf14657083a6602f8d6c08efae8cae2236de7ed17fc4058765156c6bb923956e3c7fd75f2db586399f1d8a3320ab5bbed71cc5a8b0d146590a14a808
 DIST libfakekey-0.3.tar.bz2 9672 BLAKE2B 1cd86581148e218879b14ff52fb085fd20248a475ccf00a08918d64db811b21bbba3632e799d798077a197298da4d976be3180c060a6016c396428519d1aaef2 SHA512 b0502dbb01839009de7120f8ca939c839850e7c3c88678b52d6df9f4205cbec20769cedd61c9307e8307f6bf789eee25b20d4fe20c25e7285318f5ea1334555a
-EBUILD libfakekey-0.1-r3.ebuild 1144 BLAKE2B c917446ab90d8a19ddc565ff85d0f02c864dab602c7e68e0a121953f238f86a83525dbdcbf3d991fe8dfb4d01ebd97b15245e3fef856d625865a5ff282d5d076 SHA512 bc35111648791927ef1923a65780abccf84a25db23aa8d0004a340b90fbbd2362d3fc8390d188b9119cf76f854e4bc7c4c0f0a3364f383434e887b997ca4b888
-EBUILD libfakekey-0.3.ebuild 1151 BLAKE2B 7dece2bc252046d6fa46de727b8da01b02c073c47a2c39322fde1c2acbe64150d95e60b1590d8f5a9ebc4d08bbfab89bbe1fa4365143134b983579fbb281bbe2 SHA512 6a1e925fc595a60c5d6b43474bbd97aa466d38713b4b3adee3f5ac53c20b15f02713739448839bb67456ca2c01d2d71710f47d58d0b61728e452452c085e6643
+EBUILD libfakekey-0.3.ebuild 1148 BLAKE2B 8fa5ba23bda2f51379c930255a074b8e36f1c94cea00485b542109c5d0f8b7c1958c078a94fdfe71ba5273607ed43f084ee9be1d6bd5a01ccb3f6340b6d0e356 SHA512 5c82621b0c0386949bf91aa7f39a12feef9eafbdebcb825305270af7f9c870521f016f26b0d02aae851d857d74320863e7e22d9002ce51f9b9c022fbb29f9066
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/x11-libs/libfakekey/files/libfakekey-0.1-ac.patch b/x11-libs/libfakekey/files/libfakekey-0.1-ac.patch
deleted file mode 100644
index 7158ad220efd..000000000000
--- a/x11-libs/libfakekey/files/libfakekey-0.1-ac.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/configure.ac	2011-05-22 14:59:45.801746472 +0100
-+++ b/configure.ac	2011-05-22 15:02:59.437159981 +0100
-@@ -14,16 +14,14 @@ AC_HEADER_STDC
- 
- dnl ------ libtool versioning -----------------------------------------------
- 
--LT_CURRENT=0
--LT_REVISION=1
--AC_SUBST(LT_CURRENT)
--AC_SUBST(LT_REVISION)
--LT_AGE=0
-+m4_define(LT_CURRENT, 0)
-+m4_define(LT_REVISION, 1)
-+m4_define(LT_AGE, 0)
- 
--LT_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
-+LT_VERSION_INFO="LT_CURRENT():LT_REVISION():LT_AGE()"
- AC_SUBST(LT_VERSION_INFO)
- 
--LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
-+LT_CURRENT_MINUS_AGE="m4_eval(LT_CURRENT() - LT_AGE())"
- AC_SUBST(LT_CURRENT_MINUS_AGE)
- 
- dnl ------ Check for X Stuff ------------------------------------------------
diff --git a/x11-libs/libfakekey/libfakekey-0.1-r3.ebuild b/x11-libs/libfakekey/libfakekey-0.1-r3.ebuild
deleted file mode 100644
index d423f654cc18..000000000000
--- a/x11-libs/libfakekey/libfakekey-0.1-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Helper library for the x11-misc/matchbox-keyboard package"
-HOMEPAGE="https://www.yoctoproject.org/tools-resources/projects/matchbox"
-SRC_URI="http://downloads.yoctoproject.org/releases/matchbox/${PN}/${PV}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86"
-IUSE="debug doc"
-
-RDEPEND="x11-libs/libXtst"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	# Allow configure to use libtool-2
-	"${FILESDIR}/${P}-ac.patch"
-)
-
-src_prepare() {
-	default
-
-	# Fix underlinking bug #367595
-	sed -i -e 's/^fakekey_test_LDADD=/fakekey_test_LDADD=-lX11 /' \
-		tests/Makefile.am || die 'Cannot sed Makefile.am'
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	# --with/without-x is ignored by configure script and X is used.
-	econf --with-x \
-		$(use_enable debug) \
-		$(use_enable doc doxygen-docs)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use doc && local HTML_DOCS=( doc/html/. )
-	einstalldocs
-}
diff --git a/x11-libs/libfakekey/libfakekey-0.3.ebuild b/x11-libs/libfakekey/libfakekey-0.3.ebuild
index 4cee737959b9..02a258f0146f 100644
--- a/x11-libs/libfakekey/libfakekey-0.3.ebuild
+++ b/x11-libs/libfakekey/libfakekey-0.3.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 273b2405c1d7..909431747639 100644
--- a/x11-libs/libfm-qt/Manifest
+++ b/x11-libs/libfm-qt/Manifest
@@ -1,4 +1,4 @@
 AUX libfm-qt-0.14.1-phantom-desktop-files.patch 4871 BLAKE2B 9466f517953a8733f72296bda5c8b0081828fceda505f1603b7d5db193fb7bf72b6ce7c3c007877558b8f1a4295fa73a496e0b279790126a5859bdbd246b07c4 SHA512 19b3803704dba01da16725f1cc20b4cbb6b50210fcc7f0aea397dd8061cff55f9a0e57838b48f59649d6b8e4cc53dfb992b6160687cfa0b8f46b2dda6d431021
 DIST libfm-qt-0.14.1.tar.xz 328192 BLAKE2B ff229256d3232eabc046da1fed3e4b4e51a09c3d1f2815fa726bad62f3fc53111e5d7f003e82e383dde4fe910584644e66613cbc1803ad0e11f7b6bdb2e30cfe SHA512 a265f6831a077ccb78a994828e6c69a22f2f6432b1f6ed6f404af41f013112870f7aee98067f2c466bec6cdfea040c10c7ce7e0f0ed977e5d266ec38e543d2a7
-EBUILD libfm-qt-0.14.1-r2.ebuild 891 BLAKE2B 76bb0abd166f6a8270092c25b77255d01408ebf901eca302e997a11f45b6dd001dc6c79ef08473b8a54a73b943f48d285ae314a70e943eeca2f1f6d41f781b0d SHA512 26097a0b2e5d18599c46938357b699e8ce0a86e70858989c31b9c287a14407566f680a3806f8029e65e90e8d0c733a56a1c698d753b603a8ff63c1de8b628aeb
+EBUILD libfm-qt-0.14.1-r2.ebuild 885 BLAKE2B 475351c6b235118b71cd266558050cd69b6d663bb25480f600b97870bb19beedef74fd67f3fc043be02fcf13e215cf9807269ca6433d330d00a00a3ab2c55eb0 SHA512 8cc1751a0e230452ab891feea05bbf8ab30538019d8797f8a6f826a0066042372c01c96ffcc4d87e6ce6e4712ecf931fbf2c9f8041696d03892d06c0338e01b9
 MISC metadata.xml 314 BLAKE2B a40b71c62066cf524406556206999869edecf714d898236a8f277132e8b3752fec298cf9407e9010a1037bc757fafcbae32abec9b52a68492d414acd529c176a SHA512 edaddf48fd7cef23284164b7046e0e6b5ce1442847d3353ee8175177f00b06973d6588811b166dacbd7a1182942128792858a43e029d6aa874c1b8625b5e78f3
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
index 100cff14a7f7..0339cf6dda21 100644
--- a/x11-libs/libfm-qt/libfm-qt-0.14.1-r2.ebuild
+++ b/x11-libs/libfm-qt/libfm-qt-0.14.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Qt port of libfm, a library providing components to build desktop file managers"
 HOMEPAGE="https://lxqt.org/"
diff --git a/x11-libs/libnotify/Manifest b/x11-libs/libnotify/Manifest
index 5b9f8b1b9768..84f3dc62d9e1 100644
--- a/x11-libs/libnotify/Manifest
+++ b/x11-libs/libnotify/Manifest
@@ -1,5 +1,3 @@
-DIST libnotify-0.7.7.tar.xz 285356 BLAKE2B ace0eedb1beecfbb89726960e441821d64f5ac456dfc6294b051479078726aed6fbacbd1e8cb17578933adbc4c94711b0d69a292778ba4bce096552a5197722b SHA512 133874114407bf12267ef609f5941657181760bc7cf115c5973b1810cb72bf55072b621c143e32be1e7e8b49f244851925d14bc3f9f26457747b8a8695ee9954
 DIST libnotify-0.7.8.tar.xz 108436 BLAKE2B 0a73eabe58faca55e16774cda6f649ab3187bd73a1f87b538d5098f390571a6a34078883dbd2447731d6e4cae315d8286e9e8acc06e85590c8b05a693a83e7f7 SHA512 9973d7a1af5dd7cfbaa0d0d2c9e72a40df9d814967fde47e95763a69690cc4ed32ecf713d75f91f3dff99a693eff9dab963be124e0530ebf231d517a44e75e94
-EBUILD libnotify-0.7.7-r1.ebuild 1517 BLAKE2B 65d9fe4dd605898d9eb768321ad49fac46e4587d321726149f7ca85a045a6d65e2456e309396bc37d71c7b15d809cf2c8535dd511660584265e720a309eae5ca SHA512 77a7fa2111f9ca0f266b92a35767898dc51bc6bcdad8e1d3d3ddcb9b7e5b62fbb3943d2c020085434f565a2f44277ec56a8503dbe150482b443ffd6963c2818d
-EBUILD libnotify-0.7.8.ebuild 1380 BLAKE2B a25cb43f74a9bb66ee98058b68960e909bd9bb26ba96146d827e7a641ea79cfccbd6c8ede205e8dc8abf635d757bf9c86f16c8966605c7a972b9b66735b7212b SHA512 91e5835186b42c97672437e26c989fa32d0f38a882bb1b2c4183da47d62197cb1fa036a9162a7e5e6b425a669593a32aa1df54314f1af16b6550f5160e02dbc8
+EBUILD libnotify-0.7.8.ebuild 1489 BLAKE2B a2d21af4c10d440853f3de9bfc700caaa6f0d1319bf64286b36b3857e4360a81cd669d3aa01c910c8f4e4516df06d27a22f2d5d6a029d87fb22e613fcd3c4676 SHA512 6d436b4b245892380cd003f922575c4077b4c9d25ddafb0755fc2cd2a3da1d62f808d0527ec4f6452f03c9631ea385bcceaad09ceccb3402a901adb322681843
 MISC metadata.xml 276 BLAKE2B 889856a4e8b234e03eb27d32a4bce748a561f98ca0faa36de124e58e3832d804d1492f59db1154c4ec0e2e0e46c7d9cf38d9911ee83dd0863699581000610f31 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59
diff --git a/x11-libs/libnotify/libnotify-0.7.7-r1.ebuild b/x11-libs/libnotify/libnotify-0.7.7-r1.ebuild
deleted file mode 100644
index e82fecf43792..000000000000
--- a/x11-libs/libnotify/libnotify-0.7.7-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org multilib-minimal xdg-utils
-
-DESCRIPTION="A library for sending desktop notifications"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libnotify"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="+introspection test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-eselect/eselect-notify-send
-	>=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}]
-	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/gobject-introspection-common-1.32
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.14
-	virtual/pkgconfig
-	test? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-"
-PDEPEND="virtual/notification-daemon"
-
-src_prepare() {
-	default
-	xdg_environment_reset
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf \
-		--disable-gtk-doc \
-		--disable-static \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable test tests)
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/reference/html docs/reference/html || die
-	fi
-}
-
-multilib_src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	mv "${ED}"/usr/bin/{,libnotify-}notify-send || die #379941
-}
-
-pkg_postinst() {
-	eselect notify-send update ifunset
-}
-
-pkg_postrm() {
-	eselect notify-send update ifunset
-}
diff --git a/x11-libs/libnotify/libnotify-0.7.8.ebuild b/x11-libs/libnotify/libnotify-0.7.8.ebuild
index 1c11ad27b1e5..7f8ce624abc2 100644
--- a/x11-libs/libnotify/libnotify-0.7.8.ebuild
+++ b/x11-libs/libnotify/libnotify-0.7.8.ebuild
@@ -11,20 +11,22 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libnotify"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="+introspection test"
+IUSE="gtk-doc +introspection test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-eselect/eselect-notify-send
 	>=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}]
 	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
 	>=dev-libs/gobject-introspection-common-1.32
 	dev-util/glib-utils
 	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2 )
 	test? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
 "
 PDEPEND="virtual/notification-daemon"
@@ -38,7 +40,7 @@ multilib_src_configure() {
 	local emesonargs=(
 		-Dtests="$(usex test true false)"
 		-Dintrospection="$(multilib_native_usex introspection enabled disabled)"
-		-Dgtk_doc=false
+		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
 		-Ddocbook_docs=disabled
 	)
 	meson_src_configure
diff --git a/x11-libs/libvdpau/Manifest b/x11-libs/libvdpau/Manifest
index 151b84f530c4..75a6ca11c9d7 100644
--- a/x11-libs/libvdpau/Manifest
+++ b/x11-libs/libvdpau/Manifest
@@ -1,6 +1,6 @@
 DIST libvdpau-1.3.tar.bz2 139009 BLAKE2B d535c7723638339d4e67002721e9d0d8aae89a6001fccc41d9c3b21d52f0fae9237705bca448fbf1c244dd7eeb71f5fc74ed81f05c975bed798fce503a571c90 SHA512 c06c23062816e8b207d38d9d53df43a1b193bb9836b48bd6d79a63d76522e87d383c446285b9877fe9c99faa0d290da8a49ccbb58eefa138cc38d0929a8e1330
 DIST libvdpau-libvdpau-1.2.tar.bz2 140017 BLAKE2B 0420961c48fcd5c92e7e98f84f629946f6234c28781bd7d8c9eb4aa2ab11b76e89e05f50cc423a2935b3376ff3b919ad9e6ef1710ff3549369567f298b5efa50 SHA512 f76c2283a1bd2e854aa6b86a564f7f08c1ff7da34e971c7c39f36e77fbd51fe0440d1ba01bff0b80be6c0326817ee4e6bff719dbe8dbf5e1ec7a94fad5016b7e
 EBUILD libvdpau-1.2.ebuild 1119 BLAKE2B 85f160e0ea734453d5fc2f5edc0e50d9417e49c022b7d600f6cf9dbbd2363aeec29a0f93c4822a8d9fff85bfe46378e12d2a1df88dd0dca3abab8cba9f0bbd70 SHA512 c1decab86618c605a93820d22d2a91118b56a53d9e709458d04bf07607fdf2ec4057e9ebe5372391bd2f5876f2d8726f2dea0e8111c6167bfdbd24ec005aa622
-EBUILD libvdpau-1.3.ebuild 1162 BLAKE2B 62f0936564742325ecfb8fb2b0c3fb0183096f2bd57677871ea40a09dd0dc51c17ab76070a3cedece1c8f48a11fa24c248da595b10276fcdaf69200c83a36988 SHA512 e08715578018052c4d14a5dfec2ab4fe689aa2c69a89c1844681c368302ae1d60c8b6df1742eeceb56f3cd78303de5c4f497b0a23103df05822e89de00ac440e
+EBUILD libvdpau-1.3.ebuild 1160 BLAKE2B f8b155db62eee4a49ceaf03d399052673ad39cd932fefa9ae77f1f00113a7c64eb5edf3adc467c35f7b83e7dfc19ed4224248b9fed1f7993c0368f555e856137 SHA512 b399f7ed6b67a88cd372921c34bce9e0f21b2e7d5b279e84275ea2a03f44994659fc8861660a44fe4c98cd4f5f3365815abefa892f4b583b6fd84f01565c5e09
 EBUILD libvdpau-99999.ebuild 1122 BLAKE2B b2e74c53c093e22e58257b67b91b59f51e98cc3715f68c67958a57e366df36bb660436e3bb7abdcb0fe11490f60d6a0c5bc8b2658c58d3979125385f6d7f7276 SHA512 8da6e8637191f4b8c198498e4f81fb4e7a0f5fa8108c16edf3ae89d52ee7ab360a2c2e505b3b5341076e7cfe18f1ad1093c251cad96f456ad81f134fdd940851
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/x11-libs/libvdpau/libvdpau-1.3.ebuild b/x11-libs/libvdpau/libvdpau-1.3.ebuild
index 260b116d8271..09b8c0dd0f02 100644
--- a/x11-libs/libvdpau/libvdpau-1.3.ebuild
+++ b/x11-libs/libvdpau/libvdpau-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.freedesktop.org/vdpau/${PN}/-/archive/${PV}/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~x86"
+KEYWORDS="~alpha amd64 ~arm64 x86"
 IUSE="doc dri"
 
 RDEPEND="
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 0ce47ccb2bc8..d3f31d670583 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,3 +1,3 @@
 DIST libxcb-1.13.1.tar.bz2 506778 BLAKE2B eca685a21d40f664b611c0c8da845e3464126b101320a86db27ee4d87b85ac0ad1a41950281b7f0ecca06883c591571d059a913591b0281890b339f279b7af93 SHA512 763edff9572623674f75a858adc57b5c09591f508cc5d5093218e7bb047abdbe0a0108bd465419a8bf15c7dcdc85efdd2d4d9fd56605c41475d15dc992640c23
-EBUILD libxcb-1.13.1.ebuild 1462 BLAKE2B 9f07746942a04bc5c2b68ac7f667ab29f444288731daf45bede6895195456a2817c309f4cdc1eb5c93b48884d49957d16b98403979b46ce57f2d6dfe4b87c70d SHA512 c246038a3ab99472316b1e47a4af3df13c03ac5831fc93e21989b6de1436b3dae6124a20d53eae89ecb0abb69473ed368abde35fa74370044baa0744eb8a1ee1
+EBUILD libxcb-1.13.1.ebuild 1458 BLAKE2B 1bf9a8c6ad461d86ee9f7a49b22ec238bef7ace3eb6a0798eb6b5ed1cbaf5c017b3b4d034f473f3ac87c20473ea07e8d58b80177bb0eba293980bcf46428b5ea SHA512 3119417a2b3664b6a6f70710a551bd7fc16b3446f7c644fbee477bee3d7c5a482fc2b5b47809616a34d64de9ccd4194ef7c26d745fe649603d890165758801a9
 MISC metadata.xml 400 BLAKE2B e4de0bffe9b79f7c4a715ade0014f14d85ae7389a3fa523572b4abed6ed6849250902ea479e9aa90745f104c9020d671742d0aec8bffa539e20f0bd7b48f2e64 SHA512 f9688e8ee148768a072e6da7f72985a7a3971a445117bbfa8448f2337ce1b601296501eda1da531c6bcb50a0d3106376e8cda0b98ef10219882c2f66fe02f40f
diff --git a/x11-libs/libxcb/libxcb-1.13.1.ebuild b/x11-libs/libxcb/libxcb-1.13.1.ebuild
index 1eafafb3fd8c..a00b275a4b05 100644
--- a/x11-libs/libxcb/libxcb-1.13.1.ebuild
+++ b/x11-libs/libxcb/libxcb-1.13.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 PYTHON_REQ_USE=xml
 
 XORG_DOC=doc
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index 42b9d655b03d..5dd8478dc7d5 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -1,5 +1,5 @@
 AUX Mwm.defaults 536 BLAKE2B 675abf74eaa86c9b8f1f9730c3216d06239a6e67cd3657245b4c4095a5e1fc552a0c9c59cd72d3537de71e7f26d10bca87c7d34723e5514890c7a044aa2674b2 SHA512 ef121001e0a124fdea20a2b573ad79a68f23bf4f73c33097e8acc62fa00fd28311d999893b37514be33bceee1d2a22a5b03a02b75b2c02049131c8fedb3e02ab
-DIST motif-2.3.6-patches-2.tar.xz 1600 BLAKE2B 03ef74773c581d09ad89f35f26e9d01ed01ec8b40344cd4d6aba106de80bfe0ce69d65551aafb4c53daf61cc31d1e703c9762c2b4a60729c73783b649a00e6c3 SHA512 09c857f7f2ec0d48660e6fff8afddec99416084e2b80a8793401e7641a3669fbe4eb10811e60f3d9dc106c828a87324dfdd27cc91a62bf3dedbd9154542c7619
+DIST motif-2.3.8-patches-1.tar.xz 1896 BLAKE2B 7234860dadac55362c7f1804133a660da1ab468fb6c0f0c71cad76b956a5f0b1e58874496a6721f49bd6413e916014807e946112b48b9a22272db5e4d97d43d9 SHA512 22e5d8c590d2c1c57fc639cb46d16984dc5fbafb3b68fd647d180d6299a06f884a8ed69e2180da8153bb0f68821eb0031f93e9b9a3128ba93535fd7fb92b402b
 DIST motif-2.3.8.tar.gz 5704328 BLAKE2B 3755b7f46e50240e1e9e7046aa439fa89872e54ae5d03860383f509b6d0f09edf85bd7d92ea4d37925efd2e44401028aa2752d940c42d9cccb652b2bd1d85459 SHA512 1ab8e8eece25ef97e948592b5fa3e19d98e932695290a18b7a8e90f1aa2766bc4f082bdbc3999dff5660e684821178a149040f76bb477163e53ca06474d02b55
-EBUILD motif-2.3.8-r1.ebuild 3362 BLAKE2B 993fdeacb0b1523b483ac3c2f714ab6db77c534f64c7d09585f8d7d6486d64cd59b8daae87c9d27212d6e323433ad5cff6e0905cd4606934cff66ecad5b99c9e SHA512 e1d95f503e5d1159d1d4e90a52152da6fb0f3679553d6d05a6b5ae790d0709ca5a261522d93ef233eca48915e28143c0d323ce14ac648b7287748640c62b633f
+EBUILD motif-2.3.8-r1.ebuild 3110 BLAKE2B c32256b98891f61dabad7115f9e45178f81c90808646f92f68a9d94b111dfc2ef52f92f3bc47a074a3590fd18fc9b68a1cad04e351a06153175d65876a48493e SHA512 51717584babdf448d3e9458307d6d2cdf3d40375689e012a45f3b18d858611913af7b804034a3caa9bace5429b179a867883434257d0ab607595a6ed68b97860
 MISC metadata.xml 394 BLAKE2B 8302e867353fbe09f017b4d54ec2ad043f8872643914ef29002611b41f4f1c0639959da9c7e06b4317c8fec4d0a5fba72cc3927991054a65a1d42a1f4fb9da17 SHA512 5a2fd548df5d694acb6c1bf1d51c8e80adb49915d4328879478a6b7c5a76cfbf02f31e58103967bab2c4afd4873752ffafd9f8f0839f68d09868d7f501542d3c
diff --git a/x11-libs/motif/motif-2.3.8-r1.ebuild b/x11-libs/motif/motif-2.3.8-r1.ebuild
index 6f17e1ab2e9f..956da5293b19 100644
--- a/x11-libs/motif/motif-2.3.8-r1.ebuild
+++ b/x11-libs/motif/motif-2.3.8-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="The Motif user interface component toolkit"
 HOMEPAGE="https://sourceforge.net/projects/motif/
 	https://motif.ics.com/"
 SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.tar.gz
-	https://dev.gentoo.org/~ulm/distfiles/${PN}-2.3.6-patches-2.tar.xz"
+	https://dev.gentoo.org/~ulm/distfiles/${P}-patches-1.tar.xz"
 
 LICENSE="LGPL-2.1+ MIT"
 SLOT="0"
@@ -38,12 +38,6 @@ src_prepare() {
 	eapply ../patch
 	eapply_user
 
-	# disable compilation of demo binaries
-	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
-
-	# add X.Org vendor string to aliases for virtual bindings
-	echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias
-
 	AT_M4DIR=. eautoreconf
 
 	# get around some LANG problems in make (#15119)
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index a8c8aa933040..450b3029f488 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,7 +1,5 @@
 DIST QScintilla-2.11.3.tar.gz 3006383 BLAKE2B 6238aaff44d6136a64e8c38e38c4886357eb72aa4067f54eda1e876040c41ebce8577e244b81a062e9020c4d142439f5612ca88055d0ba87172ff5b8893938d7 SHA512 83406ef2f425c6288fcac52b01417853186ba860e33e14b236801271e034c327cbb00817cb7247e98bafc1844aeff9f24ec4878ac8ec4bd52d0d2d9778f6b884
-DIST QScintilla_gpl-2.10.8.tar.gz 2736054 BLAKE2B 4bc7a2bc1974f8e10a96b7716a8e35d4854e9eeb8040734f99b796bddd9679ee2539f6517743689f9d7deff9ce523cdbb2f77ccd65eaadfc947dcc7a1337d918 SHA512 c0a216737dbda6bc390225196b37a43e4884c9cd67e6e81fc1b1b952683fe88dbfe7caf3c66d94a378f37502e1f08cbdf788426248e73f5f66ec65982b7652b5
-DIST QScintilla_gpl-2.11.1.tar.gz 2932060 BLAKE2B 9f2f9fd89667cc04c95d0a36e4a615dcf3c1c11a5446e19a43104513894b76bc7478f2aed7e8c94ce413f940327deb09e51507bee1fa35c79c176e01e6b74767 SHA512 40b600aa8eec17bc99491a08aeaee72bf498a66f0257d310a8df2667de82805715b9c859885c092acfb03ba8f69433a6517d0d4bb324bf99bd9db461172c08d5
-EBUILD qscintilla-2.10.8.ebuild 1796 BLAKE2B d32e1be6bd53bbd8b893c4dbd755350430907213b38b95462ce26742affda2b3c93588189b636cfe6df1b3854e7b825555b5993fe4a766135ee802c239b8d906 SHA512 7f5906dc73b378fc93bbbd97394e269d55f335f7404b05e8d04f3048084637710a6ab6d4c4e4a7e121834b1f966bff07bf53df13400735af301d8026c63d3f61
-EBUILD qscintilla-2.11.1.ebuild 1961 BLAKE2B 4c43f10d33d3019b2500640314b0c02fe88f112a4e76d40334a7476a4b44c75da6b8b747e82a79e10fb1406cc32c89a0f6589288e122fe1761f9c24aea7476a1 SHA512 0fcc9259f8f3d8f391faa6180b7f440132c2e59814b22f3b8c80ceeaccd6e2187d353a29b36db21189d48d22d17bfdd77031365da2d9217e21f6a1bb9fdeac13
-EBUILD qscintilla-2.11.3.ebuild 1957 BLAKE2B 84a7752f28ce961ab39d41f5c2c63c6c040bb78ce4789075305496024d5fd0878689b095af9d01503998bc8c9c070750827314b6c1ce1abdb0ddc4c9235f2702 SHA512 d139200a4e02325878bded6c8f6858a47ed0444a1a6044992e783e79034b3896fe2aa68726f917faddf83dc112ae6b1764eac305394aea55efa7c6d069150078
+DIST QScintilla-2.11.4.tar.gz 3007719 BLAKE2B b0f88a15a3636a0056d3bdac6e5d5bb05a065461c7de7fe0d5ad1740e87ca78a47bc1fd1af90a8751b553e8e326c830088a4cb38c9ebcad6be8bf9ebdb49bad0 SHA512 90fc2427121ca9ae55e34cf636460099bbdadd844318d9ef05f86790a36e25fb64528264bb7bb99e46b7add96378eff0cc69bb692940c6a1bddfadf86a9abdbd
+EBUILD qscintilla-2.11.3.ebuild 1954 BLAKE2B 249d3628025e2ecd7c026290d337a1eefa30efb5700612b76189adc35a346593814b6c0d581cf7d31746d5ed631680440185dff5ab0e3e91810a1aa910ac027e SHA512 3df250303393e3b9cd8408cb47fffd83c7063e7b0f4961eab6ed24f45c2a9dc0cd4d19016d850e048c209d90cd944b74d7be7ac073bd51c268d85e1b844d3517
+EBUILD qscintilla-2.11.4.ebuild 1957 BLAKE2B 84a7752f28ce961ab39d41f5c2c63c6c040bb78ce4789075305496024d5fd0878689b095af9d01503998bc8c9c070750827314b6c1ce1abdb0ddc4c9235f2702 SHA512 d139200a4e02325878bded6c8f6858a47ed0444a1a6044992e783e79034b3896fe2aa68726f917faddf83dc112ae6b1764eac305394aea55efa7c6d069150078
 MISC metadata.xml 705 BLAKE2B c0c287bbd6ea54929cae6ebc67434bed9fb068a3f560a870412e6182e0da5543abcaf0c38aa3c84e4597cbdcbc4be09775be679d6c83b52a8d6f10166fdb6c53 SHA512 39849b3d5febe51eb9dcad9333ca64ee7cc81c48fa411b167e3398a03a2d4f75d5380bf4650e2e625952e0b3d842242859f487136d25cea768dcf128f35f490e
diff --git a/x11-libs/qscintilla/qscintilla-2.10.8.ebuild b/x11-libs/qscintilla/qscintilla-2.10.8.ebuild
deleted file mode 100644
index ee5c0e806255..000000000000
--- a/x11-libs/qscintilla/qscintilla-2.10.8.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic qmake-utils
-
-MY_P=QScintilla_gpl-${PV/_pre/.dev}
-
-DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
-SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/13"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
-IUSE="designer doc"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	designer? ( dev-qt/designer:5 )
-"
-RDEPEND="${DEPEND}"
-
-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/qscintilla/qscintilla-2.11.3.ebuild b/x11-libs/qscintilla/qscintilla-2.11.3.ebuild
index 9c5354a9b46e..f6b4a37b4593 100644
--- a/x11-libs/qscintilla/qscintilla-2.11.3.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.11.3.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
 IUSE="designer doc"
 
 RDEPEND="
diff --git a/x11-libs/qscintilla/qscintilla-2.11.1.ebuild b/x11-libs/qscintilla/qscintilla-2.11.4.ebuild
index ae3d709bc0df..9c5354a9b46e 100644
--- a/x11-libs/qscintilla/qscintilla-2.11.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.11.4.ebuild
@@ -9,7 +9,7 @@ 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}_gpl-${PV/_pre/.dev}
+MY_P=${MY_PN}-${PV/_pre/.dev}
 if [[ ${PV} == *_pre* ]]; then
 	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
 else
diff --git a/x11-libs/qtermwidget/Manifest b/x11-libs/qtermwidget/Manifest
index d4b99a1a1552..1e82554a8ddc 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.9.0.tar.xz 166976 BLAKE2B 5f3f56168e21dbf9a5039784fbb42682b5422fc919c3f30c4240acdff23b57dd7f850eb37bba96a50ae18f9b2594dd3ccdde173d3cf002e39611f67085cc9e0c SHA512 fc7286dc3494bd1ccdd95fae3cee7cc8dd39b51eab58e697d939d5fb85c930545d79b984769815708852335e460ad063b684291b200e1e7f90c13195ea5e66dc
-EBUILD qtermwidget-0.14.1.ebuild 651 BLAKE2B 1fbee7fc1e38c8ab0fd87d65f97acc0aeece53b3e58fb86ad2526caa0e6b3e36ac85b03311cf0a979ede23136119665abaef7aa213fcfb77507411be34e0880c SHA512 b8205f0a2f32c1c329a615b9cd298ec25cc3e6816adf4be93a46d0f2e6ca711fea60d21383ce49d0e037c55a1cc782d5761f448da0874cc99dc7c57250997e9e
+EBUILD qtermwidget-0.14.1.ebuild 645 BLAKE2B 4c934f6c8e940edf3e675fc570ba55b6ee060277b717261534c39133e375b4fb0047442bf9b66b90233ad278ed3ebd5fed5047a44cfd39fe53039703204d3ec6 SHA512 11ff64843599e0b37c4b95770ad90df62fcf7818ab9057bc892bdccbef5e7bf3cf898582807b4ff88d774af31f83a67f6e0a8ca98a263c94462cacf719e82235
 EBUILD qtermwidget-0.9.0.ebuild 726 BLAKE2B 96165db397eba5e17a6533539c4aa869a8d633cc77ce3d0c3e726c4372b3f4cd065316a8e3d39fdcca121c4d505f2aca92baf3c1e0c82012d467bf8d42e35f8b SHA512 b4e10cfb5c5fce50c63256cddc22f6b33de0227884c01d8af21a47053d3ebd434fbf57f5f10bd40af60f2aa1eca7ddb01257adf09c3162280dd77342c416c097
-EBUILD qtermwidget-9999.ebuild 623 BLAKE2B f387d0f3a47afac376cd5661718a61155b0943aa57776d286e279f629151748cd268ed87a75ddfca4c063d33c614c3293a2660b11b1bc812881d2fad7606bd87 SHA512 d335773a0d9aed1322a68bcf7bb0373013e6a49021d406212595c60aaec39244945e31727354c5997a448dfa734cf7470b878aacad22eb21bf074bfe4fb71856
+EBUILD qtermwidget-9999.ebuild 617 BLAKE2B dd22689dbc1e91d9dde06fb37b67910acd174389b1f6e720cd264324eba92d0759057ffb7e91ba35c61aae008048d148279adfcbc3d9a77b6da08a2fdc0cd10e SHA512 866ff9f4d5801b14347b107649295018106133e3d4c0f462bafbcc2a2b205109cb54c2060e339f21adb25db537694bfb75e4216efe118e8bdbbe860ae1213511
 MISC metadata.xml 602 BLAKE2B fb54623b5c5e38a3eda61f4bc5f116c6da5f7f58dff1a65b2b43b3b4c5f8596ec4fbf4fb93e1705b4d97a5231fe75d23aa1705308523ef125ea81933ed3cad72 SHA512 30175f7c45f4102fdb38223065d4e143bebc2ecef84e2e148900d8510c9c393d8feb7d6787f9593b90f1e4054b5016444e02f17c6a8a51082e7b8cb8294d9d31
diff --git a/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild b/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild
index a4f168095b5b..b7ed36058ef8 100644
--- a/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild
+++ b/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Qt terminal emulator widget"
 HOMEPAGE="https://lxqt.org/"
diff --git a/x11-libs/qtermwidget/qtermwidget-9999.ebuild b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
index 9c367cc15cbc..e9a17c8f55cd 100644
--- a/x11-libs/qtermwidget/qtermwidget-9999.ebuild
+++ b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Qt terminal emulator widget"
 HOMEPAGE="https://lxqt.org/"
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index c4dc2384484b..25235e5e466b 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1,5 +1,5 @@
 AUX qwt-6.0.2-invalid-read.patch 9447 BLAKE2B a3a9074113cee590bae03f0a55eb6cb2800c88ad06aa989d3293c42be8945db11982c915b775dac43d773f557dbfa57f5f3abf40a0f57c4d414f4003d09f581b SHA512 e9912ec60d062bad89ecb74c0342815f8c7b351318df88120e7510e44224f52a1c89e8ab2bcafd6d8c418a7a3e67347b159d174d417cbebf4fa3377191d0f201
 AUX qwt-6.1.1-pc-destdir.patch 498 BLAKE2B 4e3fefa36daebe0c173adaae02c33a622d70cefd626998f9baf65229291be87dcd5dff175961fb2b33d794e0b3f082a36209ce682434bd3f83de6fecc585137a SHA512 a2035e27af7110a2aaf4e28f316e2c6c49b6909345ceec01eb4793ac66445594bf362fa6939506ba6d0300bde9487c83ea770299af8c3ca8d71b162cbc71e769
 DIST qwt-6.1.3.tar.bz2 4245614 BLAKE2B 5461602702eb159c5c9131eb554d6a619f40c459432c3f32f98b55e4b659d37848fbc0691baeaf691155bae83f68b9c91d3fee430935dd0c1b29e6fceac7a36f SHA512 d4a73e9e7ddcb7c16c508920a298784935be2eddc8f7585993d9fffe1bb01e1787a0d5d7ea4f220398b94ea2b211a19009dccaeadce56a84410357124bcb051a
-EBUILD qwt-6.1.3-r2.ebuild 3828 BLAKE2B 9f8166cfdac2931dd2f3d384ec0aba5c55f9e3bc90e291cf6184a7ae24f8ca49ed424fd1b57dd7acfce3cf5cc46b4ec4b893cf9af0387a1a4ad9c41768c8017a SHA512 6447a35b30b0703b5c85aa6836a4e4be5b70ffd7d2f83f0070385640b872b3ec5150e18d7c97b15b8720cebe0f3a7d36497a86f88b5a327ffdec4b338d879fdf
+EBUILD qwt-6.1.3-r2.ebuild 3824 BLAKE2B 6672251fc72796e983ce11586cd5d7d6e278f77f30c17f22bd6de4a54cbead4e0cbf316144490bebeeadf867505b8cd7a7f13b39951a0cf46a96e7254052f748 SHA512 dc733c456244ac5f543f366298eb92c42ae40fe3f8ac59e03dc6b354a7c4ad584ba105f5418f1a9730b1c38d2fa18e1c50993c763ca76df1ed4de5b1f3b26500
 MISC metadata.xml 870 BLAKE2B 1e2262a74f86901bfdb2a897fb40885880391898e60ca6ddb001ea6f7a1bca4586e2cc2c3af28b8d3f455aac4d93204efb370d491ac6749207cf584c8b08f589 SHA512 53e10079699529613ece87ae1e2908e7f7144d041f62618512d00df0b6bf9ae2c5b70afc8309cef0523e10a6605126f3ce871589c3133d64ac52db9ff7346b43
diff --git a/x11-libs/qwt/qwt-6.1.3-r2.ebuild b/x11-libs/qwt/qwt-6.1.3-r2.ebuild
index e651d6ffdcd0..652b957e006b 100644
--- a/x11-libs/qwt/qwt-6.1.3-r2.ebuild
+++ b/x11-libs/qwt/qwt-6.1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -127,7 +127,7 @@ src_install () {
 	if use doc; then
 		HTML_DOCS=( doc/html/. )
 	else
-		rm -rf "${ED}"/usr/share/doc/${PF}/html || die
+		rm -rf "${ED}"/usr/share/doc/${PF}/html || die
 	fi
 
 	einstalldocs
diff --git a/x11-libs/tslib/Manifest b/x11-libs/tslib/Manifest
index 8677107a3e9d..34c21bba9015 100644
--- a/x11-libs/tslib/Manifest
+++ b/x11-libs/tslib/Manifest
@@ -1,4 +1,7 @@
+AUX tslib-1.21-optional-utils.patch 610 BLAKE2B 0f25c58205f5bbddc62f278827d9689e58c88323d6c2797d3f36d165c5dcfc8fe18574225dab106eb9c01d3a7f54a3f7c3797be0853dd3b144bbb61529ea83eb SHA512 3c061d34e5a2f89c61754331d9a8efa9ffeb492169d3c0082b29107f03442adc75f6a39f289577c3902df2a9efc4166f9ac610867742989f09f10a8bfd69230d
 DIST tslib-1.0-patches-5.tar.bz2 6602 BLAKE2B 3cd67f4eeacd0651354af8ee4637e27084e9ad61246e6cab631ef52c7435e6d37acdaffd4ca72d8435335860f12d2b0fb4205b33092ea603aafc837e2dba6885 SHA512 dcde900942a3c9e9114e2c36d1d9554eeae8e5ca64463d69c52188a30734b19d6ba0439e8bb009b0d535dfae3f8f8e688a6861ec0a0371fdcb0e9986abb963de
 DIST tslib-1.0.tar.bz2 47522 BLAKE2B 99f43b5175fadef240a973d0e88c80a227b5ffe518c97c6d890fa4194148ff099055b98e7b5b3fee542249bb9c9bae88a22d1d050f2f7ca1563d03b453aac34c SHA512 a12e569b1d9cd809776a605775c3000f4e405789d95eeda21451d3911b5aa67003c921d9988f5ea8eba8b32108c8b0816e6609b5f013a2594d27b6e00e75de8c
+DIST tslib-1.21.tar.xz 349216 BLAKE2B e19623c9390688b0aa85e6547a57542d2e10498c8ebbb30f840157d240dc9975c3e6735814a5e6f02fb71c273a52f860695cf4772fef28522e74c5781cdcb02a SHA512 66c5e5dc4e2314277e19af29b5dce1181573579f13b0e79fa43e658838d4c19a77feb978b60d7c6458337e8d6100ee54a42fc4af3a99fd8d6840cccafa6323c4
 EBUILD tslib-1.0-r3.ebuild 1103 BLAKE2B 48107042388b9b05dfa1977a62cea786856e267b762dc64c80c2a48b0469cdcc6c072dd06b8bc2c66bae768431f4af1939ebafe9c54a468496180fe60768d4b7 SHA512 a41e3bee36018b625230f165585afb9493ce86aadeaf1d651773a5b26fd8e0bf35673b1387098321d9aa3a8e0afe90e3cef4d6d52665a29fb0e039b14291b29c
-MISC metadata.xml 329 BLAKE2B 0bc3d02cbc1aa33d242977276c8edc2aa27a58b2b32144be6b6c03bf91cbb77f79c7f6278eb7b505a1be9631d200a198630ec3491bb84ddc486a2d9a305039f9 SHA512 cf3b3310e40c72fa30927c8877d2bcdbf66f38adb2e43a82f7bbea771f4e7f1c292948c03a292b550db0dc8d2e3ef2e12ddb9d676e3bc5663d40714325d0c044
+EBUILD tslib-1.21.ebuild 1571 BLAKE2B 20d3ca2a8c62a85e7f5bafaeb30cf7be34a30fb8519ff9fdde7747cfee76bba19af66e465e74c72745498eef06165d763a5d2fd91a70d5cc91ce8159a3a14f1d SHA512 470ff9c800bea111deafeab004724bc7980360d5375dbe1ff835d70bde49ef3351dbadacaa0d92150f5bed91bab5ce3da2c58014f7c9fd7bc540be7fa7a57b8d
+MISC metadata.xml 476 BLAKE2B 60986e648e86b87a797224b40bcb510af598d2aeafdc497850c714872d844b86c27d7f3c24cbbdad92ec91c8803fd1a8aeb9e06ffea5700ce3c42a2b3d3d8587 SHA512 f5b0def5c198a78dd8bebfb3e9b022ab37dc6466e1a3af7a7b0497f4133be7d155a205da190d63f98c4e10bc7fca6ee84e6aaa6e46e74e1ed0d8c2ac387a15e5
diff --git a/x11-libs/tslib/files/tslib-1.21-optional-utils.patch b/x11-libs/tslib/files/tslib-1.21-optional-utils.patch
new file mode 100644
index 000000000000..5b94599a86fd
--- /dev/null
+++ b/x11-libs/tslib/files/tslib-1.21-optional-utils.patch
@@ -0,0 +1,21 @@
+--- a/CMakeLists.txt	2019-10-22 10:27:05.000000000 +0200
++++ b/CMakeLists.txt	2019-12-25 16:18:52.814921538 +0100
+@@ -17,6 +17,7 @@
+ option(BUILD_SHARED_LIBS "ON:  tslib is build as shared; 
+ 			  OFF: tslib is build as static" ON)
+ option(ENABLE_TOOLS "build additional tools" ON)
++option(ENABLE_UTILS "build calibration/test binaries" ON)
+ 
+ set(LIBTS_VERSION_CURRENT 10)
+ set(LIBTS_VERSION_REVISION 3)
+@@ -28,7 +29,9 @@
+ 
+ add_subdirectory(src)
+ add_subdirectory(plugins)
+-add_subdirectory(tests)
++if (ENABLE_UTILS)
++	add_subdirectory(tests)
++endif ()
+ if (ENABLE_TOOLS)
+ 	add_subdirectory(tools)
+ endif ()
diff --git a/x11-libs/tslib/metadata.xml b/x11-libs/tslib/metadata.xml
index 7407021b7ce5..640fc4e4a42a 100644
--- a/x11-libs/tslib/metadata.xml
+++ b/x11-libs/tslib/metadata.xml
@@ -8,4 +8,8 @@
 	<upstream>
 		<remote-id type="github">kergoth/tslib</remote-id>
 	</upstream>
+	<use>
+		<flag name="evdev">Build experimental input module</flag>
+		<flag name="uinput">Provide alternative ts_uinput evdev device</flag>
+	</use>
 </pkgmetadata>
diff --git a/x11-libs/tslib/tslib-1.21.ebuild b/x11-libs/tslib/tslib-1.21.ebuild
new file mode 100644
index 000000000000..ac72cb85bb3f
--- /dev/null
+++ b/x11-libs/tslib/tslib-1.21.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+DESCRIPTION="Touchscreen Access Library"
+HOMEPAGE="https://github.com/kergoth/tslib"
+SRC_URI="https://github.com/libts/tslib/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2 uinput? ( GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="evdev sdl uinput"
+
+BDEPEND="
+	evdev? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	evdev? ( dev-libs/libevdev[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS NEWS README{,.md} )
+
+PATCHES=( "${FILESDIR}/${P}-optional-utils.patch" )
+
+src_configure() {
+	my_configure() {
+		local mycmakeargs=(
+			-Denable-input-evdev=$(usex evdev)
+			-DENABLE_TOOLS=$(usex uinput $(multilib_is_native_abi && echo ON || echo OFF) OFF)
+			-DENABLE_UTILS=$(multilib_is_native_abi && echo ON || echo OFF)
+			-Denable-arctic2=ON
+			-Denable-collie=ON
+			-Denable-corgi=ON
+			-Denable-cy8mrln-palmpre=ON
+			-Denable-dejitter=ON
+			-Denable-dmc=ON
+			-Denable-dmc_dus3000=ON
+			-Denable-galax=ON
+			-Denable-h3600=ON
+			-Denable-input=ON
+			-Denable-linear-h2200=ON
+			-Denable-linear=ON
+			-Denable-mk712=ON
+			-Denable-one-wire-ts-input=ON
+			-Denable-pthres=ON
+			-Denable-tatung=ON
+			-Denable-ucb1x00=ON
+			-Denable-variance=ON
+		)
+		multilib_is_native_abi && mycmakeargs+=( -Dwith-sdl=$(usex sdl) )
+
+		cmake-utils_src_configure
+	}
+	multilib_parallel_foreach_abi my_configure
+}
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index a702b65068c4..1b370c83147e 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,18 +1,10 @@
-AUX 0.54.4-vala-0.44-compat.patch 883 BLAKE2B ecf653b7d37d731eace38d8bd1b52d9b6420fa46c67ce0090e0d0e2d4c48aa03f1951438db6bfe62a5e0094d080605d0cb51d71247d133307d47c98b6bd45f7a SHA512 9aa4961497931d7d18f7107b6101aa04dbbc034e45313272154e7e685166e565022e025e407ff56a95661e7c1bf135d68023ed0d513ceb0a6b6f83a43292d161
 AUX vte-0.28.2-interix.patch 1566 BLAKE2B 1d6b4b7cfc1fee464779e3efb8de09554c9e52f562d90d280e03493f01d8f44e468260b4c92327006a2358688414cf04d9639eea1162808597c590eeb6c21af0 SHA512 f02574f96355c6cedde05d0877d3bf50e7777d210484a80b6e95e597b0bb225f5968649e67f67d7f112f50302ae6566e4f3d8c59d7a5b65fc95601cac00868d7
 AUX vte-0.28.2-limit-arguments.patch 1477 BLAKE2B 329e8eb93156244526ebe3ccb3c2a75234da7a57a994c2c1b42e283a65011d6245133f858778571efefec18bf18bc7db9afe5aeded0df0cec35a72a31507671b SHA512 e5639d94fd455195c354d03cab04bbb73eff98bc540c813cccf4ab5eb793f4c8ae645fcf2bd502924ed4d38412101341deaf2d28ea8aaea3530a98ffbba8256d
 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.48.4-command-notify.patch.xz 5500 BLAKE2B 88b655403d2bef034604a283b173fece305af35f51b20f9d4811b33265b5a6eb83441e0b978539de501d118a8431c4a9a9a69a111a03c45adc87763b15b09fd2 SHA512 b8ba202aedb5d821962a7cdc89e6ef8ac8a3480dd7681bf8ce708ce511598f3335ba153750d40cb06e9a2c5bab5888b3daef9096458c2889d94028feaa394575
-DIST vte-0.48.4.tar.xz 1008296 BLAKE2B 9f946d6909d38896ec80db2a02666d809155997b27109724fb318d28200220f1514fb23e4cdc90263a756914b5db442c947578c8854a535cb960a06f7bc03a77 SHA512 4b75bd881e58b5043bc44e391ef3a826a2c25d0f1bb5ffb890367e11a60b1bcbce091575ede6972a89ae043b39c51897f91fca1faf6872664d602e503d8020fc
 DIST vte-0.54.1-command-notify.patch.xz 3428 BLAKE2B 75b0c22720276300be2e49e8444aa68fed77fb7a6cc6b0e93a5c2d41257626bd60ff1084d68579769cb3d85e7ec567927591746de48e860b138d0c1f24f64cc7 SHA512 a53da569f8168c8e9e21e186dcfc00bf9fdb78a0c767ba35033c1c1e4f836406b4d9bf70ee3e071f6c749fd6f72101a6960d201617bd0bc23021e1eeaac6fd0c
-DIST vte-0.54.4.tar.xz 1087748 BLAKE2B 65fb762414e832930ce1519dc99fe306b3c9c3860bf8116c29e66b758178d1f0a52705cd6f7ab1be30374fb2956a01aaccc8f6859d0af971f2037809421bb502 SHA512 7e0f4140a4c474fad9a48eaf0e4c29f83e7bf50719087983c238b362c6303824836c34485eb2ca135be0961fa4b83a318d08ef70d4cf0dab0d37dc2e36710c41
-DIST vte-0.56.3.tar.xz 1100584 BLAKE2B 7fd1e041c52aab93d95d6ce91f6dd7d4bc9080e22cb82041d1636946973f1eee86e257f2c357af93417eeec52142edcb7df3bdbcf90727e40fb61a1e4b2d9292 SHA512 f78b3d532ca47e53c1bb51db6780697ce4692d493c0030d2dc4beb63a2595e44a43eb409ee31b94e4551eae259ac1baa8f06825a02fd66df8352e192f4ea1988
 DIST vte-0.56.4.tar.xz 1100952 BLAKE2B 3c3ec69f4078bdb07a4501df4aeb31aaeb7f9fa5a4631152d486fbb2c950362612cd9dff4abe25b93da6c712a37a20ccbf050ad33d96ec7b997bb1409189f60b SHA512 5a6c79b30f07c1f5848ef59028864d893cc605b9ad8f49ae819958aaed962d2ff96baad379f126381b8bf00015003c5a6dc28c792e4e050ba35090338bd7dabb
 EBUILD vte-0.28.2-r208.ebuild 2952 BLAKE2B 40d1d998937dceb5b3f614a4c5ad959721463b4e11829f3618a54d60c3ae7f854dce7e218eeea7a8dbc79b760f39f04f3c94daa8dca4a307ec1e3a2a6023323a SHA512 06889f2d68a032d8b68bcc8815b0641bb7254945514988b32547cc9c3f4e032bdf23279681bb8c5fbb4eb6901b0f064b299c69ea53a188c008ebabf7e6ae8fb9
-EBUILD vte-0.48.4.ebuild 2444 BLAKE2B 3b5f8f9758b15039aacd4dd88845383307802cb8069e85616e0979d5e9f4167927d41c77e83eadc5d006ba0e750fdabb8d9a0cfed0ce0c4344176ce4ae4839c1 SHA512 4612220c197a3fa90170e5e97e52ee6a1ac63a61f6d346f5d00a315b359a3a80935ef5e9000966e4aea68ef1fc1bd61199c6ae229fd4075fbb8148964c7f31f8
-EBUILD vte-0.54.4.ebuild 2362 BLAKE2B 4fd6478ea2fe7abf6b56d4ccbcb2edd53ec112b4bbf01393d2dd59bdc612909aa535ef92cdc00be191ba87865af1618facd805909cfa1bc5e19118526d16b9d6 SHA512 9b2698e69433cefaa16b21089b4d42565d6baf60f195780ee481f4f7aa39d80ecbd186ee4ee57d0152fdd84bbb7c0a47ebb0c7ca46dae808c4683c86d1a2ab2b
-EBUILD vte-0.56.3.ebuild 2287 BLAKE2B 667fd7416f0f552d15e243ad688f83e46f0126ef65dcf7b8e9ac8d27ebab17298f7ffd17b66de9e1bd072adf596b757cef91b2af2288c56aa41b8ab5b0fb432e SHA512 7031557db7b036d17af586af95539db8c635f30edebbaad596178f86d6958a11326f7155ab37e83fa4120bb575f67641932dd39c0445f0da252e731d08007c18
-EBUILD vte-0.56.4.ebuild 2281 BLAKE2B 9299dade4e846d07e7357500605eb738707e30178036c9ceb797532b88b27c97eea379abc558d1a2cf0b07eed383aabccbfeb5c27b4f98ee0f52efb375c173b5 SHA512 6b64d957c2a9cc3de53cff59c1a4029f1f90aab4f3bdf752a8c9e2ebb9a4d2ad4085e43a9372e5420655ab16624ea2be284b41e4c848c8ea32b9f89ae4d70b29
+EBUILD vte-0.56.4.ebuild 2278 BLAKE2B ccf8eedd6022721a0eed732293a3707c71b78b12ac350cbdf685b3f4f66b580f074d68f25d2aafcf6c0bb42d5aff93031e18792d2e9504f2254b57e4ad85ba4c SHA512 f1265a1133d5ea3710ce85dfb8284a95b4d34b60311cbf8b81e6051be899633409a9ea64720b74fbb83e1e31a0a89f85e6291f5173e30be1e911d3764cd3cc62
 MISC metadata.xml 348 BLAKE2B 3bf56ab8eced6c72e3d4dcb9979464b9652010b09d6576da3f1b9061f92b508d9bfa11ae081083ff07b2d7ec05c8e72123e25d6ec8c6edfa738b241a9f4339cb SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4
diff --git a/x11-libs/vte/files/0.54.4-vala-0.44-compat.patch b/x11-libs/vte/files/0.54.4-vala-0.44-compat.patch
deleted file mode 100644
index 5da32bea838a..000000000000
--- a/x11-libs/vte/files/0.54.4-vala-0.44-compat.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 53690d5cee51bdb7c3f7680d3c22b316b1086f2c Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Sat, 1 Dec 2018 19:04:59 +0100
-Subject: [PATCH] vala: Fix build with vala 0.43+ git master due to empty
- struct definition
-
-This should get a proper refactoring as the FIXME suggests.
-
-See https://gitlab.gnome.org/GNOME/vte/issues/76
----
- bindings/vala/app.vala | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala
-index 8663d63c..a534e76b 100644
---- a/bindings/vala/app.vala
-+++ b/bindings/vala/app.vala
-@@ -819,6 +819,8 @@ class App : Gtk.Application
- 
-   public struct Options
-   {
-+    //FIXME Merge this struct into App class
-+    public int dummy;
-     public static bool audible = false;
-     public static string? command = null;
-     private static string? cjk_ambiguous_width_string = null;
--- 
-2.20.1
-
diff --git a/x11-libs/vte/vte-0.48.4.ebuild b/x11-libs/vte/vte-0.48.4.ebuild
deleted file mode 100644
index 5ffe7d62e34b..000000000000
--- a/x11-libs/vte/vte-0.48.4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-REQUIRED_USE="vala? ( introspection )"
-
-SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~eva/distfiles/${PN}/${P}-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-util/gperf
-	dev-libs/libxml2
-	>=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
-		# First half of http://pkgs.fedoraproject.org/cgit/rpms/vte291.git/tree/vte291-command-notify-scroll-speed.patch
-		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
-		eapply "${WORKDIR}"/${P}-command-notify.patch
-	fi
-
-	# Fix bindings test compilation with vala:0.44 and newer - https://gitlab.gnome.org/GNOME/vte/issues/76
-	eapply "${FILESDIR}"/0.54.4-vala-0.44-compat.patch
-
-	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
-
-	# Python bindings are via gobject-introspection
-	# Ex: from gi.repository import Vte
-	gnome2_src_configure \
-		--disable-test-application \
-		--disable-static \
-		--with-gtk=3.0 \
-		$(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.54.4.ebuild b/x11-libs/vte/vte-0.54.4.ebuild
deleted file mode 100644
index 5aa7db15493d..000000000000
--- a/x11-libs/vte/vte-0.54.4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 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 ~sh 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
-		# First half of http://pkgs.fedoraproject.org/cgit/rpms/vte291.git/tree/vte291-command-notify-scroll-speed.patch
-		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
-		eapply "${WORKDIR}"/${PN}-0.54.1-command-notify.patch
-	fi
-
-	# Fix bindings test compilation with vala:0.44 and newer - https://gitlab.gnome.org/GNOME/vte/issues/76
-	eapply "${FILESDIR}"/${PV}-vala-0.44-compat.patch
-
-	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.56.3.ebuild b/x11-libs/vte/vte-0.56.3.ebuild
deleted file mode 100644
index a1d0b27dbcdd..000000000000
--- a/x11-libs/vte/vte-0.56.3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 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 ~sh ~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.56.4.ebuild b/x11-libs/vte/vte-0.56.4.ebuild
index d446e9e70d31..718b10f7f507 100644
--- a/x11-libs/vte/vte-0.56.4.ebuild
+++ b/x11-libs/vte/vte-0.56.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh 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 )"
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /x11-libs
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)