Gentoo Archives: gentoo-commits

From: Nirbheek Chauhan <nirbheek@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/
Date: Fri, 25 Feb 2011 23:35:04
Message-Id: 55255d604fdf7d8686e27d1ab2c06e52f7cae86b.nirbheek@gentoo
1 commit: 55255d604fdf7d8686e27d1ab2c06e52f7cae86b
2 Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 25 22:17:06 2011 +0000
4 Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 25 22:17:06 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=55255d60
7
8 gnome-base/gnome-shell: fix python shebangs
9
10 ---
11 gnome-base/gnome-shell/gnome-shell-2.91.90.ebuild | 10 +++++++---
12 gnome-base/gnome-shell/gnome-shell-9999.ebuild | 12 +++++++-----
13 2 files changed, 14 insertions(+), 8 deletions(-)
14
15 diff --git a/gnome-base/gnome-shell/gnome-shell-2.91.90.ebuild b/gnome-base/gnome-shell/gnome-shell-2.91.90.ebuild
16 index 35c5aa0..19872b0 100644
17 --- a/gnome-base/gnome-shell/gnome-shell-2.91.90.ebuild
18 +++ b/gnome-base/gnome-shell/gnome-shell-2.91.90.ebuild
19 @@ -25,13 +25,13 @@ fi
20 # gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop
21 # FIXME: Automagic gnome-bluetooth[introspection] support.
22 COMMON_DEPEND=">=dev-libs/glib-2.25.9
23 + >=dev-libs/gjs-0.7.11
24 + >=dev-libs/gobject-introspection-0.10.1
25 x11-libs/gdk-pixbuf:2[introspection]
26 >=x11-libs/gtk+-3.0.0:3[introspection]
27 >=media-libs/clutter-1.5.15[introspection]
28 >=gnome-base/gnome-desktop-2.91.2:3
29 >=gnome-base/gsettings-desktop-schemas-0.1.7
30 - >=dev-libs/gjs-0.7.11
31 - >=dev-libs/gobject-introspection-0.10.1
32 >=gnome-extra/evolution-data-server-2.91.6
33 >=media-libs/gstreamer-0.10.16
34 >=media-libs/gst-plugins-base-0.10.16
35 @@ -79,10 +79,14 @@ pkg_setup() {
36 }
37
38 src_prepare() {
39 - python_convert_shebangs --recursive 2 .
40 gnome2_src_prepare
41 }
42
43 +src_install() {
44 + python_convert_shebangs 2 tools/check-for-missing.py src/gnome-shell
45 + gnome2_src_install
46 +}
47 +
48 pkg_postinst() {
49 if ! has_version '>=media-libs/gst-plugins-good-0.10.23' || \
50 ! has_version 'media-plugins/gst-plugins-vp8'; then
51
52 diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
53 index f3a6869..47e4081 100644
54 --- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
55 +++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
56 @@ -54,10 +54,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9
57 x11-libs/startup-notification
58 x11-libs/libXfixes
59 x11-apps/mesa-progs
60 -
61 +
62 nm-applet? ( >=net-misc/networkmanager-9999[introspection] )"
63 # Runtime-only deps are probably incomplete and approximate.
64 -# nm-applet is only needed temporarily for the secrets and wireless dialogs.
65 RDEPEND="${COMMON_DEPEND}
66 dev-python/dbus-python
67 dev-python/gconf-python
68 @@ -67,7 +66,7 @@ RDEPEND="${COMMON_DEPEND}
69 >=gnome-base/gnome-control-center-2.91
70 >=gnome-base/libgnomekbd-2.91.4[introspection]
71 sys-power/upower[introspection]
72 -
73 +
74 nm-applet? ( >=gnome-extra/nm-applet-9999 )"
75 DEPEND="${COMMON_DEPEND}
76 sys-devel/gettext
77 @@ -84,8 +83,6 @@ pkg_setup() {
78 }
79
80 src_prepare() {
81 - python_convert_shebangs --recursive 2 .
82 -
83 if use nm-applet; then
84 # See https://bugzilla.gnome.org/show_bug.cgi?id=621707"
85 ewarn "Adding support for the experimental NetworkManager applet."
86 @@ -97,6 +94,11 @@ src_prepare() {
87 gnome2_src_prepare
88 }
89
90 +src_install() {
91 + python_convert_shebangs 2 tools/check-for-missing.py src/gnome-shell
92 + gnome2_src_install
93 +}
94 +
95 pkg_postinst() {
96 if ! has_version '>=media-libs/gst-plugins-good-0.10.23' || \
97 ! has_version 'media-plugins/gst-plugins-vp8'; then