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

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

commit:     ddf9dda8f1b572235c1869e82ced6a7719057094
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sun May  1 12:59:03 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sun May  1 12:59:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ddf9dda8

gnome-extra/sushi: fix deps, add live ebuild

* Note, this won't work yet because it needs the previewer branch of nautilus

---
 gnome-extra/sushi/sushi-0.0.1.ebuild |   45 ++++++++++++++++++----------
 gnome-extra/sushi/sushi-9999.ebuild  |   55 ++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 16 deletions(-)

diff --git a/gnome-extra/sushi/sushi-0.0.1.ebuild b/gnome-extra/sushi/sushi-0.0.1.ebuild
index 3546992..20cb0e3 100644
--- a/gnome-extra/sushi/sushi-0.0.1.ebuild
+++ b/gnome-extra/sushi/sushi-0.0.1.ebuild
@@ -2,41 +2,54 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="3"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
 
-DESCRIPTION="Quick previewer for the GNOME desktop file manager"
-HOMEPAGE="http://www.gnome.org"
+DESCRIPTION="A quick previewer for Nautilus, the GNOME file manager"
+HOMEPAGE="http://git.gnome.org/browse/sushi"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
 IUSE=""
 
-# Optional app-office/unoconv support
-RDEPEND="
-	>=dev-libs/gjs-0.7.7
-	>=dev-libs/glib-2.28:2
+# Optional app-office/unoconv support (OOo to pdf)
+COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
 	>=dev-libs/gobject-introspection-0.9.6
-	>=media-libs/clutter-1.6:1.0
-	>=media-libs/clutter-gtk-0.91.8:1.0
-	media-libs/gstreamer:0.10
+	>=x11-libs/gdk-pixbuf-2.22.1[introspection]
+	>=media-libs/clutter-1.6.0:1.0[introspection]
+	>=x11-libs/gtk+-3.0.0:3[introspection]
+	>=media-libs/clutter-gtk-0.91.8i:1.0[introspection]
+	>=app-text/evince-3.0[introspection]
+	>=dev-libs/gjs-0.7.7
+
+	media-libs/gstreamer:0.10[introspection]
+	media-libs/gst-plugins-base:0.10[introspection]
+	media-libs/clutter-gst:1.0[introspection]
 	media-libs/musicbrainz:3
-	>=app-text/evince-3
-	>=x11-libs/gdk-pixbuf-2.22.1:2
-	>=x11-libs/gtk+-3:3
 "
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.22
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 "
-RDEPEND=">=gnome-base/nautilus-3"
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/nautilus-3
+"
 
 pkg_setup() {
+	G2CONF="${G2CONF}
+		UNOCONV=$(type -p false)
+		--disable-static"
 	DOCS="AUTHORS NEWS README TODO"
-	G2CONF="${G2CONF} UNOCONV=$(type -p false)"
 }

diff --git a/gnome-extra/sushi/sushi-9999.ebuild b/gnome-extra/sushi/sushi-9999.ebuild
new file mode 100644
index 0000000..20cb0e3
--- /dev/null
+++ b/gnome-extra/sushi/sushi-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+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-3"
+SLOT="0"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE=""
+
+# Optional app-office/unoconv support (OOo to pdf)
+COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
+	>=dev-libs/gobject-introspection-0.9.6
+	>=x11-libs/gdk-pixbuf-2.22.1[introspection]
+	>=media-libs/clutter-1.6.0:1.0[introspection]
+	>=x11-libs/gtk+-3.0.0:3[introspection]
+	>=media-libs/clutter-gtk-0.91.8i:1.0[introspection]
+	>=app-text/evince-3.0[introspection]
+	>=dev-libs/gjs-0.7.7
+
+	media-libs/gstreamer:0.10[introspection]
+	media-libs/gst-plugins-base:0.10[introspection]
+	media-libs/clutter-gst:1.0[introspection]
+	media-libs/musicbrainz:3
+"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.22
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+"
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/nautilus-3
+"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		UNOCONV=$(type -p false)
+		--disable-static"
+	DOCS="AUTHORS NEWS README TODO"
+}