cleanup old versions and bump to 0.8.3

Package-Manager: portage-2.1.3_rc6

15 files changed, 30 insertions, 464 deletions

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index af41406fe22d..8dd85cb88c00 100644
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.106 2007/07/08 04:16:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.107 2007/07/19 14:24:12 eva Exp $
+
+*evince-0.8.3 (19 Jul 2007)
+
+  19 Jul 2007; Gilles Dartiguelongue <eva@gentoo.org> -evince-0.6.0.ebuild,
+  -evince-0.6.1.ebuild, -evince-0.6.1-r1.ebuild, -evince-0.6.1-r2.ebuild,
+  -evince-0.8.0.ebuild, -evince-0.8.1.ebuild, +evince-0.8.3.ebuild:
+  cleaning up old versions
+  bump to 0.8.3
+  * fix compilation against poppler 0.5.4
+  * freebsd patch is upstream
 
   08 Jul 2007; Michael Sterrett <mr_bones_@gentoo.org>
   evince-0.5.3-r1.ebuild, evince-0.6.0.ebuild, evince-0.6.1.ebuild,
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 3c5b30871618..ba48f1a37f2c 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -27,46 +27,24 @@ MD5 56922747a3dfd90f27cea514e13ce442 files/evince-0.8.1-freebsd.patch 517
 RMD160 5d9b2e267ae8904620ee2f13c07f24a2ac3c81db files/evince-0.8.1-freebsd.patch 517
 SHA256 b6e0cec1d77be3234b7232da47162ba67735ba3a876d442881af2fb813809c44 files/evince-0.8.1-freebsd.patch 517
 DIST evince-0.5.3.tar.bz2 994976 RMD160 6f29572326eef5f68309b3fa85e583eaaddc1eb6 SHA1 8336966d4c269065eee30912f8dd94caa76b0ba5 SHA256 793067426e0adf18129642426c4b4e8e4f61747dfea48111690525eff06822a0
-DIST evince-0.6.0.tar.bz2 1120159 RMD160 697fe6b5c1ba60d529422c2ea2a145b2e2dc7f3b SHA1 b3a38490b109284d91de3b50a3bb85b2847b39ed SHA256 c1a43a2795c2305ee4ce1cac86e31be959335133bb65fd6475d2abeaac090ec2
 DIST evince-0.6.1.tar.bz2 1212271 RMD160 ac94e1964f4f46e505fe945daa9de288c2587898 SHA1 bc314761ecc9c29d10d09294ad8e32bab3a5dbc6 SHA256 ee72f48ec0c76a8f44d8a6aed6759d43a147a9d5bb2b15f06460c4d6ef86025e
-DIST evince-0.8.0.tar.bz2 1460387 RMD160 f76c2da86a60ff6d129f6ec4dd900b50bbfa7368 SHA1 2aa16754fe3a5453ea5896a48deb00d5348f0cf4 SHA256 eaed6371b1909a8cbab91f7e40c710b251e7adbb2a88174f12b96e26e132a8df
-DIST evince-0.8.1.tar.bz2 1472930 RMD160 c9d268102e3d8b7f7f6bb06930f2995b053614de SHA1 5f32ff51cfde32fee89062743a3ddabbdadf579f SHA256 5247d5f0462e7877f4885708b6242849dbfd43f4af4f9b19786c0b28bc0659ee
+DIST evince-0.8.3.tar.bz2 1515083 RMD160 49a84a59a8d059b62a3482f7a3a9bae1349f1de7 SHA1 981020c677e257b8749478b3c23d25a76b426baf SHA256 2b02cacecbcde7d2849e2b40239d7cdae3e0f8e117c529249ac5d327e605baac
 EBUILD evince-0.5.3-r1.ebuild 1897 RMD160 fb0c9b0d869572708582e7431fa9bc017fe997d6 SHA1 545c9fa8f532cab52fdbd5a7a3766736603aa8e7 SHA256 af288663533b22ff4e56c4ebbf80711636a6bea4b4e9b0e6e00454641edccaa4
 MD5 c3a2322d8faf8293a7909ab8838a2a7b evince-0.5.3-r1.ebuild 1897
 RMD160 fb0c9b0d869572708582e7431fa9bc017fe997d6 evince-0.5.3-r1.ebuild 1897
 SHA256 af288663533b22ff4e56c4ebbf80711636a6bea4b4e9b0e6e00454641edccaa4 evince-0.5.3-r1.ebuild 1897
