From: "Priit Laes" <plaes@plaes.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: mail-client/evolution/
Date: Tue, 10 Feb 2015 15:37:32 +0000 (UTC) [thread overview]
Message-ID: <1423582636.e3139cecbd4940059c2387f93c8508727abc4e25.plaes@gentoo> (raw)
commit: e3139cecbd4940059c2387f93c8508727abc4e25
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Feb 10 15:37:16 2015 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> 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]
next reply other threads:[~2015-02-10 15:37 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-10 15:37 Priit Laes [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-09-11 9:02 [gentoo-commits] proj/gnome:master commit in: mail-client/evolution/ Mart Raudsepp
2018-09-11 9:02 Mart Raudsepp
2018-05-29 20:54 Sobhan Mohammadpour
2018-01-12 13:48 Dennis Lamm
2016-05-19 6:34 Priit Laes
2016-04-02 11:36 Ole Reifschneider
2016-02-26 19:24 Priit Laes
2016-01-18 16:10 Priit Laes
2015-12-20 7:10 Priit Laes
2015-11-27 12:41 Priit Laes
2015-10-29 5:37 Priit Laes
2015-09-21 19:54 Ole Reifschneider
2015-09-15 18:13 Priit Laes
2015-06-08 21:17 Gilles Dartiguelongue
2015-05-12 22:20 Gilles Dartiguelongue
2015-05-10 17:20 Gilles Dartiguelongue
2015-04-14 18:10 Priit Laes
2015-03-27 5:52 Priit Laes
2015-03-16 18:22 Priit Laes
2015-03-04 5:57 git@oystercatcher mirror+tproxy
2015-03-04 5:57 Priit Laes
2015-02-17 19:02 Alexandre Rostovtsev
2015-02-17 7:05 Priit Laes
2015-01-29 16:49 Priit Laes
2014-12-23 5:44 Priit Laes
2014-11-28 17:08 Priit Laes
2014-11-13 12:53 Priit Laes
2014-10-05 5:44 Priit Laes
2014-10-04 7:49 Priit Laes
2014-09-24 18:39 Priit Laes
2014-08-26 4:46 Priit Laes
2014-07-30 6:42 Priit Laes
2014-08-22 6:16 ` Priit Laes
2014-06-23 10:07 Priit Laes
2014-04-22 21:53 Gilles Dartiguelongue
2014-04-21 14:40 Gilles Dartiguelongue
2014-04-11 12:34 Priit Laes
2014-03-20 7:22 Priit Laes
2014-03-03 12:32 Priit Laes
2014-02-12 20:58 Gilles Dartiguelongue
2014-02-03 6:47 Priit Laes
2014-01-18 10:26 Priit Laes
2013-12-22 20:26 Gilles Dartiguelongue
2013-12-12 23:21 Gilles Dartiguelongue
2013-11-16 14:53 Gilles Dartiguelongue
2013-11-13 13:15 Priit Laes
2013-09-17 12:33 Priit Laes
2013-08-20 5:20 Priit Laes
2013-07-29 8:20 Priit Laes
2013-07-12 11:48 Priit Laes
2013-03-17 22:39 Priit Laes
2013-03-17 14:32 Priit Laes
2013-03-05 13:47 Priit Laes
2013-03-03 15:07 Priit Laes
2013-02-10 20:47 Alexandre Rostovtsev
2012-12-19 8:38 Alexandre Rostovtsev
2012-11-21 18:56 Priit Laes
2012-10-17 8:58 Alexandre Rostovtsev
2012-09-22 18:03 Nirbheek Chauhan
2012-09-08 8:43 Nirbheek Chauhan
2012-08-25 15:05 Priit Laes
2012-08-24 17:24 Priit Laes
2012-08-08 20:48 Priit Laes
2012-04-02 5:34 Alexandre Restovtsev
2012-03-26 11:37 Priit Laes
2011-09-05 0:12 Mart Raudsepp
2011-04-29 12:47 Nirbheek Chauhan
2011-04-17 21:28 Gilles Dartiguelongue
2011-03-24 2:52 Nirbheek Chauhan
2011-03-19 14:09 Nirbheek Chauhan
2011-02-21 21:20 Nirbheek Chauhan
2011-02-15 19:52 Nirbheek Chauhan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1423582636.e3139cecbd4940059c2387f93c8508727abc4e25.plaes@gentoo \
--to=plaes@plaes.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox