gentoo resync : 14.05.2020

7 files changed, 3 insertions, 424 deletions

diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 5cb949c21abd..ac673277a42b 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,15 +1,6 @@
-AUX 3.26.2-non-wayland-build.patch 1035 BLAKE2B 7c9beb268c2f1b5784bbb2b44d8199f9821462c0be7678b69c9feb05171f46a2ccf96c18e8ed45b32c7ce576a7693839d03a90b4beb787f5291e7853b28b514c SHA512 88bda28953ba08bb6cf7847de49356d7896d554169d0039b599963eb333a0c688b49dc9d55c8b8e497b15d54ad3bed495bf18ded00d09d6510bb399d20750ca0
 AUX 3.32-eglmesaext-include.patch 2078 BLAKE2B cea9ba1a8d2749eb3590dd17a598aace69ad96897cbc5a6c1061c4041a8fe3809ff9f5bcc99cbdc33611a3a3319cda20f74f88434e71f03f2a1cac108185f3fb SHA512 23296f0e0b6ffd4610be3f0c6e1d524d15a5d259c5607a7ded4a8c39846f555dee92e5a8bb9c766211b758f8bc7483715a9640718bb9b7daa42905d802b2ee71
-AUX 3.32.2-no-cogl-gles2.patch 2350 BLAKE2B 3d78e408009fe7486542127162b3ea580ccc070bf46addb5799b3bcecd435d364bdf942ebfd463360be0c9105c51dcd8cb86aeae0d5599fc50f8d322376add56 SHA512 0210fdd7c5a716788918987a2e61ef765a5ae0c6268a05cfbb75ce5b469336109c4677696cab94ec12006ac4abc616222ddb62a719c2e5cac59d4833b0794beb
-DIST mutter-3.26.2-patchset.tar.xz 48156 BLAKE2B 7b33495a8bb7ac69f5610e1dfcb1fef49a983403fd176b229a75bcc7691e83e76a3dd87b7663ece0fcdc4077becd3ffa5e33217584f156456813769646730bf9 SHA512 2eeb9dfe137d6ea65f957ed19aa5ef83106aa16a049531c0c41d3ab6afac6c1b345cc68f2a9a9c41658172cc0dde61b946e6bf2507979ff4155e79770adf5e90
-DIST mutter-3.26.2.tar.xz 3622904 BLAKE2B b32af24c6ffcd0e6af38ab1ff7cd0ba16ea3ceb84c62ed21d9e38fff5357eda2648050beada3fc8727474407a419a2c218331c8a87f7eb68eddf824d26ca9c51 SHA512 95885b4c053d4bc467a7c11615ee3d1a3086a674ae10e7cb9bb241f692e66dd8190508db1cdf1760bc2f19100e532e68d5e147d344e94d1430d80dd26ca0156b
-DIST mutter-3.32.2-patchset.tar.xz 26872 BLAKE2B 026c87cc3859624bcfd273694a8a34661d97cc77776e3df5f6f5de16b8758fc435773b1c96172b867fe0d9bea421c56986db2e7263c6ec3482171cc2adf06295 SHA512 e318fcfa4ee7850814cdfb5fbcc118a92fa3df524a78b24a440346be6a6c7cb975f90218a2d4feeacd222f2daf56c4cff4195c83e3ed74726dc1da63d38a93c5
-DIST mutter-3.32.2.tar.xz 2797664 BLAKE2B 8b69436778d9c3e10b0373c83e1f306cb2718e49ad1f351f2e3a1ef92caeb1eb7a391be07c60578cfb2601eea5dc3949b1d8305e9f079b2b00d43ff305409f00 SHA512 e4494d028ae71441fbdc584bd8acd9c2559d52ac72402bad9a7cb43f4f519487d11df6453172fd27a9df7f2cade020d6317931613bd0be343c66170e6cda0269
-DIST mutter-3.34.4-patchset.tar.xz 7216 BLAKE2B 6a9d503a8da80a9255649150c1256ea0d1459b11c0803728553f6699f0bb54b56161a411e9dec3725e5cd4230531c90b0160ef702083285443849c9ec4ca8278 SHA512 b592a6ded20c61c15fe8dc5a69fb73e81143975632237a32329bbf40239bdc2c392aef4676cd8800f7ad39eb16e8f159b0cec87c8bd035302db0a8001ddeda2e
-DIST mutter-3.34.4.tar.xz 2791624 BLAKE2B cd7ea49333dc50574f993f15638504eac0d0a6f1e85f34a617accbabcec71f02244ce6cd292c968def302652707e21692d94dcccb01d59b3661220c90cefd802 SHA512 6cae8473071d9ab105a3635cee314157a268894fc3b18e53857e097223a9c2677e1cd51b10b501a3b85f74c83470c2ce87986972218f9833c9f6ad31b1910f6a
 DIST mutter-3.34.5.tar.xz 2804640 BLAKE2B b73a34f4e064b74b321b7ac54749170663c10874a82c0e4f6b20b1f9d97662af0ba188e5ac13a187117765b8aee820fc7367dfbeecc26002942151e77433012c SHA512 4199cf66e6551ebf80b9d2217e3164b1de30b055c58a64bc2d88961aad3a35c137174f6aea96f0250fa3efb2bf4676aa409fefb1a9237bbc7acf438aeed2e78a
