Gentoo Archives: gentoo-commits

From: Sobhan Mohammadpour <sobhan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: mail-client/evolution/
Date: Tue, 29 May 2018 20:54:50
Message-Id: 1527627277.16179dfba3f0ac4332c2ce3ff8903b075fa553fa.sobhan@gentoo
1 commit: 16179dfba3f0ac4332c2ce3ff8903b075fa553fa
2 Author: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 29 20:54:37 2018 +0000
4 Commit: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
5 CommitDate: Tue May 29 20:54:37 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=16179dfb
7
8 mail-client/evolution: bump and sync live ebuild
9
10 Package-Manager: Portage-2.3.36, Repoman-2.3.9
11 Manifest-Sign-Key: 0x7DF238CF0AA182E1
12
13 ...olution-9999.ebuild => evolution-3.26.6.ebuild} | 118 ++++++++++-----------
14 mail-client/evolution/evolution-9999.ebuild | 115 ++++++++++----------
15 mail-client/evolution/metadata.xml | 8 +-
16 3 files changed, 114 insertions(+), 127 deletions(-)
17
18 diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-3.26.6.ebuild
19 similarity index 62%
20 copy from mail-client/evolution/evolution-9999.ebuild
21 copy to mail-client/evolution/evolution-3.26.6.ebuild
22 index 476b39b6..f585a9af 100644
23 --- a/mail-client/evolution/evolution-9999.ebuild
24 +++ b/mail-client/evolution/evolution-3.26.6.ebuild
25 @@ -1,15 +1,10 @@
26 -# Copyright 1999-2015 Gentoo Foundation
27 +# Copyright 1999-2018 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Id$
30
31 -EAPI="5"
32 -GCONF_DEBUG="no"
33 +EAPI=6
34 GNOME2_LA_PUNT="yes"
35
36 -inherit eutils flag-o-matic readme.gentoo gnome2
37 -if [[ ${PV} = 9999 ]]; then
38 - inherit gnome2-live
39 -fi
40 +inherit cmake-utils gnome2 flag-o-matic readme.gentoo-r1
41
42 DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
43 HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
44 @@ -17,36 +12,30 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
45 # Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
46 LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
47 SLOT="2.0"
48 -IUSE="+bogofilter crypt highlight ldap map spamassassin spell ssl +weather"
49 -if [[ ${PV} = 9999 ]]; then
50 - IUSE="${IUSE} doc"
51 - KEYWORDS=""
52 -else
53 - # Needs x11-libs/libcryptui keyworded
54 - #KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
55 - KEYWORDS="~amd64 ~x86 ~x86-fbsd"
56 -fi
57 +
58 +IUSE="archive +bogofilter crypt geolocation highlight ldap spamassassin spell ssl +weather ytnef"
59 +
60 +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
61
62 # We need a graphical pinentry frontend to be able to ask for the GPG
63 # password from inside evolution, bug 160302
64 -PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] )"
65 +PINENTRY_DEPEND="|| ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] app-crypt/pinentry[qt5] )"
66
67 # glade-3 support is for maintainers only per configure.ac
68 # pst is not mature enough and changes API/ABI frequently
69 # dconf explicitely needed for backup plugin
70 # gnome-desktop support is optional with --enable-gnome-desktop
71 -# gnome-autoar (currently disabled because no release has been made)
72 COMMON_DEPEND="
73 - >=app-crypt/gcr-3.4
74 + >=app-crypt/gcr-3.4:=[gtk]
75 >=app-text/enchant-1.1.7
76 - >=dev-libs/glib-2.40:2[dbus]
77 + >=dev-libs/glib-2.46:2[dbus]
78 >=dev-libs/libxml2-2.7.3:2
79 >=gnome-base/gnome-desktop-2.91.3:3=
80 >=gnome-base/gsettings-desktop-schemas-2.91.92
81 >=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
82 >=media-libs/libcanberra-0.25[gtk3]
83 >=net-libs/libsoup-2.42:2.4
84 - >=net-libs/webkit-gtk-2.2:3
85 + >=net-libs/webkit-gtk-2.16.0:4
86 >=x11-libs/cairo-1.9.15:=[glib]
87 >=x11-libs/gdk-pixbuf-2.24:2
88 >=x11-libs/gtk+-3.10:3
89 @@ -60,32 +49,34 @@ COMMON_DEPEND="
90 x11-libs/libSM
91 x11-libs/libICE
92
93 + archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
94 crypt? (
95 >=app-crypt/gnupg-1.4
96 ${PINENTRY_DEPEND}
97 x11-libs/libcryptui )
98 - map? (
99 + geolocation? (
100 >=media-libs/libchamplain-0.12:0.12[gtk]
101 >=media-libs/clutter-1.0.0:1.0
102 >=media-libs/clutter-gtk-0.90:1.0
103 >=sci-geosciences/geocode-glib-3.10.0
104 x11-libs/mx:1.0 )
105 - spell? ( app-text/gtkspell:3 )
106 ldap? ( >=net-nds/openldap-2:= )
107 + spell? ( app-text/gtkspell:3 )
108 ssl? (
109 >=dev-libs/nspr-4.6.1:=
110 >=dev-libs/nss-3.11:= )
111 weather? ( >=dev-libs/libgweather-3.10:2= )
112 + ytnef? ( net-mail/ytnef )
113 "
114 DEPEND="${COMMON_DEPEND}
115 app-text/docbook-xml-dtd:4.1.2
116 - dev-util/gtk-doc-am
117 + app-text/yelp-tools
118 + dev-util/gdbus-codegen
119 + >=dev-util/gtk-doc-am-1.14
120 >=dev-util/intltool-0.40.0
121 + >=sys-devel/gettext-0.18.3
122 virtual/pkgconfig
123 "
124 -# eautoreconf needs:
125 -# app-text/yelp-tools
126 -# >=gnome-base/gnome-common-2.12
127 RDEPEND="${COMMON_DEPEND}
128 bogofilter? ( mail-filter/bogofilter )
129 highlight? ( app-text/highlight )
130 @@ -93,12 +84,6 @@ RDEPEND="${COMMON_DEPEND}
131 !gnome-extra/evolution-exchange
132 "
133
134 -if [[ ${PV} = 9999 ]]; then
135 - DEPEND="${DEPEND}
136 - app-text/yelp-tools
137 - doc? ( >=dev-util/gtk-doc-1.14 )"
138 -fi
139 -
140 DISABLE_AUTOFORMATTING="yes"
141 DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
142 ~/.local/share/applications/mimeapps.list so it includes the
143 @@ -112,45 +97,50 @@ x-scheme-handler/https=firefox.desktop
144 file from /usr/share/applications if you use a different browser)."
145
146 src_prepare() {
147 - # Fix relink issues in src_install
148 - ELTCONF="--reverse-deps"
149 + # Leave post-install actions to eclass
150 + sed -e "s;\(find_program(GTK_UPDATE_ICON_CACHE\).*;\1 $(type -P true));" \
151 + -i "${S}"/cmake/modules/IconCache.cmake || die
152
153 gnome2_src_prepare
154 -
155 }
156
157 src_configure() {
158 # Use NSS/NSPR only if 'ssl' is enabled.
159 - local myconf
160 - [[ ${PV} != 9999 ]] && myconf="${myconf} ITSTOOL=$(type -P true)"
161 - gnome2_src_configure \
162 - --without-glade-catalog \
163 - --disable-autoar \
164 - --disable-code-coverage \
165 - --disable-installed-tests \
166 - --disable-pst-import \
167 - --enable-canberra \
168 - $(use_enable crypt libcryptui) \
169 - $(use_enable highlight text-highlight) \
170 - $(use_enable map contact-maps) \
171 - $(use_enable spell gtkspell) \
172 - $(use_enable ssl nss) \
173 - $(use_enable ssl smime) \
174 - $(use_with bogofilter) \
175 - $(use_with ldap openldap) \
176 - $(use_with spamassassin) \
177 - $(usex ssl --enable-nss=yes "--without-nspr-libs
178 - --without-nspr-includes
179 - --without-nss-libs
180 - --without-nss-includes") \
181 - $(use_enable weather) \
182 - ${myconf}
183 + local mycmakeargs=(
184 + -DENABLE_SCHEMAS_COMPILE=OFF
185 + -DENABLE_GTK_DOC=OFF
186 + -DWITH_OPENLDAP=$(usex ldap)
187 + -DENABLE_SMIME=$(usex ssl)
188 + -DENABLE_GNOME_DESKTOP=ON
189 + -DENABLE_CANBERRA=ON
190 + -DENABLE_AUTOAR=$(usex archive)
191 + -DWITH_HELP=ON
192 + -DENABLE_LIBCRYPTUI=$(usex crypt)
193 + -DENABLE_YTNEF=OFF
194 + -DWITH_BOGOFILTER=$(usex bogofilter)
195 + -DWITH_SPAMASSASSIN=$(usex spamassassin)
196 + -DENABLE_GTKSPELL=$(usex spell)
197 + -DENABLE_TEXT_HIGHLIGHT=$(usex highlight)
198 + -DENABLE_WEATHER=$(usex weather)
199 + -DENABLE_CONTACT_MAPS=$(usex geolocation)
200 + -DENABLE_YTNEF=$(usex ytnef)
201 + -DENABLE_PST_IMPORT=OFF
202 + -DWITH_GLADE_CATALOG=OFF
203 + )
204 +
205 + cmake-utils_src_configure
206 }
207
208 -src_install() {
209 - DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
210 +src_compile() {
211 + cmake-utils_src_compile
212 +}
213
214 - gnome2_src_install
215 +src_test() {
216 + cmake-utils_src_test
217 +}
218 +
219 +src_install() {
220 + cmake-utils_src_install
221
222 # Problems with prelink:
223 # https://bugzilla.gnome.org/show_bug.cgi?id=731680
224
225 diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild
226 index 476b39b6..13c6c18b 100644
227 --- a/mail-client/evolution/evolution-9999.ebuild
228 +++ b/mail-client/evolution/evolution-9999.ebuild
229 @@ -1,12 +1,10 @@
230 -# Copyright 1999-2015 Gentoo Foundation
231 +# Copyright 1999-2018 Gentoo Foundation
232 # Distributed under the terms of the GNU General Public License v2
233 -# $Id$
234
235 -EAPI="5"
236 -GCONF_DEBUG="no"
237 +EAPI=6
238 GNOME2_LA_PUNT="yes"
239
240 -inherit eutils flag-o-matic readme.gentoo gnome2
241 +inherit cmake-utils gnome2 flag-o-matic readme.gentoo-r1
242 if [[ ${PV} = 9999 ]]; then
243 inherit gnome2-live
244 fi
245 @@ -17,36 +15,30 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
246 # Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
247 LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
248 SLOT="2.0"
249 -IUSE="+bogofilter crypt highlight ldap map spamassassin spell ssl +weather"
250 -if [[ ${PV} = 9999 ]]; then
251 - IUSE="${IUSE} doc"
252 - KEYWORDS=""
253 -else
254 - # Needs x11-libs/libcryptui keyworded
255 - #KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
256 - KEYWORDS="~amd64 ~x86 ~x86-fbsd"
257 -fi
258 +
259 +IUSE="archive +bogofilter crypt geolocation highlight ldap spamassassin spell ssl +weather ytnef"
260 +
261 +KEYWORDS=""
262
263 # We need a graphical pinentry frontend to be able to ask for the GPG
264 # password from inside evolution, bug 160302
265 -PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] )"
266 +PINENTRY_DEPEND="|| ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] app-crypt/pinentry[qt5] )"
267
268 # glade-3 support is for maintainers only per configure.ac
269 # pst is not mature enough and changes API/ABI frequently
270 # dconf explicitely needed for backup plugin
271 # gnome-desktop support is optional with --enable-gnome-desktop
272 -# gnome-autoar (currently disabled because no release has been made)
273 COMMON_DEPEND="
274 - >=app-crypt/gcr-3.4
275 + >=app-crypt/gcr-3.4:=[gtk]
276 >=app-text/enchant-1.1.7
277 - >=dev-libs/glib-2.40:2[dbus]
278 + >=dev-libs/glib-2.46:2[dbus]
279 >=dev-libs/libxml2-2.7.3:2
280 >=gnome-base/gnome-desktop-2.91.3:3=
281 >=gnome-base/gsettings-desktop-schemas-2.91.92
282 >=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
283 >=media-libs/libcanberra-0.25[gtk3]
284 >=net-libs/libsoup-2.42:2.4
285 - >=net-libs/webkit-gtk-2.2:3
286 + >=net-libs/webkit-gtk-2.16.0:4
287 >=x11-libs/cairo-1.9.15:=[glib]
288 >=x11-libs/gdk-pixbuf-2.24:2
289 >=x11-libs/gtk+-3.10:3
290 @@ -60,32 +52,34 @@ COMMON_DEPEND="
291 x11-libs/libSM
292 x11-libs/libICE
293
294 + archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
295 crypt? (
296 >=app-crypt/gnupg-1.4
297 ${PINENTRY_DEPEND}
298 x11-libs/libcryptui )
299 - map? (
300 + geolocation? (
301 >=media-libs/libchamplain-0.12:0.12[gtk]
302 >=media-libs/clutter-1.0.0:1.0
303 >=media-libs/clutter-gtk-0.90:1.0
304 >=sci-geosciences/geocode-glib-3.10.0
305 x11-libs/mx:1.0 )
306 - spell? ( app-text/gtkspell:3 )
307 ldap? ( >=net-nds/openldap-2:= )
308 + spell? ( app-text/gtkspell:3 )
309 ssl? (
310 >=dev-libs/nspr-4.6.1:=
311 >=dev-libs/nss-3.11:= )
312 weather? ( >=dev-libs/libgweather-3.10:2= )
313 + ytnef? ( net-mail/ytnef )
314 "
315 DEPEND="${COMMON_DEPEND}
316 app-text/docbook-xml-dtd:4.1.2
317 - dev-util/gtk-doc-am
318 + app-text/yelp-tools
319 + dev-util/gdbus-codegen
320 + >=dev-util/gtk-doc-am-1.14
321 >=dev-util/intltool-0.40.0
322 + >=sys-devel/gettext-0.18.3
323 virtual/pkgconfig
324 "
325 -# eautoreconf needs:
326 -# app-text/yelp-tools
327 -# >=gnome-base/gnome-common-2.12
328 RDEPEND="${COMMON_DEPEND}
329 bogofilter? ( mail-filter/bogofilter )
330 highlight? ( app-text/highlight )
331 @@ -93,12 +87,6 @@ RDEPEND="${COMMON_DEPEND}
332 !gnome-extra/evolution-exchange
333 "
334
335 -if [[ ${PV} = 9999 ]]; then
336 - DEPEND="${DEPEND}
337 - app-text/yelp-tools
338 - doc? ( >=dev-util/gtk-doc-1.14 )"
339 -fi
340 -
341 DISABLE_AUTOFORMATTING="yes"
342 DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
343 ~/.local/share/applications/mimeapps.list so it includes the
344 @@ -112,45 +100,50 @@ x-scheme-handler/https=firefox.desktop
345 file from /usr/share/applications if you use a different browser)."
346
347 src_prepare() {
348 - # Fix relink issues in src_install
349 - ELTCONF="--reverse-deps"
350 + # Leave post-install actions to eclass
351 + sed -e "s;\(find_program(GTK_UPDATE_ICON_CACHE\).*;\1 $(type -P true));" \
352 + -i "${S}"/cmake/modules/IconCache.cmake || die
353
354 gnome2_src_prepare
355 -
356 }
357
358 src_configure() {
359 # Use NSS/NSPR only if 'ssl' is enabled.
360 - local myconf
361 - [[ ${PV} != 9999 ]] && myconf="${myconf} ITSTOOL=$(type -P true)"
362 - gnome2_src_configure \
363 - --without-glade-catalog \
364 - --disable-autoar \
365 - --disable-code-coverage \
366 - --disable-installed-tests \
367 - --disable-pst-import \
368 - --enable-canberra \
369 - $(use_enable crypt libcryptui) \
370 - $(use_enable highlight text-highlight) \
371 - $(use_enable map contact-maps) \
372 - $(use_enable spell gtkspell) \
373 - $(use_enable ssl nss) \
374 - $(use_enable ssl smime) \
375 - $(use_with bogofilter) \
376 - $(use_with ldap openldap) \
377 - $(use_with spamassassin) \
378 - $(usex ssl --enable-nss=yes "--without-nspr-libs
379 - --without-nspr-includes
380 - --without-nss-libs
381 - --without-nss-includes") \
382 - $(use_enable weather) \
383 - ${myconf}
384 + local mycmakeargs=(
385 + -DENABLE_SCHEMAS_COMPILE=OFF
386 + -DENABLE_GTK_DOC=OFF
387 + -DWITH_OPENLDAP=$(usex ldap)
388 + -DENABLE_SMIME=$(usex ssl)
389 + -DENABLE_GNOME_DESKTOP=ON
390 + -DENABLE_CANBERRA=ON
391 + -DENABLE_AUTOAR=$(usex archive)
392 + -DWITH_HELP=ON
393 + -DENABLE_LIBCRYPTUI=$(usex crypt)
394 + -DENABLE_YTNEF=OFF
395 + -DWITH_BOGOFILTER=$(usex bogofilter)
396 + -DWITH_SPAMASSASSIN=$(usex spamassassin)
397 + -DENABLE_GTKSPELL=$(usex spell)
398 + -DENABLE_TEXT_HIGHLIGHT=$(usex highlight)
399 + -DENABLE_WEATHER=$(usex weather)
400 + -DENABLE_CONTACT_MAPS=$(usex geolocation)
401 + -DENABLE_YTNEF=$(usex ytnef)
402 + -DENABLE_PST_IMPORT=OFF
403 + -DWITH_GLADE_CATALOG=OFF
404 + )
405 +
406 + cmake-utils_src_configure
407 }
408
409 -src_install() {
410 - DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
411 +src_compile() {
412 + cmake-utils_src_compile
413 +}
414
415 - gnome2_src_install
416 +src_test() {
417 + cmake-utils_src_test
418 +}
419 +
420 +src_install() {
421 + cmake-utils_src_install
422
423 # Problems with prelink:
424 # https://bugzilla.gnome.org/show_bug.cgi?id=731680
425
426 diff --git a/mail-client/evolution/metadata.xml b/mail-client/evolution/metadata.xml
427 index ad4605bc..885e9b3f 100644
428 --- a/mail-client/evolution/metadata.xml
429 +++ b/mail-client/evolution/metadata.xml
430 @@ -6,17 +6,21 @@
431 <name>Gentoo GNOME Desktop</name>
432 </maintainer>
433 <use>
434 + <flag name="archive">Enable archives support in attachments via
435 + <pkg>app-arch/gnome-autoar</pkg></flag>
436 <flag name="bogofilter">Build <pkg>mail-filter/bogofilter</pkg> plugin</flag>
437 <flag name="crypt">Enable GPG encryption support using
438 <pkg>app-crypt/gnupg</pkg> and <pkg>app-crypt/pinentry</pkg></flag>
439 + <flag name="geolocation">Enable support for displaying contacts on a map
440 + inside evolution using <pkg>media-libs/libchamplain</pkg></flag>
441 <flag name="highlight">Enable text highlighting
442 plugin</flag>
443 <flag name="ldap">Enable support for fetching contacts from an LDAP or
444 Active Directory server using <pkg>net-nds/openldap</pkg></flag>
445 - <flag name="map">Enable support for displaying contacts on a map inside
446 - evolution using <pkg>media-libs/libchamplain</pkg></flag>
447 <flag name="spamassassin">Build <pkg>mail-filter/spamassassin</pkg>
448 plugin</flag>
449 <flag name="weather">Enable optional weather calendar support</flag>
450 + <flag name="ytnef">Enable optional TNEF attachments parser support using
451 + <pkg>net-mail/ytnef</pkg></flag>
452 </use>
453 </pkgmetadata>