6 files changed, 116 insertions, 6 deletions
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 3438fa122653..f49667ec1eb8 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index 390fe9622eb1..af0000185915 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -1,3 +1,6 @@
+AUX 40.0-Correct-the-conditional-comments-in-the-test-data.patch 1459 BLAKE2B 369acfc1401acefa1ae543eb840171dc821ef3f82080ec943efbb95bc50d1e96ff94dabf7b045c8e8099a3e124610975a1932125130f01fe24a74577ca91fde3 SHA512 03eb40f1ec3d17503f7ece68f03c48868a27265ef74fd7b2a8c2b6523f75b2155260db136ac4fab971292fd33c580a453b8b65664b4609442a700128e38f991f
+AUX 40.0-Fix-accessibility-issues-with-initializer-of-constan.patch 1386 BLAKE2B e7d0a5488a41c80e08073479bfb030148de6e0031532bc322073d71bf503e5c963a24ae7fec571ff0a21b3109d84933f0bef4d95a0d00d7cfd6e1fda98c10e71 SHA512 ef2b8435f13d1a5c144372f925cf6517eabf3db0f092eea04f1f0df9ef10cb1c9e6ff1ff7bb2f7c965789bd3dae7ed92cc4bc0cd1a1ce28c188b350506998df4
+AUX 40.0-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch 849 BLAKE2B 618a25a934d92c2ea4cb2c06d05ab99e9e6ecffc782bedc8de659b084a21d4ea6e37b13a8067b3d85e45d9b9b295843372c7eb988ee5fb67f849d7de0c36deef SHA512 e657bd88cf39d715190dbce1fb8d93df2c91e7f2b7c6d1dd4ed02d177e650195fd179f23440559e84b1f5dfd0ee35e9ea75cdd4a76810f2ebfa8db7b3f9280b2
 DIST geary-40.0.tar.xz 2490940 BLAKE2B 67ff23f9a6f4760947b5d9ac3167ffb91539af7e0afbde2c6bc7b35adbf286868f24ed74b932412e9c039ab4e2e71b4162e08e8bd31fa3abc02d10fb9c1ce47d SHA512 d31716121be63a9d39caf4bffacce0109cebcc8048127c37fac6969b4103ab2cf12aac9bed73623b0f3baf7f39996b8f0b0fe9b57968054d51ae3e209f6b1522
-EBUILD geary-40.0-r1.ebuild 2262 BLAKE2B 09c97831e4490caa2cab2c6882caba59416b2631dcb25e36b7ec391b6427637aca92fcde121eb73e016952060497487dc74ee98015ffa5b0b86c7f0abd00d913 SHA512 e622ebf77155ab6448de875a711594f97190a3bd0832f21928096b2e0cc0bb3ac9ea7f9282c8aee931cf977076aee8dcdfd4a2edca8fccf4ad69fe5b2c489fff
+EBUILD geary-40.0-r2.ebuild 2450 BLAKE2B 44fcb9c2f422165bee0b0379c925a190ab03e24a6294c2d005cd825410d5b90158854aa5522445bda80b5039c315aa0c7b8e373848b45d99ba76ed82ea9b85c0 SHA512 2aa0b488ef35199f4c79e561cbb7fa6183c3139c79a40426bd4334c91f6e3919ccbdd8fe5adaba69f428aa7a9de7cb8fd0065a623be549090eced35a51f49166
 MISC metadata.xml 380 BLAKE2B 8dfe66dd2f5e619ff018c1c64f23da3edf82ecf6162f9223068306792716cd0c4c3f7bd31b91ea7fd5fb492c877b4964edec6461f521919c8d88f59c664028e8 SHA512 8cd4286e4a6c2cdf7504938087e77ab5e17242da40104866c834b2426d6664afdb2a2512d47cda85ae842cdeb0800905fa5b69c711480008af826df0963335d2
