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

[Nirbheek Chauhan]

commit:     55255d604fdf7d8686e27d1ab2c06e52f7cae86b
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 25 22:17:06 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Feb 25 22:17:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=55255d60

gnome-base/gnome-shell: fix python shebangs

---
 gnome-base/gnome-shell/gnome-shell-2.91.90.ebuild |   10 +++++++---
 gnome-base/gnome-shell/gnome-shell-9999.ebuild    |   12 +++++++-----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/gnome-base/gnome-shell/gnome-shell-2.91.90.ebuild b/gnome-base/gnome-shell/gnome-shell-2.91.90.ebuild
index 35c5aa0..19872b0 100644
--- a/gnome-base/gnome-shell/gnome-shell-2.91.90.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-2.91.90.ebuild
@@ -25,13 +25,13 @@ fi
 # gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop
 # FIXME: Automagic gnome-bluetooth[introspection] support.
 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/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
@@ -79,10 +79,14 @@ pkg_setup() {
 }
 
 src_prepare() {
-	python_convert_shebangs --recursive 2 .
 	gnome2_src_prepare
 }
 
+src_install() {
+	python_convert_shebangs 2 tools/check-for-missing.py src/gnome-shell
+	gnome2_src_install
+}
+
 pkg_postinst() {
 	if ! has_version '>=media-libs/gst-plugins-good-0.10.23' || \
 	   ! has_version 'media-plugins/gst-plugins-vp8'; then

diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index f3a6869..47e4081 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -54,10 +54,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9
 	x11-libs/startup-notification
 	x11-libs/libXfixes
 	x11-apps/mesa-progs
-
+	
 	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}
 	dev-python/dbus-python
 	dev-python/gconf-python
@@ -67,7 +66,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=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}
 	sys-devel/gettext
@@ -84,8 +83,6 @@ pkg_setup() {
 }
 
 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."
@@ -97,6 +94,11 @@ src_prepare() {
 	gnome2_src_prepare
 }
 
+src_install() {
+	python_convert_shebangs 2 tools/check-for-missing.py src/gnome-shell
+	gnome2_src_install
+}
+
 pkg_postinst() {
 	if ! has_version '>=media-libs/gst-plugins-good-0.10.23' || \
 	   ! has_version 'media-plugins/gst-plugins-vp8'; then