2023-05-17 19:10:03+00:00

20 files changed, 237 insertions, 52 deletions

diff --git a/Manifest b/Manifest
index 7534ffbdc7f8b..629f97037c95a 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29461 BLAKE2B e5da9e2b1cb60ba79c7005857c5b141fbe0f80a6cbd43a5935337e39b2f5d86292e8091de1d0ed3bd6d87fd6cb1fec640ff10c12fff38adf4bed590c024f9ed5 SHA512 adee27cd8d1fd1c687bdb4ec5e2cc6322c7ff5ff9af5eccd7a3b3d3c9c5be449859d23c4f24847eaeb138d11c2b56d64fc7debcbe67e97ef49e9a1e244027cce
-TIMESTAMP 2023-05-17T18:40:09Z
+MANIFEST Manifest.files.gz 29464 BLAKE2B f6f410280ec1af718f75c950351f9af29a8284696d4e822513d9f19d90bb772b3c09a54706579f811c4f7b4a49cb381a9ac4f6f43daf53da9389cdca87dea7d9 SHA512 192558c1b811a69723f935a6c7730dbafe82450470bcb1324af92d1852a228a6ec7cc29b70dc11799b0532d6f7900fbe5925143ba1d7c134a609679416a90f24
+TIMESTAMP 2023-05-17T19:10:09Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRlH4lfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRlJpFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAjtw/9ENAc0m++pesSrXnwzwodpVAAmK6fnQ7ud9+oUjz+wyx8K3zHiTpwJPnF
-NqMf+WenOs7Jce2PIl0G2TEFLXloGQ0Y64g//jb0fqbnCoUzEyMNDDorwgf7n22q
-US/vno9aGIFZsaMbTG8eOz+BKoRJ7rbsNaV97OH2q5mWUEb76xVPJwGz7yBMoStf
-PirxWrpgpNXsvZY8G3aPcKmmUyUJCUtGhx8xFy4kAUKXNEoCApEd0tZTeXEhyUtI
-pMdy85jsSLUo94KBUO4VfcwrHld5uKNIMP/TlYbxhE7ZUZpYj6Cn0fINbywD56qY
-XiRNHHqZzfuQrUEGAOCp8Kk/k+ry86YUHEfSS5bzEUyItuAoryVcy7K8TmLt70v0
-ZCwAkPDgYQ+pVDjevvRUh86C4bq8mrIll30k96TVhWBh2Fmd5fv+GCHR4zyC6dz0
-dJe0TaYC+z4n4GvffCPftdVbYswwBsrrHsPc0nlRN0P3iWDhIHcnDCgwcHkue+fY
-n/xlfcUViaOGOTK86e+xMg8K+E9vl4y40DMHlt6sRL0bHPcpdKOY0uzQS5p7qhex
-xSE5Z0Bm8bLbf7xsNXsgyVS8/lT6oKXpsI/T0GGvmdvtOYvas2yVOmgv63Jnd1qF
-atjVAQ1ld0jI0tHIlFKWOGKZNHFoyZJdsGnbt/SICrF7vQREyh8=
-=dlXU
+klAZAg/7Bg9HVY7eW0RCjtHWN7EgR9mz9XOLqjOiWWWSoAuRj1Mp9UCzrIhdlGx5
+Yl84DiZqe+RgKKPHuCwsf4QEPh5z/IM3tPqtjry+mQYddLJALmkvR82IexOwuFVr
+aWCre2kd2016VJo3OYqDSKTOuAvDaXmnKJ2wmue/mG+Nvu5O5HCs42HT/ogsFUTe
+oxuvviPvvzJ+kfe7YmpqsoWh2iraT9JUOu/660hevt00G9gDw1zQU1NDdnQ1chWW
+Amr7mauPV3uNCSb+NfBrJVot0zF7TSHIi8RZ/muZ6XjUkO+ji4kb0qe/LJvD1NrR
+ndtgv6ndsEDEQ2UyTxhzWFbUTAK+nGedXSlELEp05HUVmHmuDSZhnR78v7D6ZYIf
+pfyMFJtWnbEqvQ/NJfhJl39+4qWqiKeV+830hkFfPhaK3tl4XVOVZe2sqB8UZL/1
+ggsEGmAMpvyiNMLsGtapUAG/rNvkT2ndLdboffP3NGresd/I/BNBB2bTLe4AYVbT
+HQPo/H1u8/m8RVcO/d8NEza4dp81qoJ0EpX7D5IfYiCNoj73LLwH8byc3bxq6ARf
+Gl5OXxFsXWTMvW7gKsIJg+iQTwes9lpb/RTRPlGbYH5EE0r9Xz0gZXJumscwbHvO
+L+qUml2v+b6b1H+wRhdC2VGcgSzu6+tDVEAvXXHJrR530LCFTXY=
+=ztIr
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index c79d47e11ba03..f7e205bf2f286 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 26881a6992812..10c3ff73ae13e 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 40070b820f1c3..634ebc7f4e5d6 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,10 +1,12 @@
 DIST neomutt-20220415.tar.gz 3770700 BLAKE2B 610632a8de6f407b2a33156890f33b64a7cfc80eef84cda4c5e18d1da87669c8a4cf2b4a0b269d6c338f546e83a349dc33608b9f21d1f6889efaa89d669f80e4 SHA512 8723416fe0ed325d8f0e49f6a77f2724e23e0e81c5786f15005cb05b47c0fc7f722f61a58fe0250dd5a2dac6f40b155b6bac202e6316662a1855265670affc92
 DIST neomutt-20230407.tar.gz 3725060 BLAKE2B 4127cd17967f458db4d150a5225a6a0e6cb40d1b503910b997037aac6323c4a81141aad5d4574dbe32f92c9f039f17724209e7b308154b1c994e1bd2a7cffe08 SHA512 53604ce396fb53bf01662c7105a632e0e7a50d66f0d265193c591d7f16cbbfd276925c7ae965ccf9faf9b2070d7db48c4ee6d44b0c9552f9214647c5a7e8c46d
 DIST neomutt-20230512.tar.gz 3791505 BLAKE2B 381e066e2485a3bb644df9a9fcbc9776e7b0832988d2b8b253e8adbabd446958a70d39b4f40913b4dd4fe74a8265474b57a74200d905b7d6107f026a10849403 SHA512 0d853a9913e721709f2b457852c12584addc71709f2345a8dabd3084ecee1e7b52652c6159a9b96a0455a64c0a291ecc1fd801f6c1fc095e5c57b757b9929127
+DIST neomutt-20230517.tar.gz 3792146 BLAKE2B 7bd7126ef92785b880d24d92b594251513830c4e9d1c1dd608ccd520c8758dab2661d17e937e22f987b634cf7f85418abecfa84bd94db25b1d1fb83baa4a0d18 SHA512 6314c63f1a324c9d45bc06fe1ab73b86a1f11467d6cf5105f72f55029fe8bc035b4a2833e6c8958e749fe109b5f8e68b53ff7821185b7a4480468ddce5c267f3
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3
 EBUILD neomutt-20220415.ebuild 4437 BLAKE2B b9edc11dc5d2abcfb81a948c5ce289e5f337249b3ece9761b2c73c5657cc25bc1a743171939265657963b73a78f58c6fee16f0c86c74f547356593e2a166537f SHA512 826a170e274591aebd9e8a16c6fa64f534ec17240c8627b67f8e1e2c559fa5bbdad033ce188795288fea7cecbd19b912f7667f14cffef98dc571b6de8a979178
 EBUILD neomutt-20230407-r1.ebuild 4320 BLAKE2B 4d07739939be5505188fabf668131b10571d469093fa8a276c852ea22239dba4c7f2f944188307a2e972d2002470024dfa70a02983a990cf35bba23cf04dd3f1 SHA512 1f3cb3bbc824228e7a7a70444d954c84729f6ed1fcb288cacb546a679d600dd32d3fd17b2c1b7d0af47c694363d777a2760370eacba583c155cff2b02b5961b1
 EBUILD neomutt-20230407.ebuild 4468 BLAKE2B 64a63e0c64e6afa1c90ad1be40fc0fdaafe9aa282f40ae13a0c2034dd633535d49d4425b701ee5c8b690c54ced7126eb9e746ec5d6e203a681044897ae4fc93f SHA512 c481d979029f21eb74cd09d244e1cccf1d5b69b4a3c90a40ffbe1216b6e307e22b078370f440b96a05756168f9cb4c950b5f827fe9ec6fff6270641647f67574
 EBUILD neomutt-20230512.ebuild 4320 BLAKE2B 4d07739939be5505188fabf668131b10571d469093fa8a276c852ea22239dba4c7f2f944188307a2e972d2002470024dfa70a02983a990cf35bba23cf04dd3f1 SHA512 1f3cb3bbc824228e7a7a70444d954c84729f6ed1fcb288cacb546a679d600dd32d3fd17b2c1b7d0af47c694363d777a2760370eacba583c155cff2b02b5961b1
+EBUILD neomutt-20230517.ebuild 4320 BLAKE2B 4d07739939be5505188fabf668131b10571d469093fa8a276c852ea22239dba4c7f2f944188307a2e972d2002470024dfa70a02983a990cf35bba23cf04dd3f1 SHA512 1f3cb3bbc824228e7a7a70444d954c84729f6ed1fcb288cacb546a679d600dd32d3fd17b2c1b7d0af47c694363d777a2760370eacba583c155cff2b02b5961b1
 EBUILD neomutt-99999999.ebuild 4468 BLAKE2B 64a63e0c64e6afa1c90ad1be40fc0fdaafe9aa282f40ae13a0c2034dd633535d49d4425b701ee5c8b690c54ced7126eb9e746ec5d6e203a681044897ae4fc93f SHA512 c481d979029f21eb74cd09d244e1cccf1d5b69b4a3c90a40ffbe1216b6e307e22b078370f440b96a05756168f9cb4c950b5f827fe9ec6fff6270641647f67574
 MISC metadata.xml 1566 BLAKE2B 79d3e2c7123d2ca85fef6660f181923555694a76ce484ce07ab236dc97107e3f6d59bd398823194ec9d00a044dd42b8924e45010cfd6a71f5ef715733b094953 SHA512 4548b2bcca9d03ae8ee772f0837c670840771673f0e3e545ed5dd3a6ceebe851025f916f16c461b6c05b822ea50d819688c1ac71d6e5a99375072e66a76db184