-EBUILD mutter-3.26.2-r1.ebuild 4109 BLAKE2B a4073e48c06b2185bf37a22c509c1959c0855cb838151d91d9b697e4679bc7ec9438b92eaa6499ecfa0f6e389415254b64621d24efa6df9c0abc1a8711ec7c14 SHA512 05266bd54e4bc87fc0bab475354dae4670da1c1d64a6db7cfae3dace6069b78515c5a904d6542cfc471f5cc056b2204dbf95cdabbdf5d49e7854b0c98d8e3592
-EBUILD mutter-3.32.2.ebuild 4619 BLAKE2B 09a4dca8c10a02d8aa1b211ba2c453b60f75c2e307c5d261bd9ab9ad028ef7337ea83c66f6425eaf9d64415732498f781cef066b888ede050a3b42801b523fd3 SHA512 fc14e72a1e2ae68997c0c9f55265d1ebef27f4b016830e5d3902e004270eace97229f09657406e29475544d98471364485f365b5bd5abada0f12bbef388dbe04
-EBUILD mutter-3.34.4.ebuild 4721 BLAKE2B 50eef6d2ec032e2a3d1079bf08d786920643e3eee7fc4ccbf0baa6f901ea3923f9fd8e351453e02cb0378ddcc72836346dda79276d19f195a3c635d0cb65a459 SHA512 ed1cb27b361d6203d2dfe2aedc7ce3867a2bb529513e0fbd5ed51f8e0197f1a0054f60e2ad9ac565f65ca05dcc463902ac4a5700756b46d9eede8630177cb281
+DIST mutter-3.34.6.tar.xz 2805328 BLAKE2B bba0e062ab81f8e88e7e59b6dbf51226b6e2d43932c7d61aca5a3e709119f909e30acea67a5444c95205ddf929a1f5bf7785eec7aed4f2da743c19543aa79962 SHA512 dd240fdcfc8ba0c62c0ff423a40ec6e0007d154f0be39e18cea543da7ff548e10a9b712f9b2cc09c58ad342b1e7eb50fb2a8790c55d284846bb6f1a76f8c6d6b
 EBUILD mutter-3.34.5.ebuild 4566 BLAKE2B a4550c12085dd8dedbe1d3652ab06475adee962d6006ded1506ff491773dacec9c50e1568e851418d2a95dbbcfbc104b50c771b1c2075190eab57c52f4fc473b SHA512 f5c4f35cbce4916d564e15d11a1a420c87cc695d24046d808e499916f01170709a546594e0ab1da2447ab1165d9bce287608644a24486897febe16135d781fda
