gentoo resync : 13.10.2017

3 files changed, 115 insertions, 5 deletions

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 6115e555496d..94d57c8bc2cd 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -6,8 +6,10 @@ AUX Muttrc.mbox 486 SHA256 10b251f88ccc5d4c95c96ab17b6ab6a30a16d6590ab896a60037f
 DIST neomutt-20170714.tar.gz 2509160 SHA256 40d48920f95ca49ab96eb109b658f5cf6e1c222320c58bdd03769c1355d7a383 SHA512 eb31d2f23b7211904cd66ba293c008f953778b37f13fd09d4db571d013f1c8e6449fccd827872f3ad0a2c8e62555f92b3f9591a1f0f4ac37ab362a4681abaaa0 WHIRLPOOL 455495501a2ab1989d5f3bfa75aa2370896956cdfd7d2e852e225c96aa23a1abdaf2dbb9d886d1d96486d19b2b38c225e8263f268ebafcef8cbd0024885189f3
 DIST neomutt-20170912.tar.gz 2533245 SHA256 9f0d128fe8dbbbddb67e2b629f8b5e52a9d892f82c735845c1708c14e3046657 SHA512 7551da47029667443257d9d370af7217846abf988d1469c4e08f367ef0bce2dfb658321df27176622bbd07e6d46c320380749d4ce05ee39cb1e8d9b6c3e1d7e6 WHIRLPOOL 0dad6380acf5b6f891bcb77388023de27d23e4ea8ad0eb3563c1704de555a2fc54604d47b9b67557c6ab0310e1c365c786a1952f6794b2012594f1c19033ad3c
 DIST neomutt-20171006.tar.gz 2706019 SHA256 86e9d945919438a377828b15f03c8690f639062e44151e219e2f8443ae27147c SHA512 adfa702ee642ce58b11dab1d2b805626d8f90e8cc88731cb7e051df5b785010ac43d90eb14d2a5ace02d3abaf921c9f36f86f627063036bcb7f5724912ca134d WHIRLPOOL 75f2a0c8881b769f1a7acd8c0e7724baf0a2943a68a4029d74d32a5a5ed3203c32ce3704b3271a8e05f02c233273319437a593ffad9df5e1b988f8725f0f2433
+DIST neomutt-20171013.tar.gz 2706753 SHA256 5a7c6302d623b620db03d923a7cd7cf967123a67fc42c117a0dd4b45612e9a55 SHA512 9e4499b165f25091d73868c62b14f950bdfc032444c0cb3619e99a8299d29c3d1f24078e15537e693a3af69ae0681d59e25a73b857882cce2653be593231ffac WHIRLPOOL fde9e7833bc6a469882716d7c9deb4d5146d0a6ffd5769e7d76d952096165b05d29584e057503a1ba3a4887c8afd0efe26401fc9d533250c597527bce8500634
 EBUILD neomutt-20170714.ebuild 2886 SHA256 9c5ff863ac720202d144e49b4d56d279c1156f330c13b3cb4e42dc053fc708ef SHA512 3c39242e27f38cfa7f3a491ea168b23512aa10a01d95c1d84bdb2034e5096d5e8cca5db13c8bf338e2bf39df4e953bd7ddf512d22954c2206186ab0bee3b0b8e WHIRLPOOL 511a7be9e55fde867abe4c294e861f1569d4e13267cceb712b3d3bcaf164a7d9a8d351cc4cc38f49f11439ad7047b5b45eeead3d620b477f73d4d6e4b37cf689
 EBUILD neomutt-20170912.ebuild 2883 SHA256 62f2e3c7bc4adcfe4c1f48b3b1968def7985ede762c30f2b8170df51831cdcc1 SHA512 aabd31f6bb102f174a1f076dae060decc8f01c11afce8d732ff0666d77a746d78ef96480a0f5c42eb0be73e194e07087d23e8bc418d625dad0a6d98627cff1c5 WHIRLPOOL 908a8c3c732c3ccf499e9868b183514443d9a52db2659ae7b520ca945aa5b0fb2a3dec584a69514c1f9d062d68c7bba7d856288e6bd217df5530274093640147
 EBUILD neomutt-20171006.ebuild 2795 SHA256 50e22a6219807aed7c5cc9824bc51e1c39fc8b83d84df42221bd97574f4aee29 SHA512 8d3919c88ff971891c1c49c8a56bea2a802ba07dc556d85779e13f8a6b67bc4788fbcfbcc0fd287c04e952a110ecee9b0d2420fccf79f1735e98834b037fe9e1 WHIRLPOOL a5094c1458ae6f025f0ad8b5798ca35d45a4ca39cb5f2aec00327cb2f6e2ffb335b20f915f8ea71d098f1c7eee1c2fea38f61b1b885d2da785a39b18ba0d6193
-EBUILD neomutt-9999.ebuild 2852 SHA256 4cbafe4b788a717c3ccb9dd80967b15ea5aac05c90d1d50bf55f943285e2c2d7 SHA512 c3266f72a083abed04c9abd05794c9d8c89c1422fdfa51352d8da09657142fa2901d75800157560c217042a408578437b627689711e5310c8084153cb6e34251 WHIRLPOOL 7ae660414d6e5d9736dcd94558c5161a116313ba0ed008d76559cd986bcc031b71ac88b1f2fbd99b39e79d47ac5500a7a067736b87f537385e709046ebcc2235
+EBUILD neomutt-20171013.ebuild 2719 SHA256 d38f53585c0208de9d9e1d1d3950d69b371fbfb259c1dfb8d0920238ea2b02d0 SHA512 945c6145c9965a4c3e89b0d75920dddc24848f6ba9cec16e25d937dbac9d0def98c8f770e10b2efb933c26f358a8cd257849f48b5fcde2ea15e104a7e5f8360e WHIRLPOOL c8f4313ee8945ef0931674f4cb99be1b1d8720e4dbb7a2aee60529d37b90a237501119bf67c65925233af63e5e052032e06fc95a61093a6e38317b07718cd134
+EBUILD neomutt-9999.ebuild 2685 SHA256 36ee62918a16cb2820079573449c39d200891215ad446493bc2004235f854855 SHA512 ea6f93d49a7a4987d7836b3a454b26d9120a67572b442673a98c7dfe60880748ea9101f4bd4eccf5db1f9bcc1a182c36ed8e58f3dcd587b51665b43c262f95be WHIRLPOOL 53d91df7a5e5c041e4a8732ee9803eacc7d09e57ba7011d980ed52d6b91f85ce87f778c10d46f119593e353419d73b40798caa40d90e42d7f1dbf30d94b44bfd
 MISC metadata.xml 721 SHA256 5122d3087be519e71debbfb6c796335ad7e40bf099b0058379bc63dbfc28ea72 SHA512 2fbf2b5d1b13b0845b2545ba99c0bbc15faa0f000f69dba3c307244c1a6aeb74e2d34ee7052527856335e5d8bf665738d4d8bd0e7e9ca53c28b1d92a851e8747 WHIRLPOOL c6c717387be4bef13c38fd86594966e33c2f10fdbfe899335ecc36f01c7d42fdfc991465da1c6a4ec2de1dd68ad7048e8bf11012d26241c724fd189d3a38ffbc
diff --git a/mail-client/neomutt/neomutt-20171013.ebuild b/mail-client/neomutt/neomutt-20171013.ebuild
new file mode 100644
index 000000000000..af4dc6a9e039
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20171013.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="https://www.neomutt.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn kerberos kyotocabinet
+	libressl lmdb nls notmuch qdbm sasl selinux slang smime ssl +symlink
+	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 )
+	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}
+	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_prepare() {
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		"$(use_enable crypt pgp)"
+		"$(use_enable debug)"
+		"$(use_enable doc)"
+		"$(use_enable gpg gpgme)"
+		"$(use_enable nls)"
+		"$(use_enable smime)"
+		"$(use_enable notmuch)"
+		"$(use_with idn)"
+		"$(use_with kerberos gss)"
+		"$(use_with sasl)"
+		"$(use_with tokyocabinet)"
+		"$(use_with kyotocabinet)"
+		"$(use_with qdbm)"
+		"$(use_with gdbm)"
+		"$(use_with berkdb bdb)"
+		"$(use_with lmdb)"
+		"--with-$(usex slang slang curses)"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"--with-docdir=${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	if use gnutls; then
+		myconf+=( "--with-gnutls" )
+	elif use ssl; then
+		myconf+=( "--with-ssl" )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# A newer file is provided by app-misc/mime-types. So we link it.
+
+	# A man-page is always handy, so fake one
+	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
+	fi
+
+	dodoc COPYRIGHT LICENSE* ChangeLog* README*
+}
diff --git a/mail-client/neomutt/neomutt-9999.ebuild b/mail-client/neomutt/neomutt-9999.ebuild
index 590236b4e3e5..43cb3fef7595 100644
--- a/mail-client/neomutt/neomutt-9999.ebuild
+++ b/mail-client/neomutt/neomutt-9999.ebuild
@@ -94,10 +94,6 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install
 
-	# A newer file is provided by app-misc/mime-types. So we link it.
-	#rm "${ED}"/etc/${PN}/mime.types || die
-	#dosym "${EPREFIX}/etc/mime.types" /etc/${PN}/mime.types
-
 	# A man-page is always handy, so fake one
 	if use !doc; then
 		emake -C doc neomuttrc.man