gentoo resync : 20.10.2021

24 files changed, 368 insertions, 165 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 0692037b5691..14f2f6c473f4 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/bspwm/Manifest b/x11-wm/bspwm/Manifest
index 4d0a91809c7f..6717abc71384 100644
--- a/x11-wm/bspwm/Manifest
+++ b/x11-wm/bspwm/Manifest
@@ -3,4 +3,4 @@ DIST bspwm-0.9.10.tar.gz 114099 BLAKE2B 0fd14d3605e05146435d408846844b7e5015290f
 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 328 BLAKE2B e0d5c7e609c0ea7cfbef740e84d00a3c7c43e1ad9a08c912a30632bd2ad313daf885a616f7595d591f8303448c50960244fa7f6e563eda661835f806df38e4ba SHA512 f8b1666589ca805fa092f460a129c87e73cb43ffbf50767c18d7b42c027927d46e730a11a7b034f56ac08aaf71145bd87d5fd076bd02db9d1e00fe2d540ae270
+MISC metadata.xml 250 BLAKE2B 753e22fd7acbe07e206d1eb6a8a7d7a1a9752b8e11a6a84086c96ef112026ed6f0f8e64812d737c45edcb638cb63c50a8fa4ea1f22e9aed32f841c3d398a84d0 SHA512 7ee35c9acc3a7a67d28c368f27d4b052af0334423c941d183b170a713f3004289eda105d0ec27df474094fba6ba32226eeaa5bb7befdaea53357b61ef15cee9d
diff --git a/x11-wm/bspwm/metadata.xml b/x11-wm/bspwm/metadata.xml
index ca5ebdfac7a5..297ea5190a64 100644
--- a/x11-wm/bspwm/metadata.xml
+++ b/x11-wm/bspwm/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">baskerville/bspwm</remote-id>
 	</upstream>
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 8fd30ec0ef35..7965aa8441c2 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -2,6 +2,6 @@ AUX i3-4.16-musl-GLOB_TILDE.patch 2783 BLAKE2B 9dea47af64b78a77006d3aa641273aa7a
 DIST i3-4.19.1.tar.xz 1277648 BLAKE2B a4d01d10c076da092faef2111ba0fadb481257c0011419cc911be0b63c0ff78053a39ff4a2887f6344794ea895190ebf1ac3585b598dbb90ff77d4de8fad7c53 SHA512 7a73d005e4ec438a7cf92ab719e17701948c5043cc431740b16e028e9771d1478fa539aebd1a8198fff6bec664f8bcecc17c3bd1ff35d53077d50d3ad1a8f7dc
 DIST i3-4.19.2.tar.xz 1277396 BLAKE2B 28d4dba50ae30cb620dcbd759e0ba29e284071234261aca2a217b6eef9194f72eca67d3632dc1e6a9b9879925e55c18b7a42676eaed41dd1354f772e48309d45 SHA512 58f08228d842cd3c2bc417b72f6279fcd7050879e5fd4064b2cb00edaf98b6605d5b2361608f9534991a0f8357d3294e881c7e314f33dc075241cc45ca5ed94d
 EBUILD i3-4.19.1.ebuild 1962 BLAKE2B afa9253da2dab6628674bc2d2b613a2c6a25dc9009840fda4029957c80d1fd61453a95dddcbf346bf5a457030735295b7dce72c62020efbe633087a027f2f9dc SHA512 67b9bac58c187654464633f205728e0000eba33cbdc965499ee4c689452b7ac4a559252c21fc271361c31bd9e0b486aab03f52b1d6fb8f3e35d25ea46640ab9a
-EBUILD i3-4.19.2.ebuild 1980 BLAKE2B b47551d40cc02e24a0c61ee99cf721cb3e2580806b3b4298648dbe6f03eecf043f619bde78735c4d24df29d94d8f37ac7e7cf7310187844475291514f6f2396b SHA512 d072a4304375e6cdb4ff2ba060f0c16ff9ea11d0d65ffe0c242f10c87933a869e49ded091441e8d0d6ca3cddf1f8f1ede82f61b832389d728d48820bed81a66a
+EBUILD i3-4.19.2.ebuild 1979 BLAKE2B e0ae6c87c9fca9406b2296a93959e37fb45cdde17217f9428cc95f0b94ca6c6eb0458300fac140753cea324bc669cfb9451afe3c6dc19253f13385f78a920d74 SHA512 306cefdbc5a7a073e5f335db2eeec3689ded16ad77d34957ae485537759544d42590dd611b7397e8c99b4e8fada105c1083ebb68b43126603cb8705f39294128
 EBUILD i3-9999.ebuild 1973 BLAKE2B 6560c66a1e6b47f767f7b9b7711646aeab3603d4856dba9973751f12ba99019d4c0f5d45d6ab28a75f01652d300654847b7f6eea8be48efe797e0940adfd4697 SHA512 d240e390c4c7f949de52ac382421afd5cab2f507fbe2bec97756180424c098a2fb62190d595dc49c8a4d71e59a3b433cb8a0177086445315af7c82a5a7e10dc6