diff --git a/mail-client/neomutt/neomutt-20230517.ebuild b/mail-client/neomutt/neomutt-20230517.ebuild
new file mode 100644
index 0000000000000..9769219b8f76d
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20230517.ebuild
@@ -0,0 +1,167 @@
+# 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/metadata/.checksum-test-marker b/metadata/.checksum-test-marker
index f3ac4f0cfd9d0..ada9dc869da27 100644
--- a/metadata/.checksum-test-marker
+++ b/metadata/.checksum-test-marker
@@ -1,4 +1,4 @@
-1684348842 Wed May 17 06:40:42 PM UTC 2023
+1684350640 Wed May 17 07:10:40 PM UTC 2023
 # Testcase for mirror network:
 # Watch the value over a day, if unchanging then
 # one or more mirrors is missing --checksum
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index ad907c0671aac..82f5c69e3ec20 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 4b4aae41aef2e..14138cf6e9b6b 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 17 May 2023 18:40:06 +0000
+Wed, 17 May 2023 19:10:03 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index db6657c2e9c6f..719013cbb97b7 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 543888 BLAKE2B da15fb010da91c403608af1847df77a89c9a8a24b2f5c1999256191c31d7755cd7667c19867e75c2bbdd07063f4ce4dd641cf53415eb08b83e35cbb3d2cd35e2 SHA512 ac5e51b2bf8075889870e4eedfe469274eaf28945ed1e974bc76ae0576dc1aa0db2a5fdacfc15e8cfb28486195fad65b487cf50896a207c5fcad4ffae850adbc
-TIMESTAMP 2023-05-17T18:40:09Z
+TIMESTAMP 2023-05-17T19:10:09Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRlH4lfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRlJpFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDE5hAArLEICmhREw4i7xKebLCYGc9nRBJzOzs0OF3LFHRA0CaEdOWOxY4GrMIQ
-+PQ76HBlkPCIybs+MBa2jpi43Ps4/N7gfDc7+68EUOWeUkcPTbKbUHtGmyQPTEB7
-zK2VrBle9HGkRSbP+zpmFhVMiSPIJuH5R0wXbH4dozoQiMUdDIdXtPA52gNuNRbS
-w/64iNCjWTJjWdyQ64zn0CykGwzVeNBdqBKfta0UsvQXvZBnVTB4mneWUJXKzPVr
-J+D/2slu1mGbdoD5NqADpMSOS5nBSF767apv521RviGmRpe44VMId1QSDilAv4Kl
-scsY3oW0iCSuzKAAtQGtnvVXtKw2/A/R6+JvytJNaDhUppTYzTdOjBB3QeEUQOGF
-aH+h+7I7YdgfSrjflC1xnh5+O8PT81pVpOk+oyKHvtJnNR7O9S7jN1Bx5mokyZXw
-dxJ/NARQf9iZqerqg48M5iYXV0cOopTAQa3mL8OQZ4AE651a8i4G6uC2j++UdCck
-K0wFQ00Bb7qJ2Mx1GSQ/BU/9JZ9cP09nDAWKrsLVVwq+Ol6VgdOvdoRLMRB4r+/J
-wzZAM8r9JllNDEji4Olrf0fxrbjYMUv+8leW5yl/izmoLghOGwBNLrORCrsSHLwo
-g+uZfhuax1JtFewv4vOl8WyDVj7OzNsAdim0yWK2wt5raoZDi5k=
-=2fHv
+klBI3Q/9FW7fdjWxFW3ndaINJOepTYQbe9Cl6Oof1V0BGCEI67O2HKDoZPCL8wi1
+Idl9sykVFlnxbQPX7lkaJkVDsuoJZwmcqk4ZUomhj4MfATXg9T4KcbNzQlNdWywB
+32u54ffL0mumeAtkudHIXfzZRI4diAHXmoIghT7KGB4NjAYSWTbbec7ivGUeIhe9
+TrWg+/bqRjOEJdAX4mhF5m3xyHtstCbqPGsiOENeJz6mG2yo8JwKLSrqqlzpKvjr
+mTyeBP/yMQMyFHL4QCL1ggUfqllAPu3WZl/iTIrzh/L+Ei5h+nOKWOvDrpTNFrdj
+0cqKvvc58KSpFwsvMy+rqIYFu6xiwg6EoWRxsLkgoZl3ihxyruegQMyOjXtXd+9d
+xvOzG5Ec2UjtJj07YUi4lZUbrP3aHiTPnTGId6DERYzPe4oWUBH57Pw4UcG7IYTn
++0+wtxjR/xov3RVe20mQihN6aUwKThKJ5gsyIJQt+uIqhQHEyfjQHfiAXqq+Fu2f
+LCIFkwSCGxyfbszE9SEFN9566ZmCPpshrpmfNbCmSFC9UKvooi9dTRKr0/U+vaH2
+/719ef974J/6fUKiBC7eA1Dc6lDYm0aBvix5Is8MVZo/ZCeQRORXfjpu+6EaYWo1
+knLo3j+ritX7qOxrg7iIpfCYqf9yFMNc0Q4MhhA/OIJE2mAPvr8=
+=9lkZ
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 4b4aae41aef2e..14138cf6e9b6b 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 17 May 2023 18:40:06 +0000
+Wed, 17 May 2023 19:10:03 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 2369772c1c665..ac288c8e5e705 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 4a3cca785f9b3..b32c3824119ef 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/neomutt-20230517 b/metadata/md5-cache/mail-client/neomutt-20230517
new file mode 100644
index 0000000000000..3cf626ae8dc67
--- /dev/null
+++ b/metadata/md5-cache/mail-client/neomutt-20230517
@@ -0,0 +1,16 @@
+DEFINED_PHASES=configure install postinst test unpack
+DEPEND=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 ) 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 ) )
+DESCRIPTION=A small but very powerful text-based mail client
+EAPI=8
+HOMEPAGE=https://neomutt.org/
+INHERIT=toolchain-funcs
+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
+KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=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 ) selinux? ( sec-policy/selinux-mutt )
+REQUIRED_USE=autocrypt? ( gpgme )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/neomutt/neomutt/archive/20230517.tar.gz -> neomutt-20230517.tar.gz test? ( https://github.com/neomutt/neomutt-test-files/archive/8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz -> neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz )
+_eclasses_=multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=94f962264205931b2b07111c72b8a2c0
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 1122d81e35c59..2053569e46152 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15668 BLAKE2B 449292f439e2a4f4fd7b4726028a046b309262c1c104b330b62b26428794c6a1ff66902103e9c2359f352f474b113cc9c85ddbbb187a374b6211d02e6ca79ff3 SHA512 e7b892ad549ad1d2a69c8cd56f9a18807e1e7a0c3b686e86ad5dca719913cab1270dea7dd5e376d522493285e5a8117f923772e2df0f2019b0c49a02107d6b03
-TIMESTAMP 2023-05-17T18:40:09Z
+TIMESTAMP 2023-05-17T19:10:09Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRlH4lfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRlJpFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDx/g//Z1Yik4eDBDToLnEfXdH1UA4Zc3cI364DCG5/GSFGvRKV6CUQSVLEeu9O
-gOXLhFaMbGKP30zefBGi06xfTwIGSvXZBSZPAjbORJ2PQhFF6hwbdiy5JgjQ8Nhh
-8DPJLtJI3XnFXBVMCcJXNowyQnLiNmH5IMhWmkGxrMqUPg4xZwW/dMxSNCkpiMqj
-NcR8sN9kBbP0BmpmHLGVDszK5iPFBQOctzR6qdY+g2P7u3IlRCyFMlKtSumi3ImK
-XDOGwQjwTh+0xIqNjuH10h5c3oGRNvRk+Sq0Bo5ZubUNCstPmYQstpvp9a1lWzrP
-s//IRVyFPzzqahT/1YYxALYtI8d/yYppsmHz0lzGONxWxXVjtBmWG0iUrXxoyyow
-aNITLcZItZvuML/XYDIMuHFeq5h/Bv9+Z8pfDFrsZdRHzNz5HNFPVuXr2OU0rr97
-pBh2Nq1FKaNwWBODVsNz4Txa4Qqjp0diIc2sr8E/unzoe7Jyx7eIliJi6GdHuu2Z
-WZk6K8ugd8cIgKgF2B3Kcyam/k6le6PK8LRgPmDDUuCAcOfEX+mX6gtJ30RVBwtO
-u503bC1nqZH4QJfDr905YoDI+otTtSaswK/S3S3fDY3aAUhEUQbAtcOYOhxNVWhv
-+/VU+1/7LL6mAza9RjXFjj8Hg2NIxPVmXwWkuqPssl5z2A2MM20=
-=/7RN
+klB2nA/+I/zMqOPmEA2jHLcb0wtI0HulVsCvVoccnvv7H6PBa4OCNAodNlH6PFR+
+0iXTwxoubNUasSwaCnvcx0fZ3KvOM8L6O1DfwbNkBQFp7o94/isJSBcApZZCrgCM
+89/jUnF3Ov6KK8pXBZydUAvdPp1caN4aBXVTDzShvgFaiOAuugZepp3V/MQVWakJ
+zyWY5bUsp/9v09OfKqciOo62YUsn0yx3jKrBa6sDc8Dhq+EK1AT+3jCj0sZabTDj
+07xvhENqzNbRjoaKGsn5/t2At/MaLm0pbJ7GDhVn+COcTH4xEaLV0N4TnCwd2NIP
+Zakm1B3eI4SZ4XfBZ0QOPbbnx23iFFnn7an/sR/VMOVTeBFtOqqC2RIU3/cUMWgG
+Odogz9yQy4tiXrntUGpdFRH/gdbTbIJX/yaw28W1eaE8c7jnwqgCw+D6wiEi+t1+
+E96nDG038wZsUPXXSPiMNyx66r336yBiaGfRAR1j6Nj3xez9ljeGUDOCwYQT+5p3
+3qkbCz1PKuNtUSsFMABvPV2pcYp8km/gNZTdCxLo8wSu8BWSC9eIne+kUefYv/kg
+fZYY2GB5Tpi5jLXEfDqzQaXO38jW+VSoyunL3lp5GZnPpN0o83NzJS25LSQe7Cvi
+YHNhSAAv2/Ek22E4WRu0G9G1jYlfB0jA9vzDGeaJ96fhSIJHzyE=
+=9HEu
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 4b4aae41aef2e..14138cf6e9b6b 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 17 May 2023 18:40:06 +0000
+Wed, 17 May 2023 19:10:03 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 3d88882001356..1b04a32dcbb34 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed May 17 06:40:05 PM UTC 2023
+Wed May 17 07:10:03 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 63067af72c31c..6fa71f9ead2b0 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 17 May 2023 18:45:01 +0000
+Wed, 17 May 2023 19:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 1904efb72858a..cec39a76fb91b 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-c2eee0a245e92a1219a0c17334412b9db20395bf 1684348120 2023-05-17T18:28:40+00:00
+8ef2657b76dd61f9e3590e681853dd53d6c41f97 1684350080 2023-05-17T19:01:20+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 27263d43b9412..d50f7ceb5197c 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1684348801 Wed 17 May 2023 06:40:01 PM UTC
+1684350601 Wed 17 May 2023 07:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 4b4aae41aef2e..14138cf6e9b6b 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 17 May 2023 18:40:06 +0000
+Wed, 17 May 2023 19:10:03 +0000