-EBUILD evince-0.6.0.ebuild 1882 RMD160 37945accb3f2e6d1009bc2d456d901e7e41d5b9a SHA1 88eeed0fe7d34e7a0c8b183e63e1bc2e344cd238 SHA256 42a98f15bd65b8649599c582e06fb258d45057a4e7542fa3e2be640e7a5b9f1b
-MD5 f289a5870fb484a61bd1c62de322b91d evince-0.6.0.ebuild 1882
-RMD160 37945accb3f2e6d1009bc2d456d901e7e41d5b9a evince-0.6.0.ebuild 1882
-SHA256 42a98f15bd65b8649599c582e06fb258d45057a4e7542fa3e2be640e7a5b9f1b evince-0.6.0.ebuild 1882
-EBUILD evince-0.6.1-r1.ebuild 1940 RMD160 c3c6399d4f5dd19440573d038707bc64c0749c31 SHA1 72b0f43045e43ea5b0253a33bcaa9c0d82e528c4 SHA256 b56d86f4ba28d8395a8619e6ee618311bfe003d87907c4bd10341e2cbbf994a9
-MD5 053b45d74dc5196d5684a0f1c7de2529 evince-0.6.1-r1.ebuild 1940
-RMD160 c3c6399d4f5dd19440573d038707bc64c0749c31 evince-0.6.1-r1.ebuild 1940
-SHA256 b56d86f4ba28d8395a8619e6ee618311bfe003d87907c4bd10341e2cbbf994a9 evince-0.6.1-r1.ebuild 1940
-EBUILD evince-0.6.1-r2.ebuild 1927 RMD160 d7120550d011a629f7483c3ab7ea75a2989a4d17 SHA1 7b93683ff0898d3e18e65e98aab41f06f4f46ef3 SHA256 ff488b0ef752a97924be6453b7a9f110bf176a5cfbadc6c1db8ba8be3992f434
-MD5 3f24a6190e017603bd5d07d1f3b5d377 evince-0.6.1-r2.ebuild 1927
-RMD160 d7120550d011a629f7483c3ab7ea75a2989a4d17 evince-0.6.1-r2.ebuild 1927
-SHA256 ff488b0ef752a97924be6453b7a9f110bf176a5cfbadc6c1db8ba8be3992f434 evince-0.6.1-r2.ebuild 1927
 EBUILD evince-0.6.1-r3.ebuild 2199 RMD160 9c65048233f8c1160992eb6e53fcf89c6592d8bc SHA1 59564b9af4975557117220bcf03a49b7840f4fbc SHA256 27c823275b040caf4523c5899d5e5ed28977504aa69790da998fb46f95938234
 MD5 918292af1e591eb715e3423dd922f988 evince-0.6.1-r3.ebuild 2199
 RMD160 9c65048233f8c1160992eb6e53fcf89c6592d8bc evince-0.6.1-r3.ebuild 2199
 SHA256 27c823275b040caf4523c5899d5e5ed28977504aa69790da998fb46f95938234 evince-0.6.1-r3.ebuild 2199
-EBUILD evince-0.6.1.ebuild 1836 RMD160 68316089590d1b67abea6c3349883c82eaf694e2 SHA1 f5d142f5fdc8831f3922fae29808649e2adbaedd SHA256 606d9765ed9d306e8a4a17b5a92d386eacbe4dd44e85710fa0399228d5173a15
-MD5 dc8b9bb4e33ae9b6aa3f379edb12adf1 evince-0.6.1.ebuild 1836
-RMD160 68316089590d1b67abea6c3349883c82eaf694e2 evince-0.6.1.ebuild 1836
-SHA256 606d9765ed9d306e8a4a17b5a92d386eacbe4dd44e85710fa0399228d5173a15 evince-0.6.1.ebuild 1836
-EBUILD evince-0.8.0.ebuild 1975 RMD160 e0819ec0c55182a43b73ab82517089332c6ae519 SHA1 c9156c1629912223b02a7ff90d5718b373769635 SHA256 fb1daeb3510afe5f3b3785d39c88bde8df9e69fa55e9a021c1874dc9fb2f0b28
-MD5 2d4dd318340e6db35c572fab65e44726 evince-0.8.0.ebuild 1975
-RMD160 e0819ec0c55182a43b73ab82517089332c6ae519 evince-0.8.0.ebuild 1975
-SHA256 fb1daeb3510afe5f3b3785d39c88bde8df9e69fa55e9a021c1874dc9fb2f0b28 evince-0.8.0.ebuild 1975
-EBUILD evince-0.8.1.ebuild 2062 RMD160 4a3d75701fe2580283e10e0e48ebceb060301c8b SHA1 897e9c7146f1fe0f665206715ddaa2ddac62f39c SHA256 9ee383f973a5dc733cbd44efe68eb9799e61efa05299ca8500e1bf5174ae1212
-MD5 4d4642590e788c9e1b3a4bd25ba61219 evince-0.8.1.ebuild 2062
-RMD160 4a3d75701fe2580283e10e0e48ebceb060301c8b evince-0.8.1.ebuild 2062
-SHA256 9ee383f973a5dc733cbd44efe68eb9799e61efa05299ca8500e1bf5174ae1212 evince-0.8.1.ebuild 2062
-MISC ChangeLog 14596 RMD160 d13d95450daf206b0a24275a6db655cdc4859520 SHA1 e0a750cc9af80c21c66ed406d891048179aec909 SHA256 602d9514a1922adeb2a057d7f2b538e1aff06d1aa8f82545cabe0a4989eca4e4
-MD5 cce55bde0f13414caab6461010de26cd ChangeLog 14596
-RMD160 d13d95450daf206b0a24275a6db655cdc4859520 ChangeLog 14596
-SHA256 602d9514a1922adeb2a057d7f2b538e1aff06d1aa8f82545cabe0a4989eca4e4 ChangeLog 14596
+EBUILD evince-0.8.3.ebuild 1973 RMD160 955cc02736ec1ff0e3a1dfb7b709bb1cbed23032 SHA1 578318c825646dc5d1cf76dafae437cd8bc6124e SHA256 c808947730f01938ee4f4c771fbcea4d043a805f78f3aaca56bd44cb4cc005c4
+MD5 7534cfa68f382d5e1b39f221fc998f75 evince-0.8.3.ebuild 1973
+RMD160 955cc02736ec1ff0e3a1dfb7b709bb1cbed23032 evince-0.8.3.ebuild 1973
+SHA256 c808947730f01938ee4f4c771fbcea4d043a805f78f3aaca56bd44cb4cc005c4 evince-0.8.3.ebuild 1973
+MISC ChangeLog 14953 RMD160 93bc50c8bd6ff72d47ed47530065e43249a89668 SHA1 94550d5db7f0b8680a2e41bc85cd24b2b6ad69fe SHA256 4c5edb3c103c43cf2da10f8bb3f6b5a73f35681d4923383e3c193358665a21bd
+MD5 520f0787abbb2160547b0a8b524d37db ChangeLog 14953
+RMD160 93bc50c8bd6ff72d47ed47530065e43249a89668 ChangeLog 14953
+SHA256 4c5edb3c103c43cf2da10f8bb3f6b5a73f35681d4923383e3c193358665a21bd ChangeLog 14953
 MISC metadata.xml 218 RMD160 356edd8735bce3bdded1992ed1e01831af9f1f60 SHA1 bb11546aaa0d850f95621d0a9c291bf447697982 SHA256 b53b06e28caff7a3a8fdd06a56946440e889e56ba1e3627dee44e02707cd1a52
 MD5 6725733a03ee56bb113dedaca6063b0f metadata.xml 218
 RMD160 356edd8735bce3bdded1992ed1e01831af9f1f60 metadata.xml 218
@@ -74,24 +52,9 @@ SHA256 b53b06e28caff7a3a8fdd06a56946440e889e56ba1e3627dee44e02707cd1a52 metadata
 MD5 b27867ecb2c42b5b3ea09028fc88475e files/digest-evince-0.5.3-r1 241
 RMD160 e5a044e6f7df1fbdde0b8c0103a35642a1c38ac7 files/digest-evince-0.5.3-r1 241
 SHA256 52eb5ddf6ccc40b4fe0e4c3b7366fcff03ac8d858952bbdce96ced345b290047 files/digest-evince-0.5.3-r1 241
-MD5 c4fa5b673580d6b1bb17a291d093861c files/digest-evince-0.6.0 244
-RMD160 fd1523db1851adbf5f06edfdfa2f26454bce8b13 files/digest-evince-0.6.0 244
-SHA256 33a2c59b3d827bd17c0c7851226d8a000e6dfa34a928150ba9479e8ecdf398c8 files/digest-evince-0.6.0 244
-MD5 f0a0f1d849c5b4752f41d565c47cb363 files/digest-evince-0.6.1 244
-RMD160 755fb9f6972779bb060873f439e99eff2a5a20db files/digest-evince-0.6.1 244
-SHA256 3080898d61c2f52fcf2e25788b71061292a8a4a4f49c5981e86c9253ff886b96 files/digest-evince-0.6.1 244
-MD5 f0a0f1d849c5b4752f41d565c47cb363 files/digest-evince-0.6.1-r1 244
-RMD160 755fb9f6972779bb060873f439e99eff2a5a20db files/digest-evince-0.6.1-r1 244
-SHA256 3080898d61c2f52fcf2e25788b71061292a8a4a4f49c5981e86c9253ff886b96 files/digest-evince-0.6.1-r1 244
-MD5 f0a0f1d849c5b4752f41d565c47cb363 files/digest-evince-0.6.1-r2 244
-RMD160 755fb9f6972779bb060873f439e99eff2a5a20db files/digest-evince-0.6.1-r2 244
-SHA256 3080898d61c2f52fcf2e25788b71061292a8a4a4f49c5981e86c9253ff886b96 files/digest-evince-0.6.1-r2 244
 MD5 f0a0f1d849c5b4752f41d565c47cb363 files/digest-evince-0.6.1-r3 244
 RMD160 755fb9f6972779bb060873f439e99eff2a5a20db files/digest-evince-0.6.1-r3 244
 SHA256 3080898d61c2f52fcf2e25788b71061292a8a4a4f49c5981e86c9253ff886b96 files/digest-evince-0.6.1-r3 244