-MISC metadata.xml 467 BLAKE2B 698d3f7309aa859af72db95540288e3fb4a848094d0a09b2d1deb5589f814cadc664bc455c0815bd0ac3ded9129495d7a7df8f60de1f9a7b48541c100f645b46 SHA512 6eda0780c6b9962ae7111c8f1390705b987ceff160532353f27366e336cdb00499dec8acf91aefa87fdddf99117b1f4c942d8ba94be6d41c246d342c9f075364
+MISC metadata.xml 537 BLAKE2B 81033b6b7a90a15350b23f77fe6c99d277025ae1f36ef6b5d78bf28f0b5c9fab608c165809433577551f0b478e5a154bc7b95b64b19f7ef9be18f6c7772473f8 SHA512 157b7fc03f7d9c9a455b787061a3e806701e98e3335a0f9edb50fbd5f7712ee3ed6e9573046d8fe72093e162c3253bad3e564b73633f4c67c60a326a103583be
diff --git a/x11-wm/i3/i3-4.19.2.ebuild b/x11-wm/i3/i3-4.19.2.ebuild
index beb15ef579d1..280591df10c5 100644
--- a/x11-wm/i3/i3-4.19.2.ebuild
+++ b/x11-wm/i3/i3-4.19.2.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/metadata.xml b/x11-wm/i3/metadata.xml
index 508b0597e266..7f98b6efd612 100644
--- a/x11-wm/i3/metadata.xml
+++ b/x11-wm/i3/metadata.xml
@@ -12,4 +12,7 @@
 	<use>
 		<flag name="doc">Build and install the HTML documentation and regenerate the man pages</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">i3/i3</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 77d93a695f23..9895d0205bab 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -3,6 +3,6 @@ DIST icewm-2.5.0.tar.lz 1722504 BLAKE2B caf5d61559dd5bb25583bebeaca82e54049e2a97
 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 2953 BLAKE2B 5b366e518e1c58ddae0dc11dd8b2ff39fba2e636e61d2367564debac48648c4b8169e15e1e0b382f3d2ed2b3c7d310401a98a70d1d39c0fa4721ab4870f51471 SHA512 da1c72a707d80181bb567ecc33b61d426c50774d6b08fb998336d9f1917760bd53e442e61f141db63acc77327df41d6c8c719bbefe9bc00f327dcee83e1dcf4b
+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.7.0.ebuild b/x11-wm/icewm/icewm-2.7.0.ebuild
index 08620af4ea13..6215cdd777d4 100644
--- a/x11-wm/icewm/icewm-2.7.0.ebuild
+++ b/x11-wm/icewm/icewm-2.7.0.ebuild
@@ -11,7 +11,7 @@ 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"
+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
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index 1adfaa6bba66..82a0db2ba553 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,5 +1,3 @@
-DIST metacity-3.36.1.tar.xz 2063452 BLAKE2B 2dd7b1c63e0b5f87ce4518d7d42d472223717012a46dd826dfda3c88f7e647809e6bf2449a28bd38573342fd5fec94e2233db958658ea4320b22c5451390e451 SHA512 98e73036cca238b713a112194b2cd7a866bcf7d08ef29fb590054b69a1bd807699317a51f9b851f9c474ae2557e27dc9fc4a52d7c436d93ad4a02babef68feeb
 DIST metacity-3.40.0.tar.xz 1970260 BLAKE2B 4ccd38b0ceaeef7145d28b1f4e579aebe75e1506af8097e97e5422f39e04ae9d1e259f17cc08dc68fe71d4eb082311c736dbcfafb4a3a775f6ddcce5ce77b859 SHA512 f9eeb0b08bb302c5fb0d174a4df97b253255741d507e94200820d3ebe9e89f179c9096b8e56798836fc84cbe1ac76b27fee6762f3d41373280c4726bc7cba2ff
-EBUILD metacity-3.36.1.ebuild 1230 BLAKE2B 5ed0a66a03c26b6dec890a10cefe295d703df73b2af5fa996d192d3f91d30f454a359886a71b329cc95f980541231ede4eb724d63dd3f828bc07f4316c9cf852 SHA512 55217e43229292e884d88d4abc6f88b7626ef41904127e0b39f77da84d44d73970f53bac28d803eff48ede7b5fa07cd8c2a06476b9aab021037e5932b4fedcf8
 EBUILD metacity-3.40.0.ebuild 1282 BLAKE2B 026027e84110b1aa9cb6364a8975299b2bed61b6d99e50d37641289e431375421ed0b748f5725cc572b0b2724113cf76d4952cb87e9b674d7b06e6a7f23ec225 SHA512 6121dd8fee4d2c2a5466e22bc08751d431cd65e91d953ce3be4b0d90471ca8ab0e251da57889ede4e8b2e7bb2ad82875d9aefefee6d97596e6e35b7c4ee558ba
 MISC metadata.xml 478 BLAKE2B 6b6edfb923803da21c7d6c7bb9732bc387e4f57d0682ad79a4bad3a973c8f4746ecfe3ccd376f4ae41784e019f29861b973c66cc35ba3535126de2fc6c827b98 SHA512 759912aaecef429c799aa70ec28428be7572f7eb5ddadcc3f6c0aec469d6fd9ddc3cb0d3f54585b60a2a5764bbc6b4bde5da596d9800f5989f638d60795b1533
