Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in mail-client/evolution: ChangeLog evolution-2.28.3.1-r1.ebuild evolution-2.30.3.ebuild
Date: Thu, 30 Sep 2010 18:52:34
Message-Id: 20100930185228.E432220051@flycatcher.gentoo.org
1 ssuominen 10/09/30 18:52:28
2
3 Modified: ChangeLog evolution-2.28.3.1-r1.ebuild
4 evolution-2.30.3.ebuild
5 Log:
6 Fix pinentry dependencies on latest 2.28 and 2.30 series wrt #339265.
7
8 (Portage version: 2.2_rc88/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.307 mail-client/evolution/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/ChangeLog?rev=1.307&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/ChangeLog?rev=1.307&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/ChangeLog?r1=1.306&r2=1.307
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v
20 retrieving revision 1.306
21 retrieving revision 1.307
22 diff -u -r1.306 -r1.307
23 --- ChangeLog 11 Sep 2010 18:52:47 -0000 1.306
24 +++ ChangeLog 30 Sep 2010 18:52:28 -0000 1.307
25 @@ -1,6 +1,10 @@
26 # ChangeLog for mail-client/evolution
27 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.306 2010/09/11 18:52:47 josejx Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.307 2010/09/30 18:52:28 ssuominen Exp $
30 +
31 + 30 Sep 2010; Samuli Suominen <ssuominen@g.o>
32 + evolution-2.28.3.1-r1.ebuild, evolution-2.30.3.ebuild:
33 + Fix pinentry dependencies on latest 2.28 and 2.30 series wrt #339265.
34
35 11 Sep 2010; Joseph Jezak <josejx@g.o> evolution-2.30.2-r1.ebuild:
36 Marked ppc for bug #324077.
37
38
39
40 1.5 mail-client/evolution/evolution-2.28.3.1-r1.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-2.28.3.1-r1.ebuild?rev=1.5&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-2.28.3.1-r1.ebuild?rev=1.5&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-2.28.3.1-r1.ebuild?r1=1.4&r2=1.5
45
46 Index: evolution-2.28.3.1-r1.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.28.3.1-r1.ebuild,v
49 retrieving revision 1.4
50 retrieving revision 1.5
51 diff -u -r1.4 -r1.5
52 --- evolution-2.28.3.1-r1.ebuild 5 Aug 2010 16:54:14 -0000 1.4
53 +++ evolution-2.28.3.1-r1.ebuild 30 Sep 2010 18:52:28 -0000 1.5
54 @@ -1,6 +1,6 @@
55 # Copyright 1999-2010 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.28.3.1-r1.ebuild,v 1.4 2010/08/05 16:54:14 ssuominen Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.28.3.1-r1.ebuild,v 1.5 2010/09/30 18:52:28 ssuominen Exp $
59
60 EAPI="2"
61 GCONF_DEBUG="no"
62 @@ -19,6 +19,7 @@
63 # Pango dependency required to avoid font rendering problems
64 # We need a graphical pinentry frontend to be able to ask for the GPG
65 # password from inside evolution, bug 160302
66 +PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] app-crypt/pinentry[qt3] )"
67 RDEPEND=">=dev-libs/glib-2.20
68 >=x11-libs/gtk+-2.16
69 >=gnome-extra/evolution-data-server-${PV}
70 @@ -52,7 +53,7 @@
71 >=gnome-base/orbit-2.9.8
72 crypt? ( || (
73 ( >=app-crypt/gnupg-2.0.1-r2
74 - app-crypt/pinentry[gtk] )
75 + ${PINENTRY_DEPEND} )
76 =app-crypt/gnupg-1.4* ) )
77 ldap? ( >=net-nds/openldap-2 )
78 mono? ( >=dev-lang/mono-1 )
79
80
81
82 1.2 mail-client/evolution/evolution-2.30.3.ebuild
83
84 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-2.30.3.ebuild?rev=1.2&view=markup
85 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-2.30.3.ebuild?rev=1.2&content-type=text/plain
86 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-2.30.3.ebuild?r1=1.1&r2=1.2
87
88 Index: evolution-2.30.3.ebuild
89 ===================================================================
90 RCS file: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.30.3.ebuild,v
91 retrieving revision 1.1
92 retrieving revision 1.2
93 diff -u -r1.1 -r1.2
94 --- evolution-2.30.3.ebuild 8 Sep 2010 18:57:54 -0000 1.1
95 +++ evolution-2.30.3.ebuild 30 Sep 2010 18:52:28 -0000 1.2
96 @@ -1,6 +1,6 @@
97 # Copyright 1999-2010 Gentoo Foundation
98 # Distributed under the terms of the GNU General Public License v2
99 -# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.30.3.ebuild,v 1.1 2010/09/08 18:57:54 eva Exp $
100 +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.30.3.ebuild,v 1.2 2010/09/30 18:52:28 ssuominen Exp $
101
102 EAPI="2"
103 GCONF_DEBUG="no"
104 @@ -18,8 +18,10 @@
105 # mono - disabled because it just crashes on startup :S
106
107 # Pango dependency required to avoid font rendering problems
108 -# We need a graphical pinentry frontend to be able to ask for the GPG
109 +# We need a graphical pinentry frontend to be able to ask for the GPG.
110 +# Note that separate pinenetry-qt is actually newer than USE=qt4 in pinentry.
111 # password from inside evolution, bug 160302
112 +PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] app-crypt/pinentry[qt3] )"
113 RDEPEND=">=dev-libs/glib-2.22
114 >=x11-libs/gtk+-2.18
115 >=gnome-extra/evolution-data-server-$(get_version_component_range 1-2)
116 @@ -41,7 +43,7 @@
117
118 crypt? ( || (
119 ( >=app-crypt/gnupg-2.0.1-r2
120 - || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt3] ) )
121 + ${PINENTRY_DEPEND} )
122 =app-crypt/gnupg-1.4* ) )
123 gstreamer? (
124 >=media-libs/gstreamer-0.10
Report Message
Find on MARC Find on Google Groups