gnome-base/gnome-shell: restore 3.1.4

Restore 3.1.4 (with a patch for gobject-introspection-1.29.17 compat)
since 3.1.90 appears to be somewhat unstable. The instability does not
appear to depend on extensions after all, so remove the blocker and
warnings.

4 files changed, 217 insertions, 14 deletions

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 833575c7..37b83082 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,8 +1,11 @@
+AUX gnome-shell-3.1.4-gi-1.29.17.patch 2636 RMD160 4f50ca3ae693726c6e6c532801e89c78e9e5a965 SHA1 6275d4d5c6d79c6d874c8d65e54bfbb2318fe552 SHA256 7eb4eec292c53eef3fad38d8a538bc267e322bd3bece66552d4173d31b3d0049
 AUX gnome-shell-3.1.90-default-avatar.patch 809 RMD160 6e409eb33a3d4e24080328da82dc3cfeb5f6f2bf SHA1 39197275c214d7bfd7943e776c397bf7a7a28af0 SHA256 7723f67878c000b3fd4626d7a28995f474681b434b19a03bfe03b1d352e59cca
 AUX gnome-shell-3.1.90-folks-crash.patch 1076 RMD160 8420540177746829fbf3bd40305ca0484e2d6fa4 SHA1 b0de4b2db465466238b22922fe8d7e4ac3a78e91 SHA256 b2a53c318902fcd74c12e5b88db80f54a23480a23d6315caaa54dd99359fded7
 AUX gnome-shell-3.1.90-gdm-batch.patch 798 RMD160 82d2a59d170a79b74316f52d8d1da2bd435d176d SHA1 8f48df402112a5f99f18afd5afbc66e4e07f6101 SHA256 a9ea93f56a578c510820c792ff451348a3dd31498e1b7950214a3134ee75f226
 AUX gnome-shell-3.1.90-gi-1.29.17.patch 2350 RMD160 c28faf9a821d270cc5ef74e4735bc428b034326f SHA1 f6f0fb8b964c5c5f6f530cdb87b5d46e20e1197a SHA256 4a91d02616c3c3dc254af35475a7f61583af301fa4f761f4bbb26d2beaa5155c
 AUX gnome-shell-3.1.90-telepathy-status.patch 1489 RMD160 c49a8dd5dbc2dd2298d162afa51a8c774bf845fe SHA1 7faefe8c8a91bce2156bd4718737b5684feb86ba SHA256 8bbf841e83b01e481c6da6684bfe1ed281fdcc5003c6e1df26c97c815e50777e
+DIST gnome-shell-3.1.4.tar.xz 1002024 RMD160 2dbf1f4c7f41b70dbb9eaa26a2b07f4d4c9b93e9 SHA1 0e3c09c382cfe4f994f76d8ca50ef28ac0a9d52b SHA256 bcb6eed9731233a2c57cd39b608d197445755e77fc431e524e6b7a0ec02dbbee
 DIST gnome-shell-3.1.90.tar.xz 1022100 RMD160 479ea0ef2769fc905359da793e27b8721cc9ad9d SHA1 ef3032f5e930c66708926aaf66c31d654ba08fe3 SHA256 310754ecd7a0b40b46e93fdbde8ccb5477c12a3835640f99224cb8c2fb8a2a6d
-EBUILD gnome-shell-3.1.90.ebuild 4699 RMD160 f41429a52566d972a059623dd8ad2340a0a79a15 SHA1 774781418d0bec6f71a903206d25fdad11c8327e SHA256 8bb466c2d56590884a2ee9cf8460ef737efc631f6139d47b18e4550b7d1f18ca
+EBUILD gnome-shell-3.1.4.ebuild 3933 RMD160 8cbe800241baaf70bef3f8d3cc376aef0ed25928 SHA1 5d3a4c8378bfa760fa16f5b2c6aebd2fc459b190 SHA256 2947ba3e88054603216bf2485bc6ebf4366052b672f9459c4bd05bacae330425
+EBUILD gnome-shell-3.1.90.ebuild 4188 RMD160 5e603c64d6fcc5a513b14ea04d89cff083f4114c SHA1 3378947c8d1c78710db37fbd06a01767c30cd703 SHA256 dee758c1f1e60bd581159a8bad73647e27babb1d9e21712830d89f145e2ad61c
 EBUILD gnome-shell-9999.ebuild 4324 RMD160 0a33903f7ca3076fd9e5992c62c4526857bcc71c SHA1 083f6dc4b9dc12bc148b827bf23ed1d7876d3575 SHA256 f0b47564e51be3df4feacc135612f250e4e1e7b7617a0294513f44c1a5e34ed8
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.4-gi-1.29.17.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.4-gi-1.29.17.patch
new file mode 100644
index 00000000..6aebc44b
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.1.4-gi-1.29.17.patch
@@ -0,0 +1,82 @@
+From 92d0cce50c9baac2a24d840b1db39f2627a02480 Mon Sep 17 00:00:00 2001
+From: Dan Winship <danw@gnome.org>
+Date: Tue, 30 Aug 2011 12:07:11 -0400
+Subject: [PATCH] Add some (element-type) annotations to appease g-i master
+
+[Alexandre Rostovtsev <tetromino@gmail.com>: backport to 3.1.4]
+---
+ src/gvc/gvc-mixer-card.c   |    9 +++++++++
+ src/gvc/gvc-mixer-stream.c |    9 +++++++++
+ src/shell-app-system.c     |    2 +-
+ 3 files changed, 19 insertions(+), 1 deletions(-)
+
+diff --git a/src/gvc/gvc-mixer-card.c b/src/gvc/gvc-mixer-card.c
+index 56502e3..168bc79 100644
+--- a/src/gvc/gvc-mixer-card.c
++++ b/src/gvc/gvc-mixer-card.c
+@@ -263,6 +263,11 @@ gvc_mixer_card_change_profile (GvcMixerCard *card,
+         return TRUE;
+ }
+ 
++/**
++ * gvc_mixer_card_get_profiles:
++ *
++ * Return value: (transfer none) (element-type GvcMixerCardProfile):
++ */
+ const GList *
+ gvc_mixer_card_get_profiles (GvcMixerCard *card)
+ {
+@@ -281,6 +286,10 @@ sort_profiles (GvcMixerCardProfile *a,
+         return -1;
+ }
+ 
++/**
++ * gvc_mixer_card_set_profiles:
++ * @profiles: (transfer full) (element-type GvcMixerCardProfile):
++ */
+ gboolean
+ gvc_mixer_card_set_profiles (GvcMixerCard *card,
+                              GList        *profiles)
+diff --git a/src/gvc/gvc-mixer-stream.c b/src/gvc/gvc-mixer-stream.c
+index 78de6b3..f35954a 100644
+--- a/src/gvc/gvc-mixer-stream.c
++++ b/src/gvc/gvc-mixer-stream.c
+@@ -508,6 +508,11 @@ gvc_mixer_stream_change_port (GvcMixerStream *stream,
+         return GVC_MIXER_STREAM_GET_CLASS (stream)->change_port (stream, port);
+ }
+ 
++/**
++ * gvc_mixer_stream_get_ports:
++ *
++ * Return value: (transfer none) (element-type GvcMixerStreamPort):
++ */
+ const GList *
+ gvc_mixer_stream_get_ports (GvcMixerStream *stream)
+ {
+@@ -526,6 +531,10 @@ sort_ports (GvcMixerStreamPort *a,
+         return -1;
+ }
+ 
++/**
++ * gvc_mixer_stream_set_ports:
++ * @ports: (transfer full) (element-type GvcMixerStreamPort):
++ */
+ gboolean
+ gvc_mixer_stream_set_ports (GvcMixerStream *stream,
+                             GList          *ports)
+diff --git a/src/shell-app-system.c b/src/shell-app-system.c
+index b52625a..a578e69 100644
+--- a/src/shell-app-system.c
++++ b/src/shell-app-system.c
+@@ -1399,7 +1399,7 @@ _gather_pid_callback (GDesktopAppInfo   *gapp,
+ /**
+  * shell_app_info_launch_full:
+  * @timestamp: Event timestamp, or 0 for current event timestamp
+- * @uris: List of uris to pass to application
++ * @uris: (element-type utf8): List of uris to pass to application
+  * @workspace: Start on this workspace, or -1 for default
+  * @startup_id: (out): Returned startup notification ID, or %NULL if none
+  * @error: A #GError
+-- 
+1.7.6.1
+
diff --git a/gnome-base/gnome-shell/gnome-shell-3.1.4.ebuild b/gnome-base/gnome-shell/gnome-shell-3.1.4.ebuild
new file mode 100644
index 00000000..d0c4ba3d
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.1.4.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+GNOME_TARBALL_SUFFIX="xz"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2:2.5"
+
+inherit gnome2 python
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="http://live.gnome.org/GnomeShell"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+nm-applet"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+# 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.15
+	>=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]
+	>=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.3[introspection]
+	>=net-wireless/gnome-bluetooth-3.1.0[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	>=x11-wm/mutter-3.0.0[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
+	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
+# 6. nm-applet is needed for auth prompting and the wireless connection dialog
+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.12
+
+	nm-applet? (
+		>=gnome-extra/nm-applet-0.8.999
+		>=net-misc/networkmanager-0.8.999[introspection] )"
+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 README"
+	# Don't error out on warnings
+	G2CONF="${G2CONF}
+		--enable-compile-warnings=maximum
+		--disable-schemas-compile
+		--disable-jhbuild-wrapper-script"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+	# gobject-introspection-1.29.17 compat, backported to gnome-shell-3.1.4
+	epatch "${FILESDIR}/${P}-gi-1.29.17.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
+}
diff --git a/gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild b/gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild
index 95594a2a..258babed 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild
@@ -88,11 +88,7 @@ RDEPEND="${COMMON_DEPEND}
 
 	>=sys-apps/accountsservice-0.6.12
 
-	>=app-accessibility/caribou-0.3
-
-	!!<=gnome-extra/gnome-shell-extensions-3.1.4"
-# The *presence* of <=gnome-shell-extensions-3.1.4 destabilizes gnome-shell.
-# Disabling the extensions is not enough; they must be physically uninstalled.
+	>=app-accessibility/caribou-0.3"
 DEPEND="${COMMON_DEPEND}
 	>=sys-devel/gettext-0.17
 	>=dev-util/pkgconfig-0.22
@@ -109,17 +105,10 @@ pkg_setup() {
 		--enable-compile-warnings=maximum
 		--disable-schemas-compile
 		--disable-jhbuild-wrapper-script"
-
-	ewarn
-	ewarn "${PN} tends to crash at login or shortly thereafter if there are any"
-	ewarn "old shell extensions *installed*, whether systemwide or in a user's"
-	ewarn "home directory."
-	ewarn "Disabling the extensions is not enough. You should uninstall the"
-	ewarn "extensions before upgrading gnome-shell to ${PV}."
-	ewarn
 }
 
 src_prepare() {
+	gnome2_src_prepare
 	# Useful patches from upstream git, will be in next release
 	epatch "${FILESDIR}/${P}-default-avatar.patch"
 	epatch "${FILESDIR}/${P}-folks-crash.patch"