gentoo resync : 20.03.2022

3 files changed, 183 insertions, 2 deletions

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index e4cf316957ae..3704c2c80f74 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -7,6 +7,7 @@ DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLA
 EBUILD neomutt-20210205-r1.ebuild 4404 BLAKE2B e9ac5596196d2d9ac8c462bc099adf7f775bb782c821f978ab5d9811f8cd7df3ebc1d4a0de9cfe39d4712265def68c6b22d94948859d33e55bc56dfd72d4ed30 SHA512 e374e339d62b4807da033d5b1907f43064773763e38e157b3f9de6d48b41209efbe84bbbcc61fe5325b09ba1f8b6e2f632e5c4e3c7dd2b28a62d2861ec1c1261
 EBUILD neomutt-20211015.ebuild 4322 BLAKE2B 0c4e649fde0e36a31bc46a977a6477c3d69d68338e0be3cc5cd8b99f552b860572a75bdbe020f2d49981ff7a34fcc7056496a937af97c4c1c63fa79f1bc2183f SHA512 eaa79262b049cb25ad88a120bbf6e525eee157b339f9138650e95b09374ae810dee048e5a827d44f9ef5c5cc4c639af0b4e4bcf4280b3447dc83fecdf7e32de6
 EBUILD neomutt-20211022.ebuild 4322 BLAKE2B 0c4e649fde0e36a31bc46a977a6477c3d69d68338e0be3cc5cd8b99f552b860572a75bdbe020f2d49981ff7a34fcc7056496a937af97c4c1c63fa79f1bc2183f SHA512 eaa79262b049cb25ad88a120bbf6e525eee157b339f9138650e95b09374ae810dee048e5a827d44f9ef5c5cc4c639af0b4e4bcf4280b3447dc83fecdf7e32de6
+EBUILD neomutt-20211029-r1.ebuild 4441 BLAKE2B 38b771073aaa992a1aac891d5631f89d5054722a4dfcc2a5342e200cc43d4b7f7591d3499fa005dbbca59ff9a866d6e183264d532cd2415b2b965cc55b6a49f5 SHA512 b8ca22cf5f20ce37bb170e6ba657ef529223da8d0ab43bf0ee6c9c9b42f1deae032ccb19f32addeb7fa5607a6109d6e0d4c97dfe9d2d91d106ebc87cae850e17
 EBUILD neomutt-20211029.ebuild 4322 BLAKE2B 0c4e649fde0e36a31bc46a977a6477c3d69d68338e0be3cc5cd8b99f552b860572a75bdbe020f2d49981ff7a34fcc7056496a937af97c4c1c63fa79f1bc2183f SHA512 eaa79262b049cb25ad88a120bbf6e525eee157b339f9138650e95b09374ae810dee048e5a827d44f9ef5c5cc4c639af0b4e4bcf4280b3447dc83fecdf7e32de6
-EBUILD neomutt-99999999.ebuild 4322 BLAKE2B 0c4e649fde0e36a31bc46a977a6477c3d69d68338e0be3cc5cd8b99f552b860572a75bdbe020f2d49981ff7a34fcc7056496a937af97c4c1c63fa79f1bc2183f SHA512 eaa79262b049cb25ad88a120bbf6e525eee157b339f9138650e95b09374ae810dee048e5a827d44f9ef5c5cc4c639af0b4e4bcf4280b3447dc83fecdf7e32de6
+EBUILD neomutt-99999999.ebuild 4441 BLAKE2B 38b771073aaa992a1aac891d5631f89d5054722a4dfcc2a5342e200cc43d4b7f7591d3499fa005dbbca59ff9a866d6e183264d532cd2415b2b965cc55b6a49f5 SHA512 b8ca22cf5f20ce37bb170e6ba657ef529223da8d0ab43bf0ee6c9c9b42f1deae032ccb19f32addeb7fa5607a6109d6e0d4c97dfe9d2d91d106ebc87cae850e17
 MISC metadata.xml 1566 BLAKE2B 79d3e2c7123d2ca85fef6660f181923555694a76ce484ce07ab236dc97107e3f6d59bd398823194ec9d00a044dd42b8924e45010cfd6a71f5ef715733b094953 SHA512 4548b2bcca9d03ae8ee772f0837c670840771673f0e3e545ed5dd3a6ceebe851025f916f16c461b6c05b822ea50d819688c1ac71d6e5a99375072e66a76db184
diff --git a/mail-client/neomutt/neomutt-20211029-r1.ebuild b/mail-client/neomutt/neomutt-20211029-r1.ebuild
new file mode 100644
index 000000000000..a861264f1710
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20211029-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2021 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 ~s390 ~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.2
+			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-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index dd0fe7e9a572..a861264f1710 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -77,6 +77,15 @@ RDEPEND="${CDEPEND}
 
 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)"