Bump to 3.2.1 from the gnome overlay. Drop old. Add several missing dependencies...

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

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index 926b5674ab1234b3f8187527de5bad8954c8546f..af6db86fe9383f598fbd8f279c3b3e6829ada699 100644 (file)
--- 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/Manifest b/app-text/evince/Manifest
index d23e107d84daa59de972c3faa554f57d51f8be06..f2c3a4e7ee7ccb203a5672570cf63a56c3b2befc 100644 (file)
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX evince-0.7.1-display-menu.patch 476 RMD160 a16a5e1f32490a7db219442b23cbcf77773e6bdd SHA1 73a97e83b12ad80f6645339978717bcf8c7da575 SHA256 1f450dfe57ef3325cb4642141d76fc8e7bf837c221d81a2593214913af058f4d
 AUX evince-2.32.0-dvi-CVEs.patch 3386 RMD160 af5b7e0f74566716b86974a1e2efc34e1b925be5 SHA1 3c4084017e790ed5f0a1a422c1c742e97f89918f SHA256 49d1ed8adc734a005d4d8fdc1912bb115d97f734071d64bcae0aae60f2b5626a
@@ -11,19 +11,18 @@ AUX evince-2.32.0-pk-fonts.patch 1005 RMD160 bf3db4170d868ed72887e9ab83e031d4184
 AUX evince-2.32.0-stop-spinner.patch 2370 RMD160 9136c30d8a8ab902da48aeb328320ba3a5773c85 SHA1 7414682d8c41c8a62ace0a493ae632757c4fc87f SHA256 140395d3c667d9af422054ed02d2b971c5668e52cafac86b6496ecd47f33ac97
 AUX evince-2.32.0-update-poppler.patch 1890 RMD160 8032f418acd4411e0a547a085d06bad8e757d081 SHA1 2e6acfd476e7bd82883ae34dacbb218e3ca5e76d SHA256 2990c789c8cfd50e46f4dfa7a2406499b3ee26f4db9840c8b9a6e1dee40f61f4
 AUX evince-2.32.0-use-popup.patch 766 RMD160 9260e11fae9fa98cc739602a308793199bc75ce7 SHA1 7711c4b6a0d64b31ca0935da4c94a633d6ae1cab SHA256 c53276beb4f975a9ed47fe35dd2756458d9e5e334234aeac2ff4d47ad790d9ea
-AUX evince-2.91.5-fix-evinceview-introspection.patch 668 RMD160 555823f2718668d86f2f5ff1ea6a5e82889170ff SHA1 d7c7fc8a68965883a80bd5f8323a550e3f495ca7 SHA256 9c4572bce0e8cb4faf4649fd56d8928215a871fe51996df12cda06adcd066e72
 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.0.2.tar.bz2 3016468 RMD160 b62472088a283e0d2675a04b65b3c8f204b8d540 SHA1 e87435d6cb42b9663c414691603bdfb426dfe640 SHA256 03abb74620caaa255f2d1369b684bbf8f62e15a4bf2d9f2a45f58e1789295a97
+DIST evince-3.2.1.tar.xz 3782932 RMD160 74a81f8970542c46717ea47243973cb81dbc4ee8 SHA1 993610957907df22677dab6f46648edf4b998c8f SHA256 9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35
 EBUILD evince-2.32.0-r2.ebuild 3834 RMD160 929684ca7149e1c47220d8fd46b4a4b3f4314a94 SHA1 67b0efc15d2f38b16d295f2b9c00d54a0423ecfb SHA256 2ec1e71428c961ce2c8caf456764380e7dfb24f9d8043cb4630f99aec1826337
 EBUILD evince-2.32.0-r3.ebuild 4152 RMD160 7c723d0666e599806e8352fda6a36db55680e0ba SHA1 614bfae6dcd1c5081bb96432f9ce0b48919bb84d SHA256 fa06ef00327cf19e578648844a60742eb9fc93d2133c33c7f2995648c6f43e83
-EBUILD evince-3.0.2.ebuild 3075 RMD160 934565e59ad1e982a858ede2b619cc43ef060120 SHA1 76a174033806a2cd3626472ec6707588d6b1068c SHA256 9681412455f4af98adcbbbec3c32ce05c802326ef61462f1484a6b8fe845e7f2
-MISC ChangeLog 33467 RMD160 5b866ff2316372d8ed1eb5b17a15f362f0cd728d SHA1 cf1d7537ddb2b9e812c956bc36fae2f1701e2ef5 SHA256 0c7a506e6568b26a71c0d77be4b1fd17b6b8677f978355b4ce8be56c8dffeea9
-MISC metadata.xml 710 RMD160 83aee317654e0eec4505a3537eed0ce8c096f9de SHA1 4d49e1c6b28462111d1c8e8324b8048156a0856a SHA256 d64c76ef68c1569f9b508ed6beba97e7f1a3051400e5e40d04daaa2ab76a140f
+EBUILD evince-3.2.1.ebuild 2927 RMD160 14f6d67b54edb00239e8836e2c27dbb8a43e5ad9 SHA1 f705e653f4030e523b3ae68d61dcd2066faef814 SHA256 62fc7d283e420298e66c1c6714cbf7e0d7e833a741ce1ac06e039ee3b5700827
+MISC ChangeLog 33830 RMD160 e3a57a340f0cab7edd738c5b7c1d98fe8af5d701 SHA1 ef449ee6423e261e71dde896c4a60aaad58bebef SHA256 26e65b83b81419d5c0b05da48bb708e28bf221500205edc8ec5ada0c042ddcea
+MISC metadata.xml 788 RMD160 ddf6d5febf8fc7ac34fb1635150d00a776868307 SHA1 733f3038b004e15b00ff9f6d5735bc0e48da9112 SHA256 0a7faaea7094f6abb9429988ccea9ba62daa7c251b894da77d3c38dc3d9b0f6a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk6cchAACgkQgAnW8HDreRYmmQCcDNz6Ex+kZAs+ci606J7yg0SD
-UisAnRtTaoJ1KAdyPC9H1F/UCXUyKRiM
-=59Jm
+iF4EAREIAAYFAk6yJ1UACgkQdjK8w9WeBnAZjQEAp5m/+BmbaG6mJDp4T63G28fq
+L+DlOyKFLD+lRbDrQgQBAKPKoGna7Rfaf9Qg0EBuqUJ3lWZzuHedFtdJ5wszyq5q
+=ZaPF
 -----END PGP SIGNATURE-----

diff --git a/app-text/evince/evince-3.0.2.ebuild b/app-text/evince/evince-3.2.1.ebuild
similarity index 82%
rename from app-text/evince/evince-3.0.2.ebuild
rename to app-text/evince/evince-3.2.1.ebuild
index f5dd6085ab0bb1034a8f4e646ae9a47452aec91d..7848a0e6ba0204d925aac54288e946bbdf76117b 100644 (file)
--- 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 (file)
index 5393843..0000000
--- 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 c47f45d1e4189b17a4f744766728ccca027a0bdf..cf024df36d76fbcc18dbe8d3f35b5ed5e92aebe4 100644 (file)
--- 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>