Bump to 3.2.1 from the gnome overlay. Drop old. Add several missing dependencies. Notable changes: UI fixes, stability improvements, XPS support.

(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)

4 files changed, 23 insertions, 34 deletions

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index 926b5674ab12..af6db86fe938 100644
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.229 2011/10/17 18:20:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.230 2011/11/03 05:31:59 tetromino Exp $
+
+*evince-3.2.1 (03 Nov 2011)
+
+  03 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/evince-2.91.5-fix-evinceview-introspection.patch,
+  -evince-3.0.2.ebuild, +evince-3.2.1.ebuild, metadata.xml:
+  Bump to 3.2.1 from the gnome overlay. Drop old. Add several missing
+  dependencies. Notable changes: UI fixes, stability improvements, XPS support.
 
   17 Oct 2011; Justin Lecher <jlec@gentoo.org> +files/evince-2.32.0-gold.patch,
   metadata.xml, evince-2.32.0-r3.ebuild:
diff --git a/app-text/evince/evince-3.0.2.ebuild b/app-text/evince/evince-3.2.1.ebuild
index f5dd6085ab0b..7848a0e6ba02 100644
--- a/app-text/evince/evince-3.0.2.ebuild
+++ b/app-text/evince/evince-3.2.1.ebuild
@@ -1,29 +1,35 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.0.2.ebuild,v 1.1 2011/08/16 22:43:46 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1.ebuild,v 1.1 2011/11/03 05:31:59 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
 
-inherit autotools eutils gnome2
+inherit 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"
+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
@@ -35,11 +41,13 @@ RDEPEND="
 	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 )
+	xps? ( >=app-text/libgxps-0.0.1 )
 "
 DEPEND="${RDEPEND}
 	app-text/scrollkeeper
@@ -60,11 +68,7 @@ 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.
-	#
-	# FIXME: XPS support needs >=libgxps-0.0.1
-	# http://git.gnome.org/browse/libgxps <-- no releases
 	G2CONF="${G2CONF}
-		--disable-maintainer-mode
 		--disable-schemas-compile
 		--disable-scrollkeeper
 		--disable-static
@@ -83,7 +87,7 @@ pkg_setup() {
 		$(use_enable nautilus)
 		$(use_enable t1lib)
 		$(use_enable tiff)
-		--disable-xps"
+		$(use_enable xps)"
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 }
 
@@ -94,11 +98,5 @@ src_prepare() {
 	# Fix .desktop file so menu item shows up
 	epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
 
-	# Fix building of EvinceView-3.0.gir, needs eautoreconf
-	epatch "${FILESDIR}"/${PN}-2.91.5-fix-evinceview-introspection.patch
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-
 	gnome2_src_prepare
 }
diff --git a/app-text/evince/files/evince-2.91.5-fix-evinceview-introspection.patch b/app-text/evince/files/evince-2.91.5-fix-evinceview-introspection.patch
deleted file mode 100644
index 539384348363..000000000000
--- a/app-text/evince/files/evince-2.91.5-fix-evinceview-introspection.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix building of EvinceView-3.0.gir
-
-* Without the library-path directive, it cannot find libevdocument3
-* The devs missed it because it tries to pick up the system libevdocument3
-  - That's wrong too, because it'll build the current version's introspection
-    against the previous version's library, etc.
-
----
---- libview/Makefile.am
-+++ libview/Makefile.am
-@@ -122,6 +122,7 @@
- 	$(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir):$$PKG_CONFIG_PATH \
- 	$(G_IR_SCANNER) -v --namespace EvinceView \
- 	--add-include-path=$(top_builddir)/libdocument \
-+	--library-path=$(top_builddir)/libdocument \
- 	--strip-prefix=Ev \
- 	--nsversion=$(EV_API_VERSION) \
- 	--include=GLib-2.0 \
diff --git a/app-text/evince/metadata.xml b/app-text/evince/metadata.xml
index c47f45d1e418..cf024df36d76 100644
--- a/app-text/evince/metadata.xml
+++ b/app-text/evince/metadata.xml
@@ -14,5 +14,6 @@
 		<flag name="nautilus">Enable property page extension in <pkg>gnome-base/nautilus</pkg></flag>
 		<flag name="t1lib">Enable the Type-1 fonts for the built-in DVI viewer
     (<pkg>media-libs/t1lib</pkg>)</flag>
+		<flag name="xps">Enable XPS viewer using <pkg>app-text/libgxps</pkg></flag>
 	</use>
 </pkgmetadata>