From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CBA4A138A1A for ; Tue, 10 Feb 2015 15:37:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D23F3E09FE; Tue, 10 Feb 2015 15:37:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7D16DE09FE for ; Tue, 10 Feb 2015 15:37:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E50EE3406A7 for ; Tue, 10 Feb 2015 15:37:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 40B1511752 for ; Tue, 10 Feb 2015 15:37:32 +0000 (UTC) From: "Priit Laes" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Priit Laes" Message-ID: <1423582636.e3139cecbd4940059c2387f93c8508727abc4e25.plaes@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: mail-client/evolution/ X-VCS-Repository: proj/gnome X-VCS-Files: mail-client/evolution/evolution-3.13.10.ebuild mail-client/evolution/evolution-9999.ebuild X-VCS-Directories: mail-client/evolution/ X-VCS-Committer: plaes X-VCS-Committer-Name: Priit Laes X-VCS-Revision: e3139cecbd4940059c2387f93c8508727abc4e25 X-VCS-Branch: master Date: Tue, 10 Feb 2015 15:37:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0926db21-8bf4-44b1-8aa0-cc7fbe8ecd44 X-Archives-Hash: 0638442d65f2850c4f0f4c63cfafdbbd commit: e3139cecbd4940059c2387f93c8508727abc4e25 Author: Priit Laes plaes org> AuthorDate: Tue Feb 10 15:37:16 2015 +0000 Commit: Priit Laes plaes org> CommitDate: Tue Feb 10 15:37:16 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e3139cec 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 104ade2..34ad6da 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 104ade2..15b849e 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]