gentoo resync : 28.04.2021

3 files changed, 105 insertions, 2 deletions

diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index c51921559fec..f81c28c71bbf 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -1,3 +1,5 @@
 DIST geary-3.36.3.1.tar.xz 2426684 BLAKE2B 0e52b11d515c072c610f60070f3634f98a8f89f8580ee9e59a6eca8144680c616c0984d31ad6f3a0044c08fe6a1f2b45065059561c20c9c796403d2eb088f567 SHA512 c1c659cbadbdcb4cedefb0db7c5548af55cd07c30bc4acafb96e69faa6b730a2c5ba06abceedc409fddd9768249600ebc7643b9cfe2175e6d4d2d7926a55dbb6
-EBUILD geary-3.36.3.1.ebuild 2295 BLAKE2B 933fb1184020a653010d4fd9e327cdb9e96bca5dd5d45ea42e70cb957f0fa7ca9c707aa3fb8c5ab4b892735a47dca80d2bdc9417dd8c1b1a41a6bfaa06540127 SHA512 480f78e3e5cf06d3c8dc56ab0c4c595d8632904f60cd8cda46be8e634ba15bffc7160ce700f36100e9b18280562c421cdffededf52e3cdacde93a84124581c14
+DIST geary-40.0.tar.xz 2490940 BLAKE2B 67ff23f9a6f4760947b5d9ac3167ffb91539af7e0afbde2c6bc7b35adbf286868f24ed74b932412e9c039ab4e2e71b4162e08e8bd31fa3abc02d10fb9c1ce47d SHA512 d31716121be63a9d39caf4bffacce0109cebcc8048127c37fac6969b4103ab2cf12aac9bed73623b0f3baf7f39996b8f0b0fe9b57968054d51ae3e209f6b1522
+EBUILD geary-3.36.3.1.ebuild 2296 BLAKE2B 3b43855b9936494706d437ecff9c9827c29ab5319ba760f781d17c286363c2d01fce20b0b4eaf33950c7122f673f9a065164e8ce1a65e40beb4550482ddbe352 SHA512 446b14522fb718c59192cd71818947bde3b13ff523a8fa80ac082348a64e74a3e63cdd3ec05d55a17c6c9d1fdd3dcfdb25f4ab66891ceaf02f53b7521fd926c6
+EBUILD geary-40.0.ebuild 2161 BLAKE2B e7e91befa7956fe45a69f8fa379a727830e0916d5cd2c20d2b86671d26b83b79ed80c9da8fd83068887e620d0c4ebb6aedb4039a556aef141fce97ed1f33895f SHA512 cfc4cb3337f48419b5074900229354bfbd48a79403d148f5f22949dc1cb8d5908aab13b4e03e6271ea9881d12469a05a52959343b87f46b209088e82f8986a30
 MISC metadata.xml 379 BLAKE2B de51f9dc4d75156955aa9f9d16396c237f9d0b9f130927806fb9f1de02566d5177a5eee7745bd487713af9c5320501fd47ff56d05b7d4dc906be0968328950f9 SHA512 8236050dbebf0f0e023e12280f6d62326817f142175c388eadb90963d2d7dc79a5efbcc7b4d705fc9c1de8276fafff228ef2c5392fe4aa53ea63cfbad03948c3
diff --git a/mail-client/geary/geary-3.36.3.1.ebuild b/mail-client/geary/geary-3.36.3.1.ebuild
index 071e4c68efe2..ba85b8c96c63 100644
--- a/mail-client/geary/geary-3.36.3.1.ebuild
+++ b/mail-client/geary/geary-3.36.3.1.ebuild
@@ -28,7 +28,7 @@ DEPEND="
 	>=dev-db/sqlite-3.24:3
 
 	app-text/enchant:2
-	>=dev-libs/folks-0.11:0
+	>=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
diff --git a/mail-client/geary/geary-40.0.ebuild b/mail-client/geary/geary-40.0.ebuild
new file mode 100644
index 000000000000..94e38338434e
--- /dev/null
+++ b/mail-client/geary/geary-40.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.48"
+
+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+ CC-BY-3.0 CC-BY-SA-3.0" # code is LGPL-2.1+, CC licenses for some icons
+SLOT="0"
+IUSE="ytnef"
+KEYWORDS="~amd64 ~x86"
+
+# >=gspell-1.7 dep to ensure all libraries used use enchant:2
+DEPEND="
+	>=dev-libs/glib-2.66:2
+	>=x11-libs/gtk+-3.24.23:3
+	>=net-libs/webkit-gtk-2.30:4=
+	>=dev-libs/gmime-3.2.4:3.0
+	>=dev-db/sqlite-3.24:3
+
+	x11-libs/cairo[glib]
+	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
+	media-libs/gsound
+	>=app-text/gspell-1.7:=
+	>=dev-libs/icu-60:=
+	app-text/iso-codes
+	>=dev-libs/json-glib-1.0
+	>=gui-libs/libhandy-1.2.1:1=
+	>=dev-libs/libpeas-1.24.0[gtk]
+	>=app-crypt/libsecret-0.11
+	dev-libs/snowball-stemmer
+	>=net-libs/libsoup-2.48:2.4
+	>=sys-libs/libunwind-1.1:0
+	>=dev-libs/libxml2-2.7.8:2
+	ytnef? ( >=net-mail/ytnef-1.9.3 )
+"
+RDEPEND="${DEPEND}
+	gnome-base/gsettings-desktop-schemas
+"
+BDEPEND="
+	>=dev-libs/appstream-glib-0.7.10
+	dev-libs/libxml2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	net-libs/gnutls[tools]
+
+	$(vala_depend)
+	x11-libs/gtk+:3[introspection]
+	net-libs/webkit-gtk:4[introspection]
+	dev-libs/gmime:3.0[vala]
+	app-crypt/gcr:0[introspection,vala]
+	dev-libs/libgee:0.8[introspection]
+	media-libs/gsound[vala]
+	app-text/gspell[vala]
+	gui-libs/libhandy:0.0[vala]
+	app-crypt/libsecret[introspection,vala]
+	net-libs/libsoup:2.4[introspection,vala]
+"
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dprofile=development
+		-Drevno="${PR}"
+		-Dvaladoc=disabled
+		-Dcontractor=disabled
+		-Dlibunwind=disabled
+		$(meson_feature ytnef tnef)
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	unset GSETTINGS_BACKEND
+
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}