1 |
commit: 0ec71b7c1cc10ba8d9d8d7ad0f6a75c978430103 |
2 |
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 2 11:10:05 2016 +0000 |
4 |
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 2 11:10:05 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=0ec71b7c |
7 |
|
8 |
gnome-extra/evolution-data-server: Bump version to 3.20.0 |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
Manifest-Sign-Key: 0xE9E568677E8B4D42 |
12 |
|
13 |
....ebuild => evolution-data-server-3.20.0.ebuild} | 59 ++++++++++++---------- |
14 |
.../evolution-data-server-9999.ebuild | 55 +++++++++++--------- |
15 |
gnome-extra/evolution-data-server/metadata.xml | 1 + |
16 |
3 files changed, 65 insertions(+), 50 deletions(-) |
17 |
|
18 |
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.19.90.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.20.0.ebuild |
19 |
similarity index 77% |
20 |
rename from gnome-extra/evolution-data-server/evolution-data-server-3.19.90.ebuild |
21 |
rename to gnome-extra/evolution-data-server/evolution-data-server-3.20.0.ebuild |
22 |
index d3400cf..cc9b480 100644 |
23 |
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.19.90.ebuild |
24 |
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.20.0.ebuild |
25 |
@@ -1,12 +1,11 @@ |
26 |
-# Copyright 1999-2015 Gentoo Foundation |
27 |
+# Copyright 1999-2016 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 |
GNOME2_LA_PUNT="yes" |
34 |
-PYTHON_COMPAT=( python2_7 python3_4 pypy pypy2_0 ) |
35 |
-VALA_MIN_API_VERSION="0.22" |
36 |
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy ) |
37 |
VALA_USE_DEPEND="vapigen" |
38 |
|
39 |
inherit db-use flag-o-matic gnome2 python-any-r1 vala virtualx |
40 |
@@ -16,40 +15,44 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" |
41 |
|
42 |
# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". |
43 |
LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat" |
44 |
-SLOT="0/57" # subslot = libcamel-1.2 soname + optional revision if needed |
45 |
-IUSE="api-doc-extras +google-auth +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather" |
46 |
+SLOT="0/57" # subslot = libcamel-1.2 soname version |
47 |
+ |
48 |
+IUSE="api-doc-extras +berkdb +gnome-online-accounts +gtk +google +introspection ipv6 ldap kerberos vala +weather" |
49 |
REQUIRED_USE="vala? ( introspection )" |
50 |
|
51 |
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris" |
52 |
|
53 |
# sys-libs/db is only required for migrating from <3.13 versions |
54 |
# gdata-0.15.1 is required for google tasks |
55 |
-# google-auth allows adding own google_client_id and google_client_secret |
56 |
+# berkdb needed only for migrating old calendar data, bug #519512 |
57 |
RDEPEND=" |
58 |
>=app-crypt/gcr-3.4 |
59 |
>=app-crypt/libsecret-0.5[crypt] |
60 |
>=dev-db/sqlite-3.7.17:= |
61 |
>=dev-libs/glib-2.40:2 |
62 |
+ >=dev-libs/json-glib-1.0.4 |
63 |
>=dev-libs/libgdata-0.10:= |
64 |
>=dev-libs/libical-0.43:= |
65 |
- >=net-libs/libsoup-2.42:2.4 |
66 |
>=dev-libs/libxml2-2 |
67 |
>=dev-libs/nspr-4.4:= |
68 |
>=dev-libs/nss-3.9:= |
69 |
- >=sys-libs/db-4:= |
70 |
+ >=net-libs/libsoup-2.42:2.4 |
71 |
+ >=net-libs/webkit-gtk-2.4.9:3 |
72 |
|
73 |
dev-libs/icu:= |
74 |
sys-libs/zlib:= |
75 |
virtual/libiconv |
76 |
|
77 |
- google-auth? ( |
78 |
- >=net-libs/webkit-gtk-2.4.9 |
79 |
- >=dev-libs/json-glib-1.0.4 |
80 |
- ) |
81 |
+ berkdb? ( >=sys-libs/db-4:= ) |
82 |
gtk? ( |
83 |
>=app-crypt/gcr-3.4[gtk] |
84 |
>=x11-libs/gtk+-3.10:3 |
85 |
) |
86 |
+ google? ( |
87 |
+ >=dev-libs/json-glib-1.0.4 |
88 |
+ >=dev-libs/libgdata-0.15.1:= |
89 |
+ >=net-libs/webkit-gtk-2.4.9:3 |
90 |
+ ) |
91 |
gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 ) |
92 |
introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) |
93 |
kerberos? ( virtual/krb5:= ) |
94 |
@@ -62,7 +65,6 @@ DEPEND="${RDEPEND} |
95 |
dev-util/gperf |
96 |
>=dev-util/gtk-doc-am-1.14 |
97 |
>=dev-util/intltool-0.35.5 |
98 |
- >=gnome-base/gnome-common-3.5.5 |
99 |
>=sys-devel/gettext-0.17 |
100 |
virtual/pkgconfig |
101 |
vala? ( $(vala_depend) ) |
102 |
@@ -87,24 +89,22 @@ src_prepare() { |
103 |
ELTCONF="--reverse-deps" |
104 |
|
105 |
gnome2_src_prepare |
106 |
- |
107 |
- # Fix compilation flags crazyness, upstream bug #653157 |
108 |
- sed 's/^\(AM_CFLAGS="\)$WARNING_FLAGS/\1/' \ |
109 |
- -i configure || die "sed failed" |
110 |
} |
111 |
|
112 |
src_configure() { |
113 |
# /usr/include/db.h is always db-1 on FreeBSD |
114 |
# so include the right dir in CPPFLAGS |
115 |
- append-cppflags "-I$(db_includedir)" |
116 |
+ use berkdb && append-cppflags "-I$(db_includedir)" |
117 |
|
118 |
# phonenumber does not exist in tree |
119 |
gnome2_src_configure \ |
120 |
$(use_enable api-doc-extras gtk-doc) \ |
121 |
$(use_with api-doc-extras private-docs) \ |
122 |
+ $(usex berkdb --with-libdb="${EPREFIX}"/usr --with-libdb=no) \ |
123 |
$(use_enable gnome-online-accounts goa) \ |
124 |
- $(use_enable google-auth) \ |
125 |
$(use_enable gtk) \ |
126 |
+ $(use_enable google google-auth) \ |
127 |
+ $(use_enable google) \ |
128 |
$(use_enable introspection) \ |
129 |
$(use_enable ipv6) \ |
130 |
$(use_with kerberos krb5 "${EPREFIX}"/usr) \ |
131 |
@@ -112,15 +112,20 @@ src_configure() { |
132 |
$(use_with ldap openldap) \ |
133 |
$(use_enable vala vala-bindings) \ |
134 |
$(use_enable weather) \ |
135 |
- --enable-google \ |
136 |
--enable-largefile \ |
137 |
--enable-smime \ |
138 |
- --with-libdb="${EPREFIX}"/usr \ |
139 |
--without-phonenumber \ |
140 |
--disable-examples \ |
141 |
--disable-uoa |
142 |
} |
143 |
|
144 |
+src_test() { |
145 |
+ unset ORBIT_SOCKETDIR |
146 |
+ unset SESSION_MANAGER |
147 |
+ unset DISPLAY |
148 |
+ Xemake check |
149 |
+} |
150 |
+ |
151 |
src_install() { |
152 |
gnome2_src_install |
153 |
|
154 |
@@ -131,10 +136,10 @@ src_install() { |
155 |
fi |
156 |
} |
157 |
|
158 |
-src_test() { |
159 |
- unset DBUS_SESSION_BUS_ADDRESS |
160 |
- unset ORBIT_SOCKETDIR |
161 |
- unset SESSION_MANAGER |
162 |
- unset DISPLAY |
163 |
- Xemake check |
164 |
+pkg_postinst() { |
165 |
+ gnome2_pkg_postinst |
166 |
+ if ! use berkdb; then |
167 |
+ ewarn "You will need to enable berkdb USE for migrating old" |
168 |
+ ewarn "(pre-3.12 evolution versions) addressbook data" |
169 |
+ fi |
170 |
} |
171 |
|
172 |
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild |
173 |
index 6948f3c..19daf6c 100644 |
174 |
--- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild |
175 |
+++ b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild |
176 |
@@ -1,12 +1,11 @@ |
177 |
-# Copyright 1999-2015 Gentoo Foundation |
178 |
+# Copyright 1999-2016 Gentoo Foundation |
179 |
# Distributed under the terms of the GNU General Public License v2 |
180 |
# $Id$ |
181 |
|
182 |
EAPI="5" |
183 |
GCONF_DEBUG="no" |
184 |
GNOME2_LA_PUNT="yes" |
185 |
-PYTHON_COMPAT=( python2_7 python3_4 pypy pypy2_0 ) |
186 |
-VALA_MIN_API_VERSION="0.22" |
187 |
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy ) |
188 |
VALA_USE_DEPEND="vapigen" |
189 |
|
190 |
inherit db-use flag-o-matic gnome2 python-any-r1 vala virtualx |
191 |
@@ -19,8 +18,9 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" |
192 |
|
193 |
# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". |
194 |
LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat" |
195 |
-SLOT="0/54" # subslot = libcamel-1.2 soname + optional revision if needed |
196 |
-IUSE="api-doc-extras +google-auth +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather" |
197 |
+SLOT="0/57" # subslot = libcamel-1.2 soname + optional revision if needed |
198 |
+ |
199 |
+IUSE="api-doc-extras +berkdb +gnome-online-accounts +gtk +google +introspection ipv6 ldap kerberos vala +weather" |
200 |
REQUIRED_USE="vala? ( introspection )" |
201 |
|
202 |
if [[ ${PV} = 9999 ]]; then |
203 |
@@ -33,32 +33,35 @@ fi |
204 |
|
205 |
# sys-libs/db is only required for migrating from <3.13 versions |
206 |
# gdata-0.15.1 is required for google tasks |
207 |
-# google-auth allows adding own google_client_id and google_client_secret |
208 |
+# berkdb needed only for migrating old calendar data, bug #519512 |
209 |
RDEPEND=" |
210 |
>=app-crypt/gcr-3.4 |
211 |
>=app-crypt/libsecret-0.5[crypt] |
212 |
>=dev-db/sqlite-3.7.17:= |
213 |
>=dev-libs/glib-2.40:2 |
214 |
+ >=dev-libs/json-glib-1.0.4 |
215 |
>=dev-libs/libgdata-0.10:= |
216 |
>=dev-libs/libical-0.43:= |
217 |
- >=net-libs/libsoup-2.42:2.4 |
218 |
>=dev-libs/libxml2-2 |
219 |
>=dev-libs/nspr-4.4:= |
220 |
>=dev-libs/nss-3.9:= |
221 |
- >=sys-libs/db-4:= |
222 |
+ >=net-libs/libsoup-2.42:2.4 |
223 |
+ >=net-libs/webkit-gtk-2.4.9:3 |
224 |
|
225 |
dev-libs/icu:= |
226 |
sys-libs/zlib:= |
227 |
virtual/libiconv |
228 |
|
229 |
- google-auth? ( |
230 |
- >=net-libs/webkit-gtk-2.4.9 |
231 |
- >=dev-libs/json-glib-1.0.4 |
232 |
- ) |
233 |
+ berkdb? ( >=sys-libs/db-4:= ) |
234 |
gtk? ( |
235 |
>=app-crypt/gcr-3.4[gtk] |
236 |
>=x11-libs/gtk+-3.10:3 |
237 |
) |
238 |
+ google? ( |
239 |
+ >=dev-libs/json-glib-1.0.4 |
240 |
+ >=dev-libs/libgdata-0.15.1:= |
241 |
+ >=net-libs/webkit-gtk-2.4.9:3 |
242 |
+ ) |
243 |
gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 ) |
244 |
introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) |
245 |
kerberos? ( virtual/krb5:= ) |
246 |
@@ -71,7 +74,6 @@ DEPEND="${RDEPEND} |
247 |
dev-util/gperf |
248 |
>=dev-util/gtk-doc-am-1.14 |
249 |
>=dev-util/intltool-0.35.5 |
250 |
- >=gnome-base/gnome-common-3.5.5 |
251 |
>=sys-devel/gettext-0.17 |
252 |
virtual/pkgconfig |
253 |
vala? ( $(vala_depend) ) |
254 |
@@ -106,15 +108,17 @@ src_prepare() { |
255 |
src_configure() { |
256 |
# /usr/include/db.h is always db-1 on FreeBSD |
257 |
# so include the right dir in CPPFLAGS |
258 |
- append-cppflags "-I$(db_includedir)" |
259 |
+ use berkdb && append-cppflags "-I$(db_includedir)" |
260 |
|
261 |
# phonenumber does not exist in tree |
262 |
gnome2_src_configure \ |
263 |
$(use_enable api-doc-extras gtk-doc) \ |
264 |
$(use_with api-doc-extras private-docs) \ |
265 |
+ $(usex berkdb --with-libdb="${EPREFIX}"/usr --with-libdb=no) \ |
266 |
$(use_enable gnome-online-accounts goa) \ |
267 |
- $(use_enable google-auth) \ |
268 |
$(use_enable gtk) \ |
269 |
+ $(use_enable google google-auth) \ |
270 |
+ $(use_enable google) \ |
271 |
$(use_enable introspection) \ |
272 |
$(use_enable ipv6) \ |
273 |
$(use_with kerberos krb5 "${EPREFIX}"/usr) \ |
274 |
@@ -122,15 +126,20 @@ src_configure() { |
275 |
$(use_with ldap openldap) \ |
276 |
$(use_enable vala vala-bindings) \ |
277 |
$(use_enable weather) \ |
278 |
- --enable-google \ |
279 |
--enable-largefile \ |
280 |
--enable-smime \ |
281 |
- --with-libdb="${EPREFIX}"/usr \ |
282 |
--without-phonenumber \ |
283 |
--disable-examples \ |
284 |
--disable-uoa |
285 |
} |
286 |
|
287 |
+src_test() { |
288 |
+ unset ORBIT_SOCKETDIR |
289 |
+ unset SESSION_MANAGER |
290 |
+ unset DISPLAY |
291 |
+ Xemake check |
292 |
+} |
293 |
+ |
294 |
src_install() { |
295 |
gnome2_src_install |
296 |
|
297 |
@@ -141,10 +150,10 @@ src_install() { |
298 |
fi |
299 |
} |
300 |
|
301 |
-src_test() { |
302 |
- unset DBUS_SESSION_BUS_ADDRESS |
303 |
- unset ORBIT_SOCKETDIR |
304 |
- unset SESSION_MANAGER |
305 |
- unset DISPLAY |
306 |
- Xemake check |
307 |
+pkg_postinst() { |
308 |
+ gnome2_pkg_postinst |
309 |
+ if ! use berkdb; then |
310 |
+ ewarn "You will need to enable berkdb USE for migrating old" |
311 |
+ ewarn "(pre-3.12 evolution versions) addressbook data" |
312 |
+ fi |
313 |
} |
314 |
|
315 |
diff --git a/gnome-extra/evolution-data-server/metadata.xml b/gnome-extra/evolution-data-server/metadata.xml |
316 |
index fce6455..f9541c1 100644 |
317 |
--- a/gnome-extra/evolution-data-server/metadata.xml |
318 |
+++ b/gnome-extra/evolution-data-server/metadata.xml |
319 |
@@ -9,6 +9,7 @@ |
320 |
<flag name="api-doc-extras">Build documentation for private APIs</flag> |
321 |
<flag name="gnome-online-accounts">Enable using |
322 |
<pkg>net-libs/gnome-online-accounts</pkg> for authorization</flag> |
323 |
+ <flag name="google">Enable support for google authentication, contacts and tasks</flag> |
324 |
<flag name="weather">Enable optional weather calendar support</flag> |
325 |
</use> |
326 |
</pkgmetadata> |