diff --git a/x11-wm/metacity/metacity-3.36.1.ebuild b/x11-wm/metacity/metacity-3.36.1.ebuild
deleted file mode 100644
index bc33e8f6558b..000000000000
--- a/x11-wm/metacity/metacity-3.36.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="GNOME Flashback window manager"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/metacity/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+libcanberra vulkan xinerama"
-KEYWORDS="~amd64"
-
-# TODO: libgtop could be optional, but no knob
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2
-	>=x11-libs/gtk+-3.22.0:3[X]
-	>=x11-libs/pango-1.2.0
-	>=x11-libs/libXcomposite-0.3
-	>=gnome-base/gsettings-desktop-schemas-3.3.0
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXdamage
-	libcanberra? ( media-libs/libcanberra[gtk3] )
-	>=x11-libs/startup-notification-0.7
-	x11-libs/libXcursor
-	gnome-base/libgtop:2=
-	x11-libs/libX11
-	xinerama? ( x11-libs/libXinerama )
-	x11-libs/libXrandr
-	x11-libs/libXext
-	x11-libs/libICE
-	x11-libs/libSM
-	gnome-extra/zenity
-	vulkan? ( media-libs/vulkan-loader )
-"
-DEPEND="${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.4
-	x11-base/xorg-proto
-	virtual/pkgconfig
-" # autoconf-archive for eautoreconf
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable libcanberra canberra) \
-		$(use_enable xinerama) \
-		$(use_enable vulkan)
-}
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 8a95e861b777..3623b9986381 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,6 +1,6 @@
 AUX muffin-4.8.1-slibtool.patch 6242 BLAKE2B 487b87b47378cb827eaa85b0dbaa533bf6e79eaf712939aa694a8d42b54bb100b9e99b5b4d5fdce828a6e735af0a79fd99946a5c7a29ac5ab4ef1cea685efdee SHA512 8734ffc295042fc988a6668f12bc7f13a3de6783eff23418dd6dfd07f5f8a38697fa82e23b7e0703cbb4e20c78fa3e5b63e2943b272f5b50a487d6aba7252cdb
 DIST muffin-4.8.1.tar.gz 5195618 BLAKE2B 33dbbf7231b8f8d5c7df23d6cf8ddb29a86caca7b8c3b4af1231c98e114ee797d1c6bc866574348fcabaa65a93ff95c80366329bd5a41a46a74ba53ba81ce545 SHA512 61b621c7a4e25fc8ac69f2f5182e2caf52dfcfd456154f3b91ebb8b126319e704acd927ab5abe9e19ff057f38002a3b7e322e8d411db21e0fee7ec19d7928d31
-DIST muffin-5.0.1.tar.gz 5197104 BLAKE2B b9c9039c2fcd042859c28829f0df1f2d6991a0d90f4a1647d34cc56069ee80f5e0b4a13b1a49797f84815a97adbd96379060cc879c4aa4966f7f0a23cf7e938e SHA512 8e91e37372a2ac67e216c5e1c457e3a1f2a57a274976716aa28bb9c8621af4241f49ab5e46da609588abb23bbbf48b2b67af5926e43d052f31ddc6c6068ef81f
+DIST muffin-5.0.2.tar.gz 5197188 BLAKE2B 88a7530359386ceb14b0b509e1769d8cc4d552d9afa45faf6dbd62a457c7ca19d59e553176cf3689c3d22962c761a8633f6880802ea3c5453ff07901e3ca5374 SHA512 4f31b5a4b81db5967a3bc21b7f2bdbb30f47f5dcde12be467cd27f340164483ab43b423cd043dce50201c9b900ccab4a0fc84f4f6e22c66e901cd0c6d986761d
 EBUILD muffin-4.8.1.ebuild 2391 BLAKE2B c7bba34a7a838e54661e93df09dd5939632d911d3e95a11f8cee8b432e1d0dce7f370986cac7c89f0cf8e52005f1c839e556cb684ec848160382267bbec5811f SHA512 f6a8d5f7d4d1bed6d019f2f50ef026b989ecf9cc37feab790f7de04c8c173390df70f82c4f1202e6edf98fb20e161c4df40a753caae6faaa9d2629207c124f7a
