[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

[Nirbheek Chauhan]

commit:     edcbc1475ed116e96ff6becb3bf9a67d07247df4
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 22 19:41:56 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Feb 22 19:44:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=edcbc147

gnome-base/gnome-shell: remove old, broken version

* Sorry guys, you'll have to use the live version till the shell guys release 2.91.90
* gnome-shell-2.91.6 won't run with gsettings-desktop-schemas-0.1.7

---
 .../files/gnome-shell-2.91.6-as-needed.patch       |   34 --------
 .../gnome-shell/gnome-shell-2.91.6-r1.ebuild       |   80 --------------------
 2 files changed, 0 insertions(+), 114 deletions(-)

diff --git a/gnome-base/gnome-shell/files/gnome-shell-2.91.6-as-needed.patch b/gnome-base/gnome-shell/files/gnome-shell-2.91.6-as-needed.patch
deleted file mode 100644
index 085baa2..0000000
--- a/gnome-base/gnome-shell/files/gnome-shell-2.91.6-as-needed.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b6749f4b606470bec455b4d0bd1f15d8667dea3c Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@×××××××××.org>
-Date: Mon, 24 Jan 2011 17:39:45 +0000
-Subject: BluetoothStatus: depend more on libgnome-bluetooth-applet
-
-Ensure that a dependency is generated even when using --as-needed,
-by adding a fake function that calls into the library.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=639324
----
-diff --git a/src/gnome-shell-plugin.c b/src/gnome-shell-plugin.c
-index 96075f4..8d85fa2 100644
---- a/src/gnome-shell-plugin.c
-+++ b/src/gnome-shell-plugin.c
-@@ -670,3 +670,17 @@ MetaPluginInfo *gnome_shell_plugin_plugin_info (MetaPlugin *plugin)
- 
-   return &info;
- }
-+
-+#if HAVE_BLUETOOTH
-+/* HACK:
-+   Add a non-static function that calls into libgnome-bluetooth-applet.so,
-+   to avoid the linker being too smart and removing the dependency.
-+   This function is never actually called.
-+*/
-+extern GType bluetooth_applet_get_type(void);
-+void _shell_link_to_bluetooth(void);
-+
-+void _shell_link_to_bluetooth(void) {
-+  bluetooth_applet_get_type();
-+}
-+#endif
---
-cgit v0.8.3.4

diff --git a/gnome-base/gnome-shell/gnome-shell-2.91.6-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-2.91.6-r1.ebuild
deleted file mode 100644
index e3db9b7..0000000
--- a/gnome-base/gnome-shell/gnome-shell-2.91.6-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils gnome2 python
-
-DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="http://live.gnome.org/GnomeShell"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-	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. Also gnome bug 637935
-# gtk+-2.99.3 is needed for gtk/gtkx.h
-COMMON_DEPEND=">=dev-libs/glib-2.25.9
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-2.99.3:3[introspection]
-	>=media-libs/clutter-1.5.15[introspection]
-	>=gnome-base/gnome-desktop-2.91.2:3
-	>=dev-libs/gobject-introspection-0.10.1
-	>=gnome-extra/evolution-data-server-2.91.6
-
-	dev-libs/dbus-glib
-	>=dev-libs/gjs-0.7.8
-	dev-libs/libxml2:2
-	x11-libs/pango[introspection]
-	dev-libs/libcroco:0.6
-
-	gnome-base/gconf[introspection]
-	gnome-base/gnome-menus
-	gnome-base/librsvg
-	>=media-libs/gstreamer-0.10.16
-	>=media-libs/gst-plugins-base-0.10.16
-	media-libs/libcanberra
-	media-sound/pulseaudio
-	>=net-wireless/gnome-bluetooth-2.90.0[introspection]
-
-	x11-libs/startup-notification
-	x11-libs/libXfixes
-	>=x11-wm/mutter-2.91.4[introspection]
-	x11-apps/mesa-progs
-
-	dev-python/dbus-python
-	dev-python/gconf-python"
-# Runtime-only deps are probably incomplete and approximate
-RDEPEND="${COMMON_DEPEND}
-	x11-libs/gdk-pixbuf[introspection]
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/gnome-settings-daemon-2.91
-	>=gnome-base/gnome-control-center-2.91
-	>=gnome-base/libgnomekbd-2.91.4[introspection]"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.22
-	>=dev-util/intltool-0.26
-	gnome-base/gnome-common"
-DOCS="AUTHORS README"
-# Don't error out on warnings
-G2CONF="--enable-compile-warnings=maximum
---disable-schemas-compile"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Taken from upstream, remove for next release, bug 352466
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-}