gentoo resync : 28.07.2021

7 files changed, 2 insertions, 661 deletions

diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index eb9de8d78da0..6e93cbf53df5 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,16 +1,6 @@
-AUX 3.34.6-tests-dontreq-gdkwayland.patch 1730 BLAKE2B d796a4dc91d756ac4af24c411e9f6ef33fcd02443585a3662bf58f04498305aa6b458ab0ace5191a97d9c66ba81cec9ee75099d7e77436eb39c3bec33bb68e26 SHA512 841f59c00f061302f411ce5ed5c25ef041f13a57d44da011815cfb2c1f80cccea1963675dc023d82aac4824b620861876ca628b6165db74b150564222b786b22
 AUX mutter-40.0-Disable-anonymous-file-test.patch 862 BLAKE2B bb7a0f0dfa5f0543c9187fe8c3aa8d1251fbb9c74dcf4c518a4674758a22da70a94de688f4b01d7673c679a2e96cbdfa5c33de3d009c85fecd2498061121dcf3 SHA512 d2d7ec9e1fcc3fad9dc058edf611fe16a3180a8d6694a9f3257b22eb3885dc0b311bc48054de0d183c661658e226d1b04e4ad81b1314a60a3f441a6f4c06bed8
-DIST mutter-3.36.7-patchset.tar.xz 14232 BLAKE2B 90a289f7012e28607d487fd635b73683e657bfd8792dbf662f8822ac7f096d21add6fcd3b7092e4e82f2130226f5b1ff9afd1e026fec8333680c9b4e4712dea2 SHA512 74e3951358a02c552a45b590360b9a038283e983ff78daf433fea1589ca3e7824f21af3b786a06ba84fb400581dfc4f97f29d259afdaca2ae3e1456a49a96243
-DIST mutter-3.36.7.tar.xz 2689176 BLAKE2B a3849b254dbe2029736ef760fe4225e63bf1d87bf2856a87682574904bd047822916485a3e00d2760118132466414b68764731ea4af9add5d734fd7ce3eac730 SHA512 6061cc8a3bdefe57049f9da757b9a33321b28ff7bc9543bc1db3abd75c7261bf233180fb1e8a2f76145dd67ebda91c48981f6e844a866ef6cbb66203af4b7ef7
-DIST mutter-40.1-r1-patchset.tar.xz 25312 BLAKE2B bcb58a50d63076ec012a2866dcbabaf417c094c3d7811f59e58273f7966f132fd51587b9374cee49b10e02207edc89bc0a4176de236330f4d9d9467f23a1d997 SHA512 511c9a315e29175109a8341ff608c94535579bc7e3145990405286fb47ee050a9ad90977ac18cd69f9baeeac283d3b94b1a0d4324ba3cc73fbb405443d82eb4d
-DIST mutter-40.1.tar.xz 2680816 BLAKE2B 924fd977e1c6669abd5adea1855c3a0a4027ae7e96ab3c6ccbe3d54da5f431e386f9c2f8f060dc9cd066c7414a2bb90a05760fa3413c6805cd8b73cb5d3aed90 SHA512 c2b6603e1d55492916f742f9cb8e15588cb30e78c37de987404ac40d3befa65e417184305ad87fdffc41052a094790f9e324a1ea7482e5de4f0439dceefed118
 DIST mutter-40.2.1.tar.xz 2681780 BLAKE2B b273bc9979e285bd6c48afb367f0973114dbc9af086b5aadf41e6dc1cca54f7ca25975a4e2fe5b4acb020fa8f5fc136f0661be2b06deaacf25c363a187567b73 SHA512 f9b50b10f6a4ee8ba3d8d721734d25184675c2af1f14cb8da8cac6a6a60397c36bf39e87db06ac0ed8a0f3cbf78859e57fa965ac0d2593ed9c6aa9692d90d5b2
-DIST mutter-40.2.tar.xz 2681840 BLAKE2B 7785086a9aff9f273735e0a0716a8535a7e69b35c5b4312d8a363b4058e84e499a15c1d9b085c40d1303e69e661fd74c286da89a83a27d86e1a56c537f7e2e18 SHA512 9582004efde7a4b2ad21c390f4a4558c99709e21bdcac3f161f185612de9aaeb60cbfcf5dd1684726ae18244540aa4b6bcd2b9f362b92eb8c74304c43c9e1113
 DIST mutter-40.3.tar.xz 2682460 BLAKE2B 41e505adc9aa6ca53d1f43d71051bc09c0f4f528803f10c8f4ad8fe2cf28f5a02a3d3dca1a4a02b702a40177501663e20b68415295805b6c0503690dbb5e53fc SHA512 beb9cb1b8dee153fe204aa5d799e4ba44380c8483362ab4f7b149c715be6fa929345386b78af73ca6ae7e864dd2923e5c0de88404f8ffe5d22f2ae9238bcc074
-EBUILD mutter-3.36.7-r1.ebuild 4749 BLAKE2B 69075255e249f22d91a87e440d986cfbd125c91bc878f715a1430d90996bf4183c2281c88b935ca44b8940ddf4f7850f5a42d7550f138ddead7eb6ddd62a4a8e SHA512 c2a5b423e410bb6a8a9304acea03fbefba0ce3385d3dabb8adc46baa63d9daef02a59b051a371b62acdc6acfed3c443a8cc229928a2305a11766005ded637c2a
-EBUILD mutter-40.1-r2.ebuild 4698 BLAKE2B 2e596db628643d0ea02b06c1f0a4c1fa3a59cd4f179edadacaf903b238af01e200745977570db0a9d70e3f27655bc685ca734977284f0be6ffa3029d92d85b77 SHA512 c95097736269f708215ee70990be54feadf580898911d859d3d63b4f3991646016625be586c58f718e3904dc80d3b118d4824ea528675894252ac46a0d81b8bf
-EBUILD mutter-40.1-r4.ebuild 4795 BLAKE2B 81cdf5e0012ab9145a9e131f2701dc1335833f177c336b8880d89b23cdbb7afcdd45baaa70232a81424116fd4840e140f0a59a2e74a08e852b6d399a32ad496d SHA512 4d7b383a6185c169a0b2ee6e5139fc614b3c9ff4f19094c9da6783174d0fcd255c191170c31786dd5ffc78531fb014c7253ee5d0f90f36a377f356c885bd5915
-EBUILD mutter-40.2-r1.ebuild 4701 BLAKE2B 1785d0505f6182894f187c84d2d9b04eb7d7914d0182a35ce78f0ba9984aa2fc22df955e092d1583d1e3965fa6437d3815cb081620a3d4ead6a893f0154fa9aa SHA512 42423c360756ec6d3ba7bb3e4d1da26df9c15d4b1e7f3ae139382a24c1e0b85afd77c2fe4f28ff364c794e611b68b15195a5b07ad3cfa1c59422acfb2d689a1a
 EBUILD mutter-40.2.1.ebuild 4857 BLAKE2B 7d7c1edaf536ead824e60131fa5e92e8c1a0fa612f0f2548d4669648dd0453c4325bd05f89163cb6fe9893619d1cdaf32038b0a3154c6fd4452c579cc0e72276 SHA512 43d5d57b0d96cb0a98a8b687672c7398cc23dd99990179d7a9031e669996f9a8ee73e2d83f31d36379844536c23463468db7f21743098478015ffb4789eec777
-EBUILD mutter-40.3.ebuild 4860 BLAKE2B 3b5842456b49e3b986ab280ed7e98e593173f9523c6b441032dd848095924d4007b7eca404b0fda62ee2a7782492b20915ae71febf5011dd0119d050e781d61e SHA512 c161dfc7642449768a163485de2f3e5604b9f967be2babcf463e01f73d8b84d1d33d3a93080f93e764f8744390c346ea7f0b1e2f49d0aa9097e4c99d162d954f
+EBUILD mutter-40.3-r1.ebuild 4848 BLAKE2B 5bd88ed87bcfd36268860993072b5e851dabf6c664c08f4aba9515bb34092e1b41f7cac754607b334771b7460c35592a9176483f919975673bbf1889c301355f SHA512 64b9610ab570a539e85d0bf410bfab72acb5cc650ad963ee16e24408d7189625412d0f933fffde07f94a6e0367b9a20d3cb415336d584b16d5468e64cca09cba
 MISC metadata.xml 605 BLAKE2B 5dc68fbf8b85c2bf75ea435abe116a9ed7072ec40a45bda28de9cb277a03e5c363487f1c3aa5c60cab5f710e06f15d966790684cac1573676af635e59b3cdfbd SHA512 440e7a33404e218da15c127614d843edcd42c469aced4609c2e7d7d8ec1281c9eceb64aebe406a75e9ba0a05b6be18bbb721257e140f6d334aff6143b1233fb8
