Make networkmanager optional (bug #398593, reported by Florian Klink; patch based on Michael Biebl's work for Debian). Add missing timezone-data and mobile-broadband-provider-info rdeps.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

6 files changed, 424 insertions, 11 deletions

diff --git a/gnome-base/gnome-shell/ChangeLog b/gnome-base/gnome-shell/ChangeLog
index 6dc792cb7089..f28d47c54168 100644
--- a/gnome-base/gnome-shell/ChangeLog
+++ b/gnome-base/gnome-shell/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-base/gnome-shell
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.7 2012/01/09 03:03:06 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.8 2012/01/13 09:57:08 tetromino Exp $
+
+*gnome-shell-3.2.1-r3 (13 Jan 2012)
+
+  13 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-shell-3.2.1-r1.ebuild, gnome-shell-3.2.1-r2.ebuild,
+  +gnome-shell-3.2.1-r3.ebuild,
+  +files/gnome-shell-3.2.1-optional-networkmanager.patch:
+  Make networkmanager optional (bug #398593, reported by Florian Klink; patch
+  based on Michael Biebl's work for Debian). Add missing timezone-data and
+  mobile-broadband-provider-info rdeps.
 
 *gnome-shell-3.2.1-r2 (09 Jan 2012)
 
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 747c269aef87..1c581cab8009 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -3,17 +3,19 @@ Hash: SHA256
 
 AUX gnome-shell-3.2.1-automagic-gnome-bluetooth.patch 1841 RMD160 4b57dfeb42f299ef74799409132778b60ddc7a09 SHA1 4acf93b0bda58660b6c7ed5c8fdb6b06df86c035 SHA256 df5f86858b8abc08225ffb7679e829250e05a419b439b2ecad0f02bd93b670b2
 AUX gnome-shell-3.2.1-messageTray-reduce-fade.patch 1625 RMD160 b525fe9d41b758d11b6372bd8294f5f6db94a9d6 SHA1 b417bd0a71be60caf553f34567c9ed1cb0376803 SHA256 a041beacbda9b85ed745911e1e2b28f0e3a9d4518dac7f329a1c342bc3fdc417
+AUX gnome-shell-3.2.1-optional-networkmanager.patch 7873 RMD160 d0dd3e5ae9b6d0ac12b23e0fe8e2845e79ea13a5 SHA1 00350c0484d25e0f62b3e1fadef43f46333f9b63 SHA256 c7b67f665b42d8a21e2a4f51bca121aba48af676d30e35eb6d6ac7939775b70b
 AUX gnome-shell-3.2.1-theme-lighten-sent-message.patch 1181 RMD160 15dc31a7b5e5421c7a6a58befedf8222b87e9ea1 SHA1 e4f0d05ad3198b60be16cf8352a3cd7e3aeade9c SHA256 82495b9a76a70d0a81bbb1d6a01f4390a0de8b2ebe975fdf571ea5fb7312d278
 DIST gnome-shell-3.2.1-patches-1.tar.xz 14052 RMD160 45fa17b60a3378f64f8b6b85dca04ab7d5c7b557 SHA1 823d9073d77d2531e6cbe0f0a80a116ee2f08f39 SHA256 83097366b34e5294bdaa4662ccc1c8010f2e64563ead181c781b79aa72c4f262
 DIST gnome-shell-3.2.1.tar.xz 1115744 RMD160 b56647fe0dc322110872ee8853d9253c7b870500 SHA1 62bcebbd7f274c6808212b85ad56d2edf894ecec SHA256 ac05e3133bd279c84812d8d3d8e362f8b33563cdc3e7a6aefa9c0b1c2aeab0eb
-EBUILD gnome-shell-3.2.1-r1.ebuild 5899 RMD160 82494d85f12924467db67509f680630c571d9b8b SHA1 0ec2e33b95ed1d2a6d2c6a07fa36300e2fc6cb33 SHA256 014ac3bd99970cf13ff62a0a58acb3dda053a691b62dbbdb200128f42fe1dfc7
-EBUILD gnome-shell-3.2.1-r2.ebuild 6096 RMD160 d57b1d5d60f3b0fb825cf93bc6466057e1f34b51 SHA1 7784656aacfe13bd613c4b7cdc37e4be49f6eb39 SHA256 1114f6afb248cae1ee9f066db7d25acc80e550b90f25db7abeefa4d224265cd8
-MISC ChangeLog 2647 RMD160 a2e1afc7bd075822868d899b035db5c89672d3b7 SHA1 70c38cb0c49665db94175381dbd2e434ab72b8da SHA256 bd2a08bade47a04920d8a932c5fa4b0dfe9f3d76da19a55e1091f5ca8b1f2b13
+EBUILD gnome-shell-3.2.1-r1.ebuild 6045 RMD160 7a3e0a707b4422d2602bf9636046b2c2a1d05c7c SHA1 22e2b6e20491da2b0e2b3d1a4906bc7c74be6d33 SHA256 312c0a8f06e8f864b0c0e78ccf096721578ba4c81c17022587b4f3ce6146d10b
+EBUILD gnome-shell-3.2.1-r2.ebuild 6242 RMD160 4cfc80b00b90c13dde7ecab607abc0f4cbb94de1 SHA1 af75796f21feaf58ca1def08e169d75d2a9dfaa4 SHA256 f8d590e159c674b6478ea811a302d831c5f58ee4373f73391dd1ca23b93540d8
+EBUILD gnome-shell-3.2.1-r3.ebuild 6445 RMD160 00b3d5ee134f66be6c1233d823c6f4e163477826 SHA1 f91542374ea373cdf5c76159cf24a1af3b0fda89 SHA256 82bf45888d4acba90192448bd39d9619b800c4582e9af325ea428c7413ff53a9
+MISC ChangeLog 3087 RMD160 b6563c09ddf366e8cead25e83327779b24af6bee SHA1 f3730679442264c737a8f5b1165ea79257c69f49 SHA256 21c31f04d03ffad9b5f134ab9a99364f382c8cfd796a225ef51c62327014188d
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk8KWPAACgkQdjK8w9WeBnAhtwD/TgKjsPZwZonC/EhnKtri1ahx
-oLk/HgCpCYQphjwoy9wA/j3H06Fq1+b06tXpfU3GCJBaScPuOjHtTSnn+LCtVt2V
-=MKpj
+iF4EAREIAAYFAk8P//sACgkQdjK8w9WeBnBtDAD/Uq6pyvHoZ4jiPJAzO9hanL6j
+llVLBQWOtdW9MjqXvJsA/iPwb7ZUUJMHF7sxSBEQjiJdXEMfKxUVi5eA4PC4gFIv
+=FHSN
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.2.1-optional-networkmanager.patch b/gnome-base/gnome-shell/files/gnome-shell-3.2.1-optional-networkmanager.patch
new file mode 100644
index 000000000000..ba304c1839d1
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.2.1-optional-networkmanager.patch
@@ -0,0 +1,207 @@
+From df21e761fc02cf1269a7bbee073b8a129cba1dcd 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
+
+[ Alexandre Rostovtsev <tetromino@gentoo.org> :
+  * use config.js (and AC_SUBST HAVE_NETWORKMANAGER appropriately);
+  * take care to not import ui.status.network if nm is disabled;
+  * do not try to reassign to const variables;
+  * no point really in fiddling with the list of installed js files;
+  * don't build shell-mobile-providers if nm is disabled;
+  * use "networkmanager" instead of "network_manager" because THE
+    BIKESHED SHOULD BE BLUE, also because the upstream package name is
+    NetworkManager, not Network_Manager. ]
+---
+ configure.ac         |   49 +++++++++++++++++++++++++++++++++++++++++++++++--
+ js/misc/config.js.in |    2 ++
+ js/ui/main.js        |    8 ++++++--
+ js/ui/panel.js       |    3 ++-
+ src/Makefile.am      |   18 +++++++++++++-----
+ 5 files changed, 70 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d1bea62..b972127 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -95,8 +95,41 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-2.0 >= $GIO_MIN_VERSION
+ 			       libcanberra
+                                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)
++                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes)
++
++##########################
++# Check for NetworkManager
++##########################
++NM_MIN_VERSION=0.9
++AC_ARG_ENABLE(networkmanager,
++              AS_HELP_STRING([--disable-networkmanager],
++                             [disable NetworkManager support @<:@default=auto@:>@]),,
++              [enable_networkmanager=auto])
++
++if test "x$enable_networkmanager" != "xno"; then
++   PKG_CHECK_MODULES(NETWORKMANAGER,
++                     [libnm-glib libnm-util gnome-keyring-1],
++                     [have_networkmanager=yes],
++                     [have_networkmanager=no])
++
++   GNOME_SHELL_CFLAGS="$GNOME_SHELL_CFLAGS $NETWORKMANAGER_CFLAGS"
++   GNOME_SHELL_LIBS="$GNOME_SHELL_LIBS $NETWORKMANAGER_LIBS"
++else
++   have_networkmanager="no  (disabled)"
++fi
++
++if test "x$have_networkmanager" = "xyes"; then
++   AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager])
++   AC_SUBST([HAVE_NETWORKMANAGER], [1])
++else
++   if test "x$enable_networkmanager" = "xyes"; then
++      AC_MSG_ERROR([Couldn't find NetworkManager.])
++   fi
++   AC_SUBST([HAVE_NETWORKMANAGER], [0])
++fi
++
++AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
++
+ 
+ PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
+ 
+@@ -256,3 +289,15 @@ AC_CONFIG_FILES([
+   man/Makefile
+ ])
+ AC_OUTPUT
++
++echo "
++Build configuration:
++
++	Prefix:                                 ${prefix}
++	Source code location:                   ${srcdir}
++	Compiler:                               ${CC}
++	Compiler Warnings:                      $enable_compile_warnings
++
++	Support for NetworkManager:             $have_networkmanager
++	Support for GStreamer recording:        $build_recorder
++"
+diff --git a/js/misc/config.js.in b/js/misc/config.js.in
+index a35fe28..4a09df6 100644
+--- a/js/misc/config.js.in
++++ b/js/misc/config.js.in
+@@ -8,5 +8,7 @@ const PACKAGE_VERSION = '@PACKAGE_VERSION@';
+ const GJS_VERSION = '@GJS_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@';
+diff --git a/js/ui/main.js b/js/ui/main.js
+index 4c97440..828911b 100644
+--- a/js/ui/main.js
++++ b/js/ui/main.js
+@@ -14,6 +14,7 @@ const St = imports.gi.St;
+ 
+ const AutomountManager = imports.ui.automountManager;
+ const AutorunManager = imports.ui.autorunManager;
++const Config = imports.misc.config;
+ const CtrlAltTab = imports.ui.ctrlAltTab;
+ const EndSessionDialog = imports.ui.endSessionDialog;
+ const PolkitAuthenticationAgent = imports.ui.polkitAuthenticationAgent;
+@@ -27,7 +28,7 @@ const PlaceDisplay = imports.ui.placeDisplay;
+ const RunDialog = imports.ui.runDialog;
+ const Layout = imports.ui.layout;
+ const LookingGlass = imports.ui.lookingGlass;
+-const NetworkAgent = imports.ui.networkAgent;
++const NetworkAgent = Config.HAVE_NETWORKMANAGER ? imports.ui.networkAgent : null;
+ const NotificationDaemon = imports.ui.notificationDaemon;
+ const WindowAttentionHandler = imports.ui.windowAttentionHandler;
+ const Scripting = imports.ui.scripting;
+@@ -84,7 +85,10 @@ function _createUserSession() {
+     telepathyClient = new TelepathyClient.Client();
+     automountManager = new AutomountManager.AutomountManager();
+     autorunManager = new AutorunManager.AutorunManager();
+-    networkAgent = new NetworkAgent.NetworkAgent();
++    if (Config.HAVE_NETWORKMANAGER) {
++        networkAgent = new NetworkAgent.NetworkAgent();
++    }
++
+ }
+ 
+ function _createGDMSession() {
+diff --git a/js/ui/panel.js b/js/ui/panel.js
+index 2f78db9..63e472c 100644
+--- a/js/ui/panel.js
++++ b/js/ui/panel.js
+@@ -40,7 +40,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');
+ }
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 4f8a1da..ecf4d13 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -108,9 +108,7 @@ shell_public_headers_h =		\
+ 	shell-generic-container.h	\
+ 	shell-gtk-embed.h		\
+ 	shell-global.h			\
+-	shell-mobile-providers.h	\
+ 	shell-mount-operation.h		\
+-	shell-network-agent.h		\
+ 	shell-perf-log.h		\
+ 	shell-slicer.h			\
+ 	shell-stack.h			\
+@@ -122,6 +120,11 @@ shell_public_headers_h =		\
+ 	shell-wm.h			\
+ 	shell-xfixes-cursor.h
+ 
++if HAVE_NETWORKMANAGER
++shell_public_headers_h += shell-mobile-providers.h shell-network-agent.h
++endif
++
++
+ libgnome_shell_la_SOURCES =		\
+ 	$(shell_built_sources)		\
+ 	$(shell_public_headers_h)	\
+@@ -145,9 +148,7 @@ libgnome_shell_la_SOURCES =		\
+ 	shell-generic-container.c	\
+ 	shell-gtk-embed.c		\
+ 	shell-global.c			\
+-	shell-mobile-providers.c	\
+ 	shell-mount-operation.c		\
+-	shell-network-agent.c		\
+ 	shell-perf-log.c		\
+ 	shell-polkit-authentication-agent.h	\
+ 	shell-polkit-authentication-agent.c	\
+@@ -161,6 +162,10 @@ libgnome_shell_la_SOURCES =		\
+ 	shell-wm.c			\
+ 	shell-xfixes-cursor.c
+ 
++if HAVE_NETWORKMANAGER
++libgnome_shell_la_SOURCES += shell-mobile-providers.c shell-network-agent.c
++endif
++
+ libgnome_shell_la_gir_sources = \
+ 	$(filter-out %-private.h $(shell_recorder_non_gir_sources), $(shell_public_headers_h) $(libgnome_shell_la_SOURCES))
+ 
+@@ -272,7 +277,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
++if HAVE_NETWORKMANAGER
++Shell_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0
++endif
+ Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
+ Shell_0_1_gir_LIBS = libgnome-shell.la
+ Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources)
+-- 
+1.7.8.3
+
diff --git a/gnome-base/gnome-shell/gnome-shell-3.2.1-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.2.1-r1.ebuild
index ef886418a4d9..93028b2bb5da 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.2.1-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.2.1-r1.ebuild,v 1.4 2012/01/01 21:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.2.1-r1.ebuild,v 1.5 2012/01/13 09:57:08 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -69,6 +69,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
 # 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. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c
 RDEPEND="${COMMON_DEPEND}
 	>=sys-auth/polkit-0.101[introspection]
 
@@ -83,7 +84,10 @@ RDEPEND="${COMMON_DEPEND}
 
 	>=sys-apps/accountsservice-0.6.14[introspection]
 
-	>=app-accessibility/caribou-0.3"
+	>=app-accessibility/caribou-0.3
+
+	net-misc/mobile-broadband-provider-info
+	sys-libs/timezone-data"
 DEPEND="${COMMON_DEPEND}
 	>=sys-devel/gettext-0.17
 	>=dev-util/pkgconfig-0.22
diff --git a/gnome-base/gnome-shell/gnome-shell-3.2.1-r2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.2.1-r2.ebuild
index 818c03a6f634..06c18a5ba476 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.2.1-r2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.2.1-r2.ebuild,v 1.1 2012/01/09 03:03:06 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.2.1-r2.ebuild,v 1.2 2012/01/13 09:57:08 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -73,6 +73,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
 #    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. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c
 RDEPEND="${COMMON_DEPEND}
 	>=sys-auth/polkit-0.101[introspection]
 
@@ -89,7 +90,10 @@ RDEPEND="${COMMON_DEPEND}
 
 	>=app-accessibility/caribou-0.3
 
-	x11-misc/xdg-utils"
+	x11-misc/xdg-utils
+
+	net-misc/mobile-broadband-provider-info
+	sys-libs/timezone-data"
 DEPEND="${COMMON_DEPEND}
 	>=sys-devel/gettext-0.17
 	>=dev-util/pkgconfig-0.22
diff --git a/gnome-base/gnome-shell/gnome-shell-3.2.1-r3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.2.1-r3.ebuild
new file mode 100644
index 000000000000..e1147a208998
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.2.1-r3.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.2.1-r3.ebuild,v 1.1 2012/01/13 09:57:08 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2:2.5"
+
+inherit autotools eutils gnome2 python
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="http://live.gnome.org/GnomeShell"
+
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}-patches-1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+bluetooth +networkmanager"
+KEYWORDS="~amd64 ~x86"
+
+# gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop
+# latest gsettings-desktop-schemas is needed due to commit 602fa1c6
+# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057
+# libXfixes-5.0 needed for pointer barriers
+COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
+	>=dev-libs/gjs-1.29.18
+	>=dev-libs/gobject-introspection-0.10.1
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.0.0:3[introspection]
+	>=media-libs/clutter-1.7.5:1.0[introspection]
+	app-misc/ca-certificates
+	>=dev-libs/folks-0.5.2
+	>=dev-libs/json-glib-0.13.2
+	>=gnome-base/gnome-desktop-2.91.2:3
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	>=gnome-extra/evolution-data-server-2.91.6
+	>=media-libs/gstreamer-0.10.16:0.10
+	>=media-libs/gst-plugins-base-0.10.16:0.10
+	>=net-im/telepathy-logger-0.2.4[introspection]
+	net-libs/libsoup:2.4[introspection]
+	>=net-libs/telepathy-glib-0.15.5[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	>=x11-wm/mutter-3.2.1[introspection]
+
+	dev-libs/dbus-glib
+	dev-libs/libxml2:2
+	x11-libs/pango[introspection]
+	>=dev-libs/libcroco-0.6.2:0.6
+
+	gnome-base/gconf:2[introspection]
+	>=gnome-base/gnome-menus-2.29.10:3[introspection]
+	gnome-base/librsvg
+	media-libs/libcanberra
+	media-sound/pulseaudio
+
+	>=x11-libs/startup-notification-0.11
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	x11-apps/mesa-progs
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] )
+	networkmanager? (
+		gnome-base/libgnome-keyring
+		>=net-misc/networkmanager-0.8.999[introspection] )"
+# 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. 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
+
+	>=sys-apps/accountsservice-0.6.14[introspection]
+
+	>=app-accessibility/caribou-0.3
+
+	x11-misc/xdg-utils
+
+	networkmanager? (
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )"
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/gettext-0.17
+	>=dev-util/pkgconfig-0.22
+	>=dev-util/intltool-0.40
+	gnome-base/gnome-common
+	!!=dev-lang/spidermonkey-1.8.2*"
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
+# https://bugs.gentoo.org/show_bug.cgi?id=360413
+
+pkg_setup() {
+	DOCS="AUTHORS 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)
+		--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
+}
+
+src_prepare() {
+	# Useful patches from git master (not in gnome-3-2 branch yet)
+	epatch ../patch/*.patch
+
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	epatch "${FILESDIR}/${PN}-3.2.1-automagic-gnome-bluetooth.patch"
+
+	# Make networkmanager optional, bug #398593
+	epatch "${FILESDIR}/${PN}-3.2.1-optional-networkmanager.patch"
+
+	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 "${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
+
+	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]"; 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]"; 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
+}