gentoo resync : 05.02.2020

3 files changed, 106 insertions, 3 deletions

diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index dbe603c578b1..c39660fb0fcb 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -1,4 +1,5 @@
 AUX 3.34.2-fix-ytnef-automagic.patch 1049 BLAKE2B ae3de0dfeb13ddfb7fe73b72321bc374666edfe4dcf44e9a9f4338efff801137f6ba0f10d32c8532ed0c4d926bf8a8f0ee94bf2b5a53b903ec3f676baba8b4d0 SHA512 a14e61d0f0201074b3c476cdbfd4bf994f1660a2ca28147071fe84ad7ad36fa77cb003b30d6ebf03496bc5cb045f4dc5e4ec08341b13b0bf767d5f36212f5952
 DIST geary-3.34.2.tar.xz 2411940 BLAKE2B 61c0f69b3327c487530180544bbe13d131e4236d6a205db90278b75e839294923176b41d423a52d18c5b36b6dda7865ddbaf4e929260c2c845a69a6527b4fae9 SHA512 d34886829e1330bfe7fe4891b5e368010f5742a5ac20ab057a902897df1f6c4145a882379d9dbe82e0c954a91db265b9758ddd2eb96b9c03c0efc0f6d8cc6ea0
-EBUILD geary-3.34.2-r1.ebuild 2329 BLAKE2B 229aeae7885ced009ca956b36a29a03495c17723785964439c1e93520ad0e848b01917f71752c3a6636deeb036c6ad49930ddb03d2ce0d402cc6e5748cb4cc5a SHA512 693634244f721095be537eb30816ea77db41fe01ea69e493160deb2d793fad14ed0d07dbc7251cf899f4937e5df0e3eb85ba3e1d66198ceed1f719ea561706dc
+EBUILD geary-3.34.2-r1.ebuild 2333 BLAKE2B 7d60bddd03e418c11396f32e84dfad1f9c9809f3a357a4bdd0a3d7049e9cdb3c7f19c918df14f5cc93a6ad546aa16e13f64334fe80dc14f9c8220486190a2764 SHA512 64e44fe6213a13c0971cb22e2ceae0786e823bb3f1620d3c33a42a15b279aa4d48a8faa6f99b73c1a76fdb1ba7dfa9ea6b46a641ab5d7fb642aab22ae50f7216
+EBUILD geary-3.34.2-r3.ebuild 2457 BLAKE2B 1783570d31fc60f54069945faa3fdd2207002931fa6e0073e771da8f5fe2c12ddc2aa32f001e622263c99c43b0ea30f0bc2659febea2ffb665980ff4a505e7e8 SHA512 86811da7415705d0d42a991581d38d4abef5457cb0cd704ae24237bbb98412af7ff3b4de7a7c659ec5f016a575e4bea26170c581f14d09ad70167ecddadc65fd
 MISC metadata.xml 379 BLAKE2B de51f9dc4d75156955aa9f9d16396c237f9d0b9f130927806fb9f1de02566d5177a5eee7745bd487713af9c5320501fd47ff56d05b7d4dc906be0968328950f9 SHA512 8236050dbebf0f0e023e12280f6d62326817f142175c388eadb90963d2d7dc79a5efbcc7b4d705fc9c1de8276fafff228ef2c5392fe4aa53ea63cfbad03948c3
diff --git a/mail-client/geary/geary-3.34.2-r1.ebuild b/mail-client/geary/geary-3.34.2-r1.ebuild
index bdeb8150e879..817ed0bc2e8c 100644
--- a/mail-client/geary/geary-3.34.2-r1.ebuild
+++ b/mail-client/geary/geary-3.34.2-r1.ebuild
@@ -30,12 +30,12 @@ DEPEND="
 	>=dev-db/sqlite-3.12:3
 
 	>=dev-libs/appstream-glib-0.7.10
-	app-text/enchant
+	app-text/enchant:=
 	>=dev-libs/folks-0.11:0
 	>=app-crypt/gcr-3.10.1:0=
 	>=dev-libs/libgee-0.8.5:0.8=
 	net-libs/gnome-online-accounts
-	app-text/gspell
+	app-text/gspell:=
 	app-text/iso-codes
 	>=dev-libs/json-glib-1.0
 	>=media-libs/libcanberra-0.28
diff --git a/mail-client/geary/geary-3.34.2-r3.ebuild b/mail-client/geary/geary-3.34.2-r3.ebuild
new file mode 100644
index 000000000000..dc4d077d3cdb
--- /dev/null
+++ b/mail-client/geary/geary-3.34.2-r3.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.44"
+
+inherit gnome.org gnome2-utils meson vala virtualx xdg
+
+DESCRIPTION="A lightweight, easy-to-use, feature-rich email client"
+HOMEPAGE="https://wiki.gnome.org/Apps/Geary"
+
+LICENSE="LGPL-2.1+ BSD-2 CC-BY-3.0 CC-BY-SA-3.0" # code is LGPL-2.1+, BSD-2 for bundled snowball-stemmer, CC licenses for some icons
+SLOT="0"
+
+IUSE="ytnef"
+
+KEYWORDS="~amd64 ~x86"
+
+# for now both enchants work, but ensuring enchant:2
+# FIXME: add valadoc support
+
+# >=webkit-gtk-2.26.3-r1 and >=gspell-1.7 dep to ensure all libraries used use enchant:2
+# >=webkit-gtk-2.26 dep to ensure HAS_WEBKIT_SHARED_PROC is handled for it;
+# If not, it could be compiled against 2.24 and then webkit-gtk upgraded and
+# geary not rebuilt, ending up in geary issues #558 and #559 still.
+DEPEND="
+	>=dev-libs/glib-2.54:2
+	>=x11-libs/gtk+-3.24.7:3
+	>=net-libs/webkit-gtk-2.26.3-r1:4=
+	>=dev-libs/gmime-2.6.17:2.6
+	>=dev-db/sqlite-3.12:3
+
+	>=dev-libs/appstream-glib-0.7.10
+	app-text/enchant:2
+	>=dev-libs/folks-0.11:0
+	>=app-crypt/gcr-3.10.1:0=
+	>=dev-libs/libgee-0.8.5:0.8=
+	net-libs/gnome-online-accounts
+	>=app-text/gspell-1.7:=
+	app-text/iso-codes
+	>=dev-libs/json-glib-1.0
+	>=media-libs/libcanberra-0.28
+	>=gui-libs/libhandy-0.0.9:0.0=
+	>=app-crypt/libsecret-0.11
+	>=net-libs/libsoup-2.48:2.4
+	>=sys-libs/libunwind-1.1:7
+	>=dev-libs/libxml2-2.7.8:2
+	ytnef? ( >=net-mail/ytnef-1.9.3 )
+"
+RDEPEND="${DEPEND}
+	gnome-base/gsettings-desktop-schemas
+"
+BDEPEND="
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+
+	$(vala_depend)
+	x11-libs/gtk+:3[introspection]
+	net-libs/webkit-gtk:4[introspection]
+	app-crypt/gcr:0[introspection,vala]
+	dev-libs/libgee:0.8[introspection]
+	app-text/gspell[vala]
+	app-crypt/libsecret[introspection,vala]
+	net-libs/libsoup:2.4[introspection,vala]
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-ytnef-automagic.patch # https://gitlab.gnome.org/GNOME/geary/merge_requests/390
+)
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dvaladoc=false
+		-Dcontractor=false
+		-Dpoodle=true
+		-Dlibunwind_optional=false # TODO: Automagical if optional=true
+		$(meson_use ytnef tnef-support)
+		-Dprofile=default
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}