Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in mail-client/evolution: evolution-3.0.3.ebuild evolution-3.2.1.ebuild evolution-2.32.2-r3.ebuild evolution-2.32.3.ebuild evolution-2.32.3-r1.ebuild ChangeLog metadata.xml
Date: Mon, 31 Oct 2011 07:35:32
Message-Id: 20111031073516.C6A8D2004B@flycatcher.gentoo.org
1 tetromino 11/10/31 07:35:16
2
3 Modified: evolution-3.0.3.ebuild evolution-2.32.2-r3.ebuild
4 evolution-2.32.3.ebuild evolution-2.32.3-r1.ebuild
5 ChangeLog metadata.xml
6 Added: evolution-3.2.1.ebuild
7 Log:
8 Bump to 3.2.1 from the gnome overlay. Add a patch to fix building when clutter-gtk:0.10 is installed. Switch to EAPI4 and add a REQUIRED_USE. Update the CPPFLAGS sed for configure.ac changes.
9 In addition, fix clutter dependencies in existing evolution ebuilds.
10
11 (Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
12
13 Revision Changes Path
14 1.2 mail-client/evolution/evolution-3.0.3.ebuild
15
16 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-3.0.3.ebuild?rev=1.2&view=markup
17 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-3.0.3.ebuild?rev=1.2&content-type=text/plain
18 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-3.0.3.ebuild?r1=1.1&r2=1.2
19
20 Index: evolution-3.0.3.ebuild
21 ===================================================================
22 RCS file: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.0.3.ebuild,v
23 retrieving revision 1.1
24 retrieving revision 1.2
25 diff -u -r1.1 -r1.2
26 --- evolution-3.0.3.ebuild 30 Sep 2011 18:45:22 -0000 1.1
27 +++ evolution-3.0.3.ebuild 31 Oct 2011 07:35:16 -0000 1.2
28 @@ -1,6 +1,6 @@
29 # Copyright 1999-2011 Gentoo Foundation
30 # Distributed under the terms of the GNU General Public License v2
31 -# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.0.3.ebuild,v 1.1 2011/09/30 18:45:22 nirbheek Exp $
32 +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.0.3.ebuild,v 1.2 2011/10/31 07:35:16 tetromino Exp $
33
34 EAPI="3"
35 GCONF_DEBUG="no"
36 @@ -50,7 +50,7 @@
37 clutter? (
38 >=media-libs/clutter-1.0.0:1.0
39 >=media-libs/clutter-gtk-0.90:1.0
40 - x11-libs/mx )
41 + x11-libs/mx:1.0 )
42 connman? ( net-misc/connman )
43 crypt? ( || (
44 ( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
45
46
47
48 1.7 mail-client/evolution/evolution-2.32.2-r3.ebuild
49
50 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-2.32.2-r3.ebuild?rev=1.7&view=markup
51 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-2.32.2-r3.ebuild?rev=1.7&content-type=text/plain
52 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-2.32.2-r3.ebuild?r1=1.6&r2=1.7
53
54 Index: evolution-2.32.2-r3.ebuild
55 ===================================================================
56 RCS file: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.2-r3.ebuild,v
57 retrieving revision 1.6
58 retrieving revision 1.7
59 diff -u -r1.6 -r1.7
60 --- evolution-2.32.2-r3.ebuild 5 Oct 2011 17:49:25 -0000 1.6
61 +++ evolution-2.32.2-r3.ebuild 31 Oct 2011 07:35:16 -0000 1.7
62 @@ -1,6 +1,6 @@
63 # Copyright 1999-2011 Gentoo Foundation
64 # Distributed under the terms of the GNU General Public License v2
65 -# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.2-r3.ebuild,v 1.6 2011/10/05 17:49:25 xarthisius Exp $
66 +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.2-r3.ebuild,v 1.7 2011/10/31 07:35:16 tetromino Exp $
67
68 EAPI="3"
69 GCONF_DEBUG="no"
70 @@ -46,7 +46,10 @@
71 >=x11-themes/gnome-icon-theme-2.30.2.1
72 >=dev-libs/libgdata-0.4
73
74 - clutter? ( media-libs/clutter:1.0[gtk] )
75 + clutter? (
76 + >=media-libs/clutter-1.0.0:1.0
77 + >=media-libs/clutter-gtk-0.90:1.0
78 + x11-libs/mx:1.0 )
79 crypt? ( || (
80 ( >=app-crypt/gnupg-2.0.1-r2
81 ${PINENTRY_DEPEND} )
82
83
84
85 1.7 mail-client/evolution/evolution-2.32.3.ebuild
86
87 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-2.32.3.ebuild?rev=1.7&view=markup
88 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-2.32.3.ebuild?rev=1.7&content-type=text/plain
89 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-2.32.3.ebuild?r1=1.6&r2=1.7
90
91 Index: evolution-2.32.3.ebuild
92 ===================================================================
93 RCS file: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3.ebuild,v
94 retrieving revision 1.6
95 retrieving revision 1.7
96 diff -u -r1.6 -r1.7
97 --- evolution-2.32.3.ebuild 30 Oct 2011 16:26:51 -0000 1.6
98 +++ evolution-2.32.3.ebuild 31 Oct 2011 07:35:16 -0000 1.7
99 @@ -1,6 +1,6 @@
100 # Copyright 1999-2011 Gentoo Foundation
101 # Distributed under the terms of the GNU General Public License v2
102 -# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3.ebuild,v 1.6 2011/10/30 16:26:51 armin76 Exp $
103 +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3.ebuild,v 1.7 2011/10/31 07:35:16 tetromino Exp $
104
105 EAPI="3"
106 GCONF_DEBUG="no"
107 @@ -47,7 +47,10 @@
108 >=x11-themes/gnome-icon-theme-2.30.2.1
109 >=dev-libs/libgdata-0.4
110
111 - clutter? ( media-libs/clutter:1.0[gtk] )
112 + clutter? (
113 + >=media-libs/clutter-1.0.0:1.0
114 + >=media-libs/clutter-gtk-0.90:1.0
115 + x11-libs/mx:1.0 )
116 crypt? ( || (
117 ( >=app-crypt/gnupg-2.0.1-r2
118 ${PINENTRY_DEPEND} )
119
120
121
122 1.2 mail-client/evolution/evolution-2.32.3-r1.ebuild
123
124 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-2.32.3-r1.ebuild?rev=1.2&view=markup
125 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-2.32.3-r1.ebuild?rev=1.2&content-type=text/plain
126 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-2.32.3-r1.ebuild?r1=1.1&r2=1.2
127
128 Index: evolution-2.32.3-r1.ebuild
129 ===================================================================
130 RCS file: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3-r1.ebuild,v
131 retrieving revision 1.1
132 retrieving revision 1.2
133 diff -u -r1.1 -r1.2
134 --- evolution-2.32.3-r1.ebuild 8 Oct 2011 21:25:44 -0000 1.1
135 +++ evolution-2.32.3-r1.ebuild 31 Oct 2011 07:35:16 -0000 1.2
136 @@ -1,6 +1,6 @@
137 # Copyright 1999-2011 Gentoo Foundation
138 # Distributed under the terms of the GNU General Public License v2
139 -# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3-r1.ebuild,v 1.1 2011/10/08 21:25:44 pacho Exp $
140 +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3-r1.ebuild,v 1.2 2011/10/31 07:35:16 tetromino Exp $
141
142 EAPI="3"
143 GCONF_DEBUG="no"
144 @@ -47,7 +47,10 @@
145 >=x11-themes/gnome-icon-theme-2.30.2.1
146 >=dev-libs/libgdata-0.4
147
148 - clutter? ( media-libs/clutter:1.0[gtk] )
149 + clutter? (
150 + >=media-libs/clutter-1.0.0:1.0
151 + >=media-libs/clutter-gtk-0.90:1.0
152 + x11-libs/mx:1.0 )
153 connman? ( net-misc/connman )
154 crypt? ( || (
155 ( >=app-crypt/gnupg-2.0.1-r2
156
157
158
159 1.350 mail-client/evolution/ChangeLog
160
161 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/ChangeLog?rev=1.350&view=markup
162 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/ChangeLog?rev=1.350&content-type=text/plain
163 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/ChangeLog?r1=1.349&r2=1.350
164
165 Index: ChangeLog
166 ===================================================================
167 RCS file: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v
168 retrieving revision 1.349
169 retrieving revision 1.350
170 diff -u -r1.349 -r1.350
171 --- ChangeLog 30 Oct 2011 16:26:51 -0000 1.349
172 +++ ChangeLog 31 Oct 2011 07:35:16 -0000 1.350
173 @@ -1,6 +1,17 @@
174 # ChangeLog for mail-client/evolution
175 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
176 -# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.349 2011/10/30 16:26:51 armin76 Exp $
177 +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.350 2011/10/31 07:35:16 tetromino Exp $
178 +
179 +*evolution-3.2.1 (31 Oct 2011)
180 +
181 + 31 Oct 2011; Alexandre Rostovtsev <tetromino@g.o>
182 + evolution-2.32.2-r3.ebuild, evolution-2.32.3.ebuild,
183 + evolution-2.32.3-r1.ebuild, evolution-3.0.3.ebuild, +evolution-3.2.1.ebuild,
184 + +files/evolution-3.2.1-reorder-mx-clutter-gtk.patch, metadata.xml:
185 + Bump to 3.2.1 from the gnome overlay. Add a patch to fix building when
186 + clutter-gtk:0.10 is installed. Switch to EAPI4 and add a REQUIRED_USE. Update
187 + the CPPFLAGS sed for configure.ac changes.
188 + In addition, fix clutter dependencies in existing evolution ebuilds.
189
190 30 Oct 2011; Raúl Porcel <armin76@g.o> evolution-2.32.3.ebuild:
191 alpha/ia64/sparc stable wrt #385699
192
193
194
195 1.17 mail-client/evolution/metadata.xml
196
197 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/metadata.xml?rev=1.17&view=markup
198 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/metadata.xml?rev=1.17&content-type=text/plain
199 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/metadata.xml?r1=1.16&r2=1.17
200
201 Index: metadata.xml
202 ===================================================================
203 RCS file: /var/cvsroot/gentoo-x86/mail-client/evolution/metadata.xml,v
204 retrieving revision 1.16
205 retrieving revision 1.17
206 diff -u -r1.16 -r1.17
207 --- metadata.xml 30 Sep 2011 18:45:22 -0000 1.16
208 +++ metadata.xml 31 Oct 2011 07:35:16 -0000 1.17
209 @@ -8,6 +8,8 @@
210 'networkmanager' USE flag to be disabled).</flag>
211 <flag name="crypt">Enable GPG encryption support using
212 <pkg>app-crypt/gnupg</pkg> and <pkg>app-crypt/pinentry</pkg></flag>
213 + <flag name="gnome-online-accounts">Enable using
214 + <pkg>net-libs/gnome-online-accounts</pkg> for authorization</flag>
215 <flag name="ldap">Enable support for fetching contacts from an LDAP or
216 Active Directory server using <pkg>net-nds/openldap</pkg></flag>
217 <flag name="map">Enable support for displaying contacts on a map inside
218
219
220
221 1.1 mail-client/evolution/evolution-3.2.1.ebuild
222
223 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-3.2.1.ebuild?rev=1.1&view=markup
224 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-3.2.1.ebuild?rev=1.1&content-type=text/plain
225
226 Index: evolution-3.2.1.ebuild
227 ===================================================================
228 # Copyright 1999-2011 Gentoo Foundation
229 # Distributed under the terms of the GNU General Public License v2
230 # $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.2.1.ebuild,v 1.1 2011/10/31 07:35:16 tetromino Exp $
231
232 EAPI="4"
233 GCONF_DEBUG="no"
234 GNOME2_LA_PUNT="yes"
235 PYTHON_DEPEND="python? 2:2.4"
236
237 inherit autotools eutils flag-o-matic gnome2 python
238
239 DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
240 HOMEPAGE="http://www.gnome.org/projects/evolution/"
241
242 LICENSE="GPL-2 LGPL-2 OPENLDAP"
243 SLOT="2.0"
244 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
245 IUSE="clutter connman crypt doc +gnome-online-accounts gstreamer kerberos ldap map networkmanager python ssl"
246
247 # We need a graphical pinentry frontend to be able to ask for the GPG
248 # password from inside evolution, bug 160302
249 PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] )"
250
251 # contacts-map plugin requires libchaimplain and geoclue
252 # glade-3 support is for maintainers only per configure.ac
253 # mono plugin disabled as it's incompatible with 2.8 and lacks maintainance (see bgo#634571)
254 # pst is not mature enough and changes API/ABI frequently
255 COMMON_DEPEND=">=dev-libs/glib-2.28:2
256 >=x11-libs/cairo-1.9.15[glib]
257 >=x11-libs/gtk+-3.0.2:3
258 >=gnome-base/gnome-desktop-2.91.3:3
259 >=gnome-base/gsettings-desktop-schemas-2.91.92
260 >=dev-libs/libgweather-2.90.0:2
261 >=media-libs/libcanberra-0.25[gtk3]
262 >=x11-libs/libnotify-0.7
263 >=gnome-extra/evolution-data-server-${PV}[gnome-online-accounts?,weather]
264 >=gnome-extra/gtkhtml-4.1.2:4.0
265 >=gnome-base/gconf-2:2
266 dev-libs/atk
267 >=dev-libs/libxml2-2.7.3:2
268 >=net-libs/libsoup-gnome-2.31.2:2.4
269 >=x11-misc/shared-mime-info-0.22
270 >=x11-themes/gnome-icon-theme-2.30.2.1
271 >=dev-libs/libgdata-0.9.1
272
273 x11-libs/libSM
274 x11-libs/libICE
275
276 clutter? (
277 >=media-libs/clutter-1.0.0:1.0
278 >=media-libs/clutter-gtk-0.90:1.0
279 x11-libs/mx:1.0 )
280 connman? ( net-misc/connman )
281 crypt? ( || (
282 ( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
283 =app-crypt/gnupg-1.4* ) )
284 gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 )
285 gstreamer? (
286 >=media-libs/gstreamer-0.10:0.10
287 >=media-libs/gst-plugins-base-0.10:0.10 )
288 kerberos? ( virtual/krb5 )
289 ldap? ( >=net-nds/openldap-2 )
290 map? (
291 >=app-misc/geoclue-0.11.1
292 media-libs/libchamplain:0.10 )
293 networkmanager? ( >=net-misc/networkmanager-0.7 )
294 ssl? (
295 >=dev-libs/nspr-4.6.1
296 >=dev-libs/nss-3.11 )"
297 DEPEND="${COMMON_DEPEND}
298 >=dev-util/pkgconfig-0.16
299 >=dev-util/intltool-0.40.0
300 >=sys-devel/gettext-0.17
301 sys-devel/bison
302 app-text/scrollkeeper
303 >=app-text/gnome-doc-utils-0.9.1
304 app-text/docbook-xml-dtd:4.1.2
305 >=gnome-base/gnome-common-2.12
306 >=dev-util/gtk-doc-am-1.9
307 doc? ( >=dev-util/gtk-doc-1.9 )"
308 # eautoreconf needs:
309 # >=gnome-base/gnome-common-2.12
310 # >=dev-util/gtk-doc-am-1.9
311 RDEPEND="${COMMON_DEPEND}
312 !<gnome-extra/evolution-exchange-2.32"
313
314 # contact maps require clutter
315 # NM and connman support cannot coexist
316 REQUIRED_USE="map? ( clutter )
317 connman? ( !networkmanager )
318 networkmanager? ( !connman )"
319
320 pkg_setup() {
321 ELTCONF="--reverse-deps"
322 DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
323 # image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
324 G2CONF="${G2CONF}
325 --without-glade-catalog
326 --without-kde-applnk-path
327 --enable-plugins=experimental
328 --disable-image-inline
329 --disable-mono
330 --disable-pst-import
331 --enable-canberra
332 --enable-weather
333 $(use_enable ssl nss)
334 $(use_enable ssl smime)
335 $(use_enable networkmanager nm)
336 $(use_enable connman)
337 $(use_enable gnome-online-accounts goa)
338 $(use_enable gstreamer audio-inline)
339 $(use_enable map contact-maps)
340 $(use_enable python)
341 $(use_with clutter)
342 $(use_with ldap openldap)
343 $(use_with kerberos krb5 ${EPREFIX}/usr)"
344
345 # dang - I've changed this to do --enable-plugins=experimental. This will
346 # autodetect new-mail-notify and exchange, but that cannot be helped for the
347 # moment. They should be changed to depend on a --enable-<foo> like mono
348 # is. This cleans up a ton of crap from this ebuild.
349
350 # Use NSS/NSPR only if 'ssl' is enabled.
351 if use ssl ; then
352 G2CONF="${G2CONF} --enable-nss=yes"
353 else
354 G2CONF="${G2CONF}
355 --without-nspr-libs
356 --without-nspr-includes
357 --without-nss-libs
358 --without-nss-includes"
359 fi
360
361 python_set_active_version 2
362 python_pkg_setup
363 }
364
365 src_prepare() {
366 # https://bugzilla.gnome.org/show_bug.cgi?id=663077, requires eautoreconf
367 epatch "${FILESDIR}/${PN}-3.2.1-reorder-mx-clutter-gtk.patch"
368 eautoreconf
369
370 gnome2_src_prepare
371
372 # Fix compilation flags crazyness
373 sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
374 -i configure || die "CPPFLAGS sed failed"
375 }
376
377 pkg_postinst() {
378 gnome2_pkg_postinst
379
380 elog "To change the default browser if you are not using GNOME, edit"
381 elog "~/.local/share/applications/mimeapps.list so it includes the"
382 elog "following content:"
383 elog ""
384 elog "[Default Applications]"
385 elog "x-scheme-handler/http=firefox.desktop"
386 elog "x-scheme-handler/https=firefox.desktop"
387 elog ""
388 elog "(replace firefox.desktop with the name of the appropriate .desktop"
389 elog "file from /usr/share/applications if you use a different browser)."
390 elog ""
391 elog "Junk filters are now a run-time choice. You will get a choice of"
392 elog "bogofilter or spamassassin based on which you have installed"
393 elog ""
394 elog "You have to install one of these for the spam filtering to actually work"
395 }