Gentoo Archives: gentoo-commits

From: Alexandre Rostovtsev <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: app-text/evince/
Date: Thu, 27 Dec 2012 16:51:37
Message-Id: 1356627062.257073584107bd5903ae66ebdf17f1e2c93a2bcd.tetromino@gentoo
1 commit: 257073584107bd5903ae66ebdf17f1e2c93a2bcd
2 Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 27 16:51:02 2012 +0000
4 Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 27 16:51:02 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=25707358
7
8 app-text/evince: sync with gx86
9
10 ---
11 app-text/evince/evince-9999.ebuild | 51 +++++++++++++++++------------------
12 1 files changed, 25 insertions(+), 26 deletions(-)
13
14 diff --git a/app-text/evince/evince-9999.ebuild b/app-text/evince/evince-9999.ebuild
15 index 3d44d21..dcb8f66 100644
16 --- a/app-text/evince/evince-9999.ebuild
17 +++ b/app-text/evince/evince-9999.ebuild
18 @@ -2,7 +2,7 @@
19 # Distributed under the terms of the GNU General Public License v2
20 # $Header: $
21
22 -EAPI="4"
23 +EAPI="5"
24 GCONF_DEBUG="yes"
25 GNOME2_LA_PUNT="yes"
26
27 @@ -14,9 +14,10 @@ fi
28 DESCRIPTION="Simple document viewer for GNOME"
29 HOMEPAGE="http://www.gnome.org/projects/evince/"
30
31 -LICENSE="GPL-2+"
32 -SLOT="0"
33 -IUSE="dbus debug djvu dvi gnome-keyring +introspection nautilus +postscript t1lib tiff xps"
34 +LICENSE="GPL-2+ CCPL-Attribution-ShareAlike-3.0"
35 +# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
36 +SLOT="0/evd3.4-evv3.3"
37 +IUSE="debug djvu dvi gnome-keyring +introspection nautilus +postscript t1lib tiff xps"
38 if [[ ${PV} = 9999 ]]; then
39 IUSE="${IUSE} doc"
40 KEYWORDS=""
41 @@ -31,36 +32,38 @@ fi
42 # libX11 used for totem-screensaver
43 RDEPEND="
44 dev-libs/atk
45 - >=dev-libs/glib-2.33.0:2
46 + >=dev-libs/glib-2.33:2
47 >=dev-libs/libxml2-2.5:2
48 - sys-libs/zlib
49 + sys-libs/zlib:=
50 x11-libs/gdk-pixbuf:2
51 >=x11-libs/gtk+-3.0.2:3[introspection?]
52 - x11-libs/libX11
53 - >=x11-libs/libSM-1
54 - x11-libs/libICE
55 + x11-libs/libX11:=
56 + >=x11-libs/libSM-1:=
57 + x11-libs/libICE:=
58 gnome-base/gsettings-desktop-schemas
59 || (
60 >=x11-themes/gnome-icon-theme-2.17.1
61 >=x11-themes/hicolor-icon-theme-0.10 )
62 - >=x11-libs/cairo-1.10.0
63 - >=app-text/poppler-0.20.0[cairo]
64 - djvu? ( >=app-text/djvu-3.5.17 )
65 + >=x11-libs/cairo-1.10:=
66 + >=app-text/poppler-0.20:=[cairo]
67 + djvu? ( >=app-text/djvu-3.5.17:= )
68 dvi? (
69 virtual/tex-base
70 - dev-libs/kpathsea
71 - t1lib? ( >=media-libs/t1lib-5.0.0 ) )
72 - gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.0 )
73 - introspection? ( >=dev-libs/gobject-introspection-1.0 )
74 + dev-libs/kpathsea:=
75 + t1lib? ( >=media-libs/t1lib-5:= ) )
76 + gnome-keyring? ( >=gnome-base/gnome-keyring-2.22 )
77 + introspection? ( >=dev-libs/gobject-introspection-1 )
78 nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] )
79 - postscript? ( >=app-text/libspectre-0.2.0 )
80 - tiff? ( >=media-libs/tiff-3.6:0 )
81 - xps? ( >=app-text/libgxps-0.2.1 )"
82 + postscript? ( >=app-text/libspectre-0.2.0:= )
83 + tiff? ( >=media-libs/tiff-3.6:0= )
84 + xps? ( >=app-text/libgxps-0.2.1:= )
85 +"
86 DEPEND="${RDEPEND}
87 app-text/docbook-xml-dtd:4.3
88 + dev-util/gdbus-codegen
89 sys-devel/gettext
90 - >=dev-util/intltool-0.35
91 >=dev-util/gtk-doc-am-1.13
92 + >=dev-util/intltool-0.35
93 virtual/pkgconfig"
94
95 if [[ ${PV} = 9999 ]]; then
96 @@ -75,9 +78,8 @@ ELTCONF="--portage"
97 # Releases: http://people.redhat.com/zcerza/dogtail/releases/
98 RESTRICT="test"
99
100 -pkg_setup() {
101 +src_prepare() {
102 G2CONF="${G2CONF}
103 - --disable-schemas-compile
104 --disable-static
105 --disable-tests
106 --enable-pdf
107 @@ -85,7 +87,7 @@ pkg_setup() {
108 --enable-thumbnailer
109 --with-smclient=xsmp
110 --with-platform=gnome
111 - $(use_enable dbus)
112 + --enable-dbus
113 $(use_enable djvu)
114 $(use_enable dvi)
115 $(use_with gnome-keyring keyring)
116 @@ -96,10 +98,7 @@ pkg_setup() {
117 $(use_enable tiff)
118 $(use_enable xps)"
119 [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
120 - DOCS="AUTHORS ChangeLog NEWS README TODO"
121 -}
122
123 -src_prepare() {
124 # Fix .desktop file so menu item shows up
125 epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch