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

(Portage version: 2.1_pre9-r5)

5 files changed, 109 insertions, 3 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/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;
+