gentoo resync : 25.03.2022

13 files changed, 316 insertions, 11 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index d07a62c176c1..b30fea380583 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 5a7989233dc2..5892b16d35b7 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -4,5 +4,5 @@ AUX fvwm-2.6.5-ar.patch 1077 BLAKE2B ebd3226a706087c7e7f7935a9862c59e628551e19be
 AUX fvwm-2.6.5-mouse-buttons.patch 519 BLAKE2B 23b31933e9dcc456d73be15573226017fc213da59156040136ff447b208b45691fca00b5d16cdaf57ab8411e2834d759b3bb7e53550b13ec72de4b7f70486abb SHA512 d28a9724697859ca7beac1cc2813c12413654e1c0749297c34fb0ef8bbf97369ac8039d2a82ec673d885b39e1544259b70cecf292639caa9ff99c1b42d34c196
 AUX fvwm-2.6.8-perl528.patch 515 BLAKE2B 44df7b8aef71d85c3aefefb40ab45b9e6227ef6a13aaab60cec8956db669013b4ee4dc869216972e1a443d1f69e6550e7f80dc81cdf8b7642d6c49ae46793b2a SHA512 ab35b8aef3c6d8a07f1e03290c209736ee892729d98fece3d0134fd9994f8c57bdd5703492b405a6eb52cfcd67cd9cd72c16bc25a729a46560eb6e21f2d7918f
 DIST fvwm-2.6.9.tar.gz 3942859 BLAKE2B 8faf2d420d96049ab0528a6c6a5dc6ed8ee9449f8e533b9ad9bb526faea86030684fc0aa8ed0d307cb64575457676611298adf582b1249c37a3db35a72b43bf1 SHA512 a9c2214ad19edd17da81446a6d4250284cc50b59b53c233212f2a9354c01143dbb870521392752f272f00af50bee2dd8f0b6bf6176b0d4b3075694d2a61a623e
-EBUILD fvwm-2.6.9.ebuild 4071 BLAKE2B 9541da7f3bbf07a411fb7ef16a17363370d5245d5312fd41bf7037dd866fe8ac6918571479113f4549e92b0edac87cb786c5c2ed3cebd9f16945643518d9546a SHA512 dedd699d4fbc12be19c0a4a04da2728bdabb4dd7783ef1950093ccac1de481a0935d8a7a8cc8b75d7d143d792449369562c8930fa323904ed805935c35a1daf6
+EBUILD fvwm-2.6.9.ebuild 4078 BLAKE2B e11ab353d0dd3043dfe0dc9130ffe18f5c95449755eac396e982ef5ef33ddb5306e78139f9cc11adc49ee4e3ec8249cea71ba88f7cba64b8d680c12c944e3d47 SHA512 564b6a56cfce410003fcbdab0dc057c9ae8a7076578ec0ce376614c9af4a12ff3cb7d1b0ddfbde3299d022e3610e212b53a480abb793e671b1b9e6954b7d74c1
 MISC metadata.xml 708 BLAKE2B 4f55c0b953de9742cad78d0ebba7c21b6cd5d71d373bcbe6e17233626b9447175eb87559284d4b5c083b3ff5d2191fbbb7ba3044d7efd6a81ca731debe6a1cbc SHA512 61900fcc084c99d66e7a094e9777b589b472620da31d166b8d0d795e5f104d9c80298764cd787589666e6afa9f996f687bcc39db92ef7568e4eec9aa0624d141
diff --git a/x11-wm/fvwm/fvwm-2.6.9.ebuild b/x11-wm/fvwm/fvwm-2.6.9.ebuild
index b3d24a33c6ab..036bf38cfe5c 100644
--- a/x11-wm/fvwm/fvwm-2.6.9.ebuild
+++ b/x11-wm/fvwm/fvwm-2.6.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/fvwmorg/fvwm/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+ FVWM"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="bidi debug doc netpbm nls perl png readline rplay stroke svg tk truetype +vanilla xinerama lock"
 
 COMMON_DEPEND="
diff --git a/x11-wm/goomwwm/Manifest b/x11-wm/goomwwm/Manifest
index e8eb0f27030d..880dd9ab9de8 100644
--- a/x11-wm/goomwwm/Manifest
+++ b/x11-wm/goomwwm/Manifest
@@ -1,4 +1,4 @@
 DIST goomwwm-1.0.0-github.tar.gz 406143 BLAKE2B 0118dfec32a3598b0a23b3421643a211386c1bc302d523a4a63a78e34ba9f0673b0bae18b27b491ab153e3e0fb8031123c56425ac007c20651fb3ec8484ab7a5 SHA512 e37d80c8ea47fe136172c392521ec8d4dab361c3469d3d1626ed7c30385513301983c0ffde39f4c2e6f2dee8709da6a34f14f7bb89776f1ccde5103ab1a26764
-EBUILD goomwwm-1.0.0-r1.ebuild 793 BLAKE2B 490a4295bdabbba0ccee236ce3cfb749b56cd062e7e7c3f3561d35f04d162a7ad76d5756a4987adaf6c3bc9d6279bc5e5f9a2b71a909c0db34f842e0b97b25ce SHA512 7cfc759b3603a529c5f8d155b1cc0fef0afc890952204714501234b3c0e0ce3c2d731c6d5f1376689dbe5d53722c7ce0782e537e87b5a626f4a3b161657e5c5a
-EBUILD goomwwm-9999.ebuild 752 BLAKE2B 80c360c689a694146c97d4fe69d8aa3cb5f591650bd015f4d8b3ce7240a571d48ddb14173418c378e8183361fe56f7843d6e9dfd18f47916f2ef6d286c663e6d SHA512 1e6eb95eac110029267de0e6a1d04f724335782b5a9831482f7feb7808195d25ad182c8bc49405d66f1116bea0c1c072edee5da72f9a72b4e742483be3df8551
+EBUILD goomwwm-1.0.0-r1.ebuild 795 BLAKE2B 09f17ae9824995f845a3537076e11a69f2431c4631ddff5965c2dfd316be2b505d0ff11498b13284dfb481afce61ca2da89e971ea22797c5c79160e03f7c6e64 SHA512 cd5a942d05221ed3bf51c685dd053a7a60ac0e6c727d1a4766d3546a10b67fce3cacec21aba494809c701fce1a1ac49ac2010c5451f46bd3edddb4fc4433f93b
+EBUILD goomwwm-9999.ebuild 754 BLAKE2B a773fbe2e44f62bd889668b0d64411c02c7e6bf3415d4b119f500be99f9f6cab83ab58a8922f6c298c339cecec58bd1ebe49cec5cbb6a8ad1b0b4fa9f73a6f15 SHA512 77c6450c9fbb0874987eb930121dbf1827b1e48e7796fb33d9e14267e2ead0d8bcfd7873f6a606aa021b5e1bd6b11deec1f54dd25e33fc58e6a77844e3ac8a48
 MISC metadata.xml 252 BLAKE2B c4a2c3f6d0db197a7b49dfc6cfb753158bf4a405c4deb0527672c789a2c97c68f22df69507107830adebb769d52366dbcdc13d6f2cc1199f84c6f563fd9c387e SHA512 627fde87dcdac1bc610d9889b780582d1f94cb08dc45df38b3200536b71a3b913a5b3f232144bd796a598e89c08bb9987aeb0b1ad86f79bceac7d26dd304b392
