Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/evolution/
Date: Fri, 22 Feb 2019 18:03:59
Message-Id: 1550858557.6a6f11ede87b506422198ab51026eaf9ff362f64.leio@gentoo
1 commit: 6a6f11ede87b506422198ab51026eaf9ff362f64
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 22 17:19:14 2019 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 22 18:02:37 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a6f11ed
7
8 mail-client/evolution: bump to 3.30.5
9
10 Closes: https://bugs.gentoo.org/678064
11 Package-Manager: Portage-2.3.52, Repoman-2.3.12
12 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
13
14 mail-client/evolution/Manifest | 1 +
15 mail-client/evolution/evolution-3.26.6.ebuild | 3 ++-
16 ...ution-3.26.6.ebuild => evolution-3.30.5.ebuild} | 26 +++++++++-------------
17 3 files changed, 13 insertions(+), 17 deletions(-)
18
19 diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
20 index 5aebada0129..46415d2e0b6 100644
21 --- a/mail-client/evolution/Manifest
22 +++ b/mail-client/evolution/Manifest
23 @@ -1,2 +1,3 @@
24 DIST evolution-3.24.6.tar.xz 12153692 BLAKE2B ced20d9e08f6b9aac65be6f5ecd5beb861feec40dddc4411b1bdc6519e249de8db8b3319450808d7a31b80386f9830f351b7edacb3c6fcd28fe5fdfe343329f7 SHA512 da5c9062791996735e52575894763597cc957cb17bc0abe46a966f0e3e6706550ce534ae03b2c444d142547119f3a59aec6ee17e0302a002d8437da166ef7178
25 DIST evolution-3.26.6.tar.xz 12036120 BLAKE2B b0828f172935ce75bad6e2fa9859b65e96f8b8369d8f2c4b836ef9dd992168dcdca256df4aa0577117819f8d21da3976b338fb66b75f0e2511b7f1d23712befa SHA512 34a6f3ec12c6330c2b742281030f641a0998293663d3c2ac4151eef24067ff95403fec37550be2d8d22e43e334b4349f1ece40b75cc23b1dfcec88a9a694363f
26 +DIST evolution-3.30.5.tar.xz 11995960 BLAKE2B 4a2ac539e88467148dd3be2bf2607be55ea39dfb0ceb89183a6f4fa3ee66c1973690c4e540a7405743c202aa777ad9aa147600390e909ffc93cb2dae1ebb62d9 SHA512 1d776fdb0da4166d9346ad4cd05d7ee050e0bf3ac1edc1f7d3fb4ba8909e35429e8d076a5b6e223f3fc94e2a8ad6337205c1d648220a3fdf593bae64d9c975d1
27
28 diff --git a/mail-client/evolution/evolution-3.26.6.ebuild b/mail-client/evolution/evolution-3.26.6.ebuild
29 index 439aa36d847..7ffea1371ae 100644
30 --- a/mail-client/evolution/evolution-3.26.6.ebuild
31 +++ b/mail-client/evolution/evolution-3.26.6.ebuild
32 @@ -1,4 +1,4 @@
33 -# Copyright 1999-2018 Gentoo Foundation
34 +# Copyright 1999-2019 Gentoo Authors
35 # Distributed under the terms of the GNU General Public License v2
36
37 EAPI=6
38 @@ -72,6 +72,7 @@ DEPEND="${COMMON_DEPEND}
39 app-text/docbook-xml-dtd:4.1.2
40 dev-util/gdbus-codegen
41 dev-util/glib-utils
42 + dev-util/itstool
43 gtk-doc? ( dev-util/gtk-doc )
44 >=dev-util/intltool-0.40.0
45 >=sys-devel/gettext-0.18.3
46
47 diff --git a/mail-client/evolution/evolution-3.26.6.ebuild b/mail-client/evolution/evolution-3.30.5.ebuild
48 similarity index 86%
49 copy from mail-client/evolution/evolution-3.26.6.ebuild
50 copy to mail-client/evolution/evolution-3.30.5.ebuild
51 index 439aa36d847..f46ab547f59 100644
52 --- a/mail-client/evolution/evolution-3.26.6.ebuild
53 +++ b/mail-client/evolution/evolution-3.30.5.ebuild
54 @@ -1,8 +1,7 @@
55 -# Copyright 1999-2018 Gentoo Foundation
56 +# Copyright 1999-2019 Gentoo Authors
57 # Distributed under the terms of the GNU General Public License v2
58
59 EAPI=6
60 -GNOME2_LA_PUNT="yes"
61
62 inherit cmake-utils gnome2 flag-o-matic readme.gentoo-r1
63
64 @@ -13,21 +12,18 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
65 LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
66 SLOT="2.0"
67
68 -IUSE="archive +bogofilter crypt geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
69 +IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
70
71 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
72
73 -# We need a graphical pinentry frontend to be able to ask for the GPG
74 -# password from inside evolution, bug 160302
75 -PINENTRY_DEPEND="|| ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] app-crypt/pinentry[qt5] )"
76 -
77 # glade-3 support is for maintainers only per configure.ac
78 # pst is not mature enough and changes API/ABI frequently
79 # dconf explicitely needed for backup plugin
80 # gnome-desktop support is optional with --enable-gnome-desktop
81 +# automagic libunity dep
82 COMMON_DEPEND="
83 >=app-crypt/gcr-3.4:=[gtk]
84 - >=app-text/enchant-1.1.7
85 + >=app-text/enchant-1.6.0:0
86 >=dev-libs/glib-2.46:2[dbus]
87 >=dev-libs/libxml2-2.7.3:2
88 >=gnome-base/gnome-desktop-2.91.3:3=
89 @@ -38,22 +34,18 @@ COMMON_DEPEND="
90 >=net-libs/webkit-gtk-2.16.0:4
91 >=x11-libs/cairo-1.9.15:=[glib]
92 >=x11-libs/gdk-pixbuf-2.24:2
93 - >=x11-libs/gtk+-3.10:3
94 + >=x11-libs/gtk+-3.22:3
95 >=x11-libs/libnotify-0.7:=
96 >=x11-misc/shared-mime-info-0.22
97
98 >=app-text/iso-codes-0.49
99 dev-libs/atk
100 gnome-base/dconf
101 - dev-libs/libical:=
102 + >=dev-libs/libical-3.0.2:=
103 x11-libs/libSM
104 x11-libs/libICE
105
106 archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
107 - crypt? (
108 - >=app-crypt/gnupg-1.4
109 - ${PINENTRY_DEPEND}
110 - x11-libs/libcryptui )
111 geolocation? (
112 >=media-libs/libchamplain-0.12:0.12[gtk]
113 >=media-libs/clutter-1.0.0:1.0
114 @@ -72,7 +64,9 @@ DEPEND="${COMMON_DEPEND}
115 app-text/docbook-xml-dtd:4.1.2
116 dev-util/gdbus-codegen
117 dev-util/glib-utils
118 - gtk-doc? ( dev-util/gtk-doc )
119 + dev-util/itstool
120 + gtk-doc? ( dev-util/gtk-doc
121 + app-text/docbook-xml-dtd:4.3 )
122 >=dev-util/intltool-0.40.0
123 >=sys-devel/gettext-0.18.3
124 virtual/pkgconfig
125 @@ -113,10 +107,10 @@ src_configure() {
126 -DWITH_OPENLDAP=$(usex ldap)
127 -DENABLE_SMIME=$(usex ssl)
128 -DENABLE_GNOME_DESKTOP=ON
129 + -DWITH_ENCHANT_VERSION=1
130 -DENABLE_CANBERRA=ON
131 -DENABLE_AUTOAR=$(usex archive)
132 -DWITH_HELP=ON
133 - -DENABLE_LIBCRYPTUI=$(usex crypt)
134 -DENABLE_YTNEF=OFF
135 -DWITH_BOGOFILTER=$(usex bogofilter)
136 -DWITH_SPAMASSASSIN=$(usex spamassassin)