Bump to 0.6.1-r3

	Add patch for bug #156573

Package-Manager: portage-2.1.2.2

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index a7de234a02c510b23780bdad4bd0a30aa8a6b62e..dfce65a29889b826cc479d244a3ca7ef38df64bd 100644 (file)
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,13 @@
 # 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.93 2007/03/24 18:04:36 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.94 2007/03/26 19:57:06 dang Exp $
+
+*evince-0.6.1-r3 (26 Mar 2007)
+
+  26 Mar 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/evince-0.6.1-gv-limit.patch, +evince-0.6.1-r3.ebuild:
+  Bump to 0.6.1-r3
+       Add patch for bug #156573
 
   24 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   evince-0.6.1-r2.ebuild:

diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 42d0d9a87957ff518927841f9e5f87735cbba6d4..52fc9ed6875697f399753ebbfd5eead5ec08ff49 100644 (file)
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -13,6 +13,10 @@ AUX evince-0.6.1-dbus-switch.patch 974 RMD160 85726bcd9000ebde631d8102a0f79aa6d6
 MD5 0ae3972c36cf8a8e09566e710c40c4bc files/evince-0.6.1-dbus-switch.patch 974
 RMD160 85726bcd9000ebde631d8102a0f79aa6d6df8de1 files/evince-0.6.1-dbus-switch.patch 974
 SHA256 1fe375cf561b215a9d25482b7e74ee254cf3f052a7a77a7ac7b71fa0e872fd49 files/evince-0.6.1-dbus-switch.patch 974
+AUX evince-0.6.1-gv-limit.patch 865 RMD160 3a6a40dfca47af6b68d04d0d9316272497f0c15d SHA1 053cc6e338912b8d74cfcc2f5a7609403ddec5fd SHA256 29d84d93394f99fa4fbe8c6b17d7745640a9c74ad37d3483e6d3b518591690da
+MD5 cb29b02d430e6abb47b4720655bfd019 files/evince-0.6.1-gv-limit.patch 865
+RMD160 3a6a40dfca47af6b68d04d0d9316272497f0c15d files/evince-0.6.1-gv-limit.patch 865
+SHA256 29d84d93394f99fa4fbe8c6b17d7745640a9c74ad37d3483e6d3b518591690da files/evince-0.6.1-gv-limit.patch 865
 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
@@ -32,14 +36,18 @@ EBUILD evince-0.6.1-r2.ebuild 1952 RMD160 c84633a1089216bad31cbe90362b3e934f6ef7
 MD5 1466d7308634cfb8b89b777019187b3e evince-0.6.1-r2.ebuild 1952
 RMD160 c84633a1089216bad31cbe90362b3e934f6ef7e3 evince-0.6.1-r2.ebuild 1952
 SHA256 a3ae2903dedaefc8ffda948175086faf1357ee8321c5d4645182211cd567b004 evince-0.6.1-r2.ebuild 1952
+EBUILD evince-0.6.1-r3.ebuild 2044 RMD160 5878ce83f2d01dd966be7d5633d368e4d981ce45 SHA1 2b624c99e6e747592a49b10df4a01e5b860dff85 SHA256 4549de7d7233db56f17ba6918adcbce19f84249731c526c2829000f9cad91b0e
+MD5 16740bf8c5e2c3ed9f472e60b03893dd evince-0.6.1-r3.ebuild 2044
+RMD160 5878ce83f2d01dd966be7d5633d368e4d981ce45 evince-0.6.1-r3.ebuild 2044
+SHA256 4549de7d7233db56f17ba6918adcbce19f84249731c526c2829000f9cad91b0e evince-0.6.1-r3.ebuild 2044
 EBUILD evince-0.6.1.ebuild 1858 RMD160 e4f284932a5ef394d77c3d3e4c6b75f3498cc43a SHA1 72072bd35894241a232933c747ff0c6c3b41ca05 SHA256 d0464ffb7ce07149bea8b0866a00827827cf675bee80a790d464f7168061626f
 MD5 023195c08cb41bc607d566c703001f82 evince-0.6.1.ebuild 1858
 RMD160 e4f284932a5ef394d77c3d3e4c6b75f3498cc43a evince-0.6.1.ebuild 1858
 SHA256 d0464ffb7ce07149bea8b0866a00827827cf675bee80a790d464f7168061626f evince-0.6.1.ebuild 1858
