diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 2d5cdc0..3203d3e 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -5,4 +5,4 @@ AUX evince-2.22.0-gtk-doc-die-die-die.patch 690 RMD160 f87a71134f563e5382dc0ca0d
 DIST evince-2.20.2.tar.bz2 1614179 RMD160 25daf214a29a2ead7161574852fd89c5bb6a848b SHA1 9d8d847314d728e579009eae76f2a84e17c9c893 SHA256 c6e9f2d8a90f95bc235b21ffb5be0d183ce2bfaaea84a4eafdb2449a2349129c
 DIST evince-2.22.0.tar.bz2 1618429 RMD160 5f54c3e8f7a980f35af2d2480f2f56971ffd6c95 SHA1 7c9fcc1fde30e673f7f5c96502ddf4dad6635cf4 SHA256 293778da77d42d8474bb401dc1a50d8e7d67b40b84ddce5fd39f871fef06a7ca
 EBUILD evince-2.20.2.ebuild 1979 RMD160 25814f14d24c2c2acff9e6c3d368e8542c2713f9 SHA1 caea820dd875a0cad7c8186372d603edd434dae7 SHA256 089013c8519c276ad40436248bfeb0967d7529902537681e34851a0479b42c48
-EBUILD evince-2.22.0.ebuild 2021 RMD160 814ec3138cbc24716fc921a87562e197e8265715 SHA1 3c0a3473c38cf4df28f8b1708c4daaae49564364 SHA256 cdcb7b28bde5c2c0d3e6400712f4ecb64fa88313bc4c320a46e0c18fdd4c3ebd
+EBUILD evince-2.22.0.ebuild 2054 RMD160 533fabd7a5db97658060a546690d430e780a5cbc SHA1 461389fe5249583dcf42528a7aeb1cb40c00f00d SHA256 62c676f9d537a8bb5648c770445ee8c783462878643db3dc6f53e63d4e83a95d
diff --git a/app-text/evince/evince-2.22.0.ebuild b/app-text/evince/evince-2.22.0.ebuild
index 324ea01..26c02db 100644
--- a/app-text/evince/evince-2.22.0.ebuild
+++ b/app-text/evince/evince-2.22.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.20.2.ebuild,v 1.4 2008/02/01 18:47:28 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.22.0.ebuild,v 1.1 2008/03/27 23:10:40 eva Exp $
 
 inherit eutils gnome2 autotools
 
@@ -9,14 +9,14 @@ HOMEPAGE="http://www.gnome.org/projects/evince/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd"
-IUSE="dbus djvu doc dvi gnome t1lib tiff"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="dbus djvu doc dvi gnome keyring t1lib tiff"
 
 RDEPEND="
 	dbus? ( >=dev-libs/dbus-glib-0.71 )
 	>=x11-libs/gtk+-2.10
 	>=dev-libs/glib-2.15.6
-	>=gnome-base/gnome-keyring-0.4
+	keyring? ( >=gnome-base/gnome-keyring-2.20.1 )
 	>=gnome-base/libgnomeui-2.14
 	>=gnome-base/libgnome-2.14
 	>=x11-themes/gnome-icon-theme-2.17.1
@@ -26,7 +26,7 @@ RDEPEND="
 	gnome? ( >=gnome-base/nautilus-2.10 )
 	>=app-text/poppler-bindings-0.6
 	dvi? (
-		virtual/tex-base
+		virtual/tetex
 		t1lib? ( >=media-libs/t1lib-5.0.0 )
 	)
 	tiff? ( >=media-libs/tiff-3.6 )
@@ -34,10 +34,10 @@ RDEPEND="
 	>=app-text/libspectre-0.2.0"
 DEPEND="${RDEPEND}
 	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.3.2
 	>=dev-util/pkgconfig-0.9
 	>=sys-devel/automake-1.9
 	>=dev-util/intltool-0.35
-	>=app-text/gnome-doc-utils-0.3.2
 	doc? ( dev-util/gtk-doc )"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
@@ -45,14 +45,16 @@ 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)  \
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		--enable-comics
+		--enable-impress
+		$(use_enable dbus)
+		$(use_enable djvu)
+		$(use_enable dvi)
+		$(use_with keyring)
+		$(use_enable t1lib)
+		$(use_enable tiff)
 		$(use_enable gnome nautilus)"
 
 	if ! built_with_use app-text/poppler-bindings gtk; then