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

["Mart Raudsepp" <leio@gentoo.org>]

commit:     6a6f11ede87b506422198ab51026eaf9ff362f64
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 22 17:19:14 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Feb 22 18:02:37 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a6f11ed

mail-client/evolution: bump to 3.30.5

Closes: https://bugs.gentoo.org/678064
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 mail-client/evolution/Manifest                     |  1 +
 mail-client/evolution/evolution-3.26.6.ebuild      |  3 ++-
 ...ution-3.26.6.ebuild => evolution-3.30.5.ebuild} | 26 +++++++++-------------
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 5aebada0129..46415d2e0b6 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,2 +1,3 @@
 DIST evolution-3.24.6.tar.xz 12153692 BLAKE2B ced20d9e08f6b9aac65be6f5ecd5beb861feec40dddc4411b1bdc6519e249de8db8b3319450808d7a31b80386f9830f351b7edacb3c6fcd28fe5fdfe343329f7 SHA512 da5c9062791996735e52575894763597cc957cb17bc0abe46a966f0e3e6706550ce534ae03b2c444d142547119f3a59aec6ee17e0302a002d8437da166ef7178
 DIST evolution-3.26.6.tar.xz 12036120 BLAKE2B b0828f172935ce75bad6e2fa9859b65e96f8b8369d8f2c4b836ef9dd992168dcdca256df4aa0577117819f8d21da3976b338fb66b75f0e2511b7f1d23712befa SHA512 34a6f3ec12c6330c2b742281030f641a0998293663d3c2ac4151eef24067ff95403fec37550be2d8d22e43e334b4349f1ece40b75cc23b1dfcec88a9a694363f
+DIST evolution-3.30.5.tar.xz 11995960 BLAKE2B 4a2ac539e88467148dd3be2bf2607be55ea39dfb0ceb89183a6f4fa3ee66c1973690c4e540a7405743c202aa777ad9aa147600390e909ffc93cb2dae1ebb62d9 SHA512 1d776fdb0da4166d9346ad4cd05d7ee050e0bf3ac1edc1f7d3fb4ba8909e35429e8d076a5b6e223f3fc94e2a8ad6337205c1d648220a3fdf593bae64d9c975d1

diff --git a/mail-client/evolution/evolution-3.26.6.ebuild b/mail-client/evolution/evolution-3.26.6.ebuild
index 439aa36d847..7ffea1371ae 100644
--- a/mail-client/evolution/evolution-3.26.6.ebuild
+++ b/mail-client/evolution/evolution-3.26.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -72,6 +72,7 @@ DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
+	dev-util/itstool
 	gtk-doc? ( dev-util/gtk-doc )
 	>=dev-util/intltool-0.40.0
 	>=sys-devel/gettext-0.18.3

diff --git a/mail-client/evolution/evolution-3.26.6.ebuild b/mail-client/evolution/evolution-3.30.5.ebuild
similarity index 86%
copy from mail-client/evolution/evolution-3.26.6.ebuild
copy to mail-client/evolution/evolution-3.30.5.ebuild
index 439aa36d847..f46ab547f59 100644
--- a/mail-client/evolution/evolution-3.26.6.ebuild
+++ b/mail-client/evolution/evolution-3.30.5.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-GNOME2_LA_PUNT="yes"
 
 inherit cmake-utils gnome2 flag-o-matic readme.gentoo-r1
 
@@ -13,21 +12,18 @@ 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="archive +bogofilter crypt geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
+IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
 
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 
-# 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[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] app-crypt/pinentry[qt5] )"
-
 # glade-3 support is for maintainers only per configure.ac
 # pst is not mature enough and changes API/ABI frequently
 # dconf explicitely needed for backup plugin
 # gnome-desktop support is optional with --enable-gnome-desktop
+# automagic libunity dep
 COMMON_DEPEND="
 	>=app-crypt/gcr-3.4:=[gtk]
-	>=app-text/enchant-1.1.7
+	>=app-text/enchant-1.6.0:0
 	>=dev-libs/glib-2.46:2[dbus]
 	>=dev-libs/libxml2-2.7.3:2
 	>=gnome-base/gnome-desktop-2.91.3:3=
@@ -38,22 +34,18 @@ COMMON_DEPEND="
 	>=net-libs/webkit-gtk-2.16.0:4
 	>=x11-libs/cairo-1.9.15:=[glib]
 	>=x11-libs/gdk-pixbuf-2.24:2
-	>=x11-libs/gtk+-3.10:3
+	>=x11-libs/gtk+-3.22:3
 	>=x11-libs/libnotify-0.7:=
 	>=x11-misc/shared-mime-info-0.22
 
 	>=app-text/iso-codes-0.49
 	dev-libs/atk
 	gnome-base/dconf
-	dev-libs/libical:=
+	>=dev-libs/libical-3.0.2:=
 	x11-libs/libSM
 	x11-libs/libICE
 
 	archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
-	crypt? (
-		>=app-crypt/gnupg-1.4
-		${PINENTRY_DEPEND}
-		x11-libs/libcryptui )
 	geolocation? (
 		>=media-libs/libchamplain-0.12:0.12[gtk]
 		>=media-libs/clutter-1.0.0:1.0
@@ -72,7 +64,9 @@ DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
-	gtk-doc? ( dev-util/gtk-doc )
+	dev-util/itstool
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
 	>=dev-util/intltool-0.40.0
 	>=sys-devel/gettext-0.18.3
 	virtual/pkgconfig
@@ -113,10 +107,10 @@ src_configure() {
 		-DWITH_OPENLDAP=$(usex ldap)
 		-DENABLE_SMIME=$(usex ssl)
 		-DENABLE_GNOME_DESKTOP=ON
+		-DWITH_ENCHANT_VERSION=1
 		-DENABLE_CANBERRA=ON
 		-DENABLE_AUTOAR=$(usex archive)
 		-DWITH_HELP=ON
-		-DENABLE_LIBCRYPTUI=$(usex crypt)
 		-DENABLE_YTNEF=OFF
 		-DWITH_BOGOFILTER=$(usex bogofilter)
 		-DWITH_SPAMASSASSIN=$(usex spamassassin)