gnome-base/gnome-shell: Add 3.5.5 to overlay

5 files changed, 268 insertions, 75 deletions

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index d5ce28c6..47efb570 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,3 +1,5 @@
-AUX gnome-shell-3.2.1-automagic-gnome-bluetooth.patch 1841 SHA256 df5f86858b8abc08225ffb7679e829250e05a419b439b2ecad0f02bd93b670b2 SHA512 43848dd5d04c3d3162d38f12c742d96b44061184ee946a502bf61952e17f11a57722163dcf59c1b78086c047dfc6d2c3046bd4c975fcf45ca565a2ed099802bd WHIRLPOOL 410f10e1bf87d90a33d193d726041e8cf5d66513a6ba31082bc57dbf9aefbb04c5ca3c1ba691ab60da99f2eb0319a3c55f2ecb205616779a113652fe838fc4b6
-AUX gnome-shell-3.4.0-optional-networkmanager.patch 8532 SHA256 487bfd9772799cdd1969b252056af4934870de4704a0bea581876b966e9c754c SHA512 20c2bc1ec1dc93a00f7ce7862a90965da7ce055e37f1e54514bd8af9779f797075255f7a2e61e78f24aeca197cadc8ddf4ced1a58be51f36109654847928d5a7 WHIRLPOOL 59a98990664e3023171411b4250e2f774062a11064b647361318712275b3f50affc0321d8f9316623814c46a349c8fa356e4bdbcc90f9b5b757bc89b77ac2bb2
-EBUILD gnome-shell-9999.ebuild 7026 SHA256 6db2603d1e3d8988e6959df21090722371a0a35acbe4ce57ff4b4721dcca5ed6 SHA512 ce89676bc3d6f5f52497b8865ddbc4580f6266d044bbaefdefdf75d53fbb4e2ce87423a02a21762c862a3f71a67427c5e9c3b96195943fbcd9178201d84838f3 WHIRLPOOL 95b82d6bdbc3b72bb3ccad193957f150d6b71dc551e898d27df21729649bf5a6d03a64f4b364ca456d187a9bf91efc011fb6827c67cd848944dac7b457950800
+AUX gnome-shell-3.5.x-bluetooth-flag.patch 1845 SHA256 c910495fe1bf93c6ab09252df17f8d0fcd4b6fe75fed709c8c97a55bf401970e SHA512 37e4d252d62abfe264c639e47906afa5cd17d159101072ff4ed5ddb5dfc62b4563d80c4632d50bf20c1c62cbc1bdc2a6dc2b34f4e5cc9387095dc3f5606917d8 WHIRLPOOL 6db0c6907947fc86b932f7e391f465712fce5fcd731c6be11da61678c6452e93686c818491b914155a2793ff7ff73ded540de77059ecc498ddadf81a7382714f
+AUX gnome-shell-3.5.x-networkmanager-flag.patch 7952 SHA256 a4b4d2325799d9b255d4d79aca56ad884df6159ad7f6bf67a9d19a7dead5f862 SHA512 23bfaddb0c02316befc5388c8be17fc4acc724fa387c4fff46641d953a063bf866279e6993b8b9291297b4a6909aadd118e3e13d17a28efc8a57db8f8ea7ca64 WHIRLPOOL e90d6235e129eb9f4f7b23b51110687da6807383337f9a4859725d514a05a15c4debf180421c3ee354f687417bd59d33f0eceb6ccd47d02f208ce07064450a80
+DIST gnome-shell-3.5.5.tar.xz 1351996 SHA256 d32a8896a82eacc1ad031371f8eb92321b323343020b757b8e7517c386448535 SHA512 ab4d497ababe2e0be7868b456ae4c4aad4a030d50862cbf6f71b02650f19e8e0cdc2cce2d68b56d4dfe00a55f1d6b65a141d091a734ff49b3145ffdda830fcb2 WHIRLPOOL e77111e6c2aa5225ecc3300990aa8279851f8a84d791f2c6e9e43b2e730ae443cd2c75b37b35096d286291d8806c11aee29205f5c62b2d4f0e753370b105c1d3
+EBUILD gnome-shell-3.5.5.ebuild 6907 SHA256 d7fa698c842ccfa1bacbfe5686ea3cf6fbfad83d6eb834d4515b2d992c2165f4 SHA512 7eb9df5ce50326436faf54c9fc12898dafae5273fa4c54874278d57c9dbb27336fff3d91935b7c12a4d503e3acf0d0d99e95375205754d680f2a618602a0a903 WHIRLPOOL ea2c388d76c1ec4c022dca39b6c826ee56763f76f498340e75ea6d6b26bc755f104234e21d1c5f374ef147b78d9e73fca9887c301140c002072c740c4da7da10
+EBUILD gnome-shell-9999.ebuild 6907 SHA256 d7fa698c842ccfa1bacbfe5686ea3cf6fbfad83d6eb834d4515b2d992c2165f4 SHA512 7eb9df5ce50326436faf54c9fc12898dafae5273fa4c54874278d57c9dbb27336fff3d91935b7c12a4d503e3acf0d0d99e95375205754d680f2a618602a0a903 WHIRLPOOL ea2c388d76c1ec4c022dca39b6c826ee56763f76f498340e75ea6d6b26bc755f104234e21d1c5f374ef147b78d9e73fca9887c301140c002072c740c4da7da10
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.2.1-automagic-gnome-bluetooth.patch b/gnome-base/gnome-shell/files/gnome-shell-3.5.x-bluetooth-flag.patch
index ae23a6c8..b5717548 100644
--- a/gnome-base/gnome-shell/files/gnome-shell-3.2.1-automagic-gnome-bluetooth.patch
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.5.x-bluetooth-flag.patch
@@ -1,7 +1,7 @@
-From 84568fa9454f279ff519a2a11174e112786e46db Mon Sep 17 00:00:00 2001
+From fbc509635dd60d548945636bb4f1cfec5dc7fb49 Mon Sep 17 00:00:00 2001
 From: root <admin@catmur.co.uk>
 Date: Sun, 8 Jan 2012 13:55:05 +0000
