Update dependencies w.r.t. bug 264230, fully-split-out poppler transition. Also punt evince-2.20.1, since no version of poppler in-tree meets the requirements of <app-text/poppler-bindings-0.8.

(Portage version: 2.2_rc28/cvs/Linux x86_64)

4 files changed, 11 insertions, 80 deletions

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index 6bf85e8bfa19..f855a024c597 100644
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.166 2009/03/18 15:17:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.167 2009/03/30 12:54:11 loki_val Exp $
+
+  30 Mar 2009; Peter Alfredsen <loki_val@gentoo.org> -evince-2.20.1.ebuild,
+  evince-2.22.2-r1.ebuild, evince-2.24.2.ebuild:
+  Update dependencies w.r.t. bug 264230, fully-split-out poppler transition.
+  Also punt evince-2.20.1, since no version of poppler in-tree meets the
+  requirements of <app-text/poppler-bindings-0.8.
 
   18 Mar 2009; Raúl Porcel <armin76@gentoo.org> evince-2.24.2.ebuild:
   alpha/ia64 stable wrt #260063
diff --git a/app-text/evince/evince-2.20.1.ebuild b/app-text/evince/evince-2.20.1.ebuild
deleted file mode 100644
index 6b051102c0ce..000000000000
--- a/app-text/evince/evince-2.20.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.20.1.ebuild,v 1.14 2009/03/07 14:47:36 gentoofan23 Exp $
-
-WANT_AUTOMAKE="1.9"
-EAPI="2"
-inherit eutils gnome2 autotools
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="http://www.gnome.org/projects/evince/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="arm sh"
-IUSE="dbus djvu doc dvi gnome t1lib tiff"
-
-RDEPEND="
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
-	>=x11-libs/gtk+-2.10
-	gnome-base/gnome-keyring
-	>=gnome-base/libgnomeui-2.14
-	>=gnome-base/libgnome-2.14
-	dev-libs/libxml2
-	>=x11-themes/gnome-icon-theme-2.17.1
-	>=gnome-base/gnome-vfs-2.0
-	>=gnome-base/libglade-2
-	>=dev-libs/glib-2
-	gnome? ( >=gnome-base/nautilus-2.10 )
-	<app-text/poppler-bindings-0.8[gtk]
-	dvi? (
-		virtual/tex-base
-		t1lib? ( >=media-libs/t1lib-5.0.0 )
-	)
-	tiff? ( >=media-libs/tiff-3.6 )
-	>=gnome-base/gconf-2
-	djvu? ( >=app-text/djvu-3.5.17 )
-	virtual/ghostscript"
-
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.3.2
-	~app-text/docbook-xml-dtd-4.1.2
-	>=dev-util/pkgconfig-0.9
-	>=sys-devel/automake-1.9
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-USE_DESTDIR="1"
-ELTCONF="--portage"
-RESTRICT="test"
-
-pkg_setup() {
-	G2CONF="--disable-scrollkeeper \
-		--enable-comics		\
-		--enable-impress	\
-		$(use_enable dbus)  \
-		$(use_enable djvu)  \
-		$(use_enable dvi)   \
-		$(use_enable t1lib) \
-		$(use_enable tiff)  \
-		$(use_enable gnome nautilus)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix .desktop file so menu item shows up
-	epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
-
-	# Make dbus actually switchable
-	epatch "${FILESDIR}"/${PN}-0.6.1-dbus-switch.patch
-
-	cp aclocal.m4 old_macros.m4
-	AT_M4DIR="." eautoreconf
-}
diff --git a/app-text/evince/evince-2.22.2-r1.ebuild b/app-text/evince/evince-2.22.2-r1.ebuild
index 1edc5ad27612..97ccfb20b2d2 100644
--- a/app-text/evince/evince-2.22.2-r1.ebuild
+++ b/app-text/evince/evince-2.22.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.22.2-r1.ebuild,v 1.10 2009/03/07 14:47:36 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.22.2-r1.ebuild,v 1.11 2009/03/30 12:54:11 loki_val Exp $
 
 EAPI="2"
 inherit eutils gnome2
@@ -25,7 +25,7 @@ RDEPEND="
 	>=gnome-base/libglade-2
 	>=gnome-base/gconf-2
 	gnome? ( >=gnome-base/nautilus-2.10 )
-	>=app-text/poppler-bindings-0.6[gtk]
+	>=virtual/poppler-glib-0.6
 	dvi? (
 		virtual/tex-base
 		t1lib? ( >=media-libs/t1lib-5.0.0 )
diff --git a/app-text/evince/evince-2.24.2.ebuild b/app-text/evince/evince-2.24.2.ebuild
index 7a64e74cc96c..e6a9da3c7f98 100644
--- a/app-text/evince/evince-2.24.2.ebuild
+++ b/app-text/evince/evince-2.24.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.24.2.ebuild,v 1.8 2009/03/18 15:17:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.24.2.ebuild,v 1.9 2009/03/30 12:54:11 loki_val Exp $
 
 EAPI="2"
 inherit eutils gnome2
@@ -23,7 +23,7 @@ RDEPEND="
 	>=gnome-base/libglade-2
 	>=gnome-base/gconf-2
 	nautilus? ( >=gnome-base/nautilus-2.10 )
-	>=app-text/poppler-bindings-0.8[gtk,cairo]
+	>=virtual/poppler-glib-0.8[cairo]
 	dvi? (
 		virtual/tex-base
 		t1lib? ( >=media-libs/t1lib-5.0.0 )