public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/sushi/
@ 2011-04-30 19:37 Gilles Dartiguelongue
  0 siblings, 0 replies; 19+ messages in thread
From: Gilles Dartiguelongue @ 2011-04-30 19:37 UTC (permalink / raw
  To: gentoo-commits

commit:     2aaf8a10e74a1920d1b8ea0b494bbf6e10fe7a16
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 30 19:07:38 2011 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 19:07:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2aaf8a10

gnome-extra/sushi: Initial commit

---
 gnome-extra/sushi/sushi-0.0.1.ebuild |   42 ++++++++++++++++++++++++++++++++++
 1 files changed, 42 insertions(+), 0 deletions(-)

diff --git a/gnome-extra/sushi/sushi-0.0.1.ebuild b/gnome-extra/sushi/sushi-0.0.1.ebuild
new file mode 100644
index 0000000..3546992
--- /dev/null
+++ b/gnome-extra/sushi/sushi-0.0.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Quick previewer for the GNOME desktop file manager"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+# Optional app-office/unoconv support
+RDEPEND="
+	>=dev-libs/gjs-0.7.7
+	>=dev-libs/glib-2.28: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
+	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"
+
+pkg_setup() {
+	DOCS="AUTHORS NEWS README TODO"
+	G2CONF="${G2CONF} UNOCONV=$(type -p false)"
+}



^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-extra/sushi/
@ 2011-05-01 13:13 Nirbheek Chauhan
  0 siblings, 0 replies; 19+ messages in thread
From: Nirbheek Chauhan @ 2011-05-01 13:13 UTC (permalink / raw
  To: gentoo-commits

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"
+}



^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-extra/sushi/
@ 2011-05-02  9:15 Nirbheek Chauhan
  0 siblings, 0 replies; 19+ messages in thread
From: Nirbheek Chauhan @ 2011-05-02  9:15 UTC (permalink / raw
  To: gentoo-commits

commit:     95545c7ef5d5d96c3bbb609ed6c362b06af6947a
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon May  2 09:14:38 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon May  2 09:14:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=95545c7e

gnome-extra/sushi: use EAPI=4

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

diff --git a/gnome-extra/sushi/sushi-0.0.1.ebuild b/gnome-extra/sushi/sushi-0.0.1.ebuild
index 20cb0e3..15c5385 100644
--- a/gnome-extra/sushi/sushi-0.0.1.ebuild
+++ b/gnome-extra/sushi/sushi-0.0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 

diff --git a/gnome-extra/sushi/sushi-9999.ebuild b/gnome-extra/sushi/sushi-9999.ebuild
index 20cb0e3..15c5385 100644
--- a/gnome-extra/sushi/sushi-9999.ebuild
+++ b/gnome-extra/sushi/sushi-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 



^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-extra/sushi/
@ 2011-08-15 16:31 Nirbheek Chauhan
  0 siblings, 0 replies; 19+ messages in thread
From: Nirbheek Chauhan @ 2011-08-15 16:31 UTC (permalink / raw
  To: gentoo-commits

commit:     507b01b4990b3daa9333558fcdac54e57184d34c
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 15 15:30:03 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Aug 15 15:30:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=507b01b4

gnome-extra/sushi: fix tarball suffix

---
 gnome-extra/sushi/sushi-0.0.1.ebuild |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/gnome-extra/sushi/sushi-0.0.1.ebuild b/gnome-extra/sushi/sushi-0.0.1.ebuild
index 15c5385..d5d4f0b 100644
--- a/gnome-extra/sushi/sushi-0.0.1.ebuild
+++ b/gnome-extra/sushi/sushi-0.0.1.ebuild
@@ -5,6 +5,7 @@
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
 
 inherit gnome2
 if [[ ${PV} = 9999 ]]; then



^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-extra/sushi/
@ 2011-10-18  7:37 Alexandre Restovtsev
  0 siblings, 0 replies; 19+ messages in thread
From: Alexandre Restovtsev @ 2011-10-18  7:37 UTC (permalink / raw
  To: gentoo-commits

commit:     0dd6351f6d16686a1102e5c26966433ed2838067
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Oct 18 05:44:47 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Oct 18 05:44:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0dd6351f

gnome-extra/sushi: 0.2.0 → 0.2.1

Bump with UI fixes.

---
 .../{sushi-0.2.0.ebuild => sushi-0.2.1.ebuild}     |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-extra/sushi/sushi-0.2.0.ebuild b/gnome-extra/sushi/sushi-0.2.1.ebuild
similarity index 100%
rename from gnome-extra/sushi/sushi-0.2.0.ebuild
rename to gnome-extra/sushi/sushi-0.2.1.ebuild



^ permalink raw reply	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-extra/sushi/
@ 2011-11-03  1:53 Alexandre Restovtsev
  0 siblings, 0 replies; 19+ messages in thread
From: Alexandre Restovtsev @ 2011-11-03  1:53 UTC (permalink / raw
  To: gentoo-commits

commit:     8fe7ea2b21a0d69a96ecd514a5886f49f57afaf0
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  2 16:26:53 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Nov  2 16:26:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8fe7ea2b

gnome-extra/sushi: qa

gnome.eclass takes care of maintainer mode.

---
 gnome-extra/sushi/sushi-0.2.1.ebuild |    3 +--
 gnome-extra/sushi/sushi-9999.ebuild  |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/gnome-extra/sushi/sushi-0.2.1.ebuild b/gnome-extra/sushi/sushi-0.2.1.ebuild
index 452c3cd..429711b 100644
--- a/gnome-extra/sushi/sushi-0.2.1.ebuild
+++ b/gnome-extra/sushi/sushi-0.2.1.ebuild
@@ -56,7 +56,6 @@ RDEPEND="${COMMON_DEPEND}
 pkg_setup() {
 	G2CONF="${G2CONF}
 		UNOCONV=$(type -p false)
-		--disable-static
-		--disable-maintainer-mode"
+		--disable-static"
 	DOCS="AUTHORS NEWS README TODO"
 }

diff --git a/gnome-extra/sushi/sushi-9999.ebuild b/gnome-extra/sushi/sushi-9999.ebuild
index 452c3cd..429711b 100644
--- a/gnome-extra/sushi/sushi-9999.ebuild
+++ b/gnome-extra/sushi/sushi-9999.ebuild
@@ -56,7 +56,6 @@ RDEPEND="${COMMON_DEPEND}
 pkg_setup() {
 	G2CONF="${G2CONF}
 		UNOCONV=$(type -p false)
-		--disable-static
-		--disable-maintainer-mode"
+		--disable-static"
 	DOCS="AUTHORS NEWS README TODO"
 }



^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-extra/sushi/
@ 2012-04-02  6:43 Alexandre Restovtsev
  0 siblings, 0 replies; 19+ messages in thread
From: Alexandre Restovtsev @ 2012-04-02  6:43 UTC (permalink / raw
  To: gentoo-commits

commit:     00354b600a3f211096ac08cd7e14dad7a1ce328f
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  2 06:12:28 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Apr  2 06:40:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=00354b60

gnome-extra/sushi: add 0.4.0

---
 .../{sushi-9999.ebuild => sushi-0.4.0.ebuild}      |    6 +++---
 gnome-extra/sushi/sushi-9999.ebuild                |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnome-extra/sushi/sushi-9999.ebuild b/gnome-extra/sushi/sushi-0.4.0.ebuild
similarity index 92%
copy from gnome-extra/sushi/sushi-9999.ebuild
copy to gnome-extra/sushi/sushi-0.4.0.ebuild
index 429711b..c15c904 100644
--- a/gnome-extra/sushi/sushi-9999.ebuild
+++ b/gnome-extra/sushi/sushi-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -30,7 +30,7 @@ COMMON_DEPEND=">=x11-libs/gdk-pixbuf-2.22.1[introspection]
 	>=dev-libs/gjs-0.7.7
 	>=dev-libs/glib-2.29.14:2
 	>=dev-libs/gobject-introspection-0.9.6
-	>=media-libs/clutter-1.6.0:1.0[introspection]
+	>=media-libs/clutter-1.10.0:1.0[introspection]
 	>=media-libs/clutter-gtk-1.0.1:1.0[introspection]
 	>=x11-libs/gtk+-3.0.0:3[introspection]
 
@@ -55,7 +55,7 @@ RDEPEND="${COMMON_DEPEND}
 
 pkg_setup() {
 	G2CONF="${G2CONF}
-		UNOCONV=$(type -p false)
+		UNOCONV=$(type -P false)
 		--disable-static"
 	DOCS="AUTHORS NEWS README TODO"
 }

diff --git a/gnome-extra/sushi/sushi-9999.ebuild b/gnome-extra/sushi/sushi-9999.ebuild
index 429711b..c15c904 100644
--- a/gnome-extra/sushi/sushi-9999.ebuild
+++ b/gnome-extra/sushi/sushi-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -30,7 +30,7 @@ COMMON_DEPEND=">=x11-libs/gdk-pixbuf-2.22.1[introspection]
 	>=dev-libs/gjs-0.7.7
 	>=dev-libs/glib-2.29.14:2
 	>=dev-libs/gobject-introspection-0.9.6
-	>=media-libs/clutter-1.6.0:1.0[introspection]
+	>=media-libs/clutter-1.10.0:1.0[introspection]
 	>=media-libs/clutter-gtk-1.0.1:1.0[introspection]
 	>=x11-libs/gtk+-3.0.0:3[introspection]
 
@@ -55,7 +55,7 @@ RDEPEND="${COMMON_DEPEND}
 
 pkg_setup() {
 	G2CONF="${G2CONF}
-		UNOCONV=$(type -p false)
+		UNOCONV=$(type -P false)
 		--disable-static"
 	DOCS="AUTHORS NEWS README TODO"
 }



^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-extra/sushi/
@ 2012-04-12 10:17 Priit Laes
  0 siblings, 0 replies; 19+ messages in thread
From: Priit Laes @ 2012-04-12 10:17 UTC (permalink / raw
  To: gentoo-commits

commit:     ba885d03c885b96f9eab957109c5ec4a05795a3f
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Thu Apr 12 10:11:41 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Thu Apr 12 10:11:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ba885d03

gnome-extra/sushi: Bump musicbrainz dep for live ebuild

---
 gnome-extra/sushi/sushi-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gnome-extra/sushi/sushi-9999.ebuild b/gnome-extra/sushi/sushi-9999.ebuild
index c15c904..e14fc93 100644
--- a/gnome-extra/sushi/sushi-9999.ebuild
+++ b/gnome-extra/sushi/sushi-9999.ebuild
@@ -39,7 +39,7 @@ COMMON_DEPEND=">=x11-libs/gdk-pixbuf-2.22.1[introspection]
 	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
+	media-libs/musicbrainz:4
 	net-libs/webkit-gtk:3[introspection]
 	x11-libs/gtksourceview:3.0[introspection]
 	x11-libs/libX11



^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-extra/sushi/
@ 2012-09-05 15:49 Nirbheek Chauhan
  0 siblings, 0 replies; 19+ messages in thread
From: Nirbheek Chauhan @ 2012-09-05 15:49 UTC (permalink / raw
  To: gentoo-commits

commit:     02adc79aef35b76b847646081f8d56ee780217ea
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  5 01:47:38 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Sep  5 15:48:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=02adc79a

gnome-extra/sushi: don't bump; update live ebuild instead

Needs clutter-gst-2.0, which needs gstreamer-1.0

---
 gnome-extra/sushi/sushi-9999.ebuild |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/gnome-extra/sushi/sushi-9999.ebuild b/gnome-extra/sushi/sushi-9999.ebuild
index e6cec03..370d8e2 100644
--- a/gnome-extra/sushi/sushi-9999.ebuild
+++ b/gnome-extra/sushi/sushi-9999.ebuild
@@ -23,14 +23,12 @@ else
 fi
 IUSE=""
 
-# Optional app-office/unoconv support (OOo to pdf)
-# freetype needed for font loader
 # libX11 needed for sushi_create_foreign_window()
 COMMON_DEPEND=">=x11-libs/gdk-pixbuf-2.22.1[introspection]
 	>=dev-libs/gjs-0.7.7
 	>=dev-libs/glib-2.29.14:2
 	>=dev-libs/gobject-introspection-0.9.6
-	>=media-libs/clutter-1.10.0:1.0[introspection]
+	>=media-libs/clutter-1.11.4:1.0[introspection]
 	>=media-libs/clutter-gtk-1.0.1:1.0[introspection]
 	>=x11-libs/gtk+-3.0.0:3[introspection]
 
@@ -38,25 +36,26 @@ COMMON_DEPEND=">=x11-libs/gdk-pixbuf-2.22.1[introspection]
 	media-libs/freetype:2
 	media-libs/gstreamer:0.10[introspection]
 	media-libs/gst-plugins-base:0.10[introspection]
-	media-libs/clutter-gst:1.0[introspection]
-	media-libs/musicbrainz:4
+	media-libs/clutter-gst:2.0[introspection]
+	media-libs/musicbrainz:5
 	net-libs/webkit-gtk:3[introspection]
 	x11-libs/gtksourceview:3.0[introspection]
 	x11-libs/libX11
-"
+
+	office? ( app-office/unoconv )"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
+	virtual/pkgconfig"
 RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/nautilus-3.1.90
-	x11-themes/gnome-icon-theme-symbolic
-"
+	x11-themes/gnome-icon-theme-symbolic"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
 		UNOCONV=$(type -P false)
+		--disable-schemas-compile
 		--disable-static"
 	DOCS="AUTHORS NEWS README TODO"
+	use office && G2CONF+=" UNOCONV=$(type -P unoconv)"
 }


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-extra/sushi/
@ 2012-10-27 21:59 Gilles Dartiguelongue
  0 siblings, 0 replies; 19+ messages in thread
From: Gilles Dartiguelongue @ 2012-10-27 21:59 UTC (permalink / raw
  To: gentoo-commits

commit:     783e7752d80129af48c2c2a85640d98889e3a74a
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 27 21:59:18 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Oct 27 21:59:18 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=783e7752

gnome-extra/sushi: 0.4.1 → 3.6.0

This ebuild depends on not yet commited slots. This is done on purpose.

---
 .../{sushi-9999.ebuild => sushi-3.6.0.ebuild}      |   41 +++++++++++---------
 gnome-extra/sushi/sushi-9999.ebuild                |   27 +++++++++----
 2 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/gnome-extra/sushi/sushi-9999.ebuild b/gnome-extra/sushi/sushi-3.6.0.ebuild
similarity index 69%
copy from gnome-extra/sushi/sushi-9999.ebuild
copy to gnome-extra/sushi/sushi-3.6.0.ebuild
index 370d8e2..cbb03b2 100644
--- a/gnome-extra/sushi/sushi-9999.ebuild
+++ b/gnome-extra/sushi/sushi-3.6.0.ebuild
@@ -6,23 +6,18 @@ EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
+inherit autotools eutils gnome2
 
 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=""
+KEYWORDS="~amd64 ~x86"
+IUSE="office"
 
+# Optional app-office/unoconv support (OOo to pdf)
+# freetype needed for font loader
 # libX11 needed for sushi_create_foreign_window()
 COMMON_DEPEND=">=x11-libs/gdk-pixbuf-2.22.1[introspection]
 	>=dev-libs/gjs-0.7.7
@@ -34,28 +29,38 @@ COMMON_DEPEND=">=x11-libs/gdk-pixbuf-2.22.1[introspection]
 
 	>=app-text/evince-3.0[introspection]
 	media-libs/freetype:2
-	media-libs/gstreamer:0.10[introspection]
-	media-libs/gst-plugins-base:0.10[introspection]
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
 	media-libs/clutter-gst:2.0[introspection]
 	media-libs/musicbrainz:5
 	net-libs/webkit-gtk:3[introspection]
 	x11-libs/gtksourceview:3.0[introspection]
 	x11-libs/libX11
 
-	office? ( app-office/unoconv )"
+	office? ( app-office/unoconv )
+"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/nautilus-3.1.90
-	x11-themes/gnome-icon-theme-symbolic"
+	x11-themes/gnome-icon-theme-symbolic
+"
 
-pkg_setup() {
+src_prepare() {
 	G2CONF="${G2CONF}
 		UNOCONV=$(type -P false)
 		--disable-schemas-compile
 		--disable-static"
+	if use office; then
+		G2CONF="${G2CONF} UNOCONV=$(type -P unoconv)"
+	fi
+
 	DOCS="AUTHORS NEWS README TODO"
-	use office && G2CONF+=" UNOCONV=$(type -P unoconv)"
-}
+
+	epatch "${FILESDIR}"/${P}-gold.patch
+	eautoreconf
+	gnome2_src_prepare
+}
\ No newline at end of file

diff --git a/gnome-extra/sushi/sushi-9999.ebuild b/gnome-extra/sushi/sushi-9999.ebuild
index 370d8e2..dbd4ccc 100644
--- a/gnome-extra/sushi/sushi-9999.ebuild
+++ b/gnome-extra/sushi/sushi-9999.ebuild
@@ -21,8 +21,10 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~amd64 ~x86"
 fi
-IUSE=""
+IUSE="office"
 
+# Optional app-office/unoconv support (OOo to pdf)
+# freetype needed for font loader
 # libX11 needed for sushi_create_foreign_window()
 COMMON_DEPEND=">=x11-libs/gdk-pixbuf-2.22.1[introspection]
 	>=dev-libs/gjs-0.7.7
@@ -34,28 +36,35 @@ COMMON_DEPEND=">=x11-libs/gdk-pixbuf-2.22.1[introspection]
 
 	>=app-text/evince-3.0[introspection]
 	media-libs/freetype:2
-	media-libs/gstreamer:0.10[introspection]
-	media-libs/gst-plugins-base:0.10[introspection]
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
 	media-libs/clutter-gst:2.0[introspection]
 	media-libs/musicbrainz:5
 	net-libs/webkit-gtk:3[introspection]
 	x11-libs/gtksourceview:3.0[introspection]
 	x11-libs/libX11
 
-	office? ( app-office/unoconv )"
+	office? ( app-office/unoconv )
+"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/nautilus-3.1.90
-	x11-themes/gnome-icon-theme-symbolic"
+	x11-themes/gnome-icon-theme-symbolic
+"
 
-pkg_setup() {
+src_prepare() {
 	G2CONF="${G2CONF}
 		UNOCONV=$(type -P false)
 		--disable-schemas-compile
 		--disable-static"
+	if use office; then
+		G2CONF="${G2CONF} UNOCONV=$(type -P unoconv)"
+	fi
+
 	DOCS="AUTHORS NEWS README TODO"
-	use office && G2CONF+=" UNOCONV=$(type -P unoconv)"
-}
+	gnome2_src_prepare
+}
\ No newline at end of file


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-extra/sushi/
@ 2012-11-01 22:48 Gilles Dartiguelongue
  0 siblings, 0 replies; 19+ messages in thread
From: Gilles Dartiguelongue @ 2012-11-01 22:48 UTC (permalink / raw
  To: gentoo-commits

commit:     cb0d3247631683ef9ce0207112112bfbedec53a7
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  1 21:35:12 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Nov  1 21:41:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=cb0d3247

gnome-extra/sushi: drop useless patch

---
 gnome-extra/sushi/metadata.xml       |    5 +++++
 gnome-extra/sushi/sushi-3.6.0.ebuild |    9 +++------
 gnome-extra/sushi/sushi-9999.ebuild  |    4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/gnome-extra/sushi/metadata.xml b/gnome-extra/sushi/metadata.xml
new file mode 100644
index 0000000..6e0e2ec
--- /dev/null
+++ b/gnome-extra/sushi/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+</pkgmetadata>

diff --git a/gnome-extra/sushi/sushi-3.6.0.ebuild b/gnome-extra/sushi/sushi-3.6.0.ebuild
index cbb03b2..b1c5a5a 100644
--- a/gnome-extra/sushi/sushi-3.6.0.ebuild
+++ b/gnome-extra/sushi/sushi-3.6.0.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2
+inherit gnome2
 
 DESCRIPTION="A quick previewer for Nautilus, the GNOME file manager"
 HOMEPAGE="http://git.gnome.org/browse/sushi"
@@ -50,6 +50,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 src_prepare() {
+	DOCS="AUTHORS NEWS README TODO"
 	G2CONF="${G2CONF}
 		UNOCONV=$(type -P false)
 		--disable-schemas-compile
@@ -58,9 +59,5 @@ src_prepare() {
 		G2CONF="${G2CONF} UNOCONV=$(type -P unoconv)"
 	fi
 
-	DOCS="AUTHORS NEWS README TODO"
-
-	epatch "${FILESDIR}"/${P}-gold.patch
-	eautoreconf
 	gnome2_src_prepare
-}
\ No newline at end of file
+}

diff --git a/gnome-extra/sushi/sushi-9999.ebuild b/gnome-extra/sushi/sushi-9999.ebuild
index dbd4ccc..6249c91 100644
--- a/gnome-extra/sushi/sushi-9999.ebuild
+++ b/gnome-extra/sushi/sushi-9999.ebuild
@@ -57,6 +57,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 src_prepare() {
+	DOCS="AUTHORS NEWS README TODO"
 	G2CONF="${G2CONF}
 		UNOCONV=$(type -P false)
 		--disable-schemas-compile
@@ -65,6 +66,5 @@ src_prepare() {
 		G2CONF="${G2CONF} UNOCONV=$(type -P unoconv)"
 	fi
 
-	DOCS="AUTHORS NEWS README TODO"
 	gnome2_src_prepare
-}
\ No newline at end of file
+}


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-extra/sushi/
@ 2012-11-21 22:36 Gilles Dartiguelongue
  0 siblings, 0 replies; 19+ messages in thread
From: Gilles Dartiguelongue @ 2012-11-21 22:36 UTC (permalink / raw
  To: gentoo-commits

commit:     ae8e79f756b4f79dc4d25f168d9e4b5aea7a8738
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 21 22:30:22 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Nov 21 22:30:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ae8e79f7

gnome-extra/sushi: 3.6.0 → 3.6.1

---
 .../{sushi-3.6.0.ebuild => sushi-3.6.1.ebuild}     |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-extra/sushi/sushi-3.6.0.ebuild b/gnome-extra/sushi/sushi-3.6.1.ebuild
similarity index 100%
rename from gnome-extra/sushi/sushi-3.6.0.ebuild
rename to gnome-extra/sushi/sushi-3.6.1.ebuild


^ permalink raw reply	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-extra/sushi/
@ 2012-12-24 16:16 Gilles Dartiguelongue
  0 siblings, 0 replies; 19+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-24 16:16 UTC (permalink / raw
  To: gentoo-commits

commit:     cbd1dfbddc539a973207982e185d5477945cbdb1
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 24 16:15:40 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Dec 24 16:15:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=cbd1dfbd

gnome-extra/sushi: moved to gx86

    * Sync live ebuild with gx86 changes.
    * Add missing USE to metadata.xml.

---
 gnome-extra/sushi/metadata.xml       |    4 ++
 gnome-extra/sushi/sushi-3.6.1.ebuild |   63 ----------------------------------
 gnome-extra/sushi/sushi-9999.ebuild  |   16 ++++-----
 3 files changed, 11 insertions(+), 72 deletions(-)

diff --git a/gnome-extra/sushi/metadata.xml b/gnome-extra/sushi/metadata.xml
index 6e0e2ec..e7badbc 100644
--- a/gnome-extra/sushi/metadata.xml
+++ b/gnome-extra/sushi/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>gnome</herd>
+  <use>
+    <flag name="office">Support viewing file formats such as generated by
+			<pkg>app-office/libreoffice</pkg></flag>
+  </use>
 </pkgmetadata>

diff --git a/gnome-extra/sushi/sushi-3.6.1.ebuild b/gnome-extra/sushi/sushi-3.6.1.ebuild
deleted file mode 100644
index b1c5a5a..0000000
--- a/gnome-extra/sushi/sushi-3.6.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="A quick previewer for Nautilus, the GNOME file manager"
-HOMEPAGE="http://git.gnome.org/browse/sushi"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="office"
-
-# Optional app-office/unoconv support (OOo to pdf)
-# freetype needed for font loader
-# libX11 needed for sushi_create_foreign_window()
-COMMON_DEPEND=">=x11-libs/gdk-pixbuf-2.22.1[introspection]
-	>=dev-libs/gjs-0.7.7
-	>=dev-libs/glib-2.29.14:2
-	>=dev-libs/gobject-introspection-0.9.6
-	>=media-libs/clutter-1.11.4:1.0[introspection]
-	>=media-libs/clutter-gtk-1.0.1:1.0[introspection]
-	>=x11-libs/gtk+-3.0.0:3[introspection]
-
-	>=app-text/evince-3.0[introspection]
-	media-libs/freetype:2
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-	media-libs/clutter-gst:2.0[introspection]
-	media-libs/musicbrainz:5
-	net-libs/webkit-gtk:3[introspection]
-	x11-libs/gtksourceview:3.0[introspection]
-	x11-libs/libX11
-
-	office? ( app-office/unoconv )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/nautilus-3.1.90
-	x11-themes/gnome-icon-theme-symbolic
-"
-
-src_prepare() {
-	DOCS="AUTHORS NEWS README TODO"
-	G2CONF="${G2CONF}
-		UNOCONV=$(type -P false)
-		--disable-schemas-compile
-		--disable-static"
-	if use office; then
-		G2CONF="${G2CONF} UNOCONV=$(type -P unoconv)"
-	fi
-
-	gnome2_src_prepare
-}

diff --git a/gnome-extra/sushi/sushi-9999.ebuild b/gnome-extra/sushi/sushi-9999.ebuild
index 6249c91..b950550 100644
--- a/gnome-extra/sushi/sushi-9999.ebuild
+++ b/gnome-extra/sushi/sushi-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
@@ -14,7 +14,7 @@ fi
 DESCRIPTION="A quick previewer for Nautilus, the GNOME file manager"
 HOMEPAGE="http://git.gnome.org/browse/sushi"
 
-LICENSE="GPL-3"
+LICENSE="GPL-2+"
 SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
@@ -26,13 +26,14 @@ IUSE="office"
 # Optional app-office/unoconv support (OOo to pdf)
 # freetype needed for font loader
 # libX11 needed for sushi_create_foreign_window()
-COMMON_DEPEND=">=x11-libs/gdk-pixbuf-2.22.1[introspection]
+COMMON_DEPEND="
+	>=x11-libs/gdk-pixbuf-2.22.1[introspection]
 	>=dev-libs/gjs-0.7.7
 	>=dev-libs/glib-2.29.14:2
 	>=dev-libs/gobject-introspection-0.9.6
 	>=media-libs/clutter-1.11.4:1.0[introspection]
 	>=media-libs/clutter-gtk-1.0.1:1.0[introspection]
-	>=x11-libs/gtk+-3.0.0:3[introspection]
+	>=x11-libs/gtk+-3:3[introspection]
 
 	>=app-text/evince-3.0[introspection]
 	media-libs/freetype:2
@@ -56,15 +57,12 @@ RDEPEND="${COMMON_DEPEND}
 	x11-themes/gnome-icon-theme-symbolic
 "
 
-src_prepare() {
-	DOCS="AUTHORS NEWS README TODO"
+src_configure() {
 	G2CONF="${G2CONF}
 		UNOCONV=$(type -P false)
-		--disable-schemas-compile
 		--disable-static"
 	if use office; then
 		G2CONF="${G2CONF} UNOCONV=$(type -P unoconv)"
 	fi
-
-	gnome2_src_prepare
+	gnome2_src_configure
 }


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-extra/sushi/
@ 2013-11-16 11:35 Gilles Dartiguelongue
  0 siblings, 0 replies; 19+ messages in thread
From: Gilles Dartiguelongue @ 2013-11-16 11:35 UTC (permalink / raw
  To: gentoo-commits

commit:     e260fd483baf0772c3ac1bf69c4d9a7106890ea4
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 16 12:59:59 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 12:59:59 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e260fd48

gnome-extra/sushi: 3.8.1 → 3.10.0

---
 .../{sushi-9999.ebuild => sushi-3.10.0.ebuild}     | 27 +++++-----------------
 gnome-extra/sushi/sushi-9999.ebuild                | 20 +++++-----------
 2 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/gnome-extra/sushi/sushi-9999.ebuild b/gnome-extra/sushi/sushi-3.10.0.ebuild
similarity index 70%
copy from gnome-extra/sushi/sushi-9999.ebuild
copy to gnome-extra/sushi/sushi-3.10.0.ebuild
index b950550..71c96ad 100644
--- a/gnome-extra/sushi/sushi-9999.ebuild
+++ b/gnome-extra/sushi/sushi-3.10.0.ebuild
@@ -1,39 +1,31 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 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-2+"
 SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="office"
 
 # Optional app-office/unoconv support (OOo to pdf)
 # freetype needed for font loader
 # libX11 needed for sushi_create_foreign_window()
 COMMON_DEPEND="
-	>=x11-libs/gdk-pixbuf-2.22.1[introspection]
-	>=dev-libs/gjs-0.7.7
+	>=x11-libs/gdk-pixbuf-2.23[introspection]
+	>=dev-libs/gjs-1.34
 	>=dev-libs/glib-2.29.14:2
 	>=dev-libs/gobject-introspection-0.9.6
 	>=media-libs/clutter-1.11.4:1.0[introspection]
 	>=media-libs/clutter-gtk-1.0.1:1.0[introspection]
-	>=x11-libs/gtk+-3:3[introspection]
+	>=x11-libs/gtk+-3.4.0:3[introspection]
 
 	>=app-text/evince-3.0[introspection]
 	media-libs/freetype:2
@@ -49,7 +41,6 @@ COMMON_DEPEND="
 "
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 "
 RDEPEND="${COMMON_DEPEND}
@@ -58,11 +49,5 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 src_configure() {
-	G2CONF="${G2CONF}
-		UNOCONV=$(type -P false)
-		--disable-static"
-	if use office; then
-		G2CONF="${G2CONF} UNOCONV=$(type -P unoconv)"
-	fi
-	gnome2_src_configure
+	gnome2_src_configure --disable-static
 }

diff --git a/gnome-extra/sushi/sushi-9999.ebuild b/gnome-extra/sushi/sushi-9999.ebuild
index b950550..7189fd6 100644
--- a/gnome-extra/sushi/sushi-9999.ebuild
+++ b/gnome-extra/sushi/sushi-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 if [[ ${PV} = 9999 ]]; then
@@ -19,7 +18,7 @@ SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 IUSE="office"
 
@@ -27,13 +26,13 @@ IUSE="office"
 # freetype needed for font loader
 # libX11 needed for sushi_create_foreign_window()
 COMMON_DEPEND="
-	>=x11-libs/gdk-pixbuf-2.22.1[introspection]
-	>=dev-libs/gjs-0.7.7
+	>=x11-libs/gdk-pixbuf-2.23[introspection]
+	>=dev-libs/gjs-1.34
 	>=dev-libs/glib-2.29.14:2
 	>=dev-libs/gobject-introspection-0.9.6
 	>=media-libs/clutter-1.11.4:1.0[introspection]
 	>=media-libs/clutter-gtk-1.0.1:1.0[introspection]
-	>=x11-libs/gtk+-3:3[introspection]
+	>=x11-libs/gtk+-3.4.0:3[introspection]
 
 	>=app-text/evince-3.0[introspection]
 	media-libs/freetype:2
@@ -49,7 +48,6 @@ COMMON_DEPEND="
 "
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 "
 RDEPEND="${COMMON_DEPEND}
@@ -58,11 +56,5 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 src_configure() {
-	G2CONF="${G2CONF}
-		UNOCONV=$(type -P false)
-		--disable-static"
-	if use office; then
-		G2CONF="${G2CONF} UNOCONV=$(type -P unoconv)"
-	fi
-	gnome2_src_configure
+	gnome2_src_configure --disable-static
 }


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-extra/sushi/
@ 2014-04-21 14:40 Gilles Dartiguelongue
  0 siblings, 0 replies; 19+ messages in thread
From: Gilles Dartiguelongue @ 2014-04-21 14:40 UTC (permalink / raw
  To: gentoo-commits

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]


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-extra/sushi/
@ 2014-04-23 22:14 Gilles Dartiguelongue
  0 siblings, 0 replies; 19+ messages in thread
From: Gilles Dartiguelongue @ 2014-04-23 22:14 UTC (permalink / raw
  To: gentoo-commits

commit:     a8205ade12169f31e463cf7b6e07d563585a86f7
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 23 21:32:22 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Apr 23 21:36:18 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a8205ade

gnome-extra/sushi: 3.11.90 → 3.12.0

---
 gnome-extra/sushi/{sushi-3.11.90.ebuild => sushi-3.12.0.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-extra/sushi/sushi-3.11.90.ebuild b/gnome-extra/sushi/sushi-3.12.0.ebuild
similarity index 100%
rename from gnome-extra/sushi/sushi-3.11.90.ebuild
rename to gnome-extra/sushi/sushi-3.12.0.ebuild


^ permalink raw reply	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-extra/sushi/
@ 2014-10-27  0:04 Gilles Dartiguelongue
  0 siblings, 0 replies; 19+ messages in thread
From: Gilles Dartiguelongue @ 2014-10-27  0:04 UTC (permalink / raw
  To: gentoo-commits

commit:     8129e4639c9a60dc1d087a970aa7fac6f0fdb82c
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 26 23:46:49 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 26 23:46:49 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8129e463

gnome-extra/sushi: moved to gentoo-x86

---
 gnome-extra/sushi/sushi-3.12.0.ebuild | 53 -----------------------------------
 1 file changed, 53 deletions(-)

diff --git a/gnome-extra/sushi/sushi-3.12.0.ebuild b/gnome-extra/sushi/sushi-3.12.0.ebuild
deleted file mode 100644
index 7f543ae..0000000
--- a/gnome-extra/sushi/sushi-3.12.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="A quick previewer for Nautilus, the GNOME file manager"
-HOMEPAGE="http://git.gnome.org/browse/sushi"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="office"
-
-# Optional app-office/unoconv support (OOo to pdf)
-# freetype needed for font loader
-# libX11 needed for sushi_create_foreign_window()
-COMMON_DEPEND="
-	>=x11-libs/gdk-pixbuf-2.23[introspection]
-	>=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]
-	>=media-libs/clutter-gtk-1.0.1:1.0[introspection]
-	>=x11-libs/gtk+-3.4.0:3[introspection]
-
-	>=app-text/evince-3.0[introspection]
-	media-libs/freetype:2
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-	media-libs/clutter-gst:2.0[introspection]
-	media-libs/musicbrainz:5
-	net-libs/webkit-gtk:3[introspection]
-	x11-libs/gtksourceview:3.0[introspection]
-	x11-libs/libX11
-
-	office? ( app-office/unoconv )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/nautilus-3.1.90
-	x11-themes/gnome-icon-theme-symbolic
-"
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-extra/sushi/
@ 2015-05-14 13:39 Gilles Dartiguelongue
  0 siblings, 0 replies; 19+ messages in thread
From: Gilles Dartiguelongue @ 2015-05-14 13:39 UTC (permalink / raw
  To: gentoo-commits

commit:     f8141efbf76c218f31c9cbad5fec98965a385b90
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu May 14 10:53:18 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu May 14 10:53:18 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=f8141efb

gnome-extra/sushi: 3.12.0 → 3.16.0

 .../sushi/{sushi-9999.ebuild => sushi-3.16.0.ebuild}     | 16 ++++------------
 gnome-extra/sushi/sushi-9999.ebuild                      |  7 +++----
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/gnome-extra/sushi/sushi-9999.ebuild b/gnome-extra/sushi/sushi-3.16.0.ebuild
similarity index 78%
copy from gnome-extra/sushi/sushi-9999.ebuild
copy to gnome-extra/sushi/sushi-3.16.0.ebuild
index 6e967dd..ba53056 100644
--- a/gnome-extra/sushi/sushi-9999.ebuild
+++ b/gnome-extra/sushi/sushi-3.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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)
@@ -32,7 +25,7 @@ COMMON_DEPEND="
 	>=dev-libs/gobject-introspection-0.9.6
 	>=media-libs/clutter-1.11.4:1.0[introspection]
 	>=media-libs/clutter-gtk-1.0.1:1.0[introspection]
-	>=x11-libs/gtk+-3.4.0:3[introspection]
+	>=x11-libs/gtk+-3.13.2:3[introspection]
 
 	>=app-text/evince-3.0[introspection]
 	media-libs/freetype:2
@@ -40,7 +33,7 @@ COMMON_DEPEND="
 	media-libs/gst-plugins-base:1.0[introspection]
 	media-libs/clutter-gst:2.0[introspection]
 	media-libs/musicbrainz:5
-	net-libs/webkit-gtk:3[introspection]
+	net-libs/webkit-gtk:4[introspection]
 	x11-libs/gtksourceview:3.0[introspection]
 	x11-libs/libX11
 
@@ -52,7 +45,6 @@ DEPEND="${RDEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/nautilus-3.1.90
-	x11-themes/gnome-icon-theme-symbolic
 "
 
 src_configure() {

diff --git a/gnome-extra/sushi/sushi-9999.ebuild b/gnome-extra/sushi/sushi-9999.ebuild
index 6e967dd..b9b9a71 100644
--- a/gnome-extra/sushi/sushi-9999.ebuild
+++ b/gnome-extra/sushi/sushi-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -32,7 +32,7 @@ COMMON_DEPEND="
 	>=dev-libs/gobject-introspection-0.9.6
 	>=media-libs/clutter-1.11.4:1.0[introspection]
 	>=media-libs/clutter-gtk-1.0.1:1.0[introspection]
-	>=x11-libs/gtk+-3.4.0:3[introspection]
+	>=x11-libs/gtk+-3.13.2:3[introspection]
 
 	>=app-text/evince-3.0[introspection]
 	media-libs/freetype:2
@@ -40,7 +40,7 @@ COMMON_DEPEND="
 	media-libs/gst-plugins-base:1.0[introspection]
 	media-libs/clutter-gst:2.0[introspection]
 	media-libs/musicbrainz:5
-	net-libs/webkit-gtk:3[introspection]
+	net-libs/webkit-gtk:4[introspection]
 	x11-libs/gtksourceview:3.0[introspection]
 	x11-libs/libX11
 
@@ -52,7 +52,6 @@ DEPEND="${RDEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/nautilus-3.1.90
-	x11-themes/gnome-icon-theme-symbolic
 "
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-extra/sushi/
@ 2018-12-14 12:17 Gilles Dartiguelongue
  0 siblings, 0 replies; 19+ messages in thread
From: Gilles Dartiguelongue @ 2018-12-14 12:17 UTC (permalink / raw
  To: gentoo-commits

commit:     3a79d1eafbd1ad66a128dff716b29adb9b1211ab
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 14 12:10:51 2018 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Dec 14 12:17:09 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=3a79d1ea

gnome-extra/sushi: sync live ebuild with ::gentoo

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Manifest-Sign-Key: 0x5A56C8CD0C13248A
Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org>

 gnome-extra/sushi/sushi-9999.ebuild | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/gnome-extra/sushi/sushi-9999.ebuild b/gnome-extra/sushi/sushi-9999.ebuild
index 9b519834..93f473fe 100644
--- a/gnome-extra/sushi/sushi-9999.ebuild
+++ b/gnome-extra/sushi/sushi-9999.ebuild
@@ -1,17 +1,14 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
 
+EAPI=6
 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"
+HOMEPAGE="https://git.gnome.org/browse/sushi"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -24,29 +21,30 @@ IUSE="office"
 
 # Optional app-office/unoconv support (OOo to pdf)
 # freetype needed for font loader
-# libX11 needed for sushi_create_foreign_window()
+# gtk+[X] optionally needed for sushi_create_foreign_window(); when wayland is more widespread, might want to not force it
 COMMON_DEPEND="
 	>=x11-libs/gdk-pixbuf-2.23[introspection]
 	>=dev-libs/gjs-1.40
 	>=dev-libs/glib-2.29.14:2
-	>=dev-libs/gobject-introspection-0.9.6
+	>=dev-libs/gobject-introspection-0.9.6:=
 	>=media-libs/clutter-1.11.4:1.0[introspection]
 	>=media-libs/clutter-gtk-1.0.1:1.0[introspection]
-	>=x11-libs/gtk+-3.13.2:3[introspection]
+	>=x11-libs/gtk+-3.13.2:3[X,introspection]
 
 	>=app-text/evince-3.0[introspection]
 	media-libs/freetype:2
 	media-libs/gstreamer:1.0[introspection]
 	media-libs/gst-plugins-base:1.0[introspection]
-	media-libs/clutter-gst:2.0[introspection]
-	media-libs/musicbrainz:5
+	>=media-libs/harfbuzz-0.9.9:=
+	media-libs/clutter-gst:3.0[introspection]
+	media-libs/musicbrainz:5=
 	net-libs/webkit-gtk:4[introspection]
 	x11-libs/gtksourceview:3.0[introspection]
-	x11-libs/libX11
 
 	office? ( app-office/unoconv )
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
 "


^ permalink raw reply related	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2018-12-14 12:17 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-18  7:37 [gentoo-commits] proj/gnome:master commit in: gnome-extra/sushi/ Alexandre Restovtsev
  -- strict thread matches above, loose matches on Subject: below --
2018-12-14 12:17 Gilles Dartiguelongue
2015-05-14 13:39 Gilles Dartiguelongue
2014-10-27  0:04 Gilles Dartiguelongue
2014-04-23 22:14 Gilles Dartiguelongue
2014-04-21 14:40 Gilles Dartiguelongue
2013-11-16 11:35 Gilles Dartiguelongue
2012-12-24 16:16 Gilles Dartiguelongue
2012-11-21 22:36 Gilles Dartiguelongue
2012-11-01 22:48 Gilles Dartiguelongue
2012-10-27 21:59 Gilles Dartiguelongue
2012-09-05 15:49 Nirbheek Chauhan
2012-04-12 10:17 Priit Laes
2012-04-02  6:43 Alexandre Restovtsev
2011-11-03  1:53 Alexandre Restovtsev
2011-08-15 16:31 Nirbheek Chauhan
2011-05-02  9:15 Nirbheek Chauhan
2011-05-01 13:13 Nirbheek Chauhan
2011-04-30 19:37 Gilles Dartiguelongue

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox