gentoo resync : 28.04.2021

30 files changed, 724 insertions, 73 deletions

diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 1c8ef6de390d..52a45de9ff13 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/amtk/Manifest b/gui-libs/amtk/Manifest
index 3891ad02d9f8..221379f522ba 100644
--- a/gui-libs/amtk/Manifest
+++ b/gui-libs/amtk/Manifest
@@ -1,5 +1,3 @@
-DIST amtk-5.0.2.tar.xz 368440 BLAKE2B d13498079714612ac775a20032c0684b77c8a2238dad055dba6b87e81c009da22b53cb93df185a10278eedab2857321ee59230488f738064a4fb305345eba345 SHA512 71876430c4e7c19c49170ef6ff8d4c5324f871fd1e02162f33a9249b87f693fa4f4f748ac73d901135d331fee662e5000851e86a00d921da6669319728526136
 DIST amtk-5.2.0.tar.xz 381328 BLAKE2B b97a4b27d33bf49a97d585ecbecad04c3f2ea4e08e378d02218be5bf4aed2fe26f260ed1fd1eaa09a5b9f0e30e49901ddf860087fc630794aaa25ecda353b118 SHA512 520c9e762bdef96907320ec8dd4d3a005f262064ee402527c1087652af91c61657868189be8aedb7c0bd17758cf6d7e976da4ce941eb8a54e2d3e10ce55dc9eb
-EBUILD amtk-5.0.2.ebuild 750 BLAKE2B cd2a06aba34875b9dd28333751d9ff7ac2832d011f93fc77688e5b6707968dc34e9811fe8d0286ebe4ece8d4f519ae91731bc08586839ca12a6c4f38388d730b SHA512 3f7a5dce70279f380c9e894a44a25627cc871001998bc6d5294b8ad3ee6016545e911b2aa47e05f168c3ad056414147c3a5ea9c4e1147f42ceaacd33139db7cf
-EBUILD amtk-5.2.0.ebuild 762 BLAKE2B 00864d9372965b076fcf173ecfdbf34b9168c0aee56b525b2685a5de9074dc4e20c39ce7b5c043b8b259715967de3656883fa691966ff4bf1e3cb30bcd8756f5 SHA512 b50910b5c99e5413845b6eb36445f9c498335b2f2858cbea056972058aa550bb5b208bb83cc79621bc1e633999ee1b60247358841bf965733ad6ad6f67b17e72
+EBUILD amtk-5.2.0.ebuild 761 BLAKE2B 76d9cae7926b31dc7788e4042125155251692ca4ca9abf3c8d8b9f1b9bdcabd02cc95e51f7652bb0f6ffdd96c86221cce6843b46e4b89ef2029e6e019292c6e4 SHA512 b82a5173d9f39c2ab2230b06c802ad34f5e894a9b4cb14f9f3e1e12fa06e14d59a1b938446f46ccbdc2437caa45827364f598b6804f907480ff966315521bfd1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gui-libs/amtk/amtk-5.0.2.ebuild b/gui-libs/amtk/amtk-5.0.2.ebuild
deleted file mode 100644
index f795465143d4..000000000000
--- a/gui-libs/amtk/amtk-5.0.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="Actions, Menus and Toolbars Kit for GTK+ applications"
-HOMEPAGE="https://wiki.gnome.org/Projects/Amtk"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.52:2
-	>=x11-libs/gtk+-3.22:3
-	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.19.6
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.25
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-gtk-doc \
-		--disable-installed-tests \
-		$(use_enable introspection) \
-		--disable-valgrind
-}
diff --git a/gui-libs/amtk/amtk-5.2.0.ebuild b/gui-libs/amtk/amtk-5.2.0.ebuild
index edf98f0e0504..543cc8fbb456 100644
--- a/gui-libs/amtk/amtk-5.2.0.ebuild
+++ b/gui-libs/amtk/amtk-5.2.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Amtk"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/gui-libs/display-manager-init/Manifest b/gui-libs/display-manager-init/Manifest
index 9e66f2ff13c1..23e2dc2682e3 100644
--- a/gui-libs/display-manager-init/Manifest
+++ b/gui-libs/display-manager-init/Manifest
@@ -3,5 +3,5 @@ AUX display-manager.confd 608 BLAKE2B 814b4d36ce74d2f70a771cda31c3b9f6e21246bef6
 AUX display-manager.initd-r1 6201 BLAKE2B d30dd3c2cfc651c48e4f5a25ddae401894c994286fd5dd5c3668de92e107fdd36a7c14d47f0c080854004aaf6f9cfe7e0a41abee552a69077ed4c795ce834623 SHA512 fdef2ff2eedda6c0b262f5f1fa4b0f3c9bea56b575956b308c2fd145eba204c3cf9f336b6348cc12dd342bcbb64ed2e49f3f82c143249d74c922ac472b786851
 AUX startDM-r1 778 BLAKE2B 134345da401d5d75cb4e3cf79189a2594e508d4afe748bc209e8a93ea754169b205b114fcdb830ed95908788d0bf9cf071cd50de0c37df7fe5b83827f406d766 SHA512 e0cbb1f0ca6d6d3ae3f963bb5508e5b58e03682aba3f35cb2c1819c17e2d94ee240a5dc603f9fd93d22ecca060d131e46c0a0a25685aa8deac280294ff76b8c9
 AUX xdm.initd 200 BLAKE2B ec997b7080037a7197a6f75728d9075c846168115d705015afc6518e1e72d815cdf87c2e9e3f3ad950034599e548d015e530cb7821f83b9d289337908455c17a SHA512 4552215cc2cdffa3298a9136e2a22f600f55958d7f74b2d06bbf48568d8034ef24deea27ad9f8d6d100516b0efb4e2688c1f454dc556120f759b1da7fecd877c
-EBUILD display-manager-init-1.0-r3.ebuild 1672 BLAKE2B e451cdb9e174cebd4e8df8153d8668ab1a6c823198f1c5e43960468740cf7db9e9599952f73972152b7a9e4c7895a2b425f3cdc9061dabcf8e3de38d19ed8ede SHA512 6710ee128eec439af6ac1e670cee3e681048dbb38eab17366a2feb33fad81159914838db1a5d34ec4a5fb0ed43ad54a48c9e1aee949c02e533c44818026319a0
+EBUILD display-manager-init-1.0-r3.ebuild 1666 BLAKE2B 3bb8914c90b689cbc24745f413aaf5e97ae7c69d9879c7782cbe842317135d46e60be49e063817d807bc7aa949dd486c677f0281a75178bf311261382fc9f4a3 SHA512 ee3e5967db0053e92d93bb741b115541101c231138ead96e379b659e753bd021fd81760af7693b3695bd6312b477b676be6804acf38e0804adfbfb3bbd0b115a
 MISC metadata.xml 258 BLAKE2B 4597deb2f1355078e78791baad22d30ec067357a50f01a817b3fdd239e794a4255ac4e59908b7d9d2e276e455fd352320ab46f37dbfd7df036f64c0bf3cc4900 SHA512 d97af5111022f569340bb378949f4f70ab33607c1d5dc027eff7d64a7a2ed64238710f8bfb623e01e01d48c7b1db60318ac340b8a4279d7fa6984f35a083b2a8
diff --git a/gui-libs/display-manager-init/display-manager-init-1.0-r3.ebuild b/gui-libs/display-manager-init/display-manager-init-1.0-r3.ebuild
index 1a18f3f2feb3..3765467e3c9c 100644
--- a/gui-libs/display-manager-init/display-manager-init-1.0-r3.ebuild
+++ b/gui-libs/display-manager-init/display-manager-init-1.0-r3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:X11"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}"
 