diff --git a/x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild b/x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild
index db6647764c2d..f51897cf633f 100644
--- a/x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild
+++ b/x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -35,7 +35,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) proto normal
+	emake CC="$(tc-getCC)" proto normal
 }
 
 src_install() {
diff --git a/x11-wm/goomwwm/goomwwm-9999.ebuild b/x11-wm/goomwwm/goomwwm-9999.ebuild
index f1597d56c856..7183c82c7e49 100644
--- a/x11-wm/goomwwm/goomwwm-9999.ebuild
+++ b/x11-wm/goomwwm/goomwwm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -35,7 +35,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) proto normal
+	emake CC="$(tc-getCC)" proto normal
 }
 
 src_install() {
diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index 8c73b03bd5e4..ed98a76acc34 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -4,7 +4,9 @@ AUX 1.6.1-desktop-files.patch 1671 BLAKE2B 4eec89c64a1fdb4dc05cc5ccb7b92daa5cae4
 AUX lumina-session 2011 BLAKE2B bec6e1161c89ef0ae5f6506d57b6deff09f907b2c16b0d3404eb61369f1c3fa6f19400557f18dc3081e19652badae541d9f84be8717851b5a583392caaef303f SHA512 79e06e1761b079c96984c84f225e23a545d012ad94148080c3659c85f75b322dd050fc4b1908f72de1cdd22bab6b62e0d1de4f8c77f29073e88488671b0836db
 DIST lumina-1.6.0.tar.gz 20662000 BLAKE2B c016f07fb86333e792d6a0a0ddaa9ea09f322d6de69d099abf9340d7db6cb9e23624b62882579ba6c13eec71fcf663f1688424fd940cd7e09e625f6fcc4b281f SHA512 e923961568ab9cc32206386066daef8cd1fd2db2d5c3e260e5c1da1dcda39a516576418f607cefbe5a1c47d8684591d0e595fb344e7d6aa2859fc3b326e73e30
 DIST lumina-1.6.1.tar.gz 20614263 BLAKE2B c0ad6a48d06ec9b2c0856a673319cb6a022416465e5f15fce47aac62d7e1817dc8b01acc7c55eaf3664217f2f27ef1b4d7a603a355cd9e22b707b481b322783a SHA512 ff4a77812e8d91478cbfd123ddc545e5a4aaabf3d9f96e6dedc769eb9490e4ac372c4243dca9444cdf986886c08e2eaa587470c9bc8a5a00bbe10ff80ad64c96
+DIST lumina-1.6.2.tar.gz 20818383 BLAKE2B ecb2d4c1f3ce94f247cd86640bd6394807ed5d9a34b2256d333894e6528c0d3dac1ddcab8c790a63df67c2738ab7af8dd2ef0cae67c534e10c4b2edd8919ad8c SHA512 0bebdc89644af49232ad9a0b753dee501f3e99d6615ce926c71790932d228e3c6676ca4835aeaf6badf5455102278261e48bed0d3004fe9209aca68d620cae02
 EBUILD lumina-1.6.0.ebuild 2393 BLAKE2B 81ec58a7db69858efba8551c036f11190af573b21ae85c18c97ae6759ab35e169b63d5cc6d6c93146ba9af12823e70007a740eb2fe3d0c42fc2452d9cc94fd0e SHA512 fdd5aca5842e6b7cbe3e815c0ba65d869d8a5f934ad06421cc83b7e16b6f840c5668e14bd7c449db799d9d2a7e246e784f8de8979a0508e9122b399f9684a05f
 EBUILD lumina-1.6.1.ebuild 2265 BLAKE2B 7c2bcfd2b91165cd2399735b91dd00c0dd71e5c80aa673d5450b52fdd1168aff3e754a1ba878ad42cd26ce0c6d10ccc3b2528b7291761760cbf79c9214e8cfe8 SHA512 ec14e919d4834fc54fe407520e66357586859a3d25c9397113d87a9adb9fff2501af8a88a422314ac21097b05c3e5fc8274b5897e4bec4bc3e8114843240faba
+EBUILD lumina-1.6.2.ebuild 1972 BLAKE2B 6887f5d9c7694e3f0b43f6f8b7632494ecbb5204cf9a8444e8146fb42b813af2a924365e810286857c2181b7bc5791bdf6811118cd4bf8ad94f62ff9871beae1 SHA512 5816c2fae7680393ec5167f9b3c93c3eba96394e7a5a57dc3090ed27ff12e58df3bfad699f47355300ed691a2388df541fd6fa0aa4b328c598918890efc2911c
 EBUILD lumina-9999.ebuild 1366 BLAKE2B 0da2fd0940f6ebdb0dcbe0424b81458f90b20fe66cfb3c65f3bc1164c45deb5293981eb30886bdcc40d56e1ffe0ffc79660c91c62531fb038c56b5fa584d45be SHA512 758c5ac50e8673155abf452dbe28ba54d5f59ff5f1b91f59dcb061d5ed1c979aab7c8101dab4b928e24ca79491c9bf5b8c27a83a7277ba9d10b7f016c8674d13
 MISC metadata.xml 1982 BLAKE2B f2ea25f4e1118e58d78802ba7a047ec2cf1a963127d650625d2e18d2dd4378fdd255d513dcfbd7c24dacd7635839f3edde09cf778846ac7c98f302000e79b14a SHA512 54ffea2bd7d41a773888fe09dd4c70ef2db0898347249806cde19476f8a8a5b925ba5c953c4718786dd763a1664e5e247151cde69328525615cf9b0412dce909
diff --git a/x11-wm/lumina/lumina-1.6.2.ebuild b/x11-wm/lumina/lumina-1.6.2.ebuild
new file mode 100644
index 000000000000..c49afaa5aa0c
--- /dev/null
+++ b/x11-wm/lumina/lumina-1.6.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="af ar az bg bn bs ca cs cy da de el en_AU en_GB en_ZA es et eu fa fi fr fr_CA fur gl he hi hr hu id is it ja ka ko lt lv mk mn ms mt nb ne nl pa pl pt pt_BR ro ru sa sk sl sr sv sw ta tg th tr uk ur uz vi zh_CN zh_HK zh_TW zu"
+inherit plocale qmake-utils xdg
+
+DESCRIPTION="Lumina desktop environment"
+HOMEPAGE="https://lumina-desktop.org/"
+SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="desktop-utils"
+
+DEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5[widgets]
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libxcb:0
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-wm
+	desktop-utils? ( app-text/poppler[qt5] )"
+
+RDEPEND="${DEPEND}
+	app-admin/sysstat
+	media-sound/alsa-utils
+	sys-fs/inotify-tools
+	sys-power/acpi
+	|| (
+		x11-apps/xbacklight
+		sys-power/acpilight
+	)
+	x11-misc/numlockx
+	x11-wm/fluxbox"
+
+BDEPEND="
+	dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=(
+	"${FILESDIR}/1.6.1-desktop-files.patch"
+)
+
+DOCS=( README.md )
+
+src_prepare() {
+	default
+
+	if ! use desktop-utils ; then
+		rm -rf src-qt5/desktop-utils || die
+		sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
+	fi
+
+	plocale_find_changes "${S}/src-qt5/core/${PN}-desktop/i18n" "${PN}-desktop_" '.ts'
+}
+
+src_configure() {
+	eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
+		CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+	einstalldocs
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}/lumina-session" lumina ||die
+
+	remove_locale() {
+		rm -f "${ED}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm
+
+	}
+	plocale_for_each_disabled_locale remove_locale
+}
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 19b8e66b9c11..9708d30accfc 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,4 +1,7 @@
 AUX mutter-40.0-Disable-anonymous-file-test.patch 862 BLAKE2B bb7a0f0dfa5f0543c9187fe8c3aa8d1251fbb9c74dcf4c518a4674758a22da70a94de688f4b01d7673c679a2e96cbdfa5c33de3d009c85fecd2498061121dcf3 SHA512 d2d7ec9e1fcc3fad9dc058edf611fe16a3180a8d6694a9f3257b22eb3885dc0b311bc48054de0d183c661658e226d1b04e4ad81b1314a60a3f441a6f4c06bed8
