Clean up old revision.

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

4 files changed, 9 insertions, 96 deletions

diff --git a/gnome-extra/sushi/ChangeLog b/gnome-extra/sushi/ChangeLog
index 78b24f69ce3d..58733bb64eff 100644
--- a/gnome-extra/sushi/ChangeLog
+++ b/gnome-extra/sushi/ChangeLog
@@ -1,6 +1,10 @@
 # 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.13 2013/03/28 17:30:55 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sushi/ChangeLog,v 1.14 2013/03/29 22:55:08 eva Exp $
+
+  29 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> -sushi-0.4.1.ebuild,
+  -files/sushi-0.4.1-gold.patch, sushi-3.8.0.ebuild:
+  Clean up old revision.
 
 *sushi-3.8.0 (28 Mar 2013)
 
diff --git a/gnome-extra/sushi/files/sushi-0.4.1-gold.patch b/gnome-extra/sushi/files/sushi-0.4.1-gold.patch
deleted file mode 100644
index bb9edc0f65b6..000000000000
--- a/gnome-extra/sushi/files/sushi-0.4.1-gold.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 44b5746760248105386c7bca8c4edbf812b42548 Mon Sep 17 00:00:00 2001
-Message-Id: <44b5746760248105386c7bca8c4edbf812b42548.1347213825.git.jlec@gentoo.org>
-From: Funda Wang <fwang@mageia.org>
-Date: Sat, 7 Jul 2012 04:37:08 +0200
-Subject: [PATCH] Make it build with as-needed linking
-
-https://bugzilla.gnome.org/show_bug.cgi?id=679495
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index 6f0ade6..60f1359 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -58,6 +58,7 @@ GOBJECT_INTROSPECTION_MIN_VERSION=0.9.6
- GDK_PIXBUF_MIN_VERSION=2.22.1
- 
- PKG_CHECK_MODULES(SUSHI,
-+                  freetype2
-                   glib-2.0 >= $GLIB_MIN_VERSION
-                   gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
-                   gjs-1.0 >= $GJS_MIN_VERSION
--- 
-1.7.12
-
diff --git a/gnome-extra/sushi/sushi-0.4.1.ebuild b/gnome-extra/sushi/sushi-0.4.1.ebuild
deleted file mode 100644
index 39a64b1ec417..000000000000
--- a/gnome-extra/sushi/sushi-0.4.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.3 2012/12/24 16:16:00 eva Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="A quick previewer for Nautilus, the GNOME file manager"
-HOMEPAGE="http://git.gnome.org/browse/sushi"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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-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
-	net-libs/webkit-gtk:3[introspection]
-	x11-libs/gtksourceview:3.0[introspection]
-	x11-libs/libX11
-"
-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
-"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		UNOCONV=$(type -P false)
-		--disable-static"
-	DOCS="AUTHORS NEWS README TODO"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gold.patch
-	eautoreconf
-	gnome2_src_prepare
-}
diff --git a/gnome-extra/sushi/sushi-3.8.0.ebuild b/gnome-extra/sushi/sushi-3.8.0.ebuild
index f340b306a0fd..e61cf32acbe2 100644
--- a/gnome-extra/sushi/sushi-3.8.0.ebuild
+++ b/gnome-extra/sushi/sushi-3.8.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.1 2013/03/28 17:30:55 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sushi/sushi-3.8.0.ebuild,v 1.2 2013/03/29 22:55:08 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -50,11 +50,7 @@ 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 \
+		UNOCONV=$(usex office $(type -P unoconv) $(type -P false))
 }