Fix for bug #132129. Add -r1, with a patch to work with .17, and make it dep on >= .17. Make -r0 dep on .16

Package-Manager: portage-2.1_pre9-r5

6 files changed, 175 insertions, 9 deletions

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index 2b28c91c1a4d..0642bba1444a 100644
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.37 2006/05/02 13:52:23 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.38 2006/05/03 16:29:42 dang Exp $
+
+*evince-0.5.2-r1 (03 May 2006)
+
+  03 May 2006; Daniel Gryniewicz <dang@gentoo.org>
+  +files/evince-0.5.2-djvu-miniexp.patch, evince-0.5.2.ebuild,
+  +evince-0.5.2-r1.ebuild:
+  Fix for bug #132129. Add -r1, with a patch to work with .17, and make it dep
+  on >= .17. Make -r0 dep on .16
 
   02 May 2006; Markus Rothe <corsair@gentoo.org> evince-0.5.2.ebuild:
   Added ~ppc64
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index b842859199dd..cefff4d7a445 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,13 +1,73 @@
-MD5 6388d9183052044959bc1b38e51b74de ChangeLog 5352
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX evince-0.4.0-display-menu.patch 471 RMD160 e11baeaed7560e2dc524bcd09b6d4fb2118a6bfe SHA1 5b42238385a008e5c1ad833a7b3b474d4d1a214f SHA256 1d759ff798e817ca7652a9f43d8b58bcb97520a04b16a9999c546a4d29624819 size 471
+MD5 185784a35b672ed49ea8afb3aba25e30 files/evince-0.4.0-display-menu.patch 471
+RMD160 e11baeaed7560e2dc524bcd09b6d4fb2118a6bfe files/evince-0.4.0-display-menu.patch 471
+SHA256 1d759ff798e817ca7652a9f43d8b58bcb97520a04b16a9999c546a4d29624819 files/evince-0.4.0-display-menu.patch 471
+AUX evince-0.4.0-no-tiff.patch 985 RMD160 cbeaaabd0fd1892fab06602812aaefc5d3658697 SHA1 71e676b06f88eeb08146d2f0c4b80735a8fc3fbe SHA256 5708273e4b626e770a82a8a3f329b90a4b9fef5bcf876745f4e6247108ab8e26 size 985
+MD5 94070710202e7c8024edc662eb420658 files/evince-0.4.0-no-tiff.patch 985
+RMD160 cbeaaabd0fd1892fab06602812aaefc5d3658697 files/evince-0.4.0-no-tiff.patch 985
+SHA256 5708273e4b626e770a82a8a3f329b90a4b9fef5bcf876745f4e6247108ab8e26 files/evince-0.4.0-no-tiff.patch 985
+AUX evince-0.4.0-t1lib_is_t1.patch 976 RMD160 566d6a27bb76511354bf0e5917247bcd3bf086c7 SHA1 1bfa79015bcd672055a2f845ad2ef8a855b0825a SHA256 392bf6996406f0942ebbb67023b6e1baa071d17d6e86d4e55f8ad092c182b072 size 976
+MD5 755b327b4928ab9492b7c2aab72ef52d files/evince-0.4.0-t1lib_is_t1.patch 976
+RMD160 566d6a27bb76511354bf0e5917247bcd3bf086c7 files/evince-0.4.0-t1lib_is_t1.patch 976
+SHA256 392bf6996406f0942ebbb67023b6e1baa071d17d6e86d4e55f8ad092c182b072 files/evince-0.4.0-t1lib_is_t1.patch 976
+AUX evince-0.5.2-djvu-miniexp.patch 514 RMD160 c520a9795456fdb6f391cfd045014cc937557fc0 SHA1 881ddb114419632f9dafa8e305c291abfe1947ee SHA256 77c6f2b202186bdb7f9fb53afb1f9e3b7fa0821261694dce09951456718350db size 514
+MD5 a441d581aa0926cec8bceae1511234db files/evince-0.5.2-djvu-miniexp.patch 514
+RMD160 c520a9795456fdb6f391cfd045014cc937557fc0 files/evince-0.5.2-djvu-miniexp.patch 514
+SHA256 77c6f2b202186bdb7f9fb53afb1f9e3b7fa0821261694dce09951456718350db files/evince-0.5.2-djvu-miniexp.patch 514
+DIST evince-0.4.0.tar.bz2 891605 size 891605
+DIST evince-0.5.0.tar.bz2 1116319 RMD160 36215e2429ab1ae36a2e95645f6f6e3ebb6758b8 SHA256 a778482f239405ae1baa4ddc426a36c4dd8b4f0f80077932aac4f6916eebe9d2 size 1116319
+DIST evince-0.5.1.tar.bz2 969909 RMD160 bdbde4b9ec7758f8f21f46fe54c17d527eda3c16 SHA256 6cfe62a67f65e881e7bb4b9bc0593d9b6b553b9cc84c050c582aafeefe6d56f3 size 969909
+DIST evince-0.5.2.tar.bz2 1000723 RMD160 2c56b5c69eeb5ad8ac2322add4e369ce620cb34c SHA256 c3f923e9becee6aa59cc4dafbc36d376a88099cf4017a5e928f367bd428174de size 1000723
+EBUILD evince-0.4.0-r3.ebuild 1982 RMD160 2987623b4c70b171863205fa716532bbae9d8e05 SHA1 bbb09ee45c332cc16b2d9921a10f9449f329d1fc SHA256 9b311b2bac04e8c7ead0a2ef1573931c15eee944a8023a1a8273f8ef8d0bb4c6 size 1982
 MD5 de934d29a04d4f6710940a30676ec3a6 evince-0.4.0-r3.ebuild 1982
