gentoo resync : 25.09.2021

16 files changed, 183 insertions, 14 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index f079eed1f86d..b07d7cb9c0a2 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index e74063766aa1..3ffe08191218 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -8,6 +8,6 @@ AUX awesome-gnome.session 220 BLAKE2B ea84c3a24feb5c9921940dedd6f3fa05a6987b6aab
 AUX awesome-session 1999 BLAKE2B c7c784fba884ff0e579eb60cb049e695022be162a535065a172c461ec60d369415faa26be7cd60645e671ae8b2861b192ff962b803473746b567ef874bc706e9 SHA512 b6e7cc0813569b448b030cb8516d0272ebcf60b96f680b7de43dc4374e6e2d85b9bd841c6f1ab62caca52120c303332653e3de38eca0fe6a813b9bc5b68ac8b7
 AUX awesome-xsession.patch 291 BLAKE2B fb8ca929487ef45cd64c44bbb3db2b7c4a1be4f5abf5f8fa7467694226bdcd1441bd5c601f0f27e7d2c8656bb4c75cb364cd6d8d641a648611ed2658b27cd389 SHA512 1d19f3ac5e9f8fd1084fd5e092d52ffbabb06fc3dc94f6f8e62834a3a03bd5bcb04adc698ac3a022c5446a07a847be35e3f3003e8bc9e7d35c6c82350517233d
 DIST awesome-4.3.tar.xz 1037816 BLAKE2B b4afc5e7bfb01ddc16b67776cc00dd7b0bcbefc9d17f9bec9c04256953858aef2bf0e4b15a525909029b7da771ade0d749758aba2878832f356d7b2c4f0363b7 SHA512 c5ef1e8dc593e7783b895d22143154aea8f211beeda24672a7ee4ed5112b4f4284043f848a151f3d3c4f569e91308670367a4353f705b20511b36495b22fa3f5
-EBUILD awesome-4.3-r101.ebuild 4013 BLAKE2B 8de97a602b1d365a241115ee410fa0967176b629f8906b68519951ad194e5b958b3e401d6b5bead8b55bfc76e1de2d361eb00842f750aea35ddc9d491e859e25 SHA512 9cfc73d8d2c514548d06c9d25343ddb4750b208c00eb57cc8a30b41b0041cec7fd36c44f4db1bf8944f116a1f247c6e33655bb0ce82e06ef9fc42c628c19080d
-EBUILD awesome-9999.ebuild 4102 BLAKE2B 760a4a15685ae98b46c8e60d8655eb5bc1ade549f7a750378848c0eb8148c500e7b47ecf2757ff4a222378c525dbdcd0011825f88bc42edf8021c74221ad199f SHA512 569057234828cb29dadb99cbc68793972795ff7785f6a472f13e709ee7c5afe6294f6c8b865992b0282cbc6d407c7852f5568d7d3b4fa648d57006c0a59d409f
+EBUILD awesome-4.3-r101.ebuild 4020 BLAKE2B 8809ac372d62170d5241818f0348677611f9200171d8780ce70a2e93ba15b353f138241e2689700c84e3a6bccb2db488145c6babcd4cfc56677bedc421a5754d SHA512 6697c72c05b025eac8b414c4265cde57f4d4e02e01eef879e1a0e783940d8efc40d419bd129117c97e0456b5e4a5490fee8b236dbffeb3264221e472447b636e
+EBUILD awesome-9999.ebuild 4109 BLAKE2B 68938fb2b33a40a0f83b04b755c433ce1334d334f863db84b25e1ada668ac6dbf8636e3f1c9560bdd9e9fb26200f58246bb09c43d89a465b2d24602ed0bbc1b3 SHA512 a70b0a327a5a12495bcd7f75b5f7e186ba6a3583b5045c270d5951059dc65e93a72c92681637e457fcb649f4803df829236c679feb35771cbe2d0e4ae11445c9
 MISC metadata.xml 328 BLAKE2B 6b2d1d1ba0a2a1f8d0a752e1e0bc7ca88fc6dc15e07ce4bd6c39b35c706d9bd8aba5a667e3a8ead36a3c49306d3e8e1bd0b59b5231b74b0040e9230c5f45a781 SHA512 e409529a09805a83eb88444dcc0011e26a006b99e4d5524ebb240338921e0cf0977743f9be44dd5c8c80314e2a78729a149b90e036cf66e89f6b106a417a6db7
