gentoo auto-resync : 21:09:2024 - 12:11:53

13 files changed, 1604 insertions, 882 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index b3eb4a2fa5e2..e88bf2e73d5a 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 6cd8ebd9d1d6..8748a9f3612f 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,15 +1,11 @@
 AUX claws-mail-3.17.5-enchant-2_default.patch 1284 BLAKE2B 076c2aa8c121e656a0b15f341b6a4b13a114348faba4bb0f298306379b26374c45719702949a5e64f35f718bd656366838ea6b867c7b18fef588f37d7d99cd9f SHA512 ac7ae41be0bc8303974c9f675ab9a0d3e6b5fbae8d569d0b87dfe2e2f72c22f3cefb64796107e393a392b8be1aa7c8d93319cd06cf57ac7517067091ff69da05
 AUX claws-mail-4.1.1-fix_lto.patch 368 BLAKE2B 8925e93d1785361b23b6cf0b107606fe50aa5b1c369ba36e4be463bbdd51930a727f8f4e17467ea41fb5bda9fb05d9a2aab1a09f3b04b731ce2854247226d7ae SHA512 0e9e180d2d3303d416d3d3accab49f1a43ebada337a6ca1916c2bbaadeb801039209d2f68f2f78448ee421da947216ee584e1c2aba18b5c221b34b5d4f6655b8
-AUX claws-mail-4.1.1-litehtml_gcc13.patch 1135 BLAKE2B c2b327a272862c4ade64f43b12ed0610061b9b68e5f0560a628eaaa0481987f347c31d7a46db31ce6d8cc1d668d5cdecef767dd2a1ffe8c2c745ca0a604941ff SHA512 5c6fa56b439d5073042acc0b432147fd920661c489912653288108387f8529a6011830f7c445d2925fc5486f4dbf7fa1a5f90f17a6e3c5d3ea68599149096e51
-AUX claws-mail-4.1.1-webkitgtk4.1.patch 12462 BLAKE2B 4368d262ad952cdf1098409378c4015b853ec7e0988ad682f47b269f77e30e96e23e1712fa53c26360cfef17785fd0595e0dee88486f77f359db95e37695987a SHA512 0034b29ea759ff7be68cc92f7ebf1f49e7e77006f8e2e266269bfce105b9672ba56aa26bdd145d11c9c7cf9263b97a5f39fe1154cf79e553b1a0c8a21a38af0f
 AUX claws-mail-4.2.0-gtksocket.patch 7480 BLAKE2B debc702b86ecf27944c76a5b1c011e62990016174c41bdac315b5022f4587fc45242ae24ae2bd7d9802f74236a04b5ea2955ff3ee2762e453ef9a1b871974144 SHA512 c00b1d55523f5f60c609d9d58cae95861ff65c2a8a9f4f22029f53df6a9394abf679732714b01c58f67995aff8a7763b002feae2d412ba4d6bc5d147dbc41515
 DIST claws-mail-3.21.0.tar.xz 6848648 BLAKE2B 9b2c89b5b9105add54db7b55f082e965645b67ca361edb9cdb7fdc3793146332acb678f06a493b0668c6a7d36a70d471d25948b0d14d6f61b22423057014a67f SHA512 59078bdb2d0314c63d4c63fdf493b0484c731523a2a099dd29816b14586f6ef038e36f794284d60deb45fe22b4c29bd239da49cc3b94549884742ef64d2fdcae
-DIST claws-mail-4.1.1.tar.xz 6523688 BLAKE2B 7e1b1ae201a67e14821f415d2b51f6eebfc2896699d89f2088fa9f7f21de984f6d8e4e92791c233ec755a15184ff5e562ce96ad9d197acc4e1f8dadb3fd57c30 SHA512 4157772fd0e918bae1df11230ce52691ff86181a0c164c0c5116d1ebb91885910e2e24ff18ae5e5ad4ed1c83ef830773de0b4ab40da988607909e0c17efb26b4
 DIST claws-mail-4.2.0.tar.xz 6674872 BLAKE2B b3118b45f1d3e8ae31a9c7bfa529fd5c8fda3ff8823e88a5ef078432d38d4150b05791deafff2577378ea17b03d965374755d2536ff6835ed46bcd566fefddaf SHA512 2415f246fc88b76263e1c43860c0638e08c581493333a3d846831f26cda21f0f14035a759379031d52e56aef2516bacec147a2cd5a153fc8fecf02ede64077f1
 DIST claws-mail-4.3.0.tar.xz 6831980 BLAKE2B e4dfb35b7f542ee514613b55286a19e2db398babc391a648edbda6d694b2e76973e1e7b6c4b7942b335898a571ffbbfef60fea1831ad4ac5ef7457a454259198 SHA512 3b0e811948d75ca2d003035d545d46d142ed4f2c1a103dc862413f9ff7a5ba612e00a7d5832836657e8d382bc7f94520496aaf60da429c72d9fb146ba12f0dfc
 EBUILD claws-mail-3.21.0-r1.ebuild 5300 BLAKE2B 3bf76da7d4901a53fedefdc7c46b4afabee2a0673b081d5df91a8c97f17aed4c45af147af10824ba6592c67b07f294691c79a3c261cc25f6f8f0730ef8140672 SHA512 a0052f06853b8240b40ca7684d8dd5af9dc3a07e076138b7cf87d3979b8ee4d3788eec22b595900317d56e2b273afbfd1edd3c493d99db3ea6a1312aad962138
-EBUILD claws-mail-4.1.1-r4.ebuild 5638 BLAKE2B a96c2a34350ecf4adfdc9d1da538a5d430f7071ac7a01dd303abbc79cac8aeef7d481c253e6bfea67588c998937671e802d902af9288ea4df4ead7770f671cee SHA512 51c1cc196d0c9c932e7ec54c154209b830dd18779dd4f6804707d1d2861920f87931b51ad9c92faa9c28811168082d36a0faddde1d073d53df0111b28d413a2c
 EBUILD claws-mail-4.2.0-r2.ebuild 5681 BLAKE2B 53e683434b1f888835cb31f8a5d0d56b4759874c707513ef7c22c4ec3dc98f0c9edc71d7e95d7365a8ecffe2bdcdb3a9ef7c2191c937e89167764a63bcca4986 SHA512 d64fc34de67f5f254c6d4baf9e8ab1dd7ba83f8f45dd5e062459d6cd0eb4809dcb4ea447f72a62ec86bca41f9141fa91cdac7c6a63adbe42d16fe407b7754042
 EBUILD claws-mail-4.3.0.ebuild 5714 BLAKE2B e6f6e826bc1a071d1faac98f6fbd2c9c6a567cf83d8a31e37a10f41256c18a58de6cd1c0bf6eb78318c7edcbeec79c106db16abafd42112b448a5b764f79da0b SHA512 01a60d39f51923bd6bdd3434bfd61205bfc9a60a2d75dbf5ff5c0e8c7486d8968534d70a3a3cb8d1a9097d302e908db046ca18e291e2d4f2fee641fdd4aeb098
 EBUILD claws-mail-9999.ebuild 5727 BLAKE2B d6483a2da9d2c0933ef23f678980b20e9ab37e2a4add3d25637f6ee0ff0851df36ba94595b36e7acce46eff14b7db9f41ed27b2c523df4e55ff4321685e4e32c SHA512 11bafd152cb21aebed676d9f3574b50ca0a1699db2356ae49db1349fa39e8958de745d85e311224c0e822c015a7e3d88fb79549f5b5bcaf4b97efd18103b3010
-MISC metadata.xml 1370 BLAKE2B d4e8a3be1636876f73dd0e789bbd1e62cc35e938b84623c4d177746bdd758bea5dd4bbb7d3c58077cac0554c1c6948f07fc4bf883eec70928f76c3fd495faf85 SHA512 e13f1ab08ddebc27da373923d20d4cfc292313a2f63438d55bd4843c90555ead1e4678345c2df6272ed784d52e305ccbaeda749b34e36f325e1de89a63b08e76
+MISC metadata.xml 1292 BLAKE2B 10b606071c9dd64ff986e6da0b7331f0b57c71e3c91437bcae62a4dd7c1eaec77dc03280589399613ed61e5ae08f686ac04fe73e7f1567d84ce8d98a2f22bdd6 SHA512 c91b7fd38b54cdec285f4d11b3a9333e38949e4676137a463be48868f61e5ce37c7a77fbb1e636a1044ec1fa7304e4a7659b1924ceed9c0028c870c6baaf1304
diff --git a/mail-client/claws-mail/claws-mail-4.1.1-r4.ebuild b/mail-client/claws-mail/claws-mail-4.1.1-r4.ebuild
deleted file mode 100644
index 902c4bdc278a..000000000000
--- a/mail-client/claws-mail/claws-mail-4.1.1-r4.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit autotools desktop python-any-r1 xdg
-
-DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="https://www.claws-mail.org/"
-
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.claws-mail.org/readonly/claws.git"
-else
-	SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-SLOT="0"
-LICENSE="GPL-3"
-
-IUSE="archive bogofilter calendar clamav dbus debug doc gdata +gnutls +imap ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification +oauth pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind webkit xface"
-REQUIRED_USE="
-	libcanberra? ( notification )
-	libnotify? ( notification )
-	networkmanager? ( dbus )
-	oauth? ( gnutls )
-	smime? ( pgp )
-"
-
-COMMONDEPEND="
-	>=dev-libs/glib-2.36:2
-	dev-libs/nettle:=
-	net-mail/ytnef
-	sys-libs/zlib:=
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2[jpeg]
-	x11-libs/gtk+:3[X]
-	x11-libs/libX11
-	x11-libs/pango
-	archive? (
-		app-arch/libarchive
-		>=net-misc/curl-7.9.7
-	)
-	bogofilter? ( mail-filter/bogofilter )
-	calendar? (
-		dev-lang/perl:=
-		>=dev-libs/libical-2.0.0:=
-		>=net-misc/curl-7.9.7
-	)
-	dbus? (
-		>=dev-libs/dbus-glib-0.60
-		sys-apps/dbus
-	)
-	gdata? ( >=dev-libs/libgdata-0.17.2 )
-	gnutls? ( >=net-libs/gnutls-3.0 )
-	imap? ( >=net-libs/libetpan-0.57 )
-	ldap? ( >=net-nds/openldap-2.0.7:= )
-	litehtml? (
-		>=dev-libs/gumbo-0.10:=
-		net-misc/curl
-		media-libs/fontconfig
-	)
-	nls? ( >=sys-devel/gettext-0.18 )
-	nntp? ( >=net-libs/libetpan-0.57 )
-	notification? (
-		libcanberra? (  media-libs/libcanberra[gtk3] )
-		libnotify? ( x11-libs/libnotify )
-	)
-	perl? ( dev-lang/perl:= )
-	pdf? ( app-text/poppler[cairo] )
-	pgp? ( >=app-crypt/gpgme-1.0.0:= )
-	rss? (
-		dev-libs/libxml2
-		net-misc/curl
-	)
-	session? (
-		x11-libs/libICE
-		x11-libs/libSM
-	)
-	smime? ( >=app-crypt/gpgme-1.0.0:= )
-	spam-report? ( >=net-misc/curl-7.9.7 )
-	spell? ( >=app-text/enchant-2.0.0:2= )
-	startup-notification? ( x11-libs/startup-notification )
-	svg? ( >=gnome-base/librsvg-2.40.5 )
-	valgrind? ( dev-debug/valgrind )
-	webkit? ( net-libs/webkit-gtk:4.1 )
-"
-
-DEPEND="${COMMONDEPEND}
-	xface? ( >=media-libs/compface-1.4 )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	app-arch/xz-utils
-	virtual/pkgconfig
-"
-RDEPEND="${COMMONDEPEND}
-	app-misc/mime-types
-	x11-misc/shared-mime-info
-	clamav? ( app-antivirus/clamav )
-	networkmanager? ( net-misc/networkmanager )
-	pdf? ( app-text/ghostscript-gpl )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch"
-	"${FILESDIR}/${PN}-4.1.1-fix_lto.patch"
-	"${FILESDIR}/${P}-webkitgtk4.1.patch"
-	"${FILESDIR}/${P}-litehtml_gcc13.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-bsfilter-plugin
-		--disable-dillo-plugin
-		--disable-generic-umpc
-		--disable-jpilot #735118
-		--disable-python-plugin
-		--enable-acpi_notifier-plugin
-		--enable-address_keeper-plugin
-		--enable-alternate-addressbook
-		--enable-att_remover-plugin
-		--enable-attachwarner-plugin
-		--enable-fetchinfo-plugin
-		--enable-ipv6
-		--enable-mailmbox-plugin
-		--enable-newmail-plugin
-		--enable-tnef_parse-plugin
-		--with-password-encryption=$(usex gnutls gnutls old)
-		$(use_enable archive archive-plugin)
-		$(use_enable bogofilter bogofilter-plugin)
-		$(use_enable calendar vcalendar-plugin)
-		$(use_enable clamav clamd-plugin)
-		$(use_enable dbus)
-		$(use_enable debug crash-dialog)
-		$(use_enable doc manual)
-		$(use_enable gdata gdata-plugin)
-		$(use_enable gnutls)
-		$(use_enable ldap)
-		$(use_enable litehtml litehtml_viewer-plugin)
-		$(use_enable networkmanager)
-		$(use_enable nls)
-		$(use_enable notification notification-plugin)
-		$(use_enable oauth oauth2)
-		$(use_enable pdf pdf_viewer-plugin)
-		$(use_enable perl perl-plugin)
-		$(use_enable pgp pgpcore-plugin)
-		$(use_enable pgp pgpinline-plugin)
-		$(use_enable pgp pgpmime-plugin)
-		$(use_enable rss rssyl-plugin)
-		$(use_enable session libsm)
-		$(use_enable sieve managesieve-plugin)
-		$(use_enable smime smime-plugin)
-		$(use_enable spam-report spam_report-plugin)
-		$(use_enable spamassassin spamassassin-plugin)
-		$(use_enable spell enchant)
-		$(use_enable startup-notification)
-		$(use_enable svg)
-		$(use_enable valgrind valgrind)
-		$(use_enable webkit fancy-plugin)
-		$(use_enable xface compface)
-	)
-
-	# libetpan is needed if user wants nntp or imap functionality
-	if use imap || use nntp ; then
-		myeconfargs+=( --enable-libetpan )
-	else
-		myeconfargs+=( --disable-libetpan )
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
-	default
-
-	# Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
-	# => also install it in /usr/share/pixmaps for other desktop envs
-	# => also install higher resolution icons in /usr/share/icons/hicolor/...
-	insinto /usr/share/pixmaps
-	doins ${PN}.png
-	local size
-	for size in 64 128 ; do
-		newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png
-	done
-
-	docinto tools
-	dodoc tools/README*
-
-	domenu ${PN}.desktop
-
-	einfo "Installing extra tools"
-	cd "${S}"/tools || die
-	exeinto /usr/$(get_libdir)/${PN}/tools
-	doexe *.pl *.py *.conf *.sh
-	doexe tb2claws-mail update-po uudec uuooffice
-
-	# kill useless files
-	find "${ED}"/usr/$(get_libdir)/${PN}/plugins/ \
-		\( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-pkg_postinst() {
-	ewarn "When upgrading from version 3.x please re-load any plugin you use"
-	xdg_pkg_postinst
-}
diff --git a/mail-client/claws-mail/files/claws-mail-4.1.1-litehtml_gcc13.patch b/mail-client/claws-mail/files/claws-mail-4.1.1-litehtml_gcc13.patch
deleted file mode 100644
index 10da0463b843..000000000000
--- a/mail-client/claws-mail/files/claws-mail-4.1.1-litehtml_gcc13.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a9a16a253ed3865a51db5e306539d3494087dafd Mon Sep 17 00:00:00 2001
-From: Paul <paul@claws-mail.org>
-Date: Wed, 19 Apr 2023 16:42:07 +0100
-Subject: [PATCH] fix bug 4648, 'fails to build with gcc 13'
-
----
- src/plugins/litehtml_viewer/litehtml/html.h    | 1 +
- src/plugins/litehtml_viewer/litehtml/num_cvt.h | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/plugins/litehtml_viewer/litehtml/html.h b/src/plugins/litehtml_viewer/litehtml/html.h
-index 4151b1225..20457f155 100644
---- a/src/plugins/litehtml_viewer/litehtml/html.h
-+++ b/src/plugins/litehtml_viewer/litehtml/html.h
-@@ -9,6 +9,7 @@
- #include <cstring>
- #include <algorithm>
- #include <sstream>
-+#include <cstdint>
- #include "os_types.h"
- #include "types.h"
- #include "background.h"
-diff --git a/src/plugins/litehtml_viewer/litehtml/num_cvt.h b/src/plugins/litehtml_viewer/litehtml/num_cvt.h
-index 515e46d62..367dcc36a 100644
---- a/src/plugins/litehtml_viewer/litehtml/num_cvt.h
-+++ b/src/plugins/litehtml_viewer/litehtml/num_cvt.h
-@@ -2,6 +2,7 @@
- #define NUM_CVT_H
- 
- #include <string>
-+#include <cstdint>
- #include "os_types.h"
- 
- namespace litehtml
--- 
-2.25.1
-
diff --git a/mail-client/claws-mail/files/claws-mail-4.1.1-webkitgtk4.1.patch b/mail-client/claws-mail/files/claws-mail-4.1.1-webkitgtk4.1.patch
deleted file mode 100644
index cfd9cb6842e8..000000000000
--- a/mail-client/claws-mail/files/claws-mail-4.1.1-webkitgtk4.1.patch
+++ /dev/null
@@ -1,317 +0,0 @@
-diff -Naur claws-mail-4.1.1.orig/configure.ac claws-mail-4.1.1/configure.ac
---- claws-mail-4.1.1.orig/configure.ac	2022-10-20 10:13:00.000000000 +0200
-+++ claws-mail-4.1.1/configure.ac	2023-04-02 22:12:14.715133250 +0200
-@@ -1238,26 +1238,10 @@
- AC_SUBST(EXPAT_LIBS)
- 
- dnl webkit *********************************************************************
--PKG_CHECK_MODULES(WEBKIT, webkit2gtk-4.0 >= 2.18.0, HAVE_WEBKIT=yes, HAVE_WEBKIT=no)
-+PKG_CHECK_MODULES(WEBKIT, webkit2gtk-4.1 >= 2.18.0, HAVE_WEBKIT=yes, HAVE_WEBKIT=no)
- AC_SUBST(WEBKIT_LIBS)
- AC_SUBST(WEBKIT_CFLAGS)
- 
--dnl libsoup ********************************************************************
--PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, HAVE_LIBSOUP=yes, HAVE_LIBSOUP=no)
--if test x"$HAVE_LIBSOUP" = xyes; then
--	AC_DEFINE(HAVE_LIBSOUP, 1, [Define if libsoup is available])
--fi
--AC_SUBST(LIBSOUP_CFLAGS)
--AC_SUBST(LIBSOUP_LIBS)
--
--dnl libsoup-gnome **************************************************************
--PKG_CHECK_MODULES(LIBSOUP_GNOME, libsoup-gnome-2.4 >= 2.26, HAVE_LIBSOUP_GNOME=yes, HAVE_LIBSOUP_GNOME=no)
--if test x"$HAVE_LIBSOUP_GNOME" = xyes; then
--	AC_DEFINE(HAVE_LIBSOUP_GNOME, 1, [Define if libsoup_gnome is available])
--fi
--AC_SUBST(LIBSOUP_GNOME_CFLAGS)
--AC_SUBST(LIBSOUP_GNOME_LIBS)
--
- dnl libarchive *****************************************************************
- PKG_CHECK_MODULES(LIBARCHIVE, libarchive, HAVE_ARCHIVE=yes, HAVE_ARCHIVE=no)
- AC_SUBST(ARCHIVE_LIBS)
-@@ -1573,7 +1557,7 @@
- 	dependencies_missing=""
- 
- 	if test x"$HAVE_WEBKIT" = xno; then
--		dependencies_missing="libwebkit2gtk-4.0 $dependencies_missing"
-+		dependencies_missing="libwebkit2gtk-4.1 $dependencies_missing"
- 	fi
- 	if test x"$HAVE_CURL" = xno; then
- 		dependencies_missing="libcurl $dependencies_missing"
-diff -Naur claws-mail-4.1.1.orig/src/plugins/fancy/fancy_prefs.c claws-mail-4.1.1/src/plugins/fancy/fancy_prefs.c
---- claws-mail-4.1.1.orig/src/plugins/fancy/fancy_prefs.c	2022-05-06 12:11:04.000000000 +0200
-+++ claws-mail-4.1.1/src/plugins/fancy/fancy_prefs.c	2023-04-02 22:07:34.285867703 +0200
-@@ -46,11 +46,8 @@
- 
- FancyPrefs fancy_prefs;
- 
--static void prefs_set_proxy_entry_sens(GtkWidget *button, GtkEntry *entry_str);
-+// static void prefs_set_proxy_entry_sens(GtkWidget *button, GtkEntry *entry_str);
- 
--#ifdef HAVE_LIBSOUP_GNOME
--static void prefs_disable_fancy_proxy(GtkWidget *checkbox, GtkWidget *block);
--#endif
- typedef struct _FancyPrefsPage FancyPrefsPage;
- 
- struct _FancyPrefsPage {
-@@ -61,11 +58,8 @@
- 	GtkWidget *enable_plugins;
- 	GtkWidget *enable_java;
- 	GtkWidget *open_external;
--#ifdef HAVE_LIBSOUP_GNOME
--	GtkWidget *gnome_proxy_checkbox;
--#endif
--	GtkWidget *proxy_checkbox;
--	GtkWidget *proxy_str;
-+/*	GtkWidget *proxy_checkbox;
-+	GtkWidget *proxy_str; */
- 	GtkWidget *stylesheet;
- };
- 
-@@ -84,14 +78,10 @@
- 		NULL, NULL, NULL},
- 		{"enable_java", "FALSE", &fancy_prefs.enable_java, P_BOOL,
- 		NULL, NULL, NULL},
--#ifdef HAVE_LIBSOUP_GNOME
--		{"enable_gnome_proxy","FALSE", &fancy_prefs.enable_gnome_proxy, P_BOOL,
--		NULL, NULL, NULL},
--#endif
--		{"enable_proxy", "FALSE", &fancy_prefs.enable_proxy, P_BOOL,
-+/*		{"enable_proxy", "FALSE", &fancy_prefs.enable_proxy, P_BOOL,
- 		NULL, NULL, NULL},
- 		{"proxy_server", "http://SERVERNAME:PORT", &fancy_prefs.proxy_str, P_STRING,
--		NULL, NULL, NULL},
-+		NULL, NULL, NULL}, */
- 		{"stylesheet", "", &fancy_prefs.stylesheet, P_STRING, NULL, NULL, NULL},
- 		{0,0,0,0,0,0,0}
- };
-@@ -180,14 +170,11 @@
- 	FancyPrefsPage *prefs_page = (FancyPrefsPage *) page;
- 
- 	GtkWidget *vbox;
--#ifdef HAVE_LIBSOUP_GNOME
--	GtkWidget *gnome_proxy_checkbox;
--#endif
--	GtkWidget *proxy_checkbox;
-+/*	GtkWidget *proxy_checkbox;
- 	GtkWidget *proxy_str;
- 	GtkWidget *vbox_proxy;
- 	GtkWidget *frame_proxy;
--
-+*/
- 	GtkWidget *frame_remote;
- 	GtkWidget *vbox_remote;
- 	GtkWidget *remote_label;
-@@ -204,25 +191,12 @@
- 	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 3);
- 	gtk_container_set_border_width(GTK_CONTAINER(vbox), VBOX_BORDER);
- 	gtk_widget_show(vbox);
--
-+/*
- 	GtkWidget *block = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
- 
- 	vbox_proxy = gtkut_get_options_frame(vbox, &frame_proxy, _("Proxy"));
--#ifdef HAVE_LIBSOUP_GNOME
--	gnome_proxy_checkbox = gtk_check_button_new_with_label(_("Use GNOME's proxy settings"));	
--	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gnome_proxy_checkbox),
--				     fancy_prefs.enable_gnome_proxy);
--	gtk_box_pack_start(GTK_BOX(vbox_proxy), gnome_proxy_checkbox, FALSE, FALSE, 0);
--	gtk_widget_show(gnome_proxy_checkbox);
--	g_signal_connect(G_OBJECT(gnome_proxy_checkbox), "toggled",
--			 G_CALLBACK(prefs_disable_fancy_proxy), block);
--#endif
- 	proxy_checkbox = gtk_check_button_new_with_label(_("Use proxy"));
- 	proxy_str = gtk_entry_new();
--#ifdef HAVE_LIBSOUP_GNOME
--	if (fancy_prefs.enable_gnome_proxy)
--		gtk_widget_set_sensitive(proxy_checkbox, FALSE);
--#endif
- 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(proxy_checkbox),
- 				     fancy_prefs.enable_proxy);
- 	prefs_set_proxy_entry_sens(proxy_checkbox, GTK_ENTRY(proxy_str));
-@@ -234,7 +208,7 @@
- 	gtk_box_pack_start(GTK_BOX(block), proxy_str, TRUE, TRUE, 0);
- 	gtk_box_pack_start(GTK_BOX(vbox_proxy), block, FALSE, FALSE, 0);
- 	gtk_widget_show_all(vbox_proxy);
--
-+*/
- 	vbox_remote = gtkut_get_options_frame(vbox, &frame_remote, _("Remote resources"));
- 	remote_label = gtk_label_new(_("Loading remote resources can lead to some privacy issues.\n"
- 					"When remote content loading is disabled, nothing will be requested\n"
-@@ -323,12 +297,8 @@
- 	pref_set_entry_from_pref(GTK_ENTRY(stylesheet), fancy_prefs.stylesheet);
- 	g_signal_emit_by_name(G_OBJECT(stylesheet), "changed", stylesheet_edit_button);
- 
--
--#ifdef HAVE_LIBSOUP_GNOME
--	prefs_page->gnome_proxy_checkbox = gnome_proxy_checkbox;
--#endif
--	prefs_page->proxy_checkbox = proxy_checkbox;
--	prefs_page->proxy_str = proxy_str;
-+/*	prefs_page->proxy_checkbox = proxy_checkbox;
-+	prefs_page->proxy_str = proxy_str; */
- 	prefs_page->enable_remote_content = enable_remote_content;
- 	prefs_page->enable_images = enable_images;
- 	prefs_page->enable_scripts = enable_scripts;
-@@ -374,25 +344,12 @@
- 	const gchar *stylesheet = gtk_entry_get_text(GTK_ENTRY(widget));
- 	gtk_widget_set_sensitive(GTK_WIDGET(data), (*stylesheet)? TRUE: FALSE);
- }
--
-+/*
- static void prefs_set_proxy_entry_sens(GtkWidget *button, GtkEntry *entry_str) {
- 	gtk_widget_set_sensitive(GTK_WIDGET(entry_str),
- 				 gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
- }
--
--#ifdef HAVE_LIBSOUP_GNOME
--static void prefs_disable_fancy_proxy(GtkWidget *checkbox, GtkWidget *block) {
--	gboolean toggle = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbox));
--	gtk_widget_set_sensitive(block, !toggle);
--	GList *list = g_list_first(gtk_container_get_children(GTK_CONTAINER(block)));
--	if (toggle) {
--		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(list->data), FALSE);
--	}
--	else {
--		gtk_widget_set_sensitive(GTK_WIDGET(list->data), TRUE);
--	}
--}
--#endif
-+*/
- static void destroy_fancy_prefs_page(PrefsPage *page)
- {
- 	/* Do nothing! */
-@@ -425,10 +382,6 @@
- {
- 		FancyPrefsPage *prefs_page = (FancyPrefsPage *) page;
- 	
--#ifdef HAVE_LIBSOUP_GNOME
--		fancy_prefs.enable_gnome_proxy = gtk_toggle_button_get_active
--				(GTK_TOGGLE_BUTTON(prefs_page->gnome_proxy_checkbox));
--#endif
- 		fancy_prefs.enable_images = gtk_toggle_button_get_active
- 				(GTK_TOGGLE_BUTTON(prefs_page->enable_images));
- 		fancy_prefs.enable_remote_content = gtk_toggle_button_get_active
-@@ -441,9 +394,9 @@
- 				(GTK_TOGGLE_BUTTON(prefs_page->enable_java));
- 		fancy_prefs.open_external = combobox_get_active_data
- 				(GTK_COMBO_BOX(prefs_page->open_external));
--		fancy_prefs.enable_proxy = gtk_toggle_button_get_active
-+/*		fancy_prefs.enable_proxy = gtk_toggle_button_get_active
- 				(GTK_TOGGLE_BUTTON(prefs_page->proxy_checkbox));
--		fancy_prefs.proxy_str = pref_get_pref_from_entry(GTK_ENTRY(prefs_page->proxy_str));
-+		fancy_prefs.proxy_str = pref_get_pref_from_entry(GTK_ENTRY(prefs_page->proxy_str)); */
- #ifdef G_OS_WIN32
- 		/* pref_get_pref_from_entry() escapes the backslashes in strings,
- 		 * we do not want that, since this entry contains a Windows path.
-diff -Naur claws-mail-4.1.1.orig/src/plugins/fancy/fancy_prefs.h claws-mail-4.1.1/src/plugins/fancy/fancy_prefs.h
---- claws-mail-4.1.1.orig/src/plugins/fancy/fancy_prefs.h	2022-05-06 12:11:04.000000000 +0200
-+++ claws-mail-4.1.1/src/plugins/fancy/fancy_prefs.h	2023-04-02 22:07:34.285867703 +0200
-@@ -1,6 +1,6 @@
- /* 
-  * Claws Mail -- A GTK based, lightweight, and fast e-mail client
-- * Copyright(C) 1999-2014 the Claws Mail Team
-+ * Copyright(C) 1999-2023 the Claws Mail Team
-  * == Fancy Plugin ==
-  * This file Copyright (C) 2009 -2014 Salvatore De Paolis
-  * <iwkse@claws-mail.org> and the Claws Mail Team
-@@ -35,11 +35,8 @@
- 	gboolean enable_java;
- 	gboolean open_external;
- 	gint zoom_level;
--#ifdef HAVE_LIBSOUP_GNOME
--	gboolean enable_gnome_proxy;
--#endif
--	gboolean enable_proxy;
--	gchar *proxy_str;
-+	// gboolean enable_proxy;
-+	// gchar *proxy_str;
- 	gchar *stylesheet;
- };
- 
-diff -Naur claws-mail-4.1.1.orig/src/plugins/fancy/fancy_viewer.c claws-mail-4.1.1/src/plugins/fancy/fancy_viewer.c
---- claws-mail-4.1.1.orig/src/plugins/fancy/fancy_viewer.c	2022-10-20 09:16:02.000000000 +0200
-+++ claws-mail-4.1.1/src/plugins/fancy/fancy_viewer.c	2023-04-02 22:07:34.285867703 +0200
-@@ -1,7 +1,7 @@
- /*
-  * Claws Mail -- A GTK based, lightweight, and fast e-mail client
-  * == Fancy Plugin ==
-- * Copyright(C) 1999-2022 the Claws Mail Team
-+ * Copyright(C) 1999-2023 the Claws Mail Team
-  * This file Copyright (C) 2009-2014 Salvatore De Paolis
-  * <iwkse@claws-mail.org> and the Claws Mail Team
-  *
-@@ -1106,23 +1106,6 @@
- 	viewer->mimeviewer.scroll_one_line = fancy_scroll_one_line;
- 	viewer->view = WEBKIT_WEB_VIEW(webkit_web_view_new());
- 
--/*#ifdef HAVE_LIBSOUP_GNOME
--  TODO webkit_get_default_session() missing 
--   *     enum WebKitNetworkProxySettings
--   * */
-- /* Use GNOME proxy settings through libproxy */
--/*	if (fancy_prefs.enable_gnome_proxy) {
--		SoupSession *session = webkit_get_default_session();
--		soup_session_add_feature_by_type (session, SOUP_TYPE_PROXY_RESOLVER_GNOME);
--	}
--#endif
--	
--	if (fancy_prefs.enable_proxy) {
--		SoupSession *session = webkit_get_default_session();
--		SoupURI* pURI = soup_uri_new(fancy_prefs.proxy_str);
--		g_object_set(session, "proxy-uri", pURI, NULL);
--	}
--*/
- 	viewer->settings = webkit_settings_new();
- 	g_object_set(viewer->settings, "user-agent", "Fancy Viewer", NULL);
- 	viewer->scrollwin = gtk_scrolled_window_new(NULL, NULL);
-diff -Naur claws-mail-4.1.1.orig/src/plugins/fancy/fancy_viewer.h claws-mail-4.1.1/src/plugins/fancy/fancy_viewer.h
---- claws-mail-4.1.1.orig/src/plugins/fancy/fancy_viewer.h	2022-10-19 16:49:50.000000000 +0200
-+++ claws-mail-4.1.1/src/plugins/fancy/fancy_viewer.h	2023-04-02 22:07:34.285867703 +0200
-@@ -1,8 +1,8 @@
- /*
-  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
-  * == Fancy Plugin ==
-- * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail Team
-- * This file Copyright (C) 2009-2013 Salvatore De Paolis <iwkse@claws-mail.org>
-+ * Copyright (C) 1999-2023 the Claws Mail Team
-+ * This file Copyright (C) 2009-2023 Salvatore De Paolis <iwkse@claws-mail.org>
-  *  and the Claws Mail Team
-  *
-  * This program is free software; you can redistribute it and/or modify
-@@ -51,10 +51,6 @@
- #include <curl/curlver.h>
- #include "filesel.h"
- 
--#ifdef HAVE_LIBSOUP_GNOME
--#include <libsoup/soup-gnome.h>
--#endif
--
- typedef enum _NavigationMode {
- 	NAV_DEFAULT,
- 	NAV_INNER,
-diff -Naur claws-mail-4.1.1.orig/src/plugins/fancy/Makefile.am claws-mail-4.1.1/src/plugins/fancy/Makefile.am
---- claws-mail-4.1.1.orig/src/plugins/fancy/Makefile.am	2022-10-20 09:16:02.000000000 +0200
-+++ claws-mail-4.1.1/src/plugins/fancy/Makefile.am	2023-04-02 22:07:34.285867703 +0200
-@@ -1,4 +1,4 @@
--# Copyright 1999-2022 the Claws Mail team.
-+# Copyright 1999-2023 the Claws Mail team.
- # This file is part of Claws Mail package, and distributed under the
- # terms of the General Public License version 3 (or later).
- # See COPYING file for license details.
-@@ -28,7 +28,6 @@
- fancy_la_LIBADD = $(plugin_libadd) \
- 	$(GTK_LIBS) \
- 	$(WEBKIT_LIBS) \
--	$(LIBSOUP_GNOME_LIBS) \
- 	$(CURL_LIBS)
- 
- fancy_la_CPPFLAGS = \
-@@ -37,7 +36,6 @@
- 	$(GTK_CFLAGS) \
- 	$(ENCHANT_CFLAGS) \
- 	$(WEBKIT_CFLAGS) \
--	$(LIBSOUP_GNOME_CFLAGS) \
- 	$(CURL_CFLAGS) \
- 	-DFANCY_WEB_EXTENSIONS_DIR=\""$(pkglibdir)/plugins/web_extensions"\" \
- 	-DFANCY_WEB_EXTENSION_FILE=\""fancywebextension"\"
diff --git a/mail-client/claws-mail/metadata.xml b/mail-client/claws-mail/metadata.xml
index 6727b3320653..71ee587a179a 100644
--- a/mail-client/claws-mail/metadata.xml
+++ b/mail-client/claws-mail/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="archive">Enable archiving plugin</flag>
 		<flag name="bogofilter">Build <pkg>mail-filter/bogofilter</pkg> plugin</flag>
-		<flag name="gdata">Enable plugin for access to Google data providers</flag>
 		<flag name="libcanberra">Enable sound notification in connection with USE=notification</flag>
 		<flag name="libnotify">Enable notification on the desktop in connection with USE=notification</flag>
 		<flag name="litehtml">Enable <pkg>dev-libs/gumbo</pkg> html viewer plugin</flag>
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 7d56210a2005..2ed8e6f5eef9 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,11 +1,8 @@
 AUX 3.50.4-fix-lto.patch 3234 BLAKE2B edca53818281f596f01fe80b6bd4c6acaea2c12458e3b54b6559ae34894081cf64b78f6c2294a0efb26feb495fb1a872ddbb0e15b21ab04332223f6fab03591c SHA512 d39fbd78ae54d1ca04c83f729a0153ae9c2e1ef7dfd19b87ad4573d5ffe7739de566a0ff4dbf86355fb84add16497b619d0ca5d28eaf85f4b1ca07ad9a109a46
 DIST evolution-3.50.2.tar.xz 13510112 BLAKE2B c30b6ecf4a4de45856137e82e7ff15072d96093a62ae7903afe10d28f8a02c7ad2c617b6d5992699e1e3fbe9501fc6bd1dc11b9e9d464aa28c4b6d8fd46ee69d SHA512 965693094e6f24ac9edb4a361d382d497bd63a48c8be6056bfbd04c27f7c88806256979e949c89aa1da7dac3114797962476d3804be49c6ca8f065c24acf9c87
 DIST evolution-3.50.4.tar.xz 13512624 BLAKE2B 3288bf3286a7c28476e5e95b9ded6d1004d7a8f73dd162a47b755a48966d30668379a6c65d462fc05d2a1c2b8b9426e39a42f80ccaa6b3927a4efd9e92b0dad7 SHA512 857e219df65dab3182b26f5751bfec68d532af11c3e3565bf288d63e5298c9bb9aec4e293769da46083213da79c41790ca624e843e0f2779a75f581d607d2109
-DIST evolution-3.52.2.tar.xz 13621044 BLAKE2B 50396067b72d597d6c5f8919c1040aee32495db1697eb9b1d5597ed61639bf096c69b91fd468e536a14b1ec729a81f1eb1626e363328f87684841724f4db383a SHA512 03db78da682216ccf96e873968c284ff1c52211d74c0d121c853747075d591d39d8b8be46dfbe9aab289ad10adff71a4cef382e23d6c577ac6b7dfd2c0c350be
 DIST evolution-3.52.4.tar.xz 13616760 BLAKE2B f44c93725264129ecf0fede23b1ab6b502a4fc054b02e8494417797ea5148442b3c3028cccc76d236d49b5ec02f294b06fb7742d14b0ff82fa10060f3ffeb6ef SHA512 6b6112032b8f531043a1ac95916b0a2190853d037fb92a93aeda4aa3023fdb267382f9e81ce28dc8dadc76e0907f3d0e540ff8499aae12560bec6a75d5247ec5
 EBUILD evolution-3.50.2.ebuild 4197 BLAKE2B 52cf67435f20f09159ee7bd7c7bc40a25ebb61e5bbf3856b9bfc903492158f440a1bc07052b4e07cf03281890cfb9530d8b0d9bfe80c2d8929bfc98dbe589295 SHA512 907db00516b205902d5242490e041929cd289c87cfe54f13d72c341ef40acdfba077259763a8e0b552a39c5c5ee2c26969fa040c900c979311f10619720e0f8c
 EBUILD evolution-3.50.4-r1.ebuild 4339 BLAKE2B e2d776dbf5442e52e560c2c2b7458ade22732aa9ff665120b5f3a1dc74e3eccac0dec007768c3d1ba0520046a5a6580a1a9c38acd821fc975b9d8bc3f556dc24 SHA512 9b575d35d8b67e693c2f9b5a011b299c433cbb393546b08999751a14e3fa060bf74585a2773b575ebb3cae2b4182801406d4277e56548db19a9d14cf89bee44e
-EBUILD evolution-3.50.4.ebuild 4200 BLAKE2B 3b5f55ab79d1e8aeaea68c00b99e18970b2d9e4137ed1aa541dff59fd94bc4d283e0880ad0c90feb400a12f9429debfef9a0a40e5b5a67a245aef3c53f1ff961 SHA512 3056e1178a5c4c13cbbba64120ca3cc1a4b1b831586bf3bc44e871f918bda3e9f0d4291f2da959b5ac8ec4d0a8818af5d48ce49fd57230217833d4faf4886afd
-EBUILD evolution-3.52.2.ebuild 4182 BLAKE2B 5bd6ea43526568651e90d639d07b0862ece6145190eb46e8937de06d75b01ff3f9f1edfc042abd60cb1de141dce9209231bc8990e5165bbdc41afc936e40edd0 SHA512 e0373156671a99f771324fdd16214f22492a2783e07f6873174b997447d2fc25ad4b6773d44de36e25508ba1a517d3512970272d6fbcda2e3aa6a540fb63bb8f
 EBUILD evolution-3.52.4.ebuild 4182 BLAKE2B 0e55043c0af44f2eba260364808d8f85b590fc162b434c0c9f4df463c263012cb0e0860b2297223e46fef0e1341da601c2372a1ca3ac8086a3bfaadaa83ca4aa SHA512 82c4e7bcca75925e1b2a75dd18a1e586def288eef3a332c53ca6877c7a53e5cab2b55514fcbc62c0f35093280cebedad0d21dff957fb9c41b1da780d612435aa
 MISC metadata.xml 1174 BLAKE2B 745a372088a3891dee71c205ef8d512df56e338ca41cd91d861938447e1cf42f0305fe27e385b7e4f391dd26cbd5173bdba9e158b65cec1260fe9c45382465c4 SHA512 d19c6775d576c35458674c301bfc5502e1f8f62cee76fe46aa749507fd9c2a1494a21a6c9a5886f8ca7e3b2e107b3e28dee448c8ecbd999cf3c3bb800c03f405
diff --git a/mail-client/evolution/evolution-3.50.4.ebuild b/mail-client/evolution/evolution-3.50.4.ebuild
deleted file mode 100644
index 3ef4b2f97780..000000000000
--- a/mail-client/evolution/evolution-3.50.4.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake gnome2 readme.gentoo-r1
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
-SLOT="2.0"
-
-IUSE="archive +bogofilter geolocation gtk-doc highlight ldap selinux spamassassin spell ssl +weather ytnef"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-
-# glade-3 support is for maintainers only per configure.ac
-# pst is not mature enough and changes API/ABI frequently
-# dconf explicitly needed for backup plugin
-# gnome-desktop support is optional with --enable-gnome-desktop
-# automagic libunity dep
-# >=gspell-1.8 to ensure it uses enchant:2 like webkit-gtk
-DEPEND="
-	>=app-crypt/libsecret-0.5
-	>=app-text/enchant-2.2.0:2
-	>=dev-db/sqlite-3.7.17:3
-	>=dev-libs/glib-2.66:2[dbus]
-	>=dev-libs/libxml2-2.7.3:2
-	>=gnome-base/gnome-desktop-2.91.3:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=net-libs/libsoup-3.0:3.0
-	>=net-libs/webkit-gtk-2.38.0:4.1=[spell?]
-	>=x11-libs/cairo-1.9.15[glib]
-	>=x11-libs/gdk-pixbuf-2.24:2
-	>=x11-libs/gtk+-3.22:3
-	>=x11-libs/libnotify-0.7
-	>=x11-misc/shared-mime-info-0.22
-
-	app-text/cmark:=
-	>=app-text/iso-codes-0.49
-	>=app-accessibility/at-spi2-core-2.46.0:2
-
-	gnome-base/dconf
-	x11-libs/libSM
-	x11-libs/libICE
-
-	archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
-	bogofilter? ( mail-filter/bogofilter )
-	geolocation? (
-		>=media-libs/libchamplain-0.12.21:0.12[gtk]
-		>=media-libs/clutter-1.0.0:1.0
-		>=media-libs/clutter-gtk-0.90:1.0
-		>=sci-geosciences/geocode-glib-3.26.3:2 )
-	ldap? ( >=net-nds/openldap-2:= )
-	spamassassin? ( mail-filter/spamassassin )
-	spell? ( >=app-text/gspell-1.8:= )
-	ssl? (
-		>=dev-libs/nspr-4.6.1
-		>=dev-libs/nss-3.11
-	)
-	weather? (
-		>=dev-libs/libgweather-4.2.0:4=
-		>=sci-geosciences/geocode-glib-3.26.3:2
-	)
-	ytnef? ( net-mail/ytnef )
-"
-RDEPEND="${DEPEND}
-	highlight? ( app-text/highlight )
-	selinux? ( sec-policy/selinux-evolution )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
-~/.local/share/applications/mimeapps.list so it includes the
-following content:
-
-[Default Applications]
-x-scheme-handler/http=firefox.desktop
-x-scheme-handler/https=firefox.desktop
-
-(replace firefox.desktop with the name of the appropriate .desktop
-file from /usr/share/applications if you use a different browser)."
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
-# call; if needed, set them after cmake_src_prepare call, if that works
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DENABLE_SCHEMAS_COMPILE=OFF
-		-DENABLE_GTK_DOC=$(usex gtk-doc)
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DENABLE_SMIME=$(usex ssl)
-		-DENABLE_GNOME_DESKTOP=ON
-		-DWITH_ENCHANT_VERSION=2
-		-DENABLE_CANBERRA=ON
-		-DENABLE_AUTOAR=$(usex archive)
-		-DWITH_HELP=ON
-		-DENABLE_YTNEF=OFF
-		-DWITH_BOGOFILTER=$(usex bogofilter)
-		-DWITH_SPAMASSASSIN=$(usex spamassassin)
-		-DENABLE_GSPELL=$(usex spell)
-		-DENABLE_TEXT_HIGHLIGHT=$(usex highlight)
-		-DENABLE_WEATHER=$(usex weather)
-		-DENABLE_CONTACT_MAPS=$(usex geolocation)
-		-DENABLE_YTNEF=$(usex ytnef)
-		-DENABLE_PST_IMPORT=OFF
-		-DWITH_GLADE_CATALOG=OFF
-		-DENABLE_MARKDOWN=ON
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	# -j1: https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/522
-	cmake_src_test -j1
-}
-
-src_install() {
-	cmake_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/mail-client/evolution/evolution-3.52.2.ebuild b/mail-client/evolution/evolution-3.52.2.ebuild
deleted file mode 100644
index 5e3c21998ec5..000000000000
--- a/mail-client/evolution/evolution-3.52.2.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake gnome2 readme.gentoo-r1
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/evolution/-/wikis/home https://gitlab.gnome.org/GNOME/evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
-SLOT="2.0"
-
-IUSE="archive +bogofilter geolocation gtk-doc highlight ldap selinux spamassassin spell ssl +weather ytnef"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-
-# glade-3 support is for maintainers only per configure.ac
-# pst is not mature enough and changes API/ABI frequently
-# dconf explicitly needed for backup plugin
-# gnome-desktop support is optional with --enable-gnome-desktop
-# automagic libunity dep
-# >=gspell-1.8 to ensure it uses enchant:2 like webkit-gtk
-DEPEND="
-	>=app-crypt/libsecret-0.5
-	>=app-text/enchant-2.2.0:2
-	>=dev-db/sqlite-3.7.17:3
-	>=dev-libs/glib-2.66:2[dbus]
-	>=dev-libs/libxml2-2.7.3:2
-	>=gnome-base/gnome-desktop-2.91.3:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=net-libs/libsoup-3.0:3.0
-	>=net-libs/webkit-gtk-2.38.0:4.1[spell?]
-	>=x11-libs/cairo-1.9.15[glib]
-	>=x11-libs/gdk-pixbuf-2.24:2
-	>=x11-libs/gtk+-3.22:3
-	>=x11-libs/libnotify-0.7
-	>=x11-misc/shared-mime-info-0.22
-
-	app-text/cmark:=
-	>=app-text/iso-codes-0.49
-	>=app-accessibility/at-spi2-core-2.46.0:2
-
-	gnome-base/dconf
-
-	archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
-	bogofilter? ( mail-filter/bogofilter )
-	geolocation? (
-		>=media-libs/libchamplain-0.12.21:0.12[gtk]
-		>=media-libs/clutter-1.0.0:1.0
-		>=media-libs/clutter-gtk-0.90:1.0
-		>=sci-geosciences/geocode-glib-3.26.3:2 )
-	ldap? ( >=net-nds/openldap-2:= )
-	spamassassin? ( mail-filter/spamassassin )
-	spell? ( >=app-text/gspell-1.8:= )
-	ssl? (
-		>=dev-libs/nspr-4.6.1
-		>=dev-libs/nss-3.11
-	)
-	weather? (
-		>=dev-libs/libgweather-4.2.0:4=
-		>=sci-geosciences/geocode-glib-3.26.3:2
-	)
-	ytnef? ( net-mail/ytnef )
-"
-RDEPEND="${DEPEND}
-	highlight? ( app-text/highlight )
-	selinux? ( sec-policy/selinux-evolution )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
-~/.local/share/applications/mimeapps.list so it includes the
-following content:
-
-[Default Applications]
-x-scheme-handler/http=firefox.desktop
-x-scheme-handler/https=firefox.desktop
-
-(replace firefox.desktop with the name of the appropriate .desktop
-file from /usr/share/applications if you use a different browser)."
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
-# call; if needed, set them after cmake_src_prepare call, if that works
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DENABLE_SCHEMAS_COMPILE=OFF
-		-DENABLE_GTK_DOC=$(usex gtk-doc)
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DENABLE_SMIME=$(usex ssl)
-		-DENABLE_GNOME_DESKTOP=ON
-		-DWITH_ENCHANT_VERSION=2
-		-DENABLE_CANBERRA=ON
-		-DENABLE_AUTOAR=$(usex archive)
-		-DWITH_HELP=ON
-		-DENABLE_YTNEF=OFF
-		-DWITH_BOGOFILTER=$(usex bogofilter)
-		-DWITH_SPAMASSASSIN=$(usex spamassassin)
-		-DENABLE_GSPELL=$(usex spell)
-		-DENABLE_TEXT_HIGHLIGHT=$(usex highlight)
-		-DENABLE_WEATHER=$(usex weather)
-		-DENABLE_CONTACT_MAPS=$(usex geolocation)
-		-DENABLE_YTNEF=$(usex ytnef)
-		-DENABLE_PST_IMPORT=OFF
-		-DWITH_GLADE_CATALOG=OFF
-		-DENABLE_MARKDOWN=ON
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	# -j1: https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/522
-	cmake_src_test -j1
-}
-
-src_install() {
-	cmake_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index e68ab27b14fb..1cb2973831dc 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -131,10 +131,77 @@ DIST thunderbird-128.2.2-uz.xpi 592131 BLAKE2B 569538d472409a3ac52a4891c07446220
 DIST thunderbird-128.2.2-vi.xpi 787028 BLAKE2B c9fb95cbd3055b58f38d8e166eb64899ac3cfda96fb223dcecf70123b21781d607c5ba552b177f91edcc9af9e378ce799b9497e740b19d5a9e8f4e7b6daec995 SHA512 4cb791209a31f87a481085fe8925b470f51ae4ba357a415bbfb01f974bad4080c61edeaf3805c5544636376ccd85470e26e24c7477a1a6436944b4a2072fd28b
 DIST thunderbird-128.2.2-zh-CN.xpi 785327 BLAKE2B 095094bc0b01974406837e776d263b96c85699123f7c5bb6cd9126e5da03c5320eaafac24344205b49a463a8b1729121f73882734aedd723ad43178ba24f0bf8 SHA512 345bba000b277941423af0f3f47763208a565a408c99a6a8ff5619d3d5a91a8c5c18d867d667f6ecdc2f56dad4007ccd2f75cff113bb7eb294f3ee2d9b8d1def
 DIST thunderbird-128.2.2-zh-TW.xpi 789780 BLAKE2B 1e1d95617c86fbcc00804dd18dcad0cc1b876ba09a2162696d14075e4814810aadc24e2124b25df935f380171a6dd1a95ec679b28ea509aeeb27d99b3a1e5950 SHA512 0b650d6c00a0dc05119e20b4d072124c98e70f70a7b98f05644e344fe952b8992d9aa5ea0f320e0f13c3c80e07e8a23f3160e4443510c139ebeedf2eb7778d1f
+DIST thunderbird-128.2.3-af.xpi 530348 BLAKE2B 0cce80e2872b19315d3c91e3770737864e11baea97ff91d98923f82a6ca24563227a013d27454fdccf87ecb74a11804ed67dcc4c33093536c57a15e10254c2e8 SHA512 32799387dd5976f2765bdde160f4a63e0943970605afa697f0cc33929a99d8fe26f049dd03743e5ea051c1fe817d9530b83041ed124b8fad01087860f7675861
+DIST thunderbird-128.2.3-ar.xpi 679865 BLAKE2B 875056b81818289195e905bc1054a0d95aeb6968c8a783c851ea4c510d026cfe19bed962b4d4e98f174b5417e0bd97a2ae0160c429277820146998a39d5fbe2c SHA512 c06229ec5ba3517a11f63a74060ef539a40df1eb69966c473cbc8c02e090524b4cf04b1f65f5815680a90745d2f287f8d8b7f2b7412305700abf8203ffb96711
+DIST thunderbird-128.2.3-ast.xpi 561054 BLAKE2B 8b0ab0bb93ca93c14707371454a24d108d9e6cf0d9b6814ea4915a4cb37fdb42d159c3f8500d5cdda92e3ecd7a342fe8f1963398359209a538d438b655cbf5d4 SHA512 06b3821672e5e3266008ef1b0006eab3adb485824902b1819e5ab7b9934a81ddc0b98be0be81ed0502bc6eb2aa0415e36b1dd1632f9f91c988678ea5680ceb99
+DIST thunderbird-128.2.3-be.xpi 755101 BLAKE2B 8809c9c42e164f92acfcec3ce377df19c1c2263ac833ec6ddb42de61f8d8504c9af76b0e66f118d1e1922e51fb27ffbfee0b9a8a98086105f48ea30dc7f0934d SHA512 121dfbdfa4dd1e882b31e19be5061ab6ee9540ead08105f7fe19d8d96e079f6125b5d607083dba7b0394acc7eb5d94adf06dfb46ccecc9d362180fe6e221b243
+DIST thunderbird-128.2.3-bg.xpi 807860 BLAKE2B 15559cd9b6868c550c8e42204bbaa1a0c094e6aeb23fdb238c31888842831f48df24a350b4854cb766634bca5b06fdb09f8ceaf3f967740e9e3c4b6d08bf92c0 SHA512 2f14b9942a2b274eaada910db4ea2bb077c89839a2353f535cded5d6e9931a36504dfbbe5a9b176987de053a9a6b7d14163cdafaa77c372de2b9a2003770cd49
+DIST thunderbird-128.2.3-br.xpi 652475 BLAKE2B 291ed76a94ece1359883e9417a7cfad32960de514248f480526b1daca024270f45b45b981bbf2802ca18534e8d74e183b176274b93405dcb669cbc7d01057d06 SHA512 fd7864aa685c8e0528e28f11ddcc475f497a1761487f57a3e2818e385a93cce5f094cef3a87f986efc747f9c06ca6edc15d4e9722f9bab5702f51161de19395f
+DIST thunderbird-128.2.3-ca.xpi 708966 BLAKE2B e0fcdb44beb729bc9e5cb58eec484ee456fdc58ed90696eb9510883a3b3e9423b1487b0147bc5eee880d5a08df17024923be9be0dea50558ff9a529cae5ad361 SHA512 f67349ddb4a11047ec4cc9ff81b86a9e62c0360231537deddef05b699722eda1b4a1babeb1dd302234118d86ade7321665fbb554a4d47dca4cac3c180279b7e1
+DIST thunderbird-128.2.3-cak.xpi 671704 BLAKE2B d1673e684c46aeba61717e4aa7c0d3777475e3b868d373ef791cd77463393625e6bbe4b7508db8cda599467a8c5d8a3378497bd40f496ab02da779141221a201 SHA512 810463d933fe2c2f842edf8600142730bb7e62b4d7787d2ec94b0cb958b9a5a99e9a4fb5c5857581e1dec61fffb6ab15cd667b5ee4a11c04ae4d3118d3f8cd80
+DIST thunderbird-128.2.3-cs.xpi 785043 BLAKE2B cc71c1fd367a1ce1196c1b247e5ea322a6a39420bbd5eb6158f1e11b0b8128294922401600b8a15a5f72033f74e9a7474e79b6c92d5c374e4901d54618ec2a9a SHA512 f2bee313f571c0dadc42002d14ae44c87da4b85dfa224c236e3a452916a8696daca3833f6e1c0749be9f47b4c0e30c8bea4de9a3a8610c9278c81f8c4938fabd
+DIST thunderbird-128.2.3-cy.xpi 749049 BLAKE2B 44218fe51318541ef939a9a039a683dfac584793da2967342888b9a55eb6a8e40bb07c97b8dc98b7c6b2ae778e70111d89384af0b47d33d59db7ee4fb4858e45 SHA512 07260b39f0743b2959cdbac5ed2204089a75131374e664f58af9adcbbe0cd20e542ea606e5e1857674fd2a34f8408dfb9e7ecda02d2c3b75965ebabea200e9c9
+DIST thunderbird-128.2.3-da.xpi 734114 BLAKE2B 023d89566e4489c9fe58888ce5210bccc98259066ef9efab69976d56921d1276e4731f23fe9e743a4fe74a74567a6ff5d34c280ff2e2891741fc5ebccc04fa92 SHA512 9ed710942242a17004ca67ea47b3f888ea5bc01b191d53b0e973ea45a3483f9a9d84172dc7bb8d219017918d9639d892b3311dbb2461b0d5ece3fa2634f40427
+DIST thunderbird-128.2.3-de.xpi 766249 BLAKE2B d5425b53e84f1d59d7640bd819aff84663568a526917a86e11eaf348e46bf9e3f1f29a6d0826591388137a72f762fee59ae8069b48569dc404004231f304aebf SHA512 5c5ba44a13014f65a304136a38e9ccc376202db274c0d4daeb511beb5ea45b75c8008eef41d28d984fcd295e233c67e4f81cfe51f6ab42eb64788e32c4239673
+DIST thunderbird-128.2.3-dsb.xpi 782741 BLAKE2B fc8270fb2043b605ef1551d8252a85881ba09bc31a48e11ff3c9366abe55bbd607b57db7ee0dbbe6a64b71aee35c0eea0e4076576cfe1cddbc4833f5056fa7bd SHA512 b4a145f85cdba1bbe8d13ed3481c9140d3bdee2bd499080f73ec7a490e0c995596fdb488da65a2048daf687617fbdf5d9ce963560b444a90d498c99ceec3aa06
+DIST thunderbird-128.2.3-el.xpi 889268 BLAKE2B 8d6f1a215e4743c4b7e9fc05e62683672b98fd8176f102413ca13c959160aa17a173ba89a01cc1e2dcc371df621b60f3a84a8e5613e676a2b70a96118f050f9e SHA512 53b75b9c98933284c4e551eb0d0e6cc610c83e416b2537d668976ec594d7ef07c15abaa6b88105090b585ad53ff848462842e0d222db45fc61a66f3658529c0a
+DIST thunderbird-128.2.3-en-CA.xpi 702142 BLAKE2B d4a6e3b1102f1e7818eec0ea6aa93c3c86e40270e8b7c8f1b6013a0323c338cad145110227e61f48695edaa6338b6907c2ef49a52a7deca37cd5c80e8925ca70 SHA512 809c007b0b5f2abf9656e021bd226d177dea1c400ae33d5e5a9603a1b1d608302c063e12854b8e9a8bbc0a3dd60bb68f9796a6761c5f7fb41a65ddb374e892fb
+DIST thunderbird-128.2.3-en-GB.xpi 702699 BLAKE2B 76b47c8660e04f14e59e4c103226051afde9a8883d899b85700bae525b1109b599451fc9d262363006b05de97abb39141d54b897af6789f9aec3cb4094d0bb8c SHA512 884764e2e957d434ae7908b0d98eb7807114fd0fb38f9a6ab88aab848e06369e57e30d4403a70d054bf0b637754b6191d3cfdf42de30317f61822cf638bddd7a
+DIST thunderbird-128.2.3-es-AR.xpi 758350 BLAKE2B b81ac10875c17c4d64e5f0a734c41a4a67a60f70ad9eb95b747c033ee5025a72b3336efc78417c79c2334169e5ceb2c6ef744399d5e87658415f8c15a1f590fc SHA512 dd21bbffbbbd4e342eb5474d83ae0ed1c6d7a0b85b54f3dca3c6929d96f2bce408a4b7db19b093a8c0946b5c636ab0514399f6bbc2525929eb1af1d6c50c36f9
+DIST thunderbird-128.2.3-es-ES.xpi 723515 BLAKE2B 328bb470f5f4089d1bdde4c67b0de8bf7eadde658b24550f04dbff35d1becae4705795e0940543e768073fe7d032be9ecf6d42a99f1c089682bca5ff15f8c3aa SHA512 236353230d32caeafac611cdc977a0f51d8dd354a458e741827fa9057238699780485ea42de8665970159f38ccf978e46a33b8213003675e81a21c25718e341b
+DIST thunderbird-128.2.3-es-MX.xpi 737706 BLAKE2B d1dc9f1e72837d8249c3034194c08c6a13663ac2277b38a04151feb5d9b1e1b98ea8e53f57dc84feee1416403bbc50f9848fe29e75417d2df9bff1b93b6b0f6c SHA512 f56b1e441cca2cf544374ea64a7d642e6be0f5fb18fa696ee15ecac2dfd015e95fcea87c446bc619b6cac129eab777ce5b844ee535bc5541a2be6368c8fffa14
+DIST thunderbird-128.2.3-et.xpi 696278 BLAKE2B a221cd844a2e1ab4f38fe868985bb15685c335b8d8bd9c3082c5c212b8ecf2db75898431898165113bd3752eeb91985e98896f23755aff6fddb67b097f3d95df SHA512 3485be28ba289f811a1cafc64c4e4b2208110eac115df5cbd4a4e2ac5ec33c0b29f050c0805759f07b0098f282feef1387b1adee9a6ae1e6b3727d929ab982c4
+DIST thunderbird-128.2.3-eu.xpi 726801 BLAKE2B 7d1e52d02c85114ddaeeea23116b5a1ebe54e492b5736725f23bd4079b9c14480b90e39a7c9a4835380d17e13d773c637332972e34cefaecdbfe1bf4acf403be SHA512 b5b306270445429fb071c139a1e144e2d9379e425568787f0f878f4412d8124b2638f4499e161b3f7fe70a6f8f01b87c721d06f92795c1dc9d90d2431e452978
+DIST thunderbird-128.2.3-fi.xpi 733650 BLAKE2B f2cd5cf44043e00af1b99cf4b123d950f26580bf71245a7dcef721425822fda7a22bf2485984859d04df2fa7d9c8c8a61734a554918d249f9c5abf2def299ec7 SHA512 52f9fde6f297e31892bc6ded2c97e104082c3569e68cd71a3b668477875fe896953f8f5eb175825904003b663dce5cec7b27df1ed3f61e911f7a82ceeb5a07bf
+DIST thunderbird-128.2.3-fr.xpi 770185 BLAKE2B fba3d2943e16bba6625b63808e1c047d26ab51ddb4442d7ab0f6f3eca5ce777aa5fb586d0584c8b99bb3255e51042aecaeaf5dc626ed5a84061d3bf0e472b6c5 SHA512 13aa3a0814f38cd3fd018882e61a769de65b237f0bbe6e506464922363318ceadf4bafacfcfe2c4880dc5fbc77eed82b2cb621e96da086100cd201bbafdb0bd5
+DIST thunderbird-128.2.3-fy-NL.xpi 752849 BLAKE2B ae11cf74df19d5fa8b7fe377531c208695eac8b90f888e316df130db2bdcad1d3b7756f04375006be5d49419d7da3559fe7c32890976e3715fbfabe0d961a0fd SHA512 ad29a5ee2a29f80c7cf4a2bbed47544846261849ad14c36a375e40794208c4c28f9ec863d8a18f45fa3377b085aa7f6a58f26d6f333d981398b0c3f3aea9dfd2
+DIST thunderbird-128.2.3-ga-IE.xpi 615198 BLAKE2B d1688832bc527c0dcde92fb86b2c71be69e95dc0ae6c5cdc13806d9caea46581a739cbd392ba965b321ec4b4c1070b04ffb75135815b81198a13366248fd6778 SHA512 395b56b68af0e9b248cf5b3d1c12f17ca912dcc74456035906a3cc3a832648ebf3ab71978817118fff132c436782ab5128c8b87c92d5a625c7be2d86448d8441
+DIST thunderbird-128.2.3-gd.xpi 727803 BLAKE2B a1fc7f1a4495867b935ca04b7988a2970f0337851be66671cffd6b67b16866270181fa014f412273076220ae6bd5beb5a720dca35bae8000c09e971890dec43d SHA512 5621a60df17c1f115facfc14864ab3bb2e19501c3f1fc268faa40f085dba83cace61cbfe3fbd411954a4aa0bc517758a4addda49111718ae9ec4f2ba76d0b54c
+DIST thunderbird-128.2.3-gl.xpi 736572 BLAKE2B 96d7b9c43e37750327bb36e3fac3a4e31ff8a245ba58cb0c588a89e2bdf0587c1efe575ca02f15ac318a86d82c5a5e7ba73cb79a9fed40058db3386dd03bf655 SHA512 25722ad053e6a4ef0ef42386587c103619c43eafeb77b9761834fd7c3a2defeeda78da47f39ae972ca89184eb11c410938600f1ec69d068fdbbf1c38ecf4441c
+DIST thunderbird-128.2.3-he.xpi 700301 BLAKE2B 036b9333c04f905317fa53fae42d49e67cd56882021213e35c202ed0f44467925076b6d476eef7364fa5ad73b9aabe215f59491dd37b1ae3ce0e128eb6f6f9af SHA512 c72bdfd9d007b6d6f6f9f6a868593b589260dbd98ba0053e9abd0adf0beb4e8aa154f7eaad75d020e0cb870f5e9c0016b7e3cebb85245e22b8c84bb712dbdb94
+DIST thunderbird-128.2.3-hr.xpi 715018 BLAKE2B 0bf73c79e4dc9321a5d75d39a83006ea0328f9661c308482a43c7aac3bf204321d17212ab0c7c659ba529ce469f13559eca7e8c7e7d90716ee02dbde38214594 SHA512 4d6cfe8dfe2412cd644ebbf5837878ca3caf87be0d07f4443abf4fce5f8d20687f1a2eed69430b3da59d16b9f9ccf2677708dd69910ecb2ed082996a97da1e03
+DIST thunderbird-128.2.3-hsb.xpi 780137 BLAKE2B 7b83862d1b6816f31c6b6c2fb2c8a78ed5507f46706d4b20c82b222946bba8d54c065bcb5ea26ea0375f17cdec05b4476323c19b550d11af638b05ffeb456670 SHA512 d04171abdb3474dc30f520e5c5d6aa4bbe39f749f6d3447b3bfa65a9c97c2cf92742a85049844f65fb6979b92fb429ec6be75c8033fe2907e8b6307fce039b2c
+DIST thunderbird-128.2.3-hu.xpi 782932 BLAKE2B ec05be9d6d54f4228780dcb566432ade115447bd9ded560b536ea44513ff889b2ba300b076eaa144e5ba03523d4f367654191e60a5ed7c823c7abe0eb97e6dc3 SHA512 83522b6f181b701929c26a804f4e83025156a553181daab0cf7b7cd504c7618bba77a80360221719f96f0839d2ef6085bd6767e6c67fd04b93f0d66341eee741
+DIST thunderbird-128.2.3-id.xpi 666011 BLAKE2B d9c26766f3183b1cb345307b10bbf8907c4b7117ed1f8dcc09d0629be8285acd10799e8b0a142487280f1161a1e85807e7ae460e45363a2e9f6e126fd8644479 SHA512 5753e509fe4c62e84f9da28bf39cb34b088bd512cbd7716050b1a236367b4347fc1a7b4bec79ce69a9b1669a798a0f99fb1b98fb4cc552fde5bf82d64379c13a
+DIST thunderbird-128.2.3-is.xpi 743886 BLAKE2B 1801650fd8833ce1b771cdecef891475b694a6d0dfcf82107da3e761cce459e7955d54912875c2917b212ff0379d58fa693f0ab1bcc22e17559add9356b3b266 SHA512 1648151bdff1910aa931890b0fda724d92fe83e2b0b2fae06c4cc6e483d0b4909139af053b1489b8538e284ad2f3e0c2526a1d009ff4aa430d6878e9e7ffff93
+DIST thunderbird-128.2.3-it.xpi 690395 BLAKE2B e5f00cde104ae2104c833aed244a7dc0df4b42b0d96174f8cfc92ef9f1e360fc7591ec53879396225003c1322c0eeaf2ecb36acbef3120b5a85c28fa77b1fe96 SHA512 970f5f4b23992d98431ede90fbc15e2163a26c3559d251a4a834653bfde6a61a48450a79304343261ffbf7326b47d5ec43aafa14682732d369f96ab02f27d32a
+DIST thunderbird-128.2.3-ja.xpi 819904 BLAKE2B 4c01201320dd464919dc24c2f9b5b9ca3d29df6692e89ea2ee908a1d5ab6355edf34281a6dfe8cc993783c0b7fae4dfebe13e2655524dbe2a048f2eabcef2e0a SHA512 c7e16a74ab4a7075dab9fcd6d5eca97bcc5f4615a14ea54b393b27beb29ae2a9f3a196b653d77beb1053a80b8730f6f9b029d56e675626c98e858e15ede6b792
+DIST thunderbird-128.2.3-ka.xpi 796047 BLAKE2B 1e92b26f7d35bf7c1009913f1189613dd217c017612a8fa3eb17fde3574120982d84b6db63f15731d98609caaef40c58231a4240f42bebcf5cb61c17795ffd86 SHA512 3b496548a99ce40a7443679f12e5e24db5fa8616d1a3f92e138d753355f5b0deb452811c2e1374893af79b15e8ddd576fa1e86f04a6c27cbd50fe4d178d387f9
+DIST thunderbird-128.2.3-kab.xpi 731858 BLAKE2B 3014788c8786b13c38f054b0ace3cfcde2a1e6bbb2643d5cb27d375a94d09cd9f8f7aa008d787b383e4a16e02ca006d11c34761ca4f7b5aea163d0163ac3f882 SHA512 a0c823c189c61f2bd9eea059d72bb574ed28c1b25921908c9f91c943903dd0e38c856f1bbc72bfc087c53792a53d08a9c15cc951ef03c0cd2de7daaac630d095
+DIST thunderbird-128.2.3-kk.xpi 857289 BLAKE2B c3fde9f0a523b784c005a1dca755249037035965aeb93231232d1972667bb4e5a6e9ea2bec3e7579eb73e99e9cb03c9d39ec14b230389edaf5e9d3a0b11be2f6 SHA512 85eba822d16425daee7a0a262759bbd67a84b3a9b0964e3b4b5810209f74678ff938b0a803c65e6fdd903ed08d549528a5b352c7d757b91c9f1002e78b7ae835
+DIST thunderbird-128.2.3-ko.xpi 755164 BLAKE2B 32da4298f807b89e32c8f671451a1cfc0d68d2137b384d11f387b1df2127ae27ad002fdc34f411864ce6c036f2716993147b0d9e8bfc98c0daaac88baef2002d SHA512 5a84c696af0d86ecbe2ef7bdd8f00e090b5ec4ea5cfd9dbd12437ca85b58a97ac9df9fd00e0617d45b698337b810cc37715f0b77231121d669e3415dcf5ca487
+DIST thunderbird-128.2.3-lt.xpi 700918 BLAKE2B 782349e2040f2d44122d7dfb7f8432c1b1451273846a28abf3a95eca859e83f141aa7556e08bf1a30d550cd37caec431478bf693f6249ed44109a42fe1ca269b SHA512 b2b011945544684b8feba7337e99d7c9b2f7433b9984891916d9a712816ce72cecf6a5cb066e3ea0a8a506e03de38e0c81b5450af4e56a74e9f190db1f609d5e
+DIST thunderbird-128.2.3-lv.xpi 623624 BLAKE2B 9987ba7bddd406896c21b2b6e315adc68462b26ff7f0c07e6ddbc14fd9b8ec41ebb477372b44d0e3bd9e6dec688a0453ace7340d070083bdfd45d2357ae60ed3 SHA512 1ac493ac0fac5db2837b2d0ba7bd5af7b462f6b8a425a62fa4dd1ef459335519c98ad86cd393d0a09581f594b84388423abd8a7814beca0bc74ba28707885640
+DIST thunderbird-128.2.3-ms.xpi 581082 BLAKE2B 0abe87234e5cec44fb7f266c601b015afad41ef281a395144f3b81a6646c5d0e16759117c36df7dc3e2f6f9b9818e973b757ad2fa5115f264aa9418b62b50741 SHA512 2b334336edcd962040f3dd0631bf8cafc975831d4db4a702b024aaa8e1eacd5e804cfef39da342fb52addab6ce46339e0424e51ddec9a5d6c889c3f4f35c7ccf
+DIST thunderbird-128.2.3-nb-NO.xpi 703764 BLAKE2B e7acc196caf13a68b95d0bfdd9b4ea0aa65ed90454042c63faa501cb80ded0a0c9d8e27084fd89ef3f620e1c4d4f721a78e27981267b49aafbe227344cf4a7dd SHA512 7bed62a3f549382cf1104a467e947bc0a5fc815785f0c4d34ab674e48a216bd9502b021e42e5111fa9243294a821c137daeb2f0b94bf7d05336c7f7b6f111aae
+DIST thunderbird-128.2.3-nl.xpi 744106 BLAKE2B 4ddbb1af6d7e435c131fdd8e48a13ef93322ee2bc59450e1baf3c74022ae3f7230bbc5c2fd5cec882d3074a68c3ad07fc282f9a67460c79fa2b061ae9aa69c62 SHA512 b383c5712dbeda8ca7215a9974759c366cc43df927d6ec9906cca22aca4a0631930c9f83fd01bc86d2ab1727a464d4b110a69e1f9c5df16de2ae722417f887ba
+DIST thunderbird-128.2.3-nn-NO.xpi 723768 BLAKE2B a93c63c16aea56eb4c3db82cc735524637ecddcbb726777b8cac804903b770b765be5f56bd4650b8831846b50bdcc2f52cb44b156b703aa6ad749b4cea8b0897 SHA512 cb2fe3637d568c6fa09962f047cd4070a7a5ce217c036f16e39060a25bea8d08f55df708c72daa81d3ae8d15d349d36ba4a07c068bc023c15f8815537593e7d1
+DIST thunderbird-128.2.3-pa-IN.xpi 683075 BLAKE2B c8e5d26bd2e6c54707d3784d6e5ea0a72709020f09beaf79442258309bcf888cd7a628151fab43a2b533db5b69423bc6d93bfc16d34e189990a33cac511a50b9 SHA512 d5f385c2e11f4e42984e635546ecf3c635e7011c1544f85bc1ebc11a064b2c4ba36621c220643721e9b6afe10a9abbbae4c45ab4554a449dcae96e147b32d70a
+DIST thunderbird-128.2.3-pl.xpi 762951 BLAKE2B 8336b7c2b3d76ac9eccd6b9bbdb5cfc41a94b50590ad4955c5873ee7c8550a690a198ee2d00347d21d938b076ba76ea3c41c4299ae58d2af70495515ac27d9c5 SHA512 86322abc42d22bc18185b468cc6221f5b09c4f0aa52ac1e372a26557cd29814b57a2f6fa56f6f64835a2a8d5e16394f41dbdc042904f9d2f802d0621bcced03d
+DIST thunderbird-128.2.3-pt-BR.xpi 751313 BLAKE2B da9513dd69b3e946e1941add87094cd9a4cc37732866e9a0e803e3037c86066acb8222bcf8470e079fc440c9c81e7a3b81077b41d36e5e435fc4207ca8e63fb4 SHA512 b1e7bcb05dbc30421b3ddf1faa036d8ca459553de980173a371e7820113460096d159c906bc753b0bd34fe41b907e4a18a6f238a87d516db9431bd2efb7db0fa
+DIST thunderbird-128.2.3-pt-PT.xpi 746870 BLAKE2B 108737b8be502f88e7b685dd8dc72627e91c7eef0bf35794f5076f3549ec681ec5ff6c07f29e46a91ad3a416e4da0738cc1c7ee55be2fbe8d596bb1115e6317e SHA512 0887d9294ef5010c4e8cd842b2ec03a75d41e5fdf6ea58ca624667b75933f84806c998548e05d574e2dd765e650c6defe52eca136b54ae792e2d406068a18160
+DIST thunderbird-128.2.3-rm.xpi 746778 BLAKE2B 0a96b77402567aa878ec32c3e0f8ab097eedec27c7073ac79bbbbf45ec866b8c6644717a52a236be65f50eccd1e4e6868430e1c6df717f4ac716ad4cfb9b4719 SHA512 28ee3b0fbdc1f6065483e27e7e7a7faee247e9f899d3e3eaee7775d5d9b9495d193fcc740f18b960b3d47948fb8e5116f3ffa81c95f2babfae6dfeb562270dd5
+DIST thunderbird-128.2.3-ro.xpi 669741 BLAKE2B 5b1ee45981743b244670d8a1403b987ee7ee05b35a947b613fe9bf898bb6aab99cad5d4078087fe09a4f8a9534333da32d629820b74a1e4f83bca6ad857936b0 SHA512 00f91287cdcb7ca12a0369ecc4ea091d238f7757716f80cb43fa545466bdd891a65cf8f5b4de840a0c2086e8b8cbeda6908fa57595f387a15ccdc8187212413d
+DIST thunderbird-128.2.3-ru.xpi 872245 BLAKE2B 8df13bff59a25707ac66ead0c24ff11b72a318752b6ee03e22bd40a9f5f76f1a8157459c0a8f2ce35f82dc4a259e3c5029372a99c89af25c358367f524118f15 SHA512 ddabb2e2e3a47b6d6c99f3cbdc06ed99f0660029a6dbd5070c155be17fadf7dbbf1bb7342586fac194ce2c694e8b4619f4eb5333f7107fadd23e3db4a84a2973
+DIST thunderbird-128.2.3-sk.xpi 784170 BLAKE2B 8033becfeab21871005c5ad85feef88f50aa94135c8929fba5cfc38d2a704d43a603f684aca66748b1dd400e49897db23f5421dc956a5915bc82411238126ff3 SHA512 3aa13c254e5d0d7bb62e242fa2aeebc5ed8b38dd7f623d1c592708727abb231b703514f621ca15d0519cb449605a07156a1391071e7450ce4ee058df1e69e957
+DIST thunderbird-128.2.3-sl.xpi 743549 BLAKE2B 733ad0aafcee0b028792970530340139ad4aaaf2a6ed994672d698aca464e926e3a24912b0fccef14169a3a6f2707f4a48a7a954b89eae7840046284fb170230 SHA512 ae5fa42f0c61bf1e22a572b9b137a85a0e4e08ec8ee04841e4ee6d98efbf913e319583460216e3e52cec90f9e88ec1e7d6c0a5639c717c950892ae1d86d4a6a8
+DIST thunderbird-128.2.3-sq.xpi 765887 BLAKE2B 6926a806642d2218497939935eea43fc65599a9dfdf8489d41018190766204db09e3123e02bfeeef634759f3c903a4ac315c8a3134bd8b3cc10696d969c8adda SHA512 5c29a91ed1ee4b48bde070e73a1e5972639d6bade766db2325b186ef33bf083a6b596a48775c0f7c492da30598ba3f013746f46d818f3220c62696897ab9df8e
+DIST thunderbird-128.2.3-sr.xpi 771005 BLAKE2B 47d54c5dc304c401211d8ab01bbc2a81ff8e0ce08976e96d0bb0248a00f3b52dfc57c03805197780d1ead796769c005c3489d5c2788d8ab145fcf893b0d1327f SHA512 3abe0a6c6e3c467cf7410a4466a1be50fefed5b27229e4eb2b69538e5e2707764e978d7984035fc45503e8df8989bc79f2821774806f7597b13049f5cf3f51e2
+DIST thunderbird-128.2.3-sv-SE.xpi 747521 BLAKE2B 77593daf9500fd057a2c36d13a4a8b0460eaeb5877886cba1b09696c4dd9cfef7a38e2131ef00895ac138339ff88abd727beffad43dd8f1495079312d30ff31d SHA512 d6e2ee6c9cd9c75ec32ca36856da1637ad14d842d625f0424f7b5e3a63f46af2790de9bacb5d87f6e426684271ca8ce99261b4bff12d7cbfae4f977f67b93120
+DIST thunderbird-128.2.3-th.xpi 813954 BLAKE2B f8e0ee98fc952bb39908c8aea8fbefafbc5845a4a0bc9be71aeeaa21a6fe336169ad344dcc602b27056b8e805c01fe05377f781816266ffb6d9fa7d1b4dd0a9d SHA512 a76970e0114c3e11eea7b5c5b662e0e71a8157a1f6f185d63029824700a0afdc281649b82b6fb455dc3e45f97e2af208a20f9df20471491e105cf61d6983ce58
+DIST thunderbird-128.2.3-tr.xpi 758164 BLAKE2B 11db65586e5ae93b8f32aa7feb04ffbecd0569c0a810faa519749c63aa1655371c47b623c90007131242dcd058b34ff2387c91d638a0fa636f8f3b7d174a9118 SHA512 53ced8767e14e3e35ada7beff6a1acf609d64d82b0a3f8049dafa253d7f2af30d464fc4e7f6f69fb55d55fab4d54a507fc22be5dda435f9fc1f5da4b4753a1c3
+DIST thunderbird-128.2.3-uk.xpi 856055 BLAKE2B 47c844953d4d643f67d0f13e18e50e9d47d52ff38f6e1785fd2c76fda1a06d4014ae16a988742c55351ee740ac241bfdd4366f24b043447cf80a562be49e74da SHA512 4640757ade6d6e033a2f920b7dd31654b6d3aa44f6b6ea1e5457916a8814daa2140bb5a37ba003113c27fd3afcadaa54e8220b49e5f37ab39c684005a7f82244
+DIST thunderbird-128.2.3-uz.xpi 592133 BLAKE2B 8ca52413636d339953004fc12ce56905e7fc5b81659930e57cc1e8bbb3c5c4e07f162a7bde1706d3d1702f5df00f63abb2948bb27183362b8adeda86e4d8197a SHA512 74795147371204a1f4a5cbbd34833b38c3b313c43f851e0f163fe99b849a52eedf3f0164f03c859bb624b52344e7b3bf0cb8fd88e5dc607ed4f660799631e110
+DIST thunderbird-128.2.3-vi.xpi 787028 BLAKE2B faa1a4f4c0589ff2f9758cc92facfd11efea8ea4cc026d925877e5730173ad8d5e5da4043db123b403a07589e6bbf2f0ae6a31fad9733ca2b96e3649ccef3d32 SHA512 8e2d93832638cadad63459d3ae56c0fdcd6d4e263183d18868b30e8248b0d967a209e0141726d48e905ad9df6c127a55aebcc90aa89daa3b1e553b95e778d4ec
+DIST thunderbird-128.2.3-zh-CN.xpi 785327 BLAKE2B cf429f92fdb233e10bae1331215d0939bca18f866ee2e575feadf6d538a2afe1938c0f148e1a41b72c750c8719335064adafb01c9ef4b3c63800b38ecbe76463 SHA512 5f96714f241516c8f1427a038d7a64ed60f4a4be08b270f2b1b84ccb2655471a78e9bd25af908666e5be79e8c151b7dcfadf41a81b6ea34f9fe49e3767872301
+DIST thunderbird-128.2.3-zh-TW.xpi 789781 BLAKE2B 52e5d1ed734bd3afa3d67eb9d39bb9c048a74610a50c38c11db722adb400d0983000ecd7aa61a3b380f3d229119a4619212a54f8f699b53f0ba4abc40ae709b2 SHA512 1706061452933c5d332353ec096adc296d14e8738c647a7d52048f090bb244f37890abd821e7b7872c1ee138035285c71ac0a220c4d04150aa7ce84026f529b6
 DIST thunderbird-bin_i686-115.15.0.tar.bz2 83141923 BLAKE2B 65ab94671fecf4f315c790ee4525041363f1f05796f6c0ca2c73948b478d37b299104fa61c425e2f0d5cc8e291119590a9f60491f126ade931e2634c866e050f SHA512 c63ba5fac74c89583af6e7beceec7e027463f1511522c8245fc80b1f55e3a87de97a54e2c599b87d5ab3bc928bcdfd9533e54d0fa7415a8af2618133aaa4a90f
 DIST thunderbird-bin_i686-128.2.2.tar.bz2 89436816 BLAKE2B 9b8046651ab6640341f1bd1226e6d74d4e2fbf72f428f9e3aded1c1b299be0bc0b5c34d8b3627a04be4cf0dea3224ff24eae42af81a95cc12588efd6dcaf3866 SHA512 2c616a6ffa4ed7cdc00f4d26067f9b2d7c624384eeb8c202dae551286bce6471966655d9fb22b4473926d90ee5352836662c375db8071c86935744ec4920d20c
+DIST thunderbird-bin_i686-128.2.3.tar.bz2 89440660 BLAKE2B b6a74bd123f5c53cf42bba9f04c502b22e638a02b2ad59bcb51fe6424738e25c492bcc4a043e859ed73564479d76d0580be5765a767098e2f3d627b9089095fa SHA512 e303b3025e3152ee248e62c26c5c8c7c5ab516fc0c43d0407db9da165c8d9aaadd88579088b6658eb602666cc54b2bb854c74c744a31ada5db312c875591620d
 DIST thunderbird-bin_x86_64-115.15.0.tar.bz2 80669183 BLAKE2B e288a1ee07234ac3ab5749f2c18f1f342b440353b66a7c6d5c80b1aa1e6f46dc2dd1e5c81124b0393fa61141ad4c6c14939f2fdf9f15547e4160df5bdba7d2ec SHA512 311df005e79ba20d6e4e61b934f0c1e450e15b6622ec741c1ead98a111c7679f01cc9b4bc2c713be470385ed8fe9f87a8c3a2d0adf6198623fbbc092134a9f06
 DIST thunderbird-bin_x86_64-128.2.2.tar.bz2 87105848 BLAKE2B 48cd8302e2c5059f0776cca72abf4d74d53b75c2479571c96b1e11a52964f3dc774e6ac65f0b8245c0580647b7d7eda693f4ca112c0fcba1bd2e3c565551eb48 SHA512 cc85b2686b03fed538043d0908a62ebd80d1a563eccbe2548f54115270db36d1dbdcf3b840039a4875abc8efb276a81c4d9fd4cd92310960bba0cce9b566a540
+DIST thunderbird-bin_x86_64-128.2.3.tar.bz2 86996077 BLAKE2B 99c07f8847a0077a7edf068a8e556ede314ca518c7d3187f757c0a9bc8f4a17b33a8f1d98089668cab4250c5e8abf6d69f6f6d1a45e7d0239e5ed9510140ae6f SHA512 3c4eb75bdbbc560ffbbd3104923416307721461d163b4fc068a1f0b9dcf7549560a58b0a68ac30d8845366c37cadc76099843b3c6024b9a0752faa909abf7cc4
 EBUILD thunderbird-bin-115.15.0-r1.ebuild 9025 BLAKE2B b920c9d10cd4ab8c4e9167f777fef46e6cd254c8a7c41955bf68bfa609b3f81170147b2e46910a29db50b9cc655200421524f2918b63ab7c43f370362432830a SHA512 93b42f57a301b7bc9433a7c93d042e7f8728f6bdf004cd5e3d9ba64f18059adce79cf534ee3686246534ab3509ff5cd4a2f5fc20cd9945071431f0ac675a520f
 EBUILD thunderbird-bin-128.2.2.ebuild 7456 BLAKE2B 548308fbb858db79ebc9e4f29027ffc808087bbf79234110ceec866f85e8f728683c516b72bec0c039647e8dad30a3e82e3e76771d45743f3dd195fbf8f7643b SHA512 e1d31d6e428b3e337605ba2377d41ca3ba7e1ac978f30b073afd8e6ad0550f1237dc83f1f8222dd78fd7c2c62e1c3d9f8bd0ead412adfd00b74c096db64fb8f6
+EBUILD thunderbird-bin-128.2.3.ebuild 7456 BLAKE2B 548308fbb858db79ebc9e4f29027ffc808087bbf79234110ceec866f85e8f728683c516b72bec0c039647e8dad30a3e82e3e76771d45743f3dd195fbf8f7643b SHA512 e1d31d6e428b3e337605ba2377d41ca3ba7e1ac978f30b073afd8e6ad0550f1237dc83f1f8222dd78fd7c2c62e1c3d9f8bd0ead412adfd00b74c096db64fb8f6
 MISC metadata.xml 255 BLAKE2B f54493c82293ca95a1ffd16d6199055650b0aaa18234716339235bab3f14a87327cb04fac6b543f973b3fef8047412e54edf72bf0b8a9424f4aa1d2eb0feec30 SHA512 28c0ab3671ed2c65cd9694181f7f9c4a8bea53dee0a0a06f0d9086166317a87611017b105d5150167597c45a7dd8921182fd6bf9d1b3fc7408c0e94f36189e33
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-128.2.3.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-128.2.3.ebuild
new file mode 100644
index 000000000000..1df793b39ec9
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-128.2.3.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit desktop optfeature pax-utils xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}esr"
+
+SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}esr.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_SRC_BASE_URI}/linux-i686/en-US/${MOZ_P}esr.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="https://www.thunderbird.net/"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0/$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+alsa +pulseaudio selinux wayland"
+
+RESTRICT="strip"
+
+BDEPEND="app-arch/unzip"
+RDEPEND="${DEPEND}
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	>=dev-libs/glib-2.26:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	sys-apps/dbus
+	virtual/freedesktop-icon-theme
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.11:3[X,wayland?]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libxcb
+	>=x11-libs/pango-1.22.0
+	alsa? (
+		!pulseaudio? ( media-sound/apulse )
+	)
+	pulseaudio? ( media-libs/libpulse )
+	selinux? ( sec-policy/selinux-thunderbird )
+"
+
+QA_PREBUILT="opt/${MOZ_PN}/*"
+
+MOZ_LANGS=(
+	af ar ast be bg br ca cak cs cy da de dsb
+	el en-CA en-GB en-US es-AR es-ES es-MX et eu
+	fi fr fy-NL ga-IE gd gl he hr hsb hu
+	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
+	pa-IN pl pt-BR pt-PT rm ro ru
+	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	mkdir "${S}" || die
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			MY_SRC_FILE=${_src_file}
+		fi
+	done
+}
+
+src_install() {
+	# Set MOZILLA_FIVE_HOME
+	local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	dodir /opt
+	pushd "${ED}"/opt &>/dev/null || die
+	unpack "${MY_SRC_FILE}"
+	popd &>/dev/null || die
+
+	pax-mark m \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN} \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/defaults/pref"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs-r1.js gentoo-prefs.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/chrome/icons/default"
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^} (bin)"
+	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
+	local desktop_filename="${PN}.desktop"
+	local exec_command="${PN}"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Add apulse support through our wrapper shell launcher, patchelf-method broken since 119.0.
+	# See bgo#916230
+	local apulselib=
+	if use alsa && ! use pulseaudio ; then
+		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
+	fi
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" \
+		|| die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@MOZ_FIVE_HOME@:${EPREFIX}${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" \
+		|| die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	local HAS_AUDIO=0
+	if use alsa || use pulseaudio; then
+		HAS_AUDIO=1
+	fi
+
+	if [[ ${HAS_AUDIO} -eq 0 ]] ; then
+		ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"
+	fi
+
+	optfeature_header "Optional programs for extra features:"
+	optfeature "fallback mouse cursor theme e.g. on WMs" gnome-base/gsettings-desktop-schemas
+	optfeature "ffmpeg-based audio/video codec support, required for HTML5 video rendering" media-video/ffmpeg
+	optfeature "encrypted chat support" net-libs/libotr
+	optfeature "desktop notifications" x11-libs/libnotify
+}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index c47239ae7a50..d405d9842284 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -202,7 +202,73 @@ DIST thunderbird-128.2.2-vi.xpi 787028 BLAKE2B c9fb95cbd3055b58f38d8e166eb64899a
 DIST thunderbird-128.2.2-zh-CN.xpi 785327 BLAKE2B 095094bc0b01974406837e776d263b96c85699123f7c5bb6cd9126e5da03c5320eaafac24344205b49a463a8b1729121f73882734aedd723ad43178ba24f0bf8 SHA512 345bba000b277941423af0f3f47763208a565a408c99a6a8ff5619d3d5a91a8c5c18d867d667f6ecdc2f56dad4007ccd2f75cff113bb7eb294f3ee2d9b8d1def
 DIST thunderbird-128.2.2-zh-TW.xpi 789780 BLAKE2B 1e1d95617c86fbcc00804dd18dcad0cc1b876ba09a2162696d14075e4814810aadc24e2124b25df935f380171a6dd1a95ec679b28ea509aeeb27d99b3a1e5950 SHA512 0b650d6c00a0dc05119e20b4d072124c98e70f70a7b98f05644e344fe952b8992d9aa5ea0f320e0f13c3c80e07e8a23f3160e4443510c139ebeedf2eb7778d1f
 DIST thunderbird-128.2.2esr.source.tar.xz 676994144 BLAKE2B e3eec7d15b4d855376ef1aa9ae2de490134a156f8ca817fbb88d6a942a567692656235ed3bf3cd11e6846b033a4ae56cdfaacde8365ac1d1facb2f41f4abf30b SHA512 6300f3f6d3a907e849a6acf06101d7441680a4eab965955887ac829886d4f2152e49a0ca97255e3cd9de579fea9ff5c03f75c70a361116a66c735face885ab89
+DIST thunderbird-128.2.3-af.xpi 530348 BLAKE2B 0cce80e2872b19315d3c91e3770737864e11baea97ff91d98923f82a6ca24563227a013d27454fdccf87ecb74a11804ed67dcc4c33093536c57a15e10254c2e8 SHA512 32799387dd5976f2765bdde160f4a63e0943970605afa697f0cc33929a99d8fe26f049dd03743e5ea051c1fe817d9530b83041ed124b8fad01087860f7675861
+DIST thunderbird-128.2.3-ar.xpi 679865 BLAKE2B 875056b81818289195e905bc1054a0d95aeb6968c8a783c851ea4c510d026cfe19bed962b4d4e98f174b5417e0bd97a2ae0160c429277820146998a39d5fbe2c SHA512 c06229ec5ba3517a11f63a74060ef539a40df1eb69966c473cbc8c02e090524b4cf04b1f65f5815680a90745d2f287f8d8b7f2b7412305700abf8203ffb96711
+DIST thunderbird-128.2.3-ast.xpi 561054 BLAKE2B 8b0ab0bb93ca93c14707371454a24d108d9e6cf0d9b6814ea4915a4cb37fdb42d159c3f8500d5cdda92e3ecd7a342fe8f1963398359209a538d438b655cbf5d4 SHA512 06b3821672e5e3266008ef1b0006eab3adb485824902b1819e5ab7b9934a81ddc0b98be0be81ed0502bc6eb2aa0415e36b1dd1632f9f91c988678ea5680ceb99
+DIST thunderbird-128.2.3-be.xpi 755101 BLAKE2B 8809c9c42e164f92acfcec3ce377df19c1c2263ac833ec6ddb42de61f8d8504c9af76b0e66f118d1e1922e51fb27ffbfee0b9a8a98086105f48ea30dc7f0934d SHA512 121dfbdfa4dd1e882b31e19be5061ab6ee9540ead08105f7fe19d8d96e079f6125b5d607083dba7b0394acc7eb5d94adf06dfb46ccecc9d362180fe6e221b243
+DIST thunderbird-128.2.3-bg.xpi 807860 BLAKE2B 15559cd9b6868c550c8e42204bbaa1a0c094e6aeb23fdb238c31888842831f48df24a350b4854cb766634bca5b06fdb09f8ceaf3f967740e9e3c4b6d08bf92c0 SHA512 2f14b9942a2b274eaada910db4ea2bb077c89839a2353f535cded5d6e9931a36504dfbbe5a9b176987de053a9a6b7d14163cdafaa77c372de2b9a2003770cd49
+DIST thunderbird-128.2.3-br.xpi 652475 BLAKE2B 291ed76a94ece1359883e9417a7cfad32960de514248f480526b1daca024270f45b45b981bbf2802ca18534e8d74e183b176274b93405dcb669cbc7d01057d06 SHA512 fd7864aa685c8e0528e28f11ddcc475f497a1761487f57a3e2818e385a93cce5f094cef3a87f986efc747f9c06ca6edc15d4e9722f9bab5702f51161de19395f
+DIST thunderbird-128.2.3-ca.xpi 708966 BLAKE2B e0fcdb44beb729bc9e5cb58eec484ee456fdc58ed90696eb9510883a3b3e9423b1487b0147bc5eee880d5a08df17024923be9be0dea50558ff9a529cae5ad361 SHA512 f67349ddb4a11047ec4cc9ff81b86a9e62c0360231537deddef05b699722eda1b4a1babeb1dd302234118d86ade7321665fbb554a4d47dca4cac3c180279b7e1
+DIST thunderbird-128.2.3-cak.xpi 671704 BLAKE2B d1673e684c46aeba61717e4aa7c0d3777475e3b868d373ef791cd77463393625e6bbe4b7508db8cda599467a8c5d8a3378497bd40f496ab02da779141221a201 SHA512 810463d933fe2c2f842edf8600142730bb7e62b4d7787d2ec94b0cb958b9a5a99e9a4fb5c5857581e1dec61fffb6ab15cd667b5ee4a11c04ae4d3118d3f8cd80
+DIST thunderbird-128.2.3-cs.xpi 785043 BLAKE2B cc71c1fd367a1ce1196c1b247e5ea322a6a39420bbd5eb6158f1e11b0b8128294922401600b8a15a5f72033f74e9a7474e79b6c92d5c374e4901d54618ec2a9a SHA512 f2bee313f571c0dadc42002d14ae44c87da4b85dfa224c236e3a452916a8696daca3833f6e1c0749be9f47b4c0e30c8bea4de9a3a8610c9278c81f8c4938fabd
+DIST thunderbird-128.2.3-cy.xpi 749049 BLAKE2B 44218fe51318541ef939a9a039a683dfac584793da2967342888b9a55eb6a8e40bb07c97b8dc98b7c6b2ae778e70111d89384af0b47d33d59db7ee4fb4858e45 SHA512 07260b39f0743b2959cdbac5ed2204089a75131374e664f58af9adcbbe0cd20e542ea606e5e1857674fd2a34f8408dfb9e7ecda02d2c3b75965ebabea200e9c9
+DIST thunderbird-128.2.3-da.xpi 734114 BLAKE2B 023d89566e4489c9fe58888ce5210bccc98259066ef9efab69976d56921d1276e4731f23fe9e743a4fe74a74567a6ff5d34c280ff2e2891741fc5ebccc04fa92 SHA512 9ed710942242a17004ca67ea47b3f888ea5bc01b191d53b0e973ea45a3483f9a9d84172dc7bb8d219017918d9639d892b3311dbb2461b0d5ece3fa2634f40427
+DIST thunderbird-128.2.3-de.xpi 766249 BLAKE2B d5425b53e84f1d59d7640bd819aff84663568a526917a86e11eaf348e46bf9e3f1f29a6d0826591388137a72f762fee59ae8069b48569dc404004231f304aebf SHA512 5c5ba44a13014f65a304136a38e9ccc376202db274c0d4daeb511beb5ea45b75c8008eef41d28d984fcd295e233c67e4f81cfe51f6ab42eb64788e32c4239673
+DIST thunderbird-128.2.3-dsb.xpi 782741 BLAKE2B fc8270fb2043b605ef1551d8252a85881ba09bc31a48e11ff3c9366abe55bbd607b57db7ee0dbbe6a64b71aee35c0eea0e4076576cfe1cddbc4833f5056fa7bd SHA512 b4a145f85cdba1bbe8d13ed3481c9140d3bdee2bd499080f73ec7a490e0c995596fdb488da65a2048daf687617fbdf5d9ce963560b444a90d498c99ceec3aa06
+DIST thunderbird-128.2.3-el.xpi 889268 BLAKE2B 8d6f1a215e4743c4b7e9fc05e62683672b98fd8176f102413ca13c959160aa17a173ba89a01cc1e2dcc371df621b60f3a84a8e5613e676a2b70a96118f050f9e SHA512 53b75b9c98933284c4e551eb0d0e6cc610c83e416b2537d668976ec594d7ef07c15abaa6b88105090b585ad53ff848462842e0d222db45fc61a66f3658529c0a
+DIST thunderbird-128.2.3-en-CA.xpi 702142 BLAKE2B d4a6e3b1102f1e7818eec0ea6aa93c3c86e40270e8b7c8f1b6013a0323c338cad145110227e61f48695edaa6338b6907c2ef49a52a7deca37cd5c80e8925ca70 SHA512 809c007b0b5f2abf9656e021bd226d177dea1c400ae33d5e5a9603a1b1d608302c063e12854b8e9a8bbc0a3dd60bb68f9796a6761c5f7fb41a65ddb374e892fb
+DIST thunderbird-128.2.3-en-GB.xpi 702699 BLAKE2B 76b47c8660e04f14e59e4c103226051afde9a8883d899b85700bae525b1109b599451fc9d262363006b05de97abb39141d54b897af6789f9aec3cb4094d0bb8c SHA512 884764e2e957d434ae7908b0d98eb7807114fd0fb38f9a6ab88aab848e06369e57e30d4403a70d054bf0b637754b6191d3cfdf42de30317f61822cf638bddd7a
+DIST thunderbird-128.2.3-es-AR.xpi 758350 BLAKE2B b81ac10875c17c4d64e5f0a734c41a4a67a60f70ad9eb95b747c033ee5025a72b3336efc78417c79c2334169e5ceb2c6ef744399d5e87658415f8c15a1f590fc SHA512 dd21bbffbbbd4e342eb5474d83ae0ed1c6d7a0b85b54f3dca3c6929d96f2bce408a4b7db19b093a8c0946b5c636ab0514399f6bbc2525929eb1af1d6c50c36f9
+DIST thunderbird-128.2.3-es-ES.xpi 723515 BLAKE2B 328bb470f5f4089d1bdde4c67b0de8bf7eadde658b24550f04dbff35d1becae4705795e0940543e768073fe7d032be9ecf6d42a99f1c089682bca5ff15f8c3aa SHA512 236353230d32caeafac611cdc977a0f51d8dd354a458e741827fa9057238699780485ea42de8665970159f38ccf978e46a33b8213003675e81a21c25718e341b
+DIST thunderbird-128.2.3-es-MX.xpi 737706 BLAKE2B d1dc9f1e72837d8249c3034194c08c6a13663ac2277b38a04151feb5d9b1e1b98ea8e53f57dc84feee1416403bbc50f9848fe29e75417d2df9bff1b93b6b0f6c SHA512 f56b1e441cca2cf544374ea64a7d642e6be0f5fb18fa696ee15ecac2dfd015e95fcea87c446bc619b6cac129eab777ce5b844ee535bc5541a2be6368c8fffa14
+DIST thunderbird-128.2.3-et.xpi 696278 BLAKE2B a221cd844a2e1ab4f38fe868985bb15685c335b8d8bd9c3082c5c212b8ecf2db75898431898165113bd3752eeb91985e98896f23755aff6fddb67b097f3d95df SHA512 3485be28ba289f811a1cafc64c4e4b2208110eac115df5cbd4a4e2ac5ec33c0b29f050c0805759f07b0098f282feef1387b1adee9a6ae1e6b3727d929ab982c4
+DIST thunderbird-128.2.3-eu.xpi 726801 BLAKE2B 7d1e52d02c85114ddaeeea23116b5a1ebe54e492b5736725f23bd4079b9c14480b90e39a7c9a4835380d17e13d773c637332972e34cefaecdbfe1bf4acf403be SHA512 b5b306270445429fb071c139a1e144e2d9379e425568787f0f878f4412d8124b2638f4499e161b3f7fe70a6f8f01b87c721d06f92795c1dc9d90d2431e452978
+DIST thunderbird-128.2.3-fi.xpi 733650 BLAKE2B f2cd5cf44043e00af1b99cf4b123d950f26580bf71245a7dcef721425822fda7a22bf2485984859d04df2fa7d9c8c8a61734a554918d249f9c5abf2def299ec7 SHA512 52f9fde6f297e31892bc6ded2c97e104082c3569e68cd71a3b668477875fe896953f8f5eb175825904003b663dce5cec7b27df1ed3f61e911f7a82ceeb5a07bf
+DIST thunderbird-128.2.3-fr.xpi 770185 BLAKE2B fba3d2943e16bba6625b63808e1c047d26ab51ddb4442d7ab0f6f3eca5ce777aa5fb586d0584c8b99bb3255e51042aecaeaf5dc626ed5a84061d3bf0e472b6c5 SHA512 13aa3a0814f38cd3fd018882e61a769de65b237f0bbe6e506464922363318ceadf4bafacfcfe2c4880dc5fbc77eed82b2cb621e96da086100cd201bbafdb0bd5
+DIST thunderbird-128.2.3-fy-NL.xpi 752849 BLAKE2B ae11cf74df19d5fa8b7fe377531c208695eac8b90f888e316df130db2bdcad1d3b7756f04375006be5d49419d7da3559fe7c32890976e3715fbfabe0d961a0fd SHA512 ad29a5ee2a29f80c7cf4a2bbed47544846261849ad14c36a375e40794208c4c28f9ec863d8a18f45fa3377b085aa7f6a58f26d6f333d981398b0c3f3aea9dfd2
+DIST thunderbird-128.2.3-ga-IE.xpi 615198 BLAKE2B d1688832bc527c0dcde92fb86b2c71be69e95dc0ae6c5cdc13806d9caea46581a739cbd392ba965b321ec4b4c1070b04ffb75135815b81198a13366248fd6778 SHA512 395b56b68af0e9b248cf5b3d1c12f17ca912dcc74456035906a3cc3a832648ebf3ab71978817118fff132c436782ab5128c8b87c92d5a625c7be2d86448d8441
+DIST thunderbird-128.2.3-gd.xpi 727803 BLAKE2B a1fc7f1a4495867b935ca04b7988a2970f0337851be66671cffd6b67b16866270181fa014f412273076220ae6bd5beb5a720dca35bae8000c09e971890dec43d SHA512 5621a60df17c1f115facfc14864ab3bb2e19501c3f1fc268faa40f085dba83cace61cbfe3fbd411954a4aa0bc517758a4addda49111718ae9ec4f2ba76d0b54c
+DIST thunderbird-128.2.3-gl.xpi 736572 BLAKE2B 96d7b9c43e37750327bb36e3fac3a4e31ff8a245ba58cb0c588a89e2bdf0587c1efe575ca02f15ac318a86d82c5a5e7ba73cb79a9fed40058db3386dd03bf655 SHA512 25722ad053e6a4ef0ef42386587c103619c43eafeb77b9761834fd7c3a2defeeda78da47f39ae972ca89184eb11c410938600f1ec69d068fdbbf1c38ecf4441c
+DIST thunderbird-128.2.3-he.xpi 700301 BLAKE2B 036b9333c04f905317fa53fae42d49e67cd56882021213e35c202ed0f44467925076b6d476eef7364fa5ad73b9aabe215f59491dd37b1ae3ce0e128eb6f6f9af SHA512 c72bdfd9d007b6d6f6f9f6a868593b589260dbd98ba0053e9abd0adf0beb4e8aa154f7eaad75d020e0cb870f5e9c0016b7e3cebb85245e22b8c84bb712dbdb94
+DIST thunderbird-128.2.3-hr.xpi 715018 BLAKE2B 0bf73c79e4dc9321a5d75d39a83006ea0328f9661c308482a43c7aac3bf204321d17212ab0c7c659ba529ce469f13559eca7e8c7e7d90716ee02dbde38214594 SHA512 4d6cfe8dfe2412cd644ebbf5837878ca3caf87be0d07f4443abf4fce5f8d20687f1a2eed69430b3da59d16b9f9ccf2677708dd69910ecb2ed082996a97da1e03
+DIST thunderbird-128.2.3-hsb.xpi 780137 BLAKE2B 7b83862d1b6816f31c6b6c2fb2c8a78ed5507f46706d4b20c82b222946bba8d54c065bcb5ea26ea0375f17cdec05b4476323c19b550d11af638b05ffeb456670 SHA512 d04171abdb3474dc30f520e5c5d6aa4bbe39f749f6d3447b3bfa65a9c97c2cf92742a85049844f65fb6979b92fb429ec6be75c8033fe2907e8b6307fce039b2c
+DIST thunderbird-128.2.3-hu.xpi 782932 BLAKE2B ec05be9d6d54f4228780dcb566432ade115447bd9ded560b536ea44513ff889b2ba300b076eaa144e5ba03523d4f367654191e60a5ed7c823c7abe0eb97e6dc3 SHA512 83522b6f181b701929c26a804f4e83025156a553181daab0cf7b7cd504c7618bba77a80360221719f96f0839d2ef6085bd6767e6c67fd04b93f0d66341eee741
+DIST thunderbird-128.2.3-id.xpi 666011 BLAKE2B d9c26766f3183b1cb345307b10bbf8907c4b7117ed1f8dcc09d0629be8285acd10799e8b0a142487280f1161a1e85807e7ae460e45363a2e9f6e126fd8644479 SHA512 5753e509fe4c62e84f9da28bf39cb34b088bd512cbd7716050b1a236367b4347fc1a7b4bec79ce69a9b1669a798a0f99fb1b98fb4cc552fde5bf82d64379c13a
+DIST thunderbird-128.2.3-is.xpi 743886 BLAKE2B 1801650fd8833ce1b771cdecef891475b694a6d0dfcf82107da3e761cce459e7955d54912875c2917b212ff0379d58fa693f0ab1bcc22e17559add9356b3b266 SHA512 1648151bdff1910aa931890b0fda724d92fe83e2b0b2fae06c4cc6e483d0b4909139af053b1489b8538e284ad2f3e0c2526a1d009ff4aa430d6878e9e7ffff93
+DIST thunderbird-128.2.3-it.xpi 690395 BLAKE2B e5f00cde104ae2104c833aed244a7dc0df4b42b0d96174f8cfc92ef9f1e360fc7591ec53879396225003c1322c0eeaf2ecb36acbef3120b5a85c28fa77b1fe96 SHA512 970f5f4b23992d98431ede90fbc15e2163a26c3559d251a4a834653bfde6a61a48450a79304343261ffbf7326b47d5ec43aafa14682732d369f96ab02f27d32a
+DIST thunderbird-128.2.3-ja.xpi 819904 BLAKE2B 4c01201320dd464919dc24c2f9b5b9ca3d29df6692e89ea2ee908a1d5ab6355edf34281a6dfe8cc993783c0b7fae4dfebe13e2655524dbe2a048f2eabcef2e0a SHA512 c7e16a74ab4a7075dab9fcd6d5eca97bcc5f4615a14ea54b393b27beb29ae2a9f3a196b653d77beb1053a80b8730f6f9b029d56e675626c98e858e15ede6b792
+DIST thunderbird-128.2.3-ka.xpi 796047 BLAKE2B 1e92b26f7d35bf7c1009913f1189613dd217c017612a8fa3eb17fde3574120982d84b6db63f15731d98609caaef40c58231a4240f42bebcf5cb61c17795ffd86 SHA512 3b496548a99ce40a7443679f12e5e24db5fa8616d1a3f92e138d753355f5b0deb452811c2e1374893af79b15e8ddd576fa1e86f04a6c27cbd50fe4d178d387f9
+DIST thunderbird-128.2.3-kab.xpi 731858 BLAKE2B 3014788c8786b13c38f054b0ace3cfcde2a1e6bbb2643d5cb27d375a94d09cd9f8f7aa008d787b383e4a16e02ca006d11c34761ca4f7b5aea163d0163ac3f882 SHA512 a0c823c189c61f2bd9eea059d72bb574ed28c1b25921908c9f91c943903dd0e38c856f1bbc72bfc087c53792a53d08a9c15cc951ef03c0cd2de7daaac630d095
+DIST thunderbird-128.2.3-kk.xpi 857289 BLAKE2B c3fde9f0a523b784c005a1dca755249037035965aeb93231232d1972667bb4e5a6e9ea2bec3e7579eb73e99e9cb03c9d39ec14b230389edaf5e9d3a0b11be2f6 SHA512 85eba822d16425daee7a0a262759bbd67a84b3a9b0964e3b4b5810209f74678ff938b0a803c65e6fdd903ed08d549528a5b352c7d757b91c9f1002e78b7ae835
+DIST thunderbird-128.2.3-ko.xpi 755164 BLAKE2B 32da4298f807b89e32c8f671451a1cfc0d68d2137b384d11f387b1df2127ae27ad002fdc34f411864ce6c036f2716993147b0d9e8bfc98c0daaac88baef2002d SHA512 5a84c696af0d86ecbe2ef7bdd8f00e090b5ec4ea5cfd9dbd12437ca85b58a97ac9df9fd00e0617d45b698337b810cc37715f0b77231121d669e3415dcf5ca487
+DIST thunderbird-128.2.3-lt.xpi 700918 BLAKE2B 782349e2040f2d44122d7dfb7f8432c1b1451273846a28abf3a95eca859e83f141aa7556e08bf1a30d550cd37caec431478bf693f6249ed44109a42fe1ca269b SHA512 b2b011945544684b8feba7337e99d7c9b2f7433b9984891916d9a712816ce72cecf6a5cb066e3ea0a8a506e03de38e0c81b5450af4e56a74e9f190db1f609d5e
+DIST thunderbird-128.2.3-lv.xpi 623624 BLAKE2B 9987ba7bddd406896c21b2b6e315adc68462b26ff7f0c07e6ddbc14fd9b8ec41ebb477372b44d0e3bd9e6dec688a0453ace7340d070083bdfd45d2357ae60ed3 SHA512 1ac493ac0fac5db2837b2d0ba7bd5af7b462f6b8a425a62fa4dd1ef459335519c98ad86cd393d0a09581f594b84388423abd8a7814beca0bc74ba28707885640
+DIST thunderbird-128.2.3-ms.xpi 581082 BLAKE2B 0abe87234e5cec44fb7f266c601b015afad41ef281a395144f3b81a6646c5d0e16759117c36df7dc3e2f6f9b9818e973b757ad2fa5115f264aa9418b62b50741 SHA512 2b334336edcd962040f3dd0631bf8cafc975831d4db4a702b024aaa8e1eacd5e804cfef39da342fb52addab6ce46339e0424e51ddec9a5d6c889c3f4f35c7ccf
+DIST thunderbird-128.2.3-nb-NO.xpi 703764 BLAKE2B e7acc196caf13a68b95d0bfdd9b4ea0aa65ed90454042c63faa501cb80ded0a0c9d8e27084fd89ef3f620e1c4d4f721a78e27981267b49aafbe227344cf4a7dd SHA512 7bed62a3f549382cf1104a467e947bc0a5fc815785f0c4d34ab674e48a216bd9502b021e42e5111fa9243294a821c137daeb2f0b94bf7d05336c7f7b6f111aae
+DIST thunderbird-128.2.3-nl.xpi 744106 BLAKE2B 4ddbb1af6d7e435c131fdd8e48a13ef93322ee2bc59450e1baf3c74022ae3f7230bbc5c2fd5cec882d3074a68c3ad07fc282f9a67460c79fa2b061ae9aa69c62 SHA512 b383c5712dbeda8ca7215a9974759c366cc43df927d6ec9906cca22aca4a0631930c9f83fd01bc86d2ab1727a464d4b110a69e1f9c5df16de2ae722417f887ba
+DIST thunderbird-128.2.3-nn-NO.xpi 723768 BLAKE2B a93c63c16aea56eb4c3db82cc735524637ecddcbb726777b8cac804903b770b765be5f56bd4650b8831846b50bdcc2f52cb44b156b703aa6ad749b4cea8b0897 SHA512 cb2fe3637d568c6fa09962f047cd4070a7a5ce217c036f16e39060a25bea8d08f55df708c72daa81d3ae8d15d349d36ba4a07c068bc023c15f8815537593e7d1
+DIST thunderbird-128.2.3-pa-IN.xpi 683075 BLAKE2B c8e5d26bd2e6c54707d3784d6e5ea0a72709020f09beaf79442258309bcf888cd7a628151fab43a2b533db5b69423bc6d93bfc16d34e189990a33cac511a50b9 SHA512 d5f385c2e11f4e42984e635546ecf3c635e7011c1544f85bc1ebc11a064b2c4ba36621c220643721e9b6afe10a9abbbae4c45ab4554a449dcae96e147b32d70a
+DIST thunderbird-128.2.3-pl.xpi 762951 BLAKE2B 8336b7c2b3d76ac9eccd6b9bbdb5cfc41a94b50590ad4955c5873ee7c8550a690a198ee2d00347d21d938b076ba76ea3c41c4299ae58d2af70495515ac27d9c5 SHA512 86322abc42d22bc18185b468cc6221f5b09c4f0aa52ac1e372a26557cd29814b57a2f6fa56f6f64835a2a8d5e16394f41dbdc042904f9d2f802d0621bcced03d
+DIST thunderbird-128.2.3-pt-BR.xpi 751313 BLAKE2B da9513dd69b3e946e1941add87094cd9a4cc37732866e9a0e803e3037c86066acb8222bcf8470e079fc440c9c81e7a3b81077b41d36e5e435fc4207ca8e63fb4 SHA512 b1e7bcb05dbc30421b3ddf1faa036d8ca459553de980173a371e7820113460096d159c906bc753b0bd34fe41b907e4a18a6f238a87d516db9431bd2efb7db0fa
+DIST thunderbird-128.2.3-pt-PT.xpi 746870 BLAKE2B 108737b8be502f88e7b685dd8dc72627e91c7eef0bf35794f5076f3549ec681ec5ff6c07f29e46a91ad3a416e4da0738cc1c7ee55be2fbe8d596bb1115e6317e SHA512 0887d9294ef5010c4e8cd842b2ec03a75d41e5fdf6ea58ca624667b75933f84806c998548e05d574e2dd765e650c6defe52eca136b54ae792e2d406068a18160
+DIST thunderbird-128.2.3-rm.xpi 746778 BLAKE2B 0a96b77402567aa878ec32c3e0f8ab097eedec27c7073ac79bbbbf45ec866b8c6644717a52a236be65f50eccd1e4e6868430e1c6df717f4ac716ad4cfb9b4719 SHA512 28ee3b0fbdc1f6065483e27e7e7a7faee247e9f899d3e3eaee7775d5d9b9495d193fcc740f18b960b3d47948fb8e5116f3ffa81c95f2babfae6dfeb562270dd5
+DIST thunderbird-128.2.3-ro.xpi 669741 BLAKE2B 5b1ee45981743b244670d8a1403b987ee7ee05b35a947b613fe9bf898bb6aab99cad5d4078087fe09a4f8a9534333da32d629820b74a1e4f83bca6ad857936b0 SHA512 00f91287cdcb7ca12a0369ecc4ea091d238f7757716f80cb43fa545466bdd891a65cf8f5b4de840a0c2086e8b8cbeda6908fa57595f387a15ccdc8187212413d
+DIST thunderbird-128.2.3-ru.xpi 872245 BLAKE2B 8df13bff59a25707ac66ead0c24ff11b72a318752b6ee03e22bd40a9f5f76f1a8157459c0a8f2ce35f82dc4a259e3c5029372a99c89af25c358367f524118f15 SHA512 ddabb2e2e3a47b6d6c99f3cbdc06ed99f0660029a6dbd5070c155be17fadf7dbbf1bb7342586fac194ce2c694e8b4619f4eb5333f7107fadd23e3db4a84a2973
+DIST thunderbird-128.2.3-sk.xpi 784170 BLAKE2B 8033becfeab21871005c5ad85feef88f50aa94135c8929fba5cfc38d2a704d43a603f684aca66748b1dd400e49897db23f5421dc956a5915bc82411238126ff3 SHA512 3aa13c254e5d0d7bb62e242fa2aeebc5ed8b38dd7f623d1c592708727abb231b703514f621ca15d0519cb449605a07156a1391071e7450ce4ee058df1e69e957
+DIST thunderbird-128.2.3-sl.xpi 743549 BLAKE2B 733ad0aafcee0b028792970530340139ad4aaaf2a6ed994672d698aca464e926e3a24912b0fccef14169a3a6f2707f4a48a7a954b89eae7840046284fb170230 SHA512 ae5fa42f0c61bf1e22a572b9b137a85a0e4e08ec8ee04841e4ee6d98efbf913e319583460216e3e52cec90f9e88ec1e7d6c0a5639c717c950892ae1d86d4a6a8
+DIST thunderbird-128.2.3-sq.xpi 765887 BLAKE2B 6926a806642d2218497939935eea43fc65599a9dfdf8489d41018190766204db09e3123e02bfeeef634759f3c903a4ac315c8a3134bd8b3cc10696d969c8adda SHA512 5c29a91ed1ee4b48bde070e73a1e5972639d6bade766db2325b186ef33bf083a6b596a48775c0f7c492da30598ba3f013746f46d818f3220c62696897ab9df8e
+DIST thunderbird-128.2.3-sr.xpi 771005 BLAKE2B 47d54c5dc304c401211d8ab01bbc2a81ff8e0ce08976e96d0bb0248a00f3b52dfc57c03805197780d1ead796769c005c3489d5c2788d8ab145fcf893b0d1327f SHA512 3abe0a6c6e3c467cf7410a4466a1be50fefed5b27229e4eb2b69538e5e2707764e978d7984035fc45503e8df8989bc79f2821774806f7597b13049f5cf3f51e2
+DIST thunderbird-128.2.3-sv-SE.xpi 747521 BLAKE2B 77593daf9500fd057a2c36d13a4a8b0460eaeb5877886cba1b09696c4dd9cfef7a38e2131ef00895ac138339ff88abd727beffad43dd8f1495079312d30ff31d SHA512 d6e2ee6c9cd9c75ec32ca36856da1637ad14d842d625f0424f7b5e3a63f46af2790de9bacb5d87f6e426684271ca8ce99261b4bff12d7cbfae4f977f67b93120
+DIST thunderbird-128.2.3-th.xpi 813954 BLAKE2B f8e0ee98fc952bb39908c8aea8fbefafbc5845a4a0bc9be71aeeaa21a6fe336169ad344dcc602b27056b8e805c01fe05377f781816266ffb6d9fa7d1b4dd0a9d SHA512 a76970e0114c3e11eea7b5c5b662e0e71a8157a1f6f185d63029824700a0afdc281649b82b6fb455dc3e45f97e2af208a20f9df20471491e105cf61d6983ce58
+DIST thunderbird-128.2.3-tr.xpi 758164 BLAKE2B 11db65586e5ae93b8f32aa7feb04ffbecd0569c0a810faa519749c63aa1655371c47b623c90007131242dcd058b34ff2387c91d638a0fa636f8f3b7d174a9118 SHA512 53ced8767e14e3e35ada7beff6a1acf609d64d82b0a3f8049dafa253d7f2af30d464fc4e7f6f69fb55d55fab4d54a507fc22be5dda435f9fc1f5da4b4753a1c3
+DIST thunderbird-128.2.3-uk.xpi 856055 BLAKE2B 47c844953d4d643f67d0f13e18e50e9d47d52ff38f6e1785fd2c76fda1a06d4014ae16a988742c55351ee740ac241bfdd4366f24b043447cf80a562be49e74da SHA512 4640757ade6d6e033a2f920b7dd31654b6d3aa44f6b6ea1e5457916a8814daa2140bb5a37ba003113c27fd3afcadaa54e8220b49e5f37ab39c684005a7f82244
+DIST thunderbird-128.2.3-uz.xpi 592133 BLAKE2B 8ca52413636d339953004fc12ce56905e7fc5b81659930e57cc1e8bbb3c5c4e07f162a7bde1706d3d1702f5df00f63abb2948bb27183362b8adeda86e4d8197a SHA512 74795147371204a1f4a5cbbd34833b38c3b313c43f851e0f163fe99b849a52eedf3f0164f03c859bb624b52344e7b3bf0cb8fd88e5dc607ed4f660799631e110
+DIST thunderbird-128.2.3-vi.xpi 787028 BLAKE2B faa1a4f4c0589ff2f9758cc92facfd11efea8ea4cc026d925877e5730173ad8d5e5da4043db123b403a07589e6bbf2f0ae6a31fad9733ca2b96e3649ccef3d32 SHA512 8e2d93832638cadad63459d3ae56c0fdcd6d4e263183d18868b30e8248b0d967a209e0141726d48e905ad9df6c127a55aebcc90aa89daa3b1e553b95e778d4ec
+DIST thunderbird-128.2.3-zh-CN.xpi 785327 BLAKE2B cf429f92fdb233e10bae1331215d0939bca18f866ee2e575feadf6d538a2afe1938c0f148e1a41b72c750c8719335064adafb01c9ef4b3c63800b38ecbe76463 SHA512 5f96714f241516c8f1427a038d7a64ed60f4a4be08b270f2b1b84ccb2655471a78e9bd25af908666e5be79e8c151b7dcfadf41a81b6ea34f9fe49e3767872301
+DIST thunderbird-128.2.3-zh-TW.xpi 789781 BLAKE2B 52e5d1ed734bd3afa3d67eb9d39bb9c048a74610a50c38c11db722adb400d0983000ecd7aa61a3b380f3d229119a4619212a54f8f699b53f0ba4abc40ae709b2 SHA512 1706061452933c5d332353ec096adc296d14e8738c647a7d52048f090bb244f37890abd821e7b7872c1ee138035285c71ac0a220c4d04150aa7ce84026f529b6
+DIST thunderbird-128.2.3esr.source.tar.xz 675213768 BLAKE2B 0d2257a976414d4cb0e2ce5bce76926737add33b50071dab3ad25fad64a69f08e491b9ac7430701555b740db67418133ce0e2995caf7be76094805b35a036b6d SHA512 f852d1fe6b8d41aa2f0fbc0fceae93cccf1e5f88d9c0447f504de775283289b82b246b79a01e8eb26e9c87197fb33138fb18c75ecc3f5f1bcfefa3920a7c7512
 EBUILD thunderbird-115.15.0.ebuild 39759 BLAKE2B 2da23464f236749409d2809acf66d836379e9fbf393039c144c4223d942095b1235d0450a57cde3ea4b2e0867d285f5af336b9da95a299c9eecdf8a3a39302f9 SHA512 dc244a723ab46e1e781eaecbfa4c801b00687eaa58acd8569fc9334d28a5cadbf1c7d87d86af4d82857cd3241f7e3ed7e3ea2caeea32dcddb4da002049f94ce3
 EBUILD thunderbird-128.2.1.ebuild 35775 BLAKE2B 698bb70b80b04d0505165c867c6b4835d8d72c58c5291f736e87caf5fa329578a3d4b8a16d357468b307466d4e473c1d7a19aa06e75f12b71a55bf8d680dc73d SHA512 1eaca1ab731975eb94255cf3b62527245575c252d2fc7139038bbd94d97511961771486791a867a88632c7e7351d0d1f7696e2a323b998f1d4f826fe76cbd599
 EBUILD thunderbird-128.2.2.ebuild 35846 BLAKE2B 4cabe6828e8f85c236d04e8d967adaa58a33abbb16cb782d3bfd913fbb898723bf1c9e38ee5aa6fc795c3ae88849a4dba7334aa6086f74b0f5017c29465e77ad SHA512 0c829e16e7e5519c7c8c52b2e643680709f23ccfd9d2264c1529e0d6c1a706ccadec6c3273173f871cc3cacadc55ce8afb465f777e8daaf70995ad6dc384776c
+EBUILD thunderbird-128.2.3.ebuild 35846 BLAKE2B 4cabe6828e8f85c236d04e8d967adaa58a33abbb16cb782d3bfd913fbb898723bf1c9e38ee5aa6fc795c3ae88849a4dba7334aa6086f74b0f5017c29465e77ad SHA512 0c829e16e7e5519c7c8c52b2e643680709f23ccfd9d2264c1529e0d6c1a706ccadec6c3273173f871cc3cacadc55ce8afb465f777e8daaf70995ad6dc384776c
 MISC metadata.xml 2522 BLAKE2B ae04a037a2497aa3cdbe64ab396557f8f73b67cedb943e48823261348645d4d2d88e9741f6724cc7b0dc68edf7d9b7a79bd738efef39a196ad14ca6353bbf377 SHA512 ff4f36837cea680c924d108e5110c04f3fc55537905f1ae73e297db3ecbcdf0f4409ba6e7a046e188554d640ddacaaf781ac0618c62b214b13a6a15599dbde8e
diff --git a/mail-client/thunderbird/thunderbird-128.2.3.ebuild b/mail-client/thunderbird/thunderbird-128.2.3.ebuild
new file mode 100644
index 000000000000..1599513d8ece
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-128.2.3.ebuild
@@ -0,0 +1,1192 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FIREFOX_PATCHSET="firefox-128esr-patches-03.tar.xz"
+
+LLVM_COMPAT=( 17 18 )
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="manual"
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multiprocessing \
+	optfeature pax-utils python-any-r1 toolchain-funcs virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}esr"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}esr-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~juippis/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}esr.source.tar.xz -> ${MOZ_P_DISTFILES}esr.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="https://www.thunderbird.net/"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+
+IUSE="+clang +dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio"
+IUSE+=" selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent"
+IUSE+=" +system-libvpx system-png +system-webp wayland wifi +X"
+
+# Thunderbird-only USE flags.
+IUSE+=" +rust-extensions +system-librnp"
+
+REQUIRED_USE="|| ( X wayland )
+	debug? ( !system-av1 )
+	pgo? ( lto )
+	rust-extensions? ( dbus )
+	wayland? ( dbus )
+	wifi? ( dbus )"
+
+TB_ONLY_DEPEND="selinux? ( sec-policy/selinux-thunderbird )
+	!system-librnp? ( dev-libs/jsoncpp )
+	system-librnp? ( >=dev-util/librnp-0.17.1 )"
+BDEPEND="${PYTHON_DEPS}
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}
+		sys-devel/llvm:${LLVM_SLOT}
+		clang? (
+			sys-devel/lld:${LLVM_SLOT}
+			virtual/rust:0/llvm-${LLVM_SLOT}
+			pgo? ( sys-libs/compiler-rt-sanitizers:${LLVM_SLOT}[profile] )
+		)
+	')
+	app-alternatives/awk
+	app-arch/unzip
+	app-arch/zip
+	>=dev-util/cbindgen-0.26.0
+	net-libs/nodejs
+	virtual/pkgconfig
+	!clang? ( >=virtual/rust-1.76 )
+	!elibc_glibc? ( dev-lang/rust )
+	amd64? ( >=dev-lang/nasm-2.14 )
+	x86? ( >=dev-lang/nasm-2.14 )
+	pgo? (
+		X? (
+			sys-devel/gettext
+			x11-base/xorg-server[xvfb]
+			x11-apps/xhost
+		)
+		!X? (
+			|| (
+				gui-wm/tinywl
+				<gui-libs/wlroots-0.17.3[tinywl(-)]
+			)
+			x11-misc/xkeyboard-config
+		)
+	)"
+COMMON_DEPEND="${TB_ONLY_DEPEND}
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/libffi:=
+	>=dev-libs/nss-3.101
+	>=dev-libs/nspr-4.35
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/mesa
+	media-video/ffmpeg
+	sys-libs/zlib
+	virtual/freedesktop-icon-theme
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+	x11-libs/pixman
+	dbus? ( sys-apps/dbus )
+	jack? ( virtual/jack )
+	pulseaudio? (
+		|| (
+			media-libs/libpulse
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	libproxy? ( net-libs/libproxy )
+	selinux? ( sec-policy/selinux-mozilla )
+	sndio? ( >=media-sound/sndio-1.8.0-r1 )
+	system-av1? (
+		>=media-libs/dav1d-1.0.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-gfx/graphite2-1.3.13
+		>=media-libs/harfbuzz-2.8.1:0=
+	)
+	system-icu? ( >=dev-libs/icu-74.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= )
+	system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
+	system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	wayland? (
+		>=media-libs/libepoxy-1.5.10-r1
+		x11-libs/gtk+:3[wayland]
+	)
+	wifi? (
+		kernel_linux? (
+			|| (
+				net-misc/networkmanager
+				net-misc/connman[networkmanager]
+			)
+			sys-apps/dbus
+		)
+	)
+	X? (
+		virtual/opengl
+		x11-libs/cairo[X]
+		x11-libs/gtk+:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXrandr
+		x11-libs/libxcb:=
+	)"
+RDEPEND="${COMMON_DEPEND}
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )"
+DEPEND="${COMMON_DEPEND}
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libICE
+		x11-libs/libSM
+	)"
+
+S="${WORKDIR}/${PN}-${PV%_*}"
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang && ! tc-ld-is-mold ; then
+		if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
+			einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
+			einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
+				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing!" >&2
+				einfo "Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+MOZ_LANGS=(
+	af ar ast be bg br ca cak cs cy da de dsb
+	el en-CA en-GB en-US es-AR es-ES es-MX et eu
+	fi fr fy-NL ga-IE gd gl he hr hsb hu
+	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
+	pa-IN pl pt-BR pt-PT rm ro ru
+	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_clear_vendor_checksums() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -ne 1 ]] ; then
+		die "${FUNCNAME} requires exact one argument"
+	fi
+
+	einfo "Clearing cargo checksums for ${1} ..."
+
+	sed -i \
+		-e 's/\("files":{\)[^}]*/\1/' \
+		"${S}"/third_party/rust/${1}/.cargo-checksum.json || die
+}
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+mozconfig_add_options_ac() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_add_options_mk() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_use_enable() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_enable "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+mozconfig_use_with() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_with "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+virtwl() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	[[ $# -lt 1 ]] && die "${FUNCNAME} needs at least one argument"
+	[[ -n $XDG_RUNTIME_DIR ]] || die "${FUNCNAME} needs XDG_RUNTIME_DIR to be set; try xdg_environment_reset"
+	tinywl -h >/dev/null || die 'tinywl -h failed'
+
+	local VIRTWL VIRTWL_PID
+	coproc VIRTWL { WLR_BACKENDS=headless exec tinywl -s 'echo $WAYLAND_DISPLAY; read _; kill $PPID'; }
+	local -x WAYLAND_DISPLAY
+	read WAYLAND_DISPLAY <&${VIRTWL[0]}
+
+	debug-print "${FUNCNAME}: $@"
+	"$@"
+	local r=$?
+
+	[[ -n $VIRTWL_PID ]] || die "tinywl exited unexpectedly"
+	exec {VIRTWL[0]}<&- {VIRTWL[1]}>&-
+	return $r
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has usersandbox $FEATURES ; then
+				die "You must enable usersandbox as X server can not run as root!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6600M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm-r1_pkg_setup
+
+		if use clang && use lto && tc-ld-is-lld ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
+				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		python-any-r1_pkg_setup
+
+		# Avoid PGO profiling problems due to enviroment leakage
+		# These should *always* be cleaned up anyway
+		unset \
+			DBUS_SESSION_BUS_ADDRESS \
+			DISPLAY \
+			ORBIT_SOCKETDIR \
+			SESSION_MANAGER \
+			XAUTHORITY \
+			XDG_CACHE_HOME \
+			XDG_SESSION_COOKIE
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if use pgo ; then
+			# Update 105.0: "/proc/self/oom_score_adj" isn't enough anymore with pgo, but not sure
+			# whether that's due to better OOM handling by Firefox (bmo#1771712), or portage
+			# (PORTAGE_SCHEDULING_POLICY) update...
+			addpredict /proc
+
+			# Clear tons of conditions, since PGO is hardware-dependant.
+			addpredict /dev
+		fi
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
+			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
+		fi
+
+		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
+			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
+		fi
+
+		# Mozilla API keys (see https://location.services.mozilla.com/api)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
+			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_prepare() {
+	if use lto; then
+		rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die
+	fi
+
+	# Workaround for bgo#917599
+	if has_version ">=dev-libs/icu-74.1" && use system-icu ; then
+		eapply "${WORKDIR}"/firefox-patches/*-bmo-1862601-system-icu-74.patch
+	fi
+	rm -v "${WORKDIR}"/firefox-patches/*-bmo-1862601-system-icu-74.patch || die
+
+	# Workaround for bgo#915651 on musl
+	if use elibc_glibc ; then
+		rm -v "${WORKDIR}"/firefox-patches/*bgo-748849-RUST_TARGET_override.patch || die
+	fi
+
+	eapply "${WORKDIR}/firefox-patches"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Make cargo respect MAKEOPTS
+	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
+
+	# Workaround for bgo#915651
+	if ! use elibc_glibc ; then
+		if use amd64 ; then
+			export RUST_TARGET="x86_64-unknown-linux-musl"
+		elif use x86 ; then
+			export RUST_TARGET="i686-unknown-linux-musl"
+		else
+			die "Unknown musl chost, please post your rustc -vV along with emerge --info on Gentoo's bug #915651"
+		fi
+	fi
+
+	# Make LTO respect MAKEOPTS
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure || die "Failed sedding multiprocessing.cpu_count"
+
+	# Make ICU respect MAKEOPTS
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/intl/icu_sources_data.py || die "Failed sedding multiprocessing.cpu_count"
+
+	# Respect MAKEOPTS all around (maybe some find+sed is better)
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/python/mozbuild/mozbuild/base.py || die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/third_party/libwebrtc/build/toolchain/get_cpu_count.py || die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/third_party/libwebrtc/build/toolchain/get_concurrent_links.py ||
+			die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/third_party/python/gyp/pylib/gyp/input.py || die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/python/mozbuild/mozbuild/code_analysis/mach_commands.py || die "Failed sedding multiprocessing.cpu_count"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py || die "sed failed to set toolchain prefix"
+
+	sed -i \
+		-e 's/ccache_stats = None/return None/' \
+		"${S}"/python/mozbuild/mozbuild/controller/building.py || die "sed failed to disable ccache stats call"
+
+	einfo "Removing pre-built binaries ..."
+
+	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Clear checksums from cargo crates we've manually patched.
+	# moz_clear_vendor_checksums xyz
+
+	# Create build dir
+	BUILD_DIR="${WORKDIR}/${PN}_build"
+	mkdir -p "${BUILD_DIR}" || die
+
+	# Write API keys to disk
+	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
+	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
+	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	local have_switched_compiler=
+	if use clang; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+
+		local version_clang=$(clang --version 2>/dev/null | grep -F -- 'clang version' | awk '{ print $3 }')
+		[[ -n ${version_clang} ]] && version_clang=$(ver_cut 1 "${version_clang}")
+		[[ -z ${version_clang} ]] && die "Failed to read clang version!"
+
+		if tc-is-gcc; then
+			have_switched_compiler=yes
+		fi
+		AR=llvm-ar
+		CC=${CHOST}-clang-${version_clang}
+		CXX=${CHOST}-clang++-${version_clang}
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain,
+	# AS is used in a non-standard way by upstream, #bmo1654031
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	export AS="$(tc-getCC) -c"
+
+	# Configuration tests expect llvm-readelf output, bug 913130
+	READELF="llvm-readelf"
+
+	tc-export CC CXX LD AR AS NM OBJDUMP RANLIB READELF PKG_CONFIG
+
+	# Pass the correct toolchain paths through cbindgen
+	if tc-is-cross-compiler ; then
+		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
+	fi
+
+	# Set MOZILLA_FIVE_HOME
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set state path
+	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	# Initialize MOZCONFIG
+	mozconfig_add_options_ac '' --enable-application=comm/mail
+	mozconfig_add_options_ac '' --enable-project=comm/mail
+
+	# Set Gentoo defaults
+	mozconfig_add_options_ac 'Gentoo default' \
+		--allow-addon-sideload \
+		--disable-cargo-incremental \
+		--disable-crashreporter \
+		--disable-disk-remnant-avoidance \
+		--disable-geckodriver \
+		--disable-gpsd \
+		--disable-install-strip \
+		--disable-legacy-profile-creation \
+		--disable-parental-controls \
+		--disable-strip \
+		--disable-tests \
+		--disable-updater \
+		--disable-valgrind \
+		--disable-wmf \
+		--enable-js-shell \
+		--enable-negotiateauth \
+		--enable-new-pass-manager \
+		--enable-official-branding \
+		--enable-release \
+		--enable-system-ffi \
+		--enable-system-pixman \
+		--enable-system-policies \
+		--host="${CBUILD:-${CHOST}}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--target="${CHOST}" \
+		--without-ccache \
+		--without-wasm-sandboxed-libraries \
+		--with-intl-api \
+		--with-libclang-path="$(llvm-config --libdir)" \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system \
+		--x-includes="${ESYSROOT}/usr/include" \
+		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
+
+	# Set update channel
+	local update_channel=release
+	[[ -n ${MOZ_ESR} ]] && update_channel=esr
+	mozconfig_add_options_ac '' --update-channel=${update_channel}
+
+	if ! use x86 ; then
+		mozconfig_add_options_ac '' --enable-rust-simd
+	fi
+
+	# For future keywording: This is currently (97.0) only supported on:
+	# amd64, arm, arm64 & x86.
+	# Might want to flip the logic around if Firefox is to support more arches.
+	# bug 833001, bug 903411#c8
+	if use ppc64 || use riscv; then
+		mozconfig_add_options_ac '' --disable-sandbox
+	else
+		mozconfig_add_options_ac '' --enable-sandbox
+	fi
+
+	# Enable JIT on riscv64 explicitly
+	# Can be removed once upstream enable it by default in the future.
+	use riscv && mozconfig_add_options_ac 'Enable JIT for RISC-V 64' --enable-jit
+
+	if [[ -s "${S}/api-google.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
+	else
+		einfo "Building without Google API key ..."
+	fi
+
+	if [[ -s "${S}/api-location.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-location-service-api-keyfile="${S}/api-location.key"
+	else
+		einfo "Building without Location API key ..."
+	fi
+
+	if [[ -s "${S}/api-mozilla.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
+	else
+		einfo "Building without Mozilla API key ..."
+	fi
+
+	mozconfig_use_enable rust-extensions thunderbird-rust
+
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libevent
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-png
+	mozconfig_use_with system-webp
+
+	if use system-librnp; then
+		mozconfig_add_options_ac "+system-librnp" --enable-compile-environment
+		mozconfig_use_with system-librnp
+	else
+		# This controls the backend of the bundled librnp. Choices are "botan" and "openssl".
+		# RNP Upstream recommends to use botan. In Gentoo it's preferred to use system-librnp.
+		mozconfig_add_options_ac "+bundled librnp backend = botan" --with-librnp-backend="botan"
+	fi
+
+	mozconfig_use_enable dbus
+	mozconfig_use_enable libproxy
+
+	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+
+		# Increase the FORTIFY_SOURCE value, #910071.
+		sed -i -e '/-D_FORTIFY_SOURCE=/s:2:3:' "${S}"/build/moz.configure/toolchain.configure || die
+	fi
+
+	local myaudiobackends=""
+	use jack && myaudiobackends+="jack,"
+	use sndio && myaudiobackends+="sndio,"
+	use pulseaudio && myaudiobackends+="pulseaudio,"
+	! use pulseaudio && myaudiobackends+="alsa,"
+
+	mozconfig_add_options_ac '--enable-audio-backends' --enable-audio-backends="${myaudiobackends::-1}"
+
+	mozconfig_use_enable wifi necko-wifi
+
+	if use X && use wayland ; then
+		mozconfig_add_options_ac '+x11+wayland' --enable-default-toolkit=cairo-gtk3-x11-wayland
+	elif ! use X && use wayland ; then
+		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland-only
+	else
+		mozconfig_add_options_ac '+x11' --enable-default-toolkit=cairo-gtk3-x11-only
+	fi
+
+	# LTO is handled via configure
+	filter-lto
+
+	if use lto ; then
+		if use clang ; then
+			# Upstream only supports lld or mold when using clang.
+			if tc-ld-is-mold ; then
+				# mold expects the -flto line from *FLAGS configuration, bgo#923119
+				append-ldflags "-flto=thin"
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+			fi
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+
+		else
+			# ThinLTO is currently broken, see bmo#1644409.
+			# mold does not support gcc+lto combination.
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		fi
+
+		if use pgo ; then
+			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
+
+			if use clang ; then
+				# Used in build/pgo/profileserver.py
+				export LLVM_PROFDATA="llvm-profdata"
+			fi
+		fi
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# lld is upstream's default
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+			fi
+
+		else
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "linker is set to bfd due to USE=-clang" --enable-linker=bfd
+			fi
+		fi
+	fi
+
+	mozconfig_use_enable debug
+	if use debug ; then
+		mozconfig_add_options_ac '+debug' --disable-optimize
+		mozconfig_add_options_ac '+debug' --enable-jemalloc
+		mozconfig_add_options_ac '+debug' --enable-real-time-tracing
+	else
+		mozconfig_add_options_ac 'Gentoo defaults' --disable-real-time-tracing
+
+		if is-flag '-g*' ; then
+			if use clang ; then
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
+			else
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
+			fi
+		else
+			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
+		fi
+
+		if is-flag '-O0' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
+		elif is-flag '-O4' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
+		elif is-flag '-O3' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
+		elif is-flag '-O1' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
+		elif is-flag '-Os' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
+		else
+			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
+		fi
+	fi
+
+	# Debug flag was handled via configure
+	filter-flags '-g*'
+
+	# Optimization flag was handled via configure
+	filter-flags '-O*'
+
+	# elf-hack
+	# Filter "-z,pack-relative-relocs" and let the build system handle it instead.
+	if use amd64 || use x86 ; then
+		filter-flags "-z,pack-relative-relocs"
+
+		if tc-ld-is-mold ; then
+			# relr-elf-hack is currently broken with mold, bgo#916259
+			mozconfig_add_options_ac 'disable elf-hack with mold linker' --disable-elf-hack
+		else
+			mozconfig_add_options_ac 'relr elf-hack' --enable-elf-hack=relr
+		fi
+	elif use ppc64 || use riscv ; then
+		# '--disable-elf-hack' is not recognized on ppc64/riscv,
+		# see bgo #917049, #930046
+		:;
+	else
+		mozconfig_add_options_ac 'disable elf-hack on non-supported arches' --disable-elf-hack
+	fi
+
+	if ! use elibc_glibc; then
+		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
+	fi
+
+	# System-av1 fix
+	use system-av1 && append-ldflags "-Wl,--undefined-version"
+
+	# Allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	# Make revdep-rebuild.sh happy; Also required for musl
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+
+	# Use system's Python environment
+	export PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
+
+	export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
+
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# Portage sets XARGS environment variable to "xargs -r" by default which
+	# breaks build system's check_prog() function which doesn't support arguments
+	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
+
+	# Set build dir
+	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
+
+	# Show flags we will use
+	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	# Handle EXTRA_CONF and show summary
+	local ac opt hash reason
+
+	# Apply EXTRA_ECONF entries to $MOZCONFIG
+	if [[ -n ${EXTRA_ECONF} ]] ; then
+		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
+		for opt in "${ac[@]}"; do
+			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
+		done
+	fi
+
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
+		[[ -z ${hash} || ${hash} == \# ]] \
+			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
+		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
+	done
+	echo "=========================================================="
+	echo
+
+	./mach configure || die
+}
+
+src_compile() {
+	local virtx_cmd=
+
+	if tc-ld-is-mold && use lto; then
+		# increase ulimit with mold+lto, bugs #892641, #907485
+		if ! ulimit -n 16384 1>/dev/null 2>&1 ; then
+			ewarn "Unable to modify ulimits - building with mold+lto might fail due to low ulimit -n resources."
+			ewarn "Please see bugs #892641 & #907485."
+		else
+			ulimit -n 16384
+		fi
+	fi
+
+	if use pgo; then
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+
+		if ! use X; then
+			virtx_cmd=virtwl
+		else
+			virtx_cmd=virtx
+		fi
+	fi
+
+	if ! use X; then
+		local -x GDK_BACKEND=wayland
+	else
+		local -x GDK_BACKEND=x11
+	fi
+
+	${virtx_cmd} ./mach build --verbose || die
+}
+
+src_install() {
+	# xpcshell is getting called during install
+	pax-mark m \
+		"${BUILD_DIR}"/dist/bin/xpcshell \
+		"${BUILD_DIR}"/dist/bin/${PN} \
+		"${BUILD_DIR}"/dist/bin/plugin-container
+
+	DESTDIR="${D}" ./mach install || die
+
+	# Upstream cannot ship symlink but we can (bmo#658850)
+	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
+	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
+		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/distribution.ini distribution.ini
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/defaults/pref"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs-r1.js gentoo-prefs.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
+
+	# Force hwaccel prefs if USE=hwaccel is enabled
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
+		>>"${GENTOO_PREFS}" \
+		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
+
+		if use wayland; then
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel wayland prefs"
+			pref("gfx.x11-egl.force-enabled",          false);
+			EOF
+		else
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel x11 prefs"
+			pref("gfx.x11-egl.force-enabled",          true);
+			EOF
+		fi
+	fi
+
+	# Set dictionary path to use system hunspell
+	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
+	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
+	EOF
+
+	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
+	if use system-harfbuzz ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
+		sticky_pref("gfx.font_rendering.graphite.enabled", true);
+		EOF
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${S}/comm/mail/branding/thunderbird"
+	local icon_symbolic_file="${icon_srcdir}/TB-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^}"
+	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
+	local desktop_filename="${PN}.desktop"
+	local exec_command="${PN}"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" || die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" || die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# does not need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		einfo "APULSE found; Generating library symlinks for sound support ..."
+		local lib
+		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# A quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+
+	optfeature_header "Optional programs for extra features:"
+	optfeature "desktop notifications" x11-libs/libnotify
+	optfeature "encrypted chat support" net-libs/libotr
+	optfeature "fallback mouse cursor theme e.g. on WMs" gnome-base/gsettings-desktop-schemas
+}