-MD5 1242a4f243b24558bd7ce026160fb7ea files/digest-evince-0.8.0 244
-RMD160 64c24d41ccce43165f9f6493c4fe468dd4d78674 files/digest-evince-0.8.0 244
-SHA256 c83e65ccaf9429fc8f1987e85e3554424cc791c014b0f833de8344e11e398515 files/digest-evince-0.8.0 244
-MD5 b68417efba3e114a749102b27d354859 files/digest-evince-0.8.1 244
-RMD160 6d5e15ce36de38cfcabf61285f9fd9de70ea7111 files/digest-evince-0.8.1 244
-SHA256 27c101f7182a8364444daf8a06a81d3747b0a11915aa2c0ec24f6c6f89dcd591 files/digest-evince-0.8.1 244
+MD5 85e544184316163ffa88e764f5daf8d9 files/digest-evince-0.8.3 244
+RMD160 62bd14f71df03c949d7167bebca7c52fe19fe1ac files/digest-evince-0.8.3 244
+SHA256 f2de747749e6804a80b739b1d12cd39dbf2a47a14d678942ff9b1fab5e8df8cb files/digest-evince-0.8.3 244
diff --git a/app-text/evince/evince-0.6.0.ebuild b/app-text/evince/evince-0.6.0.ebuild
deleted file mode 100644
index f6031c810a03..000000000000
--- a/app-text/evince/evince-0.6.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.6.0.ebuild,v 1.12 2007/07/08 04:16:37 mr_bones_ Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="http://www.gnome.org/projects/evince/"
-LICENSE="GPL-2"
-
-# TODO: Use 'gnome' flag instead of 'nautilus'
-IUSE="dbus djvu doc dvi nautilus t1lib tiff"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-
-RDEPEND="
-	dvi? (
-		virtual/tetex
-		t1lib? ( >=media-libs/t1lib-5.0.0 )
-	)
-	dbus? ( || ( >=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-0.33 ) )
-	tiff? ( >=media-libs/tiff-3.6 )
-	>=app-text/poppler-bindings-0.5.3
-	>=dev-libs/glib-2
-	>=gnome-base/gnome-vfs-2.0
-	>=gnome-base/libglade-2
-	>=gnome-base/gconf-2
-	gnome-base/libgnome
-	|| (
-		>=gnome-base/libgnomeprintui-2.6
-		>=x11-libs/gtk+-2.10
-		)
-	>=gnome-base/libgnomeui-2.14
-	nautilus? ( >=gnome-base/nautilus-2.10 )
-	>=x11-libs/gtk+-2.8.15
-	gnome-base/gnome-keyring
-	djvu? ( >=app-text/djvu-3.5.17 )
-	virtual/ghostscript"
-
-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"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-USE_DESTDIR="1"
-ELTCONF="--portage"
-
-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 nautilus)"
-
-	if ! built_with_use app-text/poppler-bindings gtk; then
-		einfo "Please re-emerge app-text/poppler-bindings with the gtk USE flag set"
-		die "poppler-bindings needs gtk flag set"
-	fi
-}
-
-src_unpack(){
-	unpack "${A}"
-	cd "${S}"
-
-	# Fix .desktop file so menu item shows up
-	epatch ${FILESDIR}/${PN}-0.5.3-display-menu.patch
-}
diff --git a/app-text/evince/evince-0.6.1-r1.ebuild b/app-text/evince/evince-0.6.1-r1.ebuild
deleted file mode 100644
index 415fa5250109..000000000000
--- a/app-text/evince/evince-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.6.1-r1.ebuild,v 1.8 2007/07/08 04:16:37 mr_bones_ Exp $
-
-inherit eutils gnome2 autotools
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="http://www.gnome.org/projects/evince/"
-LICENSE="GPL-2"
-
-IUSE="dbus djvu doc dvi gnome t1lib tiff"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
-
-RDEPEND="
-	dvi? (
-		virtual/tetex
-		t1lib? ( >=media-libs/t1lib-5.0.0 )
-	)
-	dbus? ( || ( >=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-0.33 ) )
-	tiff? ( >=media-libs/tiff-3.6 )
-	>=app-text/poppler-bindings-0.5.4
-	>=dev-libs/glib-2
-	>=gnome-base/gnome-vfs-2.0
-	>=gnome-base/libglade-2
-	>=gnome-base/gconf-2
-	gnome-base/libgnome
-	|| (
-		>=gnome-base/libgnomeprintui-2.6
-		>=x11-libs/gtk+-2.10
-		)
-	>=gnome-base/libgnomeui-2.14
-	gnome? ( >=gnome-base/nautilus-2.10 )
-	>=x11-libs/gtk+-2.8.15
-	gnome-base/gnome-keyring
-	djvu? ( >=app-text/djvu-3.5.17 )
-	virtual/ghostscript"
-
-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"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-USE_DESTDIR="1"
-ELTCONF="--portage"
-
-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)"
-
-	if ! built_with_use app-text/poppler-bindings gtk; then
-		einfo "Please re-emerge app-text/poppler-bindings with the gtk USE flag set"
-		die "poppler-bindings needs gtk flag set"
-	fi
-}
-
-src_unpack(){
-	unpack "${A}"
-	cd "${S}"
-
-	# Fix .desktop file so menu item shows up
-	epatch ${FILESDIR}/${PN}-0.5.3-display-menu.patch
-
-	# Make dbus actually switchable
-	epatch ${FILESDIR}/${P}-dbus-switch.patch
-
-	eautoreconf
-}
diff --git a/app-text/evince/evince-0.6.1-r2.ebuild b/app-text/evince/evince-0.6.1-r2.ebuild
deleted file mode 100644
index ad70bd7457ef..000000000000
--- a/app-text/evince/evince-0.6.1-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.6.1-r2.ebuild,v 1.9 2007/07/08 04:16:37 mr_bones_ Exp $
-
-inherit eutils gnome2 autotools
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="http://www.gnome.org/projects/evince/"
-LICENSE="GPL-2"
-
-IUSE="dbus djvu doc dvi gnome t1lib tiff"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-
-RDEPEND="
-	dvi? (
-		virtual/tetex
-		t1lib? ( >=media-libs/t1lib-5.0.0 )
-	)
-	dbus? ( || ( >=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-0.33 ) )
-	tiff? ( >=media-libs/tiff-3.6 )
-	>=app-text/poppler-bindings-0.5.4
-	>=dev-libs/glib-2
-	>=gnome-base/gnome-vfs-2.0
-	>=gnome-base/libglade-2
-	>=gnome-base/gconf-2
-	gnome-base/libgnome
-	>=gnome-base/libgnomeprintui-2.6
-	>=gnome-base/libgnomeui-2.14
-	gnome? ( >=gnome-base/nautilus-2.10 )
-	>=x11-libs/gtk+-2.8.15
-	gnome-base/gnome-keyring
-	djvu? ( >=app-text/djvu-3.5.17 )
-	virtual/ghostscript"
-
-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"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-USE_DESTDIR="1"
-ELTCONF="--portage"
-
-pkg_setup() {
-	G2CONF="--disable-scrollkeeper \
-		--enable-comics		\
-		--enable-impress	\
-		--with-print=gnome	\
-		$(use_enable dbus)  \
-		$(use_enable djvu)  \
-		$(use_enable dvi)   \
-		$(use_enable t1lib) \
-		$(use_enable tiff)  \
-		$(use_enable gnome nautilus)"
-
-	if ! built_with_use app-text/poppler-bindings gtk; then
-		einfo "Please re-emerge app-text/poppler-bindings with the gtk USE flag set"
-		die "poppler-bindings needs gtk flag set"
-	fi
-}
-
-src_unpack(){
-	unpack "${A}"
-	cd "${S}"
-
-	# Fix .desktop file so menu item shows up
-	epatch ${FILESDIR}/${PN}-0.5.3-display-menu.patch
-
-	# Make dbus actually switchable
-	epatch ${FILESDIR}/${P}-dbus-switch.patch
-
-	eautoreconf
-}
diff --git a/app-text/evince/evince-0.6.1.ebuild b/app-text/evince/evince-0.6.1.ebuild
deleted file mode 100644
index eb45513a92e7..000000000000
--- a/app-text/evince/evince-0.6.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.6.1.ebuild,v 1.10 2007/07/08 04:16:37 mr_bones_ Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="http://www.gnome.org/projects/evince/"
-LICENSE="GPL-2"
-
-IUSE="dbus djvu doc dvi gnome t1lib tiff"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
-
-RDEPEND="
-	dvi? (
-		virtual/tetex
-		t1lib? ( >=media-libs/t1lib-5.0.0 )
-	)
-	dbus? ( || ( >=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-0.33 ) )
-	tiff? ( >=media-libs/tiff-3.6 )
-	>=app-text/poppler-bindings-0.5.4
-	>=dev-libs/glib-2
-	>=gnome-base/gnome-vfs-2.0
-	>=gnome-base/libglade-2
-	>=gnome-base/gconf-2
-	gnome-base/libgnome
-	|| (
-		>=gnome-base/libgnomeprintui-2.6
-		>=x11-libs/gtk+-2.10
-		)
-	>=gnome-base/libgnomeui-2.14
-	gnome? ( >=gnome-base/nautilus-2.10 )
-	>=x11-libs/gtk+-2.8.15
-	gnome-base/gnome-keyring
-	djvu? ( >=app-text/djvu-3.5.17 )
-	virtual/ghostscript"
-
-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"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-USE_DESTDIR="1"
-ELTCONF="--portage"
-
-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)"
-
-	if ! built_with_use app-text/poppler-bindings gtk; then
-		einfo "Please re-emerge app-text/poppler-bindings with the gtk USE flag set"
-		die "poppler-bindings needs gtk flag set"
-	fi
-}
-
-src_unpack(){
-	unpack "${A}"
-	cd "${S}"
-
-	# Fix .desktop file so menu item shows up
-	epatch ${FILESDIR}/${PN}-0.5.3-display-menu.patch
-}
diff --git a/app-text/evince/evince-0.8.1.ebuild b/app-text/evince/evince-0.8.1.ebuild
deleted file mode 100644
index d6d20a5593d1..000000000000
--- a/app-text/evince/evince-0.8.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.8.1.ebuild,v 1.4 2007/07/08 04:16:37 mr_bones_ Exp $
-
-WANT_AUTOMAKE="1.9"
-inherit eutils gnome2 autotools
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="http://www.gnome.org/projects/evince/"
-LICENSE="GPL-2"
-
-IUSE="dbus djvu doc dvi gnome t1lib tiff"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND="
-	dvi? (
-		virtual/tetex
-		t1lib? ( >=media-libs/t1lib-5.0.0 )
-	)
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
-	tiff? ( >=media-libs/tiff-3.6 )
-	>=app-text/poppler-bindings-0.5.4
-	>=dev-libs/glib-2
-	>=gnome-base/gnome-vfs-2.0
-	>=gnome-base/libglade-2
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnome-2.14
-	>=x11-libs/gtk+-2.10
-	gnome-base/gnome-keyring
-	>=gnome-base/libgnomeui-2.14
-	gnome? ( >=gnome-base/nautilus-2.10 )
-	djvu? ( >=app-text/djvu-3.5.17 )
-	>=x11-themes/gnome-icon-theme-2.17.1
-	dev-libs/libxml2
-	virtual/ghostscript"
-
-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"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-USE_DESTDIR="1"
-ELTCONF="--portage"
-
-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)"
-
-	if ! built_with_use app-text/poppler-bindings gtk; then
-		einfo "Please re-emerge app-text/poppler-bindings with the gtk USE flag set"
-		die "poppler-bindings needs gtk flag set"
-	fi
-}
-
-src_unpack(){
-	unpack "${A}"
-	cd "${S}"
-
-	# 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
-
-	# Fix build on fbsd.  Bug #178471
-	epatch "${FILESDIR}"/${P}-freebsd.patch
-
-	cp aclocal.m4 old_macros.m4
-	AT_M4DIR="." eautoreconf
-}
diff --git a/app-text/evince/evince-0.8.0.ebuild b/app-text/evince/evince-0.8.3.ebuild
index 5787079ce70c..46974b44acdf 100644
--- a/app-text/evince/evince-0.8.0.ebuild
+++ b/app-text/evince/evince-0.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.8.0.ebuild,v 1.2 2007/07/08 04:16:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.8.3.ebuild,v 1.1 2007/07/19 14:24:12 eva Exp $
 
 WANT_AUTOMAKE="1.9"
 inherit eutils gnome2 autotools
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 IUSE="dbus djvu doc dvi gnome t1lib tiff"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 RDEPEND="
 	dvi? (
@@ -64,9 +64,8 @@ pkg_setup() {
 	fi
 }
 
-src_unpack(){
-	unpack "${A}"
-	cd "${S}"
+src_unpack() {
+	gnome2_src_unpack
 
 	# Fix .desktop file so menu item shows up
 	epatch ${FILESDIR}/${PN}-0.7.1-display-menu.patch
diff --git a/app-text/evince/files/digest-evince-0.6.0 b/app-text/evince/files/digest-evince-0.6.0
deleted file mode 100644
index c696e80b7243..000000000000
--- a/app-text/evince/files/digest-evince-0.6.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2c99fac184c6acf5ff500aea20ae267d evince-0.6.0.tar.bz2 1120159
-RMD160 697fe6b5c1ba60d529422c2ea2a145b2e2dc7f3b evince-0.6.0.tar.bz2 1120159
-SHA256 c1a43a2795c2305ee4ce1cac86e31be959335133bb65fd6475d2abeaac090ec2 evince-0.6.0.tar.bz2 1120159
diff --git a/app-text/evince/files/digest-evince-0.6.1 b/app-text/evince/files/digest-evince-0.6.1
deleted file mode 100644
index 498e46d52a0f..000000000000
--- a/app-text/evince/files/digest-evince-0.6.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 55a1d4af3cac209c7cfbe83b7ffcee1d evince-0.6.1.tar.bz2 1212271
-RMD160 ac94e1964f4f46e505fe945daa9de288c2587898 evince-0.6.1.tar.bz2 1212271
-SHA256 ee72f48ec0c76a8f44d8a6aed6759d43a147a9d5bb2b15f06460c4d6ef86025e evince-0.6.1.tar.bz2 1212271
diff --git a/app-text/evince/files/digest-evince-0.6.1-r1 b/app-text/evince/files/digest-evince-0.6.1-r1
deleted file mode 100644
index 498e46d52a0f..000000000000
--- a/app-text/evince/files/digest-evince-0.6.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 55a1d4af3cac209c7cfbe83b7ffcee1d evince-0.6.1.tar.bz2 1212271
-RMD160 ac94e1964f4f46e505fe945daa9de288c2587898 evince-0.6.1.tar.bz2 1212271
-SHA256 ee72f48ec0c76a8f44d8a6aed6759d43a147a9d5bb2b15f06460c4d6ef86025e evince-0.6.1.tar.bz2 1212271
diff --git a/app-text/evince/files/digest-evince-0.6.1-r2 b/app-text/evince/files/digest-evince-0.6.1-r2
deleted file mode 100644
index 498e46d52a0f..000000000000
--- a/app-text/evince/files/digest-evince-0.6.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 55a1d4af3cac209c7cfbe83b7ffcee1d evince-0.6.1.tar.bz2 1212271
-RMD160 ac94e1964f4f46e505fe945daa9de288c2587898 evince-0.6.1.tar.bz2 1212271
-SHA256 ee72f48ec0c76a8f44d8a6aed6759d43a147a9d5bb2b15f06460c4d6ef86025e evince-0.6.1.tar.bz2 1212271
diff --git a/app-text/evince/files/digest-evince-0.8.0 b/app-text/evince/files/digest-evince-0.8.0
deleted file mode 100644
index 26633d2e036c..000000000000
--- a/app-text/evince/files/digest-evince-0.8.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b4f7b154535c05ca77a23be193fc458d evince-0.8.0.tar.bz2 1460387
-RMD160 f76c2da86a60ff6d129f6ec4dd900b50bbfa7368 evince-0.8.0.tar.bz2 1460387
-SHA256 eaed6371b1909a8cbab91f7e40c710b251e7adbb2a88174f12b96e26e132a8df evince-0.8.0.tar.bz2 1460387
diff --git a/app-text/evince/files/digest-evince-0.8.1 b/app-text/evince/files/digest-evince-0.8.1
deleted file mode 100644
index 073fd69df3aa..000000000000
--- a/app-text/evince/files/digest-evince-0.8.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f09c8d2a6c75abe50c6db7833d66a5b4 evince-0.8.1.tar.bz2 1472930
-RMD160 c9d268102e3d8b7f7f6bb06930f2995b053614de evince-0.8.1.tar.bz2 1472930
-SHA256 5247d5f0462e7877f4885708b6242849dbfd43f4af4f9b19786c0b28bc0659ee evince-0.8.1.tar.bz2 1472930
diff --git a/app-text/evince/files/digest-evince-0.8.3 b/app-text/evince/files/digest-evince-0.8.3
new file mode 100644
index 000000000000..19f00930cb2d
--- /dev/null
+++ b/app-text/evince/files/digest-evince-0.8.3
@@ -0,0 +1,3 @@
+MD5 0603d3f3f5648c88f10f75c89807c3d1 evince-0.8.3.tar.bz2 1515083
+RMD160 49a84a59a8d059b62a3482f7a3a9bae1349f1de7 evince-0.8.3.tar.bz2 1515083
+SHA256 2b02cacecbcde7d2849e2b40239d7cdae3e0f8e117c529249ac5d327e605baac evince-0.8.3.tar.bz2 1515083