gentoo resync : 12.05.2022

21 files changed, 632 insertions, 256 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 39db6fd6f973..9d138e309e3e 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/bspwm/Manifest b/x11-wm/bspwm/Manifest
index 6717abc71384..a46555ff8a5d 100644
--- a/x11-wm/bspwm/Manifest
+++ b/x11-wm/bspwm/Manifest
@@ -1,6 +1,4 @@
 AUX bspwm-session 1876 BLAKE2B 8e1a9eaf2a1721d2b6272b6f0e1f9692fbab8b94aacf2dd52db7dc4ebd97189d36f6d464e588c06084fd433f16901576ea9f682dd54858b7780a9c8732767fdd SHA512 04d89bdd5ca5a9163e576c41dee9420fff8c51ab4a53aca179060b9f6b348537ad96d4257964e7bc4422d836a21c52f82fdc30a6b7b07c229c9934d7620d90ee
 DIST bspwm-0.9.10.tar.gz 114099 BLAKE2B 0fd14d3605e05146435d408846844b7e5015290f97fdd00683eb5388b43678df42a76f1710660ee8036b7100d79a54400c13bf9450333d573a78846d2124516e SHA512 9ccb98c4e80635a781b3f889d8c3ae621c0926a79e9607268924b78bd11137caf70ee9a1edf5bc137d362d2acbe2984645f58ba31c586e6b017797758a66f9cf
-DIST bspwm-0.9.9.tar.gz 111119 BLAKE2B b4f80f090582c48ff5322bf6b03db5aee5bab1868b39ee3c4a3ca9f46f0f5d243a94bd869f2c91dcfbca22136c632b4fa0a2dee0e5fd2f27bd170b1f85c69545 SHA512 17f70e44667813fafcf0df144ed211df5a4479af6dfaf6e0a6bb7154a7380fa48d6135e8c440b6202d07012b76ac7372f73d4bf2f0c3a6716ed998d2ee4e59a2
 EBUILD bspwm-0.9.10.ebuild 963 BLAKE2B 63c3c721e8a8fcb374d5d82a37b2415a57fd514601fc1ce02d8a2dfc5d863271ccc378bf8a4cc06601748dfc37a6d610ed770c3e645d709d22565ff5b2b4b5f4 SHA512 de2814bec71e338da2b2cde5f378b51d94ad548bdf60740cefd1e1d27daa6d1d786080e9810f57b4484b3bdc59624c6f0bba068faf17ea059c93f2828c5a703a
-EBUILD bspwm-0.9.9.ebuild 980 BLAKE2B 6334d4ef01fd74ed27c02b016784721c635567bf71c431bac57b02c5b510cb7916c3a6516e36482d84686ccd1f9683dd4365b3a55374a240d3e4970afeb45003 SHA512 674eed848ffd30d8cf299ab7606a2165b35e17e4f2c98aad47c9941edc43ba878b9ef6fcfd3f81e56571fd10591aa832565e66496de35ee8fefa48ef26f48147
 MISC metadata.xml 250 BLAKE2B 753e22fd7acbe07e206d1eb6a8a7d7a1a9752b8e11a6a84086c96ef112026ed6f0f8e64812d737c45edcb638cb63c50a8fa4ea1f22e9aed32f841c3d398a84d0 SHA512 7ee35c9acc3a7a67d28c368f27d4b052af0334423c941d183b170a713f3004289eda105d0ec27df474094fba6ba32226eeaa5bb7befdaea53357b61ef15cee9d
diff --git a/x11-wm/bspwm/bspwm-0.9.9.ebuild b/x11-wm/bspwm/bspwm-0.9.9.ebuild
deleted file mode 100644
index de939e4ebc65..000000000000
--- a/x11-wm/bspwm/bspwm-0.9.9.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="Tiling window manager based on binary space partitioning"
-HOMEPAGE="https://github.com/baskerville/bspwm/"
-SRC_URI="https://github.com/baskerville/bspwm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="examples"
-
-DEPEND="
-	x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-libs/xcb-util-wm
-"
-RDEPEND="${DEPEND}
-	x11-misc/sxhkd
-"
-
-src_compile() {
-	emake PREFIX="${EPREFIX}/usr" CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" DOCPREFIX="${EPREFIX}/usr/share/doc/${PF}" install
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session ${PN}
-
-	insinto /usr/share/xsessions
-	doins contrib/freedesktop/bspwm.desktop
-
-	insinto /etc/xdg/sxhkd
-	doins examples/sxhkdrc
-
-	if use examples ; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 841f1bbf7d23..8bcde85ea453 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,8 +1,8 @@
 AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0
 DIST icewm-2.8.0.tar.lz 1745937 BLAKE2B dc5c4c6e4b5f067881176a0f72914f971dbae3daa475ed7ca00dbf3f687aae97874a0cf2e94b0d22d45f7dc221390c0658674e9aad3ea19d21a171b6d478c4be SHA512 552d1da9ceb96c6c14a0dfd596656a56fb289716a787fb75e54b49ef6df84747a4999ce733a6ffb9ff7a1e4c0243253fc3f2fa7a2251e7f3987ab9f33c0a1b30
-DIST icewm-2.9.5.tar.lz 1768082 BLAKE2B 1e8c4885dcf6e912647d4f785e811b38eed3e8761213345c4687f6c347356e99f213eded7a5534bf3f9b8335dbaf1665b6fbfd8503f24cb98b79d7c7f3380b04 SHA512 5bfe5bf1edeead54f2046adfb21e31a23af1e86c018e7c6934309a3a47aae6b7c1bd0365460c062ad7a1e1fa9734a3f0425e1e7a2cfc2652ac123c1f1a92ae96
 DIST icewm-2.9.6.tar.lz 1763654 BLAKE2B 6d002e8f1c10bc6a0867308ede058beb0d044ef57a91c66a557271a100dcafe21f1499a90a5d95924a2ff0c9d9456c64996de4cfbad29172b9c08dec15afb8ed SHA512 7deea4d4bc8cd856aa06d0578257cef557b0fdf4e03208ec7a890bfd22171dbda3b5d94b166fbefa2e72cabe9c23295b63963dfc6024181bc9632f0210e2b348
+DIST icewm-2.9.7.tar.lz 1764916 BLAKE2B b2b88f96bb71999c3580c7df6b3f8858aca2a49f02b64f8e94e3c223ddf2bb660c0121e6172cf690424ce4bb002b95fd78589329d97a5f1695b5890ceee9e9ae SHA512 1ec2a73536a08f252d2c16f21b8d8646f4179ce025d6e828c6b9ae2405febe048ed4ab5c7d079a4a83cb4a83a5e027ae6ef1262ee0438c68f4d6124da552114d
 EBUILD icewm-2.8.0.ebuild 2945 BLAKE2B e3eb96395c915d19bf7eca3e93b6f8bd9eb0fdd355a997b77a4892a83a980f2d36e53283626094a82cb97f07c033979a7c5154ff5a714e2751a7e1537338946a SHA512 44524828aa2f0d752ada604cb4f8fae4534d236a5d0bc836f713bf7df385795ccc9fa522690da51a5d4503671b974d8c9538afc94cb0518fc28f825a20c860b0
-EBUILD icewm-2.9.5.ebuild 2949 BLAKE2B 59c8d51cc721ac2bada2a6efd8b5c135f29b988bb833d2268a87c690299d86b7cfc6cae69749af177acb9fd3440a7ca16580ae0ae311278b8ad65c4309b44b7e SHA512 f3b80189c40aa59f9f4ad41ea5310779abbc00f214a6f7a66557c60ed3cd80d7a47db9b4987046beb1e7890600d96bec945036ea5557ba182d6f435021cf857c
 EBUILD icewm-2.9.6.ebuild 2949 BLAKE2B 59c8d51cc721ac2bada2a6efd8b5c135f29b988bb833d2268a87c690299d86b7cfc6cae69749af177acb9fd3440a7ca16580ae0ae311278b8ad65c4309b44b7e SHA512 f3b80189c40aa59f9f4ad41ea5310779abbc00f214a6f7a66557c60ed3cd80d7a47db9b4987046beb1e7890600d96bec945036ea5557ba182d6f435021cf857c
+EBUILD icewm-2.9.7.ebuild 2949 BLAKE2B 59c8d51cc721ac2bada2a6efd8b5c135f29b988bb833d2268a87c690299d86b7cfc6cae69749af177acb9fd3440a7ca16580ae0ae311278b8ad65c4309b44b7e SHA512 f3b80189c40aa59f9f4ad41ea5310779abbc00f214a6f7a66557c60ed3cd80d7a47db9b4987046beb1e7890600d96bec945036ea5557ba182d6f435021cf857c
 MISC metadata.xml 748 BLAKE2B 340b1eea319761630ad5bc22dc734fbfc2492acb263f03ea267e3c37c6c2928ba23cde5ee670c9265dae8bc3f78cdacf584c32d6c65219e859cf6df3b283be4d SHA512 4ba0d01e983f7a6c16ce6da6a7f54fb962154d50db8b820855e2c0dda7609526fc1aae039b469c27eaf6bd09a71b3c951c58b2a84d8aea9ce9fce4a5eff48b46
diff --git a/x11-wm/icewm/icewm-2.9.5.ebuild b/x11-wm/icewm/icewm-2.9.7.ebuild
index 0b653160bbb5..0b653160bbb5 100644
--- a/x11-wm/icewm/icewm-2.9.5.ebuild
+++ b/x11-wm/icewm/icewm-2.9.7.ebuild
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 98e21effd7e8..36c345322c44 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,5 +1,3 @@
-DIST muffin-5.0.2.tar.gz 5197188 BLAKE2B 88a7530359386ceb14b0b509e1769d8cc4d552d9afa45faf6dbd62a457c7ca19d59e553176cf3689c3d22962c761a8633f6880802ea3c5453ff07901e3ca5374 SHA512 4f31b5a4b81db5967a3bc21b7f2bdbb30f47f5dcde12be467cd27f340164483ab43b423cd043dce50201c9b900ccab4a0fc84f4f6e22c66e901cd0c6d986761d
 DIST muffin-5.2.0.tar.gz 5197334 BLAKE2B e1c3ffc6f88ef4a6c5b2f3e03838448540baeeacce3029a039b2fae1804c79193f9ee0bb64d9187f4b2f7f902f47211dc5c5fb185e4f2fcf94513bfe2f0913bf SHA512 16d83d10e8ca4f0cc1cb679e8bf8bc0fd0788d656fa39470a921d848bcb0b158ef56bdd681a842e2ca41b40cb0121007d5e7f5f7f1570459b31fd21a78f96932
-EBUILD muffin-5.0.2.ebuild 2346 BLAKE2B c2b8ee69a05dbf4d8f3c9e9e20a5f1a5fc718d831f486cc3abe5396e2acfd5bb530224ee3b4faa36a07dca52323376c36564cb5c35284f478673fb0c106bf139 SHA512 933886bf4590cd3c5909fce63b5f5e7da939ec59e0bede656bbf13626b2650c701c3ffd7f422d74eec6ec7ee255baa53f1d205c5e2aa63b85da1592a7b7f58a8
-EBUILD muffin-5.2.0.ebuild 2353 BLAKE2B 4efc9d7f6ead92f50a03a21503c4b3a58d0b5c223d052a124dc4228b168f90b6682df533d267175774a9bb3e99df1c528f52dbff9b0a19ef97efbace7fb24820 SHA512 43c850437a78e6368c058a5d543e87e5c910e323caf18c1b875bd992600b781178f2e555622cc91ff632fd337e503668e7ae6f5afde6b132c1cdd3b85f006541
+EBUILD muffin-5.2.0.ebuild 2351 BLAKE2B 8018602b5f1dfab90f2ca00914521e69fc663cbdea767e2f28a2582020b010de17b40ee8503ea9664e6b4153adc370920e9555a22a11ed2dbaa798ff13c48ef0 SHA512 2fdce7f45641e1d6e6bc7dd4251e164bd9d7b0c1b38408bb2d1401447a2a9cbe30e19e53acb3b0a43e1c79bbe358a2fa0fd002e023abf9dc52461f6dd0e79511
 MISC metadata.xml 486 BLAKE2B 26fc8398897e069e47a85126a78fe71fe0f6b0fad0a32078f2799fd4d15db18ebe4ff010f2a2b4889e2c27fe1bdc6244abb2c11ac02f1f1c050a5f2ba37c810d SHA512 ffb4b8c46f6fe2324d68c3041308342e550b3424c1909455cfad12d1a268eda4279ea28bd1836893f453fe9a45df568e81a6fb15d72b68fefdaad27fb8106315
diff --git a/x11-wm/muffin/muffin-5.0.2.ebuild b/x11-wm/muffin/muffin-5.0.2.ebuild
deleted file mode 100644
index 0d24a28f38de..000000000000
--- a/x11-wm/muffin/muffin-5.0.2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools gnome2-utils xdg-utils virtualx
-
-DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/muffin"
-SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection test xinerama"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=dev-libs/json-glib-1.0
-	>=gnome-extra/cinnamon-desktop-5.0:0=
-	gnome-extra/zenity
-	>=media-libs/libcanberra-0.26[gtk3]
-	virtual/opengl
-	>=x11-libs/cairo-1.14:=[X]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libxcb
-	>=x11-libs/libXcomposite-0.3
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	>=x11-libs/libXi-1.6.0
-	>=x11-libs/libxkbcommon-0.4.3[X]
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	>=x11-libs/pango-1.14.0[X,introspection?]
-	>=x11-libs/startup-notification-0.7:=
-	x11-misc/xkeyboard-config
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-
-	test? ( app-text/docbook-xml-dtd:4.5 )
-"
-# needs gtk-doc, not just -am, for gtk-doc.make
-BDEPEND="
-	dev-util/glib-utils
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	eautoreconf
-	gnome2_disable_deprecation_warning
-}
-
-# Wayland is not supported upstream.
-src_configure() {
-	econf \
-		--disable-gtk-doc \
-		--disable-maintainer-mode \
-		--disable-schemas-compile \
-		--enable-compile-warnings=minimum \
-		--disable-static \
-		--enable-shape \
-		--enable-sm \
-		--enable-startup-notification \
-		--enable-xsync \
-		--enable-verbose-mode \
-		--with-libcanberra \
-		$(use_enable introspection) \
-		$(use_enable xinerama)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	dodoc HACKING MAINTAINERS *.txt doc/*.txt
-}
-
-src_test() {
-	virtx default
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_schemas_update
-}
diff --git a/x11-wm/muffin/muffin-5.2.0.ebuild b/x11-wm/muffin/muffin-5.2.0.ebuild
index e68e869ca9bc..694c008dc14d 100644
--- a/x11-wm/muffin/muffin-5.2.0.ebuild
+++ b/x11-wm/muffin/muffin-5.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+introspection test xinerama"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.37.3:2[dbus]
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 1686677fcf46..b648fd6f361d 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -2,6 +2,8 @@ AUX mutter-40.0-Disable-anonymous-file-test.patch 862 BLAKE2B bb7a0f0dfa5f0543c9
 AUX mutter-42.0-Disable-anonymous-file-test.patch 765 BLAKE2B 7d223e0dc98963b61cb0bc26ec22775e87942f88f97af7dbcde63e0d960f5b41afc3de0b358b0c6252de90af4451d4fd6c75b7815ab573c7199b0c82cdd1eb7d SHA512 c066d1b5541078c6cc8d2788b36935b9aff0f1fbb800f39fa4674755a6842be66736c57b43d5edb00e5c18a33c1ff17d54a546134e5aae8ebd9a8967cd46b164
 DIST mutter-41.4.tar.xz 2717012 BLAKE2B 2f9d144380072427c0ee65c1e3bb26e5caca76e0656f316459a77df09f9e8bda3ea9c17c6400d04abee9c7f82b36dbd035794cf31feef7ee4574ce308d627e55 SHA512 ee3881f9047f0b9ef8598609e9ac90294cb36a7549fcc6a647a80553045ed315998d0dbac247887ae06b32126bab1525f13f7f92655b9103cac77750e347e405
 DIST mutter-42.0.tar.xz 2742212 BLAKE2B 4867d184fbf63f7624c907f941f1aa1ac8d66108554385c1500b6259958a3c2bf5dcd30cebed95cbafd4a1bbd5368b6078edec695884a0ee9eb48dbf0ad4cecf SHA512 ffcfbb1b6d3add84adf2d67d459905d164dc272289b645994288c376bc656481526d445cdfe6df027b88ab590258ee9d9d4ba251e03c6ef93d17f0758f75520d
+DIST mutter-42.1.tar.xz 2747056 BLAKE2B 7973e6178e3a61078c37c593a8ffabbd002b791b8251fdf9aa7c90b40efa76591f9946cdd31dd6f274c2a4455157c8661d63714619f3966250eeca5ddae34689 SHA512 b7c7011f1c3c4361ddfdcffc61057f8821c37cfb602d7f7ec97fdd1f0ab19dd331f396ca4f61c83253d003d1d866b0d2ff1e7f34bbc9e98b48aacb973aabd6d5
 EBUILD mutter-41.4.ebuild 4973 BLAKE2B cf7432698172a8ec8baff3d665201e3f531c888acf9cca24eee2dbb33b743f536161a9ad88c7d83a5b6564594794c4ec6c5bb4346e38344a9adac8edc69f2baf SHA512 f8566f3a13911e970ca52e5fd057a8d80b9d782d5ef5bd1a85ab310514a7afa9f6c4bb5d1c4042b421f819ef0a9e02b0d623b531fb9d76a49147f4c24f1f9532
 EBUILD mutter-42.0-r1.ebuild 5377 BLAKE2B bdd67a1ac3dfa4f2494c78848138cc10043add8e5fec79e3aa21c294475abb21660c7f672e73d6eb2de7e3cc70b0ddc9cd0a52b8281693b53514e689ede06197 SHA512 d83ec646bfbfdd02c5b462c40e9c8ed15b2f050cfd277445d38e5c9d921f34aca53f9ce5c6cd14e05a803b197532f8419fc4f0546caab06be18d555e79d0d25a
+EBUILD mutter-42.1.ebuild 5377 BLAKE2B bdd67a1ac3dfa4f2494c78848138cc10043add8e5fec79e3aa21c294475abb21660c7f672e73d6eb2de7e3cc70b0ddc9cd0a52b8281693b53514e689ede06197 SHA512 d83ec646bfbfdd02c5b462c40e9c8ed15b2f050cfd277445d38e5c9d921f34aca53f9ce5c6cd14e05a803b197532f8419fc4f0546caab06be18d555e79d0d25a
 MISC metadata.xml 606 BLAKE2B 54a05fee61cf9a1d958a46e0cc94e1cd61e69e187f89393c483c7022d455b7248684df4f1df028f0733995dacfbdf1faab600d8c239885eb0c7ea3097326f156 SHA512 6dea733bb5da3bd2db059a467cec81f7cfc0765750cdcfa0404a72cbb168495f13d01051198206178615b1a3fa41f78dffd9f0a38f6d7579116e782d76fab899
diff --git a/x11-wm/mutter/mutter-42.1.ebuild b/x11-wm/mutter/mutter-42.1.ebuild
new file mode 100644
index 000000000000..64c4d9748678
--- /dev/null
+++ b/x11-wm/mutter/mutter-42.1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+inherit gnome.org gnome2-utils meson python-any-r1 udev xdg
+
+DESCRIPTION="GNOME compositing window manager based on Clutter"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
+
+LICENSE="GPL-2+"
+SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
+
+IUSE="doc elogind gnome input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
+# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
+REQUIRED_USE="
+	wayland? ( ^^ ( elogind systemd ) udev )
+	test? ( wayland )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
+# xorg-server is needed at build and runtime with USE=wayland for Xwayland
+# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
+DEPEND="
+	>=x11-libs/libX11-1.7.0
+	>=media-libs/graphene-1.10.2[introspection?]
+	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/pango-1.46[introspection?]
+	>=dev-libs/fribidi-1.0.0
+	>=x11-libs/cairo-1.14[X]
+	>=gnome-base/gsettings-desktop-schemas-42.0[introspection?]
+	>=dev-libs/glib-2.69.0:2
+	gnome-base/gnome-settings-daemon
+	>=dev-libs/json-glib-0.12.0[introspection?]
+	>=x11-libs/libXcomposite-0.4
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	>=x11-libs/libXfixes-3
+	>=x11-libs/libXi-1.7.4
+	x11-libs/libXtst
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	>=x11-libs/libxkbcommon-0.4.3[X]
+	x11-libs/libXrender
+	>=x11-libs/libXrandr-1.5.0
+	x11-libs/libxcb
+	x11-libs/libXinerama
+	x11-libs/libXau
+	x11-libs/libICE
+	>=dev-libs/atk-2.5.3[introspection?]
+	>=media-libs/libcanberra-0.26
+	sys-apps/dbus
+	gnome? ( gnome-base/gnome-desktop:3= )
+	media-libs/mesa[X(+),egl(+)]
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+	systemd? ( sys-apps/systemd )
+	wayland? (
+		>=dev-libs/wayland-protocols-1.21
+		>=dev-libs/wayland-1.18.0
+		x11-libs/libdrm:=
+		>=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2]
+		>=dev-libs/libinput-1.18.0
+		elogind? ( sys-auth/elogind )
+		x11-base/xwayland
+		video_cards_nvidia? ( gui-libs/egl-wayland )
+	)
+	udev? ( >=dev-libs/libgudev-232:=
+		>=virtual/libudev-232-r1:= )
+	x11-libs/libSM
+	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
+	>=x11-libs/startup-notification-0.7
+	screencast? ( >=media-video/pipewire-0.3.21:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	doc? ( >=dev-util/gi-docgen-2021.1 )
+"
+RDEPEND="${DEPEND}
+	gnome-extra/zenity
+"
+DEPEND="${DEPEND}
+	x11-base/xorg-proto
+	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
+"
+# wayland bdepend for wayland-scanner, and either libxcvt or xorg-server[xorg,-minimal] for the cvt binary
+BDEPEND="
+	dev-libs/wayland
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/python-dbusmock[${PYTHON_USEDEP}]
+		')
+		app-text/docbook-xml-dtd:4.5
+		x11-misc/xvfb-run
+	)
+	wayland? (
+		>=sys-kernel/linux-headers-4.4
+		x11-libs/libxcvt
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-42.0-Disable-anonymous-file-test.patch
+)
+
+python_check_deps() {
+	if use test; then
+		has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_configure() {
+	# TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
+	local emesonargs=(
+		-Dopengl=true
+		#opengl_libname
+		#gles2_libname
+		$(meson_use wayland gles2)
+		-Degl=true
+		-Dglx=true
+		$(meson_use wayland)
+		$(meson_use systemd)
+		$(meson_use wayland native_backend)
+		$(meson_use screencast remote_desktop)
+		-Dlibgnome_desktop=true
+		$(meson_use udev)
+		-Dudev_dir=$(get_udevdir)
+		$(meson_use input_devices_wacom libwacom)
+		-Dpango_ft2=true
+		-Dstartup_notification=true
+		-Dsm=true
+		$(meson_use introspection)
+		$(meson_use doc docs)
+		$(meson_use test cogl_tests)
+		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
+		-Dnative_tests=false
+		$(meson_use test clutter_tests)
+		$(meson_use test tests)
+		-Dkvm_tests=false
+		-Dtty_tests=false
+		$(meson_use sysprof profiler)
+		-Dinstalled_tests=false
+		#verbose # Let upstream choose default for verbose mode
+		#xwayland_path
+		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
+		#xwayland_grab_default_access_rules
+	)
+
+	if use wayland && use video_cards_nvidia; then
+		emesonargs+=(
+			-Degl_device=true
+			-Dwayland_eglstream=true
+		)
+	else
+		emesonargs+=(
+			-Degl_device=false
+			-Dwayland_eglstream=false
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_test() {
+	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
+	glib-compile-schemas "${BUILD_DIR}"/data
+	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/x11-wm/pekwm/Manifest b/x11-wm/pekwm/Manifest
index 374df251bf2b..4618dbc3a499 100644
--- a/x11-wm/pekwm/Manifest
+++ b/x11-wm/pekwm/Manifest
@@ -1,8 +1,6 @@
-DIST pekwm-0.1.17.tar.gz 429100 BLAKE2B 2b467539ef47f4404411f25146f9f945f9a63b7e4c85c997ed2cd0bf76ea713758e3a09dc9648064c02ab29818399623d12d78394f250c79f8f667a6e057281c SHA512 1950888402f11c5cd72c9d82de976c472d4a0443da206629a039d19a1729660fd7cd09535d35984d554dcdb366918d9e29536b1272521f36f7e54499df0c14af
 DIST pekwm-0.1.18.tar.gz 441810 BLAKE2B 8c3e98490681eed68e0f127c38c1653f8d643ceca2ddf8388f6b434d16daeb376fc9337de71786a658e9d9e7a080de922207173edb624b78732bc14da5d42eeb SHA512 31fe291b245b6e13fdfe27878162fd405fd60a766e9a7e762e817391179e7f82c41b664fba568af91e009582729e4633d23f76db95302f6f702cb74c2571db15
 DIST pekwm-0.2.1.tar.gz 943072 BLAKE2B 61a278a42517de4b2924c6e0cffdd0b112c3a1a52b70e24d6ed852a8e5005f76b4eb9a342af073481404fae68265452b140ea19539723733ec860f7cbd615598 SHA512 cefb5abb43f88cff874f12586f0f2c0b88d30fd0ce22c6e18731b11055abea389819a08a4e85a9290021ffe30708ea210c66a0f3f8c263717c05abd798fdf297
 DIST pekwm-themes.tar.bz2 138599 BLAKE2B b0c103d7ade6f9bb1ed19b7e12cfcf00fb48be7e1ed141a4b52aee404ebf9c7af5d29af166ff7265a720ca8d122ad7eddb6eaf42a0a8e18b6c1ff3af7b5e12d0 SHA512 c95bc980b5aeeb4f4832cb2dbbf82adf72e4a784fcd46432fd6e6a6577ef02823ec1c4b861d07747c066050fc5040aca975e2cdc78342abab99a3d486888a25d
-EBUILD pekwm-0.1.17-r3.ebuild 1828 BLAKE2B 5d2b59a19fcbf54efc82a6af1762bed96a302834e289f2e1fb71cf78285d508b1845050a5c7b65f5282e00486be56943c1dbefe8d7a3fad9337fa42ded49c5bb SHA512 7230bdcceb9e5d2fff59e796657168a36242204d956acc72cc49052a6ecb13d54dd3c4e9a602582efaf8ed21aa597e7a4c4509eaa267efd5a99a39e8115b4aa6
 EBUILD pekwm-0.1.18.ebuild 1839 BLAKE2B 5a44e02032b69d69a13c6af33ebaa59f4c75d886cc742e7680f26757f53624b4fc8290b05c08eadea70c3384a572ed4485a467a16d3adbde1b59483ddb5d7c61 SHA512 ef24ddf5aa9c3f6c2750ce000eeed1a4f3a2af2cadf82f345d1f193bf69a9f20a760df1a86685669f77ab26bfeaecfb7dbe2165f59a167b2fa0004ce5c8fd90d
-EBUILD pekwm-0.2.1.ebuild 2155 BLAKE2B 5d8815f835046caf455135e30130c7d8f4c6f07fd6616a7ec807cd889e309a4b842bca0c02bdda57b8ff708380059f47a84870922c1a2a6e446ca2540792b15d SHA512 11004ea45af9a0fd3048270137781508b6db81231156005783b12f5a08941306987ad5456bdc4bae0860e16ac406c919eb62206fdf166bbbdf5c3b38c7da70a6
+EBUILD pekwm-0.2.1.ebuild 2153 BLAKE2B 5231376dd443a0c9dfd896ade2ed40d7794d2b7d8d8af28adfeb792c0f1c824cabc5fed0725c579378c5ccc606cbbfd822d5dc9dd5139cbcba15aadabe83856f SHA512 c82c4b536287f1bb53b35e2928067da55a50bd1341d5bc31118494fed5d0bfa6fcbf59a60bd7f37a171d4d1b02ab8559404eb7e36b99a3f6edb882f02d7b8a04
 MISC metadata.xml 767 BLAKE2B d8634006b5aef00a9d208b1100db237a84fc7e865dba4a96dd485e09e2d025b86bec92a8ca9cd7e69dd82762b9afe385acf96327f24a58ca6b0b7e0aa49dd01d SHA512 4c27bd4a13c54e198c541c9b57db3b6082b7b79c558a172ec242cdfd415edc4af47ffe3d02229c20bdc29912aff41dc3d86d5c07b2fd0e3bcf75bac204371a7d
diff --git a/x11-wm/pekwm/pekwm-0.1.17-r3.ebuild b/x11-wm/pekwm/pekwm-0.1.17-r3.ebuild
deleted file mode 100644
index 9954b8ef44ae..000000000000
--- a/x11-wm/pekwm/pekwm-0.1.17-r3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop
-
-DESCRIPTION="A lightweight window manager initially based on aewm++"
-HOMEPAGE="
-	https://www.pekwm.se/
-	https://github.com/pekdon/pekwm
-"
-SRC_URI="
-	https://github.com/pekdon/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz
-	themes? ( https://dev.gentoo.org/~jsmolic/distfiles/${PN}-themes.tar.bz2 )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc x86"
-IUSE="contrib debug themes truetype xinerama"
-
-RDEPEND="
-	media-libs/libpng:0=
-	virtual/jpeg:0
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	truetype? ( x11-libs/libXft )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-S=${WORKDIR}/${PN}-release-${PV}
-
-src_prepare() {
-	if use themes; then
-		rm "${WORKDIR}"/themes/Ace/.theme.swp || die
-	fi
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable truetype xft) \
-		$(use_enable xinerama) \
-		--enable-image-jpeg \
-		--enable-image-png \
-		--enable-image-xpm \
-		--enable-shape \
-		--enable-xrandr
-}
-
-src_install() {
-	default
-
-	# Install contributor scripts into doc folder
-	if use contrib ; then
-		docinto contrib
-		dodoc contrib/lobo/{check.png,pekwm_autoprop.pl,pekwm_menu_config.pl} \
-			contrib/lobo/{pekwm_menu_config.pl.vars,README,uncheck.png}
-	fi
-
-	if use themes; then
-		insinto /usr/share/${PN}/themes
-		doins -r "${WORKDIR}"/themes/*
-	fi
-
-	# Insert an Xsession
-	echo -e "#!/bin/sh\n\n/usr/bin/${PN}" > "${T}"/${PN} || die
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/${PN}
-
-	# Insert a GDM/KDM xsession file
-	make_session_desktop ${PN} ${PN}
-}
-
-pkg_postinst() {
-	if use contrib ; then
-		elog " User contributed scripts have been installed into:"
-		elog " /usr/share/doc/${PF}/contrib"
-	fi
-}
diff --git a/x11-wm/pekwm/pekwm-0.2.1.ebuild b/x11-wm/pekwm/pekwm-0.2.1.ebuild
index 8f6cd45e0704..26496e8f9760 100644
--- a/x11-wm/pekwm/pekwm-0.2.1.ebuild
+++ b/x11-wm/pekwm/pekwm-0.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~mips ~ppc x86"
 IUSE="debug +jpeg +png truetype xinerama +xpm"
 
 RDEPEND="
diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest
index 08a12bbcbb21..d8e226aab2ba 100644
--- a/x11-wm/qtile/Manifest
+++ b/x11-wm/qtile/Manifest
@@ -2,5 +2,5 @@ AUX qtile-session 1854 BLAKE2B 260c39642f805f9b94e59ab25d9e8d6e53abcb9fbed76f334
 DIST qtile-0.16.1.tar.gz 324668 BLAKE2B 1f75f5dbcab6180dcf778e28108e70b6dd01105fa275aadf4a53d96ab84f3b759cb8553bcf3de2011b0990d61adc9269663afa32b83d1aa9c052b00ef9e89358 SHA512 aea42f7f6799a88b586167a57f5b5ab6f1c5bb663dec352d15eb47ce0d37fb23c31d1631cab8178c71be5ae714ec12c35a350377383dba1749a98cd45c22515b
 DIST qtile-0.17.0.tar.gz 336235 BLAKE2B f2290ab823b31cd8ed512f076018a8df19bbfedbb7d5c6932eee7cd46c341a08af04ed0d99f4391d1b3ccc07eb33015bbf0050c1c5d749bace4fb6dcfcb71ac9 SHA512 bfe51aabef2d48693c5bb7525cf67b1bb99cf3af5a653cd81d523e5adaa4767a43e7a87db14f9b85fae3a9e414af41a2e66736556eb1552d099755ba6f39caeb
 EBUILD qtile-0.16.1.ebuild 1053 BLAKE2B a992609d10a060e1d08adec28af61cd3a92beff3a89b357841ec021bdb8002c923100ff4b75673104eb72a50e66778155c6f10d3cb77aed0cf7998031b7cd28b SHA512 e26c78bd68cc719e5b6bab463080a96a5be2e2b37e7a33932983f6af0231e83acf8b6a862f67f64e65b0b4fdb866cf7284ce6bc762065671b7bfa71e196a2f56
-EBUILD qtile-0.17.0.ebuild 1062 BLAKE2B 59c74b424c03a96414183ed89aaee6933ecb14fd3854ca4f830b09a88657bb30d5eb8578acce4f3f16ec558b8eef44347cda589cf4f6713a38dd56b45098f0a4 SHA512 53d4fa24b5eb418dade24b413cb84a7bf8dcc6bcdf74bffd225a6dd798cdc20e795d84ab09aa919b1533c3580f5437f1fe8289a89665517859997ddba765c3c6
+EBUILD qtile-0.17.0-r1.ebuild 1137 BLAKE2B 1282c08507f111637e488d8159aa2100855fb153533b6937d06e5bdf598b7c4a504af53d879f47d27969b0a7235c90ae3e99bd0bbd4b1d971834d96b9b901dbd SHA512 b8c844170f2571e91e1056d61a312cdf35ddbbfbbd13ad7a6c41bf0ee3326346e407d165307eb96633867c63c396906ca101c2cb28e107948dc113134b81455e
 MISC metadata.xml 324 BLAKE2B 6daea96aa4c9f4f18abe5fe4947d9cf7c50b825846816b5a6f683e51c3bb3b3d884f4afd4e424624fe8df2de1c80b6d124dba1a4a3a53982598158347db8dde2 SHA512 589b322da542f94c942b3f4775e0fa96806ec3de47485befaba65e6c803d8004a2ba1a02f4442c3bca5d525355966de837f00af4c109600e8c56fdb53438896a
diff --git a/x11-wm/qtile/qtile-0.17.0.ebuild b/x11-wm/qtile/qtile-0.17.0-r1.ebuild
index ff3b8ed595c0..c2ca4b7e04ec 100644
--- a/x11-wm/qtile/qtile-0.17.0.ebuild
+++ b/x11-wm/qtile/qtile-0.17.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,10 +25,12 @@ RESTRICT="test"
 RDEPEND="
 	x11-libs/cairo[X,xcb(+)]
 	x11-libs/pango
+	x11-libs/libnotify[introspection]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	>=dev-python/cairocffi-0.9.0[${PYTHON_USEDEP}]
 	>=dev-python/cffi-1.1.0[${PYTHON_USEDEP}]
+	dev-python/pygobject[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
 	>=dev-python/xcffib-0.8.1[${PYTHON_USEDEP}]
 	media-sound/pulseaudio
diff --git a/x11-wm/twm/Manifest b/x11-wm/twm/Manifest
index 0a055583c57b..7d7468655f1f 100644
--- a/x11-wm/twm/Manifest
+++ b/x11-wm/twm/Manifest
@@ -1,5 +1,5 @@
 DIST twm-1.0.11.tar.xz 261176 BLAKE2B 775ee483f34b1f45e737e0f1a907c07398883bd7bb2c17f729b38a2562af1a85f27b4dfa76b5fa1f88768e01c17c8cb364baaf39d80307aee3732183c5964653 SHA512 948034bba23e6b6c4412fcd2e46bb11a9980297601218a54a5055165ab0229a44dde0d50f338b24e82d76f390597e2fa09d11ff7f3fe1b1d736b10083c7da20d
 DIST twm-1.0.12.tar.xz 262624 BLAKE2B 4bca3572dc51af6d1724aefc42f85f04cf0dcbf5514d098628b7950b59a05bd1f1f6fe51aed492777fad5b169a0d97d0c1f0567aca3e7f33c7de0037c7dbe49f SHA512 f3d68df7e06516f6b74f19181efcfd9db2479c8ea0c72c3a6ed0dc1b222405b40d81a2dea17b662955e0c1783e87d0d3eb067c3b6e7c6eed8c0d38d03d362260
 EBUILD twm-1.0.11.ebuild 561 BLAKE2B aa2e20f143ac5cafee61239be93679da4900f9f3325e7cd637830009e3f3164fa1b2f9b28ef11cf7aec621537b28990eff5b5e0d35202fab660fa2d01bd38e92 SHA512 a005868f3c14a1d7ac4e78104ab56ed93d00fa44436384f8bee6e0fea7aa1146631504093d8e7f39d5456f0dc0501cc1338414cb1927b83d26d6dd8fc7d3ccdd
-EBUILD twm-1.0.12.ebuild 568 BLAKE2B 3dbdcc0b050eeb6bba9f10e47441714ed5c4f6566a1387da6c8e50d10e35b6b35ff7f0ba77c30677215855a00698ae4fff26b159f4897a2d5b63f8c729233ef6 SHA512 066292dbb778c6afe8faffb330279fb8764ba86f27071b37e8447fadf79e3623ad3eaa6473a091fed3711b00fdb1e658b07bc0a711131c283920b6bf906d9e6f
+EBUILD twm-1.0.12.ebuild 572 BLAKE2B 37d0c201420c11eab1335832b7fe48198765fdea773a5313f1419699cee61d2342a5945ef43afb7dfd803a2bf7e806f00406999b33f9d1a385aeafe62f748f26 SHA512 127712bce1fef5158717593da4e28494fe60c6f19cafbb00e6e1f1a666c0236d4164f8f2556debc27158d98bbee7e1d88da1a048c1831af7a02d57c9917e1b0b
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-wm/twm/twm-1.0.12.ebuild b/x11-wm/twm/twm-1.0.12.ebuild
index 2f9c96f406f2..1e10bc078cdf 100644
--- a/x11-wm/twm/twm-1.0.12.ebuild
+++ b/x11-wm/twm/twm-1.0.12.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Tab Window Manager"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 40b6a6c244a1..a8df849fea07 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -3,9 +3,13 @@ AUX xpra-3.0.2_ignore-gentoo-no-compile.patch 610 BLAKE2B 963b3b61602f6a7ad7c824
 AUX xpra-4.2-no-service.patch 786 BLAKE2B 63a53c55335c2aefa5f1345b91dd01bf01340b06f68213f2fb796e6e33ab96bb1c80fbe6e4eedf129c5c06eba97ca080fef5c526ec95236e767bb1ad2ef2049d SHA512 f806b7f3eee1507c83b40f1463659acbcfe907a3e3b80d091d5816483718f295dce760aa3400b5a183a1605ef33092f68d634afaddfb69665f44f86bb3ff3aac
 AUX xpra-4.2-suid-warning.patch 745 BLAKE2B 58153996d70476058b8daba30e61cbe02a84f10bc61ba79bafa045c1474d8436f4aa7c7e1bfa0ffc92450effca92810016d6afeaf1261cd568b5c9dd9b41f468 SHA512 82e994786967fb258cf273ea69d579207e503af5a53466821d4c155c5c61099468db26b7c31b4e91d343eff8e60cc06a66664e6a7a7e968e8ea7f1b8f862700d
 AUX xpra-4.3-no-service.patch 779 BLAKE2B 5232b103b47601b4340d6a863d2cd3cc6641a55d6c252702034902a4d5189c7df45b7d6280ae9bf2a3dbe8c96a73847f936032cc9b58c4bdd91025974fa84005 SHA512 d5045da20f4fdcb2b434f280c42b26ee1c8c280e4037a116c3edd0990a97acc5017bf428c4c222a1c38e23a6dd5709789ac80e62187144d334068deecc99d20e
+AUX xpra-9999-xdummy.patch 614 BLAKE2B 9b502fa836caea212f90730e0238adb16c74814a55a2a5b32e062880d29b1fa05247fc3c5e8edddf0acdd1d93620dafb507ec9a14996c3aea248d204510a0e2c SHA512 71efb726f50b85890bb3508bd3943b3bb9e34a8f5d3c92c6fa4f7c2ea6b8c51551243ea0d4d52802f17e5aaed7716b9ee0b462cde1941dae9273651dcc461a9a
 DIST xpra-4.2.tar.gz 4057304 BLAKE2B 17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10 SHA512 261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353
 DIST xpra-4.3.1-tests.patch 51444 BLAKE2B c645aa52bb06c3872f6c1c7aace099c10a6fd46dd4c386ec1a13f6326e3fc8860a71767510ce9b44375cc8b30cef563e4405b2834670a9d2c555d3359d16e99f SHA512 0c70c33e24980db31e904c91f987a73693bd2349958ea8392138987e1dc1852ea42a4ee7e3b238f01c92adc57dbe196e57f4c4accf27aade6c4ea55c1ff9b40c
 DIST xpra-4.3.2.tar.gz 4175968 BLAKE2B 16d42f9509c1ac3cf3f345a6cdd3711496019064c890268d1c1612e37e34ffe93016488f8a6d1bf8509da1d32500571e80bb4143a2f870f07530386515107735 SHA512 b9bc89a0d042e4ef2a416b7787bd1588a9d151d482319c637073749383e2b3f3361eb0f95c0e39ba98c9ae87ef5acb68c4980645fb9a2feea37215f88f7a8a95
+DIST xpra-4.3.3.tar.gz 4180278 BLAKE2B 2fceab6c95efd0bd0390b7965aea588f39e43f86094c1f9921e1f75022f569808e27d7d85adcccfd64ac28889d0f6d2d6afdf4365f8c919bac8b1a14f3919f23 SHA512 c470e892b4b6379b6c9447731ab174e85c26de15fdc9541a199a2f49e45d07942ae8638f8ddf040a22c73422c6e6b262a9066cd8990f182b75163f7d449d91e2
 EBUILD xpra-4.2.ebuild 4193 BLAKE2B 1c611de33e8d7f62642d2e06f9ff0714110ef2f1bf436c48f2c9c6ce0a5be54dc5264b67e258e5d21f87393cb18b58866479a8d6f4c55617abaf61d960129862 SHA512 e0a8c60225f6e308bac0670b5b2657156b7f1bb9a04dc5b46cc6a297c68a0d92dbf844945ff376fc53cd13789efccfb474c2f2b852fb7d464c971cf6143c3c5c
 EBUILD xpra-4.3.2.ebuild 4962 BLAKE2B a40c901bd29c48209f2d998e0cb3c11c778e765bb3a9c7b639dbfb7e2eef0e7132eae29c6c8b72f902024ab96fcfd3a2766fe156de854ff9d4a87e43f7b13b9b SHA512 cac5c7ceba4a366fd156488d8f8d04df6597a55e1a30323af54ee22b8fd0acf7951881e4ebc18eb30ef3811d529fb48a5817ae4e48f59d4fe575f255c426bfe1
+EBUILD xpra-4.3.3.ebuild 5073 BLAKE2B 0acd46b89c2ca94cc701187d501baf22b08bc541e6e552080a2b5ddf9142cd6bb1d9df8cc7ccf7035c7f6c8beb5f81f1abd1ffad75d4c4d17b1843a592d908ce SHA512 dee798e4b81335b4fe90bdc2c4eb1aff2f6124ceda1f9e4bc67f2dfc868cb2d006351ae5562adb3f07dc9cf91a8b1e936745b06be85633125110bfdda561aeb2
+EBUILD xpra-9999.ebuild 5008 BLAKE2B 537e42dbc5e2bfd2fe185c7dbe8a096d59c4a63a444101f3730c77198b4dcb80d00159204dfdb0f166f9e0000d64d7bd38ed34f7fce5d765b4aff85dfd8e3d0d SHA512 795fbd85cf633adbd7ef63f363a2bb18c5c9f781581794fd89ad005e26539c378968e67dce7d339ffad3e9b8f2f4edb8073af58d876a0b432a7755fb62b8b50e
 MISC metadata.xml 1251 BLAKE2B c34d54c0b030f2b1f6feef9bfaa50718f4931488e948d0179cd1846f2e4b78932c4164f9a3b708b13cd90c71c84cdebc6af2dfa3fbb831eed3fc308c2537ff84 SHA512 465e19a532120ed42187e6e053b77fecad5cad408f4f1a57bcd237b7765bafd2fbff7a6e7e66ee4c9cbf50bd979aa989dd364a042e8ecfe5cd2180f2eeab3ba8
diff --git a/x11-wm/xpra/files/xpra-9999-xdummy.patch b/x11-wm/xpra/files/xpra-9999-xdummy.patch
new file mode 100644
index 000000000000..2326e63498ce
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-9999-xdummy.patch
@@ -0,0 +1,24 @@
+From 7c384b517fb391065b84b60fa8f1ec3338ed4fce Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sat, 16 Apr 2022 22:30:11 +0100
+Subject: [PATCH] Avoid Xdummy version detection, assume 0.4.0
+
+---
+ setup.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/setup.py b/setup.py
+index 40bfba61c..e4636cb46 100755
+--- a/setup.py
++++ b/setup.py
+@@ -657,6 +657,7 @@ def get_gcc_version():
+     return GCC_VERSION
+ 
+ def get_dummy_driver_version():
++    return (0, 4)
+     def vernum(s):
+         return tuple(int(v) for v in s.split("-", 1)[0].split("."))
+     #try various rpm names:
+-- 
+2.34.1
+
diff --git a/x11-wm/xpra/xpra-4.3.3.ebuild b/x11-wm/xpra/xpra-4.3.3.ebuild
new file mode 100644
index 000000000000..337531a3c0f3
--- /dev/null
+++ b/x11-wm/xpra/xpra-4.3.3.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/Xpra-org/xpra.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+		https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit xdg xdg-utils distutils-r1 tmpfiles udev
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
+HOMEPAGE="https://xpra.org/"
+LICENSE="GPL-2 BSD"
+SLOT="0"
+IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test vpx webcam webp xdg xinerama"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( client server )
+	cups? ( dbus )
+	opengl? ( client )
+	test? ( client clipboard dbus html server sound xdg xinerama )
+"
+
+TDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/netifaces[${PYTHON_USEDEP}]
+		dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+		dev-python/rencode[${PYTHON_USEDEP}]
+		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+		xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] )
+	')
+	html? ( www-apps/xpra-html5 )
+	server? (
+		x11-base/xorg-server[-minimal,xvfb]
+		x11-drivers/xf86-input-void
+	)
+	xinerama? ( x11-libs/libfakeXinerama )
+"
+DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+		opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+		sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+	')
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXres
+	x11-libs/libXtst
+	x11-libs/libxkbfile
+	brotli? ( app-arch/brotli )
+	csc? ( >=media-video/ffmpeg-1.2.2:0= )
+	ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
+	jpeg? ( media-libs/libjpeg-turbo )
+	pulseaudio? (
+		media-sound/pulseaudio
+		media-plugins/gst-plugins-pulse:1.0
+	)
+	sound? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	vpx? ( media-libs/libvpx media-video/ffmpeg )
+	webp? ( media-libs/libwebp )
+"
+RDEPEND="
+	${DEPEND}
+	${TDEPEND}
+	$(python_gen_cond_dep '
+		cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+		lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+		lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+		opengl? (
+			client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+		)
+		webcam? (
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pyinotify[${PYTHON_USEDEP}]
+			media-libs/opencv[${PYTHON_USEDEP},python]
+		)
+	')
+	acct-group/xpra
+	virtual/ssh
+	x11-apps/xauth
+	x11-apps/xmodmap
+	ibus? ( app-i18n/ibus )
+	pinentry? ( app-crypt/pinentry )
+"
+DEPEND+="
+	test? ( ${TDEPEND} )
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/cython-0.16[${PYTHON_USEDEP}]
+	')
+	virtual/pkgconfig
+	doc? ( app-text/pandoc )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
+	"${FILESDIR}"/${PN}-4.2-suid-warning.patch
+	"${FILESDIR}"/${PN}-4.3-no-service.patch
+	"${DISTDIR}"/${PN}-4.3.1-tests.patch
+)
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# FIXME: There are hardcoded paths all over the place but the following
+	# double-prefixes some files under /etc. Looks tricky to fix. :(
+	#hprefixify $(find -type f \( -name "*.py" -o -name "*.conf" \))
+
+	sed -r -e "/\bdoc_dir =/s:/${PN}\":/${PF}/html\":" \
+		-i setup.py || die
+
+	if use minimal; then
+		sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \
+			-i setup.py || die
+	fi
+}
+
+python_configure_all() {
+	sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \
+		-i setup.py || die
+
+	DISTUTILS_ARGS=(
+		--without-PIC
+		--without-Xdummy
+		$(use_with client)
+		$(use_with clipboard)
+		$(use_with csc csc_swscale)
+		--without-csc_libyuv
+		--without-cuda_rebuild
+		--without-cuda_kernels
+		$(use_with cups printing)
+		--without-debug
+		$(use_with dbus)
+		$(use_with doc docs)
+		$(use_with ffmpeg dec_avcodec2)
+		$(use_with ffmpeg enc_ffmpeg)
+		$(use_with ffmpeg enc_x264)
+		$(use_with ffmpeg enc_x265)
+		--with-gtk3
+		$(use_with jpeg jpeg_encoder)
+		$(use_with jpeg jpeg_decoder)
+		--without-mdns
+		$(use_with opengl)
+		$(use_with server shadow)
+		$(use_with server)
+		$(use_with sound)
+		--with-strict
+		$(use_with vpx)
+		--with-warn
+		$(use_with webcam)
+		$(use_with webp)
+		--with-x11
+	)
+
+	export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
+}
+
+python_test() {
+	export XAUTHORITY=${HOME}/.Xauthority
+	touch "${XAUTHORITY}" || die
+
+	distutils_install_for_testing
+	xdg_environment_reset
+
+	PYTHONPATH=${S}/tests/unittests:${BUILD_DIR}/test/lib \
+	XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \
+		"${PYTHON}" "${S}"/tests/unittests/unit/run.py || die
+}
+
+python_install_all() {
+	distutils-r1_python_prepare_all
+
+	# Move udev dir to the right place.
+	local dir=$(get_udevdir)
+	dodir "${dir%/*}"
+	mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
+}
+
+pkg_postinst() {
+	tmpfiles_process xpra.conf
+	xdg_pkg_postinst
+}
diff --git a/x11-wm/xpra/xpra-9999.ebuild b/x11-wm/xpra/xpra-9999.ebuild
new file mode 100644
index 000000000000..59f1f56b88b3
--- /dev/null
+++ b/x11-wm/xpra/xpra-9999.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/Xpra-org/xpra.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit xdg xdg-utils distutils-r1 tmpfiles udev
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
+HOMEPAGE="https://xpra.org/"
+LICENSE="GPL-2 BSD"
+SLOT="0"
+IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test vpx webcam webp xdg xinerama"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( client server )
+	cups? ( dbus )
+	opengl? ( client )
+	test? ( client clipboard dbus html server sound xdg xinerama )
+"
+
+TDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/netifaces[${PYTHON_USEDEP}]
+		dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+		dev-python/rencode[${PYTHON_USEDEP}]
+		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+		xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] )
+	')
+	html? ( www-apps/xpra-html5 )
+	server? (
+		x11-base/xorg-server[-minimal,xvfb]
+		x11-drivers/xf86-input-void
+	)
+	xinerama? ( x11-libs/libfakeXinerama )
+"
+DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+		opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+		sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+	')
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXres
+	x11-libs/libXtst
+	x11-libs/libxkbfile
+	brotli? ( app-arch/brotli )
+	csc? ( >=media-video/ffmpeg-1.2.2:0= )
+	ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
+	jpeg? ( media-libs/libjpeg-turbo )
+	pulseaudio? (
+		media-sound/pulseaudio
+		media-plugins/gst-plugins-pulse:1.0
+	)
+	sound? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	vpx? ( media-libs/libvpx media-video/ffmpeg )
+	webp? ( media-libs/libwebp )
+"
+RDEPEND="
+	${DEPEND}
+	${TDEPEND}
+	$(python_gen_cond_dep '
+		cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+		lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+		lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+		opengl? (
+			client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+		)
+		webcam? (
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pyinotify[${PYTHON_USEDEP}]
+			media-libs/opencv[${PYTHON_USEDEP},python]
+		)
+	')
+	acct-group/xpra
+	virtual/ssh
+	x11-apps/xauth
+	x11-apps/xmodmap
+	ibus? ( app-i18n/ibus )
+	pinentry? ( app-crypt/pinentry )
+"
+DEPEND+="
+	test? ( ${TDEPEND} )
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/cython-0.16[${PYTHON_USEDEP}]
+	')
+	virtual/pkgconfig
+	doc? ( app-text/pandoc )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
+	"${FILESDIR}"/${PN}-4.2-suid-warning.patch
+	"${FILESDIR}"/${PN}-4.3-no-service.patch
+	"${FILESDIR}"/${PN}-9999-xdummy.patch
+)
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# FIXME: There are hardcoded paths all over the place but the following
+	# double-prefixes some files under /etc. Looks tricky to fix. :(
+	#hprefixify $(find -type f \( -name "*.py" -o -name "*.conf" \))
+
+	sed -r -e "/\bdoc_dir =/s:/${PN}\":/${PF}/html\":" \
+		-i setup.py || die
+
+	if use minimal; then
+		sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \
+			-i setup.py || die
+	fi
+}
+
+python_configure_all() {
+	sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \
+		-i setup.py || die
+
+	DISTUTILS_ARGS=(
+		--without-PIC
+		--without-Xdummy
+		$(use_with client)
+		$(use_with clipboard)
+		$(use_with csc csc_swscale)
+		--without-csc_libyuv
+		--without-cuda_rebuild
+		--without-cuda_kernels
+		$(use_with cups printing)
+		--without-debug
+		$(use_with dbus)
+		$(use_with doc docs)
+		$(use_with ffmpeg dec_avcodec2)
+		$(use_with ffmpeg enc_ffmpeg)
+		$(use_with ffmpeg enc_x264)
+		$(use_with ffmpeg enc_x265)
+		--with-gtk3
+		$(use_with jpeg jpeg_encoder)
+		$(use_with jpeg jpeg_decoder)
+		--without-mdns
+		$(use_with opengl)
+		$(use_with server shadow)
+		$(use_with server)
+		$(use_with sound)
+		--with-strict
+		$(use_with vpx)
+		--with-warn
+		$(use_with webcam)
+		$(use_with webp)
+		--with-x11
+	)
+
+	export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
+}
+
+python_test() {
+	export XAUTHORITY=${HOME}/.Xauthority
+	touch "${XAUTHORITY}" || die
+
+	distutils_install_for_testing
+	xdg_environment_reset
+
+	PYTHONPATH=${S}/tests/unittests:${BUILD_DIR}/test/lib \
+	XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \
+		"${PYTHON}" "${S}"/tests/unittests/unit/run.py || die
+}
+
+python_install_all() {
+	distutils-r1_python_prepare_all
+
+	# Move udev dir to the right place.
+	local dir=$(get_udevdir)
+	dodir "${dir%/*}"
+	mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
+}
+
+pkg_postinst() {
+	tmpfiles_process xpra.conf
+	xdg_pkg_postinst
+}