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 1PsFtH-0006I9-D8 for garchives@archives.gentoo.org; Wed, 23 Feb 2011 14:40:34 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 23475E0574; Wed, 23 Feb 2011 14:40:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D71A8E0574 for ; Wed, 23 Feb 2011 14:40:18 +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 4C1D41B41BD for ; Wed, 23 Feb 2011 14:40:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 6D6C680075 for ; Wed, 23 Feb 2011 14:40:17 +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: <57f5ec48a84f0189da7dd11d4571f6000f86059c.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: 57f5ec48a84f0189da7dd11d4571f6000f86059c Date: Wed, 23 Feb 2011 14:40:17 +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: b79335d4ab5e150e69dde863d69738a1 commit: 57f5ec48a84f0189da7dd11d4571f6000f86059c Author: Nirbheek Chauhan gentoo org> AuthorDate: Wed Feb 23 13:36:41 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Wed Feb 23 13:36:41 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D57f5ec48 gnome-base/gnome-shell: bump to 2.91.90, update live version --- ...hell-9999.ebuild =3D> 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=3D"no" GNOME2_LA_PUNT=3D"yes" PYTHON_DEPEND=3D"2:2.5" =20 -inherit eutils gnome2 python +inherit gnome2 python =20 DESCRIPTION=3D"Provides core UI functions for the GNOME 3 desktop" HOMEPAGE=3D"http://live.gnome.org/GnomeShell" =20 LICENSE=3D"GPL-2" SLOT=3D"0" -IUSE=3D"nm-applet" +IUSE=3D"" if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live KEYWORDS=3D"" @@ -24,19 +24,23 @@ fi =20 # 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=3D">=3Ddev-libs/glib-2.25.9 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 >=3Dnet-libs/telepathy-glib-0.13.12[introspection] + >=3Dnet-wireless/gnome-bluetooth-2.90.0[introspection] + >=3Dsys-auth/polkit-0.100[introspection] + >=3Dx11-wm/mutter-2.91.90[introspection] =20 dev-libs/dbus-glib - >=3Ddev-libs/gjs-0.7.11 dev-libs/libxml2:2 x11-libs/pango[introspection] dev-libs/libcroco:0.6 @@ -44,31 +48,22 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9 gnome-base/gconf[introspection] gnome-base/gnome-menus gnome-base/librsvg - >=3Dmedia-libs/gstreamer-0.10.16 - >=3Dmedia-libs/gst-plugins-base-0.10.16 media-libs/libcanberra media-sound/pulseaudio - >=3Dnet-wireless/gnome-bluetooth-2.90.0[introspection] =20 x11-libs/startup-notification x11-libs/libXfixes - >=3Dx11-wm/mutter-2.91.7[introspection] - x11-apps/mesa-progs - + x11-apps/mesa-progs" +# Runtime-only deps are probably incomplete and approximate. +RDEPEND=3D"${COMMON_DEPEND} dev-python/dbus-python dev-python/gconf-python =20 - 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} - x11-libs/gdk-pixbuf[introspection] >=3Dgnome-base/dconf-0.4.1 >=3Dgnome-base/gnome-settings-daemon-2.91 >=3Dgnome-base/gnome-control-center-2.91 >=3Dgnome-base/libgnomekbd-2.91.4[introspection] - - nm-applet? ( >=3Dgnome-extra/nm-applet-9999 )" + sys-power/upower[introspection]" DEPEND=3D"${COMMON_DEPEND} sys-devel/gettext >=3Ddev-util/pkgconfig-0.22 @@ -79,14 +74,21 @@ DOCS=3D"AUTHORS README" G2CONF=3D"--enable-compile-warnings=3Dmaximum --disable-schemas-compile" =20 -src_prepare() { - if use nm-applet; then - # See https://bugzilla.gnome.org/show_bug.cgi?id=3D621707" - 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 @ FreeN= ode." - epatch "${FILESDIR}/${PN}-experimental-nm-applet.patch" - fi +pkg_setup() { + python_set_active_version 2 +} =20 +src_prepare() { + python_convert_shebangs --recursive 2 . gnome2_src_prepare } + +pkg_postinst() { + if ! has_version '>=3Dmedia-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 >=3Dmedia-libs/gst-plugins-good-0.10= .23" + ewarn "and media-plugins/gst-plugins-vp8, or use dconf-editor to chang= e" + 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 =20 # 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=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/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 >=3Dnet-libs/telepathy-glib-0.13.12[introspection] + >=3Dnet-wireless/gnome-bluetooth-2.90.0[introspection] + >=3Dsys-auth/polkit-0.100[introspection] + >=3Dx11-wm/mutter-2.91.90[introspection] =20 dev-libs/dbus-glib - >=3Ddev-libs/gjs-0.7.11 dev-libs/libxml2:2 x11-libs/pango[introspection] dev-libs/libcroco:0.6 @@ -44,29 +48,25 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9 gnome-base/gconf[introspection] gnome-base/gnome-menus gnome-base/librsvg - >=3Dmedia-libs/gstreamer-0.10.16 - >=3Dmedia-libs/gst-plugins-base-0.10.16 media-libs/libcanberra media-sound/pulseaudio - >=3Dnet-wireless/gnome-bluetooth-2.90.0[introspection] =20 x11-libs/startup-notification x11-libs/libXfixes - >=3Dx11-wm/mutter-2.91.7[introspection] x11-apps/mesa-progs =20 - dev-python/dbus-python - dev-python/gconf-python - 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} - x11-libs/gdk-pixbuf[introspection] + dev-python/dbus-python + dev-python/gconf-python + >=3Dgnome-base/dconf-0.4.1 >=3Dgnome-base/gnome-settings-daemon-2.91 >=3Dgnome-base/gnome-control-center-2.91 >=3Dgnome-base/libgnomekbd-2.91.4[introspection] + sys-power/upower[introspection] =20 nm-applet? ( >=3Dgnome-extra/nm-applet-9999 )" DEPEND=3D"${COMMON_DEPEND} @@ -79,7 +79,13 @@ DOCS=3D"AUTHORS README" G2CONF=3D"--enable-compile-warnings=3Dmaximum --disable-schemas-compile" =20 +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=3D621707" ewarn "Adding support for the experimental NetworkManager applet." @@ -90,3 +96,13 @@ src_prepare() { =20 gnome2_src_prepare } + +pkg_postinst() { + if ! has_version '>=3Dmedia-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 >=3Dmedia-libs/gst-plugins-good-0.10= .23" + ewarn "and media-plugins/gst-plugins-vp8, or use dconf-editor to chang= e" + ewarn "/apps/gnome-shell/recorder/pipeline to what you want to use." + fi +}