[gentoo-commits] proj/gnome:master commit in: gnome-extra/libgda/, dev-cpp/libgdamm/, x11-wm/mutter/, mail-client/evolution/, ...

[Nirbheek Chauhan]

commit:     095d2892cd9c6ce86f653a0368949c2dc78859e8
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 19:44:15 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 19:44:15 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=095d2892

libgda, evolution, mutter, gnome-shell: moved to the tree

---
 dev-cpp/libgdamm/libgdamm-4.99.3.1.ebuild          |   29 -
 .../gnome-shell-3.0.2-unbreak-extension-css.patch  |   93 ---
 .../gnome-shell-3.0.2-user-removed-signals.patch   |   33 -
 gnome-base/gnome-shell/gnome-shell-3.0.2-r1.ebuild |  132 ----
 gnome-extra/libgda/libgda-4.99.4.ebuild            |  174 -----
 mail-client/evolution/evolution-3.0.3.ebuild       |  184 -----
 mail-client/evolution/evolution-9999.ebuild        |   22 +-
 ...Always-update-signature-in-composer-on-ac.patch |   25 -
 ...refresh_folders_exec-reports-progress-inc.patch |   41 -
 ...Crash-using-saved-search-with-an-empty-ex.patch |   37 -
 .../evolution-2.32.0-wrong-lafile-usage.patch      |   13 -
 .../files/mutter-3.0.2-argb-windows-shadow.patch   |  764 --------------------
 x11-wm/mutter/files/mutter-3.0.2-fix-xshape.patch  |   30 -
 .../mutter-3.0.2-frame-region-cairo-region.patch   |  234 ------
 x11-wm/mutter/mutter-3.0.2.1.ebuild                |   89 ---
 15 files changed, 7 insertions(+), 1893 deletions(-)

diff --git a/dev-cpp/libgdamm/libgdamm-4.99.3.1.ebuild b/dev-cpp/libgdamm/libgdamm-4.99.3.1.ebuild
deleted file mode 100644
index 4dbcda1..0000000
--- a/dev-cpp/libgdamm/libgdamm-4.99.3.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libgdamm/libgdamm-4.1.1.ebuild,v 1.2 2011/02/17 10:15:01 pacho Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="C++ bindings for libgda"
-HOMEPAGE="http://www.gtkmm.org"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="berkdb doc"
-
-RDEPEND=">=dev-cpp/glibmm-2.27.93:2
-	>=gnome-extra/libgda-4.99.3:5[berkdb=]"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-pkg_setup() {
-	# Automagic libgda-berkdb support
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF} $(use_enable doc documentation)"
-}

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.0.2-unbreak-extension-css.patch b/gnome-base/gnome-shell/files/gnome-shell-3.0.2-unbreak-extension-css.patch
deleted file mode 100644
index 75c6aee..0000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.0.2-unbreak-extension-css.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 2674d96e547b27ed5c377804c1059bdfd926086e Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@×××××××××.org>
-Date: Thu, 02 Jun 2011 15:05:08 +0000
-Subject: StTheme: retrive the list of custom stylesheets and use it in loadTheme()
-
-Using the list of stylesheets loaded with st_theme_load_stylesheet(),
-one can build an StTheme that is completely identical to the previous
-one, except for one property (application-stylesheet).
-This allows rt and the user-theme extension to work while respecting
-the theming of other extensions.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=650971
----
-diff --git a/js/ui/main.js b/js/ui/main.js
-index 1d27b4c..c0f4845 100644
---- a/js/ui/main.js
-+++ b/js/ui/main.js
-@@ -393,12 +393,21 @@ function setThemeStylesheet(cssStylesheet)
-  */
- function loadTheme() {
-     let themeContext = St.ThemeContext.get_for_stage (global.stage);
-+    let previousTheme = themeContext.get_theme();
- 
-     let cssStylesheet = _defaultCssStylesheet;
-     if (_cssStylesheet != null)
-         cssStylesheet = _cssStylesheet;
- 
-     let theme = new St.Theme ({ application_stylesheet: cssStylesheet });
-+
-+    if (previousTheme) {
-+        let customStylesheets = previousTheme.get_custom_stylesheets();
-+
-+        for (let i = 0; i < customStylesheets.length; i++)
-+            theme.load_stylesheet(customStylesheets[i]);
-+    }
-+
-     themeContext.set_theme (theme);
- }
- 
-diff --git a/src/st/st-theme.c b/src/st/st-theme.c
-index 326d9de..2058e32 100644
---- a/src/st/st-theme.c
-+++ b/src/st/st-theme.c
-@@ -256,6 +256,30 @@ st_theme_unload_stylesheet (StTheme    *theme,
-   cr_stylesheet_unref (stylesheet);
- }
- 
-+/**
-+ * st_theme_get_custom_stylesheets:
-+ * @theme: an #StTheme
-+ *
-+ * Returns: (transfer full) (element-type utf8): the list of stylesheet filenames
-+ *          that were loaded with st_theme_load_stylesheet()
-+ */
-+GSList*
-+st_theme_get_custom_stylesheets (StTheme *theme)
-+{
-+  GSList *result = NULL;
-+  GSList *iter;
-+
-+  for (iter = theme->custom_stylesheets; iter; iter = iter->next)
-+    {
-+      CRStyleSheet *stylesheet = iter->data;
-+      gchar *filename = g_hash_table_lookup (theme->filenames_by_stylesheet, stylesheet);
-+
-+      result = g_slist_prepend (result, g_strdup (filename));
-+    }
-+
-+  return result;
-+}
-+
- static GObject *
- st_theme_constructor (GType                  type,
-                       guint                  n_construct_properties,
-diff --git a/src/st/st-theme.h b/src/st/st-theme.h
-index 003c2a7..0a044bf 100644
---- a/src/st/st-theme.h
-+++ b/src/st/st-theme.h
-@@ -51,9 +51,9 @@ StTheme *st_theme_new (const char *application_stylesheet,
-                        const char *theme_stylesheet,
-                        const char *default_stylesheet);
- 
--gboolean st_theme_load_stylesheet (StTheme *theme, const char *path, GError **error);
--
--void st_theme_unload_stylesheet (StTheme *theme, const char *path);
-+gboolean  st_theme_load_stylesheet        (StTheme *theme, const char *path, GError **error);
-+void      st_theme_unload_stylesheet      (StTheme *theme, const char *path);
-+GSList   *st_theme_get_custom_stylesheets (StTheme *theme);
- 
- G_END_DECLS
- 
---
-cgit v0.9.0.2

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.0.2-user-removed-signals.patch b/gnome-base/gnome-shell/files/gnome-shell-3.0.2-user-removed-signals.patch
deleted file mode 100644
index adae1f0..0000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.0.2-user-removed-signals.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 9a7f3dbd2030a5e1b54297f1aa7cf228eccafb27 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@××××××.com>
-Date: Tue, 24 May 2011 22:15:10 -0400
-Subject: [PATCH] gdm: ignore user-removed signals for untracked users
-
-If we don't know about a user, we don't care if it goes away,
-and we shouldn't try to remove it from the book keeping.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=647893
----
- src/gdmuser/gdm-user-manager.c |    7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/src/gdmuser/gdm-user-manager.c b/src/gdmuser/gdm-user-manager.c
-index e7ca833..561be32 100644
---- a/src/gdmuser/gdm-user-manager.c
-+++ b/src/gdmuser/gdm-user-manager.c
-@@ -887,6 +887,13 @@ on_user_removed_in_accounts_service (DBusGProxy *proxy,
- 
-         user = g_hash_table_lookup (manager->priv->users_by_object_path, object_path);
- 
-+        if (user == NULL) {
-+                g_debug ("GdmUserManager: ignoring untracked user %s", object_path);
-+                return;
-+        } else {
-+                g_debug ("GdmUserManager: tracked user %s removed from accounts service", object_path);
-+        }
-+
-         manager->priv->new_users = g_slist_remove (manager->priv->new_users, user);
- 
-         remove_user (manager, user);
--- 
-1.7.5.1
\ No newline at end of file

diff --git a/gnome-base/gnome-shell/gnome-shell-3.0.2-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.0.2-r1.ebuild
deleted file mode 100644
index d14bd64..0000000
--- a/gnome-base/gnome-shell/gnome-shell-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils 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-0.7.11
-	>=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.5.15: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.32.0
-	>=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/telepathy-glib-0.13.12[introspection]
-	>=net-wireless/gnome-bluetooth-2.90.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
-
-	gnome-base/gconf:2[introspection]
-	gnome-base/gnome-menus
-	gnome-base/librsvg
-	media-libs/libcanberra
-	media-sound/pulseaudio
-
-	x11-libs/startup-notification
-	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
-	>=dev-util/pkgconfig-0.22
-	>=dev-util/intltool-0.26
-	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() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=647893
-	# can trigger the crash even with accountsservice-0.6.12
-	epatch "${FILESDIR}/${PN}-3.0.2-user-removed-signals.patch"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=650971
-	# Don't clobber extensions' styles
-	epatch "${FILESDIR}/${PN}-3.0.2-unbreak-extension-css.patch"
-	gnome2_src_prepare
-}
-
-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-extra/libgda/libgda-4.99.4.ebuild b/gnome-extra/libgda/libgda-4.99.4.ebuild
deleted file mode 100644
index 7a4d659..0000000
--- a/gnome-extra/libgda/libgda-4.99.4.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.0.ebuild,v 1.3 2010/11/01 12:18:13 eva Exp $
-
-EAPI="3"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="yes"
-GNOME_TARBALL_SUFFIX="xz" # remove when python eclass supports EAPI 4
-PYTHON_DEPEND="2"
-
-inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Gnome Database Access Library"
-HOMEPAGE="http://www.gnome-db.org/"
-LICENSE="GPL-2 LGPL-2"
-
-IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl"
-SLOT="5"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
-
-# FIXME: sqlite is automagic, but maybe it is a hard-dep
-# FIXME: autoconf is a hell of inconsistencies
-RDEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.16:2
-	>=dev-libs/libxml2-2
-	dev-libs/libxslt
-	dev-libs/libunique:3
-	sys-libs/readline
-	sys-libs/ncurses
-	berkdb?   ( sys-libs/db )
-	!bindist? ( firebird? ( dev-db/firebird ) )
-	gtk? (
-		>=x11-libs/gtk+-3.0.0:3
-		canvas? ( x11-libs/goocanvas:2.0 )
-		sourceview? ( x11-libs/gtksourceview:3.0 )
-		graphviz? ( media-gfx/graphviz )
-	)
-	gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) )
-	http? ( >=net-libs/libsoup-2.24:2.4 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.5 )
-	json?     ( dev-libs/json-glib )
-	ldap?     ( net-nds/openldap )
-	mdb?      ( >app-office/mdbtools-0.5 )
-	mysql?    ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	ssl?      ( dev-libs/openssl )
-	>=dev-db/sqlite-3.6.22:3"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.18
-	>=dev-util/intltool-0.35.5
-	>=app-text/gnome-doc-utils-0.9
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-# XXX: some tests fail when run from portage (but pass when building by hand)
-RESTRICT="test"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-
-	if use canvas || use graphviz || use sourceview; then
-		if ! use gtk; then
-			ewarn "You must enable USE=gtk to make use of canvas, graphivz or sourceview USE flag."
-			ewarn "Disabling for now."
-			G2CONF="${G2CONF} --without-goocanvas --without-graphivz --without-gtksourceview"
-		else
-			G2CONF="${G2CONF}
-				$(use_with canvas goocanvas)
-				$(use_with graphviz)
-				$(use_with sourceview gtksourceview)"
-		fi
-	fi
-
-	G2CONF="${G2CONF}
-		--with-unique
-		--disable-scrollkeeper
-		--disable-static
-		--enable-system-sqlite
-		$(use_with berkdb bdb /usr)
-		$(use_with gnome-keyring)
-		$(use_with gtk ui)
-		$(use_with http libsoup)
-		$(use_enable introspection)
-		$(use_with java java $JAVA_HOME)
-		$(use_enable json)
-		$(use_with ldap)
-		$(use_with mdb mdb /usr)
-		$(use_with mysql mysql /usr)
-		$(use_with postgres postgres /usr)
-		$(use_enable ssl crypto)"
-
-	if use bindist; then
-		# firebird license is not GPL compatible
-		G2CONF="${G2CONF} --without-firebird"
-	else
-		G2CONF="${G2CONF} $(use_with firebird firebird /usr)"
-	fi
-
-	use berkdb && append-cppflags "-I$(db_includedir)"
-	use oci8 || G2CONF="${G2CONF} --without-oracle"
-
-	# Not in portage
-	G2CONF="${G2CONF}
-		--disable-default-binary"
-}
-
-src_prepare() {
-	# Fix build order for generated content, upstream #630958
-	#epatch "${FILESDIR}/${PN}-9999-fix-build-order.patch"
-
-	# Fix compilation failure of keyword_hash.c, upstream #630959
-	#epatch "${FILESDIR}/${PN}-4.2.0-missing-include-in-keyword_hash-generator.patch"
-
-	# Upstream patch to fix a serious statement rewriting bug, in next release
-	epatch "${FILESDIR}/${P}-statement-rewriting-fix.patch"
-
-	# Disable broken tests so we can check the others
-	epatch "${FILESDIR}/${PN}-9999-disable-broken-tests.patch"
-
-	# Prevent file collisions with libgda:4
-	epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-help-collision.patch"
-	epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
-	epatch "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
-	# Move files with mv (since epatch can't handle rename diffs) and
-	# update pre-generated gtk-doc files (for non-git versions of libgda)
-	local f
-	for f in tools/browser/doc/gda-browser* ; do
-		mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
-	done
-	if [[ ${PV} != 9999 ]] ; then
-		for f in tools/browser/doc/html/gda-browser.devhelp* ; do
-			sed -e 's:name="gda-browser":name="gda-browser-5.0":' \
-				-i ${f} || die "sed ${f} failed"
-			mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
-		done
-	fi
-	for f in control-center/data/*_gda-control-center.png ; do
-		mv ${f} ${f/_gda-control-center.png/_gda-control-center-5.0.png} ||
-			die "mv ${f} failed"
-	done
-
-	python_convert_shebangs -r 2 libgda-report/RML/trml2{html,pdf}
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_test() {
-	emake check XDG_DATA_HOME="${T}/.local" || die "tests failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	local d
-	for d in /usr/share/libgda-5.0/gda_trml2{html,pdf} ; do
-		python_mod_optimize ${d}
-	done
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	local d
-	for d in /usr/share/libgda-5.0/gda_trml2{html,pdf} ; do
-		python_mod_cleanup ${d}
-	done
-}

diff --git a/mail-client/evolution/evolution-3.0.3.ebuild b/mail-client/evolution/evolution-3.0.3.ebuild
deleted file mode 100644
index a501b84..0000000
--- a/mail-client/evolution/evolution-3.0.3.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.1-r1.ebuild,v 1.3 2011/01/15 19:56:39 nirbheek Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="python? 2:2.4"
-
-inherit autotools eutils flag-o-matic gnome2 python
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-
-LICENSE="GPL-2 LGPL-2 OPENLDAP"
-SLOT="2.0"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
-IUSE="clutter connman crypt doc gstreamer kerberos ldap map networkmanager python ssl"
-
-# We need a graphical pinentry frontend to be able to ask for the GPG
-# password from inside evolution, bug 160302
-PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] )"
-
-# contacts-map plugin requires libchaimplain and geoclue
-# glade-3 support is for maintainers only per configure.ac
-# mono plugin disabled as it's incompatible with 2.8 and lacks maintainance (see bgo#634571)
-# pst is not mature enough and changes API/ABI frequently
-COMMON_DEPEND=">=dev-libs/glib-2.28:2
-	>=x11-libs/cairo-1.9.15[glib]
-	>=x11-libs/gtk+-3.0.2:3
-	>=dev-libs/libunique-2.91.4:3
-	>=gnome-base/gnome-desktop-2.91.3:3
-	>=dev-libs/libgweather-2.90.0:2
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=x11-libs/libnotify-0.7
-	>=gnome-extra/evolution-data-server-${PV}[weather]
-	>=gnome-extra/gtkhtml-3.31.3:4.0
-	>=gnome-base/gconf-2:2
-	dev-libs/atk
-	>=dev-libs/libxml2-2.7.3:2
-	>=net-libs/libsoup-gnome-2.31.2:2.4
-	>=x11-misc/shared-mime-info-0.22
-	>=x11-themes/gnome-icon-theme-2.30.2.1
-	>=dev-libs/libgdata-0.4
-
-	x11-libs/libSM
-	x11-libs/libICE
-
-	clutter? (
-		>=media-libs/clutter-1.0.0:1.0
-		>=media-libs/clutter-gtk-0.90:1.0
-		x11-libs/mx )
-	connman? ( net-misc/connman )
-	crypt? ( || (
-		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
-		=app-crypt/gnupg-1.4* ) )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10:0.10
-		>=media-libs/gst-plugins-base-0.10:0.10 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-2 )
-	map? (
-		>=app-misc/geoclue-0.11.1
-		media-libs/libchamplain:0.8 )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
-	ssl? (
-		>=dev-libs/nspr-4.6.1
-		>=dev-libs/nss-3.11 )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/pkgconfig-0.16
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.17
-	sys-devel/bison
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.9.1
-	app-text/docbook-xml-dtd:4.1.2
-	>=gnome-base/gnome-common-2.12
-	>=dev-util/gtk-doc-am-1.9
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-# eautoreconf needs:
-#	>=gnome-base/gnome-common-2.12
-#	>=dev-util/gtk-doc-am-1.9
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/evolution-exchange-2.32"
-
-# Need EAPI=4 support in python eclass
-#REQUIRED_USE="map? ( clutter )"
-
-pkg_setup() {
-	ELTCONF="--reverse-deps"
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-	# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
-	G2CONF="${G2CONF}
-		--without-glade-catalog
-		--without-kde-applnk-path
-		--enable-plugins=experimental
-		--disable-image-inline
-		--disable-mono
-		--disable-profiling
-		--disable-pst-import
-		--enable-canberra
-		--enable-weather
-		$(use_enable ssl nss)
-		$(use_enable ssl smime)
-		$(use_enable networkmanager nm)
-		$(use_enable connman)
-		$(use_enable gstreamer audio-inline)
-		$(use_enable map contacts-map)
-		$(use_enable python)
-		$(use_with clutter)
-		$(use_with ldap openldap)
-		$(use_with kerberos krb5 /usr)"
-
-	# dang - I've changed this to do --enable-plugins=experimental.  This will
-	# autodetect new-mail-notify and exchange, but that cannot be helped for the
-	# moment.  They should be changed to depend on a --enable-<foo> like mono
-	# is.  This cleans up a ton of crap from this ebuild.
-
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		G2CONF="${G2CONF} --enable-nss=yes"
-	else
-		G2CONF="${G2CONF}
-			--without-nspr-libs
-			--without-nspr-includes
-			--without-nss-libs
-			--without-nss-includes"
-	fi
-
-	# NM and connman support cannot coexist
-	if use networkmanager && use connman ; then
-		ewarn "It is not possible to enable both ConnMan and NetworkManager, disabling connman..."
-		G2CONF="${G2CONF} --disable-connman"
-	fi
-
-	python_set_active_version 2
-}
-
-src_prepare() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		sed -e 's|mozilla-nss|nss|' \
-			-e 's|mozilla-nspr|nspr|' \
-			-i configure.ac || die "sed 2 failed"
-	fi
-
-	# Fix compilation flags crazyness
-	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS"/\1/' \
-		-i configure.ac || die "sed 1 failed"
-
-	if [[ ${PV} != 9999 ]]; then
-		intltoolize --force --copy --automake || die "intltoolize failed"
-		eautoreconf
-	fi
-
-	gnome2_src_prepare
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "To change the default browser if you are not using GNOME, edit"
-	elog "~/.local/share/applications/mimeapps.list so it includes the"
-	elog "following content:"
-	elog ""
-	elog "[Default Applications]"
-	elog "x-scheme-handler/http=firefox.desktop"
-	elog "x-scheme-handler/https=firefox.desktop"
-	elog ""
-	elog "(replace firefox.desktop with the name of the appropriate .desktop"
-	elog "file from /usr/share/applications if you use a different browser)."
-	elog ""
-	elog "Junk filters are now a run-time choice. You will get a choice of"
-	elog "bogofilter or spamassassin based on which you have installed"
-	elog ""
-	elog "You have to install one of these for the spam filtering to actually work"
-}

diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild
index 04f6f5e..80c1fce 100644
--- a/mail-client/evolution/evolution-9999.ebuild
+++ b/mail-client/evolution/evolution-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI="3"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="xz"
 PYTHON_DEPEND="python? 2:2.4"
 
 inherit autotools flag-o-matic gnome2 python
@@ -91,7 +92,8 @@ RDEPEND="${COMMON_DEPEND}
 	!<gnome-extra/evolution-exchange-2.32"
 
 # Need EAPI=4 support in python eclass
-#REQUIRED_USE="map? ( clutter )"
+#REQUIRED_USE="map? ( clutter )
+#	^^ ( connman networkmanager )"
 
 pkg_setup() {
 	ELTCONF="--reverse-deps"
@@ -135,6 +137,7 @@ pkg_setup() {
 	fi
 
 	# NM and connman support cannot coexist
+	# XXX: remove with EAPI 4
 	if use networkmanager && use connman ; then
 		ewarn "It is not possible to enable both ConnMan and NetworkManager, disabling connman..."
 		G2CONF="${G2CONF} --disable-connman"
@@ -144,23 +147,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		sed -e 's|mozilla-nss|nss|' \
-			-e 's|mozilla-nspr|nspr|' \
-			-i configure.ac || die "sed 2 failed"
-	fi
+	gnome2_src_prepare
 
 	# Fix compilation flags crazyness
+	# Note: sed configure.ac if eautoreconf, conditional on [[ 9999 ]]
 	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS"/\1/' \
-		-i configure.ac || die "sed 1 failed"
-
-	if [[ ${PV} != 9999 ]]; then
-		intltoolize --force --copy --automake || die "intltoolize failed"
-		eautoreconf
-	fi
-
-	gnome2_src_prepare
+		-i configure || die "CPPFLAGS sed failed"
 }
 
 pkg_postinst() {

diff --git a/mail-client/evolution/files/0001-Bug-651039-Always-update-signature-in-composer-on-ac.patch b/mail-client/evolution/files/0001-Bug-651039-Always-update-signature-in-composer-on-ac.patch
deleted file mode 100644
index 7f80812..0000000
--- a/mail-client/evolution/files/0001-Bug-651039-Always-update-signature-in-composer-on-ac.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 843e35c48ada910eb1fefb202bcb849d1047c359 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@××××××.com>
-Date: Wed, 25 May 2011 11:20:26 +0200
-Subject: [PATCH 1/3] Bug #651039 - Always update signature in composer on
- account change
-
----
- composer/e-msg-composer.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
-index 0bc9ca9..c8f1993 100644
---- a/composer/e-msg-composer.c
-+++ b/composer/e-msg-composer.c
-@@ -1714,6 +1714,7 @@ msg_composer_account_changed_cb (EMsgComposer *composer)
- 	uid = account->id->sig_uid;
- 	signature = uid ? e_get_signature_by_uid (uid) : NULL;
- 	e_composer_header_table_set_signature (table, signature);
-+	e_msg_composer_show_sig_file (composer);
- }
- 
- static void
--- 
-1.7.5.rc3
-

diff --git a/mail-client/evolution/files/0002-Bug-651062-refresh_folders_exec-reports-progress-inc.patch b/mail-client/evolution/files/0002-Bug-651062-refresh_folders_exec-reports-progress-inc.patch
deleted file mode 100644
index 4579cda..0000000
--- a/mail-client/evolution/files/0002-Bug-651062-refresh_folders_exec-reports-progress-inc.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From fbd3aca29cc12c8a58d15237e3e44f83fe1b8229 Mon Sep 17 00:00:00 2001
-From: Matthew Barnes <mbarnes@××××××.com>
-Date: Thu, 26 May 2011 07:03:15 -0400
-Subject: [PATCH 2/3] Bug 651062 - refresh_folders_exec() reports progress
- incorrectly.
-
-(cherry picked from commit 6ddc2340d03b6fe3745e97ca10336408833c7294)
----
- mail/mail-send-recv.c |    7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
-index a4e2e2e..79018f3 100644
---- a/mail/mail-send-recv.c
-+++ b/mail/mail-send-recv.c
-@@ -924,6 +924,8 @@ refresh_folders_exec (struct _refresh_folders_msg *m,
- 
- 	get_folders (m->store, m->folders, m->finfo);
- 
-+	camel_operation_push_message (cancellable, _("Updating..."));
-+
- 	for (i=0;i<m->folders->len;i++) {
- 		folder = e_mail_session_uri_to_folder_sync (
- 			m->info->session,
-@@ -944,9 +946,12 @@ refresh_folders_exec (struct _refresh_folders_msg *m,
- 			break;
- 
- 		if (m->info->state != SEND_CANCELLED)
--			g_signal_emit_by_name (m->info->cancellable, "status", _("Updating..."), 100 * i / m->folders->len);
-+			camel_operation_progress (
-+				cancellable, 100 * i / m->folders->len);
- 	}
- 
-+	camel_operation_pop_message (cancellable);
-+
- 	if (cancellable)
- 		g_signal_handler_disconnect (m->info->cancellable, handler_id);
- }
--- 
-1.7.5.rc3
-

diff --git a/mail-client/evolution/files/0003-Bug-651135-Crash-using-saved-search-with-an-empty-ex.patch b/mail-client/evolution/files/0003-Bug-651135-Crash-using-saved-search-with-an-empty-ex.patch
deleted file mode 100644
index bcec4dd..0000000
--- a/mail-client/evolution/files/0003-Bug-651135-Crash-using-saved-search-with-an-empty-ex.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From af08ff1bebc895b4de15d1822d96c64d092f2bb5 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@××××××.com>
-Date: Thu, 26 May 2011 13:48:22 +0200
-Subject: [PATCH 3/3] Bug #651135 - Crash using saved search with an empty
- expression
-
----
- addressbook/gui/widgets/e-addressbook-model.c |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
-index 8e62e40..17eb2d3 100644
---- a/addressbook/gui/widgets/e-addressbook-model.c
-+++ b/addressbook/gui/widgets/e-addressbook-model.c
-@@ -904,6 +904,9 @@ e_addressbook_model_get_query (EAddressbookModel *model)
- {
- 	g_return_val_if_fail (E_IS_ADDRESSBOOK_MODEL (model), NULL);
- 
-+	if (!model->priv->query)
-+		return NULL;
-+
- 	return e_book_query_to_string (model->priv->query);
- }
- 
-@@ -920,6 +923,9 @@ e_addressbook_model_set_query (EAddressbookModel *model,
- 	else
- 		book_query = e_book_query_from_string (query);
- 
-+	if (!book_query)
-+		return;
-+
- 	if (model->priv->query != NULL) {
- 		gchar *old_query, *new_query;
- 
--- 
-1.7.5.rc3
-

diff --git a/mail-client/evolution/files/evolution-2.32.0-wrong-lafile-usage.patch b/mail-client/evolution/files/evolution-2.32.0-wrong-lafile-usage.patch
deleted file mode 100644
index 9f0993d..0000000
--- a/mail-client/evolution/files/evolution-2.32.0-wrong-lafile-usage.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
-index 486d71e..763808b 100644
---- a/addressbook/gui/contact-editor/Makefile.am
-+++ b/addressbook/gui/contact-editor/Makefile.am
-@@ -33,7 +33,7 @@ libecontacteditor_la_LIBADD =						\
- 	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la	\
- 	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la	\
- 	$(top_builddir)/addressbook/printing/libecontactprint.la	\
--	$(top_builddir)/widgets/menus/.libs/libmenus.la	\
-+	$(top_builddir)/widgets/menus/libmenus.la	\
- 	$(EVOLUTION_ADDRESSBOOK_LIBS)					\
- 	$(GNOME_PLATFORM_LIBS)
- 

diff --git a/x11-wm/mutter/files/mutter-3.0.2-argb-windows-shadow.patch b/x11-wm/mutter/files/mutter-3.0.2-argb-windows-shadow.patch
deleted file mode 100644
index 2ae376d..0000000
--- a/x11-wm/mutter/files/mutter-3.0.2-argb-windows-shadow.patch
+++ /dev/null
@@ -1,764 +0,0 @@
-From 67c3c93b8fd1e11716e72142ca43deb978e15c98 Mon Sep 17 00:00:00 2001
-From: Owen W. Taylor <otaylor@××××××××.net>
-Date: Tue, 22 Mar 2011 19:36:12 +0000
-Subject: Only shadow ARGB windows with a frame outside the frame
-
-An ARGB window with a frame is likely something like a transparent
-terminal. It looks awful (and breaks transparency) to draw a big
-opaque black shadow under the window, so clip out the region under
-the terminal from the shadow we draw.
-
-Add meta_window_get_frame_bounds() to get a cairo region for the
-outer bounds of the frame of a window, and modify the frame handling
-code to notice changes to the frame shape and discard a cached
-region. meta_frames_apply_shapes() is refactored so we can extract
-meta_frames_get_frame_bounds() from it.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=635268
----
-diff --git a/src/compositor/meta-shadow-factory-private.h b/src/compositor/meta-shadow-factory-private.h
-index 3d51cbb..e6b033e 100644
---- a/src/compositor/meta-shadow-factory-private.h
-+++ b/src/compositor/meta-shadow-factory-private.h
-@@ -47,7 +47,8 @@ void        meta_shadow_paint       (MetaShadow            *shadow,
-                                      int                    window_width,
-                                      int                    window_height,
-                                      guint8                 opacity,
--                                     cairo_region_t        *clip);
-+                                     cairo_region_t        *clip,
-+                                     gboolean               clip_strictly);
- void        meta_shadow_get_bounds  (MetaShadow            *shadow,
-                                      int                    window_x,
-                                      int                    window_y,
-diff --git a/src/compositor/meta-shadow-factory.c b/src/compositor/meta-shadow-factory.c
-index 1a9a447..f8bb1a8 100644
---- a/src/compositor/meta-shadow-factory.c
-+++ b/src/compositor/meta-shadow-factory.c
-@@ -189,8 +189,10 @@ meta_shadow_unref (MetaShadow *shadow)
-  * @window_width: actual width of the region to paint a shadow for
-  * @window_height: actual height of the region to paint a shadow for
-  * @clip: (allow-none): if non-%NULL specifies the visible portion
-- *   of the shadow. Drawing won't be strictly clipped to this region
-- *   but it will be used to optimize what is drawn.
-+ *   of the shadow.
-+ * @clip_strictly: if %TRUE, drawing will be clipped strictly
-+ *   to @clip, otherwise, it will be only used to optimize
-+ *   drawing.
-  *
-  * Paints the shadow at the given position, for the specified actual
-  * size of the region. (Since a #MetaShadow can be shared between
-@@ -204,7 +206,8 @@ meta_shadow_paint (MetaShadow     *shadow,
-                    int             window_width,
-                    int             window_height,
-                    guint8          opacity,
--                   cairo_region_t *clip)
-+                   cairo_region_t *clip,
-+                   gboolean        clip_strictly)
- {
-   float texture_width = cogl_texture_get_width (shadow->texture);
-   float texture_height = cogl_texture_get_height (shadow->texture);
-@@ -276,6 +279,9 @@ meta_shadow_paint (MetaShadow     *shadow,
-       dest_rect.y = dest_y[j];
-       dest_rect.height = dest_y[j + 1] - dest_y[j];
- 
-+      if (dest_rect.height == 0)
-+        continue;
-+
-       for (i = 0; i < n_x; i++)
-         {
-           cairo_region_overlap_t overlap;
-@@ -283,16 +289,64 @@ meta_shadow_paint (MetaShadow     *shadow,
-           dest_rect.x = dest_x[i];
-           dest_rect.width = dest_x[i + 1] - dest_x[i];
- 
-+          if (dest_rect.width == 0)
-+            continue;
-+
-           if (clip)
-             overlap = cairo_region_contains_rectangle (clip, &dest_rect);
-           else
--            overlap = CAIRO_REGION_OVERLAP_PART;
-+            overlap = CAIRO_REGION_OVERLAP_IN;
- 
--          if (overlap != CAIRO_REGION_OVERLAP_OUT)
--            cogl_rectangle_with_texture_coords (dest_x[i], dest_y[j],
--                                                dest_x[i + 1], dest_y[j + 1],
--                                                src_x[i], src_y[j],
--                                                src_x[i + 1], src_y[j + 1]);
-+          /* There's quite a bit of overhead from allocating a new
-+           * region in order to find an exact intersection and
-+           * generating more geometry - we make the assumption that
-+           * unless we have to clip strictly it will be cheaper to
-+           * just draw the entire rectangle.
-+           */
-+          if (overlap == CAIRO_REGION_OVERLAP_IN ||
-+              (overlap == CAIRO_REGION_OVERLAP_PART && !clip_strictly))
-+            {
-+              cogl_rectangle_with_texture_coords (dest_x[i], dest_y[j],
-+                                                  dest_x[i + 1], dest_y[j + 1],
-+                                                  src_x[i], src_y[j],
-+                                                  src_x[i + 1], src_y[j + 1]);
-+            }
-+          else if (overlap == CAIRO_REGION_OVERLAP_PART)
-+            {
-+              cairo_region_t *intersection;
-+              int n_rectangles, k;
-+
-+              intersection = cairo_region_create_rectangle (&dest_rect);
-+              cairo_region_intersect (intersection, clip);
-+
-+              n_rectangles = cairo_region_num_rectangles (intersection);
-+              for (k = 0; k < n_rectangles; k++)
-+                {
-+                  cairo_rectangle_int_t rect;
-+                  float src_x1, src_x2, src_y1, src_y2;
-+
-+                  cairo_region_get_rectangle (intersection, k, &rect);
-+
-+                  /* Separately linear interpolate X and Y coordinates in the source
-+                   * based on the destination X and Y coordinates */
-+
-+                  src_x1 = (src_x[i] * (dest_rect.x + dest_rect.width - rect.x) +
-+                            src_x[i + 1] * (rect.x - dest_rect.x)) / dest_rect.width;
-+                  src_x2 = (src_x[i] * (dest_rect.x + dest_rect.width - (rect.x + rect.width)) +
-+                            src_x[i + 1] * (rect.x + rect.width - dest_rect.x)) / dest_rect.width;
-+
-+                  src_y1 = (src_y[j] * (dest_rect.y + dest_rect.height - rect.y) +
-+                            src_y[j + 1] * (rect.y - dest_rect.y)) / dest_rect.height;
-+                  src_y2 = (src_y[j] * (dest_rect.y + dest_rect.height - (rect.y + rect.height)) +
-+                            src_y[j + 1] * (rect.y + rect.height - dest_rect.y)) / dest_rect.height;
-+
-+                  cogl_rectangle_with_texture_coords (rect.x, rect.y,
-+                                                      rect.x + rect.width, rect.y + rect.height,
-+                                                      src_x1, src_y1, src_x2, src_y2);
-+                }
-+
-+              cairo_region_destroy (intersection);
-+            }
-         }
-     }
- }
-diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
-index 3be0363..4aab5c9 100644
---- a/src/compositor/meta-window-actor.c
-+++ b/src/compositor/meta-window-actor.c
-@@ -702,6 +702,26 @@ meta_window_actor_get_shadow_bounds (MetaWindowActor       *self,
- }
- #endif
- 
-+/* If we have an ARGB32 window that we decorate with a frame, it's
-+ * probably something like a translucent terminal - something where
-+ * the alpha channel represents transparency rather than a shape.  We
-+ * don't want to show the shadow through the translucent areas since
-+ * the shadow is wrong for translucent windows (it should be
-+ * translucent itself and colored), and not only that, will /look/
-+ * horribly wrong - a misplaced big black blob. As a hack, what we
-+ * want to do is just draw the shadow as normal outside the frame, and
-+ * inside the frame draw no shadow.  This is also not even close to
-+ * the right result, but looks OK. We also apply this approach to
-+ * windows set to be partially translucent with _NET_WM_WINDOW_OPACITY.
-+ */
-+static gboolean
-+clip_shadow_under_window (MetaWindowActor *self)
-+{
-+  MetaWindowActorPrivate *priv = self->priv;
-+
-+  return (priv->argb32 || priv->opacity != 0xff) && priv->window->frame;
-+}
-+
- static void
- meta_window_actor_paint (ClutterActor *actor)
- {
-@@ -714,17 +734,36 @@ meta_window_actor_paint (ClutterActor *actor)
-     {
-       MetaShadowParams params;
-       cairo_rectangle_int_t shape_bounds;
-+      cairo_region_t *clip = priv->shadow_clip;
- 
-       meta_window_actor_get_shape_bounds (self, &shape_bounds);
-       meta_window_actor_get_shadow_params (self, appears_focused, &params);
- 
-+      /* The frame bounds are already subtracted from priv->shadow_clip
-+       * if that exists.
-+       */
-+      if (!clip && clip_shadow_under_window (self))
-+        {
-+          cairo_region_t *frame_bounds = meta_window_get_frame_bounds (priv->window);
-+          cairo_rectangle_int_t bounds;
-+
-+          meta_window_actor_get_shadow_bounds (self, appears_focused, &bounds);
-+          clip = cairo_region_create_rectangle (&bounds);
-+
-+          cairo_region_subtract (clip, frame_bounds);
-+        }
-+
-       meta_shadow_paint (shadow,
-                          params.x_offset + shape_bounds.x,
-                          params.y_offset + shape_bounds.y,
-                          shape_bounds.width,
-                          shape_bounds.height,
-                          (clutter_actor_get_paint_opacity (actor) * params.opacity * priv->opacity) / (255 * 255),
--                         priv->shadow_clip);
-+                         clip,
-+                         clip_shadow_under_window (self)); /* clip_strictly - not just as an optimization */
-+
-+      if (clip && clip != priv->shadow_clip)
-+        cairo_region_destroy (clip);
-     }
- 
-   CLUTTER_ACTOR_CLASS (meta_window_actor_parent_class)->paint (actor);
-@@ -1787,6 +1826,12 @@ meta_window_actor_set_visible_region_beneath (MetaWindowActor *self,
-     {
-       meta_window_actor_clear_shadow_clip (self);
-       priv->shadow_clip = cairo_region_copy (beneath_region);
-+
-+      if (clip_shadow_under_window (self))
-+        {
-+          cairo_region_t *frame_bounds = meta_window_get_frame_bounds (priv->window);
-+          cairo_region_subtract (priv->shadow_clip, frame_bounds);
-+        }
-     }
- }
- 
-diff --git a/src/core/frame.c b/src/core/frame.c
-index 4db0002..155a0b8 100644
---- a/src/core/frame.c
-+++ b/src/core/frame.c
-@@ -328,7 +328,7 @@ meta_frame_calc_geometry (MetaFrame         *frame,
-   *geomp = geom;
- }
- 
--static void
-+static gboolean
- update_shape (MetaFrame *frame)
- {
-   if (frame->need_reapply_frame_shape)
-@@ -339,10 +339,14 @@ update_shape (MetaFrame *frame)
-                                  frame->rect.height,
-                                  frame->window->has_shape);
-       frame->need_reapply_frame_shape = FALSE;
-+
-+      return TRUE;
-     }
-+  else
-+    return FALSE;
- }
- 
--void
-+gboolean
- meta_frame_sync_to_window (MetaFrame *frame,
-                            int        resize_gravity,
-                            gboolean   need_move,
-@@ -350,8 +354,7 @@ meta_frame_sync_to_window (MetaFrame *frame,
- {
-   if (!(need_move || need_resize))
-     {
--      update_shape (frame);
--      return;
-+      return update_shape (frame);
-     }
- 
-   meta_topic (META_DEBUG_GEOMETRY,
-@@ -401,6 +404,17 @@ meta_frame_sync_to_window (MetaFrame *frame,
-         meta_ui_repaint_frame (frame->window->screen->ui,
-                                frame->xwindow);
-     }
-+
-+  return need_resize;
-+}
-+
-+cairo_region_t *
-+meta_frame_get_frame_bounds (MetaFrame *frame)
-+{
-+  return meta_ui_get_frame_bounds (frame->window->screen->ui,
-+                                   frame->xwindow,
-+                                   frame->rect.width,
-+                                   frame->rect.height);
- }
- 
- void
-diff --git a/src/core/frame.h b/src/core/frame.h
-index 019d6b3..7a637e8 100644
---- a/src/core/frame.h
-+++ b/src/core/frame.h
-@@ -73,11 +73,13 @@ Window         meta_frame_get_xwindow (MetaFrame *frame);
- /* These should ONLY be called from meta_window_move_resize_internal */
- void meta_frame_calc_geometry      (MetaFrame         *frame,
-                                     MetaFrameGeometry *geomp);
--void meta_frame_sync_to_window     (MetaFrame         *frame,
-+gboolean meta_frame_sync_to_window (MetaFrame         *frame,
-                                     int                gravity,
-                                     gboolean           need_move,
-                                     gboolean           need_resize);
- 
-+cairo_region_t *meta_frame_get_frame_bounds (MetaFrame *frame);
-+
- void meta_frame_set_screen_cursor (MetaFrame	*frame,
- 				   MetaCursor	cursor);
- 
-diff --git a/src/core/window-private.h b/src/core/window-private.h
-index cbac91d..7909943 100644
---- a/src/core/window-private.h
-+++ b/src/core/window-private.h
-@@ -42,6 +42,7 @@
- #include "stack.h"
- #include "iconcache.h"
- #include <X11/Xutil.h>
-+#include <cairo.h>
- #include <gdk-pixbuf/gdk-pixbuf.h>
- 
- typedef struct _MetaWindowQueue MetaWindowQueue;
-@@ -316,6 +317,9 @@ struct _MetaWindow
-   /* if TRUE, application is buggy and SYNC resizing is turned off */
-   guint disable_sync : 1;
- 
-+  /* if non-NULL, the bounds of the window frame */
-+  cairo_region_t *frame_bounds;
-+
-   /* Note: can be NULL */
-   GSList *struts;
- 
-diff --git a/src/core/window.c b/src/core/window.c
-index d442932..aa6d75c 100644
---- a/src/core/window.c
-+++ b/src/core/window.c
-@@ -181,6 +181,9 @@ meta_window_finalize (GObject *object)
-   if (window->mini_icon)
-     g_object_unref (G_OBJECT (window->mini_icon));
- 
-+  if (window->frame_bounds)
-+    cairo_region_destroy (window->frame_bounds);
-+
-   meta_icon_cache_free (&window->icon_cache);
- 
-   g_free (window->sm_client_id);
-@@ -4295,6 +4298,7 @@ meta_window_move_resize_internal (MetaWindow          *window,
-   int frame_size_dy;
-   int size_dx;
-   int size_dy;
-+  gboolean frame_shape_changed = FALSE;
-   gboolean is_configure_request;
-   gboolean do_gravity_adjust;
-   gboolean is_user_action;
-@@ -4598,9 +4602,9 @@ meta_window_move_resize_internal (MetaWindow          *window,
-     meta_window_set_gravity (window, StaticGravity);
- 
-   if (configure_frame_first && window->frame)
--    meta_frame_sync_to_window (window->frame,
--                               gravity,
--                               need_move_frame, need_resize_frame);
-+    frame_shape_changed = meta_frame_sync_to_window (window->frame,
-+                                                     gravity,
-+                                                     need_move_frame, need_resize_frame);
- 
-   values.border_width = 0;
-   values.x = client_move_x;
-@@ -4655,9 +4659,9 @@ meta_window_move_resize_internal (MetaWindow          *window,
-     }
- 
-   if (!configure_frame_first && window->frame)
--    meta_frame_sync_to_window (window->frame,
--                               gravity,
--                               need_move_frame, need_resize_frame);
-+    frame_shape_changed = meta_frame_sync_to_window (window->frame,
-+                                                     gravity,
-+                                                     need_move_frame, need_resize_frame);
- 
-   /* Put gravity back to be nice to lesser window managers */
-   if (use_static_gravity)
-@@ -4700,6 +4704,12 @@ meta_window_move_resize_internal (MetaWindow          *window,
-    *   b) all constraints are obeyed by window->rect and frame->rect
-    */
- 
-+  if (frame_shape_changed && window->frame_bounds)
-+    {
-+      cairo_region_destroy (window->frame_bounds);
-+      window->frame_bounds = NULL;
-+    }
-+
-   if (meta_prefs_get_attach_modal_dialogs ())
-     meta_window_foreach_transient (window, move_attached_dialog, NULL);
- }
-@@ -10204,3 +10214,24 @@ meta_window_get_frame_type (MetaWindow *window)
-       return base_type;
-     }
- }
-+
-+/**
-+ * meta_window_get_frame_bounds:
-+ *
-+ * Gets a region representing the outer bounds of the window's frame.
-+ *
-+ * Return value: (transfer none) (allow-none): a #cairo_region_t
-+ *  holding the outer bounds of the window, or %NULL if the window
-+ *  doesn't have a frame.
-+ */
-+cairo_region_t *
-+meta_window_get_frame_bounds (MetaWindow *window)
-+{
-+  if (!window->frame_bounds)
-+    {
-+      if (window->frame)
-+        window->frame_bounds = meta_frame_get_frame_bounds (window->frame);
-+    }
-+
-+  return window->frame_bounds;
-+}
-diff --git a/src/meta/window.h b/src/meta/window.h
-index a1c4b75..985a146 100644
---- a/src/meta/window.h
-+++ b/src/meta/window.h
-@@ -23,6 +23,7 @@
- #define META_WINDOW_H
- 
- #include <glib-object.h>
-+#include <cairo.h>
- #include <X11/Xlib.h>
- 
- #include <meta/boxes.h>
-@@ -156,4 +157,6 @@ const char *meta_window_get_mutter_hints (MetaWindow *window);
- 
- MetaFrameType meta_window_get_frame_type (MetaWindow *window);
- 
-+cairo_region_t *meta_window_get_frame_bounds (MetaWindow *window);
-+
- #endif
-diff --git a/src/ui/frames.c b/src/ui/frames.c
-index 7c62898..520f29d 100644
---- a/src/ui/frames.c
-+++ b/src/ui/frames.c
-@@ -797,60 +797,22 @@ apply_cairo_region_to_window (Display        *display,
- }
- #endif
- 
--void
--meta_frames_apply_shapes (MetaFrames *frames,
--                          Window      xwindow,
--                          int         new_window_width,
--                          int         new_window_height,
--                          gboolean    window_has_shape)
-+static cairo_region_t *
-+get_bounds_region (MetaFrames        *frames,
-+                  MetaUIFrame       *frame,
-+                  MetaFrameGeometry *fgeom,
-+                  int                window_width,
-+                  int                window_height)
- {
--#ifdef HAVE_SHAPE
--  /* Apply shapes as if window had new_window_width, new_window_height */
--  MetaUIFrame *frame;
--  MetaFrameGeometry fgeom;
--  cairo_rectangle_int_t rect;
-   cairo_region_t *corners_region;
--  cairo_region_t *window_region;
--  Display *display;
--  
--  frame = meta_frames_lookup_window (frames, xwindow);
--  g_return_if_fail (frame != NULL);
--
--  display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
--
--  meta_frames_calc_geometry (frames, frame, &fgeom);
-+  cairo_region_t *bounds_region;
-+  cairo_rectangle_int_t rect;
- 
--  if (!(fgeom.top_left_corner_rounded_radius != 0 ||
--        fgeom.top_right_corner_rounded_radius != 0 ||
--        fgeom.bottom_left_corner_rounded_radius != 0 ||
--        fgeom.bottom_right_corner_rounded_radius != 0 ||
--        window_has_shape))
--    {
--      if (frame->shape_applied)
--        {
--          meta_topic (META_DEBUG_SHAPES,
--                      "Unsetting shape mask on frame 0x%lx\n",
--                      frame->xwindow);
--          
--          XShapeCombineMask (display, frame->xwindow,
--                             ShapeBounding, 0, 0, None, ShapeSet);
--          frame->shape_applied = FALSE;
--        }
--      else
--        {
--          meta_topic (META_DEBUG_SHAPES,
--                      "Frame 0x%lx still doesn't need a shape mask\n",
--                      frame->xwindow);
--        }
--      
--      return; /* nothing to do */
--    }
--  
-   corners_region = cairo_region_create ();
-   
--  if (fgeom.top_left_corner_rounded_radius != 0)
-+  if (fgeom->top_left_corner_rounded_radius != 0)
-     {
--      const int corner = fgeom.top_left_corner_rounded_radius;
-+      const int corner = fgeom->top_left_corner_rounded_radius;
-       const float radius = sqrt(corner) + corner;
-       int i;
- 
-@@ -866,16 +828,16 @@ meta_frames_apply_shapes (MetaFrames *frames,
-         }
-     }
- 
--  if (fgeom.top_right_corner_rounded_radius != 0)
-+  if (fgeom->top_right_corner_rounded_radius != 0)
-     {
--      const int corner = fgeom.top_right_corner_rounded_radius;
-+      const int corner = fgeom->top_right_corner_rounded_radius;
-       const float radius = sqrt(corner) + corner;
-       int i;
- 
-       for (i=0; i<corner; i++)
-         {
-           const int width = floor(0.5 + radius - sqrt(radius*radius - (radius-(i+0.5))*(radius-(i+0.5))));
--          rect.x = new_window_width - width;
-+          rect.x = window_width - width;
-           rect.y = i;
-           rect.width = width;
-           rect.height = 1;
-@@ -884,9 +846,9 @@ meta_frames_apply_shapes (MetaFrames *frames,
-         }
-     }
- 
--  if (fgeom.bottom_left_corner_rounded_radius != 0)
-+  if (fgeom->bottom_left_corner_rounded_radius != 0)
-     {
--      const int corner = fgeom.bottom_left_corner_rounded_radius;
-+      const int corner = fgeom->bottom_left_corner_rounded_radius;
-       const float radius = sqrt(corner) + corner;
-       int i;
- 
-@@ -894,7 +856,7 @@ meta_frames_apply_shapes (MetaFrames *frames,
-         {
-           const int width = floor(0.5 + radius - sqrt(radius*radius - (radius-(i+0.5))*(radius-(i+0.5))));
-           rect.x = 0;
--          rect.y = new_window_height - i - 1;
-+          rect.y = window_height - i - 1;
-           rect.width = width;
-           rect.height = 1;
-           
-@@ -902,17 +864,17 @@ meta_frames_apply_shapes (MetaFrames *frames,
-         }
-     }
- 
--  if (fgeom.bottom_right_corner_rounded_radius != 0)
-+  if (fgeom->bottom_right_corner_rounded_radius != 0)
-     {
--      const int corner = fgeom.bottom_right_corner_rounded_radius;
-+      const int corner = fgeom->bottom_right_corner_rounded_radius;
-       const float radius = sqrt(corner) + corner;
-       int i;
- 
-       for (i=0; i<corner; i++)
-         {
-           const int width = floor(0.5 + radius - sqrt(radius*radius - (radius-(i+0.5))*(radius-(i+0.5))));
--          rect.x = new_window_width - width;
--          rect.y = new_window_height - i - 1;
-+          rect.x = window_width - width;
-+          rect.y = window_height - i - 1;
-           rect.width = width;
-           rect.height = 1;
-           
-@@ -920,19 +882,88 @@ meta_frames_apply_shapes (MetaFrames *frames,
-         }
-     }
-   
--  window_region = cairo_region_create ();
-+  bounds_region = cairo_region_create ();
-   
-   rect.x = 0;
-   rect.y = 0;
--  rect.width = new_window_width;
--  rect.height = new_window_height;
-+  rect.width = window_width;
-+  rect.height = window_height;
- 
--  cairo_region_union_rectangle (window_region, &rect);
-+  cairo_region_union_rectangle (bounds_region, &rect);
- 
--  cairo_region_subtract (window_region, corners_region);
-+  cairo_region_subtract (bounds_region, corners_region);
- 
-   cairo_region_destroy (corners_region);
-+
-+  return bounds_region;
-+}
-+
-+static cairo_region_t *
-+get_client_region (MetaFrameGeometry *fgeom,
-+                   int                window_width,
-+                   int                window_height)
-+{
-+  cairo_rectangle_int_t rect;
-+
-+  rect.x = fgeom->left_width;
-+  rect.y = fgeom->top_height;
-+  rect.width = window_width - fgeom->right_width - rect.x;
-+  rect.height = window_height - fgeom->bottom_height - rect.y;
-+
-+  return cairo_region_create_rectangle (&rect);
-+}
-+
-+void
-+meta_frames_apply_shapes (MetaFrames *frames,
-+                          Window      xwindow,
-+                          int         new_window_width,
-+                          int         new_window_height,
-+                          gboolean    window_has_shape)
-+{
-+#ifdef HAVE_SHAPE
-+  /* Apply shapes as if window had new_window_width, new_window_height */
-+  MetaUIFrame *frame;
-+  MetaFrameGeometry fgeom;
-+  cairo_region_t *window_region;
-+  Display *display;
-   
-+  frame = meta_frames_lookup_window (frames, xwindow);
-+  g_return_if_fail (frame != NULL);
-+
-+  display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-+
-+  meta_frames_calc_geometry (frames, frame, &fgeom);
-+
-+  if (!(fgeom.top_left_corner_rounded_radius != 0 ||
-+        fgeom.top_right_corner_rounded_radius != 0 ||
-+        fgeom.bottom_left_corner_rounded_radius != 0 ||
-+        fgeom.bottom_right_corner_rounded_radius != 0 ||
-+        window_has_shape))
-+    {
-+      if (frame->shape_applied)
-+        {
-+          meta_topic (META_DEBUG_SHAPES,
-+                      "Unsetting shape mask on frame 0x%lx\n",
-+                      frame->xwindow);
-+
-+          XShapeCombineMask (display, frame->xwindow,
-+                             ShapeBounding, 0, 0, None, ShapeSet);
-+          frame->shape_applied = FALSE;
-+        }
-+      else
-+        {
-+          meta_topic (META_DEBUG_SHAPES,
-+                      "Frame 0x%lx still doesn't need a shape mask\n",
-+                      frame->xwindow);
-+        }
-+
-+      return; /* nothing to do */
-+    }
-+
-+  window_region = get_bounds_region (frames, frame,
-+                                     &fgeom,
-+                                     new_window_width, new_window_height);
-+
-   if (window_has_shape)
-     {
-       /* The client window is oclock or something and has a shape
-@@ -984,15 +1015,10 @@ meta_frames_apply_shapes (MetaFrames *frames,
-       /* Punch the client area out of the normal frame shape,
-        * then union it with the shape_window's existing shape
-        */
--      client_region = cairo_region_create ();
--  
--      rect.x = fgeom.left_width;
--      rect.y = fgeom.top_height;
--      rect.width = new_window_width - fgeom.right_width - rect.x;
--      rect.height = new_window_height - fgeom.bottom_height - rect.y;
-+      client_region = get_client_region (&fgeom,
-+                                         new_window_width,
-+                                         new_window_height);
- 
--      cairo_region_union_rectangle (client_region, &rect);
--      
-       cairo_region_subtract (window_region, client_region);
- 
-       cairo_region_destroy (client_region);
-@@ -1027,6 +1053,25 @@ meta_frames_apply_shapes (MetaFrames *frames,
- #endif /* HAVE_SHAPE */
- }
- 
-+cairo_region_t *
-+meta_frames_get_frame_bounds (MetaFrames *frames,
-+                              Window      xwindow,
-+                              int         window_width,
-+                              int         window_height)
-+{
-+  MetaUIFrame *frame;
-+  MetaFrameGeometry fgeom;
-+
-+  frame = meta_frames_lookup_window (frames, xwindow);
-+  g_return_val_if_fail (frame != NULL, NULL);
-+
-+  meta_frames_calc_geometry (frames, frame, &fgeom);
-+
-+  return get_bounds_region (frames, frame,
-+                            &fgeom,
-+                            window_width, window_height);
-+}
-+
- void
- meta_frames_move_resize_frame (MetaFrames *frames,
-                                Window      xwindow,
-diff --git a/src/ui/frames.h b/src/ui/frames.h
-index 5fdba63..d1807df 100644
---- a/src/ui/frames.h
-+++ b/src/ui/frames.h
-@@ -144,6 +144,10 @@ void meta_frames_apply_shapes (MetaFrames *frames,
-                                int         new_window_width,
-                                int         new_window_height,
-                                gboolean    window_has_shape);
-+cairo_region_t *meta_frames_get_frame_bounds (MetaFrames *frames,
-+                                              Window      xwindow,
-+                                              int         window_width,
-+                                              int         window_height);
- void meta_frames_move_resize_frame (MetaFrames *frames,
- 				    Window      xwindow,
- 				    int         x,
-diff --git a/src/ui/ui.c b/src/ui/ui.c
-index 575f2ae..5381b8d 100644
---- a/src/ui/ui.c
-+++ b/src/ui/ui.c
-@@ -470,6 +470,16 @@ meta_ui_apply_frame_shape  (MetaUI  *ui,
-                             window_has_shape);
- }
- 
-+cairo_region_t *
-+meta_ui_get_frame_bounds (MetaUI  *ui,
-+                          Window   xwindow,
-+                          int      window_width,
-+                          int      window_height)
-+{
-+  return meta_frames_get_frame_bounds (ui->frames, xwindow,
-+                                       window_width, window_height);
-+}
-+
- void
- meta_ui_queue_frame_draw (MetaUI *ui,
-                           Window xwindow)
-diff --git a/src/ui/ui.h b/src/ui/ui.h
-index cc449bd..9a33d9d 100644
---- a/src/ui/ui.h
-+++ b/src/ui/ui.h
-@@ -28,6 +28,7 @@
- #include <meta/common.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
-+#include <cairo.h>
- #include <glib.h>
- #include <gdk-pixbuf/gdk-pixbuf.h>
- 
-@@ -104,6 +105,11 @@ void meta_ui_apply_frame_shape  (MetaUI  *ui,
-                                  int      new_window_height,
-                                  gboolean window_has_shape);
- 
-+cairo_region_t *meta_ui_get_frame_bounds (MetaUI  *ui,
-+                                          Window   xwindow,
-+                                          int      window_width,
-+                                          int      window_height);
-+
- void meta_ui_queue_frame_draw (MetaUI *ui,
-                                Window xwindow);
- 
---
-cgit v0.9

diff --git a/x11-wm/mutter/files/mutter-3.0.2-fix-xshape.patch b/x11-wm/mutter/files/mutter-3.0.2-fix-xshape.patch
deleted file mode 100644
index bc65ab2..0000000
--- a/x11-wm/mutter/files/mutter-3.0.2-fix-xshape.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 59efae8920ff919beffa3816874c2e7cc85f3f08 Mon Sep 17 00:00:00 2001
-From: Jasper St. Pierre <jstpierre@×××××××.net>
-Date: Wed, 25 May 2011 20:47:53 -0400
-Subject: [PATCH] Fix XShape
-
-Commit c3a04bf unintentionally broke XShape handling. By studying the code
-extremely carefully, I found this inconsistency with the code that was
-there before.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=635268
----
- src/ui/frames.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/ui/frames.c b/src/ui/frames.c
-index 9f0126c..4352e38 100644
---- a/src/ui/frames.c
-+++ b/src/ui/frames.c
-@@ -880,7 +880,7 @@ apply_cairo_region_to_window (Display        *display,
- 
-   XShapeCombineRectangles (display, xwindow,
-                            ShapeBounding, 0, 0, rects, n_rects,
--                           ShapeSet, YXBanded);
-+                           op, YXBanded);
- 
-   g_free (rects);
- }
--- 
-1.7.5.1
-

diff --git a/x11-wm/mutter/files/mutter-3.0.2-frame-region-cairo-region.patch b/x11-wm/mutter/files/mutter-3.0.2-frame-region-cairo-region.patch
deleted file mode 100644
index 2a41fea..0000000
--- a/x11-wm/mutter/files/mutter-3.0.2-frame-region-cairo-region.patch
+++ /dev/null
@@ -1,234 +0,0 @@
-From c3a04bf3948dae31cbd64e637c290ddee7bcc73b Mon Sep 17 00:00:00 2001
-From: Owen W. Taylor <otaylor@××××××××.net>
-Date: Sun, 20 Mar 2011 20:26:27 +0000
-Subject: Convert frame region handling to cairo regions
-
-It's useful to get frame shapes and manipulate them within Mutter, for
-example so that the compositor can use them to clip drawing.
-For this, we'll need the regions as cairo regions not X regions, so
-convert frame shaping code to work in terms of cairo_region_t.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=635268
----
-diff --git a/src/ui/frames.c b/src/ui/frames.c
-index 9c4782e..7c62898 100644
---- a/src/ui/frames.c
-+++ b/src/ui/frames.c
-@@ -764,6 +764,39 @@ meta_frames_unflicker_bg (MetaFrames *frames,
-   set_background_none (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), frame->xwindow);
- }
- 
-+#ifdef HAVE_SHAPE
-+static void
-+apply_cairo_region_to_window (Display        *display,
-+                              Window          xwindow,
-+                              cairo_region_t *region,
-+                              int             op)
-+{
-+  int n_rects, i;
-+  XRectangle *rects;
-+
-+  n_rects = cairo_region_num_rectangles (region);
-+  rects = g_new (XRectangle, n_rects);
-+
-+  for (i = 0; i < n_rects; i++)
-+    {
-+      cairo_rectangle_int_t rect;
-+
-+      cairo_region_get_rectangle (region, i, &rect);
-+
-+      rects[i].x = rect.x;
-+      rects[i].y = rect.y;
-+      rects[i].width = rect.width;
-+      rects[i].height = rect.height;
-+    }
-+
-+  XShapeCombineRectangles (display, xwindow,
-+                           ShapeBounding, 0, 0, rects, n_rects,
-+                           ShapeSet, YXBanded);
-+
-+  g_free (rects);
-+}
-+#endif
-+
- void
- meta_frames_apply_shapes (MetaFrames *frames,
-                           Window      xwindow,
-@@ -775,9 +808,9 @@ meta_frames_apply_shapes (MetaFrames *frames,
-   /* Apply shapes as if window had new_window_width, new_window_height */
-   MetaUIFrame *frame;
-   MetaFrameGeometry fgeom;
--  XRectangle xrect;
--  Region corners_xregion;
--  Region window_xregion;
-+  cairo_rectangle_int_t rect;
-+  cairo_region_t *corners_region;
-+  cairo_region_t *window_region;
-   Display *display;
-   
-   frame = meta_frames_lookup_window (frames, xwindow);
-@@ -813,7 +846,7 @@ meta_frames_apply_shapes (MetaFrames *frames,
-       return; /* nothing to do */
-     }
-   
--  corners_xregion = XCreateRegion ();
-+  corners_region = cairo_region_create ();
-   
-   if (fgeom.top_left_corner_rounded_radius != 0)
-     {
-@@ -824,12 +857,12 @@ meta_frames_apply_shapes (MetaFrames *frames,
-       for (i=0; i<corner; i++)
-         {
-           const int width = floor(0.5 + radius - sqrt(radius*radius - (radius-(i+0.5))*(radius-(i+0.5))));
--          xrect.x = 0;
--          xrect.y = i;
--          xrect.width = width;
--          xrect.height = 1;
-+          rect.x = 0;
-+          rect.y = i;
-+          rect.width = width;
-+          rect.height = 1;
-           
--          XUnionRectWithRegion (&xrect, corners_xregion, corners_xregion);
-+          cairo_region_union_rectangle (corners_region, &rect);
-         }
-     }
- 
-@@ -842,12 +875,12 @@ meta_frames_apply_shapes (MetaFrames *frames,
-       for (i=0; i<corner; i++)
-         {
-           const int width = floor(0.5 + radius - sqrt(radius*radius - (radius-(i+0.5))*(radius-(i+0.5))));
--          xrect.x = new_window_width - width;
--          xrect.y = i;
--          xrect.width = width;
--          xrect.height = 1;
-+          rect.x = new_window_width - width;
-+          rect.y = i;
-+          rect.width = width;
-+          rect.height = 1;
-           
--          XUnionRectWithRegion (&xrect, corners_xregion, corners_xregion);
-+          cairo_region_union_rectangle (corners_region, &rect);
-         }
-     }
- 
-@@ -860,12 +893,12 @@ meta_frames_apply_shapes (MetaFrames *frames,
-       for (i=0; i<corner; i++)
-         {
-           const int width = floor(0.5 + radius - sqrt(radius*radius - (radius-(i+0.5))*(radius-(i+0.5))));
--          xrect.x = 0;
--          xrect.y = new_window_height - i - 1;
--          xrect.width = width;
--          xrect.height = 1;
-+          rect.x = 0;
-+          rect.y = new_window_height - i - 1;
-+          rect.width = width;
-+          rect.height = 1;
-           
--          XUnionRectWithRegion (&xrect, corners_xregion, corners_xregion);
-+          cairo_region_union_rectangle (corners_region, &rect);
-         }
-     }
- 
-@@ -878,27 +911,27 @@ meta_frames_apply_shapes (MetaFrames *frames,
-       for (i=0; i<corner; i++)
-         {
-           const int width = floor(0.5 + radius - sqrt(radius*radius - (radius-(i+0.5))*(radius-(i+0.5))));
--          xrect.x = new_window_width - width;
--          xrect.y = new_window_height - i - 1;
--          xrect.width = width;
--          xrect.height = 1;
-+          rect.x = new_window_width - width;
-+          rect.y = new_window_height - i - 1;
-+          rect.width = width;
-+          rect.height = 1;
-           
--          XUnionRectWithRegion (&xrect, corners_xregion, corners_xregion);
-+          cairo_region_union_rectangle (corners_region, &rect);
-         }
-     }
-   
--  window_xregion = XCreateRegion ();
-+  window_region = cairo_region_create ();
-   
--  xrect.x = 0;
--  xrect.y = 0;
--  xrect.width = new_window_width;
--  xrect.height = new_window_height;
-+  rect.x = 0;
-+  rect.y = 0;
-+  rect.width = new_window_width;
-+  rect.height = new_window_height;
- 
--  XUnionRectWithRegion (&xrect, window_xregion, window_xregion);
-+  cairo_region_union_rectangle (window_region, &rect);
- 
--  XSubtractRegion (window_xregion, corners_xregion, window_xregion);
-+  cairo_region_subtract (window_region, corners_region);
- 
--  XDestroyRegion (corners_xregion);
-+  cairo_region_destroy (corners_region);
-   
-   if (window_has_shape)
-     {
-@@ -911,7 +944,7 @@ meta_frames_apply_shapes (MetaFrames *frames,
-       XSetWindowAttributes attrs;      
-       Window shape_window;
-       Window client_window;
--      Region client_xregion;
-+      cairo_region_t *client_region;
-       GdkScreen *screen;
-       int screen_number;
-       
-@@ -951,21 +984,21 @@ meta_frames_apply_shapes (MetaFrames *frames,
-       /* Punch the client area out of the normal frame shape,
-        * then union it with the shape_window's existing shape
-        */
--      client_xregion = XCreateRegion ();
-+      client_region = cairo_region_create ();
-   
--      xrect.x = fgeom.left_width;
--      xrect.y = fgeom.top_height;
--      xrect.width = new_window_width - fgeom.right_width - xrect.x;
--      xrect.height = new_window_height - fgeom.bottom_height - xrect.y;
-+      rect.x = fgeom.left_width;
-+      rect.y = fgeom.top_height;
-+      rect.width = new_window_width - fgeom.right_width - rect.x;
-+      rect.height = new_window_height - fgeom.bottom_height - rect.y;
- 
--      XUnionRectWithRegion (&xrect, client_xregion, client_xregion);
-+      cairo_region_union_rectangle (client_region, &rect);
-       
--      XSubtractRegion (window_xregion, client_xregion, window_xregion);
-+      cairo_region_subtract (window_region, client_region);
- 
--      XDestroyRegion (client_xregion);
--      
--      XShapeCombineRegion (display, shape_window,
--                           ShapeBounding, 0, 0, window_xregion, ShapeUnion);
-+      cairo_region_destroy (client_region);
-+
-+      apply_cairo_region_to_window (display, shape_window,
-+                                    window_region, ShapeUnion);
-       
-       /* Now copy shape_window shape to the real frame */
-       XShapeCombineShape (display, frame->xwindow, ShapeBounding,
-@@ -984,13 +1017,13 @@ meta_frames_apply_shapes (MetaFrames *frames,
-                   "Frame 0x%lx has shaped corners\n",
-                   frame->xwindow);
-       
--      XShapeCombineRegion (display, frame->xwindow,
--                           ShapeBounding, 0, 0, window_xregion, ShapeSet);
-+      apply_cairo_region_to_window (display, frame->xwindow,
-+                                    window_region, ShapeSet);
-     }
-   
-   frame->shape_applied = TRUE;
-   
--  XDestroyRegion (window_xregion);
-+  cairo_region_destroy (window_region);
- #endif /* HAVE_SHAPE */
- }
- 
---
-cgit v0.9

diff --git a/x11-wm/mutter/mutter-3.0.2.1.ebuild b/x11-wm/mutter/mutter-3.0.2.1.ebuild
deleted file mode 100644
index c5f7d14..0000000
--- a/x11-wm/mutter/mutter-3.0.2.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Upcoming GNOME 3 window manager (derived from metacity)"
-HOMEPAGE="http://blogs.gnome.org/metacity/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+introspection test xinerama"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-
-COMMON_DEPEND=">=x11-libs/pango-1.2[X,introspection?]
-	>=x11-libs/cairo-1.10[X]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.91.7:3[introspection?]
-	>=gnome-base/gconf-2:2
-	>=dev-libs/glib-2.14:2
-	>=media-libs/clutter-1.2:1.0
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/startup-notification-0.7
-	>=x11-libs/libXcomposite-0.2
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-
-	gnome-extra/zenity
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${COMMON_DEPEND}
-	>=app-text/gnome-doc-utils-0.8
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/xproto"
-RDEPEND="${COMMON_DEPEND}
-	!x11-misc/expocity"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README *.txt doc/*.txt"
-	G2CONF="${G2CONF}
-		--disable-static
-		--enable-gconf
-		--enable-shape
-		--enable-sm
-		--enable-startup-notification
-		--enable-xsync
-		--enable-verbose-mode
-		--enable-compile-warnings=maximum
-		--with-libcanberra
-		$(use_enable introspection)
-		$(use_enable xinerama)"
-}
-
-src_prepare() {
-	# Fix argb window shadows: https://bugzilla.gnome.org/show_bug.cgi?id=635268
-	# The first two patches are from upstream git master branch:
-	epatch "${FILESDIR}/${PN}-3.0.2-frame-region-cairo-region.patch"
-	epatch "${FILESDIR}/${PN}-3.0.2-argb-windows-shadow.patch"
-	# The third is from comment 33 in the gnome bug and unbreaks XShape handling
-	epatch "${FILESDIR}/${PN}-3.0.2-fix-xshape.patch"
-
-	gnome2_src_prepare
-}