gentoo resync : 21.06.2020

2 files changed, 130 insertions, 0 deletions

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 5420f922a408..fc5e33b581a2 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -4,11 +4,13 @@ DIST neomutt-20200320.tar.gz 3304719 BLAKE2B 5301a48f08857e390b204a62588895bb006
 DIST neomutt-20200417.tar.gz 3322435 BLAKE2B c0f4dc53d1f6c922c9d0bd77d5caf94d9b67db26ab88c9cb6409dc5e483b7d239bb1b66a473a95348a9bcef406ce7e47ffb9d7ea76098b06fb14f27b7cf941c5 SHA512 d23c2d72b6c783246e799fb14f9d2c6484580123766a33784fee065bdb23066a1178fd1ab0e1cc8d7f90d39a2a04950dcc70ed1a1d405676472fdc6e819dac17
 DIST neomutt-20200424.tar.gz 3323821 BLAKE2B a062e1fbf14890824b2545d10c9ca9725e0c170f8e2614fe2742a4d1c2a46c1d36495d34a8cd502520fd5e7f5f6f7c39dfea812784768a934cb4e718659a9142 SHA512 83569b304faf851a2efff332d237b0a35dc11b204740dbf828bfa662e157850b975536f25fd2a25057f16c128e9c9f0ca883df9c1d26e45c0608b424ec8d2ef9
 DIST neomutt-20200501.tar.gz 3324180 BLAKE2B 119e033082d76d942c7ce906df7f3ebd651ed586a25ce6bd1a57ba651b6a100188e9776c7565c6f7b5e3ab55198aaec5a7801622990840f22ab6e015bc107ef0 SHA512 795dd36920edc9e23c1b8f485f3e8c1cbf6128142887d81d7a991b9ce2dd052b3ac6b57e668f06236521a5d9c3acb6c26ab18fa27e32220f45f3eff4ca908670
+DIST neomutt-20200619.tar.gz 3347610 BLAKE2B bf8559b8847306c602759c857db3372aba714bf6762144d32af2c1e73703dab3a74c023d10f9389802c554ea7a7ca0591cbcfdff1d8ff685a791867e1125e275 SHA512 75d8f878776c57551f7b5fbbaaeb6bb671afe79f7f02a2e44deae40d4bb8a2db4520ae1b18f8e137ad574f401b591fdee5a1e8b2d78cfb71fa428c49418360f4
 EBUILD neomutt-20180716.ebuild 3278 BLAKE2B 02747c8e7443aa7a57c4a9d24f71698f897a1f720cd95e3386544e0b9cbb96e3527f4d4cc96a9a23bcb6e74cfc9a7b04123ed5c9e0888a85231dc3ce633cd18c SHA512 4f8d617c55d0af52170ca62b97c1910c5d536e6284d4457fdfddc403b830d8bd980715e63b4af1fa35a00a8e120813c8b989562ef8d5047d8ea28325d40a5f7c
 EBUILD neomutt-20200313.ebuild 3288 BLAKE2B c26fc42209d85f0344e742949375e3f587a9fba5df3f7b2b7e4dcfc0128752e98f58477900248beb3c57f07a0c7ae86ba235c884be410a3481277c66f5a9ed0d SHA512 82b8953bc95bb28576fe60fba5b070ef343ceb773dc85209230f9569e4ed9bef30214c0b498176fa09835406b19f40cc91656e9f5c3b0459f1ddf3d07e60a951
 EBUILD neomutt-20200320.ebuild 3288 BLAKE2B c26fc42209d85f0344e742949375e3f587a9fba5df3f7b2b7e4dcfc0128752e98f58477900248beb3c57f07a0c7ae86ba235c884be410a3481277c66f5a9ed0d SHA512 82b8953bc95bb28576fe60fba5b070ef343ceb773dc85209230f9569e4ed9bef30214c0b498176fa09835406b19f40cc91656e9f5c3b0459f1ddf3d07e60a951
 EBUILD neomutt-20200417.ebuild 3298 BLAKE2B c7c891eb021e388ed1979eae71ab5b59f9d8c6b907a892653edb991ee9e23bd977d85f5ffabd550cb409a33bb68b1d2eb92e5324957a2bcd82406f38bff128f7 SHA512 de81dac1604d64817568d45c75123262d17bfc042cc640201e5ff4845d0c5694f928e051ad4cf7cd2eda9a95dafcbe06d2d1a16361ee2f67379a5efb92f885e1
 EBUILD neomutt-20200424.ebuild 3298 BLAKE2B c7c891eb021e388ed1979eae71ab5b59f9d8c6b907a892653edb991ee9e23bd977d85f5ffabd550cb409a33bb68b1d2eb92e5324957a2bcd82406f38bff128f7 SHA512 de81dac1604d64817568d45c75123262d17bfc042cc640201e5ff4845d0c5694f928e051ad4cf7cd2eda9a95dafcbe06d2d1a16361ee2f67379a5efb92f885e1
 EBUILD neomutt-20200501.ebuild 3298 BLAKE2B c7c891eb021e388ed1979eae71ab5b59f9d8c6b907a892653edb991ee9e23bd977d85f5ffabd550cb409a33bb68b1d2eb92e5324957a2bcd82406f38bff128f7 SHA512 de81dac1604d64817568d45c75123262d17bfc042cc640201e5ff4845d0c5694f928e051ad4cf7cd2eda9a95dafcbe06d2d1a16361ee2f67379a5efb92f885e1
+EBUILD neomutt-20200619.ebuild 3298 BLAKE2B c7c891eb021e388ed1979eae71ab5b59f9d8c6b907a892653edb991ee9e23bd977d85f5ffabd550cb409a33bb68b1d2eb92e5324957a2bcd82406f38bff128f7 SHA512 de81dac1604d64817568d45c75123262d17bfc042cc640201e5ff4845d0c5694f928e051ad4cf7cd2eda9a95dafcbe06d2d1a16361ee2f67379a5efb92f885e1
 EBUILD neomutt-99999999.ebuild 3315 BLAKE2B bdf80e05854de6e592eda4e51eb9874d90a5d0d8e33ceff4480d0335822ddbfd5e850bf9ab2050932b2cb4b2a29d326d564f6f507fd5e6a8b021f6049b87bdd5 SHA512 530d4387fe1d89cf6681b9040548d9213afbc44a89e1e0bb97da21a3702f89df11bd5f2c4e2b6321a99f34210df48e2874a6dda1c29e43f6110f46bf0c6b528d
 MISC metadata.xml 1402 BLAKE2B 03ec31bb9fed5d920a22ed5bf855130e7bd538f8eac24aecdcc5cdfd4980a3328f150dd6e957acec286c96f86fca6a8d69a933e496c7fe7c9fc4d0ce5653bcc9 SHA512 cf8dd5e2317a64c7f8c69c2e39436099917e0f6edc0cb6708d9c6c2f46d50c5d897a09d08a4afff81dc3d3beb3886be45c92d7882f2b1a6de3c947f0cd0314a0
diff --git a/mail-client/neomutt/neomutt-20200619.ebuild b/mail-client/neomutt/neomutt-20200619.ebuild
new file mode 100644
index 000000000000..169bb2a3aa6b
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20200619.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 > 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
+}