gentoo auto-resync : 26:11:2024 - 02:00:48

13 files changed, 148 insertions, 368 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index f25b6fc8f923..c503a7d28266 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index fe6742e3a15d..0608567500eb 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -1,6 +1,8 @@
 AUX alpine-2.26-fix-clang16-build-no-chappa.patch 6473 BLAKE2B 4e2f67efac3700124059f4c53836428e19efabb07ad8dea24ebf87d984ac72e19b06e24989cfa5dcf54013e1f0f6f233cbfa12a6243a1959ae23669fc5c07420 SHA512 d5f95906375def56495c4bdc02bf9c4bddcf22395847880709c2d453687a84a86f9940c5fde7639a1c702951273d91987443a6adbc5c9cce54e225b8dcca8403
 AUX alpine-2.26-fix-clang16-build.patch 7238 BLAKE2B 9be1bf52918a88eba356cdf257d0ad2a2c3be3ece8f47f2282222d7706fde8cf9374e5d6a0d72b7d1ed19b73a1b7460fd66b959b8d44f5f97285fe3c1b72e94e SHA512 7b38edbb5eca13ddad8e4aacb27f21ef2ae00c7b0c90a713c778e3c16a8bc94fe3fbd45100a6caa2e506747da109c3b73696b97de6ab6da8e7fbdf7477034481
 DIST alpine-2.26-chappa-5.patch.gz 173031 BLAKE2B 8719d37fde313e190608489e6191d4f0456f8a00ea267712e1c078ab1bbd3a8542bab3cf498faa1482fde386c24bf5335c54c39595ffb7fb019d13e975bf697a SHA512 aa979825367b309d5726055620c6f8f3effff954863e648de25f768ffbc175c3f91c8d1917e89116f35195a5ae266a9dcac51eb7f744f119ad848ddc0d10b8cc
+DIST alpine-2.26-patches-1.tar.xz 492948 BLAKE2B 00f7b0ac6f138522a0cdeefcdad084f8662f781dc6f415223646a5915e189c120fd7bcdb0c4ff455eb6db379faf18dfebd4dbb539833e295b2cb08719119128b SHA512 4fbf94fbad58a5d531c9637e3ad5c7288e055c151fe99300d760dbcf93497d7c3ac000df280f3d3e5f5302a0f08c7c7be4eb4f0a95fb08f736a9863aaf3d4fd6
 DIST alpine-2.26.tar.xz 7517628 BLAKE2B fe156974462dd566ac3fbe25cc54a1b2a480b3af46c8356356a97426f3e42495853efdbfeedc6173537dc150d90592c3fd9109e7d37f16738922a4205fd2f9df SHA512 359b5cb30be78a341b76c0475a2d5268b643788f14c9b5b9457af6748034e1d2e70fd7ddf59e5c59ad596a36d8a10afa9c41cbd74241c780b8575d8186168fd2
 EBUILD alpine-2.26-r4.ebuild 2955 BLAKE2B aa998acfbf7d88f891a54d7c7dcefa52b7701a2fa6cd41b4a6205c18a13eba4027163781e17b338a7ab865c1f19b21597204d30ce38a4527523d4fc3ad6741b1 SHA512 a6a669e55e2610407becb79ecf0bf6648cd133a04290289da8cb754b5b3df392d6de96eb5ae063ee37addf599cb399ed8b9e7beb4baf5ec16d5c8fd79741a0a5
-MISC metadata.xml 762 BLAKE2B 026faecac5042e19cce6f125f66fd7af22cbd50140abe315a686d1b129f53b939f5325f9bd1956d41b47da146b6f37c597fe91370722f2f4c7af8169cbcb0f66 SHA512 e11cb2d6c0612fc09302485c38d216245adcabde36fb2c6e829b452f10f3adc9037f1461305e2e3cc3e89025560ac3d621b90b94eea152c9c3e0c53a6c6f9512
+EBUILD alpine-2.26-r5.ebuild 2851 BLAKE2B 02152fe80c055dc1c4af522fbd12e6621a443e2165323f6a2efffeaaabb952c36f55ff292df4cec2a89717998243c748761007ceb6316071ab8036b8b90d9a27 SHA512 6921a364d18faced0f46eda8f61b2ae9f1b2f9e3f9be4ddda30d3d4811d65cd2e09f862f771839adf42a80c0e0e213c62e38ef4d97bea94ad31cab6ad1267df8
+MISC metadata.xml 900 BLAKE2B 99e799731159b6a0c942307a50cbf03acde80ed254645157ef0c84c180e9cb21c7eba1181b2ca985974635a02b409a970fec63da2d38ca5f44fdd0e66518ccac SHA512 c85ae97dbf936535937473126fa9e1ef58aa18c241446ae964bde45d9ea41f76fbc5d1baafd1cacff94afaafc6dffe1d1c5c853a643c39318606ebc41fd516ca
diff --git a/mail-client/alpine/alpine-2.26-r5.ebuild b/mail-client/alpine/alpine-2.26-r5.ebuild
new file mode 100644
index 000000000000..60568914b89e
--- /dev/null
+++ b/mail-client/alpine/alpine-2.26-r5.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic optfeature toolchain-funcs
+
+DESCRIPTION="An easy to use text-based based mail and news client"
+HOMEPAGE="https://alpineapp.email/ https://repo.or.cz/alpine.git/"
+SRC_URI="https://alpineapp.email/alpine/release/src/${P}.tar.xz
+	https://www.applied-asynchrony.com/distfiles/${P}-patches-1.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+chappa ipv6 kerberos ldap nls onlyalpine passfile smime ssl"
+
+DEPEND="sys-libs/ncurses:=
+	virtual/libcrypt:=
+	kerberos? ( app-crypt/mit-krb5 )
+	ldap? ( net-nds/openldap:= )
+	ssl? ( dev-libs/openssl:0= )
+"
+RDEPEND="${DEPEND}
+	app-misc/mime-types
+"
+
+src_prepare() {
+	default
+
+	# apply patches from upstream git to fix compiler issues
+	local patches=$(find "${WORKDIR}/${P}-patches" -type f -name "0*.patch")
+	for patch in ${patches}; do
+		eapply "${patch}"
+	done
+
+	# optional extra features, see https://alpineapp.email/alpine/index.html
+	use chappa && eapply "${WORKDIR}/${P}-patches/chappa-rebased.patch"
+
+	eautoreconf
+	tc-export CC RANLIB AR
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_configure() {
+	myconf=(
+		--without-tcl
+		--with-pthread
+		--with-system-pinerc="${EPREFIX}"/etc/pine.conf
+		--with-system-fixed-pinerc="${EPREFIX}"/etc/pine.conf.fixed
+		$(use_with ldap)
+		$(use_with ssl)
+		$(use_with passfile passfile .pinepwd)
+		$(use_with kerberos krb5)
+		$(use_enable nls)
+		$(use_with ipv6)
+		$(use_with smime)
+	)
+
+	if has_version "app-text/hunspell"; then
+		myconf+=( --with-interactive-spellcheck=/usr/bin/hunspell )
+	elif has_version "app-text/aspell"; then
+		myconf+=( --with-interactive-spellcheck=/usr/bin/aspell )
+	fi
+
+	if use ssl; then
+		myconf+=(
+			--with-ssl-include-dir="${EPREFIX}"/usr/include/openssl
+			--with-ssl-lib-dir="${EPREFIX}"/usr/$(get_libdir)
+			--with-ssl-certs-dir="${EPREFIX}"/etc/ssl/certs
+		)
+	fi
+
+	# Bug 935343; see imap/docs/bugs.txt
+	if use ipv6; then
+		sed -i "s/IP=4/IP=6/" imap/Makefile || die
+	fi
+
+	# dial down warnings about unused results
+	append-flags -Wno-unused-result
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	# the bundled c-client lib stumbles with both -j>1 and --shuffle #888709
+	emake -j1 --shuffle=none AR="$(tc-getAR)" c-client
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	if use onlyalpine ; then
+		dobin alpine/alpine
+		doman doc/man1/alpine.1
+	else
+		emake -j1 DESTDIR="${D}" install
+		doman doc/man1/*.1
+	fi
+	dodoc NOTICE README*
+	dodoc doc/brochure.txt
+	dodoc -r doc/tech-notes/
+	newdoc "${S}/doc/mailcap.unx" mailcap.unx.sample
+	newdoc "${S}/doc/mime.types" mime.types.sample
+	docompress -x /usr/share/doc/${PF}/mailcap.unx.sample /usr/share/doc/${PF}/mime.types.sample
+}
+
+pkg_postinst() {
+	optfeature "Spell checking" app-text/hunspell app-text/aspell
+}
diff --git a/mail-client/alpine/metadata.xml b/mail-client/alpine/metadata.xml
index 23052a0e6bad..dabbfc0b8ca2 100644
--- a/mail-client/alpine/metadata.xml
+++ b/mail-client/alpine/metadata.xml
@@ -5,6 +5,10 @@
 		<email>gentoo.2019@r123.de</email>
 		<name>Robert Siebeck</name>
 	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>holger@applied-asynchrony.com</email>
+		<name>Holger Hoffstätte</name>
+	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
index b4ef02e419df..5f03aff9bb82 100644
--- a/mail-client/mailx/Manifest
+++ b/mail-client/mailx/Manifest
@@ -6,5 +6,5 @@ DIST bsd-mailx_8.1.2-0.20180807cvs.orig.tar.xz 79684 BLAKE2B 2846cd752472a193f89
 DIST bsd-mailx_8.1.2-0.20220412cvs-1.debian.tar.xz 49564 BLAKE2B 4df1fa6be15b811e2a23f059b52a961849818f9defeb5671ec01f6ca9604998d7bf6e182edfc54c9b06b2b0c6e8cb1c270ca1758e2ca9a2aa6758ea41cd05014 SHA512 8794d8a41ec86012f4e74509f489afa8dcb624a17a6bc779024b2bb6eed8a7a86826785601bd295147641cd26f4288ec73aa8c3a2451b35b41fbc682f91c157f
 DIST bsd-mailx_8.1.2-0.20220412cvs.orig.tar.xz 79616 BLAKE2B 436a312125f36067e5c126cb1e5bc91d8b4675c22ee827a822b14fb1f5ca23b7a43cd58ca14602929bb6c0cb48701ef6101ad2ed07ea9b7e9239c25edf73346e SHA512 acee80e49fbac85dfaa48d885dd310a056a1418c6e3b02ee9f30441a34c104b134fb7c47cac91a1b2359d3d3cba0cf026d9cdf51f659b8c172100d7f98156203
 EBUILD mailx-8.1.2.20180807-r1.ebuild 1315 BLAKE2B 173038869ae8be6442b6f29908925b0eb6d3c2dc904167a434405ddaf02cc61fe5ee36489086320d032bcea4db7d2be4ebc79c0102be1329ce1c6e078501bce6 SHA512 87193f93fa3c1db6972c3d2f13075711365298e8c8a8d849cfa4923ea209b5a7876f943eb79c9e2a462181e69fe20cc8dd1ba8533ca72220133ffb6ad52b4fb7
-EBUILD mailx-8.1.2.20220412.ebuild 1265 BLAKE2B d3f6a9d5b6ce4855128eb87079fa524f62d859daa9a0d739a2d80e458e6d64f96f607bf6bd344e5c71d5d8e06c8490165ca8c52665624f02c7cd839aa3e61b01 SHA512 18babc70c563288ffc83f3a762a8808826c1be01791752627e8367357d477c222996aba8528247a5c34d941ba31b6c5e8687ef9b4d5c745541fff941516f6bcb
+EBUILD mailx-8.1.2.20220412.ebuild 1264 BLAKE2B 02fe5d2fd9fe2ae76d652a11e97c93228f832685c4091b7f6a9980ba42b4cb3e503eaab930536f8c18386ff9a3950313cb1386fc58c25a1dcc1d28700acb3c9e SHA512 04c9a3c1f0b8aac341a428b678603c9060cbcd0c9335b07f1f679e3fcd15d8b61718fa872b1eed5d67da65edfb29cb81eb7c782cc9e7dd550ee5043bfadaec09
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/mail-client/mailx/mailx-8.1.2.20220412.ebuild b/mail-client/mailx/mailx-8.1.2.20220412.ebuild
index e3ce2ad5f4e7..fa4b455dc5b4 100644
--- a/mail-client/mailx/mailx-8.1.2.20220412.ebuild
+++ b/mail-client/mailx/mailx-8.1.2.20220412.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${DP/_/-}.orig"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="
 	>=net-libs/liblockfile-1.03
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 631f34044921..631fe9880f4a 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,16 +1,13 @@
-DIST neomutt-20220415.tar.gz 3770700 BLAKE2B 610632a8de6f407b2a33156890f33b64a7cfc80eef84cda4c5e18d1da87669c8a4cf2b4a0b269d6c338f546e83a349dc33608b9f21d1f6889efaa89d669f80e4 SHA512 8723416fe0ed325d8f0e49f6a77f2724e23e0e81c5786f15005cb05b47c0fc7f722f61a58fe0250dd5a2dac6f40b155b6bac202e6316662a1855265670affc92
-DIST neomutt-20231023.tar.gz 3803482 BLAKE2B e8e4f3ee374cf9699d1cf5d6feca7e80d7c2c6a998770d52d4a1c63940144fd4741b7ca631776e2233b349fb23a473e4f82ac03fb690d6916e9fce6a8e95c659 SHA512 0994c4b9027f8299de26bfd816298a0abf02645b07e76ecd2267c220a884869c2226ba01618a3c71887c1b627b64ca4e14375b26f165381283899a8fa5d4950e
 DIST neomutt-20231103.tar.gz 3816069 BLAKE2B 5ed767fd0c7a37fc24bebd853d6a6b3cb0c9e15f6e8df89a7a82c79327986db2814024fb43afe78f87565e438544834e8668f6d7e0448db374a46840a4f63152 SHA512 f60911fa479dc2ff99fc90a6d62a6f1c914443d38ef7de055a6bce87808f4682f798f1faef005b0e5fbe9417f4d42588d9b4b1fc56968c02f871d6f3355aa446
 DIST neomutt-20231221.tar.gz 3812682 BLAKE2B 367435e30d7e4259c1e8b6ece9531949465d6ff641065d88982a7bef959a6c7fe1ee9622a1f166fc71ea74099145ae2f88cc28a258821dcc1f3acd493f74273b SHA512 a0670d3a6de6664aefa85718194d14d703b08f38e7b633c9827e6d7ef627c6b242c7279498e98dabe8e76976d79fb207ce6d1fef674462c5939c06b8fa0f0138
 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-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3
-EBUILD neomutt-20220415.ebuild 4437 BLAKE2B b9edc11dc5d2abcfb81a948c5ce289e5f337249b3ece9761b2c73c5657cc25bc1a743171939265657963b73a78f58c6fee16f0c86c74f547356593e2a166537f SHA512 826a170e274591aebd9e8a16c6fa64f534ec17240c8627b67f8e1e2c559fa5bbdad033ce188795288fea7cecbd19b912f7667f14cffef98dc571b6de8a979178
-EBUILD neomutt-20231023-r1.ebuild 4379 BLAKE2B b40d228295ec10b0057f22750eac8851bda73a4bee3d6441da0ae88fbed14d4fa0c798e9e63c278aa7955aca0198e1ea7fbcad517dd27feb41c6200e73e3e021 SHA512 ed2ac1c6ede46bf9793753870725c7dc1239ba3be19ad26ed458b4587c29b72317e0d3c88fa4fce4d00d3437437d36a27253fa3b363060e5eef7680f699af044
-EBUILD neomutt-20231023.ebuild 4320 BLAKE2B 4d07739939be5505188fabf668131b10571d469093fa8a276c852ea22239dba4c7f2f944188307a2e972d2002470024dfa70a02983a990cf35bba23cf04dd3f1 SHA512 1f3cb3bbc824228e7a7a70444d954c84729f6ed1fcb288cacb546a679d600dd32d3fd17b2c1b7d0af47c694363d777a2760370eacba583c155cff2b02b5961b1
-EBUILD neomutt-20231103.ebuild 4463 BLAKE2B cf75b5881282cf8fd5ce749678dafe03a875cc87600c12b0359c4dd48e8e83ddaee278e8a49436088472bfd781a35ccc63077757c0fe5791919c2c1e81ac5ca6 SHA512 4c57fe72c5ea07e7adef1bd495a0084a8489442833ea98cfe3a65b3651a9b10fa6040ce38bf0fcf1c935b060d705686e6052ca2e86070659f78e441899317bd4
-EBUILD neomutt-20231221.ebuild 4463 BLAKE2B cf75b5881282cf8fd5ce749678dafe03a875cc87600c12b0359c4dd48e8e83ddaee278e8a49436088472bfd781a35ccc63077757c0fe5791919c2c1e81ac5ca6 SHA512 4c57fe72c5ea07e7adef1bd495a0084a8489442833ea98cfe3a65b3651a9b10fa6040ce38bf0fcf1c935b060d705686e6052ca2e86070659f78e441899317bd4
-EBUILD neomutt-20240201.ebuild 4501 BLAKE2B 84b0d54fde0aa485d202bbc50f999e64c22a2a4a81fa414a0492570c5891f8d0e5cf576237b5e12a698d5558e4080397ae3573d90f196ed6068b22beba0c8dc4 SHA512 f23fa0eecbf0d9f5e95476c4541caaf9114c7666fed04006a36581a1b83e8a820af5bf09969b4d917b579d8dccb229753584a72e91590593cba7d3b9149d16fd
+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-99999999.ebuild 4503 BLAKE2B 62be73a60fa6a34d3c15d7405f51501221226ddf2ecfcb91ec984d442b931836b805dac9ea96e46ae4cf94edb644888630cbacfc7dff4d807984a725abe02270 SHA512 8bdfeaea8905258c429f0693d6ae20b11debaa6ead870633dbc14084a8d66f13f9354fa93b26de4da910b4159005d4ce896b713a15705a6ac1af573a969c6c8d
 MISC metadata.xml 1821 BLAKE2B b6c051b5d1a2d172664f027ebbba02ff978daabea1b8998516ffe70b385484fcfcf95283574b8f5f3d7f9478256437fe02f31e61f2dbe2541a5ad618d539134e SHA512 c8874d8b19fd7f6584519cbfca832fb4d3b662d4dfb35ee2e49081b126339d496d5b5eafe7dab6ea6cffedda287b657f44c0a266bcf3585c9e5b60efd3ccae59
diff --git a/mail-client/neomutt/neomutt-20220415.ebuild b/mail-client/neomutt/neomutt-20220415.ebuild
deleted file mode 100644
index de71a419eef0..000000000000
--- a/mail-client/neomutt/neomutt-20220415.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-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 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 )"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="https://neomutt.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
-	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang 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/libidn:= )
-	kerberos? ( virtual/krb5 )
-	notmuch? ( net-mail/notmuch:= )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	!slang? ( sys-libs/ncurses:0= )
-	slang? ( sys-libs/slang )
-	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)"
-
-		"$(use_enable idn)"
-		"$(use_enable kerberos gss)"
-		"$(use_enable lmdb)"
-		"$(use_enable sasl)"
-		"--with-ui=$(usex slang slang ncurses)"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"$(use_enable ssl)"
-		"$(use_enable gnutls)"
-
-		"$(usex test --testing --disable-testing)"
-	)
-
-	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/neomutt/neomutt-20231023.ebuild b/mail-client/neomutt/neomutt-20231023.ebuild
deleted file mode 100644
index 9769219b8f76..000000000000
--- a/mail-client/neomutt/neomutt-20231023.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-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 )"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="https://neomutt.org/"
-
-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:5.3
-			sys-libs/db:4.8
-		)
-	)
-	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)"
-	)
-
-	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/neomutt/neomutt-20231103.ebuild b/mail-client/neomutt/neomutt-20231103.ebuild
index 441d25a8c748..56c1c04b2e1a 100644
--- a/mail-client/neomutt/neomutt-20231103.ebuild
+++ b/mail-client/neomutt/neomutt-20231103.ebuild
@@ -5,6 +5,9 @@ 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"
@@ -16,9 +19,6 @@ 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 )"
 
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="https://neomutt.org/"
-
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb lz4
diff --git a/mail-client/neomutt/neomutt-20231221.ebuild b/mail-client/neomutt/neomutt-20231221.ebuild
index 441d25a8c748..56c1c04b2e1a 100644
--- a/mail-client/neomutt/neomutt-20231221.ebuild
+++ b/mail-client/neomutt/neomutt-20231221.ebuild
@@ -5,6 +5,9 @@ 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"
@@ -16,9 +19,6 @@ 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 )"
 
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="https://neomutt.org/"
-
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb lz4
diff --git a/mail-client/neomutt/neomutt-20240201.ebuild b/mail-client/neomutt/neomutt-20240201.ebuild
index ae00a5bd52f9..9e7169822a18 100644
--- a/mail-client/neomutt/neomutt-20240201.ebuild
+++ b/mail-client/neomutt/neomutt-20240201.ebuild
@@ -5,6 +5,9 @@ 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"
@@ -16,9 +19,6 @@ 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 )"
 
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="https://neomutt.org/"
-
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb lz4
diff --git a/mail-client/neomutt/neomutt-20231023-r1.ebuild b/mail-client/neomutt/neomutt-20241114.ebuild
index 717320f71275..f0e77fe65e6e 100644
--- a/mail-client/neomutt/neomutt-20231023-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20241114.ebuild
@@ -1,9 +1,12 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit toolchain-funcs
+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
@@ -16,14 +19,11 @@ 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 )"
 
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="https://neomutt.org/"
-
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb lz4
-	nls notmuch pgp-classic qdbm asan ubsan sasl selinux smime-classic ssl
-	tokyocabinet test zlib zstd"
+	nls notmuch pgp-classic qdbm sasl selinux smime-classic ssl tokyocabinet
+	test zlib zstd"
 REQUIRED_USE="
 	autocrypt? ( gpgme )"
 
@@ -31,9 +31,11 @@ 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 )
@@ -88,9 +90,6 @@ src_configure() {
 		"$(use_enable nls)"
 		"$(use_enable notmuch)"
 
-		"$(use_enable asan)"
-		"$(use_enable ubsan)"
-
 		"$(use_enable autocrypt)"
 		"$(use_enable gpgme)"
 		"$(use_enable pgp-classic pgp)"
@@ -120,6 +119,13 @@ src_configure() {
 		"$(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[@]}"
 }