Add missing RDEPEND on librsvg (#494130 by Johan Hovold), drop old.

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

5 files changed, 8 insertions, 228 deletions

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index b4f42a005f69..e26bff996541 100644
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.263 2013/12/08 17:47:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.264 2013/12/24 14:06:10 pacho Exp $
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> -evince-3.6.1.ebuild,
+  -evince-3.8.2.ebuild, -files/evince-3.6.0-evince.desktop.patch,
+  evince-3.8.3.ebuild:
+  Add missing RDEPEND on librsvg (#494130 by Johan Hovold), drop old.
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> evince-3.8.3.ebuild:
   x86 stable, bug #478252
diff --git a/app-text/evince/evince-3.6.1.ebuild b/app-text/evince/evince-3.6.1.ebuild
deleted file mode 100644
index 0bf6f6d5245c..000000000000
--- a/app-text/evince/evince-3.6.1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.6.1.ebuild,v 1.4 2013/02/07 21:42:27 ulm Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="http://www.gnome.org/projects/evince/"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
-SLOT="0/evd3.4-evv3.3"
-IUSE="debug djvu dvi gnome-keyring +introspection nautilus +postscript t1lib tiff xps"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
-
-# Since 2.26.2, can handle poppler without cairo support. Make it optional ?
-# not mature enough
-# atk used in libview
-# gdk-pixbuf used all over the place
-# libX11 used for totem-screensaver
-RDEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.33:2
-	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib:=
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.0.2:3[introspection?]
-	x11-libs/libX11:=
-	>=x11-libs/libSM-1:=
-	x11-libs/libICE:=
-	gnome-base/gsettings-desktop-schemas
-	|| (
-		>=x11-themes/gnome-icon-theme-2.17.1
-		>=x11-themes/hicolor-icon-theme-0.10 )
-	>=x11-libs/cairo-1.10:=
-	>=app-text/poppler-0.20:=[cairo]
-	djvu? ( >=app-text/djvu-3.5.17:= )
-	dvi? (
-		virtual/tex-base
-		dev-libs/kpathsea:=
-		t1lib? ( >=media-libs/t1lib-5:= ) )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22 )
-	introspection? ( >=dev-libs/gobject-introspection-1 )
-	nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] )
-	postscript? ( >=app-text/libspectre-0.2.0:= )
-	tiff? ( >=media-libs/tiff-3.6:0= )
-	xps? ( >=app-text/libgxps-0.2.1:= )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.3
-	dev-util/gdbus-codegen
-	sys-devel/gettext
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig"
-
-ELTCONF="--portage"
-
-# Needs dogtail and pyspi from http://fedorahosted.org/dogtail/
-# Releases: http://people.redhat.com/zcerza/dogtail/releases/
-RESTRICT="test"
-
-src_prepare() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-tests
-		--enable-pdf
-		--enable-comics
-		--enable-thumbnailer
-		--with-smclient=xsmp
-		--with-platform=gnome
-		--enable-dbus
-		$(use_enable djvu)
-		$(use_enable dvi)
-		$(use_with gnome-keyring keyring)
-		$(use_enable introspection)
-		$(use_enable nautilus)
-		$(use_enable postscript ps)
-		$(use_enable t1lib)
-		$(use_enable tiff)
-		$(use_enable xps)
-		ITSTOOL=$(type -P true)"
-
-	# Fix .desktop file so menu item shows up
-	epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
-
-	# Fix .desktop file categories, in 3.7
-	epatch "${FILESDIR}/${PN}-3.6.0-evince.desktop.patch"
-
-	gnome2_src_prepare
-	# Do not depend on gnome-icon-theme, bug #326855, #391859
-	sed -e 's/gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED//g' \
-		-i configure || die "sed failed"
-}
diff --git a/app-text/evince/evince-3.8.2.ebuild b/app-text/evince/evince-3.8.2.ebuild
deleted file mode 100644
index a3e35ce9430e..000000000000
--- a/app-text/evince/evince-3.8.2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.8.2.ebuild,v 1.2 2013/08/01 02:34:24 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="http://www.gnome.org/projects/evince/"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
-SLOT="0/evd3.4-evv3.3"
-IUSE="debug djvu dvi gnome-keyring +introspection nautilus +postscript t1lib tiff xps"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
-
-# Since 2.26.2, can handle poppler without cairo support. Make it optional ?
-# not mature enough
-# atk used in libview
-# gdk-pixbuf used all over the place
-# libX11 used for totem-screensaver
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.33:2
-	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib:=
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.7.5:3[introspection?]
-	x11-libs/libX11:=
-	>=x11-libs/libSM-1:=
-	x11-libs/libICE:=
-	gnome-base/gsettings-desktop-schemas
-	|| (
-		>=x11-themes/gnome-icon-theme-2.17.1
-		>=x11-themes/hicolor-icon-theme-0.10 )
-	>=x11-libs/cairo-1.10:=
-	>=app-text/poppler-0.20:=[cairo]
-	djvu? ( >=app-text/djvu-3.5.17:= )
-	dvi? (
-		virtual/tex-base
-		dev-libs/kpathsea:=
-		t1lib? ( >=media-libs/t1lib-5:= ) )
-	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
-	introspection? ( >=dev-libs/gobject-introspection-1 )
-	nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] )
-	postscript? ( >=app-text/libspectre-0.2.0:= )
-	tiff? ( >=media-libs/tiff-3.6:0= )
-	xps? ( >=app-text/libgxps-0.2.1:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		>=x11-themes/gnome-icon-theme-2.17.1
-		>=x11-themes/hicolor-icon-theme-0.10 )
-	x11-themes/gnome-icon-theme-symbolic
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	dev-util/gdbus-codegen
-	sys-devel/gettext
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-# Needs dogtail and pyspi from http://fedorahosted.org/dogtail/
-# Releases: http://people.redhat.com/zcerza/dogtail/releases/
-RESTRICT="test"
-
-src_prepare() {
-	ELTCONF="--portage"
-
-	gnome2_src_prepare
-
-	# Do not depend on gnome-icon-theme, bug #326855, #391859
-	sed -e 's/gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED//g' \
-		-i configure || die "sed failed"
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--disable-tests \
-		--enable-pdf \
-		--enable-comics \
-		--enable-thumbnailer \
-		--with-smclient=xsmp \
-		--with-platform=gnome \
-		--enable-dbus \
-		$(use_enable djvu) \
-		$(use_enable dvi) \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable introspection) \
-		$(use_enable nautilus) \
-		$(use_enable postscript ps) \
-		$(use_enable t1lib) \
-		$(use_enable tiff) \
-		$(use_enable xps) \
-		ITSTOOL=$(type -P true)
-}
diff --git a/app-text/evince/evince-3.8.3.ebuild b/app-text/evince/evince-3.8.3.ebuild
index 3e612c8d96d0..2aa01806dbb1 100644
--- a/app-text/evince/evince-3.8.3.ebuild
+++ b/app-text/evince/evince-3.8.3.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/app-text/evince/evince-3.8.3.ebuild,v 1.4 2013/12/08 17:47:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.8.3.ebuild,v 1.5 2013/12/24 14:06:10 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -48,6 +48,7 @@ COMMON_DEPEND="
 	xps? ( >=app-text/libgxps-0.2.1:= )
 "
 RDEPEND="${COMMON_DEPEND}
+	gnome-base/librsvg
 	|| (
 		>=x11-themes/gnome-icon-theme-2.17.1
 		>=x11-themes/hicolor-icon-theme-0.10 )
diff --git a/app-text/evince/files/evince-3.6.0-evince.desktop.patch b/app-text/evince/files/evince-3.6.0-evince.desktop.patch
deleted file mode 100644
index 8fb729571385..000000000000
--- a/app-text/evince/files/evince-3.6.0-evince.desktop.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a9f7ae46f2ea3d78cb53db4f0aad69bc7d0d163a Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Fri, 12 Oct 2012 19:15:18 -0400
-Subject: [PATCH] evince.desktop: add 2DGraphics category
-
-Needed to pass validation with desktop-file-utils-0.20
-
-https://bugzilla.gnome.org/show_bug.cgi?id=686062
----
- data/evince.desktop.in.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/evince.desktop.in.in b/data/evince.desktop.in.in
-index 7106d97..e38497e 100644
---- a/data/evince.desktop.in.in
-+++ b/data/evince.desktop.in.in
-@@ -13,5 +13,5 @@ X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=evince
- X-GNOME-Bugzilla-Component=BugBuddyBugs
- X-GNOME-Bugzilla-Version=@VERSION@
--Categories=GNOME;GTK;Office;Viewer;Graphics;VectorGraphics;
-+Categories=GNOME;GTK;Office;Viewer;Graphics;2DGraphics;VectorGraphics;
- MimeType=@EVINCE_MIME_TYPES@
--- 
-1.7.12.3
-