diff --git a/gui-libs/egl-wayland/Manifest b/gui-libs/egl-wayland/Manifest
index 885d3484516d..4f3c3b98fc04 100644
--- a/gui-libs/egl-wayland/Manifest
+++ b/gui-libs/egl-wayland/Manifest
@@ -1,5 +1,5 @@
 AUX 10_nvidia_wayland.json 115 BLAKE2B b10206c742e8966d1192b9b0604137e6b296d2be74a437841c63844c0716343578b11565a34fb4c534d5908c0b5775305581b68039a6ff9ed7421c9d385a2b7a SHA512 1a611ac0fc2762d94661efc28fa58d57a821185afa7589158d1b8d503bd7361ba1b5029302550134ed1787c2bf90e2ea8afbf3bdefbfe268d8cf13d2f340fb47
 AUX egl-wayland-1.1.6-remove-werror.patch 251 BLAKE2B 12a14b185f9b1cb3a42226708642f5b57c2b0eb64d81c96438ee24ac45b950ba588591194648fc8e64e3aa8d2fda9ba2dba63a2f78fc22c00a14d56403bf6839 SHA512 c6c3c4d4f776f44d642d51ab2eed44a0388558b43f2c4c894b6d19bdef40b8a646be43b6b356a3ffa0297e36a48122ef057265db68a8717020abe30906bc8f28
 DIST egl-wayland-1.1.6.tar.gz 48674 BLAKE2B 66f58d4b841ebaaec6c0711e0dae0b3c774a7b0206f9cfd4d9e94a2c05688d563fddbbf9a60247980df00c3c493147e292bc536e2eb56de962f3b34c6215e026 SHA512 81fd3be3f49ad012efd31189d85666e869653f1f4004de4103f4ad13b7fda036cef432d1e30e33664ae423092dc1b86cfd2773d6542bb09d7a74720ba14e0fa4
-EBUILD egl-wayland-1.1.6.ebuild 1285 BLAKE2B 014cdae3321aa8f9a8e38c79f7b32cbfc8cba6c76cac39d024b9a91953792d11c524ed4118e45381a2e45d3c58a0f5e0d05def012395696624395ca8165d17ae SHA512 12ebdf2a45aeef40585c6bab222c2178ed0661b592c28a9820dfece36f448de637d47e0affacbc9432b493a819b9d30b56b157011f2e21cc62e7b7cb1ae2c0ec
+EBUILD egl-wayland-1.1.6.ebuild 1660 BLAKE2B a2dc305faacb372b25c49692081f9f8ce3c441405388abc8b231d89703c6e136e53eca1b32770a1d9f3c39a56cb32c13cc07b75fc3c94168bb28fe17e7465383 SHA512 83952f79b5f07f5a709268d37e09e465befa617091e8cd9b6aba1e3208e3441df0ab908cc5366ca9cb8ddafc5ec830d69bad86bcb893ff47077a725a546fe34f
 MISC metadata.xml 477 BLAKE2B 406298dc8bb1aabdb3f5dbe507846089c4dfeee1bf4db6e76624c33b369b2f3afd485c91020073aaaf09bc0a3500c0ca6f991b52325478e302c4c7134f009f74 SHA512 cc1b9b630d0751801cb834dafe15003eb370f3984ffeec7d5515eb2972587a5b8bb72b03dabb1e27dcbfc6c509e6974713d0fdcfcb2c96c5737f19e9ebe2ac18
diff --git a/gui-libs/egl-wayland/egl-wayland-1.1.6.ebuild b/gui-libs/egl-wayland/egl-wayland-1.1.6.ebuild
index 931329d094c9..793b2d29418b 100644
--- a/gui-libs/egl-wayland/egl-wayland-1.1.6.ebuild
+++ b/gui-libs/egl-wayland/egl-wayland-1.1.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/NVIDIA/egl-wayland/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64"
 
 RDEPEND="
 	dev-libs/wayland
@@ -48,5 +48,13 @@ pkg_postinst() {
 		elog "Can be accomplished by:"
 		elog "  echo 'options nvidia-drm modeset=1' > ${EROOT}/etc/modprobe.d/nvidia-drm.conf"
 		elog "...then reloading the module."
+		elog
+		elog "Note that EGLStream requires support from the wayland compositor and"
+		elog "is not currently supported by many popular options such as gui-wm/sway."
+	fi
+
+	if has_version "<x11-drivers/nvidia-drivers-391"; then
+		ewarn "<=nvidia-drivers-390.xx may not work properly with this version of"
+		ewarn "egl-wayland, it is recommended to use nouveau drivers for wayland."
 	fi
 }
diff --git a/gui-libs/eglexternalplatform/Manifest b/gui-libs/eglexternalplatform/Manifest
index aa20d9d4f44b..33487b47b1b7 100644
--- a/gui-libs/eglexternalplatform/Manifest
+++ b/gui-libs/eglexternalplatform/Manifest
@@ -1,3 +1,3 @@
 DIST eglexternalplatform-1.1.tar.gz 10372 BLAKE2B f18bd0c5244da34343b3bde8451602b8071972d33139ab4839e7bf68eae6be5fa69a12d5059b4b259bc4eac2e97f46d4d5fa734d48e45b6a6ae69251af86cdf0 SHA512 ee72c928abac060e28515807975a371d3792acd119fa9f9da926ae32105e1e528df8d9a3db57ffac0587b115293ede44997606d9da8e20e7f7061a01dd502748
-EBUILD eglexternalplatform-1.1.ebuild 634 BLAKE2B d7d6e46a0fc50c8be846851a2f021397b192d32c538c2371993f93719dc7655247908870b4efc2e283de9c20bc05b995777523cc11c792ab45879fcc0a4bb90e SHA512 7566e6f37729c1193a889e92f6faacd7d58a4b2adebcdb5a7cb6dd6a67502c8d174578303c745e6013ecc5850842ec11d146cf5d36df933316a42fe87ae66847
+EBUILD eglexternalplatform-1.1.ebuild 628 BLAKE2B 245e6ad513c528d105f30bd586d5548e6baef9e33983394919c79144a9ea4ebac2f6249981593297ec6d1389ae1bc1b3ba1ed96152331bea999cc1b12e965377 SHA512 0c0d9c2657b4b9b87449acca789f1b07b01c3e9d26585e9549c6745db0b06d02bdb3c0e48ae1f3bb57f09ffe3b213bf61aa68f45d4c055377ddbf716b4e46dd5
 MISC metadata.xml 485 BLAKE2B 9ed0d6b72dd03f636ecaa872e07b1569c0d33644566fdc4910bdadb60b259efe351acc34749869594a3b5b0d448d8716de6dcff491ed730f4cd1ade39bda517d SHA512 feed0ff8d4f301b7214d762c1bbedde2d071862b72e70dd66004bf9c9060e1da556f1322d9cfbb24262b59da962f436764f466c7dadbd2866f3a590d312105e2
