Version bump for Gnome 3.6.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C6085806)

4 files changed, 34 insertions, 18 deletions

diff --git a/gnome-extra/sushi/ChangeLog b/gnome-extra/sushi/ChangeLog
index 17cbe5b531c8..a8afc36ab5f7 100644
--- a/gnome-extra/sushi/ChangeLog
+++ b/gnome-extra/sushi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/sushi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sushi/ChangeLog,v 1.5 2012/09/09 18:06:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sushi/ChangeLog,v 1.6 2012/12/24 16:16:00 eva Exp $
+
+*sushi-3.6.1 (24 Dec 2012)
+
+  24 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org> -sushi-0.2.1.ebuild,
+  sushi-0.4.1.ebuild, +sushi-3.6.1.ebuild, metadata.xml:
+  Version bump for Gnome 3.6.
 
   09 Sep 2012; Justin Lecher <jlec@gentoo.org> +files/sushi-0.4.1-gold.patch,
   sushi-0.4.1.ebuild:
diff --git a/gnome-extra/sushi/metadata.xml b/gnome-extra/sushi/metadata.xml
index da6fd63d0085..6923537f839f 100644
--- a/gnome-extra/sushi/metadata.xml
+++ b/gnome-extra/sushi/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+	<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-0.4.1.ebuild b/gnome-extra/sushi/sushi-0.4.1.ebuild
index c8113e533045..39a64b1ec417 100644
--- a/gnome-extra/sushi/sushi-0.4.1.ebuild
+++ b/gnome-extra/sushi/sushi-0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sushi/sushi-0.4.1.ebuild,v 1.2 2012/09/09 18:06:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sushi/sushi-0.4.1.ebuild,v 1.3 2012/12/24 16:16:00 eva Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -11,7 +11,7 @@ inherit autotools eutils gnome2
 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"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/gnome-extra/sushi/sushi-0.2.1.ebuild b/gnome-extra/sushi/sushi-3.6.1.ebuild
index 3e8d5088acd6..d05171c27c8b 100644
--- a/gnome-extra/sushi/sushi-0.2.1.ebuild
+++ b/gnome-extra/sushi/sushi-3.6.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sushi/sushi-0.2.1.ebuild,v 1.3 2012/05/05 06:25:21 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sushi/sushi-3.6.1.ebuild,v 1.1 2012/12/24 16:16:00 eva Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
@@ -11,45 +11,51 @@ inherit gnome2
 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"
 KEYWORDS="~amd64 ~x86"
-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]
+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.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:0.10[introspection]
-	media-libs/gst-plugins-base:0.10[introspection]
-	media-libs/clutter-gst:1.0[introspection]
-	media-libs/musicbrainz:3
+	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}
-	virtual/pkgconfig
 	>=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
 "
 
-pkg_setup() {
+src_configure() {
 	G2CONF="${G2CONF}
-		UNOCONV=$(type -p false)
+		UNOCONV=$(type -P false)
 		--disable-static"
-	DOCS="AUTHORS NEWS README TODO"
+	if use office; then
+		G2CONF="${G2CONF} UNOCONV=$(type -P unoconv)"
+	fi
+	gnome2_src_configure
 }