6 files changed, 181 insertions, 5 deletions
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 5682e131af09..630b4f11b43e 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 631fe9880f4a..9713c9809b3c 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -3,11 +3,13 @@ DIST neomutt-20231221.tar.gz 3812682 BLAKE2B 367435e30d7e4259c1e8b6ece9531949465
 DIST neomutt-20240201.tar.gz 3831010 BLAKE2B 70654b8edb5b6e01585bb3551a7af3722aebc44a70804ec9e16511eec9b892a4bcf68e043699591b2610095558f3893d4d7f5c15e860c7b8c17458a872c3f170 SHA512 431270a093bfa5024f2565aa8921e3482262210ca03c410362b6fa504aa1f2e299d1f6eb63cb05dcaf7b1328051b5d32c4fd719b5cb7ddec83a176a85ff5dc53
 DIST neomutt-20240425.tar.gz 4092419 BLAKE2B 35728b226a3c6d59b95daf7f2af1d155ed15b9f82958f79fc4c012df1014c5995f8e542ca2df2cdb6d79bbc537c13e7e941355dab5e4879c999f23f107db1ace SHA512 bb47aba1aa8ecc824d9d0a8f6be23f2d39f0aac06739920ee349ff96bc27cbe39b6cfa797f648eb683fe49f01fa1873805a3ed2e7cbf4124dae12517591c02c9
 DIST neomutt-20241114.tar.gz 4072339 BLAKE2B 86ca9eefa9649bc7684415213041ae513a17a1a5a6107f7904fa4a7581557f7a9585f6d98f715adee0c93bbe43651055ffca3d7c051f3c8bcff5d633237b0d7d SHA512 3325b27fc09fdb0147abbd17ecc5059ab2460a7537b09fad846a9835c70cd7a1904488c76cb420a8db57b43905ebf81b8a2f0afa6a3c7f7a827c760d63353f00
+DIST neomutt-20241212.tar.gz 4098483 BLAKE2B 2a0d81e2e990864d7330e35dab555e898c0d992b2722fe5dbfc09324377b425c877f081c5944508b14907413891baf19e08936df03cb7dd926c624691805d563 SHA512 cbb82a2fb5943092019e6c538af15dbf83cbb4620310d8a7295a425ef10594a07b0ed64a3e4174f75e9483da08daa36d01c7405b5252a9e074076af7e2023079
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3
 EBUILD neomutt-20231103.ebuild 4463 BLAKE2B 83c9873528ffa8f66c46cb80fe62dc101fda631d0cf2e0ab34ce37ec1aaf49fb8eb34681917e604ea22a526ff1374aff17da259ae311b65d8999ab854983f890 SHA512 766a69580b7f00bf2c17982f9d7e6c51425bd1d50c62a69f67f32a046fefb693b45286aba8fe76fc06d34aa0866f80b217c24ec79401ec64756d3d4de317b50b
 EBUILD neomutt-20231221.ebuild 4463 BLAKE2B 83c9873528ffa8f66c46cb80fe62dc101fda631d0cf2e0ab34ce37ec1aaf49fb8eb34681917e604ea22a526ff1374aff17da259ae311b65d8999ab854983f890 SHA512 766a69580b7f00bf2c17982f9d7e6c51425bd1d50c62a69f67f32a046fefb693b45286aba8fe76fc06d34aa0866f80b217c24ec79401ec64756d3d4de317b50b
 EBUILD neomutt-20240201.ebuild 4501 BLAKE2B 7c2c093d95684f221b1ddbf908cf6dff94197f316d64425d4835406cee90cb47685d695fea9ac3fa49a126d16c0f1af0bdce3b568057d81a7e6626a9eb7e121b SHA512 9030012914f5675c09a169e7d488818b6d1c03a7ec12e7c250daa69e9f6f02c9d6598b67438a6548d7f68283602a89184c587eada9296c3b923e67cc3959cb12
 EBUILD neomutt-20240425.ebuild 4503 BLAKE2B 62be73a60fa6a34d3c15d7405f51501221226ddf2ecfcb91ec984d442b931836b805dac9ea96e46ae4cf94edb644888630cbacfc7dff4d807984a725abe02270 SHA512 8bdfeaea8905258c429f0693d6ae20b11debaa6ead870633dbc14084a8d66f13f9354fa93b26de4da910b4159005d4ce896b713a15705a6ac1af573a969c6c8d
 EBUILD neomutt-20241114.ebuild 4503 BLAKE2B 62be73a60fa6a34d3c15d7405f51501221226ddf2ecfcb91ec984d442b931836b805dac9ea96e46ae4cf94edb644888630cbacfc7dff4d807984a725abe02270 SHA512 8bdfeaea8905258c429f0693d6ae20b11debaa6ead870633dbc14084a8d66f13f9354fa93b26de4da910b4159005d4ce896b713a15705a6ac1af573a969c6c8d
