[gentoo-commits] proj/gnome:master commit in: mail-client/evolution/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Ole Reifschneider" <tranquility@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: mail-client/evolution/
Date: Mon, 21 Sep 2015 19:54:15 +0000 (UTC)	[thread overview]
Message-ID: <1442865247.6f76c969e6f0a4b07cac14d8d81386d5c2425997.tranquility@gentoo> (raw)

commit:     6f76c969e6f0a4b07cac14d8d81386d5c2425997
Author:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 19:54:07 2015 +0000
Commit:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 19:54:07 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=6f76c969

mail-client/evolution: Sync with tree version

Package-Manager: portage-2.2.20.1
Manifest-Sign-Key: 7E8B4D42

 mail-client/evolution/evolution-3.17.92.ebuild | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/mail-client/evolution/evolution-3.17.92.ebuild b/mail-client/evolution/evolution-3.17.92.ebuild
index b17f476..a92ad4e 100644
--- a/mail-client/evolution/evolution-3.17.92.ebuild
+++ b/mail-client/evolution/evolution-3.17.92.ebuild
@@ -7,9 +7,6 @@ GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
 inherit eutils flag-o-matic readme.gentoo gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
 HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
@@ -18,18 +15,11 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
 LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
 SLOT="2.0"
 IUSE="+bogofilter crypt highlight ldap map spamassassin spell ssl +weather"
-if [[ ${PV} = 9999 ]]; then
-	IUSE="${IUSE} doc"
-	KEYWORDS=""
-else
-	# Needs x11-libs/libcryptui keyworded
-	#KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-	KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-fi
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 
 # 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[qt4] )"
+PINENTRY_DEPEND="|| ( app-crypt/pinentry[gnome-keyring] 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
@@ -39,7 +29,7 @@ PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] )"
 COMMON_DEPEND="
 	>=app-crypt/gcr-3.4
 	>=app-text/enchant-1.1.7
-	>=dev-libs/glib-2.40:2
+	>=dev-libs/glib-2.40:2[dbus]
 	>=dev-libs/libxml2-2.7.3:2
 	>=gnome-base/gnome-desktop-2.91.3:3=
 	>=gnome-base/gsettings-desktop-schemas-2.91.92
@@ -114,15 +104,11 @@ file from /usr/share/applications if you use a different browser)."
 src_prepare() {
 	# Fix relink issues in src_install
 	ELTCONF="--reverse-deps"
-
 	gnome2_src_prepare
-
 }
 
 src_configure() {
 	# Use NSS/NSPR only if 'ssl' is enabled.
-	local myconf
-	[[ ${PV} != 9999 ]] && myconf="${myconf} ITSTOOL=$(type -P true)"
 	gnome2_src_configure \
 		--without-glade-catalog \
 		--disable-autoar \
@@ -143,8 +129,7 @@ src_configure() {
 			--without-nspr-includes
 			--without-nss-libs
 			--without-nss-includes") \
-		$(use_enable weather) \
-		${myconf}
+		$(use_enable weather)
 }
 
 src_install() {

next             reply	other threads:[~2015-09-21 19:54 UTC|newest]

Thread overview: 73+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-21 19:54 Ole Reifschneider [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-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-02-10 15:37 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

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:b17f476 dfblob:a92ad4e )
 OR (
bs:"[gentoo-commits] proj/gnome:master commit in: mail-client/evolution/" )
	(help)

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=1442865247.6f76c969e6f0a4b07cac14d8d81386d5c2425997.tranquility@gentoo \
    --to=tranquility@gentoo.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