-Subject: [PATCH] Fix automagic gnome-bluetooth dependency
+Subject: [PATCH 1/2] Fix automagic gnome-bluetooth dependency
 
 https://bugs.gentoo.org/show_bug.cgi?id=398145
 
@@ -17,11 +17,11 @@ so I can at least merge USE=-bluetooth.
  1 files changed, 5 insertions(+), 0 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 1c64122..a699838 100644
+index 7ab5c59..f3dbdcc 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -127,6 +127,8 @@ PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
- PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 0.1.7)
+@@ -123,6 +123,8 @@ PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
+ PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.5.4)
  
  AC_MSG_CHECKING([for bluetooth support])
 +AC_ARG_WITH([bluetooth], AS_HELP_STRING([--without-bluetooth], [Build without gnome-bluetooth library (default: auto)]))
@@ -29,7 +29,7 @@ index 1c64122..a699838 100644
  PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
          [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0`
  	 BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0`
-@@ -138,6 +140,9 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
+@@ -135,6 +137,9 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
  	[AC_DEFINE([HAVE_BLUETOOTH],[0])
  	 AC_SUBST([HAVE_BLUETOOTH],[0])
  	 AC_MSG_RESULT([no])])
@@ -40,5 +40,5 @@ index 1c64122..a699838 100644
  PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION libedataserverui-3.0 >= $LIBEDATASERVERUI_MIN_VERSION gio-2.0)
  AC_SUBST(CALENDAR_SERVER_CFLAGS)
 -- 
