Version bump for gnome-shell-3.4. Drop old.

(Portage version: 2.2.0_alpha104/cvs/Linux x86_64)

10 files changed, 162 insertions, 490 deletions

diff --git a/gnome-extra/gnome-shell-extensions/ChangeLog b/gnome-extra/gnome-shell-extensions/ChangeLog
index bc688350926e..ed745657a285 100644
--- a/gnome-extra/gnome-shell-extensions/ChangeLog
+++ b/gnome-extra/gnome-shell-extensions/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for gnome-extra/gnome-shell-extensions
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-shell-extensions/ChangeLog,v 1.4 2012/05/05 06:25:16 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-shell-extensions/ChangeLog,v 1.5 2012/05/14 00:06:38 tetromino Exp $
+
+*gnome-shell-extensions-3.4.0-r1 (14 May 2012)
+
+  14 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-shell-extensions-3.2.0-r2.ebuild,
+  -files/gnome-shell-extensions-3.2.0-dock-gnome-3.2.patch,
+  -files/gnome-shell-extensions-3.2.0-dock-popup-menus.patch,
+  -files/gnome-shell-extensions-3.2.0-gnome-3.2.1.patch,
+  -files/gnome-shell-extensions-3.2.0-systemMonitor-CSS.patch,
+  -files/gnome-shell-extensions-3.2.0-systemMonitor-enable-disable.patch,
+  +gnome-shell-extensions-3.4.0-r1.ebuild,
+  +files/gnome-shell-extensions-3.4.0-auto-move-windows-removed-crash.patch,
+  +files/gnome-shell-extensions-3.4.0-places-menu-align.patch,
+  +files/gnome-shell-extensions-3.4.0-windowsNavigator-tooltip-crash.patch:
+  Version bump for gnome-shell-3.4. Drop old.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org>
   gnome-shell-extensions-3.2.0-r2.ebuild, gnome-shell-extensions-3.2.2.ebuild:
