gentoo resync : 22.12.2021

7 files changed, 9 insertions, 342 deletions

diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 23b00ec6d1a9..21e11a75cf79 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,15 +1,11 @@
 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
 DIST mutter-41.1.tar.xz 2712924 BLAKE2B 1b25f4a45be258f84ea29ccc85f4b70f228af9e2c6278edf0f2689436b33d320ae08b63f02736b59269ad9f4ac129d381a9c04e9118c58b6bb6f98512d744063 SHA512 797f857a6cc053e3639a002bc35f8431ed55bd887189f74f7b183bf9e54319dd66910c9d165826effffb9bec05ec7454ce21e4d0a78cb1a9d841c1eb37865d4e
-EBUILD mutter-40.3-r3.ebuild 4791 BLAKE2B 78646582f95f5daea53fae26bdc651a7dad50dd7b5c30e156d903e657829903dbfb610856438fab8c8ce44e2889dfaaba0b261cc2fd72552d48f3fd9179b4535 SHA512 0092f2d8749360aaf95e8909b983ad6166e0bfb2403929fef41752a8ba2e50c36f0db546aaf5130e10bf458f9f9647693c2da233603d6db2f412f16737313981
-EBUILD mutter-40.4-r2.ebuild 4914 BLAKE2B 58180ea1a5bbc1c80e6e8dd0a07b213e0957cd7a3adbb2e4dc2a993b65820ba1913d547149078d4476f4ef48ac84c634ace5a19e33263cfcc5b5bc32d24e8c62 SHA512 8e4af04018cfd5c5c9b8812e321f106283dd1f0e11ac6b8bb3d7c851dd7597bd484f7d0d43ee895f7386fbc919ee61b1b89845632242c3117280ef03f04b6b14
-EBUILD mutter-40.5-r4.ebuild 4917 BLAKE2B dea558513e0eafb2fd1922e906f699df51fed248cb954cac9875c08c191d56975ea658cb74841ccbffaf5a404d9538540e3e21fb6b45774f340f3a111d6163fd SHA512 a82984fdf4b8ccdce35969f06de3f92b10e482dbe19f3a58e191a2d8fc4e7bd9f4dc54d5cdaa354076521bd01480e9b5f533e74375f35f225b4bba55389081a2
-EBUILD mutter-40.5-r5.ebuild 5015 BLAKE2B 240b7c3fe68be9bb60a4075e5e3926d1cc7e1f84ee5b5b6f3423d42e3ae8575e15ad289fdd0de93015f05695655e8d57d1be83d25c767551c45bad85b29766a3 SHA512 f3f154081b8dd167c4436d2c52feaad5bbbc8843675fe70a6315532c2e230380d4b8d53ccb42c744087152f9d0df1fa82815d1a18a13a4a939bb36569e064c41
-EBUILD mutter-41.0-r3.ebuild 5077 BLAKE2B 340c1a67be8e0a300e1986727ece6595f0b9d3db269d7c95c7432aafbe556ba4daa66170e01a1c14900bf0ade588d27e285e2325f5421e53eee2d03f7a08398c SHA512 a37436aff8e8a6cf6fc910edbbd4055602ae85eaba3e981460da370458ab7356c657548ae60aa3f4b38d99e8ae0472cb903ad53cbbf75219876def9cd6c72100
-EBUILD mutter-41.1.ebuild 4979 BLAKE2B 7799f5a03f9e2966237b494ac899f5682f01c59b1b9a4b94360e91a00725dc18f96007c0d289b65bbef0e9f90d5c66e5a9aa1f2f717ea13003556cc8a9db384b SHA512 3a79d929613208dc6df8faf48d01a157c27f4ae572edaf3f3786cbddcb6d861e8c5b97f361f4dae902efa03b7f3fa8991d65db96cd607fe2ffc3c671ff8a9a3e
+DIST mutter-41.2.tar.xz 2713924 BLAKE2B 271b5cd3eebf3b3c040876dc634d5316788ee566fece2ded6987e048d03ea8b4b4c76b482ca91e1eaf5cdcdf36294948b2ab902013874f100247dfb5b04a4cbb SHA512 9fd030e2c3e5956e4e7412ac36069ab0e81798688b0a4f2372d935f81190ae8fb383919b2c29b8af37e5eeea47d250647ce8466d7f2e9047edf60e1ca93a9e3c
+EBUILD mutter-40.4-r3.ebuild 4910 BLAKE2B d509e7c6afc917844f1b917e8d065266fb1ffee6ee6edbb8b9c4998eb6b17e6fe4559f83b6d7fa9a0842f06ca060f25140523eb0eface392478ef2c794a0eb60 SHA512 13c5de3dd4cd4bb92a23dca2b8b52973f03c3001e8b86d390c6a61d313f88d8367fb4954f81ce525656eeb4382e8d01721d83ad3383824cc057fde66de3655a5
+EBUILD mutter-40.5-r6.ebuild 5011 BLAKE2B bfae9c5e5bb26f03f5ccf0bdf8a83662f8e38af61db302a394b4fe8c4f6e40527ad7708916d72b783794055ba6e7f86f9fb880990c541e43d9569a0c375bf290 SHA512 9b5c7540852636aa927279611ba256f40790adb2a41d558af3015758d02354fbd5ee7297b72d0bbae07ac5687c0b9d77905ab13df4752601d2ea1114dc31c5f4
+EBUILD mutter-41.1-r1.ebuild 4975 BLAKE2B 6426a03d413f77306d22d2702a2e9d30d9dba481d25a896566576bd6e0683dfc9f9a9d1f19bb5f0231fac4b265663d6592d1c55f9447ab98db8ab01ec1ad64b2 SHA512 63cbda626bfb9debebeed8c08eb958826c710ecacfb4d64703fe6b2e8013ebb273b43fec2d021fb8f9f3d91ce93318d5e4f30773848d4a4557729ee42b4fcfc7
+EBUILD mutter-41.2-r1.ebuild 4975 BLAKE2B 6426a03d413f77306d22d2702a2e9d30d9dba481d25a896566576bd6e0683dfc9f9a9d1f19bb5f0231fac4b265663d6592d1c55f9447ab98db8ab01ec1ad64b2 SHA512 63cbda626bfb9debebeed8c08eb958826c710ecacfb4d64703fe6b2e8013ebb273b43fec2d021fb8f9f3d91ce93318d5e4f30773848d4a4557729ee42b4fcfc7
 MISC metadata.xml 606 BLAKE2B 54a05fee61cf9a1d958a46e0cc94e1cd61e69e187f89393c483c7022d455b7248684df4f1df028f0733995dacfbdf1faab600d8c239885eb0c7ea3097326f156 SHA512 6dea733bb5da3bd2db059a467cec81f7cfc0765750cdcfa0404a72cbb168495f13d01051198206178615b1a3fa41f78dffd9f0a38f6d7579116e782d76fab899
