5 files changed, 119 insertions, 4 deletions
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 1bff2ef44d18..ab73e4b8493a 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index 01780ea8575d..66a4f617ba08 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -1,3 +1,5 @@
 DIST geary-44.1.tar.xz 2485012 BLAKE2B 5733059286befb7e7dc646c2ffb985c6b025f711c0fa03b006596ade47702bf89a2cf4e33f3ea8bb013636489ba170dfd6af7d629da296854a9e62eb8be09dd5 SHA512 f84d0fc1ce0b34d867acaf97f891c79f0c74cd6f020f6224663c985e2be102469b974a75f6f7bf6daa580fdf88d3413fcf16096d0dc89638081fa045ab2e152a
+DIST geary-46.0.tar.xz 2489980 BLAKE2B 830ab145e7fc84107ae8d712b021180fb564dff382f4e38df3a7f55dc0a0a6257414694d3a90c50ac71a4fe7c6867659453b4db3af3a0a908d8f66b28bfd24a5 SHA512 1a9758763c918bd6cb527cb1bbf77ff22c41bd076ae9d1bb0118d328b2b443c0e1106f9a17d517d73102ce7d6b5a42cfa5d51a4cace5c0d0b43262056876845d
 EBUILD geary-44.1-r1.ebuild 2146 BLAKE2B d52334c8696a0908e0e7c8a29244b3375c231362616b7726ea413dbd599234279c5b140e4a2d4e145ad34dfe349a9f2ef3179d213013b28a5429d6b944bf8e8c SHA512 e0c3c21bf52148443e97add99f0ba7c315b3000b0703c61ea03ee40778bbc1fc5884c168f9f9c48b7cbe479ed1e5cd3d4646a5f8f038939e365876dedcfa21f1
+EBUILD geary-46.0.ebuild 2149 BLAKE2B 2f93df7b5461b615444c85862e61dd54fd3a7cc944b06296707efa1e7c9bd6ba46e12bba06251976bf3a41c4b86361675a679c92a083d88aef1a7ad0897d3d94 SHA512 37118c5e4f79d72152b09658546e7ac762da4fca096c2f9884838e9953d74e4dfa46b9f6aad5975c8d4a3c5ba387207da60ff255680a2d58e1b9f55cf414a38f
 MISC metadata.xml 473 BLAKE2B d41a2598f4175613cfda39124c2954032d9868b6a18e9087aeb3a6ffdad736398400be4ec05fac9ec2e77ee8bab1e1c4d3a651fbdb713905527e61c9a2c407e4 SHA512 1b91b4c09e832cc0c91543125423985b73ba01a085fedd24c72e0ed5559cca2463be554c1b8c4f0d0278a6f66ce979126b4ee8d6413e9570e7e671badc20cc15
