Clean up dep list, make work on amd64

Package-Manager: portage-2.0.51.19

4 files changed, 37 insertions, 30 deletions

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index bdfb3fc2b3a7..55facad87d09 100644
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.3 2005/06/18 16:30:38 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.4 2005/06/18 22:48:55 dang Exp $
+
+  18 Jun 2005; <dang@gentoo.org> +files/evince-0.3.1-64bit.patch,
+  evince-0.3.1.ebuild:
+  Clean up dependency list, add patch to make dvi work on amd64, add ~amd64
 
   18 Jun 2005; David Holm <dholm@gentoo.org> evince-0.3.1.ebuild:
   Added to ~ppc.
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index c8109c310f71..75e75b7ab54d 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,5 +1,16 @@
-MD5 d181680cc2a88b2ab8a9ae16a77e14d9 ChangeLog 616
-MD5 aa07d7d2ece892caddb77c2360a033a5 evince-0.3.1.ebuild 1924
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dcd78e33dce9dc268164139c101d2bbb evince-0.3.1.ebuild 1524
+MD5 234c6558308f780c10e399e13b8239a8 ChangeLog 781
 MD5 80e3213c196ad3e4d107694f8064aad3 metadata.xml 220
-MD5 5657db834dcf44bba4220ca2eff0373d files/digest-evince-0.3.1 65
 MD5 cb282319216c1397d7e84b39d6cc0e6f files/evince-0.3.1-t1lib_is_t1.patch 1175
+MD5 5657db834dcf44bba4220ca2eff0373d files/digest-evince-0.3.1 65
+MD5 09fa043eb4188cd63be7d39f0661ef8b files/evince-0.3.1-64bit.patch 492
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCtKTyomPajV0RnrERAjMyAJ4lP8ju4EtOtO9D8yMDZzFyTbS+VgCfcrHV
+zUnfv9jv1JhonW4IvzH/T34=
+=iN0K
+-----END PGP SIGNATURE-----
diff --git a/app-text/evince/evince-0.3.1.ebuild b/app-text/evince/evince-0.3.1.ebuild
index 6355f38f5e8d..07a4e05153df 100644
--- a/app-text/evince/evince-0.3.1.ebuild
+++ b/app-text/evince/evince-0.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.3.1.ebuild,v 1.3 2005/06/18 16:30:38 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.3.1.ebuild,v 1.4 2005/06/18 22:48:55 dang Exp $
 
 inherit gnome2 eutils
 
@@ -14,45 +14,25 @@ IUSE="djvu doc dvi t1lib"
 # app-text/evince:t1lib - Enable Type1 fonts support in .dvi files
 
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
 	djvu? ( app-text/djvu )
+	dvi? ( app-text/tetex )
+	dvi? ( t1lib? ( >=media-libs/t1lib-5.0.0 ) )
 	>=app-text/poppler-0.3.2
-	>=dev-libs/atk-1.9
-	>=dev-libs/expat-1.95
 	>=dev-libs/glib-2
-	dev-libs/libxml2
-	dev-libs/openssl
-	dev-libs/popt
-	>=gnome-base/gconf-2.0
-	>=gnome-base/gnome-keyring-0.4
 	>=gnome-base/gnome-vfs-2.0
-	gnome-base/libbonobo
-	gnome-base/libbonoboui
-	>=gnome-base/libglade-2.0
 	gnome-base/libgnome
-	gnome-base/libgnomecanvas
-	>=gnome-base/libgnomeprint-2.2
 	>=gnome-base/libgnomeprintui-2.2
 	>=gnome-base/libgnomeui-2.4
-	>=gnome-base/orbit-2
-	media-libs/audiofile
-	media-libs/fontconfig
-	>=media-libs/freetype-2
-	media-libs/jpeg
-	media-libs/libart_lgpl
-	dvi? ( t1lib? ( >=media-libs/t1lib-5.0.0 ) )
-	media-sound/esound
-	net-misc/howl
-	virtual/x11
 	>=x11-libs/gtk+-2.6.1
-	x11-libs/pango
-	dvi? ( app-text/tetex )
+	virtual/x11
 	"
 
 
 DEPEND="${RDEPEND}
+	app-text/scrollkeeper
 	>=dev-util/pkgconfig-0.12.0
 	>=dev-util/intltool-0.30"
 
@@ -72,6 +52,7 @@ src_unpack(){
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-t1lib_is_t1.patch
+	epatch ${FILESDIR}/${P}-64bit.patch
 	autoconf || die "autoconf failed"
 	automake || die "automake failed"
 	libtoolize --force || die "libtoolize failed"
diff --git a/app-text/evince/files/evince-0.3.1-64bit.patch b/app-text/evince/files/evince-0.3.1-64bit.patch
new file mode 100644
index 000000000000..68ebfafd42bc
--- /dev/null
+++ b/app-text/evince/files/evince-0.3.1-64bit.patch
@@ -0,0 +1,11 @@
+--- evince-0.3.1/dvi/mdvi-lib/dviread.c.orig	2005-06-18 17:07:36.000000000 -0400
++++ evince-0.3.1/dvi/mdvi-lib/dviread.c	2005-06-18 17:11:06.000000000 -0400
+@@ -853,7 +853,7 @@
+ 		for(i = 1; i <= 10; i++)
+ 			page[i] = fsget4(p);
+ 		page[0] = offset;
+-		offset = (long)fuget4(p);
++		offset = fsget4(p);
+ 		/* check if the page is selected */
+ 		if(spec && mdvi_page_selected(spec, page, n) == 0) {
+ 			DEBUG((DBG_DVI, "Page %d (%ld.%ld.%ld.%ld.%ld.%ld.%ld.%ld.%ld.%ld) ignored by request\n",