+RMD160 2987623b4c70b171863205fa716532bbae9d8e05 evince-0.4.0-r3.ebuild 1982
+SHA256 9b311b2bac04e8c7ead0a2ef1573931c15eee944a8023a1a8273f8ef8d0bb4c6 evince-0.4.0-r3.ebuild 1982
+EBUILD evince-0.5.0.ebuild 1905 RMD160 582a6e1619e342c2439a1e85e3476ddf12dc40ab SHA1 f3bef5ef9b9daf94ae017b7aa6d4c115d4630bfd SHA256 806d5101204b9fdd064d80beb1db8b59d8353a43f499bcc7aadd69054038e643 size 1905
 MD5 cb8b01198dea5d1b98c5101346339a36 evince-0.5.0.ebuild 1905
+RMD160 582a6e1619e342c2439a1e85e3476ddf12dc40ab evince-0.5.0.ebuild 1905
+SHA256 806d5101204b9fdd064d80beb1db8b59d8353a43f499bcc7aadd69054038e643 evince-0.5.0.ebuild 1905
+EBUILD evince-0.5.1.ebuild 1906 RMD160 e601aff2b9d5b1a8b966a58161f7ab81da4ab064 SHA1 ca8ceec1ebbbc19f9ebf3e12b249810149be6761 SHA256 ce4adc273c5e9e26dd051441fbbd4b54a9121d94aadd06367f8e84a66ed97d2d size 1906
 MD5 8082a9da85a574fa5516d914a17cf511 evince-0.5.1.ebuild 1906
