New version for GNOME 2.26. Load of small improvments here and there. Clean up old revisions.

(Portage version: 2.2_rc31/cvs/Linux x86_64)

4 files changed, 33 insertions, 155 deletions

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index 70b98b8a2dff..70434aa0fb52 100644
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.170 2009/04/27 13:13:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.171 2009/05/02 20:46:35 eva Exp $
+
+*evince-2.26.1 (02 May 2009)
+
+  02 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/evince-0.6.1-dbus-switch.patch,
+  -files/evince-2.22.2-t1lib-fonts.patch, -evince-2.22.2-r1.ebuild,
+  +evince-2.26.1.ebuild:
+  New version for GNOME 2.26. Load of small improvments here and there.
+  Clean up old revisions.
 
   27 Apr 2009; Jeroen Roovers <jer@gentoo.org> evince-2.24.2:
   Stable for HPPA (bug #260063).
diff --git a/app-text/evince/evince-2.22.2-r1.ebuild b/app-text/evince/evince-2.26.1.ebuild
index 7870d58640a6..d95aa4b9a97c 100644
--- a/app-text/evince/evince-2.22.2-r1.ebuild
+++ b/app-text/evince/evince-2.26.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.22.2-r1.ebuild,v 1.12 2009/04/10 23:20:05 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.26.1.ebuild,v 1.1 2009/05/02 20:46:35 eva Exp $
 
-EAPI=2
+EAPI="2"
 
 inherit eutils gnome2
 
@@ -11,37 +11,33 @@ HOMEPAGE="http://www.gnome.org/projects/evince/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="dbus djvu doc dvi gnome gnome-keyring t1lib tiff"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="dbus debug djvu doc dvi gnome-keyring nautilus t1lib tiff"
 
+# FIXME: enable gobject-introspection when we have an ebuild for it.
 RDEPEND="
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
-	>=x11-libs/gtk+-2.10
-	>=dev-libs/glib-2.15.6
-	gnome-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
+	>=app-text/libspectre-0.2.0
+	>=dev-libs/glib-2.18.0
 	>=dev-libs/libxml2-2.5
-	>=gnome-base/libglade-2
 	>=gnome-base/gconf-2
-	gnome? ( >=gnome-base/nautilus-2.10 )
-	>=virtual/poppler-glib-0.6[cairo]
+	>=x11-libs/gtk+-2.12
+	>=x11-libs/libSM-1
+	>=x11-themes/gnome-icon-theme-2.17.1
+	dbus? ( >=dev-libs/dbus-glib-0.71 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.0 )
+	nautilus? ( >=gnome-base/nautilus-2.10 )
+	>=virtual/poppler-glib-0.8[cairo]
 	dvi? (
 		virtual/tex-base
-		t1lib? ( >=media-libs/t1lib-5.0.0 )
-	)
+		t1lib? ( >=media-libs/t1lib-5.0.0 ) )
 	tiff? ( >=media-libs/tiff-3.6 )
-	djvu? ( >=app-text/djvu-3.5.17 )
-	>=app-text/libspectre-0.2.0"
+	djvu? ( >=app-text/djvu-3.5.17 )"
 DEPEND="${RDEPEND}
 	app-text/scrollkeeper
 	>=app-text/gnome-doc-utils-0.3.2
 	~app-text/docbook-xml-dtd-4.1.2
 	>=dev-util/pkgconfig-0.9
-	>=sys-devel/automake-1.9
 	>=dev-util/intltool-0.35
-	dev-util/gtk-doc-am
 	doc? ( dev-util/gtk-doc )"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
@@ -51,23 +47,24 @@ RESTRICT="test"
 pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-scrollkeeper
+		--disable-introspection
+		--enable-pdf
 		--enable-comics
 		--enable-impress
+		--enable-thumbnailer
+		--with-gconf
 		$(use_enable dbus)
 		$(use_enable djvu)
 		$(use_enable dvi)
 		$(use_with gnome-keyring keyring)
 		$(use_enable t1lib)
 		$(use_enable tiff)
-		$(use_enable gnome nautilus)"
+		$(use_enable nautilus)"
 }
 
