From 29463d9a4af43a0c1794969b084cc219ef89f415 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Tue, 16 Aug 2011 22:43:46 +0000 Subject: [PATCH] Bump to 3.0.2, from gnome overlay for GNOME 3 Package-Manager: portage-2.2.0_alpha39_p14/cvs/Linux x86_64 --- app-text/evince/ChangeLog | 9 +- app-text/evince/Manifest | 21 +++- app-text/evince/evince-3.0.2.ebuild | 104 ++++++++++++++++++ ...-2.91.5-fix-evinceview-introspection.patch | 18 +++ 4 files changed, 147 insertions(+), 5 deletions(-) create mode 100644 app-text/evince/evince-3.0.2.ebuild create mode 100644 app-text/evince/files/evince-2.91.5-fix-evinceview-introspection.patch diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog index 005e3f913e01..6fc40879e65f 100644 --- a/app-text/evince/ChangeLog +++ b/app-text/evince/ChangeLog @@ -1,6 +1,13 @@ # 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.226 2011/08/13 16:32:31 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.227 2011/08/16 22:43:46 nirbheek Exp $ + +*evince-3.0.2 (16 Aug 2011) + + 16 Aug 2011; Nirbheek Chauhan + +files/evince-2.91.5-fix-evinceview-introspection.patch, + +evince-3.0.2.ebuild: + Bump to 3.0.2, from gnome overlay for GNOME 3 13 Aug 2011; Raúl Porcel evince-2.32.0-r3.ebuild: alpha/ia64/sparc stable wrt #369909 diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest index 369bd8ef0aba..b5a3e53d06ce 100644 --- a/app-text/evince/Manifest +++ b/app-text/evince/Manifest @@ -10,16 +10,29 @@ 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 EBUILD evince-2.32.0-r2.ebuild 3834 RMD160 929684ca7149e1c47220d8fd46b4a4b3f4314a94 SHA1 67b0efc15d2f38b16d295f2b9c00d54a0423ecfb SHA256 2ec1e71428c961ce2c8caf456764380e7dfb24f9d8043cb4630f99aec1826337 EBUILD evince-2.32.0-r3.ebuild 4088 RMD160 ca9c6ce60f8dfae24b36e21cd3f2bc2410142443 SHA1 72e6671d83278c4dc82633b605f145c8608d519c SHA256 18bec4106adea1a7488d6d16891d47b6f748dea9c9c5076d6679ac671482f17a -MISC ChangeLog 32995 RMD160 8bd41a50a3753224e208b75e19276b62a230a91e SHA1 be3c9430a1412d722a61294cfc7e36de472e20a6 SHA256 fabada099452e6281e0704863a498073e8e265f29058c7297c3988b036609959 +EBUILD evince-3.0.2.ebuild 3075 RMD160 934565e59ad1e982a858ede2b619cc43ef060120 SHA1 76a174033806a2cd3626472ec6707588d6b1068c SHA256 9681412455f4af98adcbbbec3c32ce05c802326ef61462f1484a6b8fe845e7f2 +MISC ChangeLog 33211 RMD160 e9d1bb9e8c091c7ea9ff466f00ef6146aa9d32ec SHA1 401150cac37ace34eafa016194865d171a11a840 SHA256 c6eb6b6bb21f99de71987763f45b418d0aad99f818f350f290315bfc737c15d6 MISC metadata.xml 704 RMD160 86b7f170da9780a261a10f31ca336bc727511962 SHA1 76786146716c3d6ff74232b11f79a9258b82fa8b SHA256 c331692598dc31958f7913fd9948522a3b9c0335f0354bb58d990eeaf8052047 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk5GpyYACgkQuQc30/atMkAOWwCePX1KmzvWxDwyh0SbyG/JQ9h0 -dWEAn3MxZq1nqaghI5/o9DMHgLhdQ7ZZ -=xR1o +iQIcBAEBAgAGBQJOSvKoAAoJEO/kOhxWD91k+mMQAJ0y11ChUf3CLNmT5C8JLMkq +HSNlHZvHUD2kHbbj9/ubNwUOTTGK4BJ3gq3WLeU4MBCS8r9iVR0VUeAVw5zsR1yM +rHNxGUykGB10t9jdwV4V034LFNdeZzlaUcuFK9GBujuA4zsipf4nfSqy4ljSKGKc +f9kXOwGPlYJqECgFZLb/brAyJSLFyO0ep46oduanv2R/xjcwfzGPzn6sblOFBKZ6 +27pz7mvRQokVkcpYQLq39xf8By0l1ZHcdrxYEv+CrdE2DzCBgquN+kNLYoKYhUvL +HUBZB4yPUtgyWJqpZgLkQMFAgsA2JVCOSlQjv+TdhjmbwtciIEsh3SKUHpTni3CP +wCQbkT0s8zf1arX7gz+sJ2iiGV7wJBSjSsatPPX13dhvuvUo+SfdDeRStz4XWvyh +jGG9aSWUOUiYSifFNPF/uwBU8VrzVVxWt4z9GNVUrlVLo1qF9+tBf1mtlcKgbDG+ +IrRL+eoSwXwc2Nj0jQypkDUqPj35VURRnUrCCvbaOjqXPyrTT008lHYhwCF70kHj +q3cdct8hjwBWP/k1D9TQ+l5VePmEPon/ykw1DkEktyv7c+47SDV5b7+wjzXFuOg1 +XFnl8a+uxoapkmPrLgfWne3sIoz9SIKnk0jfr/08bLlIrUwPNYSJR9kD3TdZfhHD +38dFYKlzbTgwnud/sMHs +=7fFJ -----END PGP SIGNATURE----- diff --git a/app-text/evince/evince-3.0.2.ebuild b/app-text/evince/evince-3.0.2.ebuild new file mode 100644 index 000000000000..f5dd6085ab0b --- /dev/null +++ b/app-text/evince/evince-3.0.2.ebuild @@ -0,0 +1,104 @@ +# 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 $ + +EAPI="4" +GCONF_DEBUG="yes" +GNOME2_LA_PUNT="yes" +GNOME_TARBALL_SUFFIX="bz2" + +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" +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 +RDEPEND=" + >=app-text/libspectre-0.2.0 + >=dev-libs/glib-2.25.11:2 + >=dev-libs/libxml2-2.5:2 + >=x11-libs/gtk+-3.0.2:3[introspection?] + >=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.16[cairo] + djvu? ( >=app-text/djvu-3.5.17 ) + dvi? ( + virtual/tex-base + 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 ) +" +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/gettext + >=dev-util/intltool-0.35 + >=dev-util/gtk-doc-am-1.13 + 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. + # + # 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 + --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) + --disable-xps" + DOCS="AUTHORS ChangeLog NEWS README TODO" +} + +src_prepare() { + # Do not depend on gnome-icon-theme, bug #326855 + sed 's/gnome-icon-theme//' -i configure.ac || die "sed failed" + + # 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 new file mode 100644 index 000000000000..539384348363 --- /dev/null +++ b/app-text/evince/files/evince-2.91.5-fix-evinceview-introspection.patch @@ -0,0 +1,18 @@ +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 \ -- 2.26.2