Bump to 3.2.1 from the gnome overlay. Notable changes: built-in (and non-optional) networkmanager UI, telepathy chat integration, removable media UI, completely overhauled extension system, login-screen mode for gdm, and many improvements and bugfixes.

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

5 files changed, 244 insertions, 5 deletions

diff --git a/gnome-base/gnome-shell/ChangeLog b/gnome-base/gnome-shell/ChangeLog
index ab360d03498e..ccce8ae2e214 100644
--- a/gnome-base/gnome-shell/ChangeLog
+++ b/gnome-base/gnome-shell/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnome-base/gnome-shell
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.2 2011/10/21 02:22:11 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.3 2011/11/05 07:51:56 tetromino Exp $
+
+*gnome-shell-3.2.1-r1 (05 Nov 2011)
+
+  05 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gnome-shell-3.2.1-r1.ebuild,
+  +files/gnome-shell-3.2.1-messageTray-reduce-fade.patch,
+  +files/gnome-shell-3.2.1-theme-lighten-sent-message.patch:
+  Bump to 3.2.1 from the gnome overlay. Notable changes: built-in (and
+  non-optional) networkmanager UI, telepathy chat integration, removable media
+  UI, completely overhauled extension system, login-screen mode for gdm, and
+  many improvements and bugfixes.
 
   21 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-shell-3.0.2-r1.ebuild:
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index ac8994d40cda..66dcc546e76c 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -3,14 +3,18 @@ Hash: SHA256
 
 AUX gnome-shell-3.0.2-unbreak-extension-css.patch 3156 RMD160 bedd16d40e5c2ca63641878aab09f520cd7d1aef SHA1 4726b88a5ec797e827848dd1bcde518ead81bf8f SHA256 00f501167401bb98125c0df84340c3e15a60514fdb2f7fb83e60e3b7ec9ad615
 AUX gnome-shell-3.0.2-user-removed-signals.patch 1252 RMD160 74eeaa734afa678a03ab6aa108197871a076d504 SHA1 f419c8d6c69dc3a7232345e2730a1f34605227f7 SHA256 6ce72c46e9abbfa21e58abaeea872202df0609aaaa1233822f53758cfd901348
+AUX gnome-shell-3.2.1-messageTray-reduce-fade.patch 1625 RMD160 b525fe9d41b758d11b6372bd8294f5f6db94a9d6 SHA1 b417bd0a71be60caf553f34567c9ed1cb0376803 SHA256 a041beacbda9b85ed745911e1e2b28f0e3a9d4518dac7f329a1c342bc3fdc417
+AUX gnome-shell-3.2.1-theme-lighten-sent-message.patch 1181 RMD160 15dc31a7b5e5421c7a6a58befedf8222b87e9ea1 SHA1 e4f0d05ad3198b60be16cf8352a3cd7e3aeade9c SHA256 82495b9a76a70d0a81bbb1d6a01f4390a0de8b2ebe975fdf571ea5fb7312d278
 DIST gnome-shell-3.0.2.tar.bz2 1073613 RMD160 c94b73f53189026684a98aaa0ee301680fa54a92 SHA1 1dcdbb2fd77641edfb222fa9aad6efa1eaff9895 SHA256 a44963877da895d9b9f1ea98617067c5e88a5c4b414c6ccf0fcbfacdeac7db95
+DIST gnome-shell-3.2.1.tar.xz 1115744 RMD160 b56647fe0dc322110872ee8853d9253c7b870500 SHA1 62bcebbd7f274c6808212b85ad56d2edf894ecec SHA256 ac05e3133bd279c84812d8d3d8e362f8b33563cdc3e7a6aefa9c0b1c2aeab0eb
 EBUILD gnome-shell-3.0.2-r1.ebuild 4300 RMD160 c1e9857d9474225c13e45fe225467924fcc7bf7d SHA1 564a2c5577cbe936a095855ab8c1a46b1c632143 SHA256 e81bb356460a6bf4ddb06f16097acd55bb4918ecc475782fdbe79d3d5e8c1167
-MISC ChangeLog 750 RMD160 a1a72876a080e75bd321949b3b9ca64c9365130d SHA1 998fd7a335413f7cff6f24850c82a99eccb7e536 SHA256 006d6f032313058c329d91fe99bfb8815b987c9bff4b4711b7d3864a6381ae67
+EBUILD gnome-shell-3.2.1-r1.ebuild 4583 RMD160 a09f96f4c1bf425b1f1f6cdcb5cf0972618e1ae0 SHA1 7ab9f57c2182c5ebf6f5ec986e547c72170a1ac7 SHA256 77ab987c43ed8ee0ac78ebd592197835c8d062ecd825ca9a565cf67b490c3447
+MISC ChangeLog 1259 RMD160 cd93ea89e0069260dc9a8e3ada63d90c1f903b0c SHA1 412522d64e3a511fbb05a0ab13f24aae01943d6a SHA256 d1bbc505acc7b55ddd58cbbf10801c8e71fefb8db0feccc8fb5057c8ddfb3751
 MISC metadata.xml 344 RMD160 73c8f7dc01392af4b61b7e07158fc7a5873203f8 SHA1 00777bd2a77b1e7ecfd0615ae6351ff1252c3eab SHA256 cfc3dec563e033cb293df843e2ccb5fe123cfda6080641908f312ca53f63608b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6g11kACgkQdjK8w9WeBnBqQAEAk2qo8KmkA5qOt4WPiQMwy+kK
-uCp6yObCvwTsMd61y9oBAJ4Ql6m9bMrkLX0zcLH25rNwp8mlTYtIHpfucckg39MW
-=1v9W
+iF4EAREIAAYFAk606yIACgkQdjK8w9WeBnBNEAD+KzOUR7nRt6tJwPVlyUcNQ/BA
+ETTr0ULHe5vsrPX1y+UA/1ZdNl2ygokTPQrQQZ+4ijd59A6RmMBR4VXgI2SZ7VEU
+=0S40
 -----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
new file mode 100644
index 000000000000..22a4ce33faa9
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.2.1-messageTray-reduce-fade.patch
@@ -0,0 +1,40 @@
+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
new file mode 100644
index 000000000000..55052b757ad8
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.2.1-theme-lighten-sent-message.patch
@@ -0,0 +1,49 @@
+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
new file mode 100644
index 000000000000..5ae58635cc8e
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.2.1-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2011 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.1 2011/11/05 07:51:56 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
+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
+
+	>=app-accessibility/caribou-0.3"
+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
+}