diff --git a/x11-wm/awesome/awesome-4.3-r101.ebuild b/x11-wm/awesome/awesome-4.3-r101.ebuild
index d89688d5699b..15daaa39adca 100644
--- a/x11-wm/awesome/awesome-4.3-r101.ebuild
+++ b/x11-wm/awesome/awesome-4.3-r101.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/awesomeWM/${PN}.git"
 else
 	SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz"
-	KEYWORDS="amd64 arm ppc ppc64 x86"
+	KEYWORDS="amd64 arm ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="A dynamic floating and tiling window manager"
diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild
index e8a8a5130ca6..a85f6654445b 100644
--- a/x11-wm/awesome/awesome-9999.ebuild
+++ b/x11-wm/awesome/awesome-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/awesomeWM/${PN}.git"
 else
 	SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="A dynamic floating and tiling window manager"
diff --git a/x11-wm/dwm/Manifest b/x11-wm/dwm/Manifest
index c7dae31b6598..75447e5cfd37 100644
--- a/x11-wm/dwm/Manifest
+++ b/x11-wm/dwm/Manifest
@@ -1,6 +1,6 @@
 AUX dwm-session2 170 BLAKE2B 10158b31ae25da00d7034ce88c321f0703f3374bcf0140ce4ad3ff00483ca634075b2b5b4fc3a97b105e66128c1c882154cd815bb420d473ad1e6af0ff1dce75 SHA512 e882c447824ec430862f9af968aad0f2276b7ab28cf60b8f8e49551e3b9cc2a249429987f4a7d6577eb18182b7709fb4d7c5c4651192a04dc2394ba9afa89f08
 AUX dwm.desktop 118 BLAKE2B e88e7e7376dc18c82c39cf2e07867febc49e0f4749a5e50fd3bca7a3e03af26222fd569aa3c38fa486e4998b64808fee5a3f17d4891eea0b410c54f726850004 SHA512 6a4ba9a9c80c9a39c181427eb48f28edc7c139c73e8452b4012774d1ea787054cad4996da9c839fa437e6dba3ddba521fea72050e3929d59fcf00988bee28db8
 DIST dwm-6.2.tar.gz 25273 BLAKE2B 2bb9e5b900a1d73f3eb94cb8454580ec98930dbacbabec1f2bbd394eb96696873434b6ddea4ac95eb9d171de2c09c5d4ca0b30649836f7e25f4769f44d25a6eb SHA512 01abcab954e5b7c20d011e6fd9c28025271fea2e85610c928812f7c6a09f99d7f9e93d11ffc2d6a7aca894b3fa7e507c6c2fe5f26ff5ddcfc650a9bbaaa41e06
-EBUILD dwm-6.2.ebuild 1081 BLAKE2B fcb099706d18beaf5bf66453ad4f8122e4f846624f0e76f28dc9ed2d9d2337fe389db0fe1631268e5bddaee2f249b6afcafca04330746172da7191f5ce4f8d65 SHA512 445d9bf397ed86ffc1427f0accaf253c33b0de94a8269bd0077c77fe59931c96cab890e5ae2e163831963b54651f3b103457662ae5cc4a702c3088d1c5012a30
+EBUILD dwm-6.2.ebuild 1088 BLAKE2B 05e3cdb4c60c87432511e0862babb0f3af9b8fc64990035ab2420c10415dbdb50eb7673a11e0df12d61e43a055b843a4930cd3f97d15fc81f094f8586d811c69 SHA512 253915758913ff05684bbafabd7d6b78ef45b62e8b894b81b332483ef4e1277dd21bbf6d454449e5fcee7da41cfd25879ee4950b6622bac5a408bab36c0e55f9
 EBUILD dwm-9999.ebuild 1051 BLAKE2B b6cb69a1d68690bc904fd8276f60e3a4384cbcb54e7e334fe4562495485a7e382e613cd0481c63634c645c89012ad5a77375b8b9a8e297627ab917493a5a5e20 SHA512 377b6dbc10ef70c55e66af4c89b304ce6f146ccc81041ab814bb30e7bacba809e24383317bf9a932cf49bae025b4951c81f8c42dbb554d8cbe7113fd79f39482
 MISC metadata.xml 503 BLAKE2B 741cc38200fa0911bf9fa1a2afcd0bad76da0469a85a6f72dfce5ed04e57083405cdc0e9ee8ca66b3f9bc88b1845a7132f66552e999f66568e3e044caaa3aaad SHA512 93d86f980268b8c9f2fba670220de0a138ebd7bd22481681ce0af029743a3142e52e215fc8dffcbce6ba882d50e9e1bfbe33eee858fe28978e733c0bfb864582
diff --git a/x11-wm/dwm/dwm-6.2.ebuild b/x11-wm/dwm/dwm-6.2.ebuild
index cbc0d85abd5d..2c254051b4d6 100644
--- a/x11-wm/dwm/dwm-6.2.ebuild
+++ b/x11-wm/dwm/dwm-6.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86"
 IUSE="xinerama"
 
 RDEPEND="
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index e018f28592aa..02e0b81d273f 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -1,5 +1,5 @@
 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
-EBUILD i3-gaps-4.19.1.ebuild 1759 BLAKE2B 3740e7f2cb3aa3a493d1228b2d2caac92041ed60e5fc794362dd12ceb8f0b6b35d8c9646d903969b0361e37d4a5daac268ac599805584358c96d9fcf2c5a0c18 SHA512 028600856d08230b544e47574ceda85f3069c8e544f724d0ebae4f46abad8d4294dc6ab990d6b12ddcc6876c2911c766468a26d458a077cef670c03187825289
+EBUILD i3-gaps-4.19.1.ebuild 1766 BLAKE2B a8cd816bcf2bff2ad2d8bf67c73bc5afa9d710af68a89a848cbae019d6b28c09ea9da2a67dc28a5b9a0d807837ded3cc5fc8a067dd09ce6240ec951ee8c3b2e0 SHA512 d51b738800b05c48ba355281a05a0d58457b5310937d1b66a600b72bf7a79c890c31f6a95b85bd4bf070557a2799c31ab1b52d3256b7896b486bb83690384484
 MISC metadata.xml 325 BLAKE2B 9ba8b18821fde643863d03bd1550bb4bf6fb2f69b7fcd427eed48887573ace9d3c387e1444717e071eddee3dd89d48f04075b87926403f2ddab72111d46130c0 SHA512 5a69d3ad5248c785f1bb53e6817277e4fc4bf7ceda661ccf497271df05ea930a6f8581681f9a3b6f48a9b0bc7b905904b5b8940f1a0454dd086611486649bed1
diff --git a/x11-wm/i3-gaps/i3-gaps-4.19.1.ebuild b/x11-wm/i3-gaps/i3-gaps-4.19.1.ebuild
index 2ad2ea50b59d..4ec99970db7a 100644
--- a/x11-wm/i3-gaps/i3-gaps-4.19.1.ebuild
+++ b/x11-wm/i3-gaps/i3-gaps-4.19.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 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 6d29de1cbdb7..a1aa12539f86 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -9,6 +9,6 @@ EBUILD i3-4.18.3.ebuild 2133 BLAKE2B f5b1ca5ab47d57102c358e72d958d4b0153d24b4157
 EBUILD i3-4.18.ebuild 2126 BLAKE2B 29048fa9165965ccd572cbacc8fdcc15697384bb75039c2c77caa3970040b31592359c1aa4b8df9242fd8c455e0b1a44d33c76422a9e603235651828cb7020d3 SHA512 527a652e1c6e05b1730a404c38a612820aebc2619ea8baf63c3403cbaaa8a4a5608ba63586c4f5ab09d7d57225727ed3f1207da317110b2b50b31b224440820c
 EBUILD i3-4.19-r1.ebuild 2009 BLAKE2B 879d419a2519c1a9ed7d6450f2c61a2fd55e0092f372affcdf71a695b037086d02ba89563b2157cb10ed82b31abadc96e5b610a5a9d7b615256ca54da3e47b1f SHA512 1b102e92604ae0b0cb10dac8fba11f263915c87ca5572aa779d8c77be92e3bb2c9304229a2031a1cd32937d0bab56a1e7777ad70a3c8ac7bb42fa256ff93eb1b
 EBUILD i3-4.19.1.ebuild 1963 BLAKE2B c4c67cbfe2936a71dbe28975de1ba900e38c0b6e950c5d2651f0495ce79070ead37168b97ebee170c23f27e96e50b93311296360e4bd42f2c7dd056649b9133b SHA512 b3e605f591aaed7fe4281efe32fc4172988b225f6445537ec4512564e9eb2dee08baf365b7361bcac10f0d0614140d1e4ccb6395df51ca72ead2c014e40d0e02
