3 files changed, 7 insertions, 109 deletions
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index bc93c30df6d6..fe4f983502ce 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -1,5 +1,3 @@
-DIST geary-3.36.3.1.tar.xz 2426684 BLAKE2B 0e52b11d515c072c610f60070f3634f98a8f89f8580ee9e59a6eca8144680c616c0984d31ad6f3a0044c08fe6a1f2b45065059561c20c9c796403d2eb088f567 SHA512 c1c659cbadbdcb4cedefb0db7c5548af55cd07c30bc4acafb96e69faa6b730a2c5ba06abceedc409fddd9768249600ebc7643b9cfe2175e6d4d2d7926a55dbb6
 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 2164 BLAKE2B b41db4f0b6c32c71f335a99daa84f586f6cb581a1f81e1c53e36853084ad8b1799277b67ee6152ba3fddd5d165e40139fd4cdc2ca2458b377b5674ac3f5e1402 SHA512 e38bc708814c115a7bd713cb0052fdfdd941857dd33c1a24a339c7db8a0cb8a189a85bc91a2585f43546162e0fca918fb61410f2b089d72d981a36809c2842cd
+EBUILD geary-40.0.ebuild 2168 BLAKE2B e2dcf2859dbdf2b668b3f98c5b16e3129baa9653119e8f7c5b4cc32dc817d533c84974044e51852a28d2f9347ec596533b848d0196825dac72a45ae5c03f9935 SHA512 73a0e211f4f7d3e9431e7eb2d8688be0a0a087e4679f517ff8fa8da547cf35a2d9c0d79e121b75505263f7e00be6c5d0f11e908e338d47886adab505d232cfce
 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
deleted file mode 100644
index ba85b8c96c63..000000000000
--- a/mail-client/geary/geary-3.36.3.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.44"
-VALA_MAX_API_VERSION="0.48" # fails tests with 0.50 in v3.36.3.1 - https://gitlab.gnome.org/GNOME/geary/-/issues/958
-
-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
-		-Drevno="${PR}"
-	)
-
-	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-40.0.ebuild b/mail-client/geary/geary-40.0.ebuild
index dedc83017955..5fa9874aafe5 100644
--- a/mail-client/geary/geary-40.0.ebuild
+++ b/mail-client/geary/geary-40.0.ebuild
@@ -11,7 +11,8 @@ 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"
+IUSE="test ytnef"
+RESTRICT="!test? ( test )"
 KEYWORDS="~amd64 ~arm64 ~x86"
 
 # >=gspell-1.7 dep to ensure all libraries used use enchant:2
@@ -38,7 +39,6 @@ DEPEND="
 	>=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 )
 "
@@ -51,7 +51,7 @@ BDEPEND="
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
-	net-libs/gnutls[tools]
+	test? ( net-libs/gnutls[tools] )
 
 	$(vala_depend)
 	x11-libs/gtk+:3[introspection]
@@ -61,14 +61,15 @@ BDEPEND="
 	dev-libs/libgee:0.8[introspection]
 	media-libs/gsound[vala]
 	app-text/gspell[vala]
-	gui-libs/libhandy:0.0[vala]
+	gui-libs/libhandy:1[vala]
 	app-crypt/libsecret[introspection,vala]
 	net-libs/libsoup:2.4[introspection,vala]
 "
 
 src_prepare() {
 	vala_src_prepare
-	xdg_src_prepare
+	gnome2_environment_reset
+	default
 }
 
 src_configure() {
@@ -85,8 +86,6 @@ src_configure() {
 }
 
 src_test() {
-	unset GSETTINGS_BACKEND
-
 	virtx meson_src_test
 }