diff --git a/gui-libs/eglexternalplatform/eglexternalplatform-1.1.ebuild b/gui-libs/eglexternalplatform/eglexternalplatform-1.1.ebuild
index d8cb2dbadf48..d224b408e9f7 100644
--- a/gui-libs/eglexternalplatform/eglexternalplatform-1.1.ebuild
+++ b/gui-libs/eglexternalplatform/eglexternalplatform-1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/NVIDIA/eglexternalplatform/archive/${PV}.tar.gz -> $
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64"
 
 src_prepare() {
 	default
diff --git a/gui-libs/gtk/Manifest b/gui-libs/gtk/Manifest
new file mode 100644
index 000000000000..fb7d047bf643
--- /dev/null
+++ b/gui-libs/gtk/Manifest
@@ -0,0 +1,3 @@
+DIST gtk-4.2.0.tar.xz 25772584 BLAKE2B 38c29475050ff6d0aa41299201343d506e051387c44058f8d3e970470e49046bb11eae57d57d8d869577ca2d5f01da507edb3a87f79c98828ec938a0d87e6989 SHA512 12e825245b92f5dc652530c35b9a48a0bb284641d4128d054a19a35cb7814babe78bfbbdfd7fe3f2472d5028d078ae209a6da5d614b023c2b438223e4c5a04a0
+EBUILD gtk-4.2.0.ebuild 4372 BLAKE2B e98a842ee04d9eb29deeb7d60dea66422c5bafbf692831e317cf01a7565d7fddc76bcd7037495cd40d9f89125cd5e7f3233adc88701121bafc17fb2a96a0fc6e SHA512 d8664f429ed84d58b5f7b0fdd852d54272103543263a8936d3d5b784886c68faff80ab60101553bf3558d7dba6b541d9b7d75802b87788b077ef92d6f4f7e0da
+MISC metadata.xml 762 BLAKE2B ba9cb841a877cab910c5517bd4ddd5ade8eeeee9730842412ea371c745a90c5b69d06d95d2f77adff6b90daff589173525914139bb6bde699f241c3ddaa5662b SHA512 8678e380c257cb7cdbee752bec79bc53632b453bbb72a6c05c9ecbd791285e964ea3a57197dd247b0cd881757f3e5210551755e043126a3db9913f96a0f142ae
diff --git a/gui-libs/gtk/gtk-4.2.0.ebuild b/gui-libs/gtk/gtk-4.2.0.ebuild
new file mode 100644
index 000000000000..da0781e043da
--- /dev/null
+++ b/gui-libs/gtk/gtk-4.2.0.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="4"
+IUSE="aqua broadway cloudprint colord cups examples ffmpeg gstreamer gtk-doc +introspection sysprof test vulkan wayland +X xinerama"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	xinerama? ( X )
+"
+
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="
+	>=dev-libs/fribidi-0.19.7
+	>=dev-libs/glib-2.66.0:2
+	>=media-libs/graphene-1.9.1
+	>=media-libs/libepoxy-1.4[X(+)?]
+	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?]
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?]
+	>=x11-libs/pango-1.47.0[introspection?]
+	>=media-libs/harfbuzz-0.9:=
+	x11-misc/shared-mime-info
+
+	cloudprint? (
+		>=net-libs/rest-0.7
+		>=dev-libs/json-glib-1.0
+	)
+	colord? ( >=x11-misc/colord-0.1.9:0= )
+	cups? ( >=net-print/cups-2.0 )
+	ffmpeg? ( media-video/ffmpeg )
+	gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3 )
+	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+	vulkan? ( media-libs/vulkan-loader:= )
+	wayland? (
+		>=dev-libs/wayland-1.14.91
+		>=dev-libs/wayland-protocols-1.20
+		media-libs/mesa[wayland]
+		>=x11-libs/libxkbcommon-0.2
+	)
+	X? (
+		>=app-accessibility/at-spi2-atk-2.5.3
+		media-libs/fontconfig
+		media-libs/mesa[X(+)]
+		x11-libs/libX11
+		>=x11-libs/libXi-1.3
+		x11-libs/libXext
+		>=x11-libs/libXrandr-1.5
+		x11-libs/libXcursor
+		x11-libs/libXfixes
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		xinerama? ( x11-libs/libXinerama )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/gettext-0.19.7
+	sysprof? ( >=dev-util/sysprof-capture-3.38:4 )
+	test? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc
+	)
+	X? ( x11-base/xorg-proto )
+"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-update-icon-cache-3
+	!<x11-libs/vte-0.31.0:2.90
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+	gnome-base/librsvg
+	>=x11-themes/adwaita-icon-theme-3.14
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-lang/sassc
+	dev-libs/gobject-introspection-common
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.48
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.20
+	virtual/pkgconfig
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.3
+		>=dev-util/gtk-doc-1.33
+	)
+"
+
+src_configure() {
+	local emesonargs=(
+		# GDK backends
+		$(meson_use X x11-backend)
+		$(meson_use wayland wayland-backend)
+		$(meson_use broadway broadway-backend)
+		-Dwin32-backend=false
+		$(meson_use aqua macos-backend)
+
+		# Media backends
+		$(meson_feature ffmpeg media-ffmpeg)
+		$(meson_feature gstreamer media-gstreamer)
+
+		# Print backends
+		$(meson_feature cups print-cups)
+		$(meson_feature cloudprint print-cloudprint)
+
+		# Optional dependencies
+		$(meson_feature vulkan)
+		$(meson_feature xinerama)
+		-Dcloudproviders=disabled  # cloudprovider is not packaged in Gentoo yet
+		$(meson_feature sysprof)
+		-Dtracker=disabled  # tracker3 is not packaged in Gentoo yet
+		$(meson_feature colord)
+
+		# Documentation and introspection
+		$(meson_use gtk-doc gtk_doc)
+		-Dman-pages=true
+		$(meson_feature introspection)
+
+		# Demos and binaries
+		$(meson_use examples build-examples)
+		$(meson_use examples demos)
+		$(meson_use test build-tests)
+		-Dinstall-tests=false
+	)
+	meson_src_configure
+}
+
+src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+
+	if use X; then
+		einfo "Running tests under X"
+		GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx meson_src_test --setup=x11
+	fi
+
+	if use wayland; then
+		einfo "Running tests under Weston"
+
+		export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
+
+		weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
+		compositor=$!
+		export WAYLAND_DISPLAY=wayland-5
+
+		GSETTINGS_SCHEMA_DIR="${S}/gtk" meson_src_test --setup=wayland
+
+		exit_code=$?
+		kill ${compositor}
+	fi
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gui-libs/gtk/metadata.xml b/gui-libs/gtk/metadata.xml
new file mode 100644
index 000000000000..f8215d48ae1d
--- /dev/null
+++ b/gui-libs/gtk/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="broadway">Enable the GDK Broadway backend.</flag>
+		<flag name="cloudprint">Enable printing via Google Cloud Print.</flag>
+		<flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management
+			in printing</flag>
+		<flag name="sysprof">Enable profiling data capture support using
+			<pkg>dev-util/sysprof-capture</pkg></flag>
+		<flag name="vulkan">Enable support for the Vulkan graphics API</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gtk:gtk</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/gui-libs/libhandy/Manifest b/gui-libs/libhandy/Manifest
index 3751fe15abdf..d27a7aa62195 100644
--- a/gui-libs/libhandy/Manifest
+++ b/gui-libs/libhandy/Manifest
@@ -1,9 +1,14 @@
 AUX 0.0.13-glade3.36-compat1.patch 1655 BLAKE2B fcc6be57b5eea5554e5ba0149fdc6fe9067a436b333c299f2b6366c98798e821d6d1c861b0fc299c6de145e9f310ea5822505591e678c36f938802accecbe0e6 SHA512 beffe74c8f78767113930193870165c751443d0f9c3cf5c6df89f1f872c892a559c1d34c63f84090d6187afa4495bc2c6a557335db5a98afc3820fe688a48a6f
 AUX 0.0.13-glade3.36-compat2.patch 1879 BLAKE2B d21b874a52028e2b7e4c09da9fb1b97296872a2a7d1665124813a644c9524e56fdeba2afbca218519edf524e91efb76f6182009319e3b098e2464e478b4b5b2d SHA512 c154ee41052dadc97afe99350a08eb141c61dad7201fe2421ae0c27e9cbd5fad8af057e44ae277a2dac9b22d3e1bf945345791bc764783a8bd19448da63bde95