-MD5 9997e7f1964c40c10c5866788ace8f1f evince-0.5.2.ebuild 1915
+RMD160 e601aff2b9d5b1a8b966a58161f7ab81da4ab064 evince-0.5.1.ebuild 1906
+SHA256 ce4adc273c5e9e26dd051441fbbd4b54a9121d94aadd06367f8e84a66ed97d2d evince-0.5.1.ebuild 1906
+EBUILD evince-0.5.2-r1.ebuild 1992 RMD160 32723e6446bec490fb8d326e80814b238953c5bd SHA1 e96c9ecf7943fa38ff9e54fcd199d05070e40446 SHA256 074e79d901da6f5835c64ecc4990f4717c83a0fb58a0a70e8bdb0fe49dd8dd72 size 1992
+MD5 a02d587497faedeecaed3b32c773db94 evince-0.5.2-r1.ebuild 1992
+RMD160 32723e6446bec490fb8d326e80814b238953c5bd evince-0.5.2-r1.ebuild 1992
+SHA256 074e79d901da6f5835c64ecc4990f4717c83a0fb58a0a70e8bdb0fe49dd8dd72 evince-0.5.2-r1.ebuild 1992
+EBUILD evince-0.5.2.ebuild 1911 RMD160 0d9238558995fe5c6beae1c85bfbdea0fceb4fa0 SHA1 cfb731acdb6bfc4137bacc440f6cfcc6122660e6 SHA256 fdadd6dda6d1fd159006f1ba8e4ec0c6dfa41a5b41466fb0d0efd8cbe0a09ce3 size 1911
+MD5 0494a78d856f2231db86e74a4710d965 evince-0.5.2.ebuild 1911
+RMD160 0d9238558995fe5c6beae1c85bfbdea0fceb4fa0 evince-0.5.2.ebuild 1911
+SHA256 fdadd6dda6d1fd159006f1ba8e4ec0c6dfa41a5b41466fb0d0efd8cbe0a09ce3 evince-0.5.2.ebuild 1911
+MISC ChangeLog 5635 RMD160 af4aca0c33576777cf37788429e6f03426637a8a SHA1 50084d1722da461a9e6874c51ae9b5be253802b1 SHA256 760f02864469d8751f493c4f0c1f63d635f8d8756319b05d6a821f6eab858094 size 5635
+MD5 a5fcb85c19ed2604f5824df39799c172 ChangeLog 5635
+RMD160 af4aca0c33576777cf37788429e6f03426637a8a ChangeLog 5635
+SHA256 760f02864469d8751f493c4f0c1f63d635f8d8756319b05d6a821f6eab858094 ChangeLog 5635
+MISC metadata.xml 218 RMD160 356edd8735bce3bdded1992ed1e01831af9f1f60 SHA1 bb11546aaa0d850f95621d0a9c291bf447697982 SHA256 b53b06e28caff7a3a8fdd06a56946440e889e56ba1e3627dee44e02707cd1a52 size 218
+MD5 6725733a03ee56bb113dedaca6063b0f metadata.xml 218
+RMD160 356edd8735bce3bdded1992ed1e01831af9f1f60 metadata.xml 218
+SHA256 b53b06e28caff7a3a8fdd06a56946440e889e56ba1e3627dee44e02707cd1a52 metadata.xml 218
 MD5 a8bcc7dab66f7a60936b49f43bc4e9a9 files/digest-evince-0.4.0-r3 65
+RMD160 71f26b9bdde50195646f70a2e26c43c7da1c0118 files/digest-evince-0.4.0-r3 65
+SHA256 b32cff757b686b72912a627916e31d84c8b693300cef80ee3592ea452d274bc1 files/digest-evince-0.4.0-r3 65
 MD5 042797794914d4002e8bb7f5f5d9db81 files/digest-evince-0.5.0 244
+RMD160 a19a22e1d6989ff78edd8fceac97882ddcc68916 files/digest-evince-0.5.0 244
+SHA256 db9ab1eb468161ab43769c2daae78be0467514932096a4e7c927e3a203884f5a files/digest-evince-0.5.0 244
 MD5 dc3bc817c2e1f2bc246daa646642a1c5 files/digest-evince-0.5.1 241
+RMD160 47d76b81ef6ebbc58b1b8e6e4f179cf68ca71117 files/digest-evince-0.5.1 241
+SHA256 432aab4276ea0eccd38a966c890e2b3012b94d300186b57cd061a014e3b9c0db files/digest-evince-0.5.1 241
 MD5 0851493a955929992c17c519f21b649d files/digest-evince-0.5.2 244
