Version bump with small bugfixes and UI improvements.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 192 insertions, 2 deletions

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index eabdf38bb9e3..aa9a95258565 100644
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.243 2012/05/04 03:33:15 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.244 2012/05/05 00:29:57 tetromino Exp $
+
+*evince-3.4.0 (05 May 2012)
+
+  05 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +evince-3.4.0.ebuild, +files/evince-3.4.0-glib-gold.patch:
+  Version bump with small bugfixes and UI improvements.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> evince-2.32.0-r3.ebuild,
   evince-2.32.0-r4.ebuild, evince-3.2.1.ebuild, evince-3.2.1-r1.ebuild:
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index adc82314c193..b63ca86bb73c 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX evince-0.7.1-display-menu.patch 476 RMD160 a16a5e1f32490a7db219442b23cbcf77773e6bdd SHA1 73a97e83b12ad80f6645339978717bcf8c7da575 SHA256 1f450dfe57ef3325cb4642141d76fc8e7bf837c221d81a2593214913af058f4d
 AUX evince-2.32.0-create_thumbnail_frame-null.patch 853 RMD160 a0f2b71a4a14425fb6b8c8d2e740fddfb848a425 SHA1 9f9ed33e6fdd3c58dfb861500b09947f701fd172 SHA256 3d6472d77e07602cca0e5834a3c132702facbaac1ae684fa86fa72893a7a0833
 AUX evince-2.32.0-desktop-categories.patch 709 RMD160 7d2b4c1135c07cba4b22f33cc6b18ac5507af1f9 SHA1 39b59d44a527c3eac810f1d26f9bb7bd0033a8fc SHA256 d95489555d5b48b4aba28b41265c2cb152dd5d5163e38df3e3b5dfbfbebcab53
@@ -12,13 +15,27 @@ AUX evince-2.32.0-update-poppler.patch 1890 RMD160 8032f418acd4411e0a547a085d06b
 AUX evince-2.32.0-use-popup.patch 766 RMD160 9260e11fae9fa98cc739602a308793199bc75ce7 SHA1 7711c4b6a0d64b31ca0935da4c94a633d6ae1cab SHA256 c53276beb4f975a9ed47fe35dd2756458d9e5e334234aeac2ff4d47ad790d9ea
 AUX evince-3.2.1-glib-gold.patch 1807 RMD160 6e963fc66d81f0016b9acd75b35e0b0361be60db SHA1 f65e6056ef8b8b9ec801496f3f0c30dd21f7d7a5 SHA256 df7931c121e32f18020ad492aa5ab83fdca769572b5ccbd311b83288409b5402
 AUX evince-3.2.1-libgxps-0.2.patch 1317 RMD160 11ed8ec1d8beb1267c7e04154a5c226731c0722b SHA1 2b2900c65004db3a1349100acd1831a345b084b7 SHA256 6e98bf5625fd471913e7b461838a63d941ba04e73fe2c2e16b913c6730b8ddf0
+AUX evince-3.4.0-glib-gold.patch 2339 RMD160 ae8244340190bf3c75b1cc3f32bc9df9d2fd2653 SHA1 1e3bca72a76440f406083f06d5a3b28dcdc9d81b SHA256 c94927998693b7b75092c0a8225079bf64617f5a194691bf4bfa64feb41a8cb8
 AUX gconf-2.m4 1579 RMD160 48aa5e5e77d4c024efb70b643403bec8969fe815 SHA1 5e3c4701f63b1b4614f48d94d03440af7155f119 SHA256 2c9a981afe5bba4486c8e0ddb66433aef4af953168bd254f6a5ba1c6692f80f8
 DIST evince-2.32.0.tar.bz2 2295272 RMD160 a2d52685ac119b70cf40f320de457b3dfbac2587 SHA1 2f06a2b9dfd8667f4b4c6e90be3c49f6fe026fc8 SHA256 2a4c91ae38f8b5028cebb91b9da9ddc50ea8ae3f3d429df89ba351da2d787ff7
 DIST evince-3.2.1-synctex-1.17.patch.bz2 11938 RMD160 800c8f7254e9e225f74da7ce07e8167d28815bb5 SHA1 1c012cc97bad52876f34ef7571a9f77bee303b66 SHA256 929cf0300a4c67d447eeb417f8bfbaafa9988f036c23869728cd76c529243aa5
 DIST evince-3.2.1.tar.xz 3782932 RMD160 74a81f8970542c46717ea47243973cb81dbc4ee8 SHA1 993610957907df22677dab6f46648edf4b998c8f SHA256 9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35
