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

[Nirbheek Chauhan]

commit:     57f5ec48a84f0189da7dd11d4571f6000f86059c
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 23 13:36:41 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Feb 23 13:36:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=57f5ec48

gnome-base/gnome-shell: bump to 2.91.90, update live version

---
 ...hell-9999.ebuild => gnome-shell-2.91.90.ebuild} |   52 ++++++++++---------
 gnome-base/gnome-shell/gnome-shell-9999.ebuild     |   38 ++++++++++----
 2 files changed, 54 insertions(+), 36 deletions(-)

diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-2.91.90.ebuild
similarity index 72%
copy from gnome-base/gnome-shell/gnome-shell-9999.ebuild
copy to gnome-base/gnome-shell/gnome-shell-2.91.90.ebuild
index c90dc8e..35c5aa0 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-2.91.90.ebuild
@@ -7,14 +7,14 @@ GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.5"
 
-inherit eutils gnome2 python
+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="nm-applet"
+IUSE=""
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 	KEYWORDS=""
@@ -24,19 +24,23 @@ fi
 
 # gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop
 # FIXME: Automagic gnome-bluetooth[introspection] support.
-# mutter-2.91.7 is needed, but not checked for in configure
 COMMON_DEPEND=">=dev-libs/glib-2.25.9
 	x11-libs/gdk-pixbuf:2[introspection]
 	>=x11-libs/gtk+-3.0.0:3[introspection]
 	>=media-libs/clutter-1.5.15[introspection]
 	>=gnome-base/gnome-desktop-2.91.2:3
 	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	>=dev-libs/gjs-0.7.11
 	>=dev-libs/gobject-introspection-0.10.1
 	>=gnome-extra/evolution-data-server-2.91.6
+	>=media-libs/gstreamer-0.10.16
+	>=media-libs/gst-plugins-base-0.10.16
 	>=net-libs/telepathy-glib-0.13.12[introspection]
+	>=net-wireless/gnome-bluetooth-2.90.0[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	>=x11-wm/mutter-2.91.90[introspection]
 
 	dev-libs/dbus-glib
-	>=dev-libs/gjs-0.7.11
 	dev-libs/libxml2:2
 	x11-libs/pango[introspection]
 	dev-libs/libcroco:0.6
@@ -44,31 +48,22 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9
 	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.7[introspection]
-	x11-apps/mesa-progs
-
+	x11-apps/mesa-progs"
+# Runtime-only deps are probably incomplete and approximate.
+RDEPEND="${COMMON_DEPEND}
 	dev-python/dbus-python
 	dev-python/gconf-python
 
-	nm-applet? ( >=net-misc/networkmanager-9999[introspection] )"
-# Runtime-only deps are probably incomplete and approximate.
-# nm-applet is only needed temporarily for the secrets and wireless dialogs.
-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]
-
-	nm-applet? ( >=gnome-extra/nm-applet-9999 )"
+	sys-power/upower[introspection]"
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 	>=dev-util/pkgconfig-0.22
@@ -79,14 +74,21 @@ DOCS="AUTHORS README"
 G2CONF="--enable-compile-warnings=maximum
 --disable-schemas-compile"
 
-src_prepare() {
-	if use nm-applet; then
-		# See https://bugzilla.gnome.org/show_bug.cgi?id=621707"
-		ewarn "Adding support for the experimental NetworkManager applet."
-		ewarn "This needs the latest NetworkManager & nm-applet trunk."
-		ewarn "Report bugs about this to 'nirbheek' on #gentoo-desktop @ FreeNode."
-		epatch "${FILESDIR}/${PN}-experimental-nm-applet.patch"
-	fi
+pkg_setup() {
+	python_set_active_version 2
+}
 
+src_prepare() {
+	python_convert_shebangs --recursive 2 .
 	gnome2_src_prepare
 }
+
+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-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index c90dc8e..ef3cd5a 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -24,19 +24,23 @@ fi
 
 # gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop
 # FIXME: Automagic gnome-bluetooth[introspection] support.
-# mutter-2.91.7 is needed, but not checked for in configure
 COMMON_DEPEND=">=dev-libs/glib-2.25.9
+	>=dev-libs/gjs-0.7.11
+	>=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.5.15[introspection]
 	>=gnome-base/gnome-desktop-2.91.2:3
 	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=dev-libs/gobject-introspection-0.10.1
 	>=gnome-extra/evolution-data-server-2.91.6
+	>=media-libs/gstreamer-0.10.16
+	>=media-libs/gst-plugins-base-0.10.16
 	>=net-libs/telepathy-glib-0.13.12[introspection]
+	>=net-wireless/gnome-bluetooth-2.90.0[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	>=x11-wm/mutter-2.91.90[introspection]
 
 	dev-libs/dbus-glib
-	>=dev-libs/gjs-0.7.11
 	dev-libs/libxml2:2
 	x11-libs/pango[introspection]
 	dev-libs/libcroco:0.6
@@ -44,29 +48,25 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9
 	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.7[introspection]
 	x11-apps/mesa-progs
 
-	dev-python/dbus-python
-	dev-python/gconf-python
-
 	nm-applet? ( >=net-misc/networkmanager-9999[introspection] )"
 # Runtime-only deps are probably incomplete and approximate.
 # nm-applet is only needed temporarily for the secrets and wireless dialogs.
 RDEPEND="${COMMON_DEPEND}
-	x11-libs/gdk-pixbuf[introspection]
+	dev-python/dbus-python
+	dev-python/gconf-python
+
 	>=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]
+	sys-power/upower[introspection]
 
 	nm-applet? ( >=gnome-extra/nm-applet-9999 )"
 DEPEND="${COMMON_DEPEND}
@@ -79,7 +79,13 @@ DOCS="AUTHORS README"
 G2CONF="--enable-compile-warnings=maximum
 --disable-schemas-compile"
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
 src_prepare() {
+	python_convert_shebangs --recursive 2 .
+
 	if use nm-applet; then
 		# See https://bugzilla.gnome.org/show_bug.cgi?id=621707"
 		ewarn "Adding support for the experimental NetworkManager applet."
@@ -90,3 +96,13 @@ src_prepare() {
 
 	gnome2_src_prepare
 }
+
+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
+}