gentoo resync : 04.08.2018

5 files changed, 138 insertions, 6 deletions

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 37dac8a183fd..d64757f83a47 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -2,9 +2,11 @@ DIST neomutt-20180223.tar.gz 2695087 BLAKE2B ebe19022dd23914dd3c529b49fac1b58cb9
 DIST neomutt-20180323.tar.gz 2650465 BLAKE2B 59f11208320e514119e60f6c85a876fed2693b9eae3127fc3fa5a35722a80dfd99b0c6b5a5074711d42b35d459e70f4dda3d29e7358e1d95d5d0d350438290d5 SHA512 997c697300768809823b8d8588c93003c6cd7fcc6cbe7ce524096033e91c618119f78c697ccd15b4c93751b3156d50e611974e8f8b332efb467c031385e9f819
 DIST neomutt-20180512.tar.gz 2758674 BLAKE2B 47a8d1fe5d5e2725a6ee868b937eea3807ab35dc8eefe47f0d9b1db3aeaa97e69c36e3b8544fc43f1ce0a9980017d654bace8d342094fd7d26ecdb13cdf54253 SHA512 033faa27b01998895d2452d541ed5942cf7dede7a935fc807e6a7f88f3a8c182ea0ab5b4ed7db852ff2afb4d3b990db05477d9ff0dcf7dee186c393244d1db66
 DIST neomutt-20180622.tar.gz 2769280 BLAKE2B 57e708a0502d8de795a08150dd92c4b2a8ba9d0594102f4d4d4b183f29caad147e233586882ca68aa23df6e69b0c55345120ca40ddc9db80e76c734409ff5a3b SHA512 8085bf2bcf25ee4a4531cc5f950f862f58e3bf6ebfb96450479132ed60b4d87e35bc54f9b5e110d93dbd8e9684c1eceb36012753fc7bf5d3fb5046d9d42b69e0
+DIST neomutt-20180716.tar.gz 2778105 BLAKE2B b367407baf2187347971a0327a0c037861f648ebef12ce7b006b756bf60e696ff7a2c986848a9f15815aa95638dd5a3a90f47e97a9c0573950be8cdcc93b13ad SHA512 ee4093217cc1409262b96ab33ed78a38f5c6a72f62fcd7b25027f9373687ce67af8a4e1793b1d7d843bee5b4a7e0c69b30b3badf88a4e1a8fadd8b21441faaae
 EBUILD neomutt-20180223.ebuild 4032 BLAKE2B 16d3abd69e3c9f8257b84c04409c94726a2644575021492cb7cc8d6831ab9a6233cbd54e537d8207b6832b45266c62a8b5b974d015f63df8a6d012d2a71459c2 SHA512 88463b0ff97a1c9c14742072b8cfdfda81fceb5bee2c9251a09f6b9959de5a575f6eed7a54f9d00026dd33b52d0e8912e15c841451de7dd22ffe8121014f14d9
 EBUILD neomutt-20180323.ebuild 4032 BLAKE2B 16d3abd69e3c9f8257b84c04409c94726a2644575021492cb7cc8d6831ab9a6233cbd54e537d8207b6832b45266c62a8b5b974d015f63df8a6d012d2a71459c2 SHA512 88463b0ff97a1c9c14742072b8cfdfda81fceb5bee2c9251a09f6b9959de5a575f6eed7a54f9d00026dd33b52d0e8912e15c841451de7dd22ffe8121014f14d9
