9 files changed, 366 insertions, 155 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index ab72e3211dab..fe9bfbc2bcbc 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index a0e3450b1580..bc65015dce2e 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -1,7 +1,9 @@
 AUX i3-gaps-4.18-musl.patch 2157 BLAKE2B 4fef024279d11e996c5c204f27b5a8b9fb654b392aeef19b92d5c3f9dfb203290fad7c31c003a046ee91c1201d940f3050a950721da8f58bdfd75495cb9be05c SHA512 14f70f067679b952e1ffc1965ea460173799292a33b5df6d3b2ca2c091219d6cd1f14b2d41b187452a83923b5b34cabe218ecb6fa70702accbef7562dd01f021
 AUX i3-gaps-4.19-fix-docdir.patch 508 BLAKE2B 44aa2a2a7d0b77429345c4b62be66437714851481ca968098596c28aae8769036b8238b0295f4f80ca8e6e0f2c3e25c60130f3b941cb763d2069deb07d884dfd SHA512 8169cd9fdc2a4506af3d93eda672484a43ab30cf99afcdfc10094be36e6fcccf53d416376a475a95a80d34afb6dbec32bb657a81ccc7e5244c23b34717d5201a
 DIST i3-gaps-4.19.1.tar.gz 4189285 BLAKE2B 91dcf3024cfdc01f52eefc53912d5d2264c51683ae1249761fa848593ffea94ee67d7638d07e078477074fa57158d099f668a27f88b7ad3c10e56efb464bb6d9 SHA512 200610a221655beee5c204dca1b2d8fe37c64d9054713605a403ba8973b30460bbc64f9172aa3b262f2f8b477584fca667137147ac076bb06745130f31750a9a
