gnome-base/gnome-shell: 3.0.2 → 3.1.3

Bump to gnome-3.1.x version. Warning: this is very nearly untested. Drop
patch that was applied upstream and update dependencies.

4 files changed, 28 insertions, 69 deletions

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index c7b26abd..4094639a 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,4 +1,3 @@
-AUX gnome-shell-3.0.2-user-removed-signals.patch 1252 RMD160 74eeaa734afa678a03ab6aa108197871a076d504 SHA1 f419c8d6c69dc3a7232345e2730a1f34605227f7 SHA256 6ce72c46e9abbfa21e58abaeea872202df0609aaaa1233822f53758cfd901348
-DIST gnome-shell-3.0.2.tar.bz2 1073613 RMD160 c94b73f53189026684a98aaa0ee301680fa54a92 SHA1 1dcdbb2fd77641edfb222fa9aad6efa1eaff9895 SHA256 a44963877da895d9b9f1ea98617067c5e88a5c4b414c6ccf0fcbfacdeac7db95
-EBUILD gnome-shell-3.0.2.ebuild 3857 RMD160 5dc793254a7b78c13b4216f69c242272aed9e8b0 SHA1 312f47b2b4c6a00938c0c48e0c9f181834aea158 SHA256 29b3ee7208b3a1d3372d7b7b801f5b6f949226179c394f208b846182e595d48c
-EBUILD gnome-shell-9999.ebuild 3724 RMD160 54bd772b4414c3e45ceb18d8ce3517220a0f0245 SHA1 f07a3e02e343a3e5eea78eff409c0717c4b405c3 SHA256 1017188073955e8376583095c89519916f57913312468e2aaca01593432831c6
+DIST gnome-shell-3.1.3.tar.xz 982712 RMD160 a410399132f154326aa2f9f0ab999327c0022193 SHA1 1eccc67b44d478d15104fe81ff41410bb01824e5 SHA256 65418d813d8c4f70629b377ac5fb7d37c45feb177321b8005cb781d3d118a325
+EBUILD gnome-shell-3.1.3.ebuild 3735 RMD160 fbe83c4e33d4343ba8a1197c47df3b382fdf1bab SHA1 a5dda3ad1dae339dd3ccb7aa8b2e17f5aa002578 SHA256 b147f5abcdee2e2698bbc8201621c54f83bd5594d1b0283b8c2d4701cd4b724b
+EBUILD gnome-shell-9999.ebuild 3771 RMD160 df5a8b01a62f8faf2687f1498019277e3ce97104 SHA1 8a32f7fcf78f2278073555dd294e15d5e835f418 SHA256 c73bab7d9019da4040e954bc3d9adc8d863670b8bda598e50032b4459fce9296
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 adae1f0c..00000000
--- 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@redhat.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.ebuild b/gnome-base/gnome-shell/gnome-shell-3.1.3.ebuild
index 14feacbd..0c898a4b 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.0.2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.1.3.ebuild
@@ -3,11 +3,12 @@
 # $Header: $
 
 EAPI="3"
+GNOME_TARBALL_SUFFIX="xz"
 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
@@ -28,6 +29,7 @@ fi
 # 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
@@ -36,19 +38,19 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
 	>=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
+	>=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/telepathy-glib-0.13.12[introspection]
-	>=net-wireless/gnome-bluetooth-2.90.0[introspection]
+	>=net-libs/telepathy-glib-0.15.0[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
+	>=dev-libs/libcroco-0.6.2:0.6
 
 	gnome-base/gconf:2[introspection]
 	gnome-base/gnome-menus
@@ -56,9 +58,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
 	media-libs/libcanberra
 	media-sound/pulseaudio
 
-	x11-libs/startup-notification
+	>=x11-libs/startup-notification-0.11
 	x11-libs/libX11
-	x11-libs/libXfixes
+	>=x11-libs/libXfixes-5.0
 	x11-apps/mesa-progs"
 # Runtime-only deps are probably incomplete and approximate.
 # Each block:
@@ -86,9 +88,9 @@ RDEPEND="${COMMON_DEPEND}
 		>=gnome-extra/nm-applet-0.8.999
 		>=net-misc/networkmanager-0.8.999[introspection] )"
 DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
+	>=sys-devel/gettext-0.17
 	>=dev-util/pkgconfig-0.22
-	>=dev-util/intltool-0.26
+	>=dev-util/intltool-0.40
 	gnome-base/gnome-common
 	!!<dev-lang/spidermonkey-2"
 # libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
@@ -103,13 +105,6 @@ pkg_setup() {
 		--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"
-	gnome2_src_prepare
-}
-
 src_install() {
 	gnome2_src_install
 	python_convert_shebangs 2 "${D}"/usr/bin/gnome-shell-extension-tool
diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index 3df02e50..0ad9a8eb 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -3,11 +3,12 @@
 # $Header: $
 
 EAPI="3"
+GNOME_TARBALL_SUFFIX="xz"
 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
@@ -28,27 +29,29 @@ fi
 # 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]
+	>=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.32.0
+	>=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/telepathy-glib-0.13.12[introspection]
-	>=net-wireless/gnome-bluetooth-2.90.0[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
+	>=dev-libs/libcroco-0.6.2:0.6
 
 	gnome-base/gconf:2[introspection]
 	gnome-base/gnome-menus
@@ -56,9 +59,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
 	media-libs/libcanberra
 	media-sound/pulseaudio
 
-	x11-libs/startup-notification
+	>=x11-libs/startup-notification-0.11
 	x11-libs/libX11
-	x11-libs/libXfixes
+	>=x11-libs/libXfixes-5.0
 	x11-apps/mesa-progs"
 # Runtime-only deps are probably incomplete and approximate.
 # Each block:
@@ -86,11 +89,11 @@ RDEPEND="${COMMON_DEPEND}
 		>=gnome-extra/nm-applet-0.8.999
 		>=net-misc/networkmanager-0.8.999[introspection] )"
 DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
+	>=sys-devel/gettext-0.17
 	>=dev-util/pkgconfig-0.22
-	>=dev-util/intltool-0.26
+	>=dev-util/intltool-0.40
 	gnome-base/gnome-common
-	!dev-lang/spidermonkey"
+	!!<dev-lang/spidermonkey-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
 
@@ -103,11 +106,6 @@ pkg_setup() {
 		--disable-jhbuild-wrapper-script"
 }
 
-src_prepare() {
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"
-	gnome2_src_prepare
-}
-
 src_install() {
 	gnome2_src_install
 	python_convert_shebangs 2 "${D}"/usr/bin/gnome-shell-extension-tool