gentoo resync : 22.12.2021

27 files changed, 198 insertions, 694 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 0d8cadbcb092..f0fe58f69884 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/e16/Manifest b/x11-wm/e16/Manifest
index 813784b1c92b..df13a59aa80b 100644
--- a/x11-wm/e16/Manifest
+++ b/x11-wm/e16/Manifest
@@ -1,6 +1,6 @@
 AUX e16-user-fonts.patch 412 BLAKE2B c3b7e6b0599eb511afe9c6f969f5c529313be2732e4cad2a772c9860427eaf84eb1083fb10ff28853c19a972f734f0b231e78d4862ce5246d9d3bdde6e532c96 SHA512 6fdcbe6191d93cc5c64efb6039cbe9409fd08734a4c99c29482bde06f044b1e6b88c35ef34dc65ce384ecdfb78883022a18885dde6e1bac8ca8192d5f6901c42
-DIST e16-1.0.21.tar.xz 1440484 BLAKE2B ea9521d4939400e292e9e2be6e73770a48d966702897c30babfe036a655ef3c5d9766eca3867e1a84b8fbd934a05c4a0487239a78d641c41a6e93a19feeb70a2 SHA512 0f5984d3c3594bf94338c9b53c681cd40f8cc165a18d7d9e0e6202fdf237ace52d9aac9c5ba04f052f94dfd463dcf558b8015044b4d457114c19a7a27ac23723
 DIST e16-1.0.22.tar.xz 1442288 BLAKE2B 7f102474f9054935ea15ed58c91f18613561eaad84c8398c410014a5dbfb2f7f5fd079399db4c6462096c9a351bd89e47fbd61d304ca99ec844806c26c97d6a9 SHA512 0ff40390a56f0dbd2219d9e4e665b1c1802801e552df3bd76fa71502ad2fb7466f2f175757b088b490fbc58e4196b362d6cf451ad43d5104849ac8ce2805299e
-EBUILD e16-1.0.21.ebuild 2948 BLAKE2B e64075e36b879a8367acdab664168ca7a75680cb62267aa71f100645c89594e6139f24f8b0fb9631b7f5a752be7dfaa547f68458177bb318c88bc31f0d95ae2b SHA512 e8f6df7bfa6f9011083a1d6d59b7ceb889ef140ec3bca7498c8193328824e250ae11e39e004c6b0a44e7e61bdcf192ac6d67ce431a74b9a5b73029870a3c2083
+DIST e16-1.0.24.tar.xz 1392444 BLAKE2B 5a4c30af2d484226fac73cbe9131ae9dc308638fc035958012b99747ddaa15b1fc1340fe74c7e809e399b5c93dfc7bf8a6ead338c3977483621f4ab98f8f4a3e SHA512 869e2c654bbdcdbb56656cacea8338b0f99a991e4aeaa4dde3fd01e358b1010a58422344e617d522e024186ab98a1d9364e6ea3428507b3831516d1da5dfb08a
 EBUILD e16-1.0.22.ebuild 3427 BLAKE2B 33ca3b091d59a39b322ce2a42cec37d8592a2ad5bbc4f87b59420632f3df701c66c9e3cfde8c0e66706980e0c7ecb6807c24afd32a54955356e84a0620624b2c SHA512 4ae42d166df0935206cb9821c923fddc88e5b3c9f60e25a503ab180e71847530bccd7454584229087d39f9325b98621a12e8ee24dfc05034f614b436f6128797
-MISC metadata.xml 1732 BLAKE2B 80c69535febf0d68fd6c279f27057c98d34d356c4f95318a224eebfd169d7aa2f73aacdcba6b3d0639f1b331a3d830140a32c6ee877c7f79d94bb4f2a7099a59 SHA512 9366036258ddc12f15a013ffcd82a47e906a9b8d97baca855564a9e3f766994687de51581cac57ce94b92b1bb906a4dc49ff78b8534f544b6e7691db14fd960a
+EBUILD e16-1.0.24.ebuild 3502 BLAKE2B 67579dc57dd69ed10d2eda9fcdad640c3c5c8e527eaffa77d33cc347e447fd320b4711fe80412c9adfb2b599692b3ae917d0cd28b5335e68ee9e79a435a4c295 SHA512 8051e832f1f94ee14b0fddb9f6f0ff834eb08b15cd3f4ff2bcda1c5093e547fa266f638027f6b6e5eb36ebcb7f4318de762e4b48173597b42b4160cc3a87baba
+MISC metadata.xml 1866 BLAKE2B 9123b6c7f77a370e4ef514b56e9ebd4049ece0a22697360b274738b2e85fb13a88f458a3edf03f9916889f26e86d70ab5656ec91a1ddb87ffb2f8747f10a0bfc SHA512 89047e65b2461c8ddc51d05f8c358900ca21917c17cb70c77386112120aa39bfb3738b729fd8d8e8619e86d862aa7662716f1d5d7a54f8d1b7680cbf66eb2ba9
diff --git a/x11-wm/e16/e16-1.0.21.ebuild b/x11-wm/e16/e16-1.0.24.ebuild
index 891c63f37815..89f74d6029b6 100644
--- a/x11-wm/e16/e16-1.0.21.ebuild
+++ b/x11-wm/e16/e16-1.0.24.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Enlightenment Window Manager (E16)"
 HOMEPAGE="https://www.enlightenment.org https://sourceforge.net/projects/enlightenment/"
@@ -9,17 +9,21 @@ SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="audiofile container dbus debug +dialogs doc examples gnome
-libhack modules nls opengl +pango sndfile sound +themes xcomposite
-+xft xi2 xinerama xpresent +xrandr +xrender +xsm +xsync zoom"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa audiofile container dbus debug +dialogs doc examples
+gnome libhack modules nls opengl +pango +poll player pulseaudio
+select +sndfile sound +themes xcomposite +xft xi2 xinerama xpresent
++xrandr +xrender +xsm +xsync zoom"
 
 REQUIRED_USE="
-	audiofile? ( sound )
+	^^ ( poll select )
 	opengl? ( xcomposite )
 	pango? ( xft )
-	sndfile? ( sound )
-	sound? ( ^^ ( sndfile audiofile ) )
+	sound? (
+		^^ ( alsa player pulseaudio )
+		alsa?       ( ^^ ( sndfile audiofile ) )
+		pulseaudio? ( ^^ ( sndfile audiofile ) )
+	)
 "
 
 BDEPEND="