+AUX mutter-42.0-Disable-anonymous-file-test.patch 765 BLAKE2B 7d223e0dc98963b61cb0bc26ec22775e87942f88f97af7dbcde63e0d960f5b41afc3de0b358b0c6252de90af4451d4fd6c75b7815ab573c7199b0c82cdd1eb7d SHA512 c066d1b5541078c6cc8d2788b36935b9aff0f1fbb800f39fa4674755a6842be66736c57b43d5edb00e5c18a33c1ff17d54a546134e5aae8ebd9a8967cd46b164
 DIST mutter-41.4.tar.xz 2717012 BLAKE2B 2f9d144380072427c0ee65c1e3bb26e5caca76e0656f316459a77df09f9e8bda3ea9c17c6400d04abee9c7f82b36dbd035794cf31feef7ee4574ce308d627e55 SHA512 ee3881f9047f0b9ef8598609e9ac90294cb36a7549fcc6a647a80553045ed315998d0dbac247887ae06b32126bab1525f13f7f92655b9103cac77750e347e405
+DIST mutter-42.0.tar.xz 2742212 BLAKE2B 4867d184fbf63f7624c907f941f1aa1ac8d66108554385c1500b6259958a3c2bf5dcd30cebed95cbafd4a1bbd5368b6078edec695884a0ee9eb48dbf0ad4cecf SHA512 ffcfbb1b6d3add84adf2d67d459905d164dc272289b645994288c376bc656481526d445cdfe6df027b88ab590258ee9d9d4ba251e03c6ef93d17f0758f75520d
 EBUILD mutter-41.4.ebuild 4973 BLAKE2B cf7432698172a8ec8baff3d665201e3f531c888acf9cca24eee2dbb33b743f536161a9ad88c7d83a5b6564594794c4ec6c5bb4346e38344a9adac8edc69f2baf SHA512 f8566f3a13911e970ca52e5fd057a8d80b9d782d5ef5bd1a85ab310514a7afa9f6c4bb5d1c4042b421f819ef0a9e02b0d623b531fb9d76a49147f4c24f1f9532
+EBUILD mutter-42.0.ebuild 5395 BLAKE2B 023b905a7e85c82f63c5e2f6a6859590adc46c3ad1f5dd9afe7f9d8798cf7e29d577244f001f16034b5d8e2d15a04148c87a742e12c42f9c72bbf13bf95055e4 SHA512 7b515916af214d97b43aaa70d7e5c6c2a540c91cc82ccfeff84819bc1cd82ed68d92bc79b4275f5e002d46045cefe4b5589672d6314190d5ccf5bd07f42e2792
 MISC metadata.xml 606 BLAKE2B 54a05fee61cf9a1d958a46e0cc94e1cd61e69e187f89393c483c7022d455b7248684df4f1df028f0733995dacfbdf1faab600d8c239885eb0c7ea3097326f156 SHA512 6dea733bb5da3bd2db059a467cec81f7cfc0765750cdcfa0404a72cbb168495f13d01051198206178615b1a3fa41f78dffd9f0a38f6d7579116e782d76fab899
diff --git a/x11-wm/mutter/files/mutter-42.0-Disable-anonymous-file-test.patch b/x11-wm/mutter/files/mutter-42.0-Disable-anonymous-file-test.patch
new file mode 100644
index 000000000000..d0e07840d46e
--- /dev/null
+++ b/x11-wm/mutter/files/mutter-42.0-Disable-anonymous-file-test.patch
@@ -0,0 +1,30 @@
+From 8cb699dc59c64dc9f58873b3bbe2d17c3a08d2f9 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Fri, 18 Mar 2022 17:40:52 -0700
+Subject: [PATCH] Disable anonymous-file test
+
+It attempts to open /proc/self/fd/* (an fd created by memfd_create),
+which sandbox disallows.
+---
+ src/tests/meson.build | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/src/tests/meson.build b/src/tests/meson.build
+index a19703288..50027d1f8 100644
+--- a/src/tests/meson.build
++++ b/src/tests/meson.build
+@@ -180,11 +180,6 @@ test_cases += [
+     'suite': 'compositor',
+     'sources': [ 'stage-view-tests.c', ],
+   },
+-  {
+-    'name': 'anonymous-file',
+-    'suite': 'unit',
+-    'sources': [ 'anonymous-file.c', ],
+-  },
+ ]
+ 
+ if have_native_tests
+-- 
+2.34.1
+
diff --git a/x11-wm/mutter/mutter-42.0.ebuild b/x11-wm/mutter/mutter-42.0.ebuild
new file mode 100644
index 000000000000..3c8742787bec
--- /dev/null
+++ b/x11-wm/mutter/mutter-42.0.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+inherit gnome.org gnome2-utils meson python-any-r1 udev xdg
+
+DESCRIPTION="GNOME compositing window manager based on Clutter"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
+
+LICENSE="GPL-2+"
+SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
+
+IUSE="doc elogind gnome input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
+# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
+REQUIRED_USE="
+	wayland? ( ^^ ( elogind systemd ) udev )
+	test? ( wayland )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
+# xorg-server is needed at build and runtime with USE=wayland for Xwayland
+# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
+DEPEND="
+	>=x11-libs/libX11-1.7.0
+	>=media-libs/graphene-1.10.2[introspection?]
+	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/pango-1.46[introspection?]
+	>=dev-libs/fribidi-1.0.0
+	>=x11-libs/cairo-1.14[X]
+	>=gnome-base/gsettings-desktop-schemas-42.0[introspection?]
+	>=dev-libs/glib-2.69.0:2
+	gnome-base/gnome-settings-daemon
+	>=dev-libs/json-glib-0.12.0[introspection?]
+	>=x11-libs/libXcomposite-0.4
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	>=x11-libs/libXfixes-3
+	>=x11-libs/libXi-1.7.4
+	x11-libs/libXtst
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	>=x11-libs/libxkbcommon-0.4.3[X]
+	x11-libs/libXrender
+	>=x11-libs/libXrandr-1.5.0
+	x11-libs/libxcb
+	x11-libs/libXinerama
+	x11-libs/libXau
+	x11-libs/libICE
+	>=dev-libs/atk-2.5.3[introspection?]
+	>=media-libs/libcanberra-0.26
+	sys-apps/dbus
+	gnome? ( gnome-base/gnome-desktop:3= )
+	media-libs/mesa[X(+),egl(+)]
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+	systemd? ( sys-apps/systemd )
+	wayland? (
+		>=dev-libs/wayland-protocols-1.21
+		>=dev-libs/wayland-1.18.0
+		x11-libs/libdrm:=
+		>=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2]
+		>=dev-libs/libinput-1.18.0
+		elogind? ( sys-auth/elogind )
+		x11-base/xwayland
+		video_cards_nvidia? ( gui-libs/egl-wayland )
+	)
+	udev? ( >=dev-libs/libgudev-232:=
+		>=virtual/libudev-232-r1:= )
+	x11-libs/libSM
+	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
+	>=x11-libs/startup-notification-0.7
+	screencast? ( >=media-video/pipewire-0.3.21:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	doc? ( >=dev-util/gi-docgen-2021.1 )
+"
+RDEPEND="${DEPEND}
+	gnome-extra/zenity
+"
+DEPEND="${DEPEND}
+	x11-base/xorg-proto
+	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
+"
+# wayland bdepend for wayland-scanner, and either libxcvt or xorg-server[xorg,-minimal] for the cvt binary
+BDEPEND="
+	dev-libs/wayland
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/python-dbusmock[${PYTHON_USEDEP}]
+		')
+		app-text/docbook-xml-dtd:4.5
+		x11-misc/xvfb-run
+	)
+	wayland? (
+		>=sys-kernel/linux-headers-4.4
+		x11-libs/libxcvt
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-42.0-Disable-anonymous-file-test.patch
+)
+
+python_check_deps() {
+	if use test; then
+		has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_configure() {
+	# TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
+	local emesonargs=(
+		-Dopengl=true
+		-Dopengl_libname='libOpenGL.so.0'
+		#gles2_libname
+		$(meson_use wayland gles2)
+		-Degl=true
+		-Dglx=true
+		$(meson_use wayland)
+		$(meson_use systemd)
+		$(meson_use wayland native_backend)
+		$(meson_use screencast remote_desktop)
+		-Dlibgnome_desktop=true
+		$(meson_use udev)
+		-Dudev_dir=$(get_udevdir)
+		$(meson_use input_devices_wacom libwacom)
+		-Dpango_ft2=true
+		-Dstartup_notification=true
+		-Dsm=true
+		$(meson_use introspection)
+		$(meson_use doc docs)
+		$(meson_use test cogl_tests)
+		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
+		-Dnative_tests=false
+		$(meson_use test clutter_tests)
+		$(meson_use test tests)
+		-Dkvm_tests=false
+		-Dtty_tests=false
+		$(meson_use sysprof profiler)
+		-Dinstalled_tests=false
+		#verbose # Let upstream choose default for verbose mode
+		#xwayland_path
+		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
+		#xwayland_grab_default_access_rules
+	)
+
+	if use wayland && use video_cards_nvidia; then
+		emesonargs+=(
+			-Degl_device=true
+			-Dwayland_eglstream=true
+		)
+	else
+		emesonargs+=(
+			-Degl_device=false
+			-Dwayland_eglstream=false
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_test() {
+	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
+	glib-compile-schemas "${BUILD_DIR}"/data
+	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/x11-wm/treewm/Manifest b/x11-wm/treewm/Manifest
index 198120241af4..62562d385046 100644
--- a/x11-wm/treewm/Manifest
+++ b/x11-wm/treewm/Manifest
@@ -1,4 +1,4 @@
 AUX treewm-0.4.5-gcc43.patch 568 BLAKE2B 481b948412109a7febbf97dbab7681b7ff33c3f603885755103cff663288b97925d8122ee3eb18ce2b0c448830c73b92db4162c02c992781f9ee07955e925de5 SHA512 db7bede71787693a561072ad2fd89a8a5a9c46918d4f98021d587ec447318adaf76235db189990597eba36db44f720b5ab486ee7b4aae529fb0a4fed26eeebc4
 DIST treewm-0.4.5.tar.bz2 87098 BLAKE2B 4ec890573aa32fafef99590f12b1e5491759ece65347339654844f077e9fdf794a96322d62066196eb3c50be271e8f16e842344a755411f3914a347b8cf2835e SHA512 96eb8eec11cec992daa4492b5a9243db5cc80b23d3827169d223d81b9ff289b62dbe6c8c3ea9da5da2e32435d98cc4552038c26e975cddec795de3b88f9db9cf
-EBUILD treewm-0.4.5-r2.ebuild 1590 BLAKE2B ebd2e317f350d171dc213696c144b709f98ce5dee6cdb297ff155468dcfa589628a32c5b610c4116f59eeadaf13202225e3e4aac811f649cb776def884fc3da8 SHA512 e2d6d767fad56d3fd8b3ad590b464550c6a58b16d46938750196aad05dcf4c061b67526f2e0629c116686b97fb98afe175206409371a2e923441708be3916c4e
+EBUILD treewm-0.4.5-r2.ebuild 1592 BLAKE2B 27c3e80267dc15203b4c9cd99c7697f7be795ad55fe17d72f770e21a0821e672020b8fe3871b6a0aa0c6d07e47a9a3998cda7ee7c071af047959494e3eb21347 SHA512 09eaa4dfd52c085e2555a3ef9988c45f12655eecd9d4753ebc9f4c30a153a332f427c953e38cdc35c2b5dfaec3eb968c71edbacb915b5e8965fa34cd0d83be54
 MISC metadata.xml 339 BLAKE2B c1f72ded8fc3cb1849fe389a5cab29c5de091110583c26d365c8884fcff8d8100a424ff02706a35a04767480a227cb8f5c828f93af5d43aef6699c882fa9b0f7 SHA512 68b2a14a5e788b2f35a371df60b55f4c38327c97932e89329f400a4169f5848235e252b7f3844ac624e206d04f691f8097699d1b8e1ed16871b0af19e5fe5823
diff --git a/x11-wm/treewm/treewm-0.4.5-r2.ebuild b/x11-wm/treewm/treewm-0.4.5-r2.ebuild
index a94abe2ab166..e2f992385164 100644
--- a/x11-wm/treewm/treewm-0.4.5-r2.ebuild
+++ b/x11-wm/treewm/treewm-0.4.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,7 +35,7 @@ src_prepare() {
 src_compile() {
 	# only compile treewm, not (x11-apps/){xprop,xkill}
 	emake treewm \
-		CXX=$(tc-getCXX) \
+		CXX="$(tc-getCXX)" \
 		CCOPTIONS="${CFLAGS}" \
 		EXTRA_LDOPTIONS="${LDFLAGS}" \
 		PREFIX="/usr" ROOT="${D}"