gentoo resync : 25.01.2018

4 files changed, 294 insertions, 13 deletions

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index d5e228a2876a..afb005289ab1 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -8,6 +8,8 @@ EBUILD neomutt-20171006.ebuild 2785 BLAKE2B 2bfd22e3165a509db8ac7620388cfdd18fd2
 EBUILD neomutt-20171013.ebuild 2709 BLAKE2B 03ef87a76af095aa61d2b0630979ef74d2bab16b00cf023c18bef7276fe56565021390a200f29544089b9111f025f32f8c9b8f3dd4ec3e62d9651e346f43515a SHA512 e4ba14fc7d2415419c91cfff4b6f5d633179e53d8dcb43b71786c8b63b97832f45fd0506debbfc763b77496ca075d13d3f941cd20e029f28a505cb28b4dfc78e
 EBUILD neomutt-20171027.ebuild 2709 BLAKE2B 03ef87a76af095aa61d2b0630979ef74d2bab16b00cf023c18bef7276fe56565021390a200f29544089b9111f025f32f8c9b8f3dd4ec3e62d9651e346f43515a SHA512 e4ba14fc7d2415419c91cfff4b6f5d633179e53d8dcb43b71786c8b63b97832f45fd0506debbfc763b77496ca075d13d3f941cd20e029f28a505cb28b4dfc78e
 EBUILD neomutt-20171208.ebuild 3274 BLAKE2B 231f9bff37d1cb6bd6f6dde94e9943adf7835301f917baf95d1ca5d399337719d677cd7dc187cc373b24d92b5f1fd58cf12b9ae87088d94675079567552a8f29 SHA512 fc039a384d5815d5e8b19d66a2236dd2cd006ce09f32d6dfaaebdea4c22c0294e1cb877c9fdc7657fbd7ef243e8c3387b30a178fb13c953b8f60486e6a76d97f
+EBUILD neomutt-20171215-r1.ebuild 3960 BLAKE2B 1e47347a16c8c0f31c2c89f2173e106dfc78f369564bcd4dac1850649dbeb5ebc71afb9094a5a4f8e52c1c8a8ad1bedf0af5839ee4eaaa55b89df52fc22a5dc6 SHA512 5cc4e2c11e859a1d17f96091ffa97bc0ca3843e6debe2dc4dbba05ab71950f47852404bfb89244e7ec2e4b2d60bdf9c4ff6bbc25ce5262637201189bca571a3c
+EBUILD neomutt-20171215-r2.ebuild 4032 BLAKE2B 16d3abd69e3c9f8257b84c04409c94726a2644575021492cb7cc8d6831ab9a6233cbd54e537d8207b6832b45266c62a8b5b974d015f63df8a6d012d2a71459c2 SHA512 88463b0ff97a1c9c14742072b8cfdfda81fceb5bee2c9251a09f6b9959de5a575f6eed7a54f9d00026dd33b52d0e8912e15c841451de7dd22ffe8121014f14d9
 EBUILD neomutt-20171215.ebuild 3470 BLAKE2B 0612a05bd1f2250b350a02b8868fecf1a8711ea246531352012c8894ef118fe50834a16800f464d31e9b30ebed427980c214e1c38f83cb68fe34d15512af4fc9 SHA512 96ef8e7f5e8e2a674ece11e400943545f07d71b7b694a25f41b31bf36cb52080f2c9509954fc8b83f1dd4a8b1c3ae935a1101c0e52b75e2acc649a000b5dfa4f
-EBUILD neomutt-9999.ebuild 3912 BLAKE2B d2b7ed25c443f1192663e9e98bbfb62c269a2f3897b82bbbd80bf2c0749760b695942b8b05f6f9ec0c139d80ea2d02061b52c4b37a870969eb2d4dc0cd1b5b31 SHA512 a50ce190784904f012624a707371046b04771a77dbb7b7cd633b8a16e7ed2d6fd54d9977585da94f1bb10e51cf1d1a2430ec4e8478f071b05e29325d39b61635
+EBUILD neomutt-9999.ebuild 4032 BLAKE2B 16d3abd69e3c9f8257b84c04409c94726a2644575021492cb7cc8d6831ab9a6233cbd54e537d8207b6832b45266c62a8b5b974d015f63df8a6d012d2a71459c2 SHA512 88463b0ff97a1c9c14742072b8cfdfda81fceb5bee2c9251a09f6b9959de5a575f6eed7a54f9d00026dd33b52d0e8912e15c841451de7dd22ffe8121014f14d9
 MISC metadata.xml 1430 BLAKE2B cde0fee81787af5d8401b456deafc66ac9427a88b25866abbecbf874c30a6acc69375f4c7705916985b79e052ca2c07e2a0c7ab853dbc562e53230ec11c15e28 SHA512 e19508e8851160c14d2bab48f54b3cf959411b3b0ccfe3555414bc563e8300daf03cf328379569fc516576d0065fb440f3f6426509b599d70555282426163cc3
