gnome-base/gnome-shell: 3.2.0 → 3.2.1

Bump with numerous fixes and improvements. Patches were applied
upstream. Update mutter dependency.

Also, drop gnome-shell-3.1.4 since it is compatible neither with
gnome-3.0 nor with 3.2, and since gnome-shell-extensions-3.2 have been
released.

8 files changed, 6 insertions, 403 deletions

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 3d7cc0c4..99dfc286 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,9 +1,3 @@
-AUX gnome-shell-3.1.4-gi-1.29.17.patch 2636 RMD160 4f50ca3ae693726c6e6c532801e89c78e9e5a965 SHA1 6275d4d5c6d79c6d874c8d65e54bfbb2318fe552 SHA256 7eb4eec292c53eef3fad38d8a538bc267e322bd3bece66552d4173d31b3d0049
-AUX gnome-shell-3.2.0-boxpointer-multimonitor.patch 3550 RMD160 a8c539ff0a52555ce2d5e2d47ff7e29b1f46587c SHA1 0d4600c376be15d4740762f9b63fb82c7f93224b SHA256 154a579ba098bec11f30c2f4fdbe40b9820ee439d3c436f01072e3b646f5d380
-AUX gnome-shell-3.2.0-recorder-coglhandle.patch 1288 RMD160 77b8339770196b7aee41530832c0d4575c440c3f SHA1 8ab3774b0b99ba5768e7b106f34f04555d4fb6c3 SHA256 ac944780ac2817150e1f2f5e843826e552eafdc56d59327ddee7f0d974aab210
-AUX gnome-shell-3.2.0-st-texture-cache-non-serialized-icons.patch 2055 RMD160 c848086c82e0b06a7d1fa8de246a979392ae009d SHA1 ec2c8e7aeda0025ccd6f7a94cfe11f4e0691870b SHA256 71aca86fbdd98bfc5c2e835ce2e52ffca251921f13a1fdbb318a5b6f86309bf6
-DIST gnome-shell-3.1.4.tar.xz 1002024 RMD160 2dbf1f4c7f41b70dbb9eaa26a2b07f4d4c9b93e9 SHA1 0e3c09c382cfe4f994f76d8ca50ef28ac0a9d52b SHA256 bcb6eed9731233a2c57cd39b608d197445755e77fc431e524e6b7a0ec02dbbee
-DIST gnome-shell-3.2.0.tar.xz 1102896 RMD160 8d95e0ed7f181d5b446e2f088895326bbf6e85fd SHA1 93b11bcafbf0e71a0cf66ebdec80272559489103 SHA256 55f8237f4ca517bcfa02bbf88fbcb9afcdc9b252fb9612b84a65409a1f144324
-EBUILD gnome-shell-3.1.4.ebuild 3933 RMD160 8cbe800241baaf70bef3f8d3cc376aef0ed25928 SHA1 5d3a4c8378bfa760fa16f5b2c6aebd2fc459b190 SHA256 2947ba3e88054603216bf2485bc6ebf4366052b672f9459c4bd05bacae330425
-EBUILD gnome-shell-3.2.0-r1.ebuild 4476 RMD160 34a7ffcf5ec1db10a5d6b6443ce1a7b7d25d3e55 SHA1 017298cf31a492a38223542c9ac53ac8a7647f4f SHA256 52d622420d418f9b096a90bd02a71ef25b4aad1e1eaf073a9cb7b54343da716a
-EBUILD gnome-shell-9999.ebuild 4079 RMD160 3cbf6a6096f1f2add8e5e477b51c7cb64d1a1b58 SHA1 7325b03fc9b781941b3cad8ff12f3f281122a6a2 SHA256 97315050e07a9fd5cccc3bda9a4f876e88b96e993ec3580a95f2a9fdc44b10f0
+DIST gnome-shell-3.2.1.tar.xz 1115744 RMD160 b56647fe0dc322110872ee8853d9253c7b870500 SHA1 62bcebbd7f274c6808212b85ad56d2edf894ecec SHA256 ac05e3133bd279c84812d8d3d8e362f8b33563cdc3e7a6aefa9c0b1c2aeab0eb
+EBUILD gnome-shell-3.2.1.ebuild 4079 RMD160 fdc843dee23e191ffc480bdf54a763e9ef4dadbe SHA1 786b69ec6db5044831f921144cf6dd249fce3f77 SHA256 59fa943478664684648d09d22ebcd52236f290ec9039287856100213278cd27f
+EBUILD gnome-shell-9999.ebuild 4079 RMD160 fdc843dee23e191ffc480bdf54a763e9ef4dadbe SHA1 786b69ec6db5044831f921144cf6dd249fce3f77 SHA256 59fa943478664684648d09d22ebcd52236f290ec9039287856100213278cd27f
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.4-gi-1.29.17.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.4-gi-1.29.17.patch
deleted file mode 100644
index 6aebc44b..00000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.1.4-gi-1.29.17.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 92d0cce50c9baac2a24d840b1db39f2627a02480 Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@gnome.org>
-Date: Tue, 30 Aug 2011 12:07:11 -0400
-Subject: [PATCH] Add some (element-type) annotations to appease g-i master
-
-[Alexandre Rostovtsev <tetromino@gmail.com>: backport to 3.1.4]
----
- src/gvc/gvc-mixer-card.c   |    9 +++++++++
- src/gvc/gvc-mixer-stream.c |    9 +++++++++
- src/shell-app-system.c     |    2 +-
- 3 files changed, 19 insertions(+), 1 deletions(-)
-
-diff --git a/src/gvc/gvc-mixer-card.c b/src/gvc/gvc-mixer-card.c
-index 56502e3..168bc79 100644
---- a/src/gvc/gvc-mixer-card.c
-+++ b/src/gvc/gvc-mixer-card.c
-@@ -263,6 +263,11 @@ gvc_mixer_card_change_profile (GvcMixerCard *card,
-         return TRUE;
- }
- 
-+/**
-+ * gvc_mixer_card_get_profiles:
-+ *
-+ * Return value: (transfer none) (element-type GvcMixerCardProfile):
-+ */
- const GList *
- gvc_mixer_card_get_profiles (GvcMixerCard *card)
- {
-@@ -281,6 +286,10 @@ sort_profiles (GvcMixerCardProfile *a,
-         return -1;
- }
- 
-+/**
-+ * gvc_mixer_card_set_profiles:
-+ * @profiles: (transfer full) (element-type GvcMixerCardProfile):
-+ */
- gboolean
- gvc_mixer_card_set_profiles (GvcMixerCard *card,
-                              GList        *profiles)
-diff --git a/src/gvc/gvc-mixer-stream.c b/src/gvc/gvc-mixer-stream.c
-index 78de6b3..f35954a 100644
---- a/src/gvc/gvc-mixer-stream.c
-+++ b/src/gvc/gvc-mixer-stream.c
-@@ -508,6 +508,11 @@ gvc_mixer_stream_change_port (GvcMixerStream *stream,
-         return GVC_MIXER_STREAM_GET_CLASS (stream)->change_port (stream, port);
- }
- 
-+/**
-+ * gvc_mixer_stream_get_ports:
-+ *
-+ * Return value: (transfer none) (element-type GvcMixerStreamPort):
-+ */
- const GList *
- gvc_mixer_stream_get_ports (GvcMixerStream *stream)
- {
-@@ -526,6 +531,10 @@ sort_ports (GvcMixerStreamPort *a,
-         return -1;
- }
- 
-+/**
-+ * gvc_mixer_stream_set_ports:
-+ * @ports: (transfer full) (element-type GvcMixerStreamPort):
-+ */
- gboolean
- gvc_mixer_stream_set_ports (GvcMixerStream *stream,
-                             GList          *ports)
-diff --git a/src/shell-app-system.c b/src/shell-app-system.c
-index b52625a..a578e69 100644
---- a/src/shell-app-system.c
-+++ b/src/shell-app-system.c
-@@ -1399,7 +1399,7 @@ _gather_pid_callback (GDesktopAppInfo   *gapp,
- /**
-  * shell_app_info_launch_full:
-  * @timestamp: Event timestamp, or 0 for current event timestamp
-- * @uris: List of uris to pass to application
-+ * @uris: (element-type utf8): List of uris to pass to application
-  * @workspace: Start on this workspace, or -1 for default
-  * @startup_id: (out): Returned startup notification ID, or %NULL if none
-  * @error: A #GError
--- 
-1.7.6.1
-
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.2.0-boxpointer-multimonitor.patch b/gnome-base/gnome-shell/files/gnome-shell-3.2.0-boxpointer-multimonitor.patch
deleted file mode 100644
index 4d8497cc..00000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.2.0-boxpointer-multimonitor.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 7a8a189c483b48de581c490a44d69030ba7a6923 Mon Sep 17 00:00:00 2001
-From: Jasper St. Pierre <jstpierre@mecheye.net>
-Date: Thu, 22 Sep 2011 19:52:58 +0000
-Subject: boxpointer: Don't constrain box pointer to primary monitor
-
-A boxPointer should be able to be attached to any actor, not just ones on the
-primary monitor. Assume that the sourceActor doesn't straddle monitors, and
-constrain the boxPointer to the monitor the sourceActor is on.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=659861
----
-diff --git a/js/ui/boxpointer.js b/js/ui/boxpointer.js
-index 1523ef6..979e2d1 100644
---- a/js/ui/boxpointer.js
-+++ b/js/ui/boxpointer.js
-@@ -329,7 +329,7 @@ BoxPointer.prototype = {
-         // We also want to keep it onscreen, and separated from the
-         // edge by the same distance as the main part of the box is
-         // separated from its sourceActor
--        let primary = Main.layoutManager.primaryMonitor;
-+        let monitor = Main.layoutManager.findMonitorForActor(sourceActor);
-         let themeNode = this.actor.get_theme_node();
-         let borderWidth = themeNode.get_length('-arrow-border-width');
-         let arrowBase = themeNode.get_length('-arrow-base');
-@@ -364,8 +364,8 @@ BoxPointer.prototype = {
-         case St.Side.BOTTOM:
-             resX = sourceCenterX - (halfMargin + (natWidth - margin) * alignment);
- 
--            resX = Math.max(resX, primary.x + 10);
--            resX = Math.min(resX, primary.x + primary.width - (10 + natWidth));
-+            resX = Math.max(resX, monitor.x + 10);
-+            resX = Math.min(resX, monitor.x + monitor.width - (10 + natWidth));
-             this.setArrowOrigin(sourceCenterX - resX);
-             break;
- 
-@@ -373,8 +373,8 @@ BoxPointer.prototype = {
-         case St.Side.RIGHT:
-             resY = sourceCenterY - (halfMargin + (natHeight - margin) * alignment);
- 
--            resY = Math.max(resY, primary.y + 10);
--            resY = Math.min(resY, primary.y + primary.height - (10 + natHeight));
-+            resY = Math.max(resY, monitor.y + 10);
-+            resY = Math.min(resY, monitor.y + monitor.height - (10 + natHeight));
- 
-             this.setArrowOrigin(sourceCenterY - resY);
-             break;
-diff --git a/js/ui/layout.js b/js/ui/layout.js
-index d473ae0..f21fcca 100644
---- a/js/ui/layout.js
-+++ b/js/ui/layout.js
-@@ -369,6 +369,10 @@ LayoutManager.prototype = {
-     // Removes @actor from the chrome
-     removeChrome: function(actor) {
-         this._chrome.removeActor(actor);
-+    },
-+
-+    findMonitorForActor: function(actor) {
-+        return this._chrome.findMonitorForActor(actor);
-     }
- };
- Signals.addSignalMethods(LayoutManager.prototype);
-@@ -700,7 +704,7 @@ Chrome.prototype = {
-             else if (this._inOverview)
-                 visible = true;
-             else if (!actorData.visibleInFullscreen &&
--                     this._findMonitorForActor(actorData.actor).inFullscreen)
-+                     this.findMonitorForActor(actorData.actor).inFullscreen)
-                 visible = false;
-             else
-                 visible = true;
-@@ -762,7 +766,7 @@ Chrome.prototype = {
- 
-     // This call guarantees that we return some monitor to simplify usage of it
-     // In practice all tracked actors should be visible on some monitor anyway
--    _findMonitorForActor: function(actor) {
-+    findMonitorForActor: function(actor) {
-         let [x, y] = actor.get_transformed_position();
-         let [w, h] = actor.get_transformed_size();
-         let monitor = this._findMonitorForRect(x, y, w, h);
---
-cgit v0.9.0.2
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.2.0-recorder-coglhandle.patch b/gnome-base/gnome-shell/files/gnome-shell-3.2.0-recorder-coglhandle.patch
deleted file mode 100644
index c9d3f41f..00000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.2.0-recorder-coglhandle.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 4e9e91fdce7b887bc2fea99b36b6fad4a5cea2c6 Mon Sep 17 00:00:00 2001
-From: Florian Müllner <fmuellner@gnome.org>
-Date: Wed, 21 Sep 2011 22:58:08 +0000
-Subject: recorder: Use CoglHandle instead of CoglHandle*
-
-The latter has always been wrong and should have been fixed a
-while ago, but somehow we overlooked shell-recorder.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=659822
----
-diff --git a/src/shell-recorder.c b/src/shell-recorder.c
-index 9df14d3..a624389 100644
---- a/src/shell-recorder.c
-+++ b/src/shell-recorder.c
-@@ -54,7 +54,7 @@ struct _ShellRecorder {
-   gboolean have_xfixes;
-   int xfixes_event_base;
- 
--  CoglHandle *recording_icon; /* icon shown while playing */
-+  CoglHandle recording_icon; /* icon shown while playing */
- 
-   cairo_surface_t *cursor_image;
-   int cursor_hot_x;
-@@ -160,13 +160,13 @@ G_DEFINE_TYPE(ShellRecorder, shell_recorder, G_TYPE_OBJECT);
-  * recording. The emblem is drawn *after* we record the frame so doesn't
-  * show up in the frame.
-  */
--static CoglHandle *
-+static CoglHandle
- create_recording_icon (void)
- {
-   cairo_surface_t *surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 32, 32);
-   cairo_t *cr;
-   cairo_pattern_t *pat;
--  CoglHandle *texture;
-+  CoglHandle texture;
- 
-   cr = cairo_create (surface);
- 
---
-cgit v0.9.0.2
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.2.0-st-texture-cache-non-serialized-icons.patch b/gnome-base/gnome-shell/files/gnome-shell-3.2.0-st-texture-cache-non-serialized-icons.patch
deleted file mode 100644
index 73b51da3..00000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.2.0-st-texture-cache-non-serialized-icons.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From e49a595f54b14d681ad01c8da1886ff659080e10 Mon Sep 17 00:00:00 2001
-From: Florian Müllner <fmuellner@gnome.org>
-Date: Fri, 30 Sep 2011 17:57:09 +0000
-Subject: st-texture-cache: Don't cache GIcons which cannot be serialized
-
-For GIcons we use g_icon_to_string() in the key, but the function
-will return NULL if the icon cannot be serialized. As a result,
-all non-serializable GIcons of the same size end up with the same
-cache key - an example for this are contacts with avatars, which
-currently all end up with the same image.
-To fix, opt out of caching for GIcons which cannot be serialized.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=660585
----
-diff --git a/src/st/st-texture-cache.c b/src/st/st-texture-cache.c
-index 24471bc..1e83a0d 100644
---- a/src/st/st-texture-cache.c
-+++ b/src/st/st-texture-cache.c
-@@ -1177,8 +1177,15 @@ load_gicon_with_colors (StTextureCache    *cache,
-   char *key;
-   GtkIconTheme *theme;
-   GtkIconInfo *info;
-+  StTextureCachePolicy policy;
- 
-   gicon_string = g_icon_to_string (icon);
-+  /* A return value of NULL indicates that the icon can not be serialized,
-+   * so don't have a unique identifier for it as a cache key, and thus can't
-+   * be cached. If it is cachable, we hardcode a policy of FOREVER here for
-+   * now; we should actually blow this away on icon theme changes probably */
-+  policy = gicon_string != NULL ? ST_TEXTURE_CACHE_POLICY_FOREVER
-+                                : ST_TEXTURE_CACHE_POLICY_NONE;
-   if (colors)
-     {
-       /* This raises some doubts about the practice of using string keys */
-@@ -1210,9 +1217,7 @@ load_gicon_with_colors (StTextureCache    *cache,
-     {
-       /* Transfer ownership of key */
-       request->key = key;
--      /* hardcoded here for now; we should actually blow this away on
--       * icon theme changes probably */
--      request->policy = ST_TEXTURE_CACHE_POLICY_FOREVER;
-+      request->policy = policy;
-       request->icon = g_object_ref (icon);
-       request->icon_info = info;
-       request->width = request->height = size;
---
-cgit v0.9.0.2
diff --git a/gnome-base/gnome-shell/gnome-shell-3.1.4.ebuild b/gnome-base/gnome-shell/gnome-shell-3.1.4.ebuild
deleted file mode 100644
index d0c4ba3d..00000000
--- a/gnome-base/gnome-shell/gnome-shell-3.1.4.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-GNOME_TARBALL_SUFFIX="xz"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
-
-inherit gnome2 python
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="http://live.gnome.org/GnomeShell"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+nm-applet"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop
-# FIXME: Automagic gnome-bluetooth[introspection] support.
-# latest gsettings-desktop-schemas is needed due to commit 602fa1c6
-# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057
-# libXfixes-5.0 needed for pointer barriers
-COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
-	>=dev-libs/gjs-1.29.15
-	>=dev-libs/gobject-introspection-0.10.1
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.0.0:3[introspection]
-	>=media-libs/clutter-1.7.5:1.0[introspection]
-	>=gnome-base/gnome-desktop-2.91.2:3
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	>=gnome-extra/evolution-data-server-2.91.6
-	>=media-libs/gstreamer-0.10.16:0.10
-	>=media-libs/gst-plugins-base-0.10.16:0.10
-	>=net-im/telepathy-logger-0.2.4[introspection]
-	net-libs/libsoup:2.4[introspection]
-	>=net-libs/telepathy-glib-0.15.3[introspection]
-	>=net-wireless/gnome-bluetooth-3.1.0[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	>=x11-wm/mutter-3.0.0[introspection]
-
-	dev-libs/dbus-glib
-	dev-libs/libxml2:2
-	x11-libs/pango[introspection]
-	>=dev-libs/libcroco-0.6.2:0.6
-
-	gnome-base/gconf:2[introspection]
-	gnome-base/gnome-menus
-	gnome-base/librsvg
-	media-libs/libcanberra
-	media-sound/pulseaudio
-
-	>=x11-libs/startup-notification-0.11
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	x11-apps/mesa-progs"
-# Runtime-only deps are probably incomplete and approximate.
-# Each block:
-# 1. Pull in polkit-0.101 for pretty authorization dialogs
-# 2. Introspection stuff + dconf needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. accountsservice is needed for GdmUserManager
-# 6. nm-applet is needed for auth prompting and the wireless connection dialog
-RDEPEND="${COMMON_DEPEND}
-	>=sys-auth/polkit-0.101[introspection]
-
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	sys-power/upower[introspection]
-
-	>=gnome-base/gnome-session-2.91.91
-
-	>=gnome-base/gnome-settings-daemon-2.91
-	>=gnome-base/gnome-control-center-2.91.92-r1
-
-	>=sys-apps/accountsservice-0.6.12
-
-	nm-applet? (
-		>=gnome-extra/nm-applet-0.8.999
-		>=net-misc/networkmanager-0.8.999[introspection] )"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.17
-	>=dev-util/pkgconfig-0.22
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	!!=dev-lang/spidermonkey-1.8.2*"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-pkg_setup() {
-	DOCS="AUTHORS README"
-	# Don't error out on warnings
-	G2CONF="${G2CONF}
-		--enable-compile-warnings=maximum
-		--disable-schemas-compile
-		--disable-jhbuild-wrapper-script"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	# gobject-introspection-1.29.17 compat, backported to gnome-shell-3.1.4
-	epatch "${FILESDIR}/${P}-gi-1.29.17.patch"
-}
-
-src_install() {
-	gnome2_src_install
-	python_convert_shebangs 2 "${D}"/usr/bin/gnome-shell-extension-tool
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if ! has_version '>=media-libs/gst-plugins-good-0.10.23' || \
-	   ! has_version 'media-plugins/gst-plugins-vp8'; then
-		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
-		ewarn "you need to either install >=media-libs/gst-plugins-good-0.10.23"
-		ewarn "and media-plugins/gst-plugins-vp8, or use dconf-editor to change"
-		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
-	fi
-}
diff --git a/gnome-base/gnome-shell/gnome-shell-3.2.0-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.2.1.ebuild
index 186d8e6e..1fe076b8 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.2.0-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.2.1.ebuild
@@ -8,7 +8,7 @@ GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.5"
 
-inherit eutils gnome2 python
+inherit gnome2 python
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -51,7 +51,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
 	>=net-misc/networkmanager-0.8.999[introspection]
 	>=net-wireless/gnome-bluetooth-3.1.0[introspection]
 	>=sys-auth/polkit-0.100[introspection]
-	>=x11-wm/mutter-3.0.0[introspection]
+	>=x11-wm/mutter-3.2.1[introspection]
 
 	dev-libs/dbus-glib
 	dev-libs/libxml2:2
@@ -113,20 +113,9 @@ pkg_setup() {
 		BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
 }
 
-src_prepare() {
-	gnome2_src_prepare
-	# Fix recording; will be in next release
-	epatch "${FILESDIR}/${P}-recorder-coglhandle.patch"
-	# Fix multimonitor behavior; will be in next release
-	epatch "${FILESDIR}/${P}-boxpointer-multimonitor.patch"
-	# Fix different icons being cached identically; will be in next release
-	epatch "${FILESDIR}/${P}-st-texture-cache-non-serialized-icons.patch"
-}
-
 src_install() {
 	gnome2_src_install
 	python_convert_shebangs 2 "${D}"/usr/bin/gnome-shell-extension-tool
-
 }
 
 pkg_postinst() {
diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index 3aaed7a3..1fe076b8 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -51,7 +51,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
 	>=net-misc/networkmanager-0.8.999[introspection]
 	>=net-wireless/gnome-bluetooth-3.1.0[introspection]
 	>=sys-auth/polkit-0.100[introspection]
-	>=x11-wm/mutter-3.0.0[introspection]
+	>=x11-wm/mutter-3.2.1[introspection]
 
 	dev-libs/dbus-glib
 	dev-libs/libxml2:2