Clean up old revision.

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key C6085806)

6 files changed, 11 insertions, 218 deletions

diff --git a/gnome-extra/gnome-shell-extensions/ChangeLog b/gnome-extra/gnome-shell-extensions/ChangeLog
index 5a31e3260c75..41e6c09dc15c 100644
--- a/gnome-extra/gnome-shell-extensions/ChangeLog
+++ b/gnome-extra/gnome-shell-extensions/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gnome-shell-extensions
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-shell-extensions/ChangeLog,v 1.7 2013/03/28 23:00:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-shell-extensions/ChangeLog,v 1.8 2013/03/29 22:39:03 eva Exp $
+
+  29 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  -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,
+  gnome-shell-extensions-3.8.0.ebuild:
+  Clean up old revision.
 
 *gnome-shell-extensions-3.8.0 (28 Mar 2013)
 
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
deleted file mode 100644
index 20afc2121d86..000000000000
--- a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.4.0-auto-move-windows-removed-crash.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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
deleted file mode 100644
index 83a043712112..000000000000
--- a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.4.0-places-menu-align.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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
deleted file mode 100644
index b9de71d44165..000000000000
--- a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.4.0-windowsNavigator-tooltip-crash.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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.4.0-r1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.4.0-r1.ebuild
deleted file mode 100644
index 52f662574da1..000000000000
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.4.0-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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.4.0-r1.ebuild,v 1.1 2012/05/14 00:06:38 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-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"
-IUSE="examples"
-KEYWORDS="~amd64 ~x86"
-
-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-20111211"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-libs/gjs-1.29
-	dev-libs/gobject-introspection
-	>=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
-	gnome-base/gnome-common"
-
-pkg_setup() {
-	DOCS="NEWS README"
-	G2CONF="${G2CONF}
-		--enable-extensions=all
-		--disable-schemas-compile"
-}
-
-src_prepare() {
-	# 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"
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-
-	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
-	else
-		rm -r "${ED}usr/share/gnome-shell/extensions/${example}" || die
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-	elog
-	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, 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."
-}
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.8.0.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.8.0.ebuild
index 4c58b2f160ec..b8a877370217 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.8.0.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.8.0.ebuild,v 1.1 2013/03/28 23:00:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.8.0.ebuild,v 1.2 2013/03/29 22:39:03 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -41,9 +41,7 @@ DEPEND="${COMMON_DEPEND}
 # eautoreconf needs gnome-base/gnome-common
 
 src_configure() {
-	G2CONF="${G2CONF}
-		--enable-extensions=all"
-	gnome2_src_configure
+	gnome2_src_configure --enable-extensions=all
 }
 
 src_install() {