From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Pt7Bg-0005Sg-2M for garchives@archives.gentoo.org; Fri, 25 Feb 2011 23:35:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0AAC51C01F; Fri, 25 Feb 2011 23:34:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B7DF21C01F for ; Fri, 25 Feb 2011 23:34:16 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1D47B1B40DF for ; Fri, 25 Feb 2011 23:34:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7B9168006A for ; Fri, 25 Feb 2011 23:34:15 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <55255d604fdf7d8686e27d1ab2c06e52f7cae86b.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-shell/gnome-shell-2.91.90.ebuild gnome-base/gnome-shell/gnome-shell-9999.ebuild X-VCS-Directories: gnome-base/gnome-shell/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 55255d604fdf7d8686e27d1ab2c06e52f7cae86b Date: Fri, 25 Feb 2011 23:34:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: c226de4f94aad705d84f1910d76c310f commit: 55255d604fdf7d8686e27d1ab2c06e52f7cae86b Author: Nirbheek Chauhan gentoo org> AuthorDate: Fri Feb 25 22:17:06 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Fri Feb 25 22:17:06 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D55255d60 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-ba= se/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=3D">=3Ddev-libs/glib-2.25.9 + >=3Ddev-libs/gjs-0.7.11 + >=3Ddev-libs/gobject-introspection-0.10.1 x11-libs/gdk-pixbuf:2[introspection] >=3Dx11-libs/gtk+-3.0.0:3[introspection] >=3Dmedia-libs/clutter-1.5.15[introspection] >=3Dgnome-base/gnome-desktop-2.91.2:3 >=3Dgnome-base/gsettings-desktop-schemas-0.1.7 - >=3Ddev-libs/gjs-0.7.11 - >=3Ddev-libs/gobject-introspection-0.10.1 >=3Dgnome-extra/evolution-data-server-2.91.6 >=3Dmedia-libs/gstreamer-0.10.16 >=3Dmedia-libs/gst-plugins-base-0.10.16 @@ -79,10 +79,14 @@ pkg_setup() { } =20 src_prepare() { - python_convert_shebangs --recursive 2 . gnome2_src_prepare } =20 +src_install() { + python_convert_shebangs 2 tools/check-for-missing.py src/gnome-shell + gnome2_src_install +} + pkg_postinst() { if ! has_version '>=3Dmedia-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=3D">=3Ddev-libs/glib-2.25.9 x11-libs/startup-notification x11-libs/libXfixes x11-apps/mesa-progs - +=09 nm-applet? ( >=3Dnet-misc/networkmanager-9999[introspection] )" # Runtime-only deps are probably incomplete and approximate. -# nm-applet is only needed temporarily for the secrets and wireless dial= ogs. RDEPEND=3D"${COMMON_DEPEND} dev-python/dbus-python dev-python/gconf-python @@ -67,7 +66,7 @@ RDEPEND=3D"${COMMON_DEPEND} >=3Dgnome-base/gnome-control-center-2.91 >=3Dgnome-base/libgnomekbd-2.91.4[introspection] sys-power/upower[introspection] - +=09 nm-applet? ( >=3Dgnome-extra/nm-applet-9999 )" DEPEND=3D"${COMMON_DEPEND} sys-devel/gettext @@ -84,8 +83,6 @@ pkg_setup() { } =20 src_prepare() { - python_convert_shebangs --recursive 2 . - if use nm-applet; then # See https://bugzilla.gnome.org/show_bug.cgi?id=3D621707" ewarn "Adding support for the experimental NetworkManager applet." @@ -97,6 +94,11 @@ src_prepare() { gnome2_src_prepare } =20 +src_install() { + python_convert_shebangs 2 tools/check-for-missing.py src/gnome-shell + gnome2_src_install +} + pkg_postinst() { if ! has_version '>=3Dmedia-libs/gst-plugins-good-0.10.23' || \ ! has_version 'media-plugins/gst-plugins-vp8'; then