| 1 |
mrpouet 09/09/09 19:34:02 |
| 2 |
|
| 3 |
Modified: ChangeLog evolution-2.26.3.ebuild |
| 4 |
Log: |
| 5 |
Fix bug #284271, Drop the conditionnal die when >=gnupg-2.0.12-r2 is installed without pinentry[gtk] or pinentry[qt3], replace it by a || () dependency (Any of Many Dependencies), which gives this task to portage mechanism dependencies |
| 6 |
(Portage version: 2.2_rc40/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.272 mail-client/evolution/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/evolution/ChangeLog?rev=1.272&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/evolution/ChangeLog?rev=1.272&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/evolution/ChangeLog?r1=1.271&r2=1.272 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v |
| 18 |
retrieving revision 1.271 |
| 19 |
retrieving revision 1.272 |
| 20 |
diff -u -r1.271 -r1.272 |
| 21 |
--- ChangeLog 26 Aug 2009 01:17:26 -0000 1.271 |
| 22 |
+++ ChangeLog 9 Sep 2009 19:34:01 -0000 1.272 |
| 23 |
@@ -1,6 +1,13 @@ |
| 24 |
# ChangeLog for mail-client/evolution |
| 25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.271 2009/08/26 01:17:26 jer Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.272 2009/09/09 19:34:01 mrpouet Exp $ |
| 28 |
+ |
| 29 |
+ 09 Sep 2009; Romain Perier <mrpouet@g.o> |
| 30 |
+ evolution-2.26.3.ebuild: |
| 31 |
+ Fix bug #284271, Drop the conditionnal die when >=gnupg-2.0.12-r2 is |
| 32 |
+ installed without pinentry[gtk] or pinentry[qt3], replace it by a || () |
| 33 |
+ dependency (Any of Many Dependencies), which gives this task to portage's |
| 34 |
+ mechanism dependencies. |
| 35 |
|
| 36 |
26 Aug 2009; Jeroen Roovers <jer@g.o> evolution-2.24.5.ebuild, |
| 37 |
evolution-2.26.2.ebuild, evolution-2.26.3.ebuild: |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.4 mail-client/evolution/evolution-2.26.3.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/evolution/evolution-2.26.3.ebuild?rev=1.4&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/evolution/evolution-2.26.3.ebuild?rev=1.4&content-type=text/plain |
| 45 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/evolution/evolution-2.26.3.ebuild?r1=1.3&r2=1.4 |
| 46 |
|
| 47 |
Index: evolution-2.26.3.ebuild |
| 48 |
=================================================================== |
| 49 |
RCS file: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.26.3.ebuild,v |
| 50 |
retrieving revision 1.3 |
| 51 |
retrieving revision 1.4 |
| 52 |
diff -u -r1.3 -r1.4 |
| 53 |
--- evolution-2.26.3.ebuild 26 Aug 2009 01:17:26 -0000 1.3 |
| 54 |
+++ evolution-2.26.3.ebuild 9 Sep 2009 19:34:01 -0000 1.4 |
| 55 |
@@ -1,6 +1,6 @@ |
| 56 |
# Copyright 1999-2009 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.26.3.ebuild,v 1.3 2009/08/26 01:17:26 jer Exp $ |
| 59 |
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.26.3.ebuild,v 1.4 2009/09/09 19:34:01 mrpouet Exp $ |
| 60 |
|
| 61 |
EAPI="2" |
| 62 |
|
| 63 |
@@ -16,6 +16,8 @@ |
| 64 |
# pst |
| 65 |
|
| 66 |
# Pango dependency required to avoid font rendering problems |
| 67 |
+# We need a graphical pinentry frontend to be able to ask for the GPG |
| 68 |
+# password from inside evolution, bug 160302 |
| 69 |
RDEPEND=">=dev-libs/glib-2.18 |
| 70 |
>=x11-libs/gtk+-2.14 |
| 71 |
>=gnome-extra/evolution-data-server-2.26.3 |
| 72 |
@@ -45,7 +47,10 @@ |
| 73 |
kerberos? ( virtual/krb5 ) |
| 74 |
krb4? ( app-crypt/mit-krb5[krb4] ) |
| 75 |
>=gnome-base/orbit-2.9.8 |
| 76 |
- crypt? ( || ( >=app-crypt/gnupg-2.0.1-r2 =app-crypt/gnupg-1.4* ) ) |
| 77 |
+ crypt? ( || ( |
| 78 |
+ ( >=app-crypt/gnupg-2.0.1-r2 |
| 79 |
+ || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt3] ) ) |
| 80 |
+ =app-crypt/gnupg-1.4* ) ) |
| 81 |
ldap? ( >=net-nds/openldap-2 ) |
| 82 |
mono? ( >=dev-lang/mono-1 ) |
| 83 |
python? ( >=dev-lang/python-2.4 ) |
| 84 |
@@ -90,14 +95,6 @@ |
| 85 |
$(use_with kerberos krb5 /usr) |
| 86 |
$(use_with krb4 krb4 /usr)" |
| 87 |
|
| 88 |
- # We need a graphical pinentry frontend to be able to ask for the GPG |
| 89 |
- # password from inside evolution, bug 160302 |
| 90 |
- if use crypt && has_version '>=app-crypt/gnupg-2.0.1-r2'; then |
| 91 |
- if ! built_with_use -o app-crypt/pinentry gtk qt3; then |
| 92 |
- die "You must build app-crypt/pinentry with GTK or QT3 support" |
| 93 |
- fi |
| 94 |
- fi |
| 95 |
- |
| 96 |
# dang - I've changed this to do --enable-plugins=experimental. This will |
| 97 |
# autodetect new-mail-notify and exchange, but that cannot be helped for the |
| 98 |
# moment. They should be changed to depend on a --enable-<foo> like mono |
Archives