diff --git a/x11-wm/mutter/mutter-40.3-r3.ebuild b/x11-wm/mutter/mutter-40.3-r3.ebuild
deleted file mode 100644
index aa5fa3a39ec8..000000000000
--- a/x11-wm/mutter/mutter-40.3-r3.ebuild
+++ /dev/null
@@ -1,163 +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 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 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
-	)
-"
-
-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() {
-	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.4-r2.ebuild b/x11-wm/mutter/mutter-40.4-r3.ebuild
index 1d2f1214d2f2..94dd02db647d 100644
--- a/x11-wm/mutter/mutter-40.4-r2.ebuild
+++ b/x11-wm/mutter/mutter-40.4-r3.ebuild
@@ -72,7 +72,7 @@ DEPEND="
 	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 )
+	screencast? ( >=media-video/pipewire-0.3.21:= )
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
 RDEPEND="${DEPEND}
diff --git a/x11-wm/mutter/mutter-40.5-r4.ebuild b/x11-wm/mutter/mutter-40.5-r4.ebuild
deleted file mode 100644
index 4d648da9d7b2..000000000000
--- a/x11-wm/mutter/mutter-40.5-r4.ebuild
+++ /dev/null
@@ -1,164 +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 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
-	)
-"
-
-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-40.5-r5.ebuild b/x11-wm/mutter/mutter-40.5-r6.ebuild
index ff038d790780..68ed88cbb8c5 100644
--- a/x11-wm/mutter/mutter-40.5-r5.ebuild
+++ b/x11-wm/mutter/mutter-40.5-r6.ebuild
@@ -73,7 +73,7 @@ DEPEND="
 	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 )
+	screencast? ( >=media-video/pipewire-0.3.21:= )
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
 RDEPEND="${DEPEND}
diff --git a/x11-wm/mutter/mutter-41.1.ebuild b/x11-wm/mutter/mutter-41.1-r1.ebuild
index 61469e32b533..b05673366a97 100644
--- a/x11-wm/mutter/mutter-41.1.ebuild
+++ b/x11-wm/mutter/mutter-41.1-r1.ebuild
@@ -72,7 +72,7 @@ DEPEND="
 	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 )
+	screencast? ( >=media-video/pipewire-0.3.21:= )
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
 RDEPEND="${DEPEND}
diff --git a/x11-wm/mutter/mutter-41.0-r3.ebuild b/x11-wm/mutter/mutter-41.2-r1.ebuild
index 7eff393ac61b..b05673366a97 100644
--- a/x11-wm/mutter/mutter-41.0-r3.ebuild
+++ b/x11-wm/mutter/mutter-41.2-r1.ebuild
@@ -6,7 +6,6 @@ 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/${P}-r1-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
@@ -73,7 +72,7 @@ DEPEND="
 	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 )
+	screencast? ( >=media-video/pipewire-0.3.21:= )
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
 RDEPEND="${DEPEND}
@@ -101,7 +100,6 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${WORKDIR}"/patches/
 	"${FILESDIR}"/${PN}-40.0-Disable-anonymous-file-test.patch
 )