-EBUILD i3-4.19.2.ebuild 1973 BLAKE2B 6560c66a1e6b47f767f7b9b7711646aeab3603d4856dba9973751f12ba99019d4c0f5d45d6ab28a75f01652d300654847b7f6eea8be48efe797e0940adfd4697 SHA512 d240e390c4c7f949de52ac382421afd5cab2f507fbe2bec97756180424c098a2fb62190d595dc49c8a4d71e59a3b433cb8a0177086445315af7c82a5a7e10dc6
+EBUILD i3-4.19.2.ebuild 1980 BLAKE2B b47551d40cc02e24a0c61ee99cf721cb3e2580806b3b4298648dbe6f03eecf043f619bde78735c4d24df29d94d8f37ac7e7cf7310187844475291514f6f2396b SHA512 d072a4304375e6cdb4ff2ba060f0c16ff9ea11d0d65ffe0c242f10c87933a869e49ded091441e8d0d6ca3cddf1f8f1ede82f61b832389d728d48820bed81a66a
 EBUILD i3-9999.ebuild 1973 BLAKE2B 6560c66a1e6b47f767f7b9b7711646aeab3603d4856dba9973751f12ba99019d4c0f5d45d6ab28a75f01652d300654847b7f6eea8be48efe797e0940adfd4697 SHA512 d240e390c4c7f949de52ac382421afd5cab2f507fbe2bec97756180424c098a2fb62190d595dc49c8a4d71e59a3b433cb8a0177086445315af7c82a5a7e10dc6
 MISC metadata.xml 467 BLAKE2B 698d3f7309aa859af72db95540288e3fb4a848094d0a09b2d1deb5589f814cadc664bc455c0815bd0ac3ded9129495d7a7df8f60de1f9a7b48541c100f645b46 SHA512 6eda0780c6b9962ae7111c8f1390705b987ceff160532353f27366e336cdb00499dec8acf91aefa87fdddf99117b1f4c942d8ba94be6d41c246d342c9f075364
diff --git a/x11-wm/i3/i3-4.19.2.ebuild b/x11-wm/i3/i3-4.19.2.ebuild
index 8aedb5be5197..beb15ef579d1 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 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="BSD"
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 96f0fd4004d3..2187b27b4a6d 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -2,7 +2,9 @@ AUX mutter-40.0-Disable-anonymous-file-test.patch 862 BLAKE2B bb7a0f0dfa5f0543c9
 DIST mutter-40.2.1.tar.xz 2681780 BLAKE2B b273bc9979e285bd6c48afb367f0973114dbc9af086b5aadf41e6dc1cca54f7ca25975a4e2fe5b4acb020fa8f5fc136f0661be2b06deaacf25c363a187567b73 SHA512 f9b50b10f6a4ee8ba3d8d721734d25184675c2af1f14cb8da8cac6a6a60397c36bf39e87db06ac0ed8a0f3cbf78859e57fa965ac0d2593ed9c6aa9692d90d5b2
 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.tar.xz 2682916 BLAKE2B 9ba2eeb5962a5473804fab02b1209c6044b151a1bc64b533762a27e91f6701a0ad655f582c8831cf92defc7be82e9eaa2c72b772fe7ea5e032dab5ecc96fb1b1 SHA512 ebd4f2bc4e8eef99d66305347673cbd2e38c5a058eb91eab6b932671ea7cb4a2f893dd65c4c5028ece454f8dd293898821bd125b68e304cf905ad237abff8837
 EBUILD mutter-40.2.1.ebuild 4857 BLAKE2B 7d7c1edaf536ead824e60131fa5e92e8c1a0fa612f0f2548d4669648dd0453c4325bd05f89163cb6fe9893619d1cdaf32038b0a3154c6fd4452c579cc0e72276 SHA512 43d5d57b0d96cb0a98a8b687672c7398cc23dd99990179d7a9031e669996f9a8ee73e2d83f31d36379844536c23463468db7f21743098478015ffb4789eec777
 EBUILD mutter-40.3-r1.ebuild 4845 BLAKE2B a21695fee7ce8398b5ab40ae41bbf69a8bfb83fe747e0310306763d3768c0a7815d76022b00b234f2567d34ca4729e079011b4c4e09cf4025a16b69083127ce9 SHA512 936522dfc39a0f7565bb8bb0b3e24793df32275db5352620bd72eb0f50ec6623bbd257cc6e6381bf72b226b36e744abd1fc15339efdb559becb734cc3003767a
 EBUILD mutter-40.4.ebuild 4971 BLAKE2B e8cc75ad7e71f42f0f50be44c3981a9b9c97671f075e8fec8a5ed2801d51defe5cb939354cb5556a291c46a0727f3ef43de7cccd93ad28f146760d8a67ef742b SHA512 87b5871161f120e2809256289b54043ae0438c4fa9bdc99d9fc3a6ee8a35b339ea702628de934388301eb2e031f279cb8aa4f9a59aa43729afd84e46f5e04d17