+DIST evince-3.4.0.tar.xz 6162936 RMD160 e584a585d0fb84d603b60413ae54575fb8657436 SHA1 7159f4b1486fc07b5be93c3034965395d41c458a SHA256 02f1c74c123ea0cb4c1a98cb9ba2b67d724e9f90d7ff15acbcd6b8dbeef0a129
 EBUILD evince-2.32.0-r3.ebuild 4149 RMD160 69d4eb7b0fca6686460e4417da23c2e6fb5aa1ef SHA1 33b57e49d983673bfc2911c33322702684fc8bb1 SHA256 b99fec2e8ca22454d2288313b1b9a74d6adba85ff2a2381cbe0219a52230c24e
 EBUILD evince-2.32.0-r4.ebuild 4250 RMD160 6162f9b211213b6ed7e813d5e63ecc47cb2be064 SHA1 de3e22a0d8663313ab05fe12a8e801b8a149df9d SHA256 43ef235bae38cfc6bd44e1c5853095b3cacce429924f0a5b313128336c6e5ae3
 EBUILD evince-3.2.1-r1.ebuild 3458 RMD160 53c090ff12a016dc56a33111ffb08086bf8724ed SHA1 ae16678b80cb8b5c832e1a8d9482f38e6027fb42 SHA256 fa0512ddb89b749a9eaf92f936dac6059db1ca60a33ac6d0fc98ee06637a38a9
 EBUILD evince-3.2.1.ebuild 2960 RMD160 67cde76ca387db15c606a08ff29c5df7e3c56891 SHA1 16a521628d4693024f95f927038c654e5773a124 SHA256 aedcd08e34e46366c7480c51e0ee362432882081a22f2d2e5bc14e6660f4dff4
-MISC ChangeLog 36241 RMD160 6c0bd62324252d6f619f1358ee2101a40367a266 SHA1 44f2c6432e0ba1718d5cf5e10d740ac7cf7616a4 SHA256 3f62094d5ed8d790a8aeb5606305d6bf99e52c618ad33ce331246aa9d60e2864
+EBUILD evince-3.4.0.ebuild 3347 RMD160 9690ea6492ad9a3df3966c8b8608edc42c48430d SHA1 b4b49be82c7d60bd981e89b860e08177da40b1e9 SHA256 da569ffa7859b64acb20f4481421e49d039343800bcaae2d738e8edf9b8df0e7
+MISC ChangeLog 36450 RMD160 805588cf27e5fc34cab3b028d4aef13104d9502d SHA1 34aa763046c7cb5cd1c3758914a3bb0ccdfe8052 SHA256 7b3386729cf52a491a67474cb89a8434ffd88b06e6c1b2885c92ae79afe3eb77
 MISC metadata.xml 788 RMD160 ddf6d5febf8fc7ac34fb1635150d00a776868307 SHA1 733f3038b004e15b00ff9f6d5735bc0e48da9112 SHA256 0a7faaea7094f6abb9429988ccea9ba62daa7c251b894da77d3c38dc3d9b0f6a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPpHSLAAoJEJ0WA1zPCt1hzA4H/0QyW0xafsbMHAz2mYYBQ6/f