-EBUILD neomutt-20180512.ebuild 4149 BLAKE2B cbdbb6967fb95103e45bd300ffb3ada6ef57e7fea4919114a3790c307ebb2a89c05ef1a8f4d90e61611e27843dc8ae6569ad7d1340990949b74306dbc08426a4 SHA512 6c9a692d54e9bd13fe02553a614839e1c47b31169a5ec87057cd123eb783f0cb21c484acf8647b5b9731661f8a771b8313e4c1eb148ed7a9b2790487dc7f25a1
-EBUILD neomutt-20180622.ebuild 3269 BLAKE2B 71a2c2172f924211aa4fcf2406fbcd3e05e4c40a0505bbc5a3390e63f76b483a6baca21d8e2ad4f2db079f7b0806053bc4d6db758f9d75721db54f511bd43be8 SHA512 4a327c9ace86888d7e4bf5d71079eba3b70dafd3cc5603b2c4cd54965495beddd5d4397583c81b4e2769fc462e420e4d957cf176abc13648d7cf87c4cffdae6c
-EBUILD neomutt-99999999.ebuild 3269 BLAKE2B 71a2c2172f924211aa4fcf2406fbcd3e05e4c40a0505bbc5a3390e63f76b483a6baca21d8e2ad4f2db079f7b0806053bc4d6db758f9d75721db54f511bd43be8 SHA512 4a327c9ace86888d7e4bf5d71079eba3b70dafd3cc5603b2c4cd54965495beddd5d4397583c81b4e2769fc462e420e4d957cf176abc13648d7cf87c4cffdae6c
+EBUILD neomutt-20180512.ebuild 4151 BLAKE2B de49b44fd2b4eb865b5457e6379e908cfc7f1500cd1ce6a97a1d9d19eb29b59efa595fc92227b4138ae55418b5b0fd32ab600f363adbf2ebf77865099e39a6d9 SHA512 31dfc159c61781e58f3e721b5ba827d6b526ef0fd201cb29b94fbff4affdd8a1a2f77546d56b4fb0deaca60f427f9fe76125c138875a989290e606c161991c75
+EBUILD neomutt-20180622.ebuild 3271 BLAKE2B 37bd175aca2c3d77a365a90df65be546f4724f8af5c13c841459eec58e0b70aee9be9fcbf66cdf47c64884f953fe872341d87cc5f8090dc6785a7106b1f50b81 SHA512 b22729f9cafdac9b477d0cf82e428852a2202f53992eb9ecc341dbc0f6caf95488eb5c47ffcd39f00af0f9ac8e03400375e2eec920d64e0789dad90aeba7b036
+EBUILD neomutt-20180716.ebuild 3271 BLAKE2B 37bd175aca2c3d77a365a90df65be546f4724f8af5c13c841459eec58e0b70aee9be9fcbf66cdf47c64884f953fe872341d87cc5f8090dc6785a7106b1f50b81 SHA512 b22729f9cafdac9b477d0cf82e428852a2202f53992eb9ecc341dbc0f6caf95488eb5c47ffcd39f00af0f9ac8e03400375e2eec920d64e0789dad90aeba7b036
+EBUILD neomutt-99999999.ebuild 3271 BLAKE2B 37bd175aca2c3d77a365a90df65be546f4724f8af5c13c841459eec58e0b70aee9be9fcbf66cdf47c64884f953fe872341d87cc5f8090dc6785a7106b1f50b81 SHA512 b22729f9cafdac9b477d0cf82e428852a2202f53992eb9ecc341dbc0f6caf95488eb5c47ffcd39f00af0f9ac8e03400375e2eec920d64e0789dad90aeba7b036
 MISC metadata.xml 1430 BLAKE2B cde0fee81787af5d8401b456deafc66ac9427a88b25866abbecbf874c30a6acc69375f4c7705916985b79e052ca2c07e2a0c7ab853dbc562e53230ec11c15e28 SHA512 e19508e8851160c14d2bab48f54b3cf959411b3b0ccfe3555414bc563e8300daf03cf328379569fc516576d0065fb440f3f6426509b599d70555282426163cc3
diff --git a/mail-client/neomutt/neomutt-20180512.ebuild b/mail-client/neomutt/neomutt-20180512.ebuild
index fd8061623df8..c746dd2fc3b3 100644
--- a/mail-client/neomutt/neomutt-20180512.ebuild
+++ b/mail-client/neomutt/neomutt-20180512.ebuild
@@ -42,7 +42,7 @@ CDEPEND="
 	gnutls? ( >=net-libs/gnutls-1.0.17 )
 	gpg? ( >=app-crypt/gpgme-0.9.0 )
 	gpgme? ( >=app-crypt/gpgme-0.9.0 )
-	idn? ( net-dns/libidn )
+	idn? ( net-dns/libidn:= )
 	kerberos? ( virtual/krb5 )
 	notmuch? ( net-mail/notmuch )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )
diff --git a/mail-client/neomutt/neomutt-20180622.ebuild b/mail-client/neomutt/neomutt-20180622.ebuild
index fb8ad83183d0..4d1742196c36 100644
--- a/mail-client/neomutt/neomutt-20180622.ebuild
+++ b/mail-client/neomutt/neomutt-20180622.ebuild
@@ -41,7 +41,7 @@ CDEPEND="
 	tokyocabinet? ( dev-db/tokyocabinet )
 	gnutls? ( >=net-libs/gnutls-1.0.17 )
 	gpgme? ( >=app-crypt/gpgme-0.9.0 )
-	idn? ( net-dns/libidn )
+	idn? ( net-dns/libidn:= )
 	kerberos? ( virtual/krb5 )
 	notmuch? ( net-mail/notmuch )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )
diff --git a/mail-client/neomutt/neomutt-20180716.ebuild b/mail-client/neomutt/neomutt-20180716.ebuild
new file mode 100644
index 000000000000..4d1742196c36
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20180716.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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/${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 )
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_configure() {
+	local myconf=(
+		"$(use_enable 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 "${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
+}
diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index fb8ad83183d0..4d1742196c36 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -41,7 +41,7 @@ CDEPEND="
 	tokyocabinet? ( dev-db/tokyocabinet )
 	gnutls? ( >=net-libs/gnutls-1.0.17 )
 	gpgme? ( >=app-crypt/gpgme-0.9.0 )
-	idn? ( net-dns/libidn )
+	idn? ( net-dns/libidn:= )
 	kerberos? ( virtual/krb5 )
 	notmuch? ( net-mail/notmuch )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )