gentoo Easter resync : 12.04.2020

4 files changed, 200 insertions, 2 deletions

diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index 91c220a882f1..78cb416bfed9 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -1,4 +1,8 @@
 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-r3.ebuild 2457 BLAKE2B 4ff5bd930fd5d35e3e92cfa2c6420e3dad6eb82d10e31de702fd40c3352e6df3c466488eac7a11a57a2e4a494c6c61de0e46b5572beee334b013261b49508908 SHA512 a9fc4f464c2fed900cb45554c717ee30dab3773c14c9e5acb17add14cdcb2a256cc41b026ad1c252af381498523593eaea9ca04985d236cf9be89e456db99c45
+DIST geary-3.36.0.tar.xz 2393620 BLAKE2B 06b06a948c0932f24fd3cbb70727d9fa1746dc506c80b29f100524a6b8adbfccadee5c3d5b6524c98ed6f902e68bd3151d3c3246cce4c2a825d9e99efa7a9fed SHA512 aefc29e64acc8e4416eb213de8948b6d51dc12f1087b9376ddc8e4991efc171b36c35868043ab3159eef614916da82c046222c5ea6256b51cbc72bce9cfec7d6
+DIST geary-3.36.1.tar.xz 2400548 BLAKE2B 84240b7b5b80e6172e875d46554caca5d3a10f85965f65916603a4dcf3ada8ed8a23f6c1e2ceb64922e0eaa072122bd41b22bbc2f37b35b2205f703f49887a4b SHA512 7d5812ece5f5315245237a57de26475c4db58c4bdcce4399a3d304e25d60093dfbe1332764e056f94bf754b19be2279d0b4237b628746202b6f5dc5755b11ca8
+EBUILD geary-3.34.2-r3.ebuild 2457 BLAKE2B b4da362c07451eee20fc077cb00d15ccdd32bfd268e1f6c3bdbe83c7f40570cd0d3e816668f9aaff329d2f8a93cb26d1423e29ce5bedb8886ceb24dfa34d0967 SHA512 f4a1cc7beaecb909d40bccaef7ddba3b2ab31e470b1ee464f24babec73cc8ced654a8ad079b8654130dda616fd746acefb33052526b7fddc1d7179732c86a7a9
+EBUILD geary-3.36.0.ebuild 2160 BLAKE2B fbc152a4e94a5e88d40f9c46f9eae3dc49b8782250ebde0c4ad97948b5673c56e7ddbf733f3be6ccea603b095e53a0053149d158f39dcb6bef2e477f104333d1 SHA512 76200d101db664dc30783cdb3458e21af71836f83d6cebce4972b1c339ef59de0021be1e026a155eaefaded5e786b02d3845233c628c83bac0da55e8d9a36811
+EBUILD geary-3.36.1.ebuild 2160 BLAKE2B fbc152a4e94a5e88d40f9c46f9eae3dc49b8782250ebde0c4ad97948b5673c56e7ddbf733f3be6ccea603b095e53a0053149d158f39dcb6bef2e477f104333d1 SHA512 76200d101db664dc30783cdb3458e21af71836f83d6cebce4972b1c339ef59de0021be1e026a155eaefaded5e786b02d3845233c628c83bac0da55e8d9a36811
 MISC metadata.xml 379 BLAKE2B de51f9dc4d75156955aa9f9d16396c237f9d0b9f130927806fb9f1de02566d5177a5eee7745bd487713af9c5320501fd47ff56d05b7d4dc906be0968328950f9 SHA512 8236050dbebf0f0e023e12280f6d62326817f142175c388eadb90963d2d7dc79a5efbcc7b4d705fc9c1de8276fafff228ef2c5392fe4aa53ea63cfbad03948c3
diff --git a/mail-client/geary/geary-3.34.2-r3.ebuild b/mail-client/geary/geary-3.34.2-r3.ebuild
index fae66e3a724e..60b478449778 100644
--- a/mail-client/geary/geary-3.34.2-r3.ebuild
+++ b/mail-client/geary/geary-3.34.2-r3.ebuild
@@ -42,7 +42,7 @@ DEPEND="
 	>=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
+	>=sys-libs/libunwind-1.1:0
 	>=dev-libs/libxml2-2.7.8:2
 	ytnef? ( >=net-mail/ytnef-1.9.3 )
 "
diff --git a/mail-client/geary/geary-3.36.0.ebuild b/mail-client/geary/geary-3.36.0.ebuild
new file mode 100644
index 000000000000..53757eb75165
--- /dev/null
+++ b/mail-client/geary/geary-3.36.0.ebuild
@@ -0,0 +1,97 @@
+# 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
+
+# >=webkit-gtk-2.26.4-r1 and >=gspell-1.7 dep to ensure all libraries used use enchant:2
+DEPEND="
+	>=dev-libs/glib-2.60.4:2
+	>=x11-libs/gtk+-3.24.7:3
+	>=net-libs/webkit-gtk-2.26.4-r1:4=
+	>=dev-libs/gmime-3.2.4:3.0
+	>=dev-db/sqlite-3.24:3
+
+	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
+	>=gui-libs/libhandy-0.0.10:0.0=
+	>=dev-libs/libpeas-1.24.0
+	>=app-crypt/libsecret-0.11
+	>=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
+
+	$(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]
+	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=(
+		-Dcontractor=false
+		-Dlibunwind_optional=false # TODO: Automagical if optional=true
+		-Dpoodle=true
+		$(meson_use ytnef tnef-support)
+		-Dvaladoc=false
+		-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
+}
diff --git a/mail-client/geary/geary-3.36.1.ebuild b/mail-client/geary/geary-3.36.1.ebuild
new file mode 100644
index 000000000000..53757eb75165
--- /dev/null
+++ b/mail-client/geary/geary-3.36.1.ebuild
@@ -0,0 +1,97 @@
+# 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
+
+# >=webkit-gtk-2.26.4-r1 and >=gspell-1.7 dep to ensure all libraries used use enchant:2
+DEPEND="
+	>=dev-libs/glib-2.60.4:2
+	>=x11-libs/gtk+-3.24.7:3
+	>=net-libs/webkit-gtk-2.26.4-r1:4=
+	>=dev-libs/gmime-3.2.4:3.0
+	>=dev-db/sqlite-3.24:3
+
+	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
+	>=gui-libs/libhandy-0.0.10:0.0=
+	>=dev-libs/libpeas-1.24.0
+	>=app-crypt/libsecret-0.11
+	>=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
+
+	$(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]
+	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=(
+		-Dcontractor=false
+		-Dlibunwind_optional=false # TODO: Automagical if optional=true
+		-Dpoodle=true
+		$(meson_use ytnef tnef-support)
+		-Dvaladoc=false
+		-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
+}