diff --git a/mail-client/geary/files/40.0-Correct-the-conditional-comments-in-the-test-data.patch b/mail-client/geary/files/40.0-Correct-the-conditional-comments-in-the-test-data.patch
new file mode 100644
index 000000000000..5c01bf9a32f7
--- /dev/null
+++ b/mail-client/geary/files/40.0-Correct-the-conditional-comments-in-the-test-data.patch
@@ -0,0 +1,38 @@
+From 8fb10db1de1fac2ca99fab246a276620ffd6f02b Mon Sep 17 00:00:00 2001
+From: Richard Adenling <dreeze@gmail.com>
+Date: Tue, 10 May 2022 21:18:01 +0200
+Subject: [PATCH] Correct the conditional comments in the test data
+
+This fixes the problem with libxml2 2.9.14 not considering <![ to be a
+valid way to open a tag anymore.
+
+Closes #1367
+---
+ test/engine/rfc822/rfc822-message-data-test.vala | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/engine/rfc822/rfc822-message-data-test.vala b/test/engine/rfc822/rfc822-message-data-test.vala
+index 613e4b9a..d5e25ea0 100644
+--- a/test/engine/rfc822/rfc822-message-data-test.vala
++++ b/test/engine/rfc822/rfc822-message-data-test.vala
+@@ -763,7 +763,7 @@ ttp://p.ebaystatic.com/aw/email/Welcome_Day_0/spacer.gif" width=3D"5" heigh=
+ t=3D"1" alt=3D"" border=3D"0" style=3D"display:block; width: 5px !important=
+ "></td>
+ </tr>
+-<![if ! gte mso 9]>
++<!--[if ! gte mso 9]>
+ <tr>
+ <td style=3D"border-collapse: collapse !important;
+ border-spacing: 0; !important; padding: 0"><img src=3D"http://p.ebaystatic.=
+@@ -803,7 +803,7 @@ ttp://p.ebaystatic.com/aw/email/Welcome_Day_0/spacer.gif" width=3D"5" heigh=
+ t=3D"1" alt=3D"" border=3D"0" style=3D"display:block; width: 5px !important=
+ "></td>
+ </tr>
+-<![if ! gte mso 9]>
++<!--[if ! gte mso 9]>
+ <tr>
+ <td style=3D"border-collapse: collapse !important;
+ border-spacing: 0; !important; padding: 0"><img src=3D"http://p.ebaystatic.=
+-- 
+2.35.1
+
diff --git a/mail-client/geary/files/40.0-Fix-accessibility-issues-with-initializer-of-constan.patch b/mail-client/geary/files/40.0-Fix-accessibility-issues-with-initializer-of-constan.patch
new file mode 100644
index 000000000000..3772fe81c99a
--- /dev/null
+++ b/mail-client/geary/files/40.0-Fix-accessibility-issues-with-initializer-of-constan.patch
@@ -0,0 +1,40 @@
+From 9bd4c82952a0a2c3308c5cc86c0b85650c1fb484 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Tue, 30 Nov 2021 15:31:31 +0100
+Subject: [PATCH] Fix accessibility issues with initializer of constants
+
+---
+ src/client/application/application-client.vala | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/client/application/application-client.vala b/src/client/application/application-client.vala
+index 6ce19ce2..e6ba8533 100644
+--- a/src/client/application/application-client.vala
++++ b/src/client/application/application-client.vala
+@@ -8,16 +8,16 @@
+ 
+ // Defined by CMake build script.
+ extern const string GETTEXT_PACKAGE;
+-extern const string _APP_ID;
+-extern const string _BUILD_ROOT_DIR;
+-extern const string _GSETTINGS_DIR;
+-extern const string _INSTALL_PREFIX;
+-extern const string _NAME_SUFFIX;
++public extern const string _APP_ID;
++public extern const string _BUILD_ROOT_DIR;
++public extern const string _GSETTINGS_DIR;
++public extern const string _INSTALL_PREFIX;
++public extern const string _NAME_SUFFIX;
+ extern const string _PLUGINS_DIR;
+ extern const string _PROFILE;
+ extern const string _REVNO;
+-extern const string _SOURCE_ROOT_DIR;
+-extern const string _VERSION;
++public extern const string _SOURCE_ROOT_DIR;
++public extern const string _VERSION;
+ extern const string _WEB_EXTENSIONS_DIR;
+ 
+ 
+-- 
+2.35.1
+
diff --git a/mail-client/geary/files/40.0-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch b/mail-client/geary/files/40.0-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch
new file mode 100644
index 000000000000..4b9ecbec18b5
--- /dev/null
+++ b/mail-client/geary/files/40.0-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch
@@ -0,0 +1,25 @@
+From 0f75e7a84a39492d0748cec2ba6028e08cae3644 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sun, 30 Jan 2022 19:54:11 +0100
+Subject: [PATCH] Util.Cache.Lru: Workaround missing generic type argument
+
+---
+ src/client/util/util-cache.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/client/util/util-cache.vala b/src/client/util/util-cache.vala
+index f054e32e..ecc275e8 100644
+--- a/src/client/util/util-cache.vala
++++ b/src/client/util/util-cache.vala
+@@ -12,7 +12,7 @@ public class Util.Cache.Lru<T> : Geary.BaseObject {
+     private class CacheEntry<T> {
+ 
+ 
+-        public static int lru_compare(CacheEntry<T> a, CacheEntry<T> b) {
++        public static int lru_compare(CacheEntry a, CacheEntry b) {
+             if (a.key == b.key) {
+                 return 0;
+             }
+-- 
+2.35.1
+
diff --git a/mail-client/geary/geary-40.0-r1.ebuild b/mail-client/geary/geary-40.0-r2.ebuild
index 9b3196a2df32..6b149be7cd8b 100644
--- a/mail-client/geary/geary-40.0-r1.ebuild
+++ b/mail-client/geary/geary-40.0-r2.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-VALA_MIN_API_VERSION="0.48"
-VALA_MAX_API_VERSION="0.54"
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit gnome.org gnome2-utils meson python-any-r1 vala virtualx xdg
 
@@ -69,8 +67,14 @@ BDEPEND="
 	net-libs/libsoup:2.4[introspection,vala]
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-Fix-accessibility-issues-with-initializer-of-constan.patch
+	"${FILESDIR}"/${PV}-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch
+	"${FILESDIR}"/${PV}-Correct-the-conditional-comments-in-the-test-data.patch
+)
+
 src_prepare() {
-	vala_src_prepare
+	vala_setup
 	gnome2_environment_reset
 	default
 }