gentoo resync : 25.04.2020

2 files changed, 130 insertions, 0 deletions

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index ac9ae1233c0b..a4b45fd3b96a 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -5,6 +5,7 @@ DIST neomutt-20191129.tar.gz 3227652 BLAKE2B 50c598d83a53048cec14787b7b05a7e9e3d
 DIST neomutt-20191207.tar.gz 3229018 BLAKE2B 44c3674d28abeef26614b1b05978417ffb2e4e1e88c7bd5902f0af87b5d06e9b9145a2d589258ccfec8de5e15f7b904ef309627a105c476a88328d698c16cbe9 SHA512 77faa95e6f6065a62c69814cae2c0dbc56083ec1d99524bedcec6672816223f2b6bd7e4478f916cf00e774a504fd73288857a9e79606ccf1a99601f29734c5f1
 DIST neomutt-20200313.tar.gz 3295200 BLAKE2B 78d0f3a01f44c1bae8d3a99b86e799216e545674c5966364c347f8fc9ff0ef0b085ce44d0ade72e885b55ff47220d3931e22fe0b04a9cfbac639159a55377aa0 SHA512 989bff6e0748e76664ee0df8fa49f71d5c2ce7c9493441d9c080b34a5ddaef2870ec6aa665f8c2dbb290f16a578328efe92722f50389911cd9393181106a3116
 DIST neomutt-20200320.tar.gz 3304719 BLAKE2B 5301a48f08857e390b204a62588895bb00623b4f82b58fb6a056b3f4e1ebe1476caf5b63c48ef175094245b69f2feac9fcf5b1d9c448a4875667a29037e46bba SHA512 6f47b29e2c941c3f47e3916f2fdb5e9a7cdac0221c88f9e5df1914cf6d28f7ae0ec63e0a20b271300771e073908714d2ab4c14646b617c26d48f91071ed344b2
+DIST neomutt-20200417.tar.gz 3322435 BLAKE2B c0f4dc53d1f6c922c9d0bd77d5caf94d9b67db26ab88c9cb6409dc5e483b7d239bb1b66a473a95348a9bcef406ce7e47ffb9d7ea76098b06fb14f27b7cf941c5 SHA512 d23c2d72b6c783246e799fb14f9d2c6484580123766a33784fee065bdb23066a1178fd1ab0e1cc8d7f90d39a2a04950dcc70ed1a1d405676472fdc6e819dac17
 EBUILD neomutt-20180716.ebuild 3278 BLAKE2B 02747c8e7443aa7a57c4a9d24f71698f897a1f720cd95e3386544e0b9cbb96e3527f4d4cc96a9a23bcb6e74cfc9a7b04123ed5c9e0888a85231dc3ce633cd18c SHA512 4f8d617c55d0af52170ca62b97c1910c5d536e6284d4457fdfddc403b830d8bd980715e63b4af1fa35a00a8e120813c8b989562ef8d5047d8ea28325d40a5f7c
 EBUILD neomutt-20191102.ebuild 3288 BLAKE2B 1c9ce15dbb02312f19bc18fc7e88d1901703fc5379329a8c8aff74cbdf3be07f8557d6d66e5abb9a2a70e1de05cf7b1a1aba317f0b64d357955b69e3d75ec08c SHA512 9e6e628095b69caf3a326a57482324c88d2430d4cd15e0e0e3c8cc2c779b2ea7e6ece1f8e563c3a1d5125099fc14ef8193515a4764b312e084f85ef53d99bdd2
 EBUILD neomutt-20191111.ebuild 3288 BLAKE2B 1c9ce15dbb02312f19bc18fc7e88d1901703fc5379329a8c8aff74cbdf3be07f8557d6d66e5abb9a2a70e1de05cf7b1a1aba317f0b64d357955b69e3d75ec08c SHA512 9e6e628095b69caf3a326a57482324c88d2430d4cd15e0e0e3c8cc2c779b2ea7e6ece1f8e563c3a1d5125099fc14ef8193515a4764b312e084f85ef53d99bdd2