diff --git a/mail-client/geary/geary-46.0.ebuild b/mail-client/geary/geary-46.0.ebuild
new file mode 100644
index 000000000000..f06bcb59b9d7
--- /dev/null
+++ b/mail-client/geary/geary-46.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson vala virtualx xdg
+
+DESCRIPTION="A lightweight, easy-to-use, feature-rich email client"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/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"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test ytnef"
+RESTRICT="!test? ( test )"
+
+# >=gspell-1.7 dep to ensure all libraries used use enchant:2
+DEPEND="
+	>=dev-libs/glib-2.68:2
+	>=x11-libs/gtk+-3.24.24:3
+	>=net-libs/webkit-gtk-2.38:4.1=
+	>=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:0
+	>=app-crypt/libsecret-0.11
+	net-libs/libsoup:3.0
+	dev-libs/snowball-stemmer:=
+	>=dev-libs/libxml2-2.7.8:2
+	ytnef? ( >=net-mail/ytnef-1.9.3 )
+"
+RDEPEND="${DEPEND}
+	gnome-base/gsettings-desktop-schemas
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/appstream-glib-0.7.10
+	dev-libs/libxml2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( net-libs/gnutls[tools] )
+
+	$(vala_depend)
+	x11-libs/gtk+:3[introspection]
+	net-libs/webkit-gtk:4.1[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:1[vala]
+	app-crypt/libsecret[introspection,vala]
+	net-libs/libsoup:3.0[introspection,vala]
+"
+
+src_prepare() {
+	vala_setup
+	gnome2_environment_reset
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dprofile=release
+		-Drevno="${PR}"
+		-Dvaladoc=disabled
+		-Dcontractor=disabled
+		-Dlibunwind=disabled
+		$(meson_feature ytnef tnef)
+	)
+
+	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/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 4e6ed1923754..863d5a13ca28 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -4,7 +4,7 @@ AUX gentoo-default-prefs.js 362 BLAKE2B d3f08c4ac1ae1941e2a805175dd0621756a7aa44
 AUX gentoo-hwaccel-prefs.js 162 BLAKE2B c5f2dfb727081e2d538c262f12c0cfdda31cbda58c77f4024d820e1d1915203d1fb8ad2671f88ff0eb2b019bbf44079a8b1114e240b74f815680e5c28eccc295 SHA512 f1847f11e7059a83f09c3c7494aadcb04512cdf2ccf6616ebe3ec02fc46de66fd35cf83d81e08013c0e594b73e4dffcb67a32288b6949ce137669715583fd0a4
 AUX icon/thunderbird-r2.desktop 882 BLAKE2B eb9c2e381b67319d9cd53f26e9b406f55de86b716b28a3df6470594a612e07acda4c7dcdb48b6d55930972592f7f01afbbf14f09ccc4b20265d3c18554a01a2c SHA512 689c9fa5c37a1e6ee80a3dfaebec2a185d91508537c35ce2fb35d13d89b16ae0cf3c640c3115a52c0e4b7a7624aee6a8f8c52679a0073c94dea25cc779ce624b
 AUX thunderbird-r1.sh 2896 BLAKE2B 140047417b24e959fe6388c4913457f8e3e786158b7394abf7442b0d2e83de21238e58983845a23b855e1aab60c9289e1a12af430eac9a8b2d9929da97de2852 SHA512 f9b989152a8a3ac274033722c77ec19374085654ad6c85ea4db6f8af8f4b2066d6d9f82b610be2db341c8ac867547f54f806ca6571258ed98dd9e2527d21b357
-DIST firefox-115esr-patches-09.tar.xz 16660 BLAKE2B 1dcdf62f35013b82dd70bf00c0505394b9277affcd1b1cbde92421778f4fcc146f536a546c2db8d6a70f92d40e4b1c96927fedec54383e6bb80bd9806d9b4461 SHA512 e003d0a2a5304dcdd0851b57ceb11993333326c8221d5d99555cd0c64090d5eda1bdb2a2a52e605f6094a3214ffa2238e43d57ff64eb7d424ff54b8125c16f5c
+DIST firefox-115esr-patches-11.tar.xz 49440 BLAKE2B 804f5b7434fdf671361f8efbfa3e63cb8b14fcdea39a444ee04cbb4ff7d7deaea74ede239843c350a857eeacf59a69145e234070baa3b05b6d3e1b5c8835f23c SHA512 5e2c88374f14611a1aee4fa191ceb2e66c1d440c98d6ca9d17747290f01f1a713b71c71cebc37313c089524aa6155bfce08c8931a24b71b28de54913cfccd73c
 DIST thunderbird-115.12.1-af.xpi 550974 BLAKE2B 3f973170020cd5fa492e3b1cea3088a801e799f48dffa2081589cbcaa51eaa953dafb62ce008f894b465f6c0bee45532241b823dcc4ebe643c032fcc7ad58ae2 SHA512 6f2084f4b61d39eef49a499da144308accd2dddf1c191adda616a5289c7afc8e4cf8700b45e0b9957bdbb8b882a998234d2971d51eb970957d4a2d99ce3cc877
 DIST thunderbird-115.12.1-ar.xpi 673669 BLAKE2B c4bdce98303c81590bcb30c99bbbd5026e41aa67e3c14e5a2e0e91f2452fb8774a7c7242c6c4f82c68312a67e1caa4fb2d7d892ff6fda9c35073f270ac394ce7 SHA512 549b8b491785f20e0459754087c89bdbb9fe21cd124bd025b6854040da98724884c78556382be6cd9de5652569a19c8a540c67123d3c7e9c31ae8ff445db3c94
 DIST thunderbird-115.12.1-ast.xpi 569921 BLAKE2B 58b9e9e037dcd13ff2768eac57c06a0769a47eefd37d5705a4b61cc28a338422fac10eec787501d173839a68099071cea11f0c2adec2e277d756b089e7860042 SHA512 47e605d6846cbcbdd07f6388453fad1ef5fcd99013e288a6ff5a70920b2946567dd6317416f2dfcbc19b2def5980005e245b14c6f273f4ff2dda6ef31cb96253
@@ -70,5 +70,5 @@ DIST thunderbird-115.12.1-vi.xpi 772899 BLAKE2B 177d6bd9d8458b55ea93fc2e72dee81e
 DIST thunderbird-115.12.1-zh-CN.xpi 771966 BLAKE2B d53a9f428691bfaf2e7c35977b8f87867f79e6fbeedbc4610e75ee3a1d2dbeb11184d13ebc2d39163ad02336ed509b9cfa09b7d3f920251ec00dacaabcc3469e SHA512 67f2c96a0347790acd48df1afc3adeacfb7bd5624069af70ef72ee4d31a5fc1d0120b6d0cbf1bfddea6e4dc9c5b663d940c996ba49f3a9341527b8485cae8910
 DIST thunderbird-115.12.1-zh-TW.xpi 776444 BLAKE2B 51dd24e9b4549887def3fddbf32a55cf2bcb3374bc9df83533d9585cb90f7c72b2f5b0673a9460aedfc89ef75e13155dce7248c6bd3c8353394ac14349e0d956 SHA512 a0adf8fc4329a39a6d1c05c4dcf9e0eccff4be29d2f3ef1814a78bb8c7579ed42cfd1f121355d3e5b99ff4123685a7a65d7281a2e65b502986bbc1efc611baef
 DIST thunderbird-115.12.1.source.tar.xz 535032092 BLAKE2B b88927e5591651b40366da264e9b9ef8f54e404cf669d03a67ac0b0cf929fa3c1f3ca760d13f532f765bb208ec33fdcbee9edbb7811c50fca57d419ca5c4a311 SHA512 1640d860f9cd5107d8c26f0ca8cc6254cb7e4445fb968d2bfab7011fd4b1919e867fc0c639c097469dcffe3846ef2fab09c74d211fc56aec21981669f4e3c0cf
-EBUILD thunderbird-115.12.1.ebuild 39449 BLAKE2B a5a4b2fac3438be5332861bb8fd4ed5bf516b15131063364cec8131d5fcdcdf9200aba9134b6718c3a5b5a91aab78d4a8c0403517cd7131b6c82c75a2f6f273d SHA512 358b973200dd5385bf9e453c851050ac44afbc74bec528495b916b8e3bfdfa6c8e92c20cb2f91e383c21a96571d14b1d7a822ed51b3e938e07f3721ea93be4d9
+EBUILD thunderbird-115.12.1.ebuild 39787 BLAKE2B b7549a883a8e278a8d318fb0d7ba8bc2ded1a92a11fe26ef29fe260db23afcd1d080eab59d4ca96a215ed38e5d58618551d123cb10c70ef04c2246dfd194e275 SHA512 e0e95eb936857c741040cd654ae9d59ccf44496b2a8efe1f078dd663cc26e94975a9dbe45ca97acd9a45bced56fbcb79eb69a3e80441a9645ac602c72f73772e
 MISC metadata.xml 2387 BLAKE2B 3602296d8cca60f79ea66089332dbce63b9da3625e476659e0a663966e65bc060e67b263c8fdcdbf8fa5545adf7b8f958cc36f9011459c715ee31bb494e7ce5e SHA512 e51ee84ed715cba36beb240db27265ac37b8df684c0e98f3b81ccf7785c1f465f1bbe3729c1c01717445e787129b449c009815f62a7455ea3fc4db8d1d9e82c3
diff --git a/mail-client/thunderbird/thunderbird-115.12.1.ebuild b/mail-client/thunderbird/thunderbird-115.12.1.ebuild
index 582b2c7d6c1d..a0a938341cd3 100644
--- a/mail-client/thunderbird/thunderbird-115.12.1.ebuild
+++ b/mail-client/thunderbird/thunderbird-115.12.1.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=8
 
-FIREFOX_PATCHSET="firefox-115esr-patches-09.tar.xz"
+FIREFOX_PATCHSET="firefox-115esr-patches-11.tar.xz"
 
-LLVM_MAX_SLOT=17
+LLVM_MAX_SLOT=18
 
 PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="ncurses,sqlite,ssl"
@@ -82,6 +82,15 @@ TB_ONLY_DEPEND="!<x11-plugins/enigmail-2.2
 BDEPEND="${PYTHON_DEPS}
 	|| (
 		(
+			sys-devel/clang:18
+			sys-devel/llvm:18
+			clang? (
+				sys-devel/lld:18
+				virtual/rust:0/llvm-18
+				pgo? ( =sys-libs/compiler-rt-sanitizers-18*[profile] )
+			)
+		)
+		(
 			sys-devel/clang:17
 			sys-devel/llvm:17
 			clang? (
@@ -682,6 +691,10 @@ src_prepare() {
 	# Clear cargo checksums from crates we have patched
 	# moz_clear_vendor_checksums crate
 	moz_clear_vendor_checksums audio_thread_priority
+	moz_clear_vendor_checksums bindgen
+	moz_clear_vendor_checksums encoding_rs
+	moz_clear_vendor_checksums any_all_workaround
+	moz_clear_vendor_checksums packed_simd
 
 	# Create build dir
 	BUILD_DIR="${WORKDIR}/${PN}_build"