Make browser plugin optional (bug #535704, thanks to Austin S. Hemmelgarn).

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index 6f09663d377772fd011d725a19f6e93dca0eed0b..a678a6abbf6640a73cd58e7404f460f38ea99c3f 100644 (file)
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.285 2015/03/15 13:16:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.286 2015/03/22 19:47:18 tetromino Exp $
+
+*evince-3.14.2-r1 (22 Mar 2015)
+
+  22 Mar 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +evince-3.14.2-r1.ebuild:
+  Make browser plugin optional (bug #535704, thanks to Austin S. Hemmelgarn).
 
   15 Mar 2015; Pacho Ramos <pacho@gentoo.org> evince-3.14.2.ebuild:
   x86 stable, bug 534012

diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 2530533a0ee3af9ef1163bc5061af9a471140332..e9bda2104d03fbe72f9ab31d9a87b73d8bad13aa 100644 (file)
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -19,13 +19,26 @@ DIST evince-3.14.2.tar.xz 3089840 SHA256 4c591d0b879092a5f6c9140b75f15bdea3665a3
 EBUILD evince-3.12.2-r1.ebuild 3079 SHA256 eddee9e7f9b38d446d45ea8787b195b440193c0b63804ff2743f5cd8b2f2b842 SHA512 97c30cd18809a709aa03ec72fd30cce1c56841948d19e38fbd2a62bc67bc197cb6f59fe6f8ddf8c19cb8ac32388d5f6bd8d649f67e22e854735a01bacf9d8fa5 WHIRLPOOL 95abe41468ebf09d7dec931326266a83a8ef7204b2c37f75f835a18ef717a0c459ec8c2666b83c5c94ebe60a5356cb77661674f0568c2f765d02939a12b510ed
 EBUILD evince-3.12.2.ebuild 2721 SHA256 3d006e1dee77402054fbe99956455c6d453971ef86593ace3d22f59bfc837809 SHA512 3e7e7f36856ce2a4a7fedb7344857aba1b1ea16946be2fd5076bdea2b42c092f1cdd26b1860ca0b8828dc8cac6b442dcc156eddff64c7b08eb4853dc4395b817 WHIRLPOOL fc352d151c630d229da75e0a3ac37c3dff2ac0d1a0b9d1ba087c847608ed438d53f7d959d252bb46b49cef9d4af888404f7becf078463a9fc8a5f7df8b862980
 EBUILD evince-3.14.1-r1.ebuild 3899 SHA256 2ae35b7c209aa0f7771bd41197e5b103d93e43fc436d9ec93e78375e68503027 SHA512 45cbd2c1e3e3c083953c18fccb913126667b18e1b74b5032923903297392c4a2f6d07c7b7102373f6287d17684bf510782fa163e3436ac7ed969d90ab370c0fe WHIRLPOOL 1f51abafb20a2a953e0df9bc71a0a09e44c2ea8a4295a476e1c83b2ecf7c2cf45fcd554b9784de3cbfa933b3c8186e16226dfc68e203f8599fd5809898319a27
+EBUILD evince-3.14.2-r1.ebuild 2953 SHA256 a49addfbb9c231a43ef505a202744ca6ac977ce0dca2409f795091013cbf4c37 SHA512 7fc4db02efd88f80d125f518b1d49296ccf76cec5167b89ea70d60f698bdbafbd6b386d00260d4cc001538be690e8fa2539a42a3fdf9875332976ed84775c9f8 WHIRLPOOL 8eb9264bba876f10151f56b50791820aa3e138c8d05e1345a7485d24121fbe072e19493b7102ea7b98726ebf989a2813e227c023b3bd9758d4456a9b7a4c5c4e
 EBUILD evince-3.14.2.ebuild 2921 SHA256 ed36e1f0e8619a4d27191f762ad467deb168043fb24220add5358560e824e509 SHA512 329dc842703abe34fd7b68f6e24de4fd7adcd9633de467e16c0dab072bcafd0a52b6ab927a26f627af1c7feca938f55680d8ab367da9d7587da62f75ea1b90f5 WHIRLPOOL 319cc1981044a09f5a6b0ae431d5ece62eb36030a40b6612aa3e215ed801ddd0e9ecd36d0f4e409e037c7f24c16855e21b4d33f0cdb23ed4a1f0af40b92b5642
-MISC ChangeLog 43855 SHA256 f9c6f9a165edb5a1cdce2d737e0c3f1ed6ffb5c5b0c98319cb597b8276727f52 SHA512 a2af61a7b0a90ca84c41dd2c567618d69cc28ad8b3bf806250be9c889a0e229394e1a35cf0b0573df87dde77a687026150ca7feb898ef7ce033a5ffb43cc2fb8 WHIRLPOOL 75cb97ee348b960a7c30a301c24134d30e4834f218515d48e256ea94e47d26b434ce84ff295d62715bfacd633628f76b7b432ca52f340924bcd7e5a5108e3276
+MISC ChangeLog 44058 SHA256 f80c35f074391fe444c6a69e8fdd12b7c29f3077e777556163bf375d2a841f38 SHA512 ee02ebf5f8381bf4e2972216194f223822af609b9817bedb4edefbcc0d9308f42c265eca8fdbcfb8503fc9ee7c4579b6af0ec4d9831cdc3191b68e2ea54c21b2 WHIRLPOOL 93ec1963d18ee8fdc8977a187bde8edd75a300d95e35bc42f7be94311b3bd5621f55976c3253d7577558a2666ac4b0e98848b9c5a1f758154e876e8fc7ca7c71
 MISC metadata.xml 587 SHA256 6977b9daf0c11361cb1a1e8f44990a728c1420da4daeb5b8aacb0c4aa315ba34 SHA512 234effcc88c91018a986c4513dc7e1436123f0a4b25725bed5c704ae18143bd2827c3d97e39015d0f6b7b0218d32adfbc4f483899493cfbc47de6648bad21020 WHIRLPOOL 52deb1b8aa08dfcb8e4b655a10b00a83221b1a9918e0e26128718e50e89fe0fb3dc2b45dbf362534d41d31134ae5620e449704a7342eef74c9f3be30d8480056
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUFhgMACgkQCaWpQKGI+9Q7EQCfcr37LkrnTC5pXoPecIbGLAYH
-UIkAnRl19U+H29Gfe+aHA07cnnJ0R2Pc
-=vIwV
+iQJ8BAEBCABmBQJVDxxHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNIcYP/Rk1Ut7IxaBZxquqLvD1j/Jj
+Sa8BB+RNP0wh33tE2zzqerqyV4fsLPT2yDiPodVMGzzgQ0bMzy7IirKrORHiM6m6
+vvUtkImoGCb1sUQTJSQGnpMxXyocL7EeBZmN/s9za3t+2smeIPdqdGw7WMxRpNxj
+O3kxiHl9TEkEIguQpVDzFkis4jLKR8YYJkKeTa2mJgzIDyAe5jLN6vYUwuqbgBjA
+B3pzILnG69l/0ypkVmZo2ZiM59fN/VJHkPl9dyhzSsUXHVe/hNqTaxoHqrDVPg3i
+IC7YAv3BzzLqkv4qJInH6/uJFAaLTyIxNA+rikIGhOGo7IrOmsX/qDPcmwIXi9KV
+GaOTbaNUSNECmlYJFG0bExCu0Z6lWiWYSBrMC0XMA/2hEL+Z9oDMr3UWd4dcWb1f
+NVeURmZU9I7Pz8zF99xIzkbkYk80Fv9IptVwSlCRzk7O7TNR9ubLCv7TtGToHDLY
+9a9BHbC0HaPS5P9FLomHcF0wGuyVPIWV2+vKV0/YAwwuN12lxh3CXUuXqrVLsYJx
+rUZSYuQnDyCFXUTiy+YA7OWVSKnDokZPskIT9WPhSnAoQ9G7kw9IcHxXfA+OVQtb
+0S+Fhk2KxrqnMsEwnE0w0wpvgnCD1+TSVZzpbzWrslXuX0NjWu8Vm4/x6QOZglrh
+P+Da4chByeHfesGmW3cb
+=0kZS
 -----END PGP SIGNATURE-----

diff --git a/app-text/evince/evince-3.14.2-r1.ebuild b/app-text/evince/evince-3.14.2-r1.ebuild
new file mode 100644 (file)
index 0000000..00aa248
--- /dev/null
+++ b/app-text/evince/evince-3.14.2-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.14.2-r1.ebuild,v 1.1 2015/03/22 19:47:18 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
+SLOT="0/evd3.4-evv3.3"
+IUSE="djvu dvi gnome +introspection libsecret nautilus nsplugin +postscript t1lib tiff xps"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~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
+COMMON_DEPEND="
+       dev-libs/atk
+       >=dev-libs/glib-2.36:2[dbus]
+       >=dev-libs/libxml2-2.5:2
+       sys-libs/zlib:=
+       x11-libs/gdk-pixbuf:2
+       >=x11-libs/gtk+-3.14:3[introspection?]
+       gnome-base/gsettings-desktop-schemas
+       >=x11-libs/cairo-1.10:=
+       >=app-text/poppler-0.24:=[cairo]
+       djvu? ( >=app-text/djvu-3.5.17:= )
+       dvi? (
+               virtual/tex-base
+               dev-libs/kpathsea:=
+               t1lib? ( >=media-libs/t1lib-5:= ) )
+       gnome? ( gnome-base/gnome-desktop:3 )
+       introspection? ( >=dev-libs/gobject-introspection-1 )
+       libsecret? ( >=app-crypt/libsecret-0.5 )
+       nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] )
+       postscript? ( >=app-text/libspectre-0.2:= )
+       tiff? ( >=media-libs/tiff-3.6:0= )
+       xps? ( >=app-text/libgxps-0.2.1:= )
+"
+RDEPEND="${COMMON_DEPEND}
+       gnome-base/gvfs
+       gnome-base/librsvg
+       || (
+               >=x11-themes/adwaita-icon-theme-2.17.1
+               >=x11-themes/gnome-icon-theme-2.17.1
+               >=x11-themes/hicolor-icon-theme-0.10 )
+       x11-themes/gnome-icon-theme-symbolic
+"
+DEPEND="${COMMON_DEPEND}
+       app-text/docbook-xml-dtd:4.3
+       app-text/yelp-tools
+       dev-util/gdbus-codegen
+       >=dev-util/gtk-doc-am-1.13
+       >=dev-util/intltool-0.35
+       sys-devel/gettext
+       virtual/pkgconfig
+"
+# eautoreconf needs:
+#  app-text/yelp-tools
+
+src_prepare() {
+       gnome2_src_prepare
+
+       # Do not depend on adwaita-icon-theme, bug #326855, #391859
+       # https://bugs.freedesktop.org/show_bug.cgi?id=29942
+       sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
+               -i configure || die "sed failed"
+}
+
+src_configure() {
+       gnome2_src_configure \
+               --disable-static \
+               --enable-pdf \
+               --enable-comics \
+               --enable-thumbnailer \
+               --with-platform=gnome \
+               --enable-dbus \
+               $(use_enable djvu) \
+               $(use_enable dvi) \
+               $(use_with libsecret keyring) \
+               $(use_enable gnome libgnome-desktop) \
+               $(use_enable introspection) \
+               $(use_enable nautilus) \
+               $(use_enable nsplugin browser-plugin) \
+               $(use_enable postscript ps) \
+               $(use_enable t1lib) \
+               $(use_enable tiff) \
+               $(use_enable xps) \
+               BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
+               ITSTOOL=$(type -P true)
+}