Version bump for Gnome 3.10

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 9 insertions, 67 deletions

diff --git a/gnome-extra/sushi/ChangeLog b/gnome-extra/sushi/ChangeLog
index 64108803b702..b11cb21b3b21 100644
--- a/gnome-extra/sushi/ChangeLog
+++ b/gnome-extra/sushi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/sushi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sushi/ChangeLog,v 1.18 2013/12/08 19:00:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sushi/ChangeLog,v 1.19 2013/12/24 17:14:29 pacho Exp $
+
+*sushi-3.10.0 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +sushi-3.10.0.ebuild,
+  -sushi-3.6.1.ebuild, -sushi-3.8.0.ebuild:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> sushi-3.8.1.ebuild:
   x86 stable, bug #478252
diff --git a/gnome-extra/sushi/sushi-3.8.0.ebuild b/gnome-extra/sushi/sushi-3.10.0.ebuild
index e61cf32acbe2..09c2e16ed373 100644
--- a/gnome-extra/sushi/sushi-3.8.0.ebuild
+++ b/gnome-extra/sushi/sushi-3.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sushi/sushi-3.8.0.ebuild,v 1.2 2013/03/29 22:55:08 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sushi/sushi-3.10.0.ebuild,v 1.1 2013/12/24 17:14:29 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -41,7 +41,6 @@ COMMON_DEPEND="
 "
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 "
 RDEPEND="${COMMON_DEPEND}
@@ -50,7 +49,5 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		UNOCONV=$(usex office $(type -P unoconv) $(type -P false))
+	gnome2_src_configure --disable-static
 }
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 e4757f7a8504..000000000000
--- a/gnome-extra/sushi/sushi-3.6.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sushi/sushi-3.6.1.ebuild,v 1.7 2013/02/02 22:41:36 ago Exp $
-
-EAPI="5"
-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-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.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_configure() {
-	G2CONF="${G2CONF}
-		UNOCONV=$(type -P false)
-		--disable-static"
-	if use office; then
-		G2CONF="${G2CONF} UNOCONV=$(type -P unoconv)"
-	fi
-	gnome2_src_configure
-}