Clean up old revision.

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

5 files changed, 14 insertions, 104 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/Manifest b/gnome-extra/sushi/Manifest
index fdb98c89368d..648f1f2a2d46 100644
--- a/gnome-extra/sushi/Manifest
+++ b/gnome-extra/sushi/Manifest
@@ -1,19 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX sushi-0.4.1-gold.patch 838 SHA256 19efd37c387260a1136ce6b531765e0f2e57c411dadfce67080a20677a9622f1 SHA512 fdb4e2e90f73e331d93913c2368ee537b714ac356dfe596cd67450cfe89dddbb03bf1e57f1ff4ba8c53008e8bc936bcb7a0fbf7b4603fa023eae28ea7c61b5fd WHIRLPOOL 3271950e4e1384423125e0e322d6c4b1099614edc8633738c448a7e8c60ef40e02bc37086592c0fea6cd493c979002dd5cb97a3f2fb5af190ce79260fd3e9f53
-DIST sushi-0.4.1.tar.xz 298732 SHA256 7889e4309443dd7dfd5c9546af23565d15813c3f8f2af6c6776702ca8911a7bd SHA512 88a6315aa432276e6d8d74486e680f002b8158eaafe12d9210d61fc7cd1a76a4f09f9b5e0b8043401a0c17d8b330a07f469100650fc591fae806be14d294574f WHIRLPOOL b06be438b33106f7d7dbccf086c5c15c8ebd7e0a3650a07e22cd0b55550cb1890a4239c269e99c2468474af9644b8e23c6500244eac10b42bb68d469098925af
 DIST sushi-3.6.1.tar.xz 306728 SHA256 ddcfa4fd8ad6a8a7ff2da10a5190a031df9e9debf217cb1fcdeec2a181222af8 SHA512 1e7e0e1a3dee8790f37ed8c250097ed12e4686c314836de22ad86282df4d1766e23ae823b18e36f18ef207b47ddcac008178be608b4f4414d1177aaee277dcf6 WHIRLPOOL 40130e3dcc6217a282c7b2994a4e0da84fd282f604f92401eb9fb1e1d1543aa2705e7632003fa1113003b4cfbb791af07d4a83a1e525a3ae86d105cdb86acff1
 DIST sushi-3.8.0.tar.xz 308208 SHA256 9e17c3601a509c428d72dee04da194555fd4f2d3d12287ef9bacf9b147bf5fae SHA512 03973a9145f5c207ddeb4980c51de0793aebfa86b15f04ee267a3e59fc9c63f7803e6afa01763f040d612723b6fde5f25af831839c692a921f4a0449b362856a WHIRLPOOL 13ee759a7050e671d164a8f5e8d66549a0b00ffc51ddb25a3a8a6ba22afdba9d85b3cf0bfbd96956c7114886f2df726080aaf22b25ef53333fd5774201f75d3d
-EBUILD sushi-0.4.1.ebuild 1608 SHA256 7244a6175882500bd668c4a46c7ebfe735745fb32c4c429d70eb10f0e0a972a9 SHA512 0878c26bdf161057ba3988182596d477a02ac0b800338dd0ec1c968f11afe4ff6582235a584a4ea8c6ab6f52be7bffb5dd37d4b72875c730e7becb2cdd711962 WHIRLPOOL 7329787009b06ee9f53b7cdd05b63ebfaaee87e2d858edf3b881a14530608d27ce135763abe99e7efe47a76d80e88b5fd06f256b03b23861e7a304a230c583a2
 EBUILD sushi-3.6.1.ebuild 1643 SHA256 80fb79ecf9144bc5b230c95da239af3650e9e6bbaefb3ddb039ac3bbcdf626fb SHA512 2ae244986af99105988b6bb92dc4d81c64fa569fc83319132442fc4e39ef6422b45f7b49ef2624881fda9797cece81de9e72799ab7aa4068f38250ad0ca02a88 WHIRLPOOL 727e082ddd0ff21670e0450c7a17c7616ec23028d9fd769937026ce8646f07b5b4186bcb1f055e366f04de14e4207fe9fa271452039df1f4dc797dd44b264968
-EBUILD sushi-3.8.0.ebuild 1621 SHA256 11f32e8e253791bef5a9e17b002258eb5b820baed52a460a3631a68f49823041 SHA512 76f3e90d3e1c4f96d9ea4da26326a2ba5f7666a0cef27b3fc75f63d51c79e1acc0a8aae8fada50712434d056fc0b9708416f2926d39939097306e466956a6ae2 WHIRLPOOL be59fa661570b575e6d56b28d9539725efa8e2eb13912468756364bafb51e59b8244052fb804c9ee96cac5cffcc2cb2dedf79f453edf763f765999955999f87c
-MISC ChangeLog 1864 SHA256 3c3016cffe130abcf3d5115ebf05afb9551f9837bb7450a61d7caa565d48f213 SHA512 06c6bcb178475880510350aaac4cc6a332758dcfcd513ec708c2acf834c016df4f6eeb4547d9434d5a46ec9d76d714f487c2b684982efd88934670d8672ae1b4 WHIRLPOOL b4b1feb430736cba93bab623755b31613ec3ea5d8d968ac84e8eaf50d86dd6dbbc664637d3faa7c4012b76f52f1a079aecf1effc65af4b073c1b17f8c2dbd661
+EBUILD sushi-3.8.0.ebuild 1564 SHA256 dae24ce59ac7a3921c797f0df2ccd0822be970fc548da32ce3075c8f75254156 SHA512 cc39b4c8143fb47ed504e04b249add31b3676baee5410648ed8be2f1f13fa5a07af8838b9c8b445a4ace4a7219d14aaf313e04bb5e63511335035aa9560903a8 WHIRLPOOL 967e7be9de21faefdb0c9d58672a3a081f30e65927c426e6e7827da43835b6adfacab17e33b6097a6a5930e969835f11e7b1d6864783de2cfa5d09e8ea8f29ab
+MISC ChangeLog 2016 SHA256 2aba664ec34fb6596bfe965e7bef08cbc3150c81136ee6d0660b1f6897294939 SHA512 09c9ea3a1255e948b586efd3f2cab2b8bc9159bcafe55ee974aa569626b8415c5fa0e149d4ca5a8ee650a0417edbb00789bf10ddaa2de1e72f825d1206475997 WHIRLPOOL da1c3d85ae33fcdfaefbd2b47a5bf38f5dd293c62b58adcaf4573f658d5010f3ad38ce8d81317b779279ae9fe5764321415811b2061e04c58ccfc783c40a41ee
 MISC metadata.xml 290 SHA256 6715eafe228ab9fd2065d9aaf910f430f2c0e1056f208ee0b02333c62f92d1ba SHA512 a7e7e0ea3309a9a6deb52f93ce2078438d259103606aa281ce5c111e5ab047f33e7f8b442a25b0f79fdc80ac48a553071a76cbe8bc92ae35d332708110e8a177 WHIRLPOOL aff9411a61b5e57812f7e90b13dd78d69858dbe5153d060627889137e961307c5842ef2131278b3e1b56a1025d6e5adcc21460bfc4dfa1f291c2785cea459282
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFUflAACgkQCaWpQKGI+9SE1wCggdpcm8EdFW/rCXEK99pUp4Iv
-0cUAn2BiCkWzx2oeAd3bD5nUBPeaaRlQ
-=axaQ
+iEYEAREIAAYFAlFWG80ACgkQ1fmVwcYIWAYhPwCdEiqoBqPsoVyysM8CaaOwMEUn
+xJkAnA70lGwpLFqeNS5Irn4yAK+bOad/
+=peYn
 -----END PGP SIGNATURE-----
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))
 }