@@ -43,12 +47,14 @@ COMMON_DEPEND="
 		x11-libs/pango[X]
 	)
 	sound? (
-		|| (
+		alsa? ( media-libs/alsa-lib )
+		player? ( media-sound/alsa-utils )
+		pulseaudio? ( || (
 			media-sound/apulse[sdk]
 			media-sound/pulseaudio
-		)
-		sndfile? ( media-libs/libsndfile )
+		) )
 		audiofile? ( media-libs/audiofile:= )
+		sndfile? ( media-libs/libsndfile )
 	)
 	xcomposite? (
 		x11-libs/libXcomposite
@@ -76,8 +82,6 @@ DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto
 "
 
-PATCHES=( "${FILESDIR}/${PN}-user-fonts.patch" )
-
 src_configure() {
 	local myconf=(
 		$(use_enable container)
@@ -90,7 +94,6 @@ src_configure() {
 		$(use_enable nls)
 		$(use_enable opengl glx)
 		$(use_enable pango)
-		$(use_enable sound sound pulseaudio)
 		$(use_enable xcomposite composite)
 		$(use_enable xft)
 		$(use_enable xi2)
@@ -101,9 +104,7 @@ src_configure() {
 		$(use_enable xsm sm)
 		$(use_enable xsync)
 		$(use_enable zoom)
-		$(use_with audiofile sndldr audiofile)
 		$(use_with gnome gnome gnome3)
-		$(use_with sndfile sndldr sndfile)
 		--enable-mans
 		--disable-docs
 		--disable-esdtest
@@ -112,6 +113,22 @@ src_configure() {
 		--disable-werror
 		--disable-xscrnsaver
 	)
+	if use sound; then
+		use alsa       && myconf+=( --enable-sound=alsa )
+		use pulseaudio && myconf+=( --enable-sound=pulseaudio )
+		use player     && myconf+=( --enable-sound=player )
+
+		if use alsa || use pulseaudio; then
+			use sndfile   && myconf+=( --with-sndldr=sndfile )
+			use audiofile && myconf+=( --with-sndldr=audiofile )
+		else
+			myconf+=( --without-sndldr )
+		fi
+	else
+		myconf+=( --disable-sound --without-sndldr )
+	fi
+	use poll && myconf+=( --with-evhan=poll )
+	use select && myconf+=( --with-evhan=select )
 
 	econf "${myconf[@]}"
 }
diff --git a/x11-wm/e16/metadata.xml b/x11-wm/e16/metadata.xml
index df0e841644f4..8a474b5136e5 100644
--- a/x11-wm/e16/metadata.xml
+++ b/x11-wm/e16/metadata.xml
@@ -13,6 +13,8 @@
     <flag name="modules">Enable support for loadable modules</flag>
     <flag name="pango">Enable pango font rendering using <pkg>x11-libs/pango</pkg></flag>
     <flag name="player">Enable audio using aplay from <pkg>media-sound/alsa-utils</pkg></flag>
+    <flag name="poll">Use poll() event handler API (recommended)</flag>
+    <flag name="select">Use select() event handler API</flag>
     <flag name="themes">Install the official E16 themes using <pkg>x11-themes/e16-themes</pkg></flag>
     <flag name="xi2">Enable the experimental multipointer input XInput2. This incldues the MultiPointer X feature</flag>
     <flag name="xpresent">Enable support for the X Present extension via <pkg>x11-libs/libXpresent</pkg></flag>
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index bc65015dce2e..c669e6cb3ca4 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -4,6 +4,6 @@ DIST i3-gaps-4.19.1.tar.gz 4189285 BLAKE2B 91dcf3024cfdc01f52eefc53912d5d2264c51
 DIST i3-gaps-4.20.1.tar.gz 4199697 BLAKE2B b9297f95d8e29f6bcc2fa89ba99c30bd9c4df3549de8b4eff018c0ad1e39e1c5a89281e5a0994596b6af08e8bdf94b8df866667042023dc757fa2596770484be SHA512 0f3cab505f5dcd11d4d9ab63aa84d7d90e63ffebe6a867c9592c7979fe57d37db69869d555ea2127b84caa108778a028e03fa8fab1432d897c02723e3c83e6ba
 DIST i3-gaps-4.20.tar.gz 4200904 BLAKE2B a76825404119b9161b90eebfd0d5beca53dc6b081ce434c6eac059abf7446452817364a598bfed76965807307be80227dd221162eb299b63276a8639a0f8f7e4 SHA512 e0fd261df5dd80bf7d2e1b13da88fa4968a03e9a883a7d5f4d2a68fe62cc3df8f675acde1f35a9dbd9ecec7e800322264e7f869d89f34c77668a310b866fb316
 EBUILD i3-gaps-4.19.1.ebuild 1766 BLAKE2B a8cd816bcf2bff2ad2d8bf67c73bc5afa9d710af68a89a848cbae019d6b28c09ea9da2a67dc28a5b9a0d807837ded3cc5fc8a067dd09ce6240ec951ee8c3b2e0 SHA512 d51b738800b05c48ba355281a05a0d58457b5310937d1b66a600b72bf7a79c890c31f6a95b85bd4bf070557a2799c31ab1b52d3256b7896b486bb83690384484
-EBUILD i3-gaps-4.20.1.ebuild 1728 BLAKE2B d29c1f5b82f97adf723d6ab17a434ef7649f7373f2fda8ce63211814eae2f537bcab8d761df1682375fbc8265a0dbeb87ee05d2c7bb2d2bbf6413bd517eb11ef SHA512 e3d8dfb0ffeea582d91655c6d4b44ee80698fb1922b4a496d572df3b96a30b076443e4cd4698dbe6febec12fd05fe51ebec42624f2439d0d6c3b14f80bc4cc72
+EBUILD i3-gaps-4.20.1.ebuild 1727 BLAKE2B 6cbf5ccc907ad20ce488b6e6de1c1e27bbff975e9f79ba36e0fcba9a5f17afeee9f379b49d9fb952d68236b6bb990015f632c834c4e16e7e170d113605bfb997 SHA512 abb6a7f2568d18a44c489321eb4adeaceb48a7f91f093732cd3c6ae4c4b47fbf2e034b8048d95650b4b3633a25acf75ce0e4f8f5b239a16d897e026c64dbd71e
 EBUILD i3-gaps-4.20.ebuild 1728 BLAKE2B d29c1f5b82f97adf723d6ab17a434ef7649f7373f2fda8ce63211814eae2f537bcab8d761df1682375fbc8265a0dbeb87ee05d2c7bb2d2bbf6413bd517eb11ef SHA512 e3d8dfb0ffeea582d91655c6d4b44ee80698fb1922b4a496d572df3b96a30b076443e4cd4698dbe6febec12fd05fe51ebec42624f2439d0d6c3b14f80bc4cc72
 MISC metadata.xml 325 BLAKE2B 9ba8b18821fde643863d03bd1550bb4bf6fb2f69b7fcd427eed48887573ace9d3c387e1444717e071eddee3dd89d48f04075b87926403f2ddab72111d46130c0 SHA512 5a69d3ad5248c785f1bb53e6817277e4fc4bf7ceda661ccf497271df05ea930a6f8581681f9a3b6f48a9b0bc7b905904b5b8940f1a0454dd086611486649bed1
diff --git a/x11-wm/i3-gaps/i3-gaps-4.20.1.ebuild b/x11-wm/i3-gaps/i3-gaps-4.20.1.ebuild
index 0cbd667483c2..a1489453b4ff 100644
--- a/x11-wm/i3-gaps/i3-gaps-4.20.1.ebuild
+++ b/x11-wm/i3-gaps/i3-gaps-4.20.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/i3-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~ppc64 ~riscv ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 17baa588308b..e648ca2fd876 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,11 +1,5 @@
 AUX i3-4.16-musl-GLOB_TILDE.patch 2783 BLAKE2B 9dea47af64b78a77006d3aa641273aa7a77846d4425e1da17424528445450112ab275cdf7098ba8c2a76f1b08561b1d1a852cb9fd4ee4c61e53832ca702ad55d SHA512 fdff65255e7c9b30eefdbf032e04ba568d5b75a5b7dfc5fce1aecaac0f0d376b6bb4f87338e1eaf5f20b1c5882ebfc7349f8ab43c804349b5f5c626f9fc1d340
-DIST i3-4.19.1.tar.xz 1277648 BLAKE2B a4d01d10c076da092faef2111ba0fadb481257c0011419cc911be0b63c0ff78053a39ff4a2887f6344794ea895190ebf1ac3585b598dbb90ff77d4de8fad7c53 SHA512 7a73d005e4ec438a7cf92ab719e17701948c5043cc431740b16e028e9771d1478fa539aebd1a8198fff6bec664f8bcecc17c3bd1ff35d53077d50d3ad1a8f7dc
-DIST i3-4.19.2.tar.xz 1277396 BLAKE2B 28d4dba50ae30cb620dcbd759e0ba29e284071234261aca2a217b6eef9194f72eca67d3632dc1e6a9b9879925e55c18b7a42676eaed41dd1354f772e48309d45 SHA512 58f08228d842cd3c2bc417b72f6279fcd7050879e5fd4064b2cb00edaf98b6605d5b2361608f9534991a0f8357d3294e881c7e314f33dc075241cc45ca5ed94d
 DIST i3-4.20.1.tar.xz 1284984 BLAKE2B a7943b3bc680eb3df596b008d751d034fc6ccf2b6891db731b9af5164fdcfc2872c0756c81c3f11f94a30aa9bdc4ecf4b47d20022a214bb6eb6c06fd78458fb3 SHA512 c0f6b991d46180ca470cbb7ab4cf5492552beb9dbf2631c61c8d92d0647106885481962381682e9129f3993d70bc6e5de506da1d32c3710fca64a66d51e8c8ce
-DIST i3-4.20.tar.xz 1286300 BLAKE2B 297c97032bd91e3086be8f72d476321bc48f9dbea6e45d1313229c569592c9a64bd9c19393d75a9c8abcaaf93d009709a81007b523fe5c3bae52fc1d7e4e7836 SHA512 7b184116664d2c3e097341e8008fea91bdc446a05177f50f5472890289e862fb41a11edc1d2b8d004347ce312219cb3d80c75840d3427330e3f0ee256163c198
-EBUILD i3-4.19.1.ebuild 1962 BLAKE2B afa9253da2dab6628674bc2d2b613a2c6a25dc9009840fda4029957c80d1fd61453a95dddcbf346bf5a457030735295b7dce72c62020efbe633087a027f2f9dc SHA512 67b9bac58c187654464633f205728e0000eba33cbdc965499ee4c689452b7ac4a559252c21fc271361c31bd9e0b486aab03f52b1d6fb8f3e35d25ea46640ab9a
-EBUILD i3-4.19.2.ebuild 1979 BLAKE2B e0ae6c87c9fca9406b2296a93959e37fb45cdde17217f9428cc95f0b94ca6c6eb0458300fac140753cea324bc669cfb9451afe3c6dc19253f13385f78a920d74 SHA512 306cefdbc5a7a073e5f335db2eeec3689ded16ad77d34957ae485537759544d42590dd611b7397e8c99b4e8fada105c1083ebb68b43126603cb8705f39294128
-EBUILD i3-4.20.1.ebuild 1980 BLAKE2B 69f55ddfcaaf472dcac233e60395fa7f2e00a51b98dc89f16c8ce79f4e9c977b38bd4b22fafa0a98a7eb5d2865ec70b09320a5fc4c08172717215df604e0ed99 SHA512 96124e3c86b99380a262dea53af0f538b533e7fbf5a0eb6495c752a0d52fa4f338e3cb8d113254bdf9a935d9738ee1b679635cfe934ccfcd0fce670900b86607
-EBUILD i3-4.20.ebuild 1980 BLAKE2B 69f55ddfcaaf472dcac233e60395fa7f2e00a51b98dc89f16c8ce79f4e9c977b38bd4b22fafa0a98a7eb5d2865ec70b09320a5fc4c08172717215df604e0ed99 SHA512 96124e3c86b99380a262dea53af0f538b533e7fbf5a0eb6495c752a0d52fa4f338e3cb8d113254bdf9a935d9738ee1b679635cfe934ccfcd0fce670900b86607
+EBUILD i3-4.20.1.ebuild 1978 BLAKE2B c2fd96844cd8518e764eacc4c17580e390438b082c7ed5465d9c13f8bde52b073c9dc46d2a37a3335d0491692ea6da3ab122328d3d04bd6b761741d4ef8e5409 SHA512 6170714aaddfc8d23e5e022f22575dd05d5c315af359e5aa55ead0c9478ddfe4972c8d1206ec1b391b017a215dc908a9e03b2a45bd07620866b2f981a07970a2
 EBUILD i3-9999.ebuild 1973 BLAKE2B 6560c66a1e6b47f767f7b9b7711646aeab3603d4856dba9973751f12ba99019d4c0f5d45d6ab28a75f01652d300654847b7f6eea8be48efe797e0940adfd4697 SHA512 d240e390c4c7f949de52ac382421afd5cab2f507fbe2bec97756180424c098a2fb62190d595dc49c8a4d71e59a3b433cb8a0177086445315af7c82a5a7e10dc6
 MISC metadata.xml 537 BLAKE2B 81033b6b7a90a15350b23f77fe6c99d277025ae1f36ef6b5d78bf28f0b5c9fab608c165809433577551f0b478e5a154bc7b95b64b19f7ef9be18f6c7772473f8 SHA512 157b7fc03f7d9c9a455b787061a3e806701e98e3335a0f9edb50fbd5f7712ee3ed6e9573046d8fe72093e162c3253bad3e564b73633f4c67c60a326a103583be
diff --git a/x11-wm/i3/i3-4.19.1.ebuild b/x11-wm/i3/i3-4.19.1.ebuild
deleted file mode 100644
index b3fcd0ed53ef..000000000000
--- a/x11-wm/i3/i3-4.19.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson optfeature virtualx
-if [[ "${PV}" = *9999 ]]; then
-	inherit git-r3
-fi
-
-DESCRIPTION="An improved dynamic tiling window manager"
-HOMEPAGE="https://i3wm.org/"
-if [[ "${PV}" = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/i3/i3"
-	EGIT_BRANCH="next"
-else
-	SRC_URI="https://i3wm.org/downloads/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc test"
-
-COMMON_DEPEND="dev-libs/libev
-	dev-libs/libpcre
-	dev-libs/yajl
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbcommon[X]
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
-	x11-misc/xkeyboard-config
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/pango[X]"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		dev-perl/AnyEvent
-		dev-perl/X11-XCB
-		dev-perl/Inline
-		dev-perl/Inline-C
-		dev-perl/IPC-Run
-		dev-perl/ExtUtils-PkgConfig
-		dev-perl/local-lib
-		virtual/perl-Test-Simple
-		x11-base/xorg-server[xephyr]
-		x11-misc/xvfb-run
-	)
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-		dev-lang/perl
-	)"
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	dev-perl/AnyEvent-I3
-	dev-perl/JSON-XS"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
-)
-
-src_prepare() {
-	default
-
-	cat <<- EOF > "${T}"/i3wm
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		$(meson_use doc docs)
-		$(meson_use doc mans)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/i3wm
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	optfeature_header "There are several packages that may be useful with i3:"
-	optfeature "application launcher" x11-misc/dmenu
-	optfeature "simple screen locker" x11-misc/i3lock
-	optfeature "status bar generator" x11-misc/i3status
-}
diff --git a/x11-wm/i3/i3-4.19.2.ebuild b/x11-wm/i3/i3-4.19.2.ebuild
deleted file mode 100644
index 280591df10c5..000000000000
--- a/x11-wm/i3/i3-4.19.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson optfeature virtualx
-
-DESCRIPTION="An improved dynamic tiling window manager"
-HOMEPAGE="https://i3wm.org/"
-if [[ "${PV}" = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/i3/i3"
-	EGIT_BRANCH="next"
-	inherit git-r3
-else
-	SRC_URI="https://i3wm.org/downloads/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/libev
-	dev-libs/libpcre
-	dev-libs/yajl
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbcommon[X]
-	x11-libs/pango[X]
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
-	x11-misc/xkeyboard-config
-"
-DEPEND="
-	${COMMON_DEPEND}
-	test? (
-		dev-perl/AnyEvent
-		dev-perl/ExtUtils-PkgConfig
-		dev-perl/Inline
-		dev-perl/Inline-C
-		dev-perl/IPC-Run
-		dev-perl/local-lib
-		dev-perl/X11-XCB
-		virtual/perl-Test-Simple
-		x11-base/xorg-server[xephyr]
-		x11-misc/xvfb-run
-	)
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-		dev-lang/perl
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-lang/perl
-	dev-perl/AnyEvent-I3
-	dev-perl/JSON-XS
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.16-musl-GLOB_TILDE.patch
-)
-
-src_prepare() {
-	default
-
-	cat > "${T}"/i3wm <<- EOF || die
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(meson_use doc docs)
-		$(meson_use doc mans)
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-src_install() {
-	meson_src_install
-
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/i3wm
-}
-
-pkg_postinst() {
-	optfeature_header "There are several packages that may be useful with i3:"
-	optfeature "application launcher" x11-misc/dmenu
-	optfeature "simple screen locker" x11-misc/i3lock
-	optfeature "status bar generator" x11-misc/i3status
-}
diff --git a/x11-wm/i3/i3-4.20.1.ebuild b/x11-wm/i3/i3-4.20.1.ebuild
index 406be38b4f28..e8ed20dd1b37 100644
--- a/x11-wm/i3/i3-4.20.1.ebuild
+++ b/x11-wm/i3/i3-4.20.1.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" = *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://i3wm.org/downloads/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 fi
 
 LICENSE="BSD"
diff --git a/x11-wm/i3/i3-4.20.ebuild b/x11-wm/i3/i3-4.20.ebuild
deleted file mode 100644
index 406be38b4f28..000000000000
--- a/x11-wm/i3/i3-4.20.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson optfeature virtualx
-
-DESCRIPTION="An improved dynamic tiling window manager"
-HOMEPAGE="https://i3wm.org/"
-if [[ "${PV}" = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/i3/i3"
-	EGIT_BRANCH="next"
-	inherit git-r3
-else
-	SRC_URI="https://i3wm.org/downloads/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/libev
-	dev-libs/libpcre
-	dev-libs/yajl
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbcommon[X]
-	x11-libs/pango[X]
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
-	x11-misc/xkeyboard-config
-"
-DEPEND="
-	${COMMON_DEPEND}
-	test? (
-		dev-perl/AnyEvent
-		dev-perl/ExtUtils-PkgConfig
-		dev-perl/Inline
-		dev-perl/Inline-C
-		dev-perl/IPC-Run
-		dev-perl/local-lib
-		dev-perl/X11-XCB
-		virtual/perl-Test-Simple
-		x11-base/xorg-server[xephyr]
-		x11-misc/xvfb-run
-	)
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-		dev-lang/perl
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-lang/perl
-	dev-perl/AnyEvent-I3
-	dev-perl/JSON-XS
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.16-musl-GLOB_TILDE.patch
-)
-
-src_prepare() {
-	default
-
-	cat > "${T}"/i3wm <<- EOF || die
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(meson_use doc docs)
-		$(meson_use doc mans)
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-src_install() {
-	meson_src_install
-
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/i3wm
-}
-
-pkg_postinst() {
-	optfeature_header "There are several packages that may be useful with i3:"
-	optfeature "application launcher" x11-misc/dmenu
-	optfeature "simple screen locker" x11-misc/i3lock
-	optfeature "status bar generator" x11-misc/i3status
-}
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index ed67254a5068..5e250a6682ff 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.0.tar.lz 1745872 BLAKE2B 6a37894f51adc29e73a9edb74e6b5e1cdc9f93cd2dc2a28cd456ecd574f29b985a87395c1f12fd9265d4d9cd5c55749f59b4cef711daf8d8a638c5f98669a7bf SHA512 9db1c5c5a277a55b256cd9be4a964639b24cee49e809c56a772ac2501ab96acbf0c0268609e241c800fbaa566b96585b5b67642908a1c244091683c2f8cda92b
-DIST icewm-2.9.1.tar.lz 1747544 BLAKE2B 58cbf792b8c697f04a33d3f64b7241e8067aae9f63fa27f625fbfda5fcd0ca154c588ba70930a520450dc8fb8a471561e3bbafe3d1d6d7d2b92f865012c5e838 SHA512 3cb0554c2b1cc1bae0f0229e93874739448d9cd24cb790f89cde6829c936942e61d2d4f1803154962bab4c66bcf993d5cfd1060ec520b1aec91839e2ef951097
+DIST icewm-2.9.2.tar.lz 1751384 BLAKE2B 9b292d6f0be7955346d00f8b488ca0b5e173860f976e91669660ec0e3e7c1de703648b5d4ce7327d68745e044cb0f29e88e8ee77ea6dc723adb362ecdbdbe2c5 SHA512 636de817ae2739a6e7c9d1bdacc78bb5afc7bfe743e17825785d50254e643e7800d169046033eefc6214030801451a3c1e6b496cf9da4d05091bd9a40235d8db
+DIST icewm-2.9.3.tar.lz 1760889 BLAKE2B f28ad3819bd89c70ae17df9bd3dfda6e5769be41a6206744fb13486b97a96618595da465654aca09ed43cabd5082feef70fe486f4ad679747bf6195ec4776f2e SHA512 c3aff2076bc293da4f42a72e02b44d3e4c972bfe4ceb0c0b9054f876c1ad1a6c0d43cf76db5422af8c907bfad222fb0e93c72070b93eac8fcdda8fb680f8691c
 EBUILD icewm-2.8.0.ebuild 2952 BLAKE2B 3d4deb20d6b0005814f93d3b95417d040d7074f2212229c8c306c76c7e1b9ac0d6e544211fc6ea365d8501909201be743b092778948cd241f174a4b27237b5d0 SHA512 1569cd173035d3a94bb8a471829c85774f558bbc2beb8513730523845f45ec117121b8616f8fea74ac9fb92798daf61fbae4bf4f308f415ef6e9a2c6e12b9e8f
-EBUILD icewm-2.9.0.ebuild 2956 BLAKE2B 733dadf47f5dde98dabfce3b0e74bc5cf8912cb45bca3821651a59270b1ba3abd51b3de7cb992cf0e6b3c654badfb968e8de275bc5955f377d8b9132c77cc40e SHA512 412d620843feb1394f51611d035e86bcb21ba4e1bbd553b0e5a0c76e4dedf7f5490a9f64cb7b23d20f0526dccd508c51301b9a97df7af55894e7f0ffa6c77a04
-EBUILD icewm-2.9.1.ebuild 2956 BLAKE2B 733dadf47f5dde98dabfce3b0e74bc5cf8912cb45bca3821651a59270b1ba3abd51b3de7cb992cf0e6b3c654badfb968e8de275bc5955f377d8b9132c77cc40e SHA512 412d620843feb1394f51611d035e86bcb21ba4e1bbd553b0e5a0c76e4dedf7f5490a9f64cb7b23d20f0526dccd508c51301b9a97df7af55894e7f0ffa6c77a04
+EBUILD icewm-2.9.2.ebuild 2956 BLAKE2B 733dadf47f5dde98dabfce3b0e74bc5cf8912cb45bca3821651a59270b1ba3abd51b3de7cb992cf0e6b3c654badfb968e8de275bc5955f377d8b9132c77cc40e SHA512 412d620843feb1394f51611d035e86bcb21ba4e1bbd553b0e5a0c76e4dedf7f5490a9f64cb7b23d20f0526dccd508c51301b9a97df7af55894e7f0ffa6c77a04
+EBUILD icewm-2.9.3.ebuild 2956 BLAKE2B 733dadf47f5dde98dabfce3b0e74bc5cf8912cb45bca3821651a59270b1ba3abd51b3de7cb992cf0e6b3c654badfb968e8de275bc5955f377d8b9132c77cc40e SHA512 412d620843feb1394f51611d035e86bcb21ba4e1bbd553b0e5a0c76e4dedf7f5490a9f64cb7b23d20f0526dccd508c51301b9a97df7af55894e7f0ffa6c77a04
 MISC metadata.xml 748 BLAKE2B 340b1eea319761630ad5bc22dc734fbfc2492acb263f03ea267e3c37c6c2928ba23cde5ee670c9265dae8bc3f78cdacf584c32d6c65219e859cf6df3b283be4d SHA512 4ba0d01e983f7a6c16ce6da6a7f54fb962154d50db8b820855e2c0dda7609526fc1aae039b469c27eaf6bd09a71b3c951c58b2a84d8aea9ce9fce4a5eff48b46
diff --git a/x11-wm/icewm/icewm-2.9.0.ebuild b/x11-wm/icewm/icewm-2.9.2.ebuild
index 6d9fc5f765eb..6d9fc5f765eb 100644
--- a/x11-wm/icewm/icewm-2.9.0.ebuild
+++ b/x11-wm/icewm/icewm-2.9.2.ebuild
diff --git a/x11-wm/icewm/icewm-2.9.1.ebuild b/x11-wm/icewm/icewm-2.9.3.ebuild
index 6d9fc5f765eb..6d9fc5f765eb 100644
--- a/x11-wm/icewm/icewm-2.9.1.ebuild
+++ b/x11-wm/icewm/icewm-2.9.3.ebuild
diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index fbca58d2dccf..8c73b03bd5e4 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -1,6 +1,10 @@
 AUX 1.2.0-desktop-files.patch 1001 BLAKE2B eee93a9f1d3466dcdb4d9d411b9e5b5b5a882dba2d4ccadb8ad90d82b66ee3a2d02fb02dbdd6b156fb9768c6d8d8b772b075ffc2b12e630e204e55632e99f931 SHA512 419fdd6c26f05daa4dacee5d0f21a51ffc465d443ba47e374c431c722dab98b8686453c692b0d8e579c5a5f43b18d92c0f7345845901e1d86ad36c70e1546b4d
+AUX 1.6.1-chmod.patch 647 BLAKE2B 55983e761e3cc85c092c2ee79a9c724ca48b4b0a5e32bc475fa382b24c56bcb8c6c7463a94d88044a5ecac0ee128fae0fbea7e9e90ea0c8ea7d7c32e60a85834 SHA512 0f7d5f0ab6179f48b7a2367434a370de95ed82811f8816a791a01054fcbbc1ff037333461ca50915307d2b99b265b7b6678a16897359d17ecb75b5e3774ec3f9
+AUX 1.6.1-desktop-files.patch 1671 BLAKE2B 4eec89c64a1fdb4dc05cc5ccb7b92daa5cae4485ba8eaf03c980336ebf23b871b1a59b48fa207bb6c7d560e23ea31482d2cda20bbc81ed94e71f303e8f3a62d8 SHA512 251ca933d840889a52f3464274338b04782d7965401bfd684408e4b9b264136d5871ef0aa6ad857cdd97099d5d7d7d6f9713684a69f450813ca6d58807fef8d2
 AUX lumina-session 2011 BLAKE2B bec6e1161c89ef0ae5f6506d57b6deff09f907b2c16b0d3404eb61369f1c3fa6f19400557f18dc3081e19652badae541d9f84be8717851b5a583392caaef303f SHA512 79e06e1761b079c96984c84f225e23a545d012ad94148080c3659c85f75b322dd050fc4b1908f72de1cdd22bab6b62e0d1de4f8c77f29073e88488671b0836db
 DIST lumina-1.6.0.tar.gz 20662000 BLAKE2B c016f07fb86333e792d6a0a0ddaa9ea09f322d6de69d099abf9340d7db6cb9e23624b62882579ba6c13eec71fcf663f1688424fd940cd7e09e625f6fcc4b281f SHA512 e923961568ab9cc32206386066daef8cd1fd2db2d5c3e260e5c1da1dcda39a516576418f607cefbe5a1c47d8684591d0e595fb344e7d6aa2859fc3b326e73e30
+DIST lumina-1.6.1.tar.gz 20614263 BLAKE2B c0ad6a48d06ec9b2c0856a673319cb6a022416465e5f15fce47aac62d7e1817dc8b01acc7c55eaf3664217f2f27ef1b4d7a603a355cd9e22b707b481b322783a SHA512 ff4a77812e8d91478cbfd123ddc545e5a4aaabf3d9f96e6dedc769eb9490e4ac372c4243dca9444cdf986886c08e2eaa587470c9bc8a5a00bbe10ff80ad64c96
 EBUILD lumina-1.6.0.ebuild 2393 BLAKE2B 81ec58a7db69858efba8551c036f11190af573b21ae85c18c97ae6759ab35e169b63d5cc6d6c93146ba9af12823e70007a740eb2fe3d0c42fc2452d9cc94fd0e SHA512 fdd5aca5842e6b7cbe3e815c0ba65d869d8a5f934ad06421cc83b7e16b6f840c5668e14bd7c449db799d9d2a7e246e784f8de8979a0508e9122b399f9684a05f
+EBUILD lumina-1.6.1.ebuild 2265 BLAKE2B 7c2bcfd2b91165cd2399735b91dd00c0dd71e5c80aa673d5450b52fdd1168aff3e754a1ba878ad42cd26ce0c6d10ccc3b2528b7291761760cbf79c9214e8cfe8 SHA512 ec14e919d4834fc54fe407520e66357586859a3d25c9397113d87a9adb9fff2501af8a88a422314ac21097b05c3e5fc8274b5897e4bec4bc3e8114843240faba
 EBUILD lumina-9999.ebuild 1366 BLAKE2B 0da2fd0940f6ebdb0dcbe0424b81458f90b20fe66cfb3c65f3bc1164c45deb5293981eb30886bdcc40d56e1ffe0ffc79660c91c62531fb038c56b5fa584d45be SHA512 758c5ac50e8673155abf452dbe28ba54d5f59ff5f1b91f59dcb061d5ed1c979aab7c8101dab4b928e24ca79491c9bf5b8c27a83a7277ba9d10b7f016c8674d13
 MISC metadata.xml 1982 BLAKE2B f2ea25f4e1118e58d78802ba7a047ec2cf1a963127d650625d2e18d2dd4378fdd255d513dcfbd7c24dacd7635839f3edde09cf778846ac7c98f302000e79b14a SHA512 54ffea2bd7d41a773888fe09dd4c70ef2db0898347249806cde19476f8a8a5b925ba5c953c4718786dd763a1664e5e247151cde69328525615cf9b0412dce909
diff --git a/x11-wm/lumina/files/1.6.1-chmod.patch b/x11-wm/lumina/files/1.6.1-chmod.patch
new file mode 100644
index 000000000000..ca6460eb2dda
--- /dev/null
+++ b/x11-wm/lumina/files/1.6.1-chmod.patch
@@ -0,0 +1,13 @@
+diff -r -U3 lumina-1.6.1.orig/src-qt5/core/lumina-checkpass/lumina-checkpass.pro lumina-1.6.1/src-qt5/core/lumina-checkpass/lumina-checkpass.pro
+--- lumina-1.6.1.orig/src-qt5/core/lumina-checkpass/lumina-checkpass.pro	2021-10-03 02:05:49.000000000 +0700
++++ lumina-1.6.1/src-qt5/core/lumina-checkpass/lumina-checkpass.pro	2021-12-05 12:55:00.656682056 +0700
+@@ -12,7 +12,7 @@
+ 
+ SOURCES += main.c
+ 
+-perms.path = $$DESTDIR$${PREFIX}/sbin
+-perms.extra = "chmod 4555 $$DESTDIR$${PREFIX}/sbin/lumina-checkpass"
++#perms.path = $$DESTDIR$${PREFIX}/sbin
++#perms.extra = "chmod 4555 $$DESTDIR$${PREFIX}/sbin/lumina-checkpass"
+ 
+ INSTALLS += target perms
diff --git a/x11-wm/lumina/files/1.6.1-desktop-files.patch b/x11-wm/lumina/files/1.6.1-desktop-files.patch
new file mode 100644
index 000000000000..33a7165b5901
--- /dev/null
+++ b/x11-wm/lumina/files/1.6.1-desktop-files.patch
@@ -0,0 +1,33 @@
+diff -r -U3 lumina-1.6.1.orig/src-qt5/core/lumina-info/lumina-info.desktop lumina-1.6.1/src-qt5/core/lumina-info/lumina-info.desktop
+--- lumina-1.6.1.orig/src-qt5/core/lumina-info/lumina-info.desktop	2021-10-03 02:05:49.000000000 +0700
++++ lumina-1.6.1/src-qt5/core/lumina-info/lumina-info.desktop	2021-12-05 11:42:18.142573885 +0700
+@@ -5,7 +5,7 @@
+ Type=Application
+ StartupNotify=true
+ Categories=System;
+-OnlyShowIn=Lumina;
++OnlyShowIn=X-Lumina;
+ Name=Desktop Information
+ Name[pt]=Informações do ambiente de trabalho
+ GenericName=Version and Legal Information
+diff -r -U3 lumina-1.6.1.orig/src-qt5/core/lumina-info/lumina-support.desktop lumina-1.6.1/src-qt5/core/lumina-info/lumina-support.desktop
+--- lumina-1.6.1.orig/src-qt5/core/lumina-info/lumina-support.desktop	2021-10-03 02:05:49.000000000 +0700
++++ lumina-1.6.1/src-qt5/core/lumina-info/lumina-support.desktop	2021-12-05 11:41:50.668573204 +0700
+@@ -3,7 +3,7 @@
+ URL=https://t.me/luminadesktop
+ Icon=Lumina-DE
+ Categories=System;
+-OnlyShowIn=Lumina;
++OnlyShowIn=X-Lumina;
+ Name=Community Support
+ Name[pt]=Suporte da comunidade
+ GenericName=Get Desktop Help
+diff -r -U3 lumina-1.6.1.orig/src-qt5/core-utils/lumina-config/lumina-config.desktop lumina-1.6.1/src-qt5/core-utils/lumina-config/lumina-config.desktop
+--- lumina-1.6.1.orig/src-qt5/core-utils/lumina-config/lumina-config.desktop	2021-10-03 02:05:49.000000000 +0700
++++ lumina-1.6.1/src-qt5/core-utils/lumina-config/lumina-config.desktop	2021-12-05 11:42:58.002574873 +0700
+@@ -9,4 +9,4 @@
+ Name[pt]=Configurar ambiente de trabalho
+ Comment=Modify the desktop
+ Comment[pt]=Modificar ambiente de trabalho
+-OnlyShowIn=Lumina;
++OnlyShowIn=X-Lumina;
diff --git a/x11-wm/lumina/lumina-1.6.1.ebuild b/x11-wm/lumina/lumina-1.6.1.ebuild
new file mode 100644
index 000000000000..3992057d88a8
--- /dev/null
+++ b/x11-wm/lumina/lumina-1.6.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="af ar az bg bn bs ca cs cy da de el en_AU en_GB en_ZA es et eu fa fi fr fr_CA fur gl he hi hr hu id is it ja ka ko lt lv mk mn ms mt nb ne nl pa pl pt pt_BR ro ru sa sk sl sr sv sw ta tg th tr uk ur uz vi zh_CN zh_HK zh_TW zu"
+inherit plocale qmake-utils xdg
+
+DESCRIPTION="Lumina desktop environment"
+HOMEPAGE="https://lumina-desktop.org/"
+SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="desktop-utils"
+
+DEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5[widgets]
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libxcb:0
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-wm
+	desktop-utils? ( app-text/poppler[qt5] )"
+
+RDEPEND="${DEPEND}
+	app-admin/sysstat
+	media-sound/alsa-utils
+	sys-fs/inotify-tools
+	sys-power/acpi
+	|| (
+		x11-apps/xbacklight
+		sys-power/acpilight
+	)
+	x11-misc/numlockx
+	x11-wm/fluxbox"
+
+BDEPEND="
+	dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=(
+	"${FILESDIR}/1.6.1-desktop-files.patch"
+	"${FILESDIR}/1.6.1-chmod.patch"
+)
+
+DOCS=( README.md )
+
+src_prepare() {
+	default
+
+	if ! use desktop-utils ; then
+		rm -rf src-qt5/desktop-utils || die
+		sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
+	fi
+
+	plocale_find_changes "${S}/src-qt5/core/${PN}-desktop/i18n" "${PN}-desktop_" '.ts'
+}
+
+src_configure() {
+	eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
+		CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+	einstalldocs
+	chmod 4555 "${D}"/usr/sbin/lumina-checkpass
+	mkdir -p "${D}"/usr/share/icons/hicolor/64x64/apps || die "cannot create the icons dir"
+	mv "${D}"/usr/share/icons/hicolor/scalable/apps/*.png "${D}"/usr/share/icons/hicolor/64x64/apps || die "cannot mv png icons"
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}/lumina-session" lumina ||die
+
+	remove_locale() {
+		rm -f "${ED}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm
+
+	}
+	plocale_for_each_disabled_locale remove_locale
+}
diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index 4906e61d5444..97dfaf425513 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -1,5 +1,5 @@
 DIST marco-1.24.1.tar.xz 1860008 BLAKE2B b147e6ce8aad9382b2e8d96eec2da0356cce91977f4387776359ffb1f26903d7f0b9d9a1d43a436d1a64033f545600e7f810a29e3ae6ecdfb0d73ef8073b782c SHA512 55607898b64f0da3a85dd8d7fd092d847c8f67cefa096a63dbe074c197157a3d661fcb3f2a495b4425340b583b600cda3d1c92ac08b7327904dbd4aab8e92c85
 DIST marco-1.24.2.tar.xz 1845356 BLAKE2B 9308e07fec5319f741f7d78007e68e916c407c515fc2076c0e26a760830d3c79edf39888f265f7edc1baf0c8dc29661fb6598be16352103455cc441bc2a1daf5 SHA512 2e699935fb72ddc34aa1f98f5771f252141245ad8fd0983aafe5ea55aeeb3f90b5d68a61c27704adf0b929565180367aae46486d45e789d7de101ec9a7bc9f96
 EBUILD marco-1.24.1-r1.ebuild 1481 BLAKE2B 51998a385ac740af4e5f8be0a1c11e003aa2616196f6feba41e46c237ed473d0c7e38d137eef9158cff77f9381a36ff06244fdbae55517797515e9bc40f4a2c5 SHA512 aa21ffea9dd30126fd29fca608c2bba4a6186b52769d84505d16ef5c414ebacbead9dcd19bd1d5a6e0f1dbc81d164c3e7f729a688a36c2e6d84a935a4546d371
-EBUILD marco-1.24.2.ebuild 1490 BLAKE2B 739588f1a439eeac218c2a95567873a4776d245f59724486402aa41f961a621fede8fed5898f7cd69f0c0b61f4b195b0c9245841b099e9125c8ae14ab059b155 SHA512 9c2bcec046788fd756fb5a84f0177a1527b7d9014acdbf85fc9c6af4e0e9619732d4793a2a3f04ff79a233e1607834bdfaa96751d9577767cfca87456222b47c
+EBUILD marco-1.24.2.ebuild 1488 BLAKE2B 8fe9eb2628956fe81b139953720ed5b138f3dfbb7ddd2adcf63291d40ac9d8d999718834d1abe3f73eb295715f14c701d164eeb97f0dc35eade55038c03dbb38 SHA512 d7d9a4377a92558b9d9361713278685db5894a900cbcd327b7fb754a9de2097640917234b6079f94fae6323c222d5f877e176deab3811373875be2b2608fc36a
 MISC metadata.xml 335 BLAKE2B 6ea6ccc130219ab51421a230c3725468d1981748dff6f5b5978d7dbceb67dbe6aa81d26f77f36cea462256133109f8ea125bfed41653deac552e09855cde46af SHA512 8b165e204f4c7420fbeb618ce2b19d01ab08dde6f870155c8d03b5edb959d9ea82b15d926ae2ddfd9ca445139d06f32b370016b585a1c227808e26988794ecd8
diff --git a/x11-wm/marco/marco-1.24.2.ebuild b/x11-wm/marco/marco-1.24.2.ebuild
index 10c14688141d..3583e642ce12 100644
--- a/x11-wm/marco/marco-1.24.2.ebuild
+++ b/x11-wm/marco/marco-1.24.2.ebuild
@@ -8,7 +8,7 @@ MATE2_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 fi
 
 DESCRIPTION="MATE default window manager"
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 23b00ec6d1a9..21e11a75cf79 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,15 +1,11 @@
 AUX mutter-40.0-Disable-anonymous-file-test.patch 862 BLAKE2B bb7a0f0dfa5f0543c9187fe8c3aa8d1251fbb9c74dcf4c518a4674758a22da70a94de688f4b01d7673c679a2e96cbdfa5c33de3d009c85fecd2498061121dcf3 SHA512 d2d7ec9e1fcc3fad9dc058edf611fe16a3180a8d6694a9f3257b22eb3885dc0b311bc48054de0d183c661658e226d1b04e4ad81b1314a60a3f441a6f4c06bed8
-DIST mutter-40.3.tar.xz 2682460 BLAKE2B 41e505adc9aa6ca53d1f43d71051bc09c0f4f528803f10c8f4ad8fe2cf28f5a02a3d3dca1a4a02b702a40177501663e20b68415295805b6c0503690dbb5e53fc SHA512 beb9cb1b8dee153fe204aa5d799e4ba44380c8483362ab4f7b149c715be6fa929345386b78af73ca6ae7e864dd2923e5c0de88404f8ffe5d22f2ae9238bcc074
 DIST mutter-40.4.tar.xz 2682648 BLAKE2B fe3ed2edc20b4502db17bf3e6413159047eaa9812baa01b49f64ca2e3f05fe6f2e922a8e84ffd01636e8b6e5e31381653311153db5910f2dd1c84431d1892f6b SHA512 a38fe7c1ba2c65cb4510ee3ecd9b3e726cf3cb35922977e55f8b49f5ab847601277e1efaec63e7068ce0f924b38085adfe6d26b6d0af148a8f87400b31aba805
 DIST mutter-40.5-r1-patchset.tar.xz 5568 BLAKE2B 3e1cc6a8cb0a792a4abedaaa1f856eae679acf17be8fa5be6c4bf764924d89950c8fcd264859049fcf326ed94e2b4d74433bbee16acf06bb0e180674a9d3a2c2 SHA512 8da4f92b2268a6966d468cd15063fb361a71299aff671203141225e74d5655ee1cb4f4e2f1922e06355c3f3b756638f3a2243ecafeb30273e3ff04897b6a23d8
 DIST mutter-40.5.tar.xz 2682916 BLAKE2B 9ba2eeb5962a5473804fab02b1209c6044b151a1bc64b533762a27e91f6701a0ad655f582c8831cf92defc7be82e9eaa2c72b772fe7ea5e032dab5ecc96fb1b1 SHA512 ebd4f2bc4e8eef99d66305347673cbd2e38c5a058eb91eab6b932671ea7cb4a2f893dd65c4c5028ece454f8dd293898821bd125b68e304cf905ad237abff8837
-DIST mutter-41.0-r1-patchset.tar.xz 61232 BLAKE2B 89a5f86e488b45933225010a5c37d533163d6ee75253a94b3545dae1886bff95a1463da45198646d3ebfd1e95134c0df6863e16ea927d86106ecd243fbad77f0 SHA512 967e7db9b6644c2b620f71081913adfdcd06b01decef52c9d6e64e7040c3d528f9cf15d0d0c561ae7c7ef8abe891b4890dc7e21862105b3b922a77718e703717
-DIST mutter-41.0.tar.xz 2710476 BLAKE2B 821c967ac2f130b1803132725540494c4c23bc766738d34645fced50fa8de97464432f554161c44ae4c7f7569c524204f3a57359a2958946c31589f24f674f99 SHA512 ad1b19cc05d434610657ab1d4f8d060dbd4584feba410da0c18fc9232082d6abee8d5c3c3243b12a47019779da3fe3f13b172b992d85de552cef696952cf65a3
 DIST mutter-41.1.tar.xz 2712924 BLAKE2B 1b25f4a45be258f84ea29ccc85f4b70f228af9e2c6278edf0f2689436b33d320ae08b63f02736b59269ad9f4ac129d381a9c04e9118c58b6bb6f98512d744063 SHA512 797f857a6cc053e3639a002bc35f8431ed55bd887189f74f7b183bf9e54319dd66910c9d165826effffb9bec05ec7454ce21e4d0a78cb1a9d841c1eb37865d4e
-EBUILD mutter-40.3-r3.ebuild 4791 BLAKE2B 78646582f95f5daea53fae26bdc651a7dad50dd7b5c30e156d903e657829903dbfb610856438fab8c8ce44e2889dfaaba0b261cc2fd72552d48f3fd9179b4535 SHA512 0092f2d8749360aaf95e8909b983ad6166e0bfb2403929fef41752a8ba2e50c36f0db546aaf5130e10bf458f9f9647693c2da233603d6db2f412f16737313981
-EBUILD mutter-40.4-r2.ebuild 4914 BLAKE2B 58180ea1a5bbc1c80e6e8dd0a07b213e0957cd7a3adbb2e4dc2a993b65820ba1913d547149078d4476f4ef48ac84c634ace5a19e33263cfcc5b5bc32d24e8c62 SHA512 8e4af04018cfd5c5c9b8812e321f106283dd1f0e11ac6b8bb3d7c851dd7597bd484f7d0d43ee895f7386fbc919ee61b1b89845632242c3117280ef03f04b6b14
-EBUILD mutter-40.5-r4.ebuild 4917 BLAKE2B dea558513e0eafb2fd1922e906f699df51fed248cb954cac9875c08c191d56975ea658cb74841ccbffaf5a404d9538540e3e21fb6b45774f340f3a111d6163fd SHA512 a82984fdf4b8ccdce35969f06de3f92b10e482dbe19f3a58e191a2d8fc4e7bd9f4dc54d5cdaa354076521bd01480e9b5f533e74375f35f225b4bba55389081a2
-EBUILD mutter-40.5-r5.ebuild 5015 BLAKE2B 240b7c3fe68be9bb60a4075e5e3926d1cc7e1f84ee5b5b6f3423d42e3ae8575e15ad289fdd0de93015f05695655e8d57d1be83d25c767551c45bad85b29766a3 SHA512 f3f154081b8dd167c4436d2c52feaad5bbbc8843675fe70a6315532c2e230380d4b8d53ccb42c744087152f9d0df1fa82815d1a18a13a4a939bb36569e064c41
-EBUILD mutter-41.0-r3.ebuild 5077 BLAKE2B 340c1a67be8e0a300e1986727ece6595f0b9d3db269d7c95c7432aafbe556ba4daa66170e01a1c14900bf0ade588d27e285e2325f5421e53eee2d03f7a08398c SHA512 a37436aff8e8a6cf6fc910edbbd4055602ae85eaba3e981460da370458ab7356c657548ae60aa3f4b38d99e8ae0472cb903ad53cbbf75219876def9cd6c72100
-EBUILD mutter-41.1.ebuild 4979 BLAKE2B 7799f5a03f9e2966237b494ac899f5682f01c59b1b9a4b94360e91a00725dc18f96007c0d289b65bbef0e9f90d5c66e5a9aa1f2f717ea13003556cc8a9db384b SHA512 3a79d929613208dc6df8faf48d01a157c27f4ae572edaf3f3786cbddcb6d861e8c5b97f361f4dae902efa03b7f3fa8991d65db96cd607fe2ffc3c671ff8a9a3e
+DIST mutter-41.2.tar.xz 2713924 BLAKE2B 271b5cd3eebf3b3c040876dc634d5316788ee566fece2ded6987e048d03ea8b4b4c76b482ca91e1eaf5cdcdf36294948b2ab902013874f100247dfb5b04a4cbb SHA512 9fd030e2c3e5956e4e7412ac36069ab0e81798688b0a4f2372d935f81190ae8fb383919b2c29b8af37e5eeea47d250647ce8466d7f2e9047edf60e1ca93a9e3c
+EBUILD mutter-40.4-r3.ebuild 4910 BLAKE2B d509e7c6afc917844f1b917e8d065266fb1ffee6ee6edbb8b9c4998eb6b17e6fe4559f83b6d7fa9a0842f06ca060f25140523eb0eface392478ef2c794a0eb60 SHA512 13c5de3dd4cd4bb92a23dca2b8b52973f03c3001e8b86d390c6a61d313f88d8367fb4954f81ce525656eeb4382e8d01721d83ad3383824cc057fde66de3655a5
+EBUILD mutter-40.5-r6.ebuild 5011 BLAKE2B bfae9c5e5bb26f03f5ccf0bdf8a83662f8e38af61db302a394b4fe8c4f6e40527ad7708916d72b783794055ba6e7f86f9fb880990c541e43d9569a0c375bf290 SHA512 9b5c7540852636aa927279611ba256f40790adb2a41d558af3015758d02354fbd5ee7297b72d0bbae07ac5687c0b9d77905ab13df4752601d2ea1114dc31c5f4
+EBUILD mutter-41.1-r1.ebuild 4975 BLAKE2B 6426a03d413f77306d22d2702a2e9d30d9dba481d25a896566576bd6e0683dfc9f9a9d1f19bb5f0231fac4b265663d6592d1c55f9447ab98db8ab01ec1ad64b2 SHA512 63cbda626bfb9debebeed8c08eb958826c710ecacfb4d64703fe6b2e8013ebb273b43fec2d021fb8f9f3d91ce93318d5e4f30773848d4a4557729ee42b4fcfc7
+EBUILD mutter-41.2-r1.ebuild 4975 BLAKE2B 6426a03d413f77306d22d2702a2e9d30d9dba481d25a896566576bd6e0683dfc9f9a9d1f19bb5f0231fac4b265663d6592d1c55f9447ab98db8ab01ec1ad64b2 SHA512 63cbda626bfb9debebeed8c08eb958826c710ecacfb4d64703fe6b2e8013ebb273b43fec2d021fb8f9f3d91ce93318d5e4f30773848d4a4557729ee42b4fcfc7
 MISC metadata.xml 606 BLAKE2B 54a05fee61cf9a1d958a46e0cc94e1cd61e69e187f89393c483c7022d455b7248684df4f1df028f0733995dacfbdf1faab600d8c239885eb0c7ea3097326f156 SHA512 6dea733bb5da3bd2db059a467cec81f7cfc0765750cdcfa0404a72cbb168495f13d01051198206178615b1a3fa41f78dffd9f0a38f6d7579116e782d76fab899
diff --git a/x11-wm/mutter/mutter-40.3-r3.ebuild b/x11-wm/mutter/mutter-40.3-r3.ebuild
deleted file mode 100644
index aa5fa3a39ec8..000000000000
--- a/x11-wm/mutter/mutter-40.3-r3.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson udev virtualx xdg
-
-DESCRIPTION="GNOME compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-
-LICENSE="GPL-2+"
-SLOT="0/8" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
-
-IUSE="elogind 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 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-40.0[introspection?]
-	>=dev-libs/glib-2.67.3:2
-	gnome-base/gnome-settings-daemon
-	>=dev-libs/json-glib-0.12.0[introspection?]
-	gnome-base/gnome-desktop:3=
-	>=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
-	media-libs/mesa[X(+),egl(+)]
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	wayland? (
-		>=dev-libs/wayland-protocols-1.19
-		>=dev-libs/wayland-1.18.0
-		x11-libs/libdrm:=
-		>=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2]
-		>=dev-libs/libinput-1.15.0
-		systemd? ( sys-apps/systemd )
-		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:0/0.3 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-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? ( app-text/docbook-xml-dtd:4.5 )
-	wayland? (
-		>=sys-kernel/linux-headers-4.4
-		x11-libs/libxcvt
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-40.0-Disable-anonymous-file-test.patch
-)
-
-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 wayland native_backend)
-		$(meson_use screencast remote_desktop)
-		$(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 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)
-		$(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
-		emsonargs+=(
-			-Degl_device=false
-			-Dwayland_eglstream=false
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_test() {
-	glib-compile-schemas "${BUILD_DIR}"/data
-	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/x11-wm/mutter/mutter-40.4-r2.ebuild b/x11-wm/mutter/mutter-40.4-r3.ebuild
index 1d2f1214d2f2..94dd02db647d 100644
--- a/x11-wm/mutter/mutter-40.4-r2.ebuild
+++ b/x11-wm/mutter/mutter-40.4-r3.ebuild
@@ -72,7 +72,7 @@ DEPEND="
 	x11-libs/libSM
 	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
 	>=x11-libs/startup-notification-0.7
-	screencast? ( >=media-video/pipewire-0.3.21:0/0.3 )
+	screencast? ( >=media-video/pipewire-0.3.21:= )
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
 RDEPEND="${DEPEND}
diff --git a/x11-wm/mutter/mutter-40.5-r4.ebuild b/x11-wm/mutter/mutter-40.5-r4.ebuild
deleted file mode 100644
index 4d648da9d7b2..000000000000
--- a/x11-wm/mutter/mutter-40.5-r4.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson udev virtualx xdg
-
-DESCRIPTION="GNOME compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-
-LICENSE="GPL-2+"
-SLOT="0/8" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
-
-IUSE="elogind 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-40.0[introspection?]
-	>=dev-libs/glib-2.67.3:2
-	gnome-base/gnome-settings-daemon
-	>=dev-libs/json-glib-0.12.0[introspection?]
-	gnome-base/gnome-desktop:3=
-	>=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
-	media-libs/mesa[X(+),egl(+)]
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	wayland? (
-		>=dev-libs/wayland-protocols-1.19
-		>=dev-libs/wayland-1.18.0
-		x11-libs/libdrm:=
-		>=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2]
-		>=dev-libs/libinput-1.15.0
-		systemd? ( sys-apps/systemd )
-		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:0/0.3 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-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? ( app-text/docbook-xml-dtd:4.5 )
-	wayland? (
-		>=sys-kernel/linux-headers-4.4
-		x11-libs/libxcvt
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-40.0-Disable-anonymous-file-test.patch
-)
-
-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 wayland native_backend)
-		$(meson_use screencast remote_desktop)
-		$(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 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)
-		$(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
-		emsonargs+=(
-			-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 virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/x11-wm/mutter/mutter-40.5-r5.ebuild b/x11-wm/mutter/mutter-40.5-r6.ebuild
index ff038d790780..68ed88cbb8c5 100644
--- a/x11-wm/mutter/mutter-40.5-r5.ebuild
+++ b/x11-wm/mutter/mutter-40.5-r6.ebuild
@@ -73,7 +73,7 @@ DEPEND="
 	x11-libs/libSM
 	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
 	>=x11-libs/startup-notification-0.7
-	screencast? ( >=media-video/pipewire-0.3.21:0/0.3 )
+	screencast? ( >=media-video/pipewire-0.3.21:= )
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
 RDEPEND="${DEPEND}
diff --git a/x11-wm/mutter/mutter-41.1.ebuild b/x11-wm/mutter/mutter-41.1-r1.ebuild
index 61469e32b533..b05673366a97 100644
--- a/x11-wm/mutter/mutter-41.1.ebuild
+++ b/x11-wm/mutter/mutter-41.1-r1.ebuild
@@ -72,7 +72,7 @@ DEPEND="
 	x11-libs/libSM
 	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
 	>=x11-libs/startup-notification-0.7
-	screencast? ( >=media-video/pipewire-0.3.21:0/0.3 )
+	screencast? ( >=media-video/pipewire-0.3.21:= )
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
 RDEPEND="${DEPEND}
diff --git a/x11-wm/mutter/mutter-41.0-r3.ebuild b/x11-wm/mutter/mutter-41.2-r1.ebuild
index 7eff393ac61b..b05673366a97 100644
--- a/x11-wm/mutter/mutter-41.0-r3.ebuild
+++ b/x11-wm/mutter/mutter-41.2-r1.ebuild
@@ -6,7 +6,6 @@ inherit gnome.org gnome2-utils meson udev xdg
 
 DESCRIPTION="GNOME compositing window manager based on Clutter"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-r1-patchset.tar.xz"
 
 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
@@ -73,7 +72,7 @@ DEPEND="
 	x11-libs/libSM
 	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
 	>=x11-libs/startup-notification-0.7
-	screencast? ( >=media-video/pipewire-0.3.21:0/0.3 )
+	screencast? ( >=media-video/pipewire-0.3.21:= )
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
 RDEPEND="${DEPEND}
@@ -101,7 +100,6 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${WORKDIR}"/patches/
 	"${FILESDIR}"/${PN}-40.0-Disable-anonymous-file-test.patch
 )