diff --git a/mail-client/neomutt/neomutt-20171215-r1.ebuild b/mail-client/neomutt/neomutt-20171215-r1.ebuild
new file mode 100644
index 000000000000..e5725c955639
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20171215-r1.ebuild
@@ -0,0 +1,133 @@
+# 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} =~ 9999$ ]]; 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://www.neomutt.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet
+	libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime
+	smime_classic ssl tokyocabinet"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? ( >=sys-libs/db-4:= )
+	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 )
+	gpg? ( >=app-crypt/gpgme-0.9.0 )
+	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)"
+
+		# During the transition of the crypto USE flags we need to support
+		# both sets of flags. We do not want to emit a configuration setting
+		# twice, since the second flag overrides the first, potentially
+		# leading to unwanted settings. See https://bugs.gentoo.org/640824 for
+		# details.
+		"$(if use gpg || use gpgme; then echo "--enable"; else echo "--disable"; fi)-gpgme"
+		"$(if use crypt || use pgp_classic; then echo "--enable"; else echo "--disable"; fi)-pgp"
+		"$(if use smime || use smime_classic; then echo "--enable"; else echo "--disable"; fi)-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 '/^\(SRCDIR\|EXEEXT\|CC_FOR_BUILD\)\s*=/p;$a\\n' \
+			Makefile > doc/Makefile.fakedoc || die
+		sed -n '/^\(MAKEDOC_CPP\s*=\|doc\/\(makedoc$(EXEEXT)\|neomuttrc.man\):\)/,/^[[:blank:]]*$/p' \
+			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.man
+		cp doc/neomuttrc.man doc/neomuttrc.5 || die
+		doman doc/neomutt.1 doc/neomuttrc.5
+	fi
+
+	dodoc COPYRIGHT LICENSE* ChangeLog* README*
+}
+
+pkg_postinst() {
+	if use crypt || use gpg || use smime; then
+		ewarn "Pleae note that the crypto related USE flags of neomutt have changed."
+		ewarn "(https://bugs.gentoo.org/637176)"
+		ewarn "crypt -> pgp_classic"
+		ewarn "gpg -> gpgme"
+		ewarn "smime -> smime_classic"
+		ewarn "The old USE flags still work but their use is deprecated and will"
+		ewarn "be removed in a future release."
+		if use gpg && ( use crypt || use smime ); 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
+	fi
+}
diff --git a/mail-client/neomutt/neomutt-20171215-r2.ebuild b/mail-client/neomutt/neomutt-20171215-r2.ebuild
new file mode 100644
index 000000000000..f90289f77c00
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20171215-r2.ebuild
@@ -0,0 +1,140 @@
+# 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} =~ 9999$ ]]; 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://www.neomutt.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet
+	libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime
+	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 )
+	gpg? ( >=app-crypt/gpgme-0.9.0 )
+	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)"
+
+		# During the transition of the crypto USE flags we need to support
+		# both sets of flags. We do not want to emit a configuration setting
+		# twice, since the second flag overrides the first, potentially
+		# leading to unwanted settings. See https://bugs.gentoo.org/640824 for
+		# details.
+		"$(if use gpg || use gpgme; then echo "--enable"; else echo "--disable"; fi)-gpgme"
+		"$(if use crypt || use pgp_classic; then echo "--enable"; else echo "--disable"; fi)-pgp"
+		"$(if use smime || use smime_classic; then echo "--enable"; else echo "--disable"; fi)-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 '/^\(SRCDIR\|EXEEXT\|CC_FOR_BUILD\)\s*=/p;$a\\n' \
+			Makefile > doc/Makefile.fakedoc || die
+		sed -n '/^\(MAKEDOC_CPP\s*=\|doc\/\(makedoc$(EXEEXT)\|neomuttrc.man\):\)/,/^[[:blank:]]*$/p' \
+			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.man
+		cp doc/neomuttrc.man doc/neomuttrc.5 || die
+		doman doc/neomutt.1 doc/neomuttrc.5
+	fi
+
+	dodoc COPYRIGHT LICENSE* ChangeLog* README*
+}
+
+pkg_postinst() {
+	if use crypt || use gpg || use smime; then
+		ewarn "Pleae note that the crypto related USE flags of neomutt have changed."
+		ewarn "(https://bugs.gentoo.org/637176)"
+		ewarn "crypt -> pgp_classic"
+		ewarn "gpg -> gpgme"
+		ewarn "smime -> smime_classic"
+		ewarn "The old USE flags still work but their use is deprecated and will"
+		ewarn "be removed in a future release."
+		if use gpg && ( use crypt || use smime ); 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
+	fi
+}
diff --git a/mail-client/neomutt/neomutt-9999.ebuild b/mail-client/neomutt/neomutt-9999.ebuild
index 7b36a57de365..f90289f77c00 100644
--- a/mail-client/neomutt/neomutt-9999.ebuild
+++ b/mail-client/neomutt/neomutt-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,14 @@ IUSE="berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet
 
 CDEPEND="
 	app-misc/mime-types
-	berkdb? ( >=sys-libs/db-4:= )
+	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 )
@@ -99,17 +106,16 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install
 
-	# A man-page is always handy, so fake one
+	# A man-page is always handy, so fake one – here neomuttrc.5
+	# (neomutt.1 already exists)
 	if use !doc; then
-		emake -C doc neomuttrc.man
-		# make the fake slightly better, bug #413405
-		sed -e 's#@docdir@/manual.txt#http://www.neomutt.org/guide#' \
-			-e 's#in @docdir@,#at http://www.neomutt.org/,#' \
-			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
-			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
-			doc/neomutt.man > neomutt.1 || die
-		cp doc/neomuttrc.man neomuttrc.5 || die
-		doman neomutt.1 neomuttrc.5
+		sed -n '/^\(SRCDIR\|EXEEXT\|CC_FOR_BUILD\)\s*=/p;$a\\n' \
+			Makefile > doc/Makefile.fakedoc || die
+		sed -n '/^\(MAKEDOC_CPP\s*=\|doc\/\(makedoc$(EXEEXT)\|neomuttrc.man\):\)/,/^[[:blank:]]*$/p' \
+			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.man
+		cp doc/neomuttrc.man doc/neomuttrc.5 || die
+		doman doc/neomutt.1 doc/neomuttrc.5
 	fi
 
 	dodoc COPYRIGHT LICENSE* ChangeLog* README*