From e3139cecbd4940059c2387f93c8508727abc4e25 Mon Sep 17 00:00:00 2001 From: Priit Laes Date: Tue, 10 Feb 2015 17:37:16 +0200 Subject: mail-client/evolution: Sync with gx86 --- mail-client/evolution/evolution-3.13.10.ebuild | 6 +++--- mail-client/evolution/evolution-9999.ebuild | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mail-client/evolution/evolution-3.13.10.ebuild b/mail-client/evolution/evolution-3.13.10.ebuild index 104ade25..34ad6da1 100644 --- a/mail-client/evolution/evolution-3.13.10.ebuild +++ b/mail-client/evolution/evolution-3.13.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -27,7 +27,7 @@ fi # We need a graphical pinentry frontend to be able to ask for the GPG # password from inside evolution, bug 160302 -PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] )" +PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] )" # glade-3 support is for maintainers only per configure.ac # pst is not mature enough and changes API/ABI frequently @@ -61,7 +61,7 @@ COMMON_DEPEND=" x11-themes/gnome-icon-theme crypt? ( || ( - ( >=app-crypt/gnupg-2.0.1-r2 x11-libs/libcryptui ${PINENTRY_DEPEND} ) + ( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} ) =app-crypt/gnupg-1.4* ) ) map? ( >=media-libs/libchamplain-0.12:0.12[gtk] diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild index 104ade25..15b849e5 100644 --- a/mail-client/evolution/evolution-9999.ebuild +++ b/mail-client/evolution/evolution-9999.ebuild @@ -27,7 +27,7 @@ fi # We need a graphical pinentry frontend to be able to ask for the GPG # password from inside evolution, bug 160302 -PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] )" +PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] )" # glade-3 support is for maintainers only per configure.ac # pst is not mature enough and changes API/ABI frequently @@ -61,7 +61,7 @@ COMMON_DEPEND=" x11-themes/gnome-icon-theme crypt? ( || ( - ( >=app-crypt/gnupg-2.0.1-r2 x11-libs/libcryptui ${PINENTRY_DEPEND} ) + ( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} ) =app-crypt/gnupg-1.4* ) ) map? ( >=media-libs/libchamplain-0.12:0.12[gtk] -- cgit v1.2.3-65-gdbad