[gentoo-commits] proj/gnome:master commit in: gnome-extra/sushi/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     807ac7fb63bd7a59686dcc9155e0c50247427d09
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 21 13:24:24 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Apr 21 13:34:39 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=807ac7fb

gnome-extra/sushi: 3.10.0 → 3.11.90

---
 .../sushi/{sushi-9999.ebuild => sushi-3.11.90.ebuild}       | 13 +++----------
 gnome-extra/sushi/sushi-9999.ebuild                         |  4 ++--
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/gnome-extra/sushi/sushi-9999.ebuild b/gnome-extra/sushi/sushi-3.11.90.ebuild
similarity index 84%
copy from gnome-extra/sushi/sushi-9999.ebuild
copy to gnome-extra/sushi/sushi-3.11.90.ebuild
index 7189fd6..7f543ae 100644
--- a/gnome-extra/sushi/sushi-9999.ebuild
+++ b/gnome-extra/sushi/sushi-3.11.90.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,20 +6,13 @@ EAPI="5"
 GCONF_DEBUG="no"
 
 inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="A quick previewer for Nautilus, the GNOME file manager"
 HOMEPAGE="http://git.gnome.org/browse/sushi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="office"
 
 # Optional app-office/unoconv support (OOo to pdf)
@@ -27,7 +20,7 @@ IUSE="office"
 # libX11 needed for sushi_create_foreign_window()
 COMMON_DEPEND="
 	>=x11-libs/gdk-pixbuf-2.23[introspection]
-	>=dev-libs/gjs-1.34
+	>=dev-libs/gjs-1.40
 	>=dev-libs/glib-2.29.14:2
 	>=dev-libs/gobject-introspection-0.9.6
 	>=media-libs/clutter-1.11.4:1.0[introspection]

diff --git a/gnome-extra/sushi/sushi-9999.ebuild b/gnome-extra/sushi/sushi-9999.ebuild
index 7189fd6..6e967dd 100644
--- a/gnome-extra/sushi/sushi-9999.ebuild
+++ b/gnome-extra/sushi/sushi-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -27,7 +27,7 @@ IUSE="office"
 # libX11 needed for sushi_create_foreign_window()
 COMMON_DEPEND="
 	>=x11-libs/gdk-pixbuf-2.23[introspection]
-	>=dev-libs/gjs-1.34
+	>=dev-libs/gjs-1.40
 	>=dev-libs/glib-2.29.14:2
 	>=dev-libs/gobject-introspection-0.9.6
 	>=media-libs/clutter-1.11.4:1.0[introspection]