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.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

5 files changed, 14 insertions, 85 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/Manifest b/app-text/evince/Manifest
index 7f5d7acc9f42..1f1f5546fb18 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,11 +1,9 @@
 AUX evince-0.6.1-dbus-switch.patch 974 RMD160 85726bcd9000ebde631d8102a0f79aa6d6df8de1 SHA1 246f5c18ba30de97922af003757283179134c7bf SHA256 1fe375cf561b215a9d25482b7e74ee254cf3f052a7a77a7ac7b71fa0e872fd49
 AUX evince-0.7.1-display-menu.patch 476 RMD160 a16a5e1f32490a7db219442b23cbcf77773e6bdd SHA1 73a97e83b12ad80f6645339978717bcf8c7da575 SHA256 1f450dfe57ef3325cb4642141d76fc8e7bf837c221d81a2593214913af058f4d
 AUX evince-2.22.2-t1lib-fonts.patch 4136 RMD160 7ae4bda31cf8b5326d986401009d1a32ea1cebae SHA1 b5cc6657739847de7ceef851db4bf98002c83e2a SHA256 36db5a32b2ee7bb35ca4a580a5cad13ab7c60b61653b050aca27c4ebaf33f411
-DIST evince-2.20.1.tar.bz2 1613601 RMD160 30e93bedf50ea968fea917f439bdd061203ba3d0 SHA1 785813845e30794c31a688507d1628067241d5d1 SHA256 9435c67974b59979b8d84224ed63128cd428fc9bb746f6b333c400619c7f182e
 DIST evince-2.22.2.tar.bz2 1629323 RMD160 3221c07cfcb0699697122aebeca2be35b5973fc8 SHA1 c1be08426c8d7220021d20502a7ffafbe82108b4 SHA256 4dcbdbd253b1978dcd70452780d7804ade912f4ede90f122f30d5322f53c5c3e
 DIST evince-2.24.2.tar.bz2 1717166 RMD160 d038ac41e2d956011e294344e442317719149fb3 SHA1 918f8ec07c393cad4fea1c3315cd26ed384d65eb SHA256 aa6f29c93413e206b0e30fc241b4e5aa8d67c94baff50b9b92147543516e6bce
-EBUILD evince-2.20.1.ebuild 1811 RMD160 11025bfe531025e693df1e9ab97c8971f807e568 SHA1 230ba76aa7934795fb413194fe19a0f4c113ac1b SHA256 0237002accb1fab74f263f3a7d029a122b2f91a7e3a2d555704f375abad52b09
-EBUILD evince-2.22.2-r1.ebuild 1866 RMD160 27b6ccde2b354464ad87d63ff1cd18d7f056f933 SHA1 499540c70c855fd09633f042cf1a16e0986d90e4 SHA256 001f9e752e395cd66a8c2b662f2d7d205a04a68d55576d819f2667cc80d240bd
-EBUILD evince-2.24.2.ebuild 1702 RMD160 db92da0a92db807da71c1bd477a94bb60890561d SHA1 5921a58a6816cc178a7a1fcac528e4b25d433223 SHA256 f4541efe63b9aaca74988f7a8664155bc747c6b46aaa36160d1b9eb2fcd9f194
-MISC ChangeLog 23476 RMD160 ea50fb68234f8d90c5981f95eb515079bda96ede SHA1 13bcb4f70cce6572e8d7ac7047b2f58ae5942215 SHA256 27499903bb653761d225c685140b951bb9d146e201b4d500dc3515ea79f1c752
+EBUILD evince-2.22.2-r1.ebuild 1853 RMD160 db2e75cf06db7148452c127bdb640d68e8c8baca SHA1 129511924ff7f89c98bc98d99f75aca92a60ad8d SHA256 9fc1b9f34657d2dde687cf86ff932df27c76a00295f141cfac741f41ae9a16a7
+EBUILD evince-2.24.2.ebuild 1694 RMD160 9eaeefb6485b149bac2702144a61838e76244b31 SHA1 e226f16b35bea809c35298e3d560d5066f73604f SHA256 8c2fb0051e034d2821a2f07359303bb23305163094bfd537d03b14bc709bb6a0
+MISC ChangeLog 23803 RMD160 10f0b75fd396330b5b35003d2e8655083359b20b SHA1 1cb17a3db6c0b3b64df06691c57ca688307a6c87 SHA256 966101a6902bda57e5b8e5d29e4cca0a3fc1035500f6cd4bdcf867f840de829d
 MISC metadata.xml 498 RMD160 b319329bc2c242221268761b3945f693b3aa0490 SHA1 8a5bea77d715fff4cc4480b76f7d9015e147636d SHA256 ba365b677379bdd81e8b38b42003be020d9f5bb1e96f6733800d2d8d8e3e2464
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 )