diff --git a/x11-wm/mutter/files/3.34.6-tests-dontreq-gdkwayland.patch b/x11-wm/mutter/files/3.34.6-tests-dontreq-gdkwayland.patch
deleted file mode 100644
index 810801977af8..000000000000
--- a/x11-wm/mutter/files/3.34.6-tests-dontreq-gdkwayland.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From fd10425c598f7b3db16521c2709032fd2ea5a396 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 28 Jun 2020 09:26:33 +0300
-Subject: [PATCH] test-client: Fix compilation without GDK_WINDOWING_WAYLAND
-
----
- src/tests/test-client.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/tests/test-client.c b/src/tests/test-client.c
-index 83a5ce485..80c239310 100644
---- a/src/tests/test-client.c
-+++ b/src/tests/test-client.c
-@@ -22,7 +22,9 @@
- #include <gio/gunixinputstream.h>
- #include <gtk/gtk.h>
- #include <gdk/gdkx.h>
-+#ifdef GDK_WINDOWING_WAYLAND
- #include <gdk/gdkwayland.h>
-+#endif
- #include <stdarg.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -46,8 +48,10 @@ window_export_handle_cb (GdkWindow  *window,
- {
-   GdkWindow *gdk_window = gtk_widget_get_window (GTK_WIDGET (user_data));
- 
-+#ifdef GDK_WINDOWING_WAYLAND
-   if (!gdk_wayland_window_set_transient_for_exported (gdk_window,
-                                                       (gchar *) handle_str))
-+#endif
-     g_print ("Fail to set transient_for exported window handle %s", handle_str);
-   gdk_window_set_modal_hint (gdk_window, TRUE);
- }
-@@ -377,11 +381,13 @@ process_line (const char *line)
-           goto out;
-         }
- 
-+#ifdef GDK_WINDOWING_WAYLAND
-       GdkWindow *parent_gdk_window = gtk_widget_get_window (parent_window);
-       if (!gdk_wayland_window_export_handle (parent_gdk_window,
-                                              window_export_handle_cb,
-                                              window,
-                                              NULL))
-+#endif
-         g_print ("Fail to export handle for window id %s", argv[2]);
-     }
-   else if (strcmp (argv[0], "accept_focus") == 0)
--- 
-2.20.1
-
diff --git a/x11-wm/mutter/mutter-3.36.7-r1.ebuild b/x11-wm/mutter/mutter-3.36.7-r1.ebuild
deleted file mode 100644
index 8a921682cea2..000000000000
--- a/x11-wm/mutter/mutter-3.36.7-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/6" # 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"
-# 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="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc 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
-	>=media-libs/graphene-1.9.3[introspection?]
-	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.30[introspection?]
-	>=dev-libs/fribidi-1.0.0
-	>=x11-libs/cairo-1.14[X]
-	>=gnome-base/gsettings-desktop-schemas-3.33.0[introspection?]
-	>=dev-libs/glib-2.61.1: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.35.2:3 )
-	wayland? (
-		>=dev-libs/wayland-protocols-1.19
-		>=dev-libs/wayland-1.13.0
-		x11-libs/libdrm:=
-		>=media-libs/mesa-10.3[egl,gbm,wayland,gles2]
-		>=dev-libs/libinput-1.7
-		systemd? ( sys-apps/systemd )
-		elogind? ( sys-auth/elogind )
-		x11-base/xorg-server[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.0: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.35.2 )
-"
-# wayland bdepend for wayland-scanner, xorg-server for cvt utility
-BDEPEND="
-	dev-libs/wayland
-	>=dev-util/meson-0.50.0
-	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-base/xorg-server )
-"
-
-PATCHES=(
-	"${FILESDIR}"/3.34.6-tests-dontreq-gdkwayland.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)
-		-Degl_device=false # This should be dependent on wayland,video_drivers_nvidia, once eglstream support is there
-		-Dwayland_eglstream=false # requires packages egl-wayland for wayland-eglstream-protocols.pc
-		$(meson_use udev)
-		$(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
-		$(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
-	)
-	meson_src_configure
-}
-
-src_test() {
-	glib-compile-schemas "${BUILD_DIR}"/data
-	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/x11-wm/mutter/mutter-40.1-r2.ebuild b/x11-wm/mutter/mutter-40.1-r2.ebuild
deleted file mode 100644
index 3373ba421a31..000000000000
--- a/x11-wm/mutter/mutter-40.1-r2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson udev virtualx xdg
-
-DESCRIPTION="GNOME compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-
-LICENSE="GPL-2+"
-SLOT="0/8" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
-
-IUSE="elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland"
-# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
-REQUIRED_USE="
-	wayland? ( ^^ ( elogind systemd ) udev )
-	test? ( wayland )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-
-# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
-# xorg-server is needed at build and runtime with USE=wayland for Xwayland
-# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
-DEPEND="
-	>=x11-libs/libX11-1.7.0
-	>=media-libs/graphene-1.10.2[introspection?]
-	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.46[introspection?]
-	>=dev-libs/fribidi-1.0.0
-	>=x11-libs/cairo-1.14[X]
-	>=gnome-base/gsettings-desktop-schemas-40.0[introspection?]
-	>=dev-libs/glib-2.67.3:2
-	gnome-base/gnome-settings-daemon
-	>=dev-libs/json-glib-0.12.0[introspection?]
-	gnome-base/gnome-desktop:3=
-	>=x11-libs/libXcomposite-0.4
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	>=x11-libs/libXfixes-3
-	>=x11-libs/libXi-1.7.4
-	x11-libs/libXtst
-	x11-libs/libxkbfile
-	x11-misc/xkeyboard-config
-	>=x11-libs/libxkbcommon-0.4.3[X]
-	x11-libs/libXrender
-	>=x11-libs/libXrandr-1.5.0
-	x11-libs/libxcb
-	x11-libs/libXinerama
-	x11-libs/libXau
-	x11-libs/libICE
-	>=dev-libs/atk-2.5.3[introspection?]
-	>=media-libs/libcanberra-0.26
-	sys-apps/dbus
-	media-libs/mesa[X(+),egl]
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	wayland? (
-		>=dev-libs/wayland-protocols-1.19
-		>=dev-libs/wayland-1.18.0
-		x11-libs/libdrm:=
-		>=media-libs/mesa-17.3[egl,gbm,wayland,gles2]
-		>=dev-libs/libinput-1.15.0
-		systemd? ( sys-apps/systemd )
-		elogind? ( sys-auth/elogind )
-		x11-base/xorg-server[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, xorg-server for cvt utility
-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-base/xorg-server )
-"
-
-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)
-		-Degl_device=false # This should be dependent on wayland,video_drivers_nvidia, once eglstream support is there
-		-Dwayland_eglstream=false # requires packages egl-wayland for wayland-eglstream-protocols.pc
-		$(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
-	)
-	meson_src_configure
-}
-
-src_test() {
-	glib-compile-schemas "${BUILD_DIR}"/data
-	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/x11-wm/mutter/mutter-40.1-r4.ebuild b/x11-wm/mutter/mutter-40.1-r4.ebuild
deleted file mode 100644
index 8b6349daebf3..000000000000
--- a/x11-wm/mutter/mutter-40.1-r4.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson udev virtualx xdg
-
-DESCRIPTION="GNOME compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-r1-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"
-# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
-REQUIRED_USE="
-	wayland? ( ^^ ( elogind systemd ) udev )
-	test? ( wayland )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-
-# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
-# xorg-server is needed at build and runtime with USE=wayland for Xwayland
-# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
-DEPEND="
-	>=x11-libs/libX11-1.7.0
-	>=media-libs/graphene-1.10.2[introspection?]
-	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.46[introspection?]
-	>=dev-libs/fribidi-1.0.0
-	>=x11-libs/cairo-1.14[X]
-	>=gnome-base/gsettings-desktop-schemas-40.0[introspection?]
-	>=dev-libs/glib-2.67.3:2
-	gnome-base/gnome-settings-daemon
-	>=dev-libs/json-glib-0.12.0[introspection?]
-	gnome-base/gnome-desktop:3=
-	>=x11-libs/libXcomposite-0.4
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	>=x11-libs/libXfixes-3
-	>=x11-libs/libXi-1.7.4
-	x11-libs/libXtst
-	x11-libs/libxkbfile
-	x11-misc/xkeyboard-config
-	>=x11-libs/libxkbcommon-0.4.3[X]
-	x11-libs/libXrender
-	>=x11-libs/libXrandr-1.5.0
-	x11-libs/libxcb
-	x11-libs/libXinerama
-	x11-libs/libXau
-	x11-libs/libICE
-	>=dev-libs/atk-2.5.3[introspection?]
-	>=media-libs/libcanberra-0.26
-	sys-apps/dbus
-	media-libs/mesa[X(+),egl]
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	wayland? (
-		>=dev-libs/wayland-protocols-1.19
-		>=dev-libs/wayland-1.18.0
-		x11-libs/libdrm:=
-		>=media-libs/mesa-17.3[egl,gbm,wayland,gles2]
-		>=dev-libs/libinput-1.15.0
-		systemd? ( sys-apps/systemd )
-		elogind? ( sys-auth/elogind )
-		x11-base/xorg-server[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, xorg-server for cvt utility
-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-base/xorg-server )
-"
-
-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)
-		-Degl_device=false # This should be dependent on wayland,video_drivers_nvidia, once eglstream support is there
-		-Dwayland_eglstream=false # requires packages egl-wayland for wayland-eglstream-protocols.pc
-		$(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
-	)
-	meson_src_configure
-}
-
-src_test() {
-	glib-compile-schemas "${BUILD_DIR}"/data
-	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/x11-wm/mutter/mutter-40.2-r1.ebuild b/x11-wm/mutter/mutter-40.2-r1.ebuild
deleted file mode 100644
index 42eb8d088172..000000000000
--- a/x11-wm/mutter/mutter-40.2-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson udev virtualx xdg
-
-DESCRIPTION="GNOME compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-
-LICENSE="GPL-2+"
-SLOT="0/8" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
-
-IUSE="elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland"
-# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
-REQUIRED_USE="
-	wayland? ( ^^ ( elogind systemd ) udev )
-	test? ( wayland )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
-# xorg-server is needed at build and runtime with USE=wayland for Xwayland
-# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
-DEPEND="
-	>=x11-libs/libX11-1.7.0
-	>=media-libs/graphene-1.10.2[introspection?]
-	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.46[introspection?]
-	>=dev-libs/fribidi-1.0.0
-	>=x11-libs/cairo-1.14[X]
-	>=gnome-base/gsettings-desktop-schemas-40.0[introspection?]
-	>=dev-libs/glib-2.67.3:2
-	gnome-base/gnome-settings-daemon
-	>=dev-libs/json-glib-0.12.0[introspection?]
-	gnome-base/gnome-desktop:3=
-	>=x11-libs/libXcomposite-0.4
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	>=x11-libs/libXfixes-3
-	>=x11-libs/libXi-1.7.4
-	x11-libs/libXtst
-	x11-libs/libxkbfile
-	x11-misc/xkeyboard-config
-	>=x11-libs/libxkbcommon-0.4.3[X]
-	x11-libs/libXrender
-	>=x11-libs/libXrandr-1.5.0
-	x11-libs/libxcb
-	x11-libs/libXinerama
-	x11-libs/libXau
-	x11-libs/libICE
-	>=dev-libs/atk-2.5.3[introspection?]
-	>=media-libs/libcanberra-0.26
-	sys-apps/dbus
-	media-libs/mesa[X(+),egl]
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	wayland? (
-		>=dev-libs/wayland-protocols-1.19
-		>=dev-libs/wayland-1.18.0
-		x11-libs/libdrm:=
-		>=media-libs/mesa-17.3[egl,gbm,wayland,gles2]
-		>=dev-libs/libinput-1.15.0
-		systemd? ( sys-apps/systemd )
-		elogind? ( sys-auth/elogind )
-		x11-base/xorg-server[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, xorg-server for cvt utility
-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-base/xorg-server )
-"
-
-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)
-		-Degl_device=false # This should be dependent on wayland,video_drivers_nvidia, once eglstream support is there
-		-Dwayland_eglstream=false # requires packages egl-wayland for wayland-eglstream-protocols.pc
-		$(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
-	)
-	meson_src_configure
-}
-
-src_test() {
-	glib-compile-schemas "${BUILD_DIR}"/data
-	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/x11-wm/mutter/mutter-40.3.ebuild b/x11-wm/mutter/mutter-40.3-r1.ebuild
index 0e7403318d26..9a16e952ec04 100644
--- a/x11-wm/mutter/mutter-40.3.ebuild
+++ b/x11-wm/mutter/mutter-40.3-r1.ebuild
@@ -64,7 +64,7 @@ DEPEND="
 		>=dev-libs/libinput-1.15.0
 		systemd? ( sys-apps/systemd )
 		elogind? ( sys-auth/elogind )
-		x11-base/xorg-server[wayland]
+		x11-base/xwayland
 		video_cards_nvidia? ( gui-libs/egl-wayland )
 	)
 	udev? ( >=dev-libs/libgudev-232:=