+EBUILD neomutt-20241212.ebuild 4503 BLAKE2B 62be73a60fa6a34d3c15d7405f51501221226ddf2ecfcb91ec984d442b931836b805dac9ea96e46ae4cf94edb644888630cbacfc7dff4d807984a725abe02270 SHA512 8bdfeaea8905258c429f0693d6ae20b11debaa6ead870633dbc14084a8d66f13f9354fa93b26de4da910b4159005d4ce896b713a15705a6ac1af573a969c6c8d
 EBUILD neomutt-99999999.ebuild 4503 BLAKE2B 62be73a60fa6a34d3c15d7405f51501221226ddf2ecfcb91ec984d442b931836b805dac9ea96e46ae4cf94edb644888630cbacfc7dff4d807984a725abe02270 SHA512 8bdfeaea8905258c429f0693d6ae20b11debaa6ead870633dbc14084a8d66f13f9354fa93b26de4da910b4159005d4ce896b713a15705a6ac1af573a969c6c8d
-MISC metadata.xml 1821 BLAKE2B b6c051b5d1a2d172664f027ebbba02ff978daabea1b8998516ffe70b385484fcfcf95283574b8f5f3d7f9478256437fe02f31e61f2dbe2541a5ad618d539134e SHA512 c8874d8b19fd7f6584519cbfca832fb4d3b662d4dfb35ee2e49081b126339d496d5b5eafe7dab6ea6cffedda287b657f44c0a266bcf3585c9e5b60efd3ccae59
+MISC metadata.xml 1677 BLAKE2B 7d116ede60d9e130e9d4d37c1db3f27d7bce1467a68b66f61f34ec3a931eb756065aae7d5af4f351d07d26182b2448021619da0762c5a6ba57fc96db5b886c37 SHA512 e651273328fbad142c6fc78dbee3c79a58076deadb3a0b1b9896726c147ee3c1fbc47ec41d544dd01ad0158d3f4b45a8843a1a0becfd9d66ff8c8cd5f1c3aa20
diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
index 6adb8f922fb6..583a2caccf5e 100644
--- a/mail-client/neomutt/metadata.xml
+++ b/mail-client/neomutt/metadata.xml
@@ -10,8 +10,6 @@
 		<name>Marc Schiffbauer</name>
 	</maintainer>
 	<use>
-		<flag name="asan">Enable Address sanitizer for debugging</flag>
-		<flag name="ubsan">Enable undefined behavior sanitizer for debugging</flag>
 		<flag name="autocrypt">Enable autocrypt.org support</flag>
 		<flag name="berkdb">Enable BDB (Berkley DB) backend for header
 			caching</flag>