@@ -12,5 +13,6 @@ EBUILD neomutt-20191129.ebuild 3288 BLAKE2B 1c9ce15dbb02312f19bc18fc7e88d1901703
 EBUILD neomutt-20191207.ebuild 3288 BLAKE2B 1c9ce15dbb02312f19bc18fc7e88d1901703fc5379329a8c8aff74cbdf3be07f8557d6d66e5abb9a2a70e1de05cf7b1a1aba317f0b64d357955b69e3d75ec08c SHA512 9e6e628095b69caf3a326a57482324c88d2430d4cd15e0e0e3c8cc2c779b2ea7e6ece1f8e563c3a1d5125099fc14ef8193515a4764b312e084f85ef53d99bdd2
 EBUILD neomutt-20200313.ebuild 3288 BLAKE2B c26fc42209d85f0344e742949375e3f587a9fba5df3f7b2b7e4dcfc0128752e98f58477900248beb3c57f07a0c7ae86ba235c884be410a3481277c66f5a9ed0d SHA512 82b8953bc95bb28576fe60fba5b070ef343ceb773dc85209230f9569e4ed9bef30214c0b498176fa09835406b19f40cc91656e9f5c3b0459f1ddf3d07e60a951
 EBUILD neomutt-20200320.ebuild 3288 BLAKE2B c26fc42209d85f0344e742949375e3f587a9fba5df3f7b2b7e4dcfc0128752e98f58477900248beb3c57f07a0c7ae86ba235c884be410a3481277c66f5a9ed0d SHA512 82b8953bc95bb28576fe60fba5b070ef343ceb773dc85209230f9569e4ed9bef30214c0b498176fa09835406b19f40cc91656e9f5c3b0459f1ddf3d07e60a951
+EBUILD neomutt-20200417.ebuild 3288 BLAKE2B c26fc42209d85f0344e742949375e3f587a9fba5df3f7b2b7e4dcfc0128752e98f58477900248beb3c57f07a0c7ae86ba235c884be410a3481277c66f5a9ed0d SHA512 82b8953bc95bb28576fe60fba5b070ef343ceb773dc85209230f9569e4ed9bef30214c0b498176fa09835406b19f40cc91656e9f5c3b0459f1ddf3d07e60a951
 EBUILD neomutt-99999999.ebuild 3315 BLAKE2B bdf80e05854de6e592eda4e51eb9874d90a5d0d8e33ceff4480d0335822ddbfd5e850bf9ab2050932b2cb4b2a29d326d564f6f507fd5e6a8b021f6049b87bdd5 SHA512 530d4387fe1d89cf6681b9040548d9213afbc44a89e1e0bb97da21a3702f89df11bd5f2c4e2b6321a99f34210df48e2874a6dda1c29e43f6110f46bf0c6b528d
 MISC metadata.xml 1402 BLAKE2B 03ec31bb9fed5d920a22ed5bf855130e7bd538f8eac24aecdcc5cdfd4980a3328f150dd6e957acec286c96f86fca6a8d69a933e496c7fe7c9fc4d0ce5653bcc9 SHA512 cf8dd5e2317a64c7f8c69c2e39436099917e0f6edc0cb6708d9c6c2f46d50c5d897a09d08a4afff81dc3d3beb3886be45c92d7882f2b1a6de3c947f0cd0314a0
diff --git a/mail-client/neomutt/neomutt-20200417.ebuild b/mail-client/neomutt/neomutt-20200417.ebuild
new file mode 100644
index 000000000000..d195e95a243e
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20200417.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="https://neomutt.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
+	ssl tokyocabinet"
+
+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-0.9.0 )
+	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? (
+		!libressl? ( >=dev-libs/openssl-0.9.6:0 )
+		libressl? ( dev-libs/libressl )
+	)
+"
+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 )
+"
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(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)"
+
+		"$(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)"
+	)
+
+	econf CCACHE=none "${myconf[@]}"
+}
+
+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 > doc/Makefile.fakedoc || die
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
+			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
+		emake -f doc/Makefile.fakedoc doc/neomutt.1
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
+		doman doc/neomutt.1 doc/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
+}