diff --git a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.2.0-dock-gnome-3.2.patch b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.2.0-dock-gnome-3.2.patch
deleted file mode 100644
index 776c73700dc8..000000000000
--- a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.2.0-dock-gnome-3.2.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 66242aa76a5d59fb4659551575c1fbb42e50b8fb Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@src.gnome.org>
-Date: Tue, 18 Oct 2011 10:19:50 +0200
-Subject: [PATCH 1/2] Make dock extension actually work with gnome-3.2
-
-Without this patch dock is invisible, but reacts on mouse clicks
-
-Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
----
- extensions/dock/extension.js |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/extensions/dock/extension.js b/extensions/dock/extension.js
-index 240f8a8..02c9650 100644
---- a/extensions/dock/extension.js
-+++ b/extensions/dock/extension.js
-@@ -304,7 +304,6 @@ Dock.prototype = {
-             this.actor.show();
-         }));
-         Main.layoutManager.addChrome(this.actor);
--        this.actor.lower_bottom();
- 
-         //hidden
-         this._settings.connect('changed::'+DOCK_POSITION_KEY, Lang.bind(this, function (){
-@@ -372,6 +371,8 @@ Dock.prototype = {
- 
-         this.actor.connect('leave-event', Lang.bind(this, this._hideDock));
-         this.actor.connect('enter-event', Lang.bind(this, this._showDock));
-+
-+        this._hideDock();
-     },
- 
-     destroy: function() {
-@@ -861,4 +862,4 @@ function enable() {
- function disable() {
-     dock.destroy();
-     dock = null;
--}
-\ No newline at end of file
-+}
--- 
-1.7.7.2
-
diff --git a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.2.0-dock-popup-menus.patch b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.2.0-dock-popup-menus.patch
deleted file mode 100644
index e2cc380f3779..000000000000
--- a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.2.0-dock-popup-menus.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 967aee7aad2accfb38d91ab56b6c5e91d86a2722 Mon Sep 17 00:00:00 2001
-From: Stefan 'psYchotic' Zwanenburg <stefanhetzwaantje@gmail.com>
-Date: Wed, 12 Oct 2011 01:16:18 +0000
-Subject: dock: Fix popup menus
-
-The dock popup menus weren't working because a signal had been renamed
-('popup' -> 'open-state-changed').
-
-https://bugzilla.gnome.org/show_bug.cgi?id=661484
----
-diff --git a/extensions/dock/extension.js b/extensions/dock/extension.js
-index 47cd76f..240f8a8 100644
---- a/extensions/dock/extension.js
-+++ b/extensions/dock/extension.js
-@@ -682,7 +682,7 @@ DockIcon.prototype = {
-             this._menu.connect('activate-window', Lang.bind(this, function (menu, window) {
-                 this.activateWindow(window);
-             }));
--            this._menu.connect('popup', Lang.bind(this, function (menu, isPoppedUp) {
-+            this._menu.connect('open-state-changed', Lang.bind(this, function (menu, isPoppedUp) {
-                 if (!isPoppedUp){
-                     //Restore value of autohidedock
-                     this._dock._restoreHideDock();
-@@ -776,7 +776,6 @@ DockIconMenu.prototype = {
-         this._source = source;
- 
-         this.connect('activate', Lang.bind(this, this._onActivate));
--        this.connect('open-state-changed', Lang.bind(this, this._onOpenStateChanged));
- 
-         this.actor.add_style_class_name('dock-menu');
- 
---
-cgit v0.9.0.2
diff --git a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.2.0-gnome-3.2.1.patch b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.2.0-gnome-3.2.1.patch
deleted file mode 100644
index 3d7b408157df..000000000000
--- a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.2.0-gnome-3.2.1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Ensure that extensions are marked as compatible with gnome-shell-3.2
-(meaning 3.2.*), not just 3.2.0.
-
-diff --git a/extensions/alternate-tab/metadata.json.in b/extensions/alternate-tab/metadata.json.in
-index d811b54..8aa86e3 100644
---- a/extensions/alternate-tab/metadata.json.in
-+++ b/extensions/alternate-tab/metadata.json.in
-@@ -3,7 +3,7 @@
- "name": "AlternateTab",
- "description": "A replacement for Alt-Tab, allows to cycle between windows and does not group by application",
- "original-authors": [  "jw@bargsten.org", "thomas.bouffon@gmail.com" ],
--"shell-version": [ "@shell_current@" ],
-+"shell-version": [ "@shell_current@", "3.2" ],
- "localedir": "@LOCALEDIR@",
- "url": "@url@"
- }
-diff --git a/extensions/dock/metadata.json.in b/extensions/dock/metadata.json.in
-index dce4a88..96237b4 100644
---- a/extensions/dock/metadata.json.in
-+++ b/extensions/dock/metadata.json.in
-@@ -3,7 +3,7 @@
- "name": "Dock",
- "description": "A dock for the GNOME Shell -- displays favorite and running applications",
- "original-author": "tclaesson@gmail.com",
--"shell-version": [ "@shell_current@" ],
-+"shell-version": [ "@shell_current@", "3.2" ],
- "localedir": "@LOCALEDIR@",
- "url": "@url@"
- }
diff --git a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.2.0-systemMonitor-CSS.patch b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.2.0-systemMonitor-CSS.patch
deleted file mode 100644
index dd8822d7b1d8..000000000000
--- a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.2.0-systemMonitor-CSS.patch
+++ /dev/null
@@ -1,316 +0,0 @@
-From 4c5a36e4c0cbe38f2e26b6b3c8b02e88b4b939f7 Mon Sep 17 00:00:00 2001
-From: Jason Siefken <siefkenj@gmail.com>
-Date: Tue, 11 Oct 2011 02:15:05 -0700
-Subject: Added prettier drawing operations and css colors
-
-https://bugzilla.gnome.org/show_bug.cgi?id=661443
----
- extensions/systemMonitor/extension.js   |  186 ++++++++++++++++++++++--------
- extensions/systemMonitor/stylesheet.css |   25 +++--
- 2 files changed, 152 insertions(+), 59 deletions(-)
-
-diff --git a/extensions/systemMonitor/extension.js b/extensions/systemMonitor/extension.js
-index db7fe59..39801ab 100644
---- a/extensions/systemMonitor/extension.js
-+++ b/extensions/systemMonitor/extension.js
-@@ -9,6 +9,9 @@ const Shell = imports.gi.Shell;
- 
- const Main = imports.ui.main;
- 
-+const INDICATOR_UPDATE_INTERVAL = 500;
-+const INDICATOR_NUM_GRID_LINES = 3;
-+
- let _cpuIndicator;
- let _memIndicator;
- let _box;
-@@ -19,29 +22,24 @@ function Indicator() {
- 
- Indicator.prototype = {
-     _init: function() {
--	this._initValues();
--        this.actor = new St.DrawingArea({ style_class: "extension-systemMonitor-indicator-area",
--                                          reactive: true});
--        this.actor.connect('repaint', Lang.bind(this, this._draw));
--        this.actor.connect('button-press-event', function() {
-+        this._initValues();
-+        this.drawing_area = new St.DrawingArea({ reactive: true });
-+        this.drawing_area.width = 100; this.drawing_area.height = 100;
-+        this.drawing_area.connect('repaint', Lang.bind(this, this._draw));
-+        this.drawing_area.connect('button-press-event', function() {
-             let app = Shell.AppSystem.get_default().lookup_app('gnome-system-monitor.desktop');
-             app.open_new_window(-1);
-         });
- 
--	this._timeoutId = Mainloop.timeout_add(250, Lang.bind(this, function () {
--	    this._updateValues();
--            this.actor.queue_repaint();
--            return true;
--	}));
--    },
-+        this.actor = new St.Bin({ style_class: "extension-systemMonitor-indicator-area",
-+                                  reactive: true});
-+        this.actor.add_actor(this.drawing_area);
- 
--    destroy: function() {
--        if (this._timeoutId) {
--            Mainloop.source_remove(this._timeoutId);
--            this._timeoutId = 0;
--        }
--
--        this.actor.destroy();
-+        Mainloop.timeout_add(INDICATOR_UPDATE_INTERVAL, Lang.bind(this, function () {
-+            this._updateValues();
-+            this.drawing_area.queue_repaint();
-+            return true;
-+        }));
-     },
- 
-     _initValues: function() {
-@@ -54,23 +52,83 @@ Indicator.prototype = {
-         let [width, height] = area.get_surface_size();
-         let themeNode = this.actor.get_theme_node();
-         let cr = area.get_context();
--        for (let i = this.values.length - 1; i >= 0; i--) {
--            let color = themeNode.get_color(this.values[i].color);
--            cr.moveTo(0, height);
--            let k;
--            for (k = 0; k < this.values[i].values.length; k++) {
--                cr.lineTo(k, (1 - this.values[i].values[k]) * height);
-+
-+        //draw the background grid
-+        let color = themeNode.get_color(this.gridColor);
-+        let gridOffset = Math.floor(height / (INDICATOR_NUM_GRID_LINES + 1));
-+        for (let i = 1; i <= INDICATOR_NUM_GRID_LINES; ++i) {
-+                cr.moveTo(0, i * gridOffset + .5);
-+                cr.lineTo(width, i * gridOffset + .5);
-+        }
-+        Clutter.cairo_set_source_color(cr, color);
-+        cr.setLineWidth(1);
-+        cr.setDash([4,1], 0);
-+        cr.stroke();
-+        
-+        //draw the foreground
-+
-+        function makePath(values, reverse, nudge) {
-+            if (nudge == null) {
-+                nudge = 0;
-             }
--            if (k > width)
--                this.values[i].values.shift();
--            cr.lineTo(k, height);
--            cr.lineTo(0, height);
--            cr.closePath();
--            Clutter.cairo_set_source_color(cr, color);
-+            //if we are going in reverse, we are completing the bottom of a chart, so use lineTo
-+            if (reverse) {
-+                cr.lineTo(values.length - 1, (1 - values[values.length - 1]) * height + nudge);
-+                for (let k = values.length - 2; k >= 0; --k) {
-+                    cr.lineTo(k, (1 - values[k]) * height + nudge);
-+                }
-+            } else {
-+                cr.moveTo(0, (1 - values[0]) * height + nudge);
-+                for (let k = 1; k < values.length; ++k) {
-+                    cr.lineTo(k, (1 - values[k]) * height + nudge);
-+                }
- 
--	    cr.fill();
-+            }
-+        }
-+        
-+        let renderStats = this.renderStats;
-+
-+        // Make sure we don't have more sample points than pixels
-+        renderStats.map(Lang.bind(this, function(k){
-+            let stat = this.stats[k];
-+            if (stat.values.length > width) {
-+                stat.values = stat.values.slice(stat.values.length - width, stat.values.length);
-+            }
-+        }));
-+
-+        for (let i = 0; i < renderStats.length; ++i) {
-+            let stat = this.stats[renderStats[i]];
-+            // We outline at full opacity and fill with 40% opacity
-+            let outlineColor = themeNode.get_color(stat.color);
-+            let color = new Clutter.Color(outlineColor);
-+            color.alpha = color.alpha * .4;
-+           
-+            // Render the background between us and the next level
-+            makePath(stat.values, false);
-+            // If there is a process below us, render the cpu between us and it, otherwise, 
-+            // render to the bottom of the chart
-+            if (i == renderStats.length - 1) {
-+                cr.lineTo(stat.values.length - 1, height);
-+                cr.lineTo(0, height);
-+                cr.closePath();
-+            } else {
-+                let nextStat = this.stats[renderStats[i+1]];
-+                makePath(nextStat.values, true);
-+            }
-+            cr.closePath()
-+            Clutter.cairo_set_source_color(cr, color);
-+            cr.fill();
-+            
-+            // Render the outline of this level
-+            makePath(stat.values, false, .5);
-+            Clutter.cairo_set_source_color(cr, outlineColor);
-+            cr.setLineWidth(1.0);
-+            cr.setDash([], 0);
-+            cr.stroke();
-         }
-+
-     }
-+
- };
- 
- function CpuIndicator() {
-@@ -80,14 +138,28 @@ function CpuIndicator() {
- CpuIndicator.prototype = {
-     __proto__: Indicator.prototype,
- 
-+    _init: function() {
-+        Indicator.prototype._init.call(this);
-+        this.gridColor = '-grid-color';
-+        this.renderStats = [ 'cpu-user', 'cpu-sys', 'cpu-iowait' ];
-+        
-+        // Make sure renderStats is sorted as necessary for rendering
-+        let renderStatOrder = {'cpu-total': 0, 'cpu-user': 1, 'cpu-sys': 2, 'cpu-iowait': 3};
-+        this.renderStats = this.renderStats.sort(function(a,b) {
-+            return renderStatOrder[a] - renderStatOrder[b];
-+        });
-+    },
-+
-     _initValues: function() {
-         this._prev = new GTop.glibtop_cpu;
-         GTop.glibtop_get_cpu(this._prev);
- 
--	this.values = [];
--	this.values.push({color: "-cpu-user-color", values: []});
--	this.values.push({color: "-cpu-sys-color", values: []});
--	this.values.push({color: "-cpu-iowait-color", values: []});
-+        this.stats = { 
-+                       'cpu-user': {color: '-cpu-user-color', values: []},
-+                       'cpu-sys': {color: '-cpu-sys-color', values: []},
-+                       'cpu-iowait': {color: '-cpu-iowait-color', values: []},
-+                       'cpu-total': {color: '-cpu-total-color', values: []} 
-+                     };
-     },
- 
-     _updateValues: function() {
-@@ -98,15 +170,16 @@ CpuIndicator.prototype = {
-         let user = cpu.user - this._prev.user;
-         let sys = cpu.sys - this._prev.sys;
-         let iowait = cpu.iowait - this._prev.iowait;
-+        let idle = cpu.idle - this._prev.idle;
- 
--        t = user / total;
--        this.values[0].values.push(t);
--
--        t += sys / total;
--        this.values[1].values.push(t);
-         t += iowait / total;
--        this.values[2].values.push(t);
--
-+        this.stats['cpu-iowait'].values.push(t);
-+        t += sys / total;
-+        this.stats['cpu-sys'].values.push(t);
-+        t += user / total;
-+        this.stats['cpu-user'].values.push(t);
-+        this.stats['cpu-total'].values.push(1 - idle / total);
-+        
-         this._prev = cpu;
-     }
- };
-@@ -117,24 +190,37 @@ function MemoryIndicator() {
- 
- MemoryIndicator.prototype = {
-     __proto__: Indicator.prototype,
-+    
-+    _init: function() {
-+        Indicator.prototype._init.call(this);
-+        this.gridColor = '-grid-color';
-+        this.renderStats = [ 'mem-user', 'mem-other', 'mem-cached' ];
-+        
-+        // Make sure renderStats is sorted as necessary for rendering
-+        let renderStatOrder = { 'mem-cached': 0, 'mem-other': 1, 'mem-user': 2 };
-+        this.renderStats = this.renderStats.sort(function(a,b) {
-+            return renderStatOrder[a] - renderStatOrder[b];
-+        });
-+    },
- 
-     _initValues: function() {
-         this.mem = new GTop.glibtop_mem;
--	this.values = [];
--        this.values.push({ color: "-mem-user-color", values: [] });
--        this.values.push({ color: "-mem-other-color", values: [] });
--        this.values.push({ color: "-mem-cached-color", values: [] });
-+        this.stats = {
-+                        'mem-user': { color: "-mem-user-color", values: [] },
-+                        'mem-other': { color: "-mem-other-color", values: [] },
-+                        'mem-cached': { color: "-mem-cached-color", values: [] }
-+                     };
-     },
- 
-     _updateValues: function() {
-         GTop.glibtop_get_mem(this.mem);
- 
-         let t = this.mem.user / this.mem.total;
--        this.values[0].values.push(t);
-+        this.stats['mem-user'].values.push(t);
-         t += (this.mem.used - this.mem.user - this.mem.cached) / this.mem.total;
--        this.values[1].values.push(t);
-+        this.stats['mem-other'].values.push(t);
-         t += this.mem.cached / this.mem.total;
--        this.values[2].values.push(t);
-+        this.stats['mem-cached'].values.push(t);
-     }
- };
- 
-@@ -143,7 +229,7 @@ function init() {
- }
- 
- function enable() {
--    _cpuIndicator = new CpuIndicator(); 
-+    _cpuIndicator = new CpuIndicator();
-     _memIndicator = new MemoryIndicator();
-     _box = new St.BoxLayout({ style_class: 'extension-systemMonitor-container' });
-     _box.add(_cpuIndicator.actor);
-diff --git a/extensions/systemMonitor/stylesheet.css b/extensions/systemMonitor/stylesheet.css
-index 26aad6b..daad48d 100644
---- a/extensions/systemMonitor/stylesheet.css
-+++ b/extensions/systemMonitor/stylesheet.css
-@@ -1,16 +1,23 @@
- .extension-systemMonitor-container {
-     spacing: 5px;
-+    padding-left: 5px;
-+    padding-right: 5px;
-+    padding-bottom: 1px;
-+    padding-top: 0px;
- }
- 
- .extension-systemMonitor-indicator-area {
--    border: 1px solid #000;
-+    border: 1px solid #8d8d8d;
-+    border-radius: 3px;
-     width: 100px;
--    height: 34px;
--    -cpu-user-color: #f00;
--    -cpu-sys-color: #0f0;
--    -cpu-iowait-color: #00f;
--    -mem-user-color: #ff0;
--    -mem-cached-color: #0ff;
--    -mem-other-color: #111;
--    background-color: #fff;
-+    height: 30px;
-+    -grid-color: #575757;
-+    -cpu-total-color: rgb(0,154,62);
-+    -cpu-user-color: rgb(69,154,0);
-+    -cpu-sys-color: rgb(255,253,81);
-+    -cpu-iowait-color: rgb(210,148,0);
-+    -mem-user-color: rgb(210,148,0);
-+    -mem-cached-color: rgb(90,90,90);
-+    -mem-other-color: rgb(205,203,41);
-+    background-color: #1e1e1e;
- }
--- 
-1.7.7.2
-
diff --git a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.2.0-systemMonitor-enable-disable.patch b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.2.0-systemMonitor-enable-disable.patch
deleted file mode 100644
index 2fd4229ad1fc..000000000000
--- a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.2.0-systemMonitor-enable-disable.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 2bba98d6214cffae2eb5cecb9d7c1f6b6d244052 Mon Sep 17 00:00:00 2001
-From: "Jasper St. Pierre" <jstpierre@mecheye.net>
-Date: Tue, 25 Oct 2011 14:21:01 -0400
-Subject: systemMonitor: Properly enable/disable
-
-https://bugzilla.gnome.org/show_bug.cgi?id=662705
----
- extensions/systemMonitor/extension.js |    9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
-
-diff --git a/extensions/systemMonitor/extension.js b/extensions/systemMonitor/extension.js
-index 39801ab..6aa117a 100644
---- a/extensions/systemMonitor/extension.js
-+++ b/extensions/systemMonitor/extension.js
-@@ -35,13 +35,18 @@ Indicator.prototype = {
-                                   reactive: true});
-         this.actor.add_actor(this.drawing_area);
- 
--        Mainloop.timeout_add(INDICATOR_UPDATE_INTERVAL, Lang.bind(this, function () {
-+        this._timeout = Mainloop.timeout_add(INDICATOR_UPDATE_INTERVAL, Lang.bind(this, function () {
-             this._updateValues();
-             this.drawing_area.queue_repaint();
-             return true;
-         }));
-     },
- 
-+    destroy: function() {
-+        Mainloop.source_remove(this._timeout);
-+        this.actor.destroy();
-+    },
-+
-     _initValues: function() {
-     },
- 
-@@ -239,6 +244,8 @@ function enable() {
- 
- function disable() {
-     _cpuIndicator.destroy();
-+    _cpuIndicator = null;
-     _memIndicator.destroy();
-+    _memIndicator = null;
-     _box.destroy();
- }
--- 
-1.7.7.2
-
diff --git a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.4.0-auto-move-windows-removed-crash.patch b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.4.0-auto-move-windows-removed-crash.patch
new file mode 100644
index 000000000000..20afc2121d86
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.4.0-auto-move-windows-removed-crash.patch
@@ -0,0 +1,42 @@
+From f77bf60bcba745e1615a0644fda12ac47aa1ee41 Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna@src.gnome.org>
+Date: Sun, 29 Apr 2012 21:11:00 +0200
+Subject: [PATCH] auto-move-windows/prefs: filter out apps that don't exist
+
+Recognize if the desktop file no longer exists and remove its
+entry in GSettings, instead of crashing because of a null GAppInfo.
+---
+ extensions/auto-move-windows/prefs.js |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/extensions/auto-move-windows/prefs.js b/extensions/auto-move-windows/prefs.js
+index 6f525f3..9662993 100644
+--- a/extensions/auto-move-windows/prefs.js
++++ b/extensions/auto-move-windows/prefs.js
+@@ -183,9 +183,13 @@ const Widget = new GObject.Class({
+ 	this._store.clear();
+ 
+ 	let currentItems = this._settings.get_strv(SETTINGS_KEY);
++	let validItems = [ ];
+ 	for (let i = 0; i < currentItems.length; i++) {
+ 	    let [id, index] = currentItems[i].split(':');
+ 	    let appInfo = Gio.DesktopAppInfo.new(id);
++	    if (!appInfo)
++		continue;
++	    validItems.push(currentItems[i]);
+ 
+ 	    let iter = this._store.append();
+ 	    let adj = new Gtk.Adjustment({ lower: 1,
+@@ -196,6 +200,9 @@ const Widget = new GObject.Class({
+ 			    [Columns.APPINFO, Columns.ICON, Columns.DISPLAY_NAME, Columns.WORKSPACE, Columns.ADJUSTMENT],
+ 			    [appInfo, appInfo.get_icon(), appInfo.get_display_name(), parseInt(index), adj]);
+ 	}
++
++	if (validItems.length != currentItems.length) // some items were filtered out
++	    this._settings.set_strv(SETTINGS_KEY, validItems);
+     },
+ 
+     _appendItem: function(id, workspace) {
+-- 
+1.7.8.6
+
diff --git a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.4.0-places-menu-align.patch b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.4.0-places-menu-align.patch
new file mode 100644
index 000000000000..83a043712112
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.4.0-places-menu-align.patch
@@ -0,0 +1,49 @@
+From 5ca9f35a955b9c7cd6bd0479d40cb8b4aabef2c8 Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna@src.gnome.org>
+Date: Sat, 14 Apr 2012 00:41:12 +0200
+Subject: [PATCH] places-menu: fix allocation of the icon
+
+Because the popup-menu min-width imposed by the theme was bigger
+than the natural size of the menu, and because core shell code
+cannot deal with that, the icon was not right aligned unless
+"Removable devices" was showing.
+Hack around that by setting span: -1, which pushes it to end of
+the menu item.
+---
+ extensions/places-menu/extension.js |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/extensions/places-menu/extension.js b/extensions/places-menu/extension.js
+index 418d249..dcb724a 100644
+--- a/extensions/places-menu/extension.js
++++ b/extensions/places-menu/extension.js
+@@ -65,7 +65,7 @@ const PlacesMenu = new Lang.Class({
+         for (let placeid = 0; placeid < this.defaultPlaces.length; placeid++) {
+             this.defaultItems[placeid] = new PopupMenu.PopupMenuItem(this.defaultPlaces[placeid].name);
+             let icon = this.defaultPlaces[placeid].iconFactory(PLACE_ICON_SIZE);
+-            this.defaultItems[placeid].addActor(icon, { align: St.Align.END });
++            this.defaultItems[placeid].addActor(icon, { align: St.Align.END, span: -1 });
+             this.defaultItems[placeid].place = this.defaultPlaces[placeid];
+             this.menu.addMenuItem(this.defaultItems[placeid]);
+             this.defaultItems[placeid].connect('activate', function(actor,event) {
+@@ -81,7 +81,7 @@ const PlacesMenu = new Lang.Class({
+         for (let bookmarkid = 0; bookmarkid < this.bookmarks.length; bookmarkid++) {
+             this.bookmarkItems[bookmarkid] = new PopupMenu.PopupMenuItem(this.bookmarks[bookmarkid].name);
+             let icon = this.bookmarks[bookmarkid].iconFactory(PLACE_ICON_SIZE);
+-            this.bookmarkItems[bookmarkid].addActor(icon, { align: St.Align.END });
++            this.bookmarkItems[bookmarkid].addActor(icon, { align: St.Align.END, span: -1 });
+             this.bookmarkItems[bookmarkid].place = this.bookmarks[bookmarkid];
+             this._bookmarksSection.addMenuItem(this.bookmarkItems[bookmarkid]);
+             this.bookmarkItems[bookmarkid].connect('activate', function(actor,event) {
+@@ -96,7 +96,7 @@ const PlacesMenu = new Lang.Class({
+         for (let devid = 0; devid < this.devices.length; devid++) {
+             this.deviceItems[devid] = new PopupMenu.PopupMenuItem(this.devices[devid].name);
+             let icon = this.devices[devid].iconFactory(PLACE_ICON_SIZE);
+-            this.deviceItems[devid].addActor(icon, { align: St.Align.END });
++            this.deviceItems[devid].addActor(icon, { align: St.Align.END, span: -1 });
+             this.deviceItems[devid].place = this.devices[devid];
+             this._devicesMenuItem.menu.addMenuItem(this.deviceItems[devid]);
+             this.deviceItems[devid].connect('activate', function(actor,event) {
+-- 
+1.7.8.6
+
diff --git a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.4.0-windowsNavigator-tooltip-crash.patch b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.4.0-windowsNavigator-tooltip-crash.patch
new file mode 100644
index 000000000000..b9de71d44165
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.4.0-windowsNavigator-tooltip-crash.patch
@@ -0,0 +1,36 @@
+From e1c1fc73e222ba92e9f9b6d6d75109ca793be0ea Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna@src.gnome.org>
+Date: Thu, 26 Apr 2012 22:50:11 +0200
+Subject: [PATCH] windowsNavigator: only access tooltip if it's known to exist
+
+Apparently, windowOverlay._text can be null sometimes. In that
+case, do nothing instead of crashing.
+---
+ extensions/windowsNavigator/extension.js |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/extensions/windowsNavigator/extension.js b/extensions/windowsNavigator/extension.js
+index 3ec4abf..35188e3 100644
+--- a/extensions/windowsNavigator/extension.js
++++ b/extensions/windowsNavigator/extension.js
+@@ -34,7 +34,7 @@ function enable() {
+     resetState();
+ 
+     Workspace.WindowOverlay.prototype.setId = function(id) {
+-        if (this._text.visible && id == null)
++        if (this._text && this._text.visible && id == null)
+             this._text.hide();
+         this._id = id;
+         if (id != null)
+@@ -57,7 +57,7 @@ function enable() {
+     winInjections['showTooltip'] = undefined;
+ 
+     Workspace.WindowOverlay.prototype.hideTooltip = function() {
+-        if (this._text.visible)
++        if (this._text && this._text.visible)
+             this._text.hide();
+     }
+     winInjections['hideTooltip'] = undefined;
+-- 
+1.7.8.6
+
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.2.0-r2.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.4.0-r1.ebuild
index 768eb0b19c6c..52f662574da1 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.2.0-r2.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.4.0-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-extra/gnome-shell-extensions/gnome-shell-extensions-3.2.0-r2.ebuild,v 1.3 2012/05/05 06:25:16 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.4.0-r1.ebuild,v 1.1 2012/05/14 00:06:38 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -10,6 +10,8 @@ inherit eutils gnome2
 
 DESCRIPTION="JavaScript extensions for GNOME Shell"
 HOMEPAGE="http://live.gnome.org/GnomeShell/Extensions"
+# Tarball not available from upstream website
+SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,19 +22,19 @@ COMMON_DEPEND="
 	>=dev-libs/glib-2.26
 	>=gnome-base/gnome-desktop-2.91.6:3[introspection]
 	>=gnome-base/libgtop-2.28.3[introspection]
-	app-admin/eselect-gnome-shell-extensions"
+	>=app-admin/eselect-gnome-shell-extensions-20111211"
 RDEPEND="${COMMON_DEPEND}
 	>=dev-libs/gjs-1.29
 	dev-libs/gobject-introspection
-	=gnome-base/gnome-shell-3.2*
+	>=gnome-base/gnome-shell-3.4.0-r1
 	media-libs/clutter:1.0[introspection]
 	net-libs/telepathy-glib[introspection]
 	x11-libs/gtk+:3[introspection]
 	x11-libs/pango[introspection]"
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
+	>=dev-util/intltool-0.50
 	virtual/pkgconfig
-	>=dev-util/intltool-0.26
 	gnome-base/gnome-common"
 
 pkg_setup() {
@@ -43,27 +45,18 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
-	# Useful patches from upstream, will be in the next release
-	epatch "${FILESDIR}/${P}-dock-popup-menus.patch"
-	epatch "${FILESDIR}/${P}-dock-gnome-3.2.patch"
-	epatch "${FILESDIR}/${P}-systemMonitor-CSS.patch"
-	epatch "${FILESDIR}/${P}-systemMonitor-enable-disable.patch"
+	# Useful upstream patches
+	epatch "${FILESDIR}/${P}-places-menu-align.patch"
+	epatch "${FILESDIR}/${P}-windowsNavigator-tooltip-crash.patch"
+	epatch "${FILESDIR}/${P}-auto-move-windows-removed-crash.patch"
 
-	# Extensions work with gnome-3.2*, not just 3.2.0
-	epatch "${FILESDIR}/${PN}-3.2.0-gnome-3.2.1.patch"
-
-	# xrandr-indicator crashes gnome-shell with <gjs-0.7.15;
-	# see gnome bug 649077. For simplicity, just disable it for gnome-3.0.
-	# sed -e 's:\(ALL_EXTENSIONS=.*\)xrandr-indicator:\1:' \
-	#	-i configure || die
+	gnome2_src_prepare
 }
 
 src_install() {
 	gnome2_src_install
 
-	local example="example@gnome-shell-extensions.gnome.org"
+	local example="example@gnome-shell-extensions.gcampax.github.com"
 	if use examples; then
 		mv "${ED}usr/share/gnome-shell/extensions/${example}" \
 			"${ED}usr/share/doc/${PF}/" || die
@@ -82,8 +75,12 @@ pkg_postinst() {
 	elog "Installed extensions installed are initially disabled by default."
 	elog "To change the system default and enable some extensions, you can use"
 	elog "# eselect gnome-shell-extensions"
-	elog "Alternatively, you can use the org.gnome.shell enabled-extensions"
-	elog "gsettings key to change the disabled extension list per-user, or"
-	elog "use the gnome-extra/gnome-tweak-tool GUI."
+	elog "Alternatively, to enable/disable extensions on a per-user basis,"
+	elog "you can use the https://extensions.gnome.org/ web interface, the"
+	elog "gnome-extra/gnome-tweak-tool GUI, or modify the org.gnome.shell"
+	elog "enabled-extensions gsettings key from the command line or a script."
 	elog
+	elog "In ${PN}-3.2.2, extension IDs have changed from"
+	elog "*.gnome.org to *.gcampax.github.com. As a result, extensions may"
+	elog "have become disabled, and you will need to re-enable them."
 }