-1.7.8.2
+1.7.8.6
 
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.4.0-optional-networkmanager.patch b/gnome-base/gnome-shell/files/gnome-shell-3.5.x-networkmanager-flag.patch
index ee9d0af7..bf436446 100644
--- a/gnome-base/gnome-shell/files/gnome-shell-3.4.0-optional-networkmanager.patch
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.5.x-networkmanager-flag.patch
@@ -1,7 +1,7 @@
-From 411d751935c9bdc485b113678284edf0cc9e545e Mon Sep 17 00:00:00 2001
+From 98c765809541b373e487eb4b449362a35d7bcb6c Mon Sep 17 00:00:00 2001
 From: Michael Biebl <biebl@debian.org>
 Date: Thu, 22 Dec 2011 22:04:12 +0100
-Subject: [PATCH] Make NM optional
+Subject: [PATCH 2/2] Make NM optional
 
 [ Alexandre Rostovtsev <tetromino@gentoo.org> :
   * use config.js (and AC_SUBST HAVE_NETWORKMANAGER appropriately);
@@ -16,22 +16,22 @@ Subject: [PATCH] Make NM optional
  configure.ac         |   47 ++++++++++++++++++++++++++++++++++++++++++++++-
  js/Makefile.am       |    1 +
  js/misc/config.js.in |    2 ++
- js/ui/main.js        |    8 ++++++--
- js/ui/panel.js       |    3 ++-
- src/Makefile.am      |   17 ++++++++++++-----
- 6 files changed, 69 insertions(+), 9 deletions(-)
+ js/ui/main.js        |    7 +++++--
+ src/Makefile.am      |   18 +++++++++++++-----
+ 5 files changed, 67 insertions(+), 8 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index c6ad636..f228ebd 100644
+index f3dbdcc..566a78c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -94,9 +94,42 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MIN_VERSION
+@@ -96,10 +96,43 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MIN_VERSION
                                 telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
                                 telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
                                 polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
 -                               libnm-glib libnm-util gnome-keyring-1
 +                               gnome-keyring-1
-                                gcr-3 >= $GCR_MIN_VERSION)
+                                gcr-3 >= $GCR_MIN_VERSION
+                                gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
  
 +##########################
 +# Check for NetworkManager
@@ -69,7 +69,7 @@ index c6ad636..f228ebd 100644
  PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
  
  PKG_CHECK_MODULES(SHELL_HOTPLUG_SNIFFER, gio-2.0 gdk-pixbuf-2.0)
-@@ -289,3 +322,15 @@ AC_CONFIG_FILES([
+@@ -262,3 +295,15 @@ AC_CONFIG_FILES([
    man/Makefile
  ])
  AC_OUTPUT
@@ -86,32 +86,32 @@ index c6ad636..f228ebd 100644
 +	Support for GStreamer recording:        $build_recorder
 +"
 diff --git a/js/Makefile.am b/js/Makefile.am
-index e7751cc..5eb4c18 100644
+index 37c4a92..a1b1408 100644
 --- a/js/Makefile.am
 +++ b/js/Makefile.am
-@@ -8,6 +8,7 @@ misc/config.js: misc/config.js.in Makefile
+@@ -7,6 +7,7 @@ misc/config.js: misc/config.js.in Makefile
+ 	sed -e "s|[@]PACKAGE_NAME@|$(PACKAGE_NAME)|g" \
  	    -e "s|[@]PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \
- 	    -e "s|[@]GJS_VERSION@|$(GJS_VERSION)|g" \
  	    -e "s|[@]HAVE_BLUETOOTH@|$(HAVE_BLUETOOTH)|g" \
 +	    -e "s|[@]HAVE_NETWORKMANAGER@|$(HAVE_NETWORKMANAGER)|g" \
- 	    -e "s|[@]SHELL_SYSTEM_CA_FILE@|$(SHELL_SYSTEM_CA_FILE)|g" \
  	    -e "s|[@]GETTEXT_PACKAGE@|$(GETTEXT_PACKAGE)|g" \
  	    -e "s|[@]datadir@|$(datadir)|g" \
+ 	    -e "s|[@]libexecdir@|$(libexecdir)|g" \
 diff --git a/js/misc/config.js.in b/js/misc/config.js.in
-index 4a0db16..3df3394 100644
+index 9769104..9c4795d 100644
 --- a/js/misc/config.js.in
 +++ b/js/misc/config.js.in
-@@ -8,6 +8,8 @@ const PACKAGE_VERSION = '@PACKAGE_VERSION@';
- const GJS_VERSION = '@GJS_VERSION@';
+@@ -6,6 +6,8 @@ const PACKAGE_NAME = '@PACKAGE_NAME@';
+ const PACKAGE_VERSION = '@PACKAGE_VERSION@';
  /* 1 if gnome-bluetooth is available, 0 otherwise */
  const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
 +/* 1 if networkmanager is available, 0 otherwise */
 +const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
- /* The system TLS CA list */
- const SHELL_SYSTEM_CA_FILE = '@SHELL_SYSTEM_CA_FILE@';
  /* gettext package */
+ const GETTEXT_PACKAGE = '@GETTEXT_PACKAGE@';
+ /* locale dir */
 diff --git a/js/ui/main.js b/js/ui/main.js
-index ac9330c..7ca91ee 100644
+index adfaae2..182623c 100644
 --- a/js/ui/main.js
 +++ b/js/ui/main.js
 @@ -12,6 +12,7 @@ const St = imports.gi.St;
@@ -122,7 +122,7 @@ index ac9330c..7ca91ee 100644
  const CtrlAltTab = imports.ui.ctrlAltTab;
  const EndSessionDialog = imports.ui.endSessionDialog;
  const PolkitAuthenticationAgent = imports.ui.polkitAuthenticationAgent;
-@@ -26,7 +27,7 @@ const PlaceDisplay = imports.ui.placeDisplay;
+@@ -27,7 +28,7 @@ const PlaceDisplay = imports.ui.placeDisplay;
  const RunDialog = imports.ui.runDialog;
  const Layout = imports.ui.layout;
  const LookingGlass = imports.ui.lookingGlass;
@@ -130,8 +130,8 @@ index ac9330c..7ca91ee 100644
 +const NetworkAgent = Config.HAVE_NETWORKMANAGER ? imports.ui.networkAgent : null;
  const NotificationDaemon = imports.ui.notificationDaemon;
  const WindowAttentionHandler = imports.ui.windowAttentionHandler;
- const Scripting = imports.ui.scripting;
-@@ -85,7 +86,10 @@ function _createUserSession() {
+ const ScreenShield = imports.ui.screenShield;
+@@ -88,7 +89,9 @@ function createUserSession() {
      telepathyClient = new TelepathyClient.Client();
      automountManager = new AutomountManager.AutomountManager();
      autorunManager = new AutorunManager.AutorunManager();
@@ -139,39 +139,24 @@ index ac9330c..7ca91ee 100644
 +    if (Config.HAVE_NETWORKMANAGER) {
 +        networkAgent = new NetworkAgent.NetworkAgent();
 +    }
-+
- }
- 
- function _createGDMSession() {
-diff --git a/js/ui/panel.js b/js/ui/panel.js
-index 329f118..865ce05 100644
---- a/js/ui/panel.js
-+++ b/js/ui/panel.js
-@@ -45,7 +45,8 @@ if (Config.HAVE_BLUETOOTH)
-     STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['bluetooth'] = imports.ui.status.bluetooth.Indicator;
  
- try {
--    STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['network'] = imports.ui.status.network.NMApplet;
-+    if (Config.HAVE_NETWORKMANAGER)
-+        STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['network'] = imports.ui.status.network.NMApplet;
- } catch(e) {
-     log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
+     _initRecorder();
  }
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 95f1a41..637455e 100644
+index a390691..a6279ae 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -110,9 +110,7 @@ shell_public_headers_h =		\
- 	shell-gtk-embed.h		\
+@@ -115,9 +115,7 @@ shell_public_headers_h =		\
  	shell-global.h			\
  	shell-idle-monitor.h		\
+ 	shell-invert-lightness-effect.h	\
 -	shell-mobile-providers.h	\
  	shell-mount-operation.h		\
 -	shell-network-agent.h		\
  	shell-perf-log.h		\
  	shell-screenshot.h		\
  	shell-screen-grabber.h		\
-@@ -134,6 +132,10 @@ shell_private_sources = \
+@@ -139,6 +137,10 @@ shell_private_sources = \
  	gactionobserver.h		\
  	gactionobserver.c
  
@@ -182,8 +167,8 @@ index 95f1a41..637455e 100644
  libgnome_shell_la_SOURCES =		\
  	$(shell_built_sources)		\
  	$(shell_public_headers_h)	\
-@@ -159,9 +161,7 @@ libgnome_shell_la_SOURCES =		\
- 	shell-idle-monitor.c		\
+@@ -162,9 +164,7 @@ libgnome_shell_la_SOURCES =		\
+ 	shell-invert-lightness-effect.c	\
  	shell-keyring-prompt.h		\
  	shell-keyring-prompt.c		\
 -	shell-mobile-providers.c	\
@@ -192,10 +177,11 @@ index 95f1a41..637455e 100644
  	shell-perf-log.c		\
  	shell-polkit-authentication-agent.h	\
  	shell-polkit-authentication-agent.c	\
-@@ -181,6 +181,10 @@ libgnome_shell_la_SOURCES =		\
+@@ -183,6 +183,11 @@ libgnome_shell_la_SOURCES =		\
+ 	shell-xfixes-cursor.c		\
  	$(NULL)
  
- 
++
 +if HAVE_NETWORKMANAGER
 +libgnome_shell_la_SOURCES += shell-mobile-providers.c shell-network-agent.c
 +endif
@@ -203,12 +189,12 @@ index 95f1a41..637455e 100644
  libgnome_shell_la_gir_sources = \
  	$(filter-out %-private.h $(shell_private_sources), $(shell_public_headers_h) $(libgnome_shell_la_SOURCES))
  
-@@ -296,7 +300,10 @@ libgnome_shell_la_LIBADD =		\
+@@ -296,7 +301,10 @@ libgnome_shell_la_LIBADD =		\
  libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
  
  Shell-0.1.gir: libgnome-shell.la St-1.0.gir
--Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0 Folks-0.6
-+Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 Folks-0.6
+-Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0
++Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0
 +if HAVE_NETWORKMANAGER
 +Shell_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0
 +endif
@@ -216,5 +202,5 @@ index 95f1a41..637455e 100644
  Shell_0_1_gir_LIBS = libgnome-shell.la
  Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources)
 -- 
-1.7.8.5
+1.7.8.6
 
diff --git a/gnome-base/gnome-shell/gnome-shell-3.5.5.ebuild b/gnome-base/gnome-shell/gnome-shell-3.5.5.ebuild
new file mode 100644
index 00000000..91f6214a
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.5.5.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2:2.5"
+
+inherit autotools eutils gnome2 multilib pax-utils 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="+bluetooth +networkmanager systemd"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057
+# libXfixes-5.0 needed for pointer barriers
+# TODO: gstreamer support is currently automagical:
+# gstreamer? ( >=media-libs/gstreamer-0.11.92 )
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-atk-2.5.3
+	>=app-crypt/gcr-3.3.90[introspection]
+	>=dev-libs/glib-2.31.6:2
+	>=dev-libs/gjs-1.33.2
+	>=dev-libs/gobject-introspection-0.10.1
+	>=x11-libs/gtk+-3.3.9:3[introspection]
+	>=media-libs/clutter-1.9.16:1.0[introspection]
+	>=dev-libs/json-glib-0.13.2
+	>=dev-libs/libcroco-0.6.2:0.6
+	>=gnome-base/gnome-desktop-3.5.1:3
+	>=gnome-base/gsettings-desktop-schemas-3.5.4
+	>=gnome-base/gnome-keyring-3.3.90
+	>=gnome-base/gnome-menus-3.5.3:3[introspection]
+	gnome-base/libgnome-keyring
+	>=gnome-extra/evolution-data-server-3.5.3
+	>=media-libs/gst-plugins-base-0.10.16:0.10
+	>=net-im/telepathy-logger-0.2.4[introspection]
+	>=net-libs/telepathy-glib-0.17.5[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	>=x11-libs/libXfixes-5.0
+	>=x11-wm/mutter-3.5.5[introspection]
+	>=x11-libs/startup-notification-0.11
+
+	dev-libs/dbus-glib
+	dev-libs/libxml2:2
+	gnome-base/librsvg
+	media-libs/libcanberra
+	media-libs/mesa
+	media-sound/pulseaudio
+	net-libs/libsoup:2.4[introspection]
+	x11-libs/libX11
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/pango[introspection]
+	x11-apps/mesa-progs
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] )
+	networkmanager? ( >=net-misc/networkmanager-0.8.999[introspection] )
+	systemd? ( >=sys-apps/systemd-31 )
+"
+# 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 (0.6.14 needed for fast
+#    user switching with gdm-3.1.x)
+# 6. caribou needed for on-screen keyboard
+# 7. xdg-utils needed for xdg-open, used by extension tool
+# 8. gnome-icon-theme-symbolic neeed for various icons
+# 9. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c
+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[bluetooth(+)?]
+
+	>=sys-apps/accountsservice-0.6.14[introspection]
+
+	>=app-accessibility/caribou-0.3
+
+	x11-misc/xdg-utils
+
+	x11-themes/gnome-icon-theme-symbolic
+
+	networkmanager? (
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )
+
+	!systemd? ( sys-auth/consolekit )
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/gettext-0.17
+	>=dev-util/intltool-0.40
+	gnome-base/gnome-common
+	virtual/pkgconfig
+	!!=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 NEWS README"
+	# Don't error out on warnings
+	G2CONF="${G2CONF}
+		--enable-compile-warnings=maximum
+		--disable-schemas-compile
+		--disable-jhbuild-wrapper-script
+		$(use_with bluetooth)
+		$(use_enable networkmanager)
+		$(use_with systemd)
+		BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	epatch "${FILESDIR}/${PN}-3.5.x-bluetooth-flag.patch"
+
+	# Make networkmanager optional, bug #398593
+	epatch "${FILESDIR}/${PN}-3.5.x-networkmanager-flag.patch"
+
+	[[ ${PV} != 9999 ]] && eautoreconf
+	gnome2_src_prepare
+
+	# Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765
+	# Note: sed Makefile.in because it is generated from several Makefile.ams
+	sed -e 's/-DG_DISABLE_DEPRECATED//g' \
+		-i src/Makefile.in browser-plugin/Makefile.in || die "sed failed"
+}
+
+src_install() {
+	gnome2_src_install
+	python_convert_shebangs 2 "${ED}/usr/bin/gnome-shell-extension-tool"
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	# Future-proof for >=spidermonkey-1.8.7 following polkit's example
+	if has_version '<dev-lang/spidermonkey-1.8.7'; then
+		pax-mark mr "${ED}usr/bin/gnome-shell"
+	elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then
+		pax-mark m "${ED}usr/bin/gnome-shell"
+	fi
+}
+
+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
+
+	if ! has_version ">=x11-base/xorg-server-1.11"; then
+		ewarn "If you use multiple screens, it is highly recommended that you"
+		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
+		ewarn "pointer barriers which will make it easier to use hot corners."
+	fi
+
+	if has_version "<x11-drivers/ati-drivers-12"; then
+		ewarn "GNOME Shell has been reported to show graphical corruption under"
+		ewarn "x11-drivers/ati-drivers-11.*; you may want to use GNOME in"
+		ewarn "fallback mode, or switch to open-source drivers."
+	fi
+
+	if has_version "media-libs/mesa[video_cards_radeon]" ||
+	   has_version "media-libs/mesa[video_cards_r300]" ||
+	   has_version "media-libs/mesa[video_cards_r600]"; then
+		elog "GNOME Shell is unstable under classic-mode r300/r600 mesa drivers."
+		elog "Make sure that gallium architecture for r300 and r600 drivers is"
+		elog "selected using 'eselect mesa'."
+		if ! has_version "media-libs/mesa[gallium]"; then
+			ewarn "You will need to emerge media-libs/mesa with USE=gallium."
+		fi
+	fi
+
+	if has_version "media-libs/mesa[video_cards_intel]" ||
+	   has_version "media-libs/mesa[video_cards_i915]" ||
+	   has_version "media-libs/mesa[video_cards_i965]"; then
+		elog "GNOME Shell is unstable under gallium-mode i915/i965 mesa drivers."
+		elog "Make sure that classic architecture for i915 and i965 drivers is"
+		elog "selected using 'eselect mesa'."
+		if ! has_version "media-libs/mesa[classic]"; then
+			ewarn "You will need to emerge media-libs/mesa with USE=classic."
+		fi
+	fi
+}
diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index c31aca0d..91f6214a 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -24,34 +24,34 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-# gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop
 # 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=">=app-crypt/gcr-3.3.90[introspection]
+# TODO: gstreamer support is currently automagical:
+# gstreamer? ( >=media-libs/gstreamer-0.11.92 )
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-atk-2.5.3
+	>=app-crypt/gcr-3.3.90[introspection]
 	>=dev-libs/glib-2.31.6:2
-	>=dev-libs/gjs-1.31.22
+	>=dev-libs/gjs-1.33.2
 	>=dev-libs/gobject-introspection-0.10.1
 	>=x11-libs/gtk+-3.3.9:3[introspection]
 	>=media-libs/clutter-1.9.16:1.0[introspection]
-	>=dev-libs/folks-0.5.2
 	>=dev-libs/json-glib-0.13.2
 	>=dev-libs/libcroco-0.6.2:0.6
-	>=gnome-base/gnome-desktop-2.91.2:3
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	>=gnome-base/gnome-desktop-3.5.1:3
+	>=gnome-base/gsettings-desktop-schemas-3.5.4
 	>=gnome-base/gnome-keyring-3.3.90
-	>=gnome-base/gnome-menus-2.29.10:3[introspection]
+	>=gnome-base/gnome-menus-3.5.3:3[introspection]
 	gnome-base/libgnome-keyring
-	>=gnome-extra/evolution-data-server-2.91.6
-	>=media-libs/gstreamer-0.10.16:0.10
+	>=gnome-extra/evolution-data-server-3.5.3
 	>=media-libs/gst-plugins-base-0.10.16:0.10
 	>=net-im/telepathy-logger-0.2.4[introspection]
 	>=net-libs/telepathy-glib-0.17.5[introspection]
 	>=sys-auth/polkit-0.100[introspection]
 	>=x11-libs/libXfixes-5.0
