diff options
| author |   Romain Perier <mrpouet@gentoo.org> | 2009-09-09 19:34:01 +0000 |
|---|---|---|
| committer | Romain Perier <mrpouet@gentoo.org> | 2009-09-09 19:34:01 +0000 |
| commit | 09f482b75ac0829e40c321cdbca9c06ac6ace69d (patch) | |
| tree | b502149c4175a68f1d0d2ccbeabe399489cb895b /mail-client | |
| parent | Package.mask nemerle per bug 259700. (diff) | |
| download | gentoo-2-09f482b75ac0829e40c321cdbca9c06ac6ace69d.tar.gz gentoo-2-09f482b75ac0829e40c321cdbca9c06ac6ace69d.tar.bz2 gentoo-2-09f482b75ac0829e40c321cdbca9c06ac6ace69d.zip | |
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
(Portage version: 2.2_rc40/cvs/Linux x86_64)
Diffstat (limited to 'mail-client')
| -rw-r--r-- | mail-client/evolution/ChangeLog | 9 | ||||
| -rw-r--r-- | mail-client/evolution/evolution-2.26.3.ebuild | 17 |
2 files changed, 15 insertions, 11 deletions
diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog index 4f97ef9298fe..cb87e565572e 100644 --- a/mail-client/evolution/ChangeLog +++ b/mail-client/evolution/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for mail-client/evolution # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.271 2009/08/26 01:17:26 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.272 2009/09/09 19:34:01 mrpouet Exp $ + + 09 Sep 2009; Romain Perier <mrpouet@gentoo.org> + evolution-2.26.3.ebuild: + 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's + mechanism dependencies. 26 Aug 2009; Jeroen Roovers <jer@gentoo.org> evolution-2.24.5.ebuild, evolution-2.26.2.ebuild, evolution-2.26.3.ebuild: diff --git a/mail-client/evolution/evolution-2.26.3.ebuild b/mail-client/evolution/evolution-2.26.3.ebuild index 5de23837b197..ed440aa359a2 100644 --- a/mail-client/evolution/evolution-2.26.3.ebuild +++ b/mail-client/evolution/evolution-2.26.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.26.3.ebuild,v 1.3 2009/08/26 01:17:26 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.26.3.ebuild,v 1.4 2009/09/09 19:34:01 mrpouet Exp $ EAPI="2" @@ -16,6 +16,8 @@ IUSE="crypt dbus hal kerberos krb4 ldap mono networkmanager nntp pda profile pyt # pst # Pango dependency required to avoid font rendering problems +# We need a graphical pinentry frontend to be able to ask for the GPG +# password from inside evolution, bug 160302 RDEPEND=">=dev-libs/glib-2.18 >=x11-libs/gtk+-2.14 >=gnome-extra/evolution-data-server-2.26.3 @@ -45,7 +47,10 @@ RDEPEND=">=dev-libs/glib-2.18 kerberos? ( virtual/krb5 ) krb4? ( app-crypt/mit-krb5[krb4] ) >=gnome-base/orbit-2.9.8 - crypt? ( || ( >=app-crypt/gnupg-2.0.1-r2 =app-crypt/gnupg-1.4* ) ) + crypt? ( || ( + ( >=app-crypt/gnupg-2.0.1-r2 + || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt3] ) ) + =app-crypt/gnupg-1.4* ) ) ldap? ( >=net-nds/openldap-2 ) mono? ( >=dev-lang/mono-1 ) python? ( >=dev-lang/python-2.4 ) @@ -90,14 +95,6 @@ pkg_setup() { $(use_with kerberos krb5 /usr) $(use_with krb4 krb4 /usr)" - # We need a graphical pinentry frontend to be able to ask for the GPG - # password from inside evolution, bug 160302 - if use crypt && has_version '>=app-crypt/gnupg-2.0.1-r2'; then - if ! built_with_use -o app-crypt/pinentry gtk qt3; then - die "You must build app-crypt/pinentry with GTK or QT3 support" - fi - fi - # dang - I've changed this to do --enable-plugins=experimental. This will # autodetect new-mail-notify and exchange, but that cannot be helped for the # moment. They should be changed to depend on a --enable-<foo> like mono |