-EBUILD muffin-5.0.1-r1.ebuild 2341 BLAKE2B a970ae932f31099e2c072a648ac69ee64839044ad8ff5579a29dec4d1240fe6182425df3f435354b7bc40af4b016f851f9f6a93d5616b336189a0c8040477144 SHA512 68402d22b36fd23c1140c4e48026a871bb59d26e6db27972b990ff3b4e8d4a4c9673aa4054990405a34ff31fb4baaea5665a9f6e3d74aebb0a91f1d4a7ffd075
+EBUILD muffin-5.0.2.ebuild 2341 BLAKE2B a970ae932f31099e2c072a648ac69ee64839044ad8ff5579a29dec4d1240fe6182425df3f435354b7bc40af4b016f851f9f6a93d5616b336189a0c8040477144 SHA512 68402d22b36fd23c1140c4e48026a871bb59d26e6db27972b990ff3b4e8d4a4c9673aa4054990405a34ff31fb4baaea5665a9f6e3d74aebb0a91f1d4a7ffd075
 MISC metadata.xml 486 BLAKE2B 26fc8398897e069e47a85126a78fe71fe0f6b0fad0a32078f2799fd4d15db18ebe4ff010f2a2b4889e2c27fe1bdc6244abb2c11ac02f1f1c050a5f2ba37c810d SHA512 ffb4b8c46f6fe2324d68c3041308342e550b3424c1909455cfad12d1a268eda4279ea28bd1836893f453fe9a45df568e81a6fb15d72b68fefdaad27fb8106315
diff --git a/x11-wm/muffin/muffin-5.0.1-r1.ebuild b/x11-wm/muffin/muffin-5.0.2.ebuild
index bad4d915000b..bad4d915000b 100644
--- a/x11-wm/muffin/muffin-5.0.1-r1.ebuild
+++ b/x11-wm/muffin/muffin-5.0.2.ebuild
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 095840f74e3f..44d0d322d6f9 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,8 +1,13 @@
 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
 EBUILD mutter-40.3-r1.ebuild 4845 BLAKE2B a21695fee7ce8398b5ab40ae41bbf69a8bfb83fe747e0310306763d3768c0a7815d76022b00b234f2567d34ca4729e079011b4c4e09cf4025a16b69083127ce9 SHA512 936522dfc39a0f7565bb8bb0b3e24793df32275db5352620bd72eb0f50ec6623bbd257cc6e6381bf72b226b36e744abd1fc15339efdb559becb734cc3003767a
 EBUILD mutter-40.4.ebuild 4970 BLAKE2B c8295fb63e9b21ccde5abdcaef8ac0c6bc914240510fc16098d61ef4ef95a27f7019e8d04d199d951d88b9d1ac4388490009652b01540b65607058d4de4bb9c1 SHA512 9ac9571c79616782c1e1d2459531298c8aef03086217e442ac5b7e9404fd46fb9fceda3749a0a96d6cd91fa3ea9b26f2b3e8cfd328f78985e2c810504a9a3ad4
+EBUILD mutter-40.5-r1.ebuild 5067 BLAKE2B 23ae09d56f2e66265ca906f648ea7e3ff2b421029607ecc71fa60415455ade569a62b414c662157620822b0df261ce164b8a8edda0bf6b96ab06984db9004dae SHA512 b5c3386b4daadc4fa8a4b4efa57815520aef9c8fefb0739aaf31fb68ea3e0f9013a2ed473cf996bd2b22fcd1466968d825efcd13490c9dce94d97d87e64e7eda
 EBUILD mutter-40.5.ebuild 4971 BLAKE2B e8cc75ad7e71f42f0f50be44c3981a9b9c97671f075e8fec8a5ed2801d51defe5cb939354cb5556a291c46a0727f3ef43de7cccd93ad28f146760d8a67ef742b SHA512 87b5871161f120e2809256289b54043ae0438c4fa9bdc99d9fc3a6ee8a35b339ea702628de934388301eb2e031f279cb8aa4f9a59aa43729afd84e46f5e04d17
+EBUILD mutter-41.0-r1.ebuild 5129 BLAKE2B 64bd59426566eddf7896c000a4e93ea1dcc5f62c8603b02529c38408554aabfb3c3eb0af72b5297241d293ffcac43dbd7c9ef4efa7506b7b25b55856e1f91c39 SHA512 77f297bc9aaf009dd636b406f7c22e7ac63d0b5f34c29c700894e886d9bb69814a19fb12ebaa99d8582f0b99a2ae402f26edf818d8b37450047d0bdd0f988ad4
 MISC metadata.xml 606 BLAKE2B 54a05fee61cf9a1d958a46e0cc94e1cd61e69e187f89393c483c7022d455b7248684df4f1df028f0733995dacfbdf1faab600d8c239885eb0c7ea3097326f156 SHA512 6dea733bb5da3bd2db059a467cec81f7cfc0765750cdcfa0404a72cbb168495f13d01051198206178615b1a3fa41f78dffd9f0a38f6d7579116e782d76fab899