-DIST libhandy-1.0.2.tar.xz 388756 BLAKE2B c4995c5865378b133ba90125cd2c6c7500730be32b2426ccb323c878c22e556c0aad4eb0a5ab5f6ff936b3132a1717759af826e5bc0c9426b6f6972ac20f4f44 SHA512 411e016e1770ea83507a66e6e751f223304890cd193191c28cf751f8128dc5c98feb5342012596c10219e4da5a2445659395a0e7086d5c9990f7845b0406c685
+AUX 0.0.13-glade3.37-compat.patch 7101 BLAKE2B 5c49a13403f5ee41d2aeb99036925c4d94c9174f55abb3f92a27ea631f641d3678caf250319d9199b68506099bab1617013652fa062535d0fc4ec88655394f7e SHA512 8c758b47afe3c0e79c55561a8e93d1ddc3220073659889eba3b0a245f271ef44f35ad8599bdb30ab524102c41b4b344c0debffc5188bc57fcc7d8fee73b73b94
 DIST libhandy-1.0.3.tar.xz 389068 BLAKE2B 2892103a672551f9a48a2f877568548fe771aeddbf156427baf03f8654488b5a0a8218f621366a47097030eb0ecf5abeb4f021d320046602cda0a028d91ec566 SHA512 cc304acc53e0819dce4931292e395ba44c1eb8630ebfa56390637bf376de226f4545906892967815c3e144423409b5a85e293568d3ed8069a6c4775307aeef4f
+DIST libhandy-1.2.0.tar.xz 481120 BLAKE2B 327a2b1d9bec68a705f0e1cd7ebecc35706a95fd9964482244ebc6fd36f84e1563918286e507b77ec70ba4bab118b0e508a2cebef7514685221b918994d2fa6a SHA512 34f84479fcef6fdd3b46a03a0b4806887708ce8295461eae655e34febdec5b62de56e34e58696545f086be8de1e2c0ac13a61a4bbe0a945a87e7d8e860a5f919
+DIST libhandy-1.2.1.tar.xz 488324 BLAKE2B 9266671b0503971b80d9466673431624600c1ed0d061693187ab2dfe5a017235c985ba997882493f03bd7d6bb0d32c78a8858591dc57f6c101e64987d37eef4a SHA512 0474d1f15a1572ab3f622ec703fc4167beb3ed6062f566d8b50c20894a217c66d00c5b4616d54e65fac312b9836428e8cb83753566cf67abffb9eafbb87dc926
+DIST libhandy-1.2.2.tar.xz 488508 BLAKE2B 1b764c90710de8a7960308b6441657799e6c3a12de9688f720748ca57653f6592fb4ba9f75841d76ae477af7c1709dc4f303658cc543c8de3f6f64d1de7d03cf SHA512 2135d3e15931fa143698de9200803c90e93c87b82c96b4fff90b75075c218a8ef2f69a26210bda8c10fb7195f115b11b804bb6de0b2f65cd464a7cefe35d0af4
 DIST libhandy-v0.0.13.tar.bz2 394811 BLAKE2B 318c226f20b4d8032e984dbd47b4634e828b922dcbc244e4f3f35b94c38f27ed38427196d553809bb1d6bfa7c4830db5d27701e3595cac8a05b58a27ba4a2472 SHA512 a0918c55c9ac14af223a83db542e7dc815d97c844d1f0830a1bee4bdcdf248d00d049fa90fd2be96265535a68d56de5143ddd9264b5e997a902ac9558d5096f3
-EBUILD libhandy-0.0.13.ebuild 1597 BLAKE2B 71348de5c307e2d9918ef11bed12c8e38bfff3ac995c97e9983c2692690f2c859b96090bf52c9bede73a822a2b595bdb730820660dcaca690bcf38c5b0436a55 SHA512 a224091202fb9ba6e3c233ac8c7694de21d776cd64f319299da84ed39bec2ea8973f614d7750e25df0c61374c581f6faee739902eaf5a7aa8764da77b6fd7614
-EBUILD libhandy-1.0.2.ebuild 1250 BLAKE2B d485b113d14e7c640bb5329abf59de104a6e8d1a4568278967c05da082d03ebf856058bc85435447f72456ae4a4173de27eade28292f263f19241ac8d630fa8f SHA512 16ba69dd21140246b0fe93afbb96e0df22bd130f4677d4decf0b84c95d661075970b20236aebbd93d17aafce60e16e0fb883e6b4ee07cf48a4323ccb82578153
-EBUILD libhandy-1.0.3.ebuild 1249 BLAKE2B 1c36bfd5a37ec02de82172074bc113fcaae1cd52bedc7beb559d5fe68b1956715faca38c13f31b1f2b7ae492eec3f560b25a3c99bd3531923e4ed7d8199187c0 SHA512 7ad42a8f9d132ca905c1af011ad2af596a84edcd09d9a574686f57c27202034643277cb21c4f1521955d9c7db427ccb8d6265d320728b34b382fb27effd9e598
+EBUILD libhandy-0.0.13.ebuild 1641 BLAKE2B fdbb3a2bc50d3ddbbce1bef684846a33b96d73b59bbbe7bbe8f609cd62fefdb4951c949da4c5e50e641a6d473f7e8bf7ee4c102cb24f6691b2eae3cddb3a8e83 SHA512 0ca4f29996d3749799c7e8c55aec00598a14099ac1aff8eb70d374e80ae1be985339080eba22bf19d498131428d1201a16c210f381255e3491bfdd0d7f4d6ace
+EBUILD libhandy-1.0.3.ebuild 1247 BLAKE2B 071fce1a5906628b0a40e326287628c1fa2a9e2c0d9b71e1671601f73833b43054656c3aa4b0af5a68d0224453f30bc9c5cb1801e73ff7996f65dd5c2415eec1 SHA512 d49db8606c70cc79b425b2ef553205901543e4715fedca7b9122ecb86933ba3b2f2393fcddee584962c23d36218efc303c734247907ca13b1bab03dfee39861b
+EBUILD libhandy-1.2.0.ebuild 1250 BLAKE2B 2c5ada7d0266a55cb68169de0a8d21049a10ae962bd6f7c80c3acf79cc650c3772531db2a0f455e486bc762d7845851b196b28b49c34914cc86b0ff5f291d910 SHA512 1a1b98c0a7346d0f8f84d86375f52faba3a39e007e910d681f237f13fbe8d4758c4dd39c8100a47d826ef77aa4288d14803de3735317683b1f4816d9e122a5b9
+EBUILD libhandy-1.2.1.ebuild 1250 BLAKE2B 2c5ada7d0266a55cb68169de0a8d21049a10ae962bd6f7c80c3acf79cc650c3772531db2a0f455e486bc762d7845851b196b28b49c34914cc86b0ff5f291d910 SHA512 1a1b98c0a7346d0f8f84d86375f52faba3a39e007e910d681f237f13fbe8d4758c4dd39c8100a47d826ef77aa4288d14803de3735317683b1f4816d9e122a5b9
+EBUILD libhandy-1.2.2.ebuild 1250 BLAKE2B 2c5ada7d0266a55cb68169de0a8d21049a10ae962bd6f7c80c3acf79cc650c3772531db2a0f455e486bc762d7845851b196b28b49c34914cc86b0ff5f291d910 SHA512 1a1b98c0a7346d0f8f84d86375f52faba3a39e007e910d681f237f13fbe8d4758c4dd39c8100a47d826ef77aa4288d14803de3735317683b1f4816d9e122a5b9
 MISC metadata.xml 353 BLAKE2B 7857afbafa45ea4d3230afa20992cf7196bdd23430ba09bd032b5965b3ce6b7ebadf8122b412549a84d798107adbce3f0b1d6ed79975f315889f7a7700187504 SHA512 f54a7b013a4b5f2e94efda2de95f8063a8755fb2162262a2734ea561fa10cd48be737ddbc3ab7ea93f5d1cf3f59dd91c70da25db5d331828aa74194109c5d36f