diff --git a/mail-client/neomutt/neomutt-20241212.ebuild b/mail-client/neomutt/neomutt-20241212.ebuild
new file mode 100644
index 000000000000..f0e77fe65e6e
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20241212.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="https://neomutt.org/"
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+fi
+
+TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75
+SRC_URI+=" test? ( https://github.com/${PN}/neomutt-test-files/archive/${TEST_FILES_COMMIT}.tar.gz -> neomutt-test-files-${TEST_FILES_COMMIT}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb lz4
+	nls notmuch pgp-classic qdbm sasl selinux smime-classic ssl tokyocabinet
+	test zlib zstd"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? (
+		|| (
+			sys-libs/db:6.0
+			sys-libs/db:5.3
+			sys-libs/db:4.8
+		)
+		<sys-libs/db-6.3:=
+	)
+	gdbm? ( sys-libs/gdbm:= )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	lmdb? ( dev-db/lmdb:= )
+	nls? ( virtual/libintl )
+	qdbm? ( dev-db/qdbm )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	gnutls? ( >=net-libs/gnutls-1.0.17:= )
+	gpgme? ( >=app-crypt/gpgme-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
+	idn? ( net-dns/libidn2:= )
+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+DEPEND="${CDEPEND}
+	dev-lang/tcl:=
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| (
+			www-client/lynx
+			www-client/w3m
+			www-client/elinks
+		)
+	)
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mutt )
+"
+
+RESTRICT="!test? ( test )"
+
+src_unpack() {
+	if [[ -n ${A} ]]; then
+		unpack ${A}
+	fi
+	if [[ ${PV} =~ 99999999$ ]]; then
+		git-r3_src_unpack
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable autocrypt)"
+		"$(use_enable gpgme)"
+		"$(use_enable pgp-classic pgp)"
+		"$(use_enable smime-classic smime)"
+
+		# Database backends.
+		"$(use_enable berkdb bdb)"
+		"$(use_enable gdbm)"
+		"$(use_enable kyotocabinet)"
+		"$(use_enable qdbm)"
+		"$(use_enable tokyocabinet)"
+
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
+		--disable-idn
+		"$(use_enable idn idn2)"
+		"$(use_enable kerberos gss)"
+		"$(use_enable lmdb)"
+		"$(use_enable sasl)"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"$(use_enable ssl)"
+		"$(use_enable gnutls)"
+
+		"$(usex test --testing --disable-testing)"
+	)
+
+	if is-flagq -fsanitize=address; then
+		myconf+=( --asan )
+	fi
+	if is-flagq -fsanitize=undefined; then
+		myconf+=( --ubsan )
+	fi
+
+	econf CCACHE=none CC_FOR_BUILD="$(tc-getCC)" "${myconf[@]}"
+}
+
+src_test() {
+	local test_dir="$(readlink --canonicalize "${S}"/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	pushd ${test_dir} || die "Could not cd into test_dir"
+	NEOMUTT_TEST_DIR="${test_dir}" ./setup.sh \
+		|| die "Failed to run the setup.sh script"
+	popd || die "Could not cd back"
+	NEOMUTT_TEST_DIR="${test_dir}" emake test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# A man-page is always handy, so fake one - here neomuttrc.5 (neomutt.1
+	# already exists)
+	if use !doc; then
+		sed -n \
+			-e '/^\(CC_FOR_BUILD\|CFLAGS_FOR_BUILD\)\s*=/p' \
+			-e '/^\(EXTRA_CFLAGS_FOR_BUILD\|LDFLAGS_FOR_BUILD\)\s*=/p' \
+			-e '/^\(EXEEXT\|SRCDIR\)\s*=/p' \
+			Makefile > docs/Makefile.fakedoc || die
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^docs\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
+			docs/Makefile.autosetup >> docs/Makefile.fakedoc || die
+		emake -f docs/Makefile.fakedoc docs/neomutt.1
+		emake -f docs/Makefile.fakedoc docs/neomuttrc.5
+		doman docs/neomutt.1 docs/neomuttrc.5
+	fi
+
+	dodoc LICENSE* ChangeLog* README*
+}
+
+pkg_postinst() {
+	if use gpgme && ( use pgp-classic || use smime-classic ); then
+		ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
+		ewarn "  support.  You can probably remove pgp-classic (old crypt)"
+		ewarn "  and smime-classic (old smime) from your USE-flags and"
+		ewarn "  only enable gpgme."
+	fi
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
+}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 32afbe408018..52cd717a2956 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -202,5 +202,5 @@ DIST thunderbird-128.5.2esr-zh-TW.xpi 797336 BLAKE2B 78b896488e71b1db7990409fe17
 DIST thunderbird-128.5.2esr.source.tar.xz 674696420 BLAKE2B 3dea8ca8a7eb1e155e50a3a476d8b448c2e810eb347731efd078e15227073fb31c43eb8456678df21d834702085f3470248c51929fe01ed8c02735aa64364739 SHA512 cbfd4b1a7245c2a2f6ef9b2cf69d95a8095eba855755d00fd397351b21ad504733084d6f41801f4114be7015332b8db65e5290bec45f5321efc753412b9acecc
 EBUILD thunderbird-128.5.0.ebuild 34115 BLAKE2B 767d96ad146357bfc9bd7507d5f46349056eeb7ef8ee75277cc8310bba9690a662cead451788d33d71c971119121a645b6aea2e8368cb79ab06f9e01fe1fb255 SHA512 03edba5771b90cb823693f60968c7e5a125221c4a11585ea631bf2cadb6570d832414289050f8338a473d19a518dd4f4f72b67a157712a4ca1c0f58ecc0728af
 EBUILD thunderbird-128.5.1.ebuild 34116 BLAKE2B 9f8cbd07cfa3db2b6a506edd79197a050ee8006eb2c2ce7be79c2a9ff3626fa186eacdafadec26a9594609d1842ad846eda81c94ef3da3907094098c57065919 SHA512 b7e28e21debdaad028c4b104e2ba7dd224a2451d138a6744e7774c6ec5214ae32b7dbfd3cce3bfba89c46e39ffecef01adb93e1bd7909a8002b9d023e877bc4a
-EBUILD thunderbird-128.5.2.ebuild 34114 BLAKE2B 78e7040558a09322b2768aea5239c3768a34a01b647c96833544f3f888178666e8d667a0ad81eef4f73c02cf21fab24971bf3ee5e9fbe1439f59d040e9a95d05 SHA512 0c11b6b8593da023b466ffe67edffbef703efd32b1635426f17a071bfc0a03662bb93b8f1642e983bbeb4a8515e944e15c66ea80b7745d2f41b2d9b98ffa5e81
+EBUILD thunderbird-128.5.2.ebuild 34113 BLAKE2B 1f798c3550e02bed86ded41b991406a907d4c9db9a5a26c995682949549bae931f31b335d97df99a25608746357faa5206529dfddedb30f0b7b51958a14c1e3b SHA512 65af6cefc3fcb766368040fde4f688339ff373c2cba38156b5c9e44c7731dc0a43c79d5687459ef70c31a9af672154f05b532e5133611cf54100c5a3ae66a8ca
 MISC metadata.xml 2277 BLAKE2B e4681b61ae7363d0442ad382e5972c7654624c2033e43559d9d751af8abcebf6e1badede00b68d8f28ba0eda4b060acb3f730b79181d0acfc286c1a03c7cc2fe SHA512 517460e6a4ce6232570290b69596bc2e1913c7a95ef4df62216df4d3be7b8c83247004916ed5e74d285951d9e9d96fe80406d128a0764ab41aa26458805a1513
diff --git a/mail-client/thunderbird/thunderbird-128.5.2.ebuild b/mail-client/thunderbird/thunderbird-128.5.2.ebuild
index 59815787cf73..836f831a1a59 100644
--- a/mail-client/thunderbird/thunderbird-128.5.2.ebuild
+++ b/mail-client/thunderbird/thunderbird-128.5.2.ebuild
@@ -63,7 +63,7 @@ S="${WORKDIR}/${PN}-${PV%_*}"
 
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 
 IUSE="+clang +dbus debug eme-free hardened hwaccel jack libproxy lto pgo pulseaudio sndio selinux"
 IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx"