Bump, fixes lots of crashes, rendering errrors, and memory leaks (in network menu, notifications, workspace thumbnails, icons, etc.) Also, mark gnome-shell executable to allow running under hardened/PaX (bug #398941, thanks to Orson Teodoro). Drop old.

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

6 files changed, 39 insertions, 276 deletions

diff --git a/gnome-base/gnome-shell/ChangeLog b/gnome-base/gnome-shell/ChangeLog
index f28d47c54168..bd30c35c47e7 100644
--- a/gnome-base/gnome-shell/ChangeLog
+++ b/gnome-base/gnome-shell/ChangeLog
@@ -1,6 +1,18 @@
 # 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.8 2012/01/13 09:57:08 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.9 2012/01/21 02:05:31 tetromino Exp $
+
+*gnome-shell-3.2.2.1 (21 Jan 2012)
+
+  21 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-shell-3.2.1-r1.ebuild, -gnome-shell-3.2.1-r2.ebuild,
+  -files/gnome-shell-3.2.1-messageTray-reduce-fade.patch,
+  -files/gnome-shell-3.2.1-theme-lighten-sent-message.patch,
+  +gnome-shell-3.2.2.1.ebuild:
+  Bump, fixes lots of crashes, rendering errrors, and memory leaks (in network
+  menu, notifications, workspace thumbnails, icons, etc.) Also, mark
+  gnome-shell executable to allow running under hardened/PaX (bug #398941,
+  thanks to Orson Teodoro). Drop old.
 
 *gnome-shell-3.2.1-r3 (13 Jan 2012)
 
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 1c581cab8009..7ea9639107aa 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -2,20 +2,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 6045 RMD160 7a3e0a707b4422d2602bf9636046b2c2a1d05c7c SHA1 22e2b6e20491da2b0e2b3d1a4906bc7c74be6d33 SHA256 312c0a8f06e8f864b0c0e78ccf096721578ba4c81c17022587b4f3ce6146d10b
-EBUILD gnome-shell-3.2.1-r2.ebuild 6242 RMD160 4cfc80b00b90c13dde7ecab607abc0f4cbb94de1 SHA1 af75796f21feaf58ca1def08e169d75d2a9dfaa4 SHA256 f8d590e159c674b6478ea811a302d831c5f58ee4373f73391dd1ca23b93540d8
+DIST gnome-shell-3.2.2.1-patches-1.tar.xz 9244 RMD160 4753b8e010d73aba1ac70385d2bbd1cd25648cf6 SHA1 880f5b03c05a263352857922fbf81a22389747eb SHA256 89c250adc8304a9d6f77e0a3af4136de8438f43b1e4874f2fc7966c7558c274a
+DIST gnome-shell-3.2.2.1.tar.xz 1119984 RMD160 2a3d3360ce630e2644ccd82a7b58801a97ee01ff SHA1 46bbfa5f575fcdd8ff7c653123ce249e7ce93537 SHA256 209363084ef2d58777d70d8430e4659b058cf854c4b9766f3019d69ffea34d6f
 EBUILD gnome-shell-3.2.1-r3.ebuild 6445 RMD160 00b3d5ee134f66be6c1233d823c6f4e163477826 SHA1 f91542374ea373cdf5c76159cf24a1af3b0fda89 SHA256 82bf45888d4acba90192448bd39d9619b800c4582e9af325ea428c7413ff53a9
-MISC ChangeLog 3087 RMD160 b6563c09ddf366e8cead25e83327779b24af6bee SHA1 f3730679442264c737a8f5b1165ea79257c69f49 SHA256 21c31f04d03ffad9b5f134ab9a99364f382c8cfd796a225ef51c62327014188d
+EBUILD gnome-shell-3.2.2.1.ebuild 6554 RMD160 e0fea3ef50efe5bc3dd738d9fd807c4829c049cb SHA1 709d7d29586fa5f8d028139bb9a82013e757b3b6 SHA256 b092ed8795513859d6ef79b03696b7e8db6518508f5a5b960e1112d7236ccd88
+MISC ChangeLog 3656 RMD160 1dc98ddb01e12b4cb14393fa002464c447522c1f SHA1 995afe60bc018bfdc03ce217e31954259b617a9d SHA256 336079212734326e328bf776b5e478e8440b41995d28fa9bd180226e5b93b993
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk8P//sACgkQdjK8w9WeBnBtDAD/Uq6pyvHoZ4jiPJAzO9hanL6j
-llVLBQWOtdW9MjqXvJsA/iPwb7ZUUJMHF7sxSBEQjiJdXEMfKxUVi5eA4PC4gFIv
-=FHSN
+iF4EAREIAAYFAk8aHXEACgkQdjK8w9WeBnCs9QD9GWMMnuSkgJrHHiuo32OqzyTH
+XyvH2eR97X40SZ7/T/IA/i0xE0DCUF/xWBroSoliY7TkKBaFpMQhyYhhmndKyYb1
+=ijnL
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.2.1-messageTray-reduce-fade.patch b/gnome-base/gnome-shell/files/gnome-shell-3.2.1-messageTray-reduce-fade.patch
deleted file mode 100644
index 22a4ce33faa9..000000000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.2.1-messageTray-reduce-fade.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 18541c447e30154e7bd5806e11e3fe70fb9d5887 Mon Sep 17 00:00:00 2001
-From: Jasper St. Pierre <jstpierre@mecheye.net>
-Date: Thu, 27 Oct 2011 13:52:17 -0400
-Subject: [PATCH 2/2] messageTray: Reduce the scroll view fade
-
-https://bugzilla.gnome.org/show_bug.cgi?id=662226
----
- data/theme/gnome-shell.css |    1 +
- js/ui/messageTray.js       |    3 +--
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
-index 0e09866..ea81870 100644
---- a/data/theme/gnome-shell.css
-+++ b/data/theme/gnome-shell.css
-@@ -1217,6 +1217,7 @@ StTooltip StLabel {
- 
- #notification-scrollview {
-     max-height: 10em;
-+    -st-vfade-offset: 24px;
- }
- 
- #notification-scrollview > .top-shadow, #notification-scrollview > .bottom-shadow {
-diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
-index 75eb9f9..ca12fb1 100644
---- a/js/ui/messageTray.js
-+++ b/js/ui/messageTray.js
-@@ -597,8 +597,7 @@ Notification.prototype = {
-         this._table.add_style_class_name('multi-line-notification');
-         this._scrollArea = new St.ScrollView({ name: 'notification-scrollview',
-                                                vscrollbar_policy: this._scrollPolicy,
--                                               hscrollbar_policy: Gtk.PolicyType.NEVER,
--                                               style_class: 'vfade' });
-+                                               hscrollbar_policy: Gtk.PolicyType.NEVER });
-         this._table.add(this._scrollArea, { row: 1,
-                                             col: 2 });
-         this._updateLastColumnSettings();
--- 
-1.7.3.4
-
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.2.1-theme-lighten-sent-message.patch b/gnome-base/gnome-shell/files/gnome-shell-3.2.1-theme-lighten-sent-message.patch
deleted file mode 100644
index 55052b757ad8..000000000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.2.1-theme-lighten-sent-message.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 3294a6e1a7d7a6bea1cb02ec671aaa0d350b57f5 Mon Sep 17 00:00:00 2001
-From: Jasper St. Pierre <jstpierre@mecheye.net>
-Date: Fri, 2 Sep 2011 16:01:24 -0400
-Subject: [PATCH 1/2] theme: Lighten up the sent message color, clean up
-
-Properly apply "received" style and drop unused border-radius styles
-now that the messages have no background color
-
-https://bugzilla.gnome.org/show_bug.cgi?id=658096
----
- data/theme/gnome-shell.css |    7 ++-----
- 1 files changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
-index 4487159..0e09866 100644
---- a/data/theme/gnome-shell.css
-+++ b/data/theme/gnome-shell.css
-@@ -1329,9 +1329,8 @@ StTooltip StLabel {
-     padding: 8px 0;
- }
- 
--.chat-sent {
-+.chat-received {
-     padding-left: 4px;
--    border-radius: 4px;
- }
- 
- .chat-received:rtl {
-@@ -1341,8 +1340,7 @@ StTooltip StLabel {
- 
- .chat-sent {
-     padding-left: 18pt;
--    border-radius: 4px;
--    color: #7E7E7E;
-+    color: #959595;
- }
- 
- .chat-sent:rtl {
-@@ -1352,7 +1350,6 @@ StTooltip StLabel {
- 
- .chat-meta-message {
-     padding-left: 4px;
--    border-radius: 4px;
-     font-size: 9pt;
-     color: #bbbbbb;
- }
--- 
-1.7.3.4
-
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
deleted file mode 100644
index 93028b2bb5da..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# 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.5 2012/01/13 09:57:08 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
-
-inherit gnome2 python
-
-DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="http://live.gnome.org/GnomeShell"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-# gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop
-# FIXME: Automagic gnome-bluetooth[introspection] support.
-# latest gsettings-desktop-schemas is needed due to commit 602fa1c6
-# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057
-# libXfixes-5.0 needed for pointer barriers
-COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
-	>=dev-libs/gjs-1.29.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-base/libgnome-keyring
-	>=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]
-	>=net-misc/networkmanager-0.8.999[introspection]
-	>=net-wireless/gnome-bluetooth-3.1.0[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	>=x11-wm/mutter-3.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"
-# 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. 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
-
-	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
-		--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() {
-	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"
-
-	# Two chat messageTray fixes taken from git master, not in gnome-3-2 yet
-	epatch "${FILESDIR}/${PN}-3.2.1-theme-lighten-sent-message.patch"
-	epatch "${FILESDIR}/${PN}-3.2.1-messageTray-reduce-fade.patch"
-}
-
-src_install() {
-	gnome2_src_install
-	python_convert_shebangs 2 "${D}"/usr/bin/gnome-shell-extension-tool
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if ! has_version '>=media-libs/gst-plugins-good-0.10.23' || \
-	   ! has_version 'media-plugins/gst-plugins-vp8'; then
-		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
-		ewarn "you need to either install >=media-libs/gst-plugins-good-0.10.23"
-		ewarn "and media-plugins/gst-plugins-vp8, or use dconf-editor to change"
-		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
-	fi
-
-	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
-}
diff --git a/gnome-base/gnome-shell/gnome-shell-3.2.1-r2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.2.2.1.ebuild
index 06c18a5ba476..ef967a7aef64 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.2.1-r2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.2.2.1.ebuild
@@ -1,13 +1,13 @@
 # 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.2 2012/01/13 09:57:08 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.2.2.1.ebuild,v 1.1 2012/01/21 02:05:31 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.5"
 
-inherit autotools eutils gnome2 python
+inherit autotools eutils gnome2 pax-utils python
 
 DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
 HOMEPAGE="http://live.gnome.org/GnomeShell"
@@ -17,7 +17,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+bluetooth"
+IUSE="+bluetooth +networkmanager"
 KEYWORDS="~amd64 ~x86"
 
 # gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop
@@ -35,14 +35,12 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9: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-base/libgnome-keyring
 	>=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]
-	>=net-misc/networkmanager-0.8.999[introspection]
 	>=sys-auth/polkit-0.100[introspection]
 	>=x11-wm/mutter-3.2.1[introspection]
 
@@ -62,7 +60,10 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
 	>=x11-libs/libXfixes-5.0
 	x11-apps/mesa-progs
 
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] )"
+	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
@@ -92,8 +93,9 @@ RDEPEND="${COMMON_DEPEND}
 
 	x11-misc/xdg-utils
 
-	net-misc/mobile-broadband-provider-info
-	sys-libs/timezone-data"
+	networkmanager? (
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )"
 DEPEND="${COMMON_DEPEND}
 	>=sys-devel/gettext-0.17
 	>=dev-util/pkgconfig-0.22
@@ -111,6 +113,7 @@ pkg_setup() {
 		--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
@@ -124,6 +127,9 @@ src_prepare() {
 	# 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
 
@@ -135,11 +141,15 @@ src_prepare() {
 
 src_install() {
 	gnome2_src_install
-	python_convert_shebangs 2 "${D}"/usr/bin/gnome-shell-extension-tool
+	python_convert_shebangs 2 "${ED}/usr/bin/gnome-shell-extension-tool"
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	pax-mark mr "${ED}usr/bin/gnome-shell"
 }
 
 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,"