diff --git a/gui-libs/libhandy/files/0.0.13-glade3.37-compat.patch b/gui-libs/libhandy/files/0.0.13-glade3.37-compat.patch
new file mode 100644
index 000000000000..63568496d637
--- /dev/null
+++ b/gui-libs/libhandy/files/0.0.13-glade3.37-compat.patch
@@ -0,0 +1,173 @@
+From dfb9322ae70236edd45fad695dd6c24517f2ceaf Mon Sep 17 00:00:00 2001
+From: James Westman <james@flyingpimonster.net>
+Date: Wed, 23 Sep 2020 13:14:07 -0500
+Subject: [PATCH] glade: Fix macro renamed in GladeUI 3.37
+
+Glade 3.37 renamed the macro GWA_GET_CLASS to
+GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS [1]. This commit switches to use the new
+macro name, and for older versions of Glade, defines the new name as the old
+one for compatibility.
+
+Fixes #335 and obsoletes !607.
+
+[1]: https://gitlab.gnome.org/GNOME/glade/-/commit/bb626dd41d93c92b587b37f03d295356e39a7d04
+
+mattst88: Backported to 0.0.13
+---
+ glade/glade-hdy-header-group.c | 14 +++++++++++---
+ glade/glade-hdy-paginator.c    | 18 +++++++++++++-----
+ glade/glade-hdy-swipe-group.c  | 14 +++++++++++---
+ 3 files changed, 35 insertions(+), 11 deletions(-)
+
+diff --git a/glade/glade-hdy-header-group.c b/glade/glade-hdy-header-group.c
+index bd620ad..11c3aad 100644
+--- a/glade/glade-hdy-header-group.c
++++ b/glade/glade-hdy-header-group.c
+@@ -14,6 +14,14 @@
+ #include <glib/gi18n-lib.h>
+ #include <gladeui/glade.h>
+ 
++/*
++ * Another macro got renamed in GladeUI 3.38. For older versions of GladeUI,
++ * define the new macro as the old one.
++ */
++#ifndef GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
++#define GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS GWA_GET_CLASS
++#endif
++
+ /* Guess wether we are using a Glade version older than 3.36.
+  *
+  * If yes, redefine some symbols which got renamed.
+@@ -83,7 +91,7 @@ glade_hdy_header_group_read_widget (GladeWidgetAdaptor *adaptor,
+     return;
+ 
+   /* First chain up and read in all the normal properties.. */
+-  GWA_GET_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
++  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
+ 
+   glade_hdy_header_group_read_widgets (widget, node);
+ }
+@@ -129,7 +137,7 @@ glade_hdy_header_group_write_widget (GladeWidgetAdaptor *adaptor,
+     return;
+ 
+   /* First chain up and read in all the normal properties.. */
+-  GWA_GET_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
++  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
+ 
+   glade_hdy_header_group_write_widgets (widget, context, node);
+ }
+@@ -163,7 +171,7 @@ glade_hdy_header_group_set_property (GladeWidgetAdaptor *adaptor,
+                                          GTK_HEADER_BAR (list->data));
+     }
+   } else {
+-    GWA_GET_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object,
++    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object,
+                                                  property_name, value);
+   }
+ }
+diff --git a/glade/glade-hdy-paginator.c b/glade/glade-hdy-paginator.c
+index cce9abf..f34acc8 100644
+--- a/glade/glade-hdy-paginator.c
++++ b/glade/glade-hdy-paginator.c
+@@ -16,6 +16,14 @@
+ 
+ #include <math.h>
+ 
++/*
++ * Another macro got renamed in GladeUI 3.38. For older versions of GladeUI,
++ * define the new macro as the old one.
++ */
++#ifndef GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
++#define GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS GWA_GET_CLASS
++#endif
++
+ #define CENTER_CONTENT_INSENSITIVE_MSG _("This property does not apply unless Show Indicators is set.")
+ 
+ static gint
+@@ -231,7 +239,7 @@ glade_hdy_paginator_child_action_activate (GladeWidgetAdaptor *adaptor,
+ 
+     glade_command_pop_group ();
+   } else
+-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_action_activate (adaptor,
++    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_action_activate (adaptor,
+                                                                container,
+                                                                object,
+                                                                action_path);
+@@ -315,7 +323,7 @@ glade_hdy_paginator_set_property (GladeWidgetAdaptor *adaptor,
+     if (!strcmp (id, "indicator-style"))
+       set_indicator_style (object, value);
+ 
+-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
++    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
+   }
+ }
+ 
+@@ -332,7 +340,7 @@ glade_hdy_paginator_get_property (GladeWidgetAdaptor *adaptor,
+     g_value_reset (value);
+     g_value_set_int (value, hdy_paginator_get_page (HDY_PAGINATOR (object)));
+   } else {
+-    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->get_property (adaptor, object, id, value);
++    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->get_property (adaptor, object, id, value);
+   }
+ }
+ 
+@@ -370,8 +378,8 @@ glade_hdy_paginator_verify_property (GladeWidgetAdaptor *adaptor,
+     return glade_hdy_paginator_verify_n_pages (object, value);
+   else if (!strcmp (id, "page"))
+     return glade_hdy_paginator_verify_page (object, value);
+-  else if (GWA_GET_CLASS (GTK_TYPE_CONTAINER)->verify_property)
+-    return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->verify_property (adaptor, object,
++  else if (GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->verify_property)
++    return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->verify_property (adaptor, object,
+                                                                 id, value);
+ 
+   return TRUE;
+diff --git a/glade/glade-hdy-swipe-group.c b/glade/glade-hdy-swipe-group.c
+index 5b165a2..927dea0 100644
+--- a/glade/glade-hdy-swipe-group.c
++++ b/glade/glade-hdy-swipe-group.c
+@@ -15,6 +15,14 @@
+ #include <glib/gi18n-lib.h>
+ #include <gladeui/glade.h>
+ 
++/*
++ * Another macro got renamed in GladeUI 3.38. For older versions of GladeUI,
++ * define the new macro as the old one.
++ */
++#ifndef GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
++#define GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS GWA_GET_CLASS
++#endif
++
+ /* Guess wether we are using a Glade version older than 3.36.
+  *
+  * If yes, redefine some symbols which got renamed.
+@@ -87,7 +95,7 @@ glade_hdy_swipe_group_read_widget (GladeWidgetAdaptor *adaptor,
+     return;
+ 
+   /* First chain up and read in all the normal properties.. */
+-  GWA_GET_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
++  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
+ 
+   glade_hdy_swipe_group_read_widgets (widget, node);
+ }
+@@ -131,7 +139,7 @@ glade_hdy_swipe_group_write_widget (GladeWidgetAdaptor *adaptor,
+     return;
+ 
+   /* First chain up and read in all the normal properties.. */
+-  GWA_GET_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
++  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
+ 
+   glade_hdy_swipe_group_write_widgets (widget, context, node);
+ }
+@@ -164,7 +172,7 @@ glade_hdy_swipe_group_set_property (GladeWidgetAdaptor *adaptor,
+                                        HDY_SWIPEABLE (list->data));
+     }
+   } else {
+-    GWA_GET_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object,
++    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object,
+                                                  property_name, value);
+   }
+ }
+-- 
+2.26.3
+
diff --git a/gui-libs/libhandy/libhandy-0.0.13.ebuild b/gui-libs/libhandy/libhandy-0.0.13.ebuild
index 5d6f3c895bca..751616d2f13b 100644
--- a/gui-libs/libhandy/libhandy-0.0.13.ebuild
+++ b/gui-libs/libhandy/libhandy-0.0.13.ebuild
@@ -39,6 +39,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-glade3.36-compat{1,2}.patch
+	"${FILESDIR}"/${PV}-glade3.37-compat.patch
 )
 
 src_prepare() {
diff --git a/gui-libs/libhandy/libhandy-1.0.3.ebuild b/gui-libs/libhandy/libhandy-1.0.3.ebuild
index 6184734db505..2e4925e780a0 100644
--- a/gui-libs/libhandy/libhandy-1.0.3.ebuild
+++ b/gui-libs/libhandy/libhandy-1.0.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libhandy/"
 
 LICENSE="LGPL-2.1+"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="examples glade gtk-doc +introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/gui-libs/libhandy/libhandy-1.0.2.ebuild b/gui-libs/libhandy/libhandy-1.2.0.ebuild
index 43d30fc4e3fc..1df7e54eddb4 100644
--- a/gui-libs/libhandy/libhandy-1.0.2.ebuild
+++ b/gui-libs/libhandy/libhandy-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/gui-libs/libhandy/libhandy-1.2.1.ebuild b/gui-libs/libhandy/libhandy-1.2.1.ebuild
new file mode 100644
index 000000000000..1df7e54eddb4
--- /dev/null
+++ b/gui-libs/libhandy/libhandy-1.2.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson xdg vala virtualx
+
+DESCRIPTION="Building blocks for modern adaptive GNOME apps"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libhandy/"
+
+LICENSE="LGPL-2.1+"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="examples glade gtk-doc +introspection test +vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=x11-libs/gtk+-3.24.1:3[introspection?]
+	glade? ( dev-util/glade:3.10= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dprofiling=false # -pg passing
+		$(meson_feature introspection)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use test tests)
+		$(meson_use examples)
+		$(meson_feature glade glade_catalog)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/gui-libs/libhandy/libhandy-1.2.2.ebuild b/gui-libs/libhandy/libhandy-1.2.2.ebuild
new file mode 100644
index 000000000000..1df7e54eddb4
--- /dev/null
+++ b/gui-libs/libhandy/libhandy-1.2.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson xdg vala virtualx
+
+DESCRIPTION="Building blocks for modern adaptive GNOME apps"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libhandy/"
+
+LICENSE="LGPL-2.1+"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="examples glade gtk-doc +introspection test +vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=x11-libs/gtk+-3.24.1:3[introspection?]
+	glade? ( dev-util/glade:3.10= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dprofiling=false # -pg passing
+		$(meson_feature introspection)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use test tests)
+		$(meson_use examples)
+		$(meson_feature glade glade_catalog)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/gui-libs/libwpe/Manifest b/gui-libs/libwpe/Manifest
index c3923b4b0c33..12dd5a679eb5 100644
--- a/gui-libs/libwpe/Manifest
+++ b/gui-libs/libwpe/Manifest
@@ -1,3 +1,5 @@
+DIST libwpe-1.10.0.tar.xz 52004 BLAKE2B 3088cb103b99ab626a74c37910d91fe8abdb07d14d0846bd202716fa1a7d8087e4095e65977e25d9a6f2b97bdfcef664f3872abd8de447ffe3e841a613ebc116 SHA512 b5634dd71cca70eb960f3c045ad109346ab6ce6b01aa8c8bc8f326d232eb16ac1600757896a4b99720af3c77084351ea4f69e2e2c81b9c32cc8bc12a5c66ba3c
 DIST libwpe-1.8.0.tar.xz 51260 BLAKE2B d5f5249e3fffba03a0e87e6a8b2a261e426dc25c2a57d5e060d81f7618e957884c1c74a86a79216d4e5e85f9e173e7629be9c6a674898b20e701fd59d487bd32 SHA512 38b02d97f9ee40a1bb345ba0766acd1852500c704447bde224ac79f41e91abc06fb3047119f9843a11c78cdd5899287ab86ccedbcaefb51e366a1810f2f42fa8
+EBUILD libwpe-1.10.0.ebuild 574 BLAKE2B e323db6c7038585cdf007c602f2ff7239d5819ac5aad73dd753446dcde203f7fa47a4d625eded6c8ecd82da84d7e9ccc856166e5d81c7542d2bfa1bfc12b0399 SHA512 f3a0e17c6ccf24943fccc2071005e8dcec1f992f6d2322d38e62145525aed6275986bcc4831bf52b600451585fd75771f6b6dab9dc0895ddc881f63a14664308
 EBUILD libwpe-1.8.0.ebuild 577 BLAKE2B fded65fffdd22fdec9c06cba3bdb82c107ebe0567e389a375277b8c908c5a41bea7df0ea1425986118b9773748a18b6e3f0fbe5c49e479a4ef5ada2092447ec5 SHA512 e4e49304c2e6edc4883ac650e2be9304e712ee7784d20b22422c46567229001034530ccb8629881a682237047e1de7623437ef923ae74973964582840184f083
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gui-libs/libwpe/libwpe-1.10.0.ebuild b/gui-libs/libwpe/libwpe-1.10.0.ebuild
new file mode 100644
index 000000000000..0e9f6488f905
--- /dev/null
+++ b/gui-libs/libwpe/libwpe-1.10.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Platform-agnostic interfaces for WPE WebKit"
+HOMEPAGE="https://wpewebkit.org/"
+SRC_URI="https://wpewebkit.org/releases/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="1.0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	media-libs/mesa[egl]
+	x11-libs/libxkbcommon
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCS=OFF # hotdoc not packaged
+	)
+
+	cmake_src_configure
+}
diff --git a/gui-libs/tepl/Manifest b/gui-libs/tepl/Manifest
index 54924bcc0069..6b405361ceb2 100644
--- a/gui-libs/tepl/Manifest
+++ b/gui-libs/tepl/Manifest
@@ -1,5 +1,7 @@
 DIST tepl-4.4.0.tar.xz 466576 BLAKE2B fe9d9c625a3febe6fc71e5972b864b0d732b7f75bcc114a391d7f94b2fc242fe7c5199e61d5a69a8ceccb845fffcf830d6071adb1ecda5e223d453d029ed3398 SHA512 2050c28f9564034bea7c44d3fa27784ab87503c2db6cf35e6389c40ca78722b092fbc52df5fdfc85cc1e39a9dc3c0e30fa7993fb63411b0240f3a6ac9607c282
 DIST tepl-5.0.1.tar.xz 126068 BLAKE2B 2c3038326660f6326c5030cb944f8cee885b794a481f6d8f1b5d87a8ea7121ded381d28b36246a99b57bbea5fd9e6d2d4f65f9dfc54d8154ee8aabbccd7e3cb5 SHA512 f363d182185976447d235cf1201148e5201cdabd1fa8b88d7a763a965896f87bd222a0161c11e93662afaf4e474bbd0308643d28559aadc27b9d48974f4c458d