-MD5 185784a35b672ed49ea8afb3aba25e30 files/evince-0.4.0-display-menu.patch 471
-MD5 94070710202e7c8024edc662eb420658 files/evince-0.4.0-no-tiff.patch 985
-MD5 755b327b4928ab9492b7c2aab72ef52d files/evince-0.4.0-t1lib_is_t1.patch 976
-MD5 6725733a03ee56bb113dedaca6063b0f metadata.xml 218
+RMD160 e85d74a28485644b2f63ca45f7aa0a085e20f5ba files/digest-evince-0.5.2 244
+SHA256 17757ce4723a35dcb3da36bbe8cb865dbfdd32e0cd6c6d4826b2643662ca8a63 files/digest-evince-0.5.2 244
+MD5 0851493a955929992c17c519f21b649d files/digest-evince-0.5.2-r1 244
+RMD160 e85d74a28485644b2f63ca45f7aa0a085e20f5ba files/digest-evince-0.5.2-r1 244
+SHA256 17757ce4723a35dcb3da36bbe8cb865dbfdd32e0cd6c6d4826b2643662ca8a63 files/digest-evince-0.5.2-r1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFEWNp6omPajV0RnrERAr47AJ4mEzqE+5aY3QV/RJThLfoNa2wxdwCfdvZo
+xv5N4o1DKf1Jtj3Yc1hq6zg=
+=yi23
+-----END PGP SIGNATURE-----
diff --git a/app-text/evince/evince-0.5.2-r1.ebuild b/app-text/evince/evince-0.5.2-r1.ebuild
new file mode 100644
index 000000000000..80bb74203412
--- /dev/null
+++ b/app-text/evince/evince-0.5.2-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.5.2-r1.ebuild,v 1.1 2006/05/03 16:29:42 dang 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dvi? (
+		app-text/tetex
+		t1lib? ( >=media-libs/t1lib-5.0.0 )
+	)
+	dbus? ( >=sys-apps/dbus-0.33 )
+	tiff? ( >=media-libs/tiff-3.6 )
+	>=app-text/poppler-bindings-0.5.1
+	>=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.6
+	nautilus? ( >=gnome-base/nautilus-2.10 )
+	>=x11-libs/gtk+-2.8
+	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
+	>=dev-util/intltool-0.28"
+
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+USE_DESTDIR="1"
+ELTCONF="--portage"
+
+
+pkg_setup() {
+	G2CONF="--disable-scrollkeeper \
+		--enable-comics		\
+		$(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.4.0-display-menu.patch
+
+	# Fix to work with djvu-3.5.17
+	epatch ${FILESDIR}/${P}-djvu-miniexp.patch
+
+	export WANT_AUTOMAKE=1.7
+	automake || die "automake failed"
+	autoconf || die "autoconf failed"
+	libtoolize --copy --force || die "libtoolize failed"
+}
diff --git a/app-text/evince/evince-0.5.2.ebuild b/app-text/evince/evince-0.5.2.ebuild
index 4eb920612944..1fe8ec559539 100644
--- a/app-text/evince/evince-0.5.2.ebuild
+++ b/app-text/evince/evince-0.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.5.2.ebuild,v 1.2 2006/05/02 13:52:23 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.5.2.ebuild,v 1.3 2006/05/03 16:29:42 dang Exp $
 
 inherit eutils gnome2
 
@@ -32,7 +32,7 @@ RDEPEND="
 	nautilus? ( >=gnome-base/nautilus-2.10 )
 	>=x11-libs/gtk+-2.8
 	gnome-base/gnome-keyring
-	djvu? ( >=app-text/djvu-3.5.15 )
+	djvu? ( =app-text/djvu-3.5.16 )
 	virtual/ghostscript"
 
 DEPEND="${RDEPEND}
diff --git a/app-text/evince/files/digest-evince-0.5.2-r1 b/app-text/evince/files/digest-evince-0.5.2-r1
new file mode 100644
index 000000000000..d5f3a7986172
--- /dev/null
+++ b/app-text/evince/files/digest-evince-0.5.2-r1
@@ -0,0 +1,3 @@
+MD5 732df368435cebddd4cc8132a8a280bd evince-0.5.2.tar.bz2 1000723
+RMD160 2c56b5c69eeb5ad8ac2322add4e369ce620cb34c evince-0.5.2.tar.bz2 1000723
+SHA256 c3f923e9becee6aa59cc4dafbc36d376a88099cf4017a5e928f367bd428174de evince-0.5.2.tar.bz2 1000723
diff --git a/app-text/evince/files/evince-0.5.2-djvu-miniexp.patch b/app-text/evince/files/evince-0.5.2-djvu-miniexp.patch
new file mode 100644
index 000000000000..a991be2796c5
--- /dev/null
+++ b/app-text/evince/files/evince-0.5.2-djvu-miniexp.patch
@@ -0,0 +1,15 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN evince-0.5.2.orig/djvu/djvu-text.h evince-0.5.2/djvu/djvu-text.h
+--- evince-0.5.2.orig/djvu/djvu-text.h	2006-02-19 15:22:57.000000000 -0500
++++ evince-0.5.2/djvu/djvu-text.h	2006-05-03 12:17:21.000000000 -0400
+@@ -23,10 +23,9 @@
+ 
+ #include <glib.h>
+ #include <libdjvu/ddjvuapi.h>
++#include <libdjvu/miniexp.h>
+ 
+ typedef struct miniexp_s* miniexp_t;
+-extern const miniexp_t miniexp_nil;
+-extern const miniexp_t miniexp_dummy;
+ 
+ typedef struct _DjvuText DjvuText;
+