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

[Ole Reifschneider]

commit:     b19e7810672d80e0adf09650eb00dc43e4815a0a
Author:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  2 11:12:26 2016 +0000
Commit:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Sat Apr  2 11:12:26 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=b19e7810

mail-client/evolution: Bump version to 3.20.0

Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE9E568677E8B4D42

 ...evolution-3.19.90.ebuild => evolution-3.20.0.ebuild} | 17 +++++++----------
 mail-client/evolution/evolution-9999.ebuild             |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/mail-client/evolution/evolution-3.19.90.ebuild b/mail-client/evolution/evolution-3.20.0.ebuild
similarity index 93%
rename from mail-client/evolution/evolution-3.19.90.ebuild
rename to mail-client/evolution/evolution-3.20.0.ebuild
index a92ad4e..6691e04 100644
--- a/mail-client/evolution/evolution-3.19.90.ebuild
+++ b/mail-client/evolution/evolution-3.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils flag-o-matic readme.gentoo gnome2
+inherit eutils flag-o-matic readme.gentoo-r1 gnome2
 
 DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
 HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
@@ -14,8 +14,10 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
 # Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
 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"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 
 # We need a graphical pinentry frontend to be able to ask for the GPG
 # password from inside evolution, bug 160302
@@ -33,7 +35,7 @@ COMMON_DEPEND="
 	>=dev-libs/libxml2-2.7.3:2
 	>=gnome-base/gnome-desktop-2.91.3:3=
 	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
+	>=gnome-extra/evolution-data-server-3.20.0:=[gtk,weather?]
 	>=media-libs/libcanberra-0.25[gtk3]
 	>=net-libs/libsoup-2.42:2.4
 	>=net-libs/webkit-gtk-2.2:3
@@ -71,6 +73,7 @@ DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40.0
+	dev-util/itstool
 	virtual/pkgconfig
 "
 # eautoreconf needs:
@@ -83,12 +86,6 @@ RDEPEND="${COMMON_DEPEND}
 	!gnome-extra/evolution-exchange
 "
 
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/yelp-tools
-		doc? ( >=dev-util/gtk-doc-1.14 )"
-fi
-
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
 ~/.local/share/applications/mimeapps.list so it includes the

diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild
index b17f476..476b39b 100644
--- a/mail-client/evolution/evolution-9999.ebuild
+++ b/mail-client/evolution/evolution-9999.ebuild
@@ -39,7 +39,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