+DIST tepl-6.00.0.tar.xz 141908 BLAKE2B 200693a8cf760d18e1c53647abb8156f7e067557b4cefbd05b03c5a3ec83c3c5807ab93e0464178b68fc9f2572c3175fbf9355f4131df1fe7f79b5e2deb3961e SHA512 e36877b9f33943715a50546d82ed61e65fc07b71dca2c85ff350a305767e96eda74dc14f30b2a430e14deacd4ee8d49697fe01df1f5023afab3747e5e9c95e2e
 EBUILD tepl-4.4.0.ebuild 1406 BLAKE2B 23e69dcecfeee896411b1445da15661d77eb53f7b21d29fdb8e3947112323e6d6598151a5bff02588c785d416a8e19f4cfcb47cb7e6c1e3555f77b0871890a2a SHA512 f33f88640a18939512f8ef81d613bfd7e8212fd4ed0eb9f33e12a3ad7b700f0014827f39a7115dc6b3a309597d3e00bcdc717d47ce36fa69daae258d60d4feea
-EBUILD tepl-5.0.1.ebuild 913 BLAKE2B 1dc8fadd7f9f04e6af2617cbb06fe1d9966b23256e3490f5ff50abf0f9896d54c97601945b74f12d57ce5d646308628cf01feb31fbdd9c16e4be90250953de0e SHA512 1e2d023d6ff6a8f47ed4d8dde7ed580e9c493285f12089b76fa5a8751ee0ce976d3a46c88a0742af02a261faa344a2cbf5859a6daeff04bce10278b7e59517a9
+EBUILD tepl-5.0.1.ebuild 912 BLAKE2B 52a46f67c5093b1c3b469b6dab7565e61bf791e851a27cb40a3cace0fe640b392edeb302fe6b937594406a1abdffd8bebb532c0fbed1346816e90c6094c7412d SHA512 f2e5a99ffa90c3119ad93bd3c58229b834133be58027ce3880b2d4dfef76f3fcadeced29246315f7b69322debc90dad7ec91ac173ee9eea0589c15bcaef659ef
+EBUILD tepl-6.00.0.ebuild 914 BLAKE2B 7a4e5f1056aea1fb1960960859bdad0080a0b6cd4110480c0bf48d5169b133f4e14067f683e016f92555c52f8d39437c359b7bb209e30434ae39f39d582be971 SHA512 ed899804106c47efa5ad146bde28a6b5c5602c367379d1e989afc8ceacc3b4df5f8fbcab71d5b1c48168b53ab6c52d1612ae7caeec338a4e584460cec02be132
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gui-libs/tepl/tepl-5.0.1.ebuild b/gui-libs/tepl/tepl-5.0.1.ebuild
index 5900fa606da2..d870f6abfed5 100644
--- a/gui-libs/tepl/tepl-5.0.1.ebuild
+++ b/gui-libs/tepl/tepl-5.0.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Tepl"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="gtk-doc"
 
 RDEPEND="
diff --git a/gui-libs/tepl/tepl-6.00.0.ebuild b/gui-libs/tepl/tepl-6.00.0.ebuild
new file mode 100644
index 000000000000..4e673848195b
--- /dev/null
+++ b/gui-libs/tepl/tepl-6.00.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson virtualx
+
+DESCRIPTION="GtkSourceView-based text editors and IDE helper library"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tepl"
+
+LICENSE="LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk-doc"
+
+RDEPEND="
+	>=dev-libs/glib-2.64:2
+	>=dev-libs/gobject-introspection-1.42:=
+	>=x11-libs/gtk+-3.22:3[introspection]
+	>=x11-libs/gtksourceview-4.0:4[introspection]
+	>=gui-libs/amtk-5.0:5[introspection]
+	>=dev-libs/libxml2-2.5:2
+	app-i18n/uchardet
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-devel/gettext-0.19.6
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.25
+	virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index e5e12c8e330c..27a5f8e09d4a 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -1,6 +1,8 @@
 DIST wlroots-0.11.0.tar.gz 481126 BLAKE2B d2262298f24948293643b02c823851b4643289f776bc087d7b67240f4c9c76a7aca03c7dc7e13a65b3d0d3a7c8a5f5246a0e282d2cb3b88bbae0ef94b906f18a SHA512 a8a0c498d10664ff0a5aab8ad1a4fd034179542eff38b058e1da7e4653c42136e4a3586634f3d0a25a985aa7f4c5d17260117d9f4a70a7f8060494c04456f575
 DIST wlroots-0.12.0.tar.gz 476936 BLAKE2B 4129c87a148085f95f4cee6973308d79ab3f8b024247287a68dadd6729da8a5f8cc1e4ada63c15477a2c8e8258032440afe4a21a26f947143d17c87b0ca8a1a4 SHA512 560eae30932b777c1f07fb44592d5601c5d10ef74b31b6b9e4166a14caadab2bfa88d39282f159785d4c7f22f78d204f9bb7fab65d58afaf14b72a8486f9b415
+DIST wlroots-0.13.0.tar.gz 503575 BLAKE2B bfcd40ea5cf9f85157b9a44a4a49f0fef1c82c2199ee428316b578e8d53cc39276b42d0a2c4b6b94d1a1f49df5d312539cdf4d053ea2472e0de93254e39dc015 SHA512 1c942a6b8a628383e2b68cd9096d3525021347c5c363a8239a3b4fb0d5736ffcd3e2c1333fdd7d95ecf214dd04bf01062b4f1b4fbbcd88d1d086a55261ca0c82
 EBUILD wlroots-0.11.0.ebuild 1855 BLAKE2B cdf38296782645752facdb54febb5a75ae7a4577809ce14ec24fb31109193810fecfbaaba16536b7633e86799d480da7426203e61309a02063b0497c0178e3e9 SHA512 5447e589bfa0057b55a2ff918a900357b59ec8ef6f33b5ed81175a32b3305fb9e803d0ba75c307179b86c289cab75d5df057ed89548f89587fcef24be6cee897
 EBUILD wlroots-0.12.0.ebuild 1933 BLAKE2B 716d5177e922e17cf03249e3be4e9277bc04e5b42b9878addad282462f1f815e2cb1d9f8a7d0da74d066926e9225e6874516e6259120d7c76352eea559bd3120 SHA512 081c33aebe7a0326563f3143411cadbec78cb499db231b37c0ba8dbec19a817fb3f79b1199093b564a99282745c95cc6212e5bfd8757e05b857890dec4c20e6b
-EBUILD wlroots-9999.ebuild 1938 BLAKE2B 090142ff895880bd3ca362bcaa7151fa84f41a32f1e594184e2fed3e9e52937e7e1c4313d9e407f7b28d1610a34b1e58297e95a33c363959896e67b01ad52934 SHA512 9382966698c381ff23d2dce9d22b7a244110944b41db08ab6d9ded7f05c6d9afd7b556a4f0baeef19c613612d9cc65612e0186fc4292bf19e2527c630ada2552
+EBUILD wlroots-0.13.0.ebuild 1953 BLAKE2B b50e4871bb53bae03abf0de816bf94082149ecf6e383b9ba5c87b1f9da6417537d43d6598b68b847c0795b63b352ccbde383a437b81db642f744e18b7d355ad2 SHA512 8c6ac6e38484e9470e9ae59aaa7d00da0d9adce5dda30eb1afffd7411112d264d20229ebfeb58a2e8859ccf15e4cd59613270a7f1c1019aa1c9db82ded970369
+EBUILD wlroots-9999.ebuild 1502 BLAKE2B cc3fe493692c7063ceb2d505603b3d508cc88807e4608d653afbc19e94d80261b7279ca1d44fda8ad41afcb4f29ac20f7a13607b5d5aa1a6d3685e76e8536745 SHA512 577162e7a4f5181b196f7cf8cd209fa0099b45ef8b6bcfdb32841f17ae4748ebd139107d5667de1c2799876d522a7f31a681cfca85af9dd79e7ccd2cf6c11e05
 MISC metadata.xml 1719 BLAKE2B 363f75063f67b87b9447f4aafa37c528a6b418f8bf8039453c79a9d8a7e4c9bfb60c36b181f311f21dc26c854b51d98b060fd3367d0f45787420c61cec426577 SHA512 a75cb0f8f9b3ce1576c4e688b0abff4f2c68e57a4661b1ffb46a1d3b0d6edd3cea2a8bcf69558ff9210d654daba38c7fe5d8b1ad2c1cacaa78387f6623089633