diff --git a/x11-wm/mutter/mutter-40.5-r1.ebuild b/x11-wm/mutter/mutter-40.5-r1.ebuild
new file mode 100644
index 000000000000..4c687e7de45d
--- /dev/null
+++ b/x11-wm/mutter/mutter-40.5-r1.ebuild
@@ -0,0 +1,169 @@
+# 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/"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"
+
+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
+			<x11-base/xorg-server-1.20.11-r3[xorg,-minimal]
+		)
+	)
+"
+
+PATCHES=(
+	"${WORKDIR}"/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-41.0-r1.ebuild b/x11-wm/mutter/mutter-41.0-r1.ebuild
new file mode 100644
index 000000000000..1ed4f561b96b
--- /dev/null
+++ b/x11-wm/mutter/mutter-41.0-r1.ebuild
@@ -0,0 +1,173 @@
+# 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/"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-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
+
+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
+			<x11-base/xorg-server-1.20.11-r3[xorg,-minimal]
+		)
+	)
+"
+
+PATCHES=(
+	"${WORKDIR}"/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
+}
diff --git a/x11-wm/page/Manifest b/x11-wm/page/Manifest
index 8b38ff39b562..8be714f7b6ca 100644
--- a/x11-wm/page/Manifest
+++ b/x11-wm/page/Manifest
@@ -1,5 +1,5 @@
 DIST page-1.9.8.tar.gz 162352 BLAKE2B acde0feb62d58f66708ec09545137978540fb8c5fab651961b6e87d7c9d7be3170b8e2171c80ec553a9059ae2c23869759f37953da783be3a8fb3ea471e8b15b SHA512 758b1efbecb6d0a3d6ea0f7261b1c55db0927aa46d871f1a30b77e5aa7b9819ae74ca6fb821692656f2150da758793ba5653bdd94ab92ba2b79b39e0d4a4882e
 DIST page-1.9.9-r1.tar.gz 1009216 BLAKE2B 8248705f9e5eceaeea37889a9859249d9eb236f215da804f5edad3c36007179f63f132c161c1e4a6a97df6240f87799242140c97877775ae00f2e86dd7eed69d SHA512 9e7594590b1fdeadcf59d715d30727bee9f640903a34cadd8c0d92b3e94059c183d931a7d8e96763adb74f59a94acb03f7bfbbd4f1f8b57371fe886e6a227012
 EBUILD page-1.9.8.ebuild 1348 BLAKE2B fd2f8a03df95bd652bb253568e7c0ca8348eeb834d06f223c0d6d601f67e6ada45c36ef20d33ae5b90b88494f469853d0cc9af7dd110143b29d8a207adf133c7 SHA512 cd7719566b074cf9f074ed4e94298a1ffdfc1f852a9494fd63c55077bfef9c2f41116e2209ed3b78620172a9238266c8f869ffdbf46a1755aabb8a68fa16a602
-EBUILD page-1.9.9-r3.ebuild 1338 BLAKE2B 57513e1153465c8eebd9d5465c575637ae9e7e10273bce49f9d9d0f9a1e50fc66693802e6e370305f09f72a1af6b4d443f16a51ea55264c238a2bbeb401722a1 SHA512 5bf39133d17b991f19c5bf8366da9585abb4b4d66aab2db2959482258e1c11eee635980ddec7cb111e74de007a1c1d828a91781247eda30fd81ca4057f85adfe
+EBUILD page-1.9.9-r3.ebuild 1341 BLAKE2B d6a18ab1c4ae879f3aac459160aa33fa09e79ecc05812b6593d9dec787f48ae47fd061ce2951b81b1daeefe642e20c0eee45d83865f04d6a138c2925fcfa6419 SHA512 e55c83ff9baec2bbe3b24aaeb553bd4f98eda6c24e92854b46af86f3dd2d585328cc7b00332492a7a392e9316436f2831090585aa2e340f8c1f2d491ae1d81d7
 MISC metadata.xml 529 BLAKE2B 4c6d01f77562ee31d8bd0f72c5217036cdad2b10f1c24fe2a1d3840a68502d130979d21a8a9a4791378f4ccaffd7eb685feb0c3fb81edfd18d08be6bd8aa345d SHA512 d2989494a7f5a4a8d3c48343763098dcb9a5f7fb6754455b008e0cb982b4284d84809d7c299c2c7bcdc1ee76429286efdd03a9ecdfb0163fccaaaaa4ee2b45fc
diff --git a/x11-wm/page/page-1.9.9-r3.ebuild b/x11-wm/page/page-1.9.9-r3.ebuild
index 8fc15947bd37..a5c53381b117 100644
--- a/x11-wm/page/page-1.9.9-r3.ebuild
+++ b/x11-wm/page/page-1.9.9-r3.ebuild
@@ -42,7 +42,7 @@ src_install() {
 	ebegin "Changing references from 'page' to 'pagewm'"
 	mv "${D}"usr/bin/page "${D}"usr/bin/pagewm || die "Could not rename binary!"
 	sed -i -e "s:/usr/bin/page:/usr/bin/pagewm:" "${D}"usr/share/applications/page.desktop || die "Could not change .desktop file!"
-	eend
+	eend $?
 }
 
 pkg_postinst() {
diff --git a/x11-wm/pekwm/Manifest b/x11-wm/pekwm/Manifest
index f7e06bc8ebed..f6c248e33bfc 100644
--- a/x11-wm/pekwm/Manifest
+++ b/x11-wm/pekwm/Manifest
@@ -1,6 +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-themes.tar.bz2 138599 BLAKE2B b0c103d7ade6f9bb1ed19b7e12cfcf00fb48be7e1ed141a4b52aee404ebf9c7af5d29af166ff7265a720ca8d122ad7eddb6eaf42a0a8e18b6c1ff3af7b5e12d0 SHA512 c95bc980b5aeeb4f4832cb2dbbf82adf72e4a784fcd46432fd6e6a6577ef02823ec1c4b861d07747c066050fc5040aca975e2cdc78342abab99a3d486888a25d
-EBUILD pekwm-0.1.17-r3.ebuild 1814 BLAKE2B fe8d6041949245c2b74112b483c37e5f82839300f2d9fbeaea8ac2de3f76942ecec14133f1c82df01ae57caf620c0f4fd9c52e00560ed5da0fac0ea68c645b4e SHA512 93d5f39de1217adc9f296ce446aa590eb45aaaf029f888f48f40afde228f41b45a9cc0370d95d11c2cceefc88bdee51f301b9117df92e34e2b58266300a7ddc3
-EBUILD pekwm-0.1.18.ebuild 1825 BLAKE2B ae8f3cb1738eeb96c8686e9c517c2be87827ac4e990c0961d422d762f322174ccc926ad61c55ae8b85367ee2d9a1be0b9427876be61f1ae9a66f66eff54a7a64 SHA512 4712feb2621f58226c4a41c8e3d30100a7e4059675658c6e2604223dce1a2debdd9b65bb9316ce7658b3aa2aec1d4d2cf458397b585c5dddfeb06ad8ba6e6275
+EBUILD pekwm-0.1.17-r3.ebuild 1828 BLAKE2B 5d2b59a19fcbf54efc82a6af1762bed96a302834e289f2e1fb71cf78285d508b1845050a5c7b65f5282e00486be56943c1dbefe8d7a3fad9337fa42ded49c5bb SHA512 7230bdcceb9e5d2fff59e796657168a36242204d956acc72cc49052a6ecb13d54dd3c4e9a602582efaf8ed21aa597e7a4c4509eaa267efd5a99a39e8115b4aa6
+EBUILD pekwm-0.1.18.ebuild 1839 BLAKE2B 5a44e02032b69d69a13c6af33ebaa59f4c75d886cc742e7680f26757f53624b4fc8290b05c08eadea70c3384a572ed4485a467a16d3adbde1b59483ddb5d7c61 SHA512 ef24ddf5aa9c3f6c2750ce000eeed1a4f3a2af2cadf82f345d1f193bf69a9f20a760df1a86685669f77ab26bfeaecfb7dbe2165f59a167b2fa0004ce5c8fd90d
 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
index 736b6d30d9cc..9954b8ef44ae 100644
--- a/x11-wm/pekwm/pekwm-0.1.17-r3.ebuild
+++ b/x11-wm/pekwm/pekwm-0.1.17-r3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/pekdon/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz
-	themes? ( https://dev.gentoo.org/~jer/${PN}-themes.tar.bz2 )
+	themes? ( https://dev.gentoo.org/~jsmolic/distfiles/${PN}-themes.tar.bz2 )
 "
 
 LICENSE="GPL-2"
diff --git a/x11-wm/pekwm/pekwm-0.1.18.ebuild b/x11-wm/pekwm/pekwm-0.1.18.ebuild
index b17eeaccaf65..7d866b5fa28c 100644
--- a/x11-wm/pekwm/pekwm-0.1.18.ebuild
+++ b/x11-wm/pekwm/pekwm-0.1.18.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/pekdon/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz
-	themes? ( https://dev.gentoo.org/~jer/${PN}-themes.tar.bz2 )
+	themes? ( https://dev.gentoo.org/~jsmolic/distfiles/${PN}-themes.tar.bz2 )
 "
 S="${WORKDIR}"/${PN}-release-${PV}
 
diff --git a/x11-wm/subtle/Manifest b/x11-wm/subtle/Manifest
index 59247b795b4f..7eb6977286f1 100644
--- a/x11-wm/subtle/Manifest
+++ b/x11-wm/subtle/Manifest
@@ -1,4 +1,3 @@
 DIST subtle-0.11.3244.tar.gz 190549 BLAKE2B bb4b78165741ef30c1e9e145d4f26c8903d597dfa210688246210bb6f04ffb8b62b9295ffdfd0829f1c36019287ff82677253daf87878562b7ba55a517fb00ce SHA512 3d6edd5cb1b5dcd058caeddf3ead024c7cce39684baca8bac9709683ce3130a5c8433cbe046d28dc7420637dd855a2b6775638097f78a5e701bb85e505e8167c
 EBUILD subtle-0.11.3244-r1.ebuild 1924 BLAKE2B ddaf40394ae07529b812de11215296a60fe776edc6cc667247be915a419bf9c651f6d09d19fa802feeb8070e024b5262dcc7cdc29e7c7ead94cea37d8e89bfe8 SHA512 dce8fa1370489615ec717f64cd735ebc015fd4eb9c4d665176e4c4a374fae4de4ce4ebaaf125f01730e7c5c5ca9d2be8488b3adae708832dc099f8f52e4fc57e
-EBUILD subtle-0.11.3244.ebuild 2070 BLAKE2B 1c2d16eeb72c171c164e4ec5862b18e52380b72aa26a3252d0192cdb4c3098d2e906fce700d2b2892ed96e3530078b39fc37415d967f81bb6e9a565273047df2 SHA512 c98a5bf12b1d3322344cdcf80ff612e5f4bc0f25ca637f6872538674e26c8aeed9a87ea4a2200f3636ea3f654256c64ec1c520f6a8e175a7f28ac7b301ea2fb2
 MISC metadata.xml 1072 BLAKE2B 1697a2fbbafb79feb3d03b01ca32c6491321c68bda436a4aea7917ab5bb6cc19cd1bd658fcc44541303763ca97c0ce65f477dbe892f79197341a3ad82e908e68 SHA512 efc00cf35734c9c77ba9cc52f3fd7af62ccc1f3a6d728a406b4c74d9727eb85ff727e62f0f9bd66c92cfe7919360400dba7247edba05eacc0d1d863e7991e02d
diff --git a/x11-wm/subtle/subtle-0.11.3244.ebuild b/x11-wm/subtle/subtle-0.11.3244.ebuild
deleted file mode 100644
index ef71c3fce45f..000000000000
--- a/x11-wm/subtle/subtle-0.11.3244.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit ruby-ng toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EHG_REPO_URI="https://hg.subforge.org/subtle"
-	EHG_CHECKOUT_DIR=${S}/all
-	inherit mercurial
-else
-	SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A manual tiling window manager"
-HOMEPAGE="https://subforge.org/projects/subtle/wiki"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug doc +xft xinerama xpm +xrandr +xtest"
-RESTRICT="!test? ( test )"
-
-RDEPEND="x11-libs/libX11
-	xft? ( x11-libs/libXft )
-	xinerama? ( x11-libs/libXinerama )
-	xpm? ( x11-libs/libXpm )
-	xtest? ( x11-libs/libXtst )
-	xrandr? ( x11-libs/libXrandr )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-ruby_add_rdepend "dev-ruby/archive-tar-minitar"
-ruby_add_bdepend "dev-ruby/rake doc? ( dev-ruby/rdoc )"
-
-all_ruby_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		mercurial_src_unpack
-	else
-		default
-	fi
-}
-
-each_ruby_configure() {
-	local myconf
-	use debug && myconf+=" debug=yes" || myconf+=" debug=no"
-	use xft && myconf+=" xft=yes" || myconf+=" xft=no"
-	use xinerama && myconf+=" xinerama=yes" || myconf+=" xinerama=no"
-	use xpm && myconf+=" xpm=yes" || myconf+=" xpm=no"
-	use xtest && myconf+=" xtest=yes" || myconf+=" xtest=no"
-	use xrandr && myconf+=" xrandr=yes" || myconf+=" xrandr=no"
-
-	${RUBY} -S rake -v CC="$(tc-getCC)" destdir="${D}" ${myconf} config || die
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake -v build || die
-}
-
-all_ruby_compile() {
-	use doc && { rake rdoc || die ; }
-}
-
-each_ruby_install() {
-	${RUBY} -S rake -v install || die
-}
-
-all_ruby_install() {
-	dodir /etc/X11/Sessions
-	cat <<-EOF > "${D}/etc/X11/Sessions/${PN}"
-		#!/bin/sh
-		exec /usr/bin/subtle
-	EOF
-	fperms a+x /etc/X11/Sessions/${PN}
-
-	insinto /usr/share/xsessions
-	doins data/${PN}.desktop
-
-	dodoc AUTHORS NEWS
-
-	use doc && dodoc -r html
-}
-
-pkg_postinst() {
-	elog "Note that surserver will currently not work since dev-ruby/datamapper"
-	elog "is not in the tree."
-}
diff --git a/x11-wm/wmfs/Manifest b/x11-wm/wmfs/Manifest
index cf093f8ee02a..ab31d2ead6b7 100644
--- a/x11-wm/wmfs/Manifest
+++ b/x11-wm/wmfs/Manifest
@@ -3,6 +3,6 @@ AUX wmfs-99999999-desktop.patch 153 BLAKE2B e9a3f1039bddd76ddc05955e843e89c1ab81
 AUX wmfs-99999999-fno-common.patch 1986 BLAKE2B 096becca88a23b15e3fee115640b50baca0f1f3ba58c15903a74fd4da75bc2e1662d672982940ac55c506f79f3820ffa9e851981008f82d9163eaf291e4339cf SHA512 b7593e0c0c0e3e73421a1636cdc2b3cebd6c51896e404bad9bec378e733b54cb0168a53dea40466128210f47459a2bb5e04074d588d33b07908efd1581472eaf
 AUX wmfs-99999999-strncat.patch 598 BLAKE2B e80fd233e895162e24f7264cf152c9a570665d5f6ff48ea1ec9212963c2b786b5707c8052d33a1a354b283042af0c2b7d5ac45f34e8dc57a68abd517d7e410aa SHA512 9141bd044a122fbe0aa10189f38d02e127c453665ae7d926dee852bb16ec7812450357e86ab6dfc8f48a41ce16891759a8229bb4a67f1bb5a970c7e6452298fd
 DIST wmfs-20180520.tar.xz 56364 BLAKE2B 23530193ba2c37ae4129fd23dda2ff8cd301b0bd92d32e06b264efd990b7957b38170de31f04afca6fd9875d2e0450c8bede416e5f49d6e19962718fe2e240a3 SHA512 bcff251397d8483db49c037c51eef7b3dcc87a6d94650ae9e9cabc7104177216e0efa7e67bfb34978bae67dc4853884673ce288bb8087e95cb2993d519ab4f2f
-EBUILD wmfs-20180520.ebuild 1132 BLAKE2B cb7e3aebeb66a9c09f0984f6ef7d3b1971e1365c12af12a2ba33484aa05b67bbe62f24a586b04c3d0000a69941378868c2104813ea5a43618617c1a48f4a88ba SHA512 49d7081c5c0f5cf9177b898b3eb81e9275fa06aa9a45afeb235b5c3742e92f28edbc80fca9310fc1c4172fa5ab8eac3d90b2822afb5f331e88d82b8aee380dc0
+EBUILD wmfs-20180520.ebuild 1146 BLAKE2B 63687796ea6c489004b9c2e6849ddaf915ef6fe5b6a965e83843d962474e6508a74684422fa968b93b7b09662167110c27da5d46212af117ecdd48d8f223f1ea SHA512 e0e8d520722df622cd697bc3ab750a4f7325ef489e2232b98bf984ed012c30fa25c710edc2e66488ed2b750dcf43793769e6001ebf28c7283682b4a8b5f81568
 EBUILD wmfs-99999999.ebuild 1130 BLAKE2B d0e2ae315de0ce2a810b0ff2b7bfb5dcd0ea6f2e98201ade65e7f4154c61a421a1c642c541078379ef3ff6d31ce2aa78f50423454251bba4649286b3cef38d46 SHA512 b52a4cbb7ef9268c7e3da454d08ea38df0d1f585ea94ca71f4dc7da157f19b85f50749b9ef7f71226c2ec0304c23c3de1ca8b07bbfb4961a7a85a7c517bff2ad
 MISC metadata.xml 337 BLAKE2B 37cbcce41705581321945fb5883880d4b03fa675814722af9e5e3175ccd757fa35670ba3feb7832009833db42ab5b59f066ce8cacbed090039bace82f5f53e71 SHA512 93086638f6017c646bcf1a99ada107baa3c43d997677c818445894fbe55c10c97cdd882f51c872ac6acfde0f34ce982d5ee54efdc4221ef3ae166d3f8501b6e4
diff --git a/x11-wm/wmfs/wmfs-20180520.ebuild b/x11-wm/wmfs/wmfs-20180520.ebuild
index f01f6ce2129b..b0225851e54d 100644
--- a/x11-wm/wmfs/wmfs-20180520.ebuild
+++ b/x11-wm/wmfs/wmfs-20180520.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Window Manager From Scratch, A tiling window manager highly configurable"
 HOMEPAGE="https://github.com/xorg62/wmfs"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.xz"
+SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"