-	>=x11-wm/mutter-3.4.1[introspection]
+	>=x11-wm/mutter-3.5.5[introspection]
 	>=x11-libs/startup-notification-0.11
 
-	app-misc/ca-certificates
 	dev-libs/dbus-glib
 	dev-libs/libxml2:2
 	gnome-base/librsvg
@@ -125,7 +125,6 @@ pkg_setup() {
 		$(use_with bluetooth)
 		$(use_enable networkmanager)
 		$(use_with systemd)
-		--with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
 		BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
 	python_set_active_version 2
 	python_pkg_setup
@@ -133,10 +132,10 @@ pkg_setup() {
 
 src_prepare() {
 	# Fix automagic gnome-bluetooth dep, bug #398145
-	epatch "${FILESDIR}/${PN}-3.2.1-automagic-gnome-bluetooth.patch"
+	epatch "${FILESDIR}/${PN}-3.5.x-bluetooth-flag.patch"
 
 	# Make networkmanager optional, bug #398593
-	epatch "${FILESDIR}/${PN}-3.4.0-optional-networkmanager.patch"
+	epatch "${FILESDIR}/${PN}-3.5.x-networkmanager-flag.patch"
 
 	[[ ${PV} != 9999 ]] && eautoreconf
 	gnome2_src_prepare