-MISC metadata.xml 662 BLAKE2B 500aef5ca1856da7a8027c1f69c30639791430cf7e94302de37edca6b8c85aa10f244bb85dcd193c1bab65854652b1999219c35fbe8eab49c33647a3b6a0b486 SHA512 b36d65b3f0bd8bf904cc3270b963d997eebe188ee98425a2cffe9df2e15dc28106baea2d0437972c8c211045200b979cd9fb6a902527efe2f6640380bed15801
+EBUILD mutter-3.34.6.ebuild 4568 BLAKE2B d8cf3267696b61193efbe0189e45bf2c5e96e5d6f44e727c630a19b4b33b6796a23596b51171cb8bdbe40879d05a73f66a1438c828067086e279bc87a01e560c SHA512 b47cc0637b4a59e7a680dace7f3ca95b32c6ef9b903cfffcd34395dca037f88b859ac2905fb97d4ca6e91e4277d035d781cd257d471ccc9b25dfb9d71af15bf6
+MISC metadata.xml 605 BLAKE2B 5dc68fbf8b85c2bf75ea435abe116a9ed7072ec40a45bda28de9cb277a03e5c363487f1c3aa5c60cab5f710e06f15d966790684cac1573676af635e59b3cdfbd SHA512 440e7a33404e218da15c127614d843edcd42c469aced4609c2e7d7d8ec1281c9eceb64aebe406a75e9ba0a05b6be18bbb721257e140f6d334aff6143b1233fb8
diff --git a/x11-wm/mutter/files/3.26.2-non-wayland-build.patch b/x11-wm/mutter/files/3.26.2-non-wayland-build.patch
deleted file mode 100644
index a2a8d356e07e..000000000000
--- a/x11-wm/mutter/files/3.26.2-non-wayland-build.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 6cc48d8cbbf11fa82ec78cac0b29d52f05eabb60 Mon Sep 17 00:00:00 2001
-From: Ting-Wei Lan <lantw@src.gnome.org>
-Date: Sun, 24 Dec 2017 17:55:14 +0800
-Subject: [PATCH] build: Fix non-wayland builds
-
-meta_dnd_wayland_handle_end_modal is not available on non-wayland build.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=791916
----
- src/compositor/compositor.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
-index 51d22bc17..aa49347c9 100644
---- a/src/compositor/compositor.c
-+++ b/src/compositor/compositor.c
-@@ -419,11 +419,13 @@ meta_end_modal_for_plugin (MetaCompositor *compositor,
-   meta_backend_ungrab_device (backend, META_VIRTUAL_CORE_POINTER_ID, timestamp);
-   meta_backend_ungrab_device (backend, META_VIRTUAL_CORE_KEYBOARD_ID, timestamp);
- 
-+#ifdef HAVE_WAYLAND
-   if (meta_is_wayland_compositor ())
-     {
-       meta_dnd_wayland_handle_end_modal (compositor);
-       meta_display_sync_wayland_input_focus (display);
-     }
-+#endif
- }
- 
- static void
--- 
-2.18.0
-
diff --git a/x11-wm/mutter/files/3.32.2-no-cogl-gles2.patch b/x11-wm/mutter/files/3.32.2-no-cogl-gles2.patch
deleted file mode 100644
index 41c3e94d8602..000000000000
--- a/x11-wm/mutter/files/3.32.2-no-cogl-gles2.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From a00bd286724b3186c17d70f1b2fe98da2d90bf60 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 1 Sep 2019 14:42:04 +0300
-Subject: [PATCH] build: Allow building native backend without cogl-gles2
-
-Native backend already requires gles2, but was controlled by gles2
-meson option, even though it's hard required with native_backend
-already, and errored out if gles2 wasn't enabled too.
-Instead allow native_backend to be built without cogl-gles2 by simply
-checking for the gles2 hard requirement in case of have_native_backend
-too and not erroring out without -Dgles2=true, which is now used only
-for controlling cogl-gles2 build.
----
- meson.build     | 10 +++-------
- src/meson.build |  4 ++--
- 2 files changed, 5 insertions(+), 9 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 6160a4bb3..c85284ba2 100644
---- a/meson.build
-+++ b/meson.build
-@@ -150,12 +150,13 @@ endif
- have_egl_xlib = have_egl and have_x11
- 
- have_gles2 = get_option('gles2')
--if have_gles2
-+have_native_backend = get_option('native_backend')
-+if have_gles2 or have_native_backend
-   gles2_dep = dependency('glesv2')
-   gles2_libname = get_option('gles2_libname')
- 
-   if not have_egl
--    error('GLESv2 support requires EGL to be enabled')
-+    error('GLESv2 and native backend support requires EGL to be enabled')
-   endif
- endif
- 
-@@ -177,7 +178,6 @@ if have_libgudev
-   gudev_dep = dependency('gudev-1.0', version: gudev_req)
- endif
- 
--have_native_backend = get_option('native_backend')
- if have_native_backend
-   libdrm_dep = dependency('libdrm')
-   libgbm_dep = dependency('gbm', version: gbm_req)
-@@ -194,10 +194,6 @@ if have_native_backend
-     error('The native backend requires EGL to be enabled')
-   endif
- 
--  if not have_gles2
--    error('The native backend requires GLESv2 to be enabled')
--  endif
--
-   if not have_libgudev
-     error('The native backend requires udev to be enabled')
-   endif
-diff --git a/src/meson.build b/src/meson.build
-index 182f7f5f5..af9776480 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -36,7 +36,7 @@ if have_gl
-   ]
- endif
- 
--if have_gles2
-+if have_native_backend
-   mutter_pkg_private_deps += [
-     gles2_dep,
-   ]
-@@ -436,7 +436,7 @@ if have_egl
-   ]
- endif
- 
--if have_gles2
-+if have_native_backend
-   mutter_sources += [
-     'backends/meta-gles3.c',
-     'backends/meta-gles3.h',
--- 
-2.20.1
-
diff --git a/x11-wm/mutter/metadata.xml b/x11-wm/mutter/metadata.xml
index 9bd58e53b934..10c80726fde4 100644
--- a/x11-wm/mutter/metadata.xml
+++ b/x11-wm/mutter/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="elogind">Rely on <pkg>sys-auth/elogind</pkg> as logind provider for Wayland sessions</flag>
-		<flag name="gles2">Enable OpenGL ES 2.0 support</flag>
 		<flag name="screencast">Enable support for remote desktop and screen cast using <pkg>media-video/pipewire</pkg></flag>
 		<flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag>
 	</use>
diff --git a/x11-wm/mutter/mutter-3.26.2-r1.ebuild b/x11-wm/mutter/mutter-3.26.2-r1.ebuild
deleted file mode 100644
index 412f34a9e30f..000000000000
--- a/x11-wm/mutter/mutter-3.26.2-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-inherit gnome2 virtualx
-
-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/1" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
-
-IUSE="debug gles2 input_devices_wacom +introspection test udev wayland"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# libXi-1.7.4 or newer needed per:
-# https://bugzilla.gnome.org/show_bug.cgi?id=738944
-RDEPEND="
-	>=dev-libs/atk-2.5.3
-	>=x11-libs/gdk-pixbuf-2:2
-	>=dev-libs/json-glib-0.12.0
-	>=x11-libs/pango-1.30[introspection?]
-	>=x11-libs/cairo-1.14[X]
-	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
-	>=dev-libs/glib-2.53.2:2
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/startup-notification-0.7
-	>=x11-libs/libXcomposite-0.2
-	>=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?]
-	<gnome-base/gsettings-desktop-schemas-3.31
-	gnome-base/gnome-desktop:3=
-	>sys-power/upower-0.99:=
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	>=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/libXinerama
-	>=x11-libs/libXrandr-1.5
-	x11-libs/libXrender
-	x11-libs/libxcb
-	x11-libs/libxkbfile
-	>=x11-libs/libxkbcommon-0.4.3[X]
-	x11-misc/xkeyboard-config
-
-	gnome-extra/zenity
-	media-libs/mesa[egl]
-
-	gles2? ( media-libs/mesa[gles2] )
-	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
-	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-	udev? ( >=dev-libs/libgudev-232:= )
-	wayland? (
-		>=dev-libs/libgudev-232:=
-		>=dev-libs/libinput-1.4
-		>=dev-libs/wayland-1.13.0
-		>=dev-libs/wayland-protocols-1.9
-		>=media-libs/mesa-10.3[egl,gbm,wayland]
-		sys-apps/systemd
-		>=virtual/libudev-136:=
-		x11-base/xorg-server[wayland]
-		x11-libs/libdrm:=
-	)
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	wayland? ( >=sys-kernel/linux-headers-4.4 )
-"
-
-PATCHES=(
-	# Lots of patches from gnome-3-26 branch on top of 3.26.2
-	"${WORKDIR}"/patches/
-
-	# Fix non-wayland builds, bug #667244
-	"${FILESDIR}"/${PV}-non-wayland-build.patch
-)
-
-src_prepare() {
-	# Disable building of noinst_PROGRAM for tests
-	if ! use test; then
-		sed -e '/^noinst_PROGRAMS/d' \
-			-i cogl/tests/conform/Makefile.{am,in} || die
-		sed -e '/noinst_PROGRAMS += testboxes/d' \
-			-i src/Makefile-tests.am || die
-		sed -e '/noinst_PROGRAMS/ s/testboxes$(EXEEXT)//' \
-			-i src/Makefile.in || die
-	fi
-
-	gnome2_src_prepare
-
-	# Leave the damn CFLAGS alone
-	sed -e 's/$CFLAGS -g/$CFLAGS /' \
-		-i clutter/configure || die
-	sed -e 's/$CFLAGS -g -O0/$CFLAGS /' \
-		-i cogl/configure || die
-	sed -e 's/$CFLAGS -g -O/$CFLAGS /' \
-		-i configure || die
-}
-
-src_configure() {
-	# TODO: pipewire remote desktop support; --disable-remote-desktop actually enables it due to upstream autotools bug in 3.26.2 (omitted means disabled)
-	# TODO: nvidia EGLDevice support
-	# Prefer gl driver by default
-	# GLX is forced by mutter but optional in clutter
-	# xlib-egl-platform required by mutter x11 backend
-	# native backend without wayland is useless
-	gnome2_src_configure \
-		--disable-static \
-		--enable-compile-warnings=minimum \
-		--enable-gl \
-		--enable-glx \
-		--enable-sm \
-		--enable-startup-notification \
-		--enable-verbose-mode \
-		--enable-xlib-egl-platform \
-		--with-default-driver=gl \
-		--with-libcanberra \
-		$(usex debug --enable-debug=yes "") \
-		$(use_enable gles2)        \
-		$(use_enable gles2 cogl-gles2) \
-		$(use_enable introspection) \
-		$(use_enable wayland) \
-		$(use_enable wayland kms-egl-platform) \
-		$(use_enable wayland native-backend) \
-		$(use_enable wayland wayland-egl-server) \
-		$(use_with input_devices_wacom libwacom) \
-		$(use_with udev gudev)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/x11-wm/mutter/mutter-3.32.2.ebuild b/x11-wm/mutter/mutter-3.32.2.ebuild
deleted file mode 100644
index 38ea482c947d..000000000000
--- a/x11-wm/mutter/mutter-3.32.2.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 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/${PF}-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/4" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
-
-IUSE="elogind gles2 input_devices_wacom +introspection screencast 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"
-
-# libXi-1.7.4 or newer needed per:
-# https://bugzilla.gnome.org/show_bug.cgi?id=738944 - https://gitlab.gnome.org/GNOME/mutter/merge_requests/766
-
-# 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
-	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.30[introspection?]
-	>=x11-libs/cairo-1.14[X]
-	>=gnome-base/gsettings-desktop-schemas-3.31.0[introspection?]
-	>=dev-libs/glib-2.53.2: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/libICE
-	>=dev-libs/atk-2.5.3[introspection?]
-	>=media-libs/libcanberra-0.26
-	media-libs/mesa[X(+),egl,gles2?]
-	wayland? (
-		>=dev-libs/wayland-protocols-1.16
-		>=dev-libs/wayland-1.13.0
-		x11-libs/libdrm:=
-		>=media-libs/mesa-10.3[egl,gbm,wayland,gles2]
-		>=dev-libs/libinput-1.4
-		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.2.2:0/0.2 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	gnome-extra/zenity
-"
-DEPEND="${DEPEND}
-	x11-base/xorg-proto
-"
-# 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=(
-	# Some patches from gnome-3-32 branch on top of 3.32.2
-	"${WORKDIR}"/patches/
-	# Allow building USE=wayland without cogl-gles2 from USE=gles2
-	"${FILESDIR}"/${PV}-no-cogl-gles2.patch
-
-	"${FILESDIR}"/3.32-eglmesaext-include.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 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 test clutter_tests)
-		$(meson_use test tests)
-		-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() {
-	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-3.34.4.ebuild b/x11-wm/mutter/mutter-3.34.6.ebuild
index edd7e4a06986..4703c77a3b87 100644
--- a/x11-wm/mutter/mutter-3.34.4.ebuild
+++ b/x11-wm/mutter/mutter-3.34.6.ebuild
@@ -6,7 +6,6 @@ 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/${PF}-patchset.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0/5" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
@@ -93,9 +92,6 @@ BDEPEND="
 "
 
 PATCHES=(
-	# Some patches from gnome-3-34 branch on top of 3.34.4
-	"${WORKDIR}"/patches/
-
 	"${FILESDIR}"/3.32-eglmesaext-include.patch
 )