+3O26alJeiIuB3XPAk91ltGorGXnVRFO57ZczvcvB2A0RqcRRRdZ5heLDA8dKV1om
+r5mlICaBO0M4FcasbwRZEmjhpCgYaLt0Ra9mIv+T6A4l/vok5oVhqA8SZT9Vr9zd
+SnY6kaH+J/SRTxEuVN7pWqZlkEzR1PyuoJLQWaTMiUigSqKG2/Dw/aD+30Q3PHcm
+wA35dstRy30MIGWghElRql+qHNmrtmJKqGZPukIK/ck+Yh6drZ7FCSmrhKoItFSQ
+4DATquSvugwNUtV+kue3Pks7x9kiJENA93ddZJgphYGxOOxRkGw9Hv+WuuAecHs=
+=kcgO
+-----END PGP SIGNATURE-----
diff --git a/app-text/evince/evince-3.4.0.ebuild b/app-text/evince/evince-3.4.0.ebuild
new file mode 100644
index 000000000000..0aa54857032e
--- /dev/null
+++ b/app-text/evince/evince-3.4.0.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.4.0.ebuild,v 1.1 2012/05/05 00:29:57 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="http://www.gnome.org/projects/evince/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dbus debug djvu doc dvi gnome-keyring +introspection nautilus t1lib tiff xps"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
+
+# Since 2.26.2, can handle poppler without cairo support. Make it optional ?
+# not mature enough
+# atk used in libview
+# gdk-pixbuf used all over the place
+# libX11 used for totem-screensaver
+RDEPEND="
+	>=app-text/libspectre-0.2.0
+	dev-libs/atk
+	>=dev-libs/glib-2.25.11:2
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.0.2:3[introspection?]
+	x11-libs/libX11
+	>=x11-libs/libSM-1
+	x11-libs/libICE
+	gnome-base/gsettings-desktop-schemas
+	|| (
+		>=x11-themes/gnome-icon-theme-2.17.1
+		>=x11-themes/hicolor-icon-theme-0.10 )
+	>=x11-libs/cairo-1.10.0
+	>=app-text/poppler-0.18[cairo]
+	djvu? ( >=app-text/djvu-3.5.17 )
+	dvi? (
+		virtual/tex-base
+		dev-libs/kpathsea
+		t1lib? ( >=media-libs/t1lib-5.0.0 ) )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.0 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6 )
+	nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] )
+	tiff? ( >=media-libs/tiff-3.6:0 )
+	xps? ( >=app-text/libgxps-0.2.1 )
+"
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.3.2
+	app-text/docbook-xml-dtd:4.3
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	>=dev-util/gtk-doc-am-1.13
+	virtual/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.13 )"
+
+ELTCONF="--portage"
+
+# Needs dogtail and pyspi from http://fedorahosted.org/dogtail/
+# Releases: http://people.redhat.com/zcerza/dogtail/releases/
+RESTRICT="test"
+
+pkg_setup() {
+	# Passing --disable-help would drop offline help, that would be inconsistent
+	# with helps of the most of Gnome apps that doesn't require network for that.
+	G2CONF="${G2CONF}
+		--disable-schemas-compile
+		--disable-scrollkeeper
+		--disable-static
+		--disable-tests
+		--enable-pdf
+		--enable-comics
+		--enable-thumbnailer
+		--with-smclient=xsmp
+		--with-platform=gnome
+		--enable-help
+		$(use_enable dbus)
+		$(use_enable djvu)
+		$(use_enable dvi)
+		$(use_with gnome-keyring keyring)
+		$(use_enable introspection)
+		$(use_enable nautilus)
+		$(use_enable t1lib)
+		$(use_enable tiff)
+		$(use_enable xps)"
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+}
+
+src_prepare() {
+	# Regenerate marshalers to allow building with <glib-2.32
+	rm -v cut-n-paste/gimpcellrenderertoggle/gimpwidgetsmarshal.{c,h} \
+		cut-n-paste/toolbar-editor/eggmarshalers.{c,h} \
+		libview/ev-view-marshal.{c,h} || die "rm failed"
+
+	# Fix .desktop file so menu item shows up
+	epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
+
+	# glib-2.32 restructured dep libs in pkg-config files, #414065
+	epatch "${FILESDIR}/${P}-glib-gold.patch"
+
+	gnome2_src_prepare
+
+	AT_NOELIBTOOLIZE=yes eautoreconf
+
+	# Do not depend on gnome-icon-theme, bug #326855, #391859
+	sed -e 's/gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED//g' \
+		-i configure || die "sed failed"
+}
diff --git a/app-text/evince/files/evince-3.4.0-glib-gold.patch b/app-text/evince/files/evince-3.4.0-glib-gold.patch
new file mode 100644
index 000000000000..34733f75908b
--- /dev/null
+++ b/app-text/evince/files/evince-3.4.0-glib-gold.patch
@@ -0,0 +1,54 @@
+From f2f9097ea87e2f0d15241ac0ee95099a219b7539 Mon Sep 17 00:00:00 2001
+From: Justin Lecher <jlec@gentoo.org>
+Date: Mon, 30 Apr 2012 11:51:18 +0200
+Subject: [PATCH] Fix underlinking with >=glib-2.32 detected by gold linker
+
+As descripted in bug 675129, recent changes in pkg-config files
+drop necessary libs from linking, more accurate gio-2.0 droppes
+gmodule-no-export-2.0.
+
+Readd gmodule-no-export-2.0 at all necessary places.
+
+Signed-off-by: Justin Lecher <jlec@gentoo.org>
+---
+ configure.ac |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 66958fa..2ef6e50 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -154,10 +154,10 @@ fi
+ ZLIB_LIBS=-lz
+ AC_SUBST(ZLIB_LIBS)
+ 
+-PKG_CHECK_MODULES(LIBDOCUMENT, gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gmodule-2.0)
++PKG_CHECK_MODULES(LIBDOCUMENT, gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gmodule-2.0)
+ PKG_CHECK_MODULES(LIBVIEW, gtk+-3.0 >= $GTK_REQUIRED gail-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
+ PKG_CHECK_MODULES(BACKEND, cairo >= $CAIRO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED)
+-PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
++PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED)
+ 
+ SHELL_PLATFORM_PKGS=
+ case "$with_platform" in
+@@ -180,7 +180,7 @@ case "$with_platform" in
+         ;;
+ esac
+ 
+-PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS])
++PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS])
+ 
+ # *********
+ # SM client
+@@ -407,7 +407,7 @@ AC_ARG_ENABLE([previewer],
+   [enable_previewer=yes])
+ 
+ if test x$enable_previewer = "xyes" ; then
+-  PKG_CHECK_MODULES([PREVIEWER],[gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED])
++  PKG_CHECK_MODULES([PREVIEWER],[gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED])
+ fi
+ 
+ AM_CONDITIONAL([ENABLE_PREVIEWER],[test "$enable_previewer" = "yes"])
+-- 
+1.7.8.6
+