+EBUILD mutter-40.5.ebuild 4971 BLAKE2B e8cc75ad7e71f42f0f50be44c3981a9b9c97671f075e8fec8a5ed2801d51defe5cb939354cb5556a291c46a0727f3ef43de7cccd93ad28f146760d8a67ef742b SHA512 87b5871161f120e2809256289b54043ae0438c4fa9bdc99d9fc3a6ee8a35b339ea702628de934388301eb2e031f279cb8aa4f9a59aa43729afd84e46f5e04d17
 MISC metadata.xml 606 BLAKE2B 54a05fee61cf9a1d958a46e0cc94e1cd61e69e187f89393c483c7022d455b7248684df4f1df028f0733995dacfbdf1faab600d8c239885eb0c7ea3097326f156 SHA512 6dea733bb5da3bd2db059a467cec81f7cfc0765750cdcfa0404a72cbb168495f13d01051198206178615b1a3fa41f78dffd9f0a38f6d7579116e782d76fab899
diff --git a/x11-wm/mutter/mutter-40.5.ebuild b/x11-wm/mutter/mutter-40.5.ebuild
new file mode 100644
index 000000000000..34e1e0658349
--- /dev/null
+++ b/x11-wm/mutter/mutter-40.5.ebuild
@@ -0,0 +1,167 @@
+# 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
+			<x11-base/xorg-server-1.20.11-r3[xorg,-minimal]
+		)
+	)
+"
+
+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/pekwm/Manifest b/x11-wm/pekwm/Manifest
index 75ef1b53b885..f7e06bc8ebed 100644
--- a/x11-wm/pekwm/Manifest
+++ b/x11-wm/pekwm/Manifest
@@ -2,5 +2,5 @@ DIST pekwm-0.1.17.tar.gz 429100 BLAKE2B 2b467539ef47f4404411f25146f9f945f9a63b7e
 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 1828 BLAKE2B 9bfebc537042530b731403f4bfb29495da5f8fdf76f650aa8c2f25a37bef9ae1dcb780bcd04b5e0f6bd08647c1fafb066dead2b665aa10763d1b614dfaba19da SHA512 4483f0c99a9e4d507e59a9c03125ee486caee6e1de713d04891a3e573df11c16d730d1bb0d6c113c4fe4c0829dbaae178cb5e273239bb1affdf42f78bb09757b
+EBUILD pekwm-0.1.18.ebuild 1825 BLAKE2B ae8f3cb1738eeb96c8686e9c517c2be87827ac4e990c0961d422d762f322174ccc926ad61c55ae8b85367ee2d9a1be0b9427876be61f1ae9a66f66eff54a7a64 SHA512 4712feb2621f58226c4a41c8e3d30100a7e4059675658c6e2604223dce1a2debdd9b65bb9316ce7658b3aa2aec1d4d2cf458397b585c5dddfeb06ad8ba6e6275
 MISC metadata.xml 767 BLAKE2B d8634006b5aef00a9d208b1100db237a84fc7e865dba4a96dd485e09e2d025b86bec92a8ca9cd7e69dd82762b9afe385acf96327f24a58ca6b0b7e0aa49dd01d SHA512 4c27bd4a13c54e198c541c9b57db3b6082b7b79c558a172ec242cdfd415edc4af47ffe3d02229c20bdc29912aff41dc3d86d5c07b2fd0e3bcf75bac204371a7d