+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.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
new file mode 100644
index 000000000000..0cbd667483c2
--- /dev/null
+++ b/x11-wm/i3-gaps/i3-gaps-4.20.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature
+
+DESCRIPTION="i3 fork with gaps and some more features"
+HOMEPAGE="https://github.com/Airblader/i3"
+SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/i3-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="dev-libs/glib:2
+	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"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		dev-perl/ExtUtils-PkgConfig
+		dev-perl/IPC-Run
+		dev-perl/Inline
+		dev-perl/Inline-C
+		dev-perl/X11-XCB
+		dev-perl/XS-Object-Magic
+		x11-apps/xhost
+		x11-base/xorg-server[xephyr,xvfb]
+		x11-misc/xvfb-run
+	)"
+BDEPEND="app-text/asciidoc
+	app-text/xmlto
+	dev-lang/perl
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	dev-perl/AnyEvent-I3
+	dev-perl/JSON-XS
+	!x11-wm/i3"
+
+DOCS=( RELEASE-NOTES-$(ver_cut 1-3) )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.18-musl.patch"
+)
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir="/usr/share/doc/${PF}"
+		-Ddocs=$(usex doc true false)
+		-Dmans=true
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	exeinto /etc/X11/Sessions
+	newexe - i3wm <<- EOF
+		#!/usr/bin/env sh
+		exec /usr/bin/i3
+	EOF
+}
+
+pkg_postinst() {
+	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/Manifest b/x11-wm/i3/Manifest
index 7bd787e7532f..17baa588308b 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,9 +1,11 @@
 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-9999.ebuild 1973 BLAKE2B 6560c66a1e6b47f767f7b9b7711646aeab3603d4856dba9973751f12ba99019d4c0f5d45d6ab28a75f01652d300654847b7f6eea8be48efe797e0940adfd4697 SHA512 d240e390c4c7f949de52ac382421afd5cab2f507fbe2bec97756180424c098a2fb62190d595dc49c8a4d71e59a3b433cb8a0177086445315af7c82a5a7e10dc6
 MISC metadata.xml 537 BLAKE2B 81033b6b7a90a15350b23f77fe6c99d277025ae1f36ef6b5d78bf28f0b5c9fab608c165809433577551f0b478e5a154bc7b95b64b19f7ef9be18f6c7772473f8 SHA512 157b7fc03f7d9c9a455b787061a3e806701e98e3335a0f9edb50fbd5f7712ee3ed6e9573046d8fe72093e162c3253bad3e564b73633f4c67c60a326a103583be
diff --git a/x11-wm/i3/i3-4.20.1.ebuild b/x11-wm/i3/i3-4.20.1.ebuild
new file mode 100644
index 000000000000..406be38b4f28
--- /dev/null
+++ b/x11-wm/i3/i3-4.20.1.ebuild
@@ -0,0 +1,107 @@
+# 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 9895d0205bab..419204a5fd88 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,8 +1,6 @@
 AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0
-DIST icewm-2.5.0.tar.lz 1722504 BLAKE2B caf5d61559dd5bb25583bebeaca82e54049e2a97d8e5eeb93942908481f68614cfe55afd4041b5d60e58e732fef1694f67c5918a130bc55b252ebae67a51482a SHA512 1f59b4dbe90ca47031e5abf999cdb23a8e9ea956d5a76a0dde9b3489dec4530bf0ce72e10b337615d0bcadf04007b00a7db6f43082504bef65b109f9115d9f52
 DIST icewm-2.7.0.tar.lz 1738471 BLAKE2B 407f5290329de99519b806db4bbc8895623d2930f37912db701170145579a1c2819b7ae2576b0aee146e8b006a12c78f7344224dd407ed7e8a1eba1cffc43ced SHA512 829673a3f7aa26fd7f74a9a8ab220548b6bb7724026517fa7ec1d5705fca2c0aa9339078d603242dbb2209c194a7a64aebcf55454aea5f8a20c4785e63e8cc3f
 DIST icewm-2.8.0.tar.lz 1745937 BLAKE2B dc5c4c6e4b5f067881176a0f72914f971dbae3daa475ed7ca00dbf3f687aae97874a0cf2e94b0d22d45f7dc221390c0658674e9aad3ea19d21a171b6d478c4be SHA512 552d1da9ceb96c6c14a0dfd596656a56fb289716a787fb75e54b49ef6df84747a4999ce733a6ffb9ff7a1e4c0243253fc3f2fa7a2251e7f3987ab9f33c0a1b30
-EBUILD icewm-2.5.0.ebuild 2952 BLAKE2B b0d75ba7ec27295593caa2bb47d51c518b35a81e95a53210b424f7632d197bb2cb6116feeee53f56348409589a13c2c288f01ddd76a98549643d051da89bfdee SHA512 016db15eb35afcc81a5312690790d43de8d6f936f99de63fc1efe6974adaf0f8a074bfb6e53711af9a561490686786e2e5b860d7f4fc678058eba44347f8c440
 EBUILD icewm-2.7.0.ebuild 2952 BLAKE2B b0d75ba7ec27295593caa2bb47d51c518b35a81e95a53210b424f7632d197bb2cb6116feeee53f56348409589a13c2c288f01ddd76a98549643d051da89bfdee SHA512 016db15eb35afcc81a5312690790d43de8d6f936f99de63fc1efe6974adaf0f8a074bfb6e53711af9a561490686786e2e5b860d7f4fc678058eba44347f8c440
 EBUILD icewm-2.8.0.ebuild 2956 BLAKE2B 733dadf47f5dde98dabfce3b0e74bc5cf8912cb45bca3821651a59270b1ba3abd51b3de7cb992cf0e6b3c654badfb968e8de275bc5955f377d8b9132c77cc40e SHA512 412d620843feb1394f51611d035e86bcb21ba4e1bbd553b0e5a0c76e4dedf7f5490a9f64cb7b23d20f0526dccd508c51301b9a97df7af55894e7f0ffa6c77a04
 MISC metadata.xml 748 BLAKE2B 340b1eea319761630ad5bc22dc734fbfc2492acb263f03ea267e3c37c6c2928ba23cde5ee670c9265dae8bc3f78cdacf584c32d6c65219e859cf6df3b283be4d SHA512 4ba0d01e983f7a6c16ce6da6a7f54fb962154d50db8b820855e2c0dda7609526fc1aae039b469c27eaf6bd09a71b3c951c58b2a84d8aea9ce9fce4a5eff48b46
diff --git a/x11-wm/icewm/icewm-2.5.0.ebuild b/x11-wm/icewm/icewm-2.5.0.ebuild
deleted file mode 100644
index 6215cdd777d4..000000000000
--- a/x11-wm/icewm/icewm-2.5.0.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools unpacker
-
-DESCRIPTION="Ice Window Manager with Themes"
-HOMEPAGE="https://ice-wm.org/ https://github.com/ice-wm/icewm"
-LICENSE="GPL-2"
-SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 sparc x86"
-IUSE="+alsa ao bidi debug +gdk-pixbuf imlib nls truetype uclibc xinerama"
-
-# Tests broken in all versions, patches welcome, bug #323907, #389533
-RESTRICT="test"
-
-REQUIRED_USE="|| ( alsa ao )"
-#?? ( gdk-pixbuf imlib )
-
-#fix for icewm preversion package names
-S="${WORKDIR}/${P/_}"
-
-# These are the core dependencies of icewm.
-# Look into configure.ac and search for PKG_CHECK_MODULES([CORE]
-CORE_DEPEND="
-	media-libs/fontconfig
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-"
-
-RDEPEND="
-	${CORE_DEPEND}
-	dev-libs/glib:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	alsa? (
-		media-libs/alsa-lib
-		media-libs/libsndfile[alsa]
-	)
-	ao? (
-		media-libs/libao
-		media-libs/libsndfile
-	)
-	bidi? ( dev-libs/fribidi )
-	gdk-pixbuf? (
-		x11-libs/gdk-pixbuf-xlib
-		>=x11-libs/gdk-pixbuf-2.42.0:2
-	)
-	!gdk-pixbuf? (
-		imlib? (
-			gnome-base/librsvg:2
-			media-libs/imlib2
-		)
-		!imlib? (
-			media-libs/libpng:0=
-			virtual/jpeg
-		)
-	)
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	$(unpacker_src_uri_depends)
-	x11-base/xorg-proto
-	gdk-pixbuf? ( gnome-base/librsvg:2 )
-"
-
-BDEPEND="
-	app-text/asciidoc
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.19.8 )
-"
-
-pkg_pretend() {
-	if use gdk-pixbuf && use imlib ; then
-		einfo 'Confilcting USE flags have been enabled:'
-		einfo '"gdk-pixbuf" and "imlib" exclude each other!'
-		einfo 'Using "gdk-pixbuf".'
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local icesound
-	if use alsa && use ao ; then
-		icesound="alsa,ao"
-	elif use alsa ; then
-		icesound="alsa"
-	elif use ao ; then
-		icesound="ao"
-	fi
-
-	local myconf=(
-		--enable-logevents
-		--enable-xrandr
-		--with-cfgdir="${EPREFIX}"/etc/icewm
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}/html
-		--with-icesound="${icesound}"
-		--with-libdir="${EPREFIX}"/usr/share/icewm
-		$(use_enable bidi fribidi)
-		$(use_enable debug)
-		$(use_enable debug logevents)
-		$(use_enable gdk-pixbuf)
-		$(use_enable imlib imlib2)
-		$(use_enable nls i18n)
-		$(use_enable nls)
-		$(use_enable xinerama)
-	)
-	if use truetype ; then
-		myconf+=(
-			--enable-shape
-		)
-	else
-		myconf+=(
-			--disable-xfreetype
-			--enable-corefonts
-		)
-	fi
-
-	econf "${myconf[@]}"
-
-	sed \
-		-e "s:/icewm-\$(VERSION)::" \
-		-e "s:ungif:gif:" \
-		-i src/Makefile || die
-}
-
-src_install() {
-	local DOCS=( AUTHORS ChangeLog NEWS README.md TODO VERSION )
-
-	default
-
-	docinto html
-	dodoc doc/icewm.html
-	dodoc man/*.html
-
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/icewm"
-}
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 2f020d2e77c8..23b00ec6d1a9 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -5,9 +5,11 @@ DIST mutter-40.5-r1-patchset.tar.xz 5568 BLAKE2B 3e1cc6a8cb0a792a4abedaaa1f856ea
 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
 MISC metadata.xml 606 BLAKE2B 54a05fee61cf9a1d958a46e0cc94e1cd61e69e187f89393c483c7022d455b7248684df4f1df028f0733995dacfbdf1faab600d8c239885eb0c7ea3097326f156 SHA512 6dea733bb5da3bd2db059a467cec81f7cfc0765750cdcfa0404a72cbb168495f13d01051198206178615b1a3fa41f78dffd9f0a38f6d7579116e782d76fab899
diff --git a/x11-wm/mutter/mutter-41.1.ebuild b/x11-wm/mutter/mutter-41.1.ebuild
new file mode 100644
index 000000000000..61469e32b533
--- /dev/null
+++ b/x11-wm/mutter/mutter-41.1.ebuild
@@ -0,0 +1,168 @@
+# 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 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="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.69.0: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 )
+	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: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
+		x11-misc/xvfb-run
+	)
+	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 systemd)
+		$(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 meson_src_test --setup=CI
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}