-MISC ChangeLog 12687 RMD160 106dbd5d1f37ce4f1950425e3ec8d8d6ac988377 SHA1 613c24468a02ed1114aedc16142ac9aa87ae97fc SHA256 57062c33d5edf0951af02a4fffb4cb8310be312b4497ddc7c75a24d99d055fca
-MD5 ea8c46bca629b5f403b95d58a81cf76f ChangeLog 12687
-RMD160 106dbd5d1f37ce4f1950425e3ec8d8d6ac988377 ChangeLog 12687
-SHA256 57062c33d5edf0951af02a4fffb4cb8310be312b4497ddc7c75a24d99d055fca ChangeLog 12687
+MISC ChangeLog 12878 RMD160 f889418454c43502c5dae56e93c60b1f4979205e SHA1 fd5f2b2f9dc25ded796e2438c357d7c12ff07b10 SHA256 f55c9893abd1ff9ba81c32e84e007a9fe2102cefc5dd35a58532135667a8a733
+MD5 65236d07da124f9c18714d767a25c6a0 ChangeLog 12878
+RMD160 f889418454c43502c5dae56e93c60b1f4979205e ChangeLog 12878
+SHA256 f55c9893abd1ff9ba81c32e84e007a9fe2102cefc5dd35a58532135667a8a733 ChangeLog 12878
 MISC metadata.xml 218 RMD160 356edd8735bce3bdded1992ed1e01831af9f1f60 SHA1 bb11546aaa0d850f95621d0a9c291bf447697982 SHA256 b53b06e28caff7a3a8fdd06a56946440e889e56ba1e3627dee44e02707cd1a52
 MD5 6725733a03ee56bb113dedaca6063b0f metadata.xml 218
 RMD160 356edd8735bce3bdded1992ed1e01831af9f1f60 metadata.xml 218
@@ -59,10 +67,13 @@ SHA256 3080898d61c2f52fcf2e25788b71061292a8a4a4f49c5981e86c9253ff886b96 files/di
 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGBWg6kT4lNIS36YERAt9IAJ0QSoB1rGNjeyyLsrlEyZaTSRBBrQCgi68d
-GNI/jp8V7yqFfWUa1Z6nlfQ=
-=xZRg
+iD8DBQFGCCVAomPajV0RnrERAnNNAJsHROyl4E/OEnhsXuFP4PVCya0cOgCdGTZH
+b0sOVLh3PY6XVA9xihgcUf0=
+=p8rd
 -----END PGP SIGNATURE-----

diff --git a/app-text/evince/evince-0.6.1-r3.ebuild b/app-text/evince/evince-0.6.1-r3.ebuild
new file mode 100644 (file)
index 0000000..f7f09d8
--- /dev/null
+++ b/app-text/evince/evince-0.6.1-r3.ebuild
@@ -0,0 +1,83 @@
+# 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-r3.ebuild,v 1.1 2007/03/26 19:57:06 dang 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.90 >=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
+
+       # Limits on gv buffer lengths.  Bug #156573
+       epatch "${FILESDIR}"/${P}-gv-limit.patch
+
+       eautoreconf
+}

diff --git a/app-text/evince/files/digest-evince-0.6.1-r3 b/app-text/evince/files/digest-evince-0.6.1-r3
new file mode 100644 (file)
index 0000000..498e46d
--- /dev/null
+++ b/app-text/evince/files/digest-evince-0.6.1-r3
@@ -0,0 +1,3 @@
+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/evince-0.6.1-gv-limit.patch b/app-text/evince/files/evince-0.6.1-gv-limit.patch
new file mode 100644 (file)
index 0000000..7ff5d15
--- /dev/null
+++ b/app-text/evince/files/evince-0.6.1-gv-limit.patch
@@ -0,0 +1,23 @@
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN evince-0.6.1.orig/ps/ps.c evince-0.6.1/ps/ps.c
+--- evince-0.6.1.orig/ps/ps.c  2006-01-06 18:03:44.000000000 -0500
++++ evince-0.6.1/ps/ps.c       2007-03-26 15:14:13.000000000 -0400
+@@ -1231,7 +1231,8 @@ get_next_text(line, next_char)
+     int level = 0;
+     quoted = 1;
+     line++;
+-    while(*line && !(*line == ')' && level == 0)) {
++    while(*line && !(*line == ')' && level == 0)
++        && (cp - text) < PSLINELENGTH - 1) {
+       if(*line == '\\') {
+         if(*(line + 1) == 'n') {
+           *cp++ = '\n';
+@@ -1302,7 +1303,8 @@ get_next_text(line, next_char)
+     }
+   }
+   else {
+-    while(*line && !(*line == ' ' || *line == '\t' || *line == '\n'))
++    while(*line && !(*line == ' ' || *line == '\t' || *line == '\n')
++        && (cp - text) < PSLINELENGTH - 1)
+       *cp++ = *line++;
+   }
+   *cp = '\0';