diff --git a/x11-wm/pekwm/pekwm-0.1.18.ebuild b/x11-wm/pekwm/pekwm-0.1.18.ebuild
index 9902fd4f3dc0..b17eeaccaf65 100644
--- a/x11-wm/pekwm/pekwm-0.1.18.ebuild
+++ b/x11-wm/pekwm/pekwm-0.1.18.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${PN}-release-${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~mips ppc x86"
 IUSE="contrib debug themes truetype xinerama"
 
 RDEPEND="media-libs/libpng:0=
diff --git a/x11-wm/spectrwm/Manifest b/x11-wm/spectrwm/Manifest
index 25920474b062..5e136f1608aa 100644
--- a/x11-wm/spectrwm/Manifest
+++ b/x11-wm/spectrwm/Manifest
@@ -1,5 +1,5 @@
 AUX spectrwm-3.4.0-gentoo.patch 1134 BLAKE2B 01f472388c38b276fc91747cb1e06bf4709b1a53caacd1e16f3ef7d0817eb3d127aac76c665e92d05c41c9f01ce8b79525dd0bacbeecdd5d36c1d012bcdcb1c5 SHA512 9c8450fcdd198dd0ef88d13c38edb0cc48c7324cc8a3b3e2c331d9ca5608cfa9fa041b9cae466429e8b77fcb9eb28a29d484590106ea604f27163d07ee428508
 AUX spectrwm-3.4.1-musl.patch 259 BLAKE2B 61dde875af4c9fb8be72a098debe0ac00174ee4bf15c727778d37f80f844a60834959c8ab6f2f15200e4fb5968528f06c03a18fa4d89d074ffe1f32eb7fbfd8c SHA512 5780b9fa2504b3fe0d426bc373d9e43babc642af402035bcdf453b71766adac9d9e903226a63ccac1edc4f90d44c61723f80ceb2fb0c8743702cc1b14da0491b
 DIST spectrwm-3.4.1.tar.gz 164507 BLAKE2B 8047e639be3d4a07616f7ef3911765c5d6dd7dbd56c684453db90283faee08aac2cb9e3e20ae42f839582b67b778a4490a04fa21fc90fe489f798c40c517351e SHA512 94d468833124b51fa12b29b173126f10f27dd551d599459e4bea589721b3df6f1f0af0ea67326ed3ad462e1203d3bbcb82032ff83abfa0943ec45afd29dedaa6
-EBUILD spectrwm-3.4.1.ebuild 1178 BLAKE2B 320c66c5585f60206318568ff6b5b43878cf0b940ec5ad250bf43aeee4d222cdef06f24075b8461f1ae7e05b65de01f85f75928f3cd023ec41adfe17871d6fa8 SHA512 a4a74677a018f361a14cbef154b480f6135903efda8009754753412493a1df2d989ff4a4b98a678fd9d0dc36e3323403ad74345d7c301e92d891ef0f9255d593
+EBUILD spectrwm-3.4.1.ebuild 1161 BLAKE2B 8e387535ed26df8d9dd8109b311f4a7f9816b9bdfc3c23e11e71612031e374c910f4f90f06248a221f1cbb8150ec8d28e0eb2862e79a8d749038e2485adbfb85 SHA512 1b7c1f46fd59bb451294906d49506202a838cfb452742bea4e8145d1da9b105bd7c330da1c367f84c3c17af0ff882978e0de8340547306a681c9a94fecbb2563
 MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
diff --git a/x11-wm/spectrwm/spectrwm-3.4.1.ebuild b/x11-wm/spectrwm/spectrwm-3.4.1.ebuild
index 3836663ba0ba..a0949ab30736 100644
--- a/x11-wm/spectrwm/spectrwm-3.4.1.ebuild
+++ b/x11-wm/spectrwm/spectrwm-3.4.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit desktop multilib toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Small dynamic tiling window manager for X11"
 HOMEPAGE="https://github.com/conformal/spectrwm"