-src_unpack() {
-	gnome2_src_unpack
+src_prepare() {
+	gnome2_src_prepare
 
 	# Fix .desktop file so menu item shows up
 	epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
-
-	# Fix t1lib font rendering.  Bug #158172
-	epatch "${FILESDIR}"/${P}-t1lib-fonts.patch
 }
diff --git a/app-text/evince/files/evince-0.6.1-dbus-switch.patch b/app-text/evince/files/evince-0.6.1-dbus-switch.patch
deleted file mode 100644
index 701114e87af4..000000000000
--- a/app-text/evince/files/evince-0.6.1-dbus-switch.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -up -ruN evince-0.6.1.orig/configure.ac evince-0.6.1/configure.ac
---- evince-0.6.1.orig/configure.ac	2006-10-09 14:58:09.000000000 -0400
-+++ evince-0.6.1/configure.ac	2006-12-17 11:41:10.000000000 -0500
-@@ -109,6 +109,9 @@ AM_CONDITIONAL(WITH_GTK_PRINT, test x$en
- 
- 
- dnl ========= Check for DBUS
-+AC_ARG_ENABLE(dbus,
-+ 	[AC_HELP_STRING([--enable-dbus], [Compile with support for dbus])],enable_dbus="$enableval",enable_dbus=yes)
-+if test "x$enable_dbus" != "xno"; then
- PKG_CHECK_MODULES([DBUS], [dbus-glib-1 >= $DBUS_GLIB_REQUIRED],
- 	[enable_dbus=yes],[enable_dbus=no])
- AC_SUBST([DBUS_CFLAGS])
-@@ -130,6 +133,7 @@ if test "x$enable_dbus" = "xyes" ; then
- 	DBUS_VERSION=`$PKG_CONFIG --modversion dbus-glib-1 | sed 's/0\.\([[0-9]]*\)\.\{0,1\}\([[0-9]]*\)/\1/'`
- 	AC_DEFINE_UNQUOTED(DBUS_VERSION, $DBUS_VERSION, [DBUS version.])
- fi
-+fi
- 
- SHELL_CFLAGS="$SHELL_CORE_CFLAGS $DBUS_CFLAGS"
- SHELL_LIBS="$SHELL_CORE_LIBS $DBUS_LIBS -lz"
diff --git a/app-text/evince/files/evince-2.22.2-t1lib-fonts.patch b/app-text/evince/files/evince-2.22.2-t1lib-fonts.patch
deleted file mode 100644
index 39613743d46d..000000000000
--- a/app-text/evince/files/evince-2.22.2-t1lib-fonts.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evince-2.22.2.orig/backend/dvi/mdvi-lib/bitmap.c evince-2.22.2/backend/dvi/mdvi-lib/bitmap.c
---- evince-2.22.2.orig/backend/dvi/mdvi-lib/bitmap.c	2008-05-28 17:13:57.000000000 -0400
-+++ evince-2.22.2/backend/dvi/mdvi-lib/bitmap.c	2008-07-07 10:54:03.000000000 -0400
-@@ -125,7 +125,7 @@ static Uchar bit_swap[] = {
-  * hopelessly slow.
-  */
- 
--BITMAP	*bitmap_convert_lsb8(Uchar *bits, int w, int h)
-+BITMAP	*bitmap_convert_lsb8(Uchar *bits, int w, int h, int stride)
- {
- 	BITMAP	*bm;
- 	int	i;
-@@ -147,12 +147,13 @@ BITMAP	*bitmap_convert_lsb8(Uchar *bits,
- 	for(i = 0; i < h; i++) {
- #ifdef WORD_LITTLE_ENDIAN
- 		memcpy(unit, curr, bytes);
--		curr += bytes;
-+		curr += stride;
- #else
- 		int	j;
- 		
- 		for(j = 0; j < bytes; curr++, j++)
- 			unit[j] = bit_swap[*curr];
-+		cur += stride - bytes;
- #endif
- 		memzero(unit + bytes, bm->stride - bytes);
- 		unit  += bm->stride;
-@@ -162,7 +163,7 @@ BITMAP	*bitmap_convert_lsb8(Uchar *bits,
- 	return bm;
- }
- 
--BITMAP	*bitmap_convert_msb8(Uchar *data, int w, int h)
-+BITMAP	*bitmap_convert_msb8(Uchar *data, int w, int h, int stride)
- {
- 	BITMAP	*bm;
- 	Uchar	*unit;
-@@ -180,9 +181,10 @@ BITMAP	*bitmap_convert_msb8(Uchar *data,
- 		
- 		for(j = 0; j < bytes; curr++, j++)
- 			unit[j] = bit_swap[*curr];
-+		curr += stride - bytes;
- #else
- 		memcpy(unit, curr, bytes);
--		curr += bytes;
-+		curr += stride;
- #endif
- 		memzero(unit + bytes, bm->stride - bytes);
- 		unit += bm->stride;
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evince-2.22.2.orig/backend/dvi/mdvi-lib/bitmap.h evince-2.22.2/backend/dvi/mdvi-lib/bitmap.h
---- evince-2.22.2.orig/backend/dvi/mdvi-lib/bitmap.h	2008-05-28 17:13:57.000000000 -0400
-+++ evince-2.22.2/backend/dvi/mdvi-lib/bitmap.h	2008-07-07 10:54:03.000000000 -0400
-@@ -136,8 +136,8 @@ extern void bitmap_rotate_clockwise __PR
- extern void bitmap_rotate_counter_clockwise __PROTO((BITMAP *));
- extern void bitmap_flip_rotate_clockwise __PROTO((BITMAP *));
- extern void bitmap_flip_rotate_counter_clockwise __PROTO((BITMAP *));
--extern BITMAP *bitmap_convert_lsb8 __PROTO((Uchar *, int, int));
--extern BITMAP *bitmap_convert_msb8 __PROTO((Uchar *, int, int));
-+extern BITMAP *bitmap_convert_lsb8 __PROTO((Uchar *, int, int, int));
-+extern BITMAP *bitmap_convert_msb8 __PROTO((Uchar *, int, int, int));
- 
- #include <stdio.h>
- extern void	bitmap_print __PROTO((FILE *, BITMAP *));
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evince-2.22.2.orig/backend/dvi/mdvi-lib/t1.c evince-2.22.2/backend/dvi/mdvi-lib/t1.c
---- evince-2.22.2.orig/backend/dvi/mdvi-lib/t1.c	2008-05-28 17:13:57.000000000 -0400
-+++ evince-2.22.2/backend/dvi/mdvi-lib/t1.c	2008-07-07 10:54:03.000000000 -0400
-@@ -437,25 +437,16 @@ static int t1_load_font(DviParams *param
- 
- static inline BITMAP *t1_glyph_bitmap(GLYPH *glyph)
- {
--	BITMAP	*bm;
--	int	w, h;
-+	int	w, h, pad;
- 	
- 	w = GLYPH_WIDTH(glyph);
- 	h = GLYPH_HEIGHT(glyph);
- 
- 	if(!w || !h)
- 		return MDVI_GLYPH_EMPTY;
--	switch(glyph->bpp << 3) {
--		case 8: 
--			bm = bitmap_convert_lsb8((unsigned char *)glyph->bits, w, h);
--			break;
--		default:
--			warning(_("(t1) unsupported bitmap pad size %d\n"),
--				glyph->bpp);
--			bm = MDVI_GLYPH_EMPTY;
--			break;
--	}
--	return bm;
-+
-+	pad = T1_GetBitmapPad();
-+	return bitmap_convert_lsb8((unsigned char *)glyph->bits, w, h, ROUND(w, pad) * (pad >> 3));
- }
- 
- static void t1_font_shrink_glyph(DviContext *dvi, DviFont *font, DviFontChar *ch, DviGlyph *dest)
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evince-2.22.2.orig/backend/dvi/mdvi-lib/tt.c evince-2.22.2/backend/dvi/mdvi-lib/tt.c
---- evince-2.22.2.orig/backend/dvi/mdvi-lib/tt.c	2008-05-28 17:13:57.000000000 -0400
-+++ evince-2.22.2/backend/dvi/mdvi-lib/tt.c	2008-07-07 10:54:03.000000000 -0400
-@@ -382,7 +382,7 @@ static int tt_get_bitmap(DviParams *para
- 	
- 	TT_Translate_Outline(&outline, -bbox.xMin, -bbox.yMin);
- 	TT_Get_Outline_Bitmap(tt_handle, &outline, &raster);
--	glyph->data = bitmap_convert_msb8(raster.bitmap, w, h);
-+	glyph->data = bitmap_convert_msb8(raster.bitmap, w, h, ROUND(w, 8));
- 	TT_Done_Outline(&outline);
- 	mdvi_free(raster.bitmap);
-