gentoo auto-resync : 12:05:2023 - 23:49:59

4 files changed, 5 insertions, 180 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 1e402c18d932..adf5d0ed0a82 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index c7b9aa5cbd87..40070b820f1c 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,11 +1,10 @@
 DIST neomutt-20220415.tar.gz 3770700 BLAKE2B 610632a8de6f407b2a33156890f33b64a7cfc80eef84cda4c5e18d1da87669c8a4cf2b4a0b269d6c338f546e83a349dc33608b9f21d1f6889efaa89d669f80e4 SHA512 8723416fe0ed325d8f0e49f6a77f2724e23e0e81c5786f15005cb05b47c0fc7f722f61a58fe0250dd5a2dac6f40b155b6bac202e6316662a1855265670affc92
-DIST neomutt-20230322.tar.gz 3716391 BLAKE2B c845a354a19d1f014efe9a64503b8b612fce99cc4cef5828532f7a6b035d133d4159fdcb138da1b64d3c3e1c45e0046fa65ed3a0d753df8f762d98c993060b15 SHA512 bbe88d1906db2c8633380a55f0c9a1c0e74994c653bfcd2605608f7ee15a3b761139f9996daebb8c968d83760eec5df620de8ebed72eb52e5d9765ff837a3fb3
 DIST neomutt-20230407.tar.gz 3725060 BLAKE2B 4127cd17967f458db4d150a5225a6a0e6cb40d1b503910b997037aac6323c4a81141aad5d4574dbe32f92c9f039f17724209e7b308154b1c994e1bd2a7cffe08 SHA512 53604ce396fb53bf01662c7105a632e0e7a50d66f0d265193c591d7f16cbbfd276925c7ae965ccf9faf9b2070d7db48c4ee6d44b0c9552f9214647c5a7e8c46d
+DIST neomutt-20230512.tar.gz 3791505 BLAKE2B 381e066e2485a3bb644df9a9fcbc9776e7b0832988d2b8b253e8adbabd446958a70d39b4f40913b4dd4fe74a8265474b57a74200d905b7d6107f026a10849403 SHA512 0d853a9913e721709f2b457852c12584addc71709f2345a8dabd3084ecee1e7b52652c6159a9b96a0455a64c0a291ecc1fd801f6c1fc095e5c57b757b9929127
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3
 EBUILD neomutt-20220415.ebuild 4437 BLAKE2B b9edc11dc5d2abcfb81a948c5ce289e5f337249b3ece9761b2c73c5657cc25bc1a743171939265657963b73a78f58c6fee16f0c86c74f547356593e2a166537f SHA512 826a170e274591aebd9e8a16c6fa64f534ec17240c8627b67f8e1e2c559fa5bbdad033ce188795288fea7cecbd19b912f7667f14cffef98dc571b6de8a979178
-EBUILD neomutt-20230322-r1.ebuild 4428 BLAKE2B 46ef12faadce6a86fa1f25ab75dda49ad7aa18752f659503320805d3d870cc6f7656a67593003f44af0bb0543409a040dd844e1aef932fd0c7bb840b1d03e7fc SHA512 3ff4c8cd2ca81bf7c089ae5671541e749bbb0afa08b98d838ebb8bf1bc3207693e5b8fbc579fcbebd7f87f4f80871c11007f130dc2870c6bd04f53595e7bf15e
-EBUILD neomutt-20230322.ebuild 4446 BLAKE2B 3b8f7369a22633eb204f90fb737e8d82d3545d5e54f29a69fac440838a9194a9422592b50d023045be36a87398da8d0370f1d1a292a0f0f0f98ad8e6fc7deab0 SHA512 ef8e959fefd48d6e20a2f1fda17891d3fab098c33c72167f61cea0f33d98fa12c1e57edab626a7a1a6f9b8a319c9001b17eb10cb603ce27c2a5a5f9629e4d890
 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-99999999.ebuild 4468 BLAKE2B 64a63e0c64e6afa1c90ad1be40fc0fdaafe9aa282f40ae13a0c2034dd633535d49d4425b701ee5c8b690c54ced7126eb9e746ec5d6e203a681044897ae4fc93f SHA512 c481d979029f21eb74cd09d244e1cccf1d5b69b4a3c90a40ffbe1216b6e307e22b078370f440b96a05756168f9cb4c950b5f827fe9ec6fff6270641647f67574
 MISC metadata.xml 1566 BLAKE2B 79d3e2c7123d2ca85fef6660f181923555694a76ce484ce07ab236dc97107e3f6d59bd398823194ec9d00a044dd42b8924e45010cfd6a71f5ef715733b094953 SHA512 4548b2bcca9d03ae8ee772f0837c670840771673f0e3e545ed5dd3a6ceebe851025f916f16c461b6c05b822ea50d819688c1ac71d6e5a99375072e66a76db184
diff --git a/mail-client/neomutt/neomutt-20230322.ebuild b/mail-client/neomutt/neomutt-20230322.ebuild
deleted file mode 100644
index 771367cdb4f5..000000000000
--- a/mail-client/neomutt/neomutt-20230322.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2022 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 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-20230322-r1.ebuild b/mail-client/neomutt/neomutt-20230512.ebuild
index 5568bdc1402c..9769219b8f76 100644
--- a/mail-client/neomutt/neomutt-20230322-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20230512.ebuild
@@ -21,9 +21,9 @@ 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"
+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 )"
 
@@ -48,8 +48,6 @@ CDEPEND="
 	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 )
@@ -112,7 +110,6 @@ src_configure() {
 		"$(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)"