diff --git a/gui-libs/wlroots/wlroots-0.13.0.ebuild b/gui-libs/wlroots/wlroots-0.13.0.ebuild
new file mode 100644
index 000000000000..da2f898bd72a
--- /dev/null
+++ b/gui-libs/wlroots/wlroots-0.13.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps meson
+
+DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
+HOMEPAGE="https://github.com/swaywm/wlroots"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+	inherit git-r3
+	SLOT="0/9999"
+else
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	SLOT="0/13"
+fi
+
+LICENSE="MIT"
+IUSE="elogind icccm seatd systemd x11-backend X"
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	>=dev-libs/libinput-1.14.0:0=
+	>=dev-libs/wayland-1.19.0
+	>=dev-libs/wayland-protocols-1.17.0
+	media-libs/mesa[egl,gles2,gbm]
+	virtual/libudev
+	x11-libs/libdrm
+	x11-libs/libxkbcommon
+	x11-libs/pixman
+	elogind? ( >=sys-auth/elogind-237 )
+	icccm? ( x11-libs/xcb-util-wm )
+	seatd? ( sys-auth/seatd:= )
+	systemd? ( >=sys-apps/systemd-237 )
+	x11-backend? ( x11-libs/libxcb:0= )
+	X? (
+		x11-base/xorg-server[wayland]
+		x11-libs/libxcb:0=
+		x11-libs/xcb-util-image
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.17
+	>=dev-util/meson-0.56.0
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
+	local emesonargs=(
+		"-Dxcb-errors=disabled"
+		-Dxcb-icccm=$(usex icccm enabled disabled)
+		-Dxwayland=$(usex X enabled disabled)
+		-Dx11-backend=$(usex x11-backend enabled disabled)
+		"-Dexamples=false"
+		"-Dwerror=false"
+		-Dlibseat=$(usex seatd enabled disabled)
+	)
+	if use systemd; then
+		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
+	elif use elogind; then
+		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
+	else
+		emesonargs+=("-Dlogind=disabled")
+	fi
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	elog "You must be in the input group to allow your compositor"
+	elog "to access input devices via libinput."
+}
diff --git a/gui-libs/wlroots/wlroots-9999.ebuild b/gui-libs/wlroots/wlroots-9999.ebuild
index c37237839e1e..cb80b4e42fd5 100644
--- a/gui-libs/wlroots/wlroots-9999.ebuild
+++ b/gui-libs/wlroots/wlroots-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit fcaps meson
+inherit meson
 
 DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
 HOMEPAGE="https://github.com/swaywm/wlroots"
@@ -11,34 +11,32 @@ HOMEPAGE="https://github.com/swaywm/wlroots"
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
 	inherit git-r3
+	SLOT="0/9999"
 else
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	SLOT="0/14"
 fi
 
 LICENSE="MIT"
-SLOT="0/9999"
-IUSE="elogind icccm seatd systemd x11-backend X"
-REQUIRED_USE="?? ( elogind systemd )"
+IUSE="x11-backend X"
 
 DEPEND="
-	>=dev-libs/libinput-1.9.0:0=
+	>=dev-libs/libinput-1.14.0:0=
 	>=dev-libs/wayland-1.19.0
 	>=dev-libs/wayland-protocols-1.17.0
 	media-libs/mesa[egl,gles2,gbm]
+	sys-auth/seatd:=
 	virtual/libudev
 	x11-libs/libdrm
 	x11-libs/libxkbcommon
 	x11-libs/pixman
-	elogind? ( >=sys-auth/elogind-237 )
-	icccm? ( x11-libs/xcb-util-wm )
-	seatd? ( sys-auth/seatd:= )
-	systemd? ( >=sys-apps/systemd-237 )
 	x11-backend? ( x11-libs/libxcb:0= )
 	X? (
 		x11-base/xorg-server[wayland]
 		x11-libs/libxcb:0=
 		x11-libs/xcb-util-image
+		x11-libs/xcb-util-wm
 	)
 "
 RDEPEND="
@@ -54,20 +52,12 @@ src_configure() {
 	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
 	local emesonargs=(
 		"-Dxcb-errors=disabled"
-		-Dxcb-icccm=$(usex icccm enabled disabled)
-		-Dxwayland=$(usex X enabled disabled)
-		-Dx11-backend=$(usex x11-backend enabled disabled)
 		"-Dexamples=false"
 		"-Dwerror=false"
-		-Dlibseat=$(usex seatd enabled disabled)
+		"-Drenderers=gles2"
+		-Dxwayland=$(usex X enabled disabled)
+		-Dx11-backend=$(usex x11-backend enabled disabled)
 	)
-	if use systemd; then
-		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
-	elif use elogind; then
-		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
-	else
-		emesonargs+=("-Dlogind=disabled")
-	fi
 
 	meson_src_configure
 }
diff --git a/gui-libs/wpebackend-fdo/Manifest b/gui-libs/wpebackend-fdo/Manifest
index 6217d882de18..b6d54b71e590 100644
--- a/gui-libs/wpebackend-fdo/Manifest
+++ b/gui-libs/wpebackend-fdo/Manifest
@@ -1,3 +1,5 @@
 DIST wpebackend-fdo-1.8.0.tar.xz 42520 BLAKE2B 885a1eee84d040e176a4f9d06e3cd527a6f619c3a85f19f2331b18a84460a102692aec3f3a1a5eff96e9fe858aa45df5ab5785db5c8c71f76cee5dc3a49f0338 SHA512 e885a169e89f90bdd38149894406af368ddd951a17612975a459bd958fef3adf46f39f80c2264a9a2eae965984a8f1f61b36440836780e73cb4e7b8f433335a6
+DIST wpebackend-fdo-1.8.3.tar.xz 42976 BLAKE2B 9c155f7da5bcfb9a485ffc9aca24bf27aa423cf1f456deec628de9ba1cbfc92c30041572562148403889442caf3953bc4bd075df980cca12db5e30f97bfaeb5d SHA512 5b53604d192d78d92644dd9d266f06ac149fc404850e2c68ad0cef04b98931bd8417791450d96d60bdf8f02fae6c486c2d53c61dbf3da5d556bc4daba0b7b528
 EBUILD wpebackend-fdo-1.8.0.ebuild 633 BLAKE2B d2bf545e94c9f923d7f38e73bd2d65a719c954e727cac98ad6acb062ffe2c86e3ada6016cae5141b0811fec7dfc3b27f706ada0ada4a5c3058ba1e0e5638cbe5 SHA512 8c46f7c93cc9fba12d29dda2430b9e8ab4cac4b0d34f4295939a02df6fbb850358cd4ab00b37aa2ead724cc828876283610026e0ee90200ed3de3b9d87e7ba16
+EBUILD wpebackend-fdo-1.8.3.ebuild 630 BLAKE2B 5aa71f6425525ca425523167e5694e092d8477e01c4a5f5010013944ce864e638f2954c2514a3f91d5ed04d5c114157c7a99d54e11eba849f748b0182dd47d2f SHA512 9870a58f33f416ee4a5717ff0dc9397c2bb2a0ecb4b8f38f4994ced2c7fb0342c81bd80b6e87d3d7bff953bffa3e1b7754665b8c97a646d0c4381072d7278f3e
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.3.ebuild b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.3.ebuild
new file mode 100644
index 000000000000..d71374deea58
--- /dev/null
+++ b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="WPE backend designed for Linux desktop systems"
+HOMEPAGE="https://wpewebkit.org/"
+SRC_URI="https://wpewebkit.org/releases/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="1.0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	media-libs/libepoxy[egl]
+	dev-libs/glib:2
+	>=dev-libs/wayland-1.10
+	>=gui-libs/libwpe-1.5.90:1.0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCS=OFF # hotdoc not packaged
+	)
+
+	cmake_src_configure
+}