Gentoo Archives: gentoo-commits

From: Gilles Dartiguelongue <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: app-text/evince/
Date: Sat, 26 May 2018 19:35:23
Message-Id: 1527353912.fde5d6a097d12f6f393c7633752b0c3837f0b7ab.eva@gentoo
1 commit: fde5d6a097d12f6f393c7633752b0c3837f0b7ab
2 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 26 16:58:32 2018 +0000
4 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
5 CommitDate: Sat May 26 16:58:32 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=fde5d6a0
7
8 app-text/evince: synchronize live ebuild
9
10 Package-Manager: Portage-2.3.40, Repoman-2.3.9
11 Manifest-Sign-Key: 0x5A56C8CD0C13248A
12
13 app-text/evince/evince-9999.ebuild | 21 +++++++--------------
14 1 file changed, 7 insertions(+), 14 deletions(-)
15
16 diff --git a/app-text/evince/evince-9999.ebuild b/app-text/evince/evince-9999.ebuild
17 index f0a34501..3ecb6a1f 100644
18 --- a/app-text/evince/evince-9999.ebuild
19 +++ b/app-text/evince/evince-9999.ebuild
20 @@ -1,11 +1,10 @@
21 # Copyright 1999-2018 Gentoo Foundation
22 # Distributed under the terms of the GNU General Public License v2
23
24 -EAPI="5"
25 -GCONF_DEBUG="yes"
26 +EAPI=6
27 GNOME2_LA_PUNT="yes"
28
29 -inherit gnome2
30 +inherit gnome2 systemd
31 if [[ ${PV} = 9999 ]]; then
32 inherit gnome2-live
33 fi
34 @@ -21,24 +20,23 @@ if [[ ${PV} = 9999 ]]; then
35 IUSE="${IUSE} doc"
36 KEYWORDS=""
37 else
38 - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
39 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
40 fi
41
42 -# Since 2.26.2, can handle poppler without cairo support. Make it optional ?
43 -# not mature enough
44 # atk used in libview
45 # gdk-pixbuf used all over the place
46 -# libX11 used for totem-screensaver
47 +# bundles unarr library. It does not seem to exist standalone.
48 COMMON_DEPEND="
49 dev-libs/atk
50 >=dev-libs/glib-2.36:2[dbus]
51 >=dev-libs/libxml2-2.5:2
52 sys-libs/zlib:=
53 - x11-libs/gdk-pixbuf:2
54 + >=x11-libs/gdk-pixbuf-2.36.5:2
55 >=x11-libs/gtk+-3.16.0:3[introspection?]
56 gnome-base/gsettings-desktop-schemas
57 >=x11-libs/cairo-1.10:=
58 >=app-text/poppler-0.33[cairo]
59 + >=app-arch/libarchive-3.1.2
60 djvu? ( >=app-text/djvu-3.5.22:= )
61 dvi? (
62 virtual/tex-base
63 @@ -61,9 +59,7 @@ RDEPEND="${COMMON_DEPEND}
64 gnome-base/librsvg
65 || (
66 >=x11-themes/adwaita-icon-theme-2.17.1
67 - ( >=x11-themes/gnome-icon-theme-2.17.1 x11-themes/gnome-icon-theme-symbolic )
68 >=x11-themes/hicolor-icon-theme-0.10 )
69 - x11-themes/gnome-icon-theme-symbolic
70 "
71 DEPEND="${COMMON_DEPEND}
72 app-text/docbook-xml-dtd:4.3
73 @@ -82,10 +78,6 @@ if [[ ${PV} = 9999 ]]; then
74 doc? ( >=dev-util/gtk-doc-1.13 )"
75 fi
76
77 -# Needs dogtail and pyspi from http://fedorahosted.org/dogtail/
78 -# Releases: http://people.redhat.com/zcerza/dogtail/releases/
79 -#RESTRICT="test"
80 -
81 src_prepare() {
82 gnome2_src_prepare
83
84 @@ -118,5 +110,6 @@ src_configure() {
85 $(use_enable tiff) \
86 $(use_enable xps) \
87 BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
88 + --with-systemduserunitdir="$(systemd_get_userunitdir)"
89 ${myconf}
90 }