mail-client/evolution: Bump version to 3.20.0

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

3 files changed, 23 insertions, 12 deletions

diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 2d38b941..1ea51e0c 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1 +1,15 @@
-DIST evolution-3.19.90.tar.xz 12114144 SHA256 fb12dbe6f1a019d0d39d462565922633ad11e6aee5d1bf63e181d786e5061b4e SHA512 f947c87a07696b0c86bcf4c61af03430b9500cc129bf3d8cd5525173c83198bfe3e6f57dd9b4df518707746754c4008f991fb939b80730fa6190756197a322db WHIRLPOOL e0c570754b63d3f5969933d3feb05e9b547c68b00cd65e625bf074774add0e2b8f66e2e24d76472a1e58870c53ca2a2ff2e0a76a49df1980845175b92ba98376
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST evolution-3.20.0.tar.xz 12114388 SHA256 6bd0cc0c077363a29026a5194062d981d0b0aa9ffea9e7ffcec1f1fdbe9b502e SHA512 27f16d5248d699e717d4e0c18766881164f7894f37cf6751af413c4f41ba424e6c79ab23ac0ffea261dc0a4220ffd26ba45afad72e979c1be65c7fd13383df18 WHIRLPOOL e97c3c961855458fa25a1d33fe3b4b6a2d3e42268ed6e1ba8c231cbaeaa28b9e8f8b284c99e169e8eadcd047a553c61d857750d97e8f795f30869c9c5bc9dff1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJW/6kZAAoJEOnlaGd+i01CQEgH/jqH3lGjnHDs9VxC0IGZawcN
+W9eRM7gBWwx0UYlWK8uIUA8B/k/FWhsc/vlCS2swneaBHreElkdQrn5d2UlcvqRQ
+tYtCf4qAYYvOkmNxm5sh5vPzwFQ68hfpv+yVro1odIMtvBMdp3yZiJsyWnqrVrTL
+ovLgsQVFpZbfsOnQ6Gdd+NZc7GABcoSZ9krdLsqLR5a0EU94ldA0T5WIswOnNPLg
+EN8W+VUV9I7XE57WPw/GI+e/kOHsS1Xxluol3AKmP+WlW9uDSNZqEXlBRGlx10zC
+q0asLt7rdT2kbI55wzl7qWigVHR4CTbbhCo8EkqcWknlSFdykDCdetn1fsZpWWY=
+=JHcd
+-----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-3.19.90.ebuild b/mail-client/evolution/evolution-3.20.0.ebuild
index a92ad4ec..6691e046 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 b17f4768..476b39b6 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