gentoo resync : 15.12.2017

4 files changed, 316 insertions, 34 deletions

diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index d64be327e451..e3f81ee1a0f6 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -5,8 +5,9 @@ DIST mutt-1.9.0.tar.gz 4191932 BLAKE2B 8ec3bf68f6ae4e12875d396fcd097070110f349cf
 DIST mutt-1.9.1.tar.gz 4193868 BLAKE2B 44623e3fd75e9f599daf044be54913944f894a5e05a8cb4e669c5d44e6bfab9caecbf0e0eb0fd6ebe0c0d177a141c78f1e837ad3059260e29326867c9db201b0 SHA512 1a6871eb8499c60ae18b03d56b81e64de1643c68f8fbe05bbe114085b20098be58175e5bd6d2515e8332a824cbed75640744a261d4f10654c56625f903224095
 DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 BLAKE2B ecc845983dc00e388c25ced0ca0c253d9fdfa813e9df6a4f166f4ccbb05cc26b5522fa84ccdfd1f92d5cce7291ac3d70ddefaeac3e13dafc892f924236a62f11 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e
 DIST mutt-gentoo-1.9.0-patches-r3.tar.xz 114568 BLAKE2B 157060a7f0d2833c311fdc68ee02e1b52cd9feeb18236e6e3f7d8a3ad75acd6d2fdbc7c11dbf29a298d9d88056b1d0eee3abd9fd508d04aca6e47877ce78ee1c SHA512 9ea5979e54237a9e11cfc8b62119329fdff217f54ec0b75b9ee84d6db891638219855c2408a8a65fae2f8b6c6d19333d009364ced22d2a6de6e93df09bd2ef69
-DIST mutt-gentoo-1.9.1-patches-r1.tar.xz 112940 BLAKE2B 9992f7977a6a2a39f1bc6d3da092477c2da065342ec1aacd2315fd204732aca5fe4a9a33cf5233660de213c87e53f94b87d65cce7084954391c9b8c95b650ae7 SHA512 ad658140a39e59c84b3c5dcee0585ec6f462ce60093dac2c77e2a77ef792a4214c4f966fe4e9c29a84d333b4249a5336d1d8a3fdaeef5368ebbc7edfb4c2ebf5
+DIST mutt-gentoo-1.9.1-patches-r2.tar.xz 112976 BLAKE2B 3b4e882992982cf513bdfb27f24a136230e70e2e654136175394db5b6c2c37a48d1d4ae52da05a7b64c741eadd1c294f2141a36007516e6d444e3c5d2d949bdd SHA512 39204b0336bdcc610cf6152f2a41e1a4bde9a5cb05e2120b9ac80360ce978ba830656d53fb4c860ac35baf0ad7f9f359e151a2ae6a657de3073c97667b02c264
 EBUILD mutt-1.7.2.ebuild 7597 BLAKE2B 293f44f17fcac1ef39c1a02adeafa4096b57ebf62d4000ce64f2dce89c241cd87f83f7dd96e42b0ce245e5f1e1eae016025187d785c08ec5e2639494b820709e SHA512 4316b6c10d5b70071cc8e0d2185d89056763210bacf626d11c8632ce93e8638cdef2c59d87806b588551db590d8c0bcaebf6b487bb2eaa5c6556d57b51aeb2ef
 EBUILD mutt-1.9.0-r2.ebuild 7396 BLAKE2B d0eef22a079f4858600d27e2a58c68db27ce7ebdafc182ce127789255d752cfb674eb24f0074f6202e5486568b80af9c6ee8725aa4b32821ad79ad97917dfda3 SHA512 f3461caf42987f63db8e26194788b733aac89c9230c1d02c41058f0af8559367cbacde1adacab01b0bd7ccec6f7eeed24bc781b0a04829426394a9e7aa107135
-EBUILD mutt-1.9.1-r1.ebuild 7396 BLAKE2B 6f2334920893d826a091eab3cf8e386b584ad78087041c4da4c504efb6dc3085207a9f22c4dec3cb1f50f86f251f8df13aae2da553a838392920dadcf5b53c0a SHA512 1d8530d8d0fe7b87d85335fed81f7d5171c233b94b664c638db0d59a678b50f98f7e93ff1496a0f3395e90e69b273b326ff3fa86d283c5767706c761a01400a7
-MISC metadata.xml 1472 BLAKE2B 7a817152e2e616b7428d817d284525619a21f43d92113eb8c1a364c933db2c4ee404f21c8e5d0b430baa295dc249629fe4d30a0d5f9fe49b1aac8d0dd5f0e332 SHA512 f9f9f9e360c72bc2d5f60db11956bec9faf8b9b3dba538ddbd42db42f1718ec9f72f34df48555fef756bd37180a03f1f86056b519ad7a67a3f759bc271cdf3a1
+EBUILD mutt-1.9.1-r2.ebuild 7396 BLAKE2B 1a3921492979456b8baa74c057de39218564406ee2c20353178f7386730074c3c4798ce5c607825089d432c678dc4a296108f59d849c5a9b6e531b99f2afc7c8 SHA512 700fc554fc46e091a4b4c1e9d5cd044771c590a56b0d8fc2ddf9f949784960f9106bbb3483b517d2703a3b3ef9d80d11955fdbd8a142ac8c2ac9f44ca714ca45
+EBUILD mutt-1.9.1-r4.ebuild 8631 BLAKE2B 920eacb18c3ac7daece5133a2eb1b7cf6a7a187204bc0eb9996361e8763d39653f4636de258de484c20d6b3060681f598b30cad8e9d4c1d66a9cd0f8d6ce065c SHA512 a73465c57c30ac6373e58d0e9328b8ea1d073d2a5a62227afbcf5757a6904dda54681085e30cc8cbbdaca3a236938dd5aba4b3e90fd09d7b94df7e8cfc09abcb
+MISC metadata.xml 1747 BLAKE2B 62a88e2f036303c9d67f1b77eebb979ab2f3c232ad85872bb7ab63d8cb93525f0ed4d76950d8096cb1d4b3d6ea1c885eb9d3038dbee54bea67fdff32c4dbb1a2 SHA512 34ea19f78aedf5e391799222fc3c576f0ccca53141a5bbcf6b5f12c91d5176e49844878309a8c30151ff38aa30e9c8105b775cec958595578855c07c0937de1c
diff --git a/mail-client/mutt/metadata.xml b/mail-client/mutt/metadata.xml
index 75c5b94f6148..217549fa2db9 100644
--- a/mail-client/mutt/metadata.xml
+++ b/mail-client/mutt/metadata.xml
@@ -1,34 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>grobian@gentoo.org</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>net-mail@gentoo.org</email>
-    <name>Net-Mail</name>
-  </maintainer>
-  <use>
-    <flag name="berkdb">Enable <pkg>sys-libs/db</pkg> database backend
-      for header caching</flag>
-    <flag name="gdbm">Enable <pkg>sys-libs/gdbm</pkg> database backend
-      for header caching</flag>
-    <flag name="gpg">Enable support for <pkg>app-crypt/gpgme</pkg> to
-      sign/verify and encrypt/decrypt OpenPGP messages</flag>
-    <flag name="hcache">Enable header cache, one database backend needs
-      to be enabled</flag>
-    <flag name="lmdb">Enable <pkg>dev-db/lmdb</pkg> database backend for
-      header caching</flag>
-    <flag name="notmuch">Enable support for <pkg>net-mail/notmuch</pkg></flag>
-    <flag name="pop">Enable support for POP3 mailboxes</flag>
-    <flag name="sidebar">Enable the sidebar feature</flag>
-    <flag name="smime">Enable support for S/MIME mailparts</flag>
-    <flag name="smtp">Enable support for direct SMTP delivery</flag>
-    <flag name="tokyocabinet">Enable <pkg>dev-db/tokyocabinet</pkg>
-      database backend for header caching</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">mutt</remote-id>
-    <remote-id type="bitbucket">mutt/mutt</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>grobian@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
+	<use>
+		<flag name="berkdb">Enable <pkg>sys-libs/db</pkg> database backend
+			for header caching</flag>
+		<flag name="gdbm">Enable <pkg>sys-libs/gdbm</pkg> database backend
+			for header caching</flag>
+		<flag name="hcache">Enable header cache, one database backend needs
+			to be enabled</flag>
+		<flag name="lmdb">Enable <pkg>dev-db/lmdb</pkg> database backend for
+			header caching</flag>
+		<flag name="notmuch">Enable support for <pkg>net-mail/notmuch</pkg></flag>
+		<flag name="pop">Enable support for POP3 mailboxes</flag>
+		<flag name="sidebar">Enable the sidebar feature</flag>
+		<flag name="smtp">Enable support for direct SMTP delivery</flag>
+		<flag name="tokyocabinet">Enable <pkg>dev-db/tokyocabinet</pkg>
+			database backend for header caching</flag>
+		<flag name="crypt">Add support for encryption -- using mcrypt or gpg
+			where applicable</flag>
+		<flag name="pgp_classic">Build classic_pgp backend to support PGP/MIME
+			and traditional/inline PGP</flag>
+		<flag name="gpg">Enable support for <pkg>app-crypt/gpgme</pkg></flag>
+		<flag name="gpgme">Build gpgme backend to support S/MIME, PGP/MIME and
+			traditional/inline PGP</flag>
+		<flag name="smime">Enable support for smime</flag>
+		<flag name="smime_classic">Build classic_smime backend to support
+			S/MIME</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">mutt</remote-id>
+		<remote-id type="bitbucket">mutt/mutt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-client/mutt/mutt-1.9.1-r1.ebuild b/mail-client/mutt/mutt-1.9.1-r2.ebuild
index 4491727bd3a1..98ae31060e18 100644
--- a/mail-client/mutt/mutt-1.9.1-r1.ebuild
+++ b/mail-client/mutt/mutt-1.9.1-r2.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 inherit eutils flag-o-matic autotools
 
-PATCHREV="r1"
+PATCHREV="r2"
 PATCHSET="gentoo-${PVR}/${PATCHREV}"
 
 DESCRIPTION="A small but very powerful text-based mail client"
diff --git a/mail-client/mutt/mutt-1.9.1-r4.ebuild b/mail-client/mutt/mutt-1.9.1-r4.ebuild
new file mode 100644
index 000000000000..0cad65143c18
--- /dev/null
+++ b/mail-client/mutt/mutt-1.9.1-r4.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic autotools
+
+PATCHREV="r2"
+PATCHSET="gentoo-${PVR}/${PATCHREV}"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
+SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
+	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
+	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg gpgme +hcache idn imap kerberos libressl lmdb mbox nls nntp notmuch pgp_classic pop qdbm sasl selinux sidebar slang smime smime_classic smtp ssl tokyocabinet vanilla prefix"
+REQUIRED_USE="
+	hcache?           ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+	imap?             ( ssl )
+	pop?              ( ssl )
+	nntp?             ( ssl )
+	smime?            ( ssl !gnutls )
+	smime_classic?    ( ssl !gnutls )
+	smtp?             ( ssl )
+	sasl?             ( || ( imap pop smtp nntp ) )
+	kerberos?         ( || ( imap pop smtp nntp ) )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+CDEPEND="
+	app-misc/mime-types
+
+	berkdb?        ( >=sys-libs/db-4:= )
+	gdbm?          ( sys-libs/gdbm )
+	lmdb?          ( dev-db/lmdb:= )
+	qdbm?          ( dev-db/qdbm )
+	tokyocabinet?  ( dev-db/tokyocabinet )
+
+	ssl? (
+		gnutls?    ( >=net-libs/gnutls-1.0.17:= )
+		!gnutls? (
+			libressl? ( dev-libs/libressl:= )
+			!libressl? ( >=dev-libs/openssl-0.9.6:0= )
+		)
+	)
+
+	nls?           ( virtual/libintl )
+	sasl?          ( >=dev-libs/cyrus-sasl-2 )
+	kerberos?      ( virtual/krb5 )
+	idn?           ( net-dns/libidn )
+	gpg?           ( >=app-crypt/gpgme-0.9.0:= )
+	gpgme?         ( >=app-crypt/gpgme-0.9.0:= )
+	notmuch?       ( net-mail/notmuch:= )
+	slang?         ( sys-libs/slang )
+	!slang?        ( >=sys-libs/ncurses-5.2:0= )
+"
+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 )
+	smime? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
+	smime_classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
+	crypt? ( app-crypt/gnupg )
+	pgp_classic? ( app-crypt/gnupg )
+"
+
+src_prepare() {
+	local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches
+
+	if use !vanilla ; then
+		# apply patches
+		export EPATCH_FORCE="yes"
+		export EPATCH_SUFFIX="patch"
+		# http://hg.code.sf.net/p/gentoomutt/code/file/gentoo-1.8
+		# http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.8
+		local patches=(
+			patches-mutt
+			bugs-gentoo
+			features-common
+			features-extra
+			gentoo
+		)
+		local patchset
+		for patchset in "${patches[@]}" ; do
+			[[ -d "${PATCHDIR}/${patchset}" ]] || continue
+			einfo "Applying ${PATCHSET} patchset ${patchset}"
+			EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
+				|| die "patchset ${patchset} failed"
+		done
+		# add some explanation as to why not to go upstream
+		sed -i \
+			-e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \
+			main.c || die "Failed to add bug instructions"
+	fi
+
+	local upatches=
+	# allow user patches
+	eapply_user && upatches=" with user patches"
+
+	# patch version string for bug reports
+	local patchset=
+	use vanilla || patchset=", ${PATCHSET}"
+	sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \
+		muttlib.c || die "failed patching in Gentoo version"
+
+	# many patches touch the buildsystem, we always need this
+	AT_M4DIR="m4" eautoreconf
+
+	# the configure script contains some "cleverness" whether or not to setgid
+	# the dotlock program, resulting in bugs like #278332
+	sed -i -e 's/@DOTLOCK_GROUP@//' \
+		Makefile.in || die "sed failed"
+}
+
+src_configure() {
+	local myconf=(
+		# signing and encryption
+		# clumpsy blocks for transition period of USE-flag renames
+		$(use crypt         && use_enable crypt pgp)
+		$(use pgp_classic   && use_enable pgp_classic pgp)
+		$(use !crypt && use !pgp_classic && echo "--disable-pgp")
+
+		$(use smime         && use_enable smime)
+		$(use smime_classic && use_enable smime_classic smime)
+		$(use !smime && use !smime_classic && echo "--disable-smime")
+
+		$(use gpg           && use_enable gpg gpgme)
+		$(use gpgme         && use_enable gpgme)
+		$(use !gpg && use !gpgme && echo "--disable-gpgme")
+
+		# features
+		$(use_enable debug)
+		$(use_enable doc)
+		$(use_enable nls)
+		$(use_enable notmuch)
+		$(use_enable sidebar)
+
+		# protocols
+		$(use_enable imap)
+		$(use_enable pop)
+		$(use_enable nntp)
+		$(use_enable smtp)
+
+		$(use  ssl && use  gnutls && echo --with-gnutls    --without-ssl)
+		$(use  ssl && use !gnutls && echo --without-gnutls --with-ssl   )
+		$(use !ssl &&                echo --without-gnutls --without-ssl)
+
+		$(use_with sasl)
+		$(use_with idn)
+		$(use_with kerberos gss)
+		"$(use slang && echo --with-slang=${EPREFIX}/usr || echo a=b)"
+		"$(use_with !slang curses ${EPREFIX}/usr)"
+
+		"--enable-compressed"
+		"--enable-external-dotlock"
+		"--enable-nfs-fix"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		"--with-regex"
+		"--with-exec-shell=${EPREFIX}/bin/sh"
+	)
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# arrows in index view do not show when using wchar_t
+		myconf+=( "--without-wc-funcs" )
+	fi
+
+	# REQUIRED_USE should have selected only one of these
+	local hcaches=(
+		"berkdb:bdb"
+		"gdbm"
+		"lmdb"
+		"qdbm"
+		"tokyocabinet"
+	)
+	local ucache hcache lcache
+	for hcache in "${hcaches[@]}" ; do
+		if use ${hcache%%:*} ; then
+			ucache=${hcache}
+			break
+		fi
+	done
+	if [[ -n ${ucache} ]] ; then
+		myconf+=( "--enable-hcache" )
+	else
+		myconf+=( "--disable-hcache" )
+	fi
+	for hcache in "${hcaches[@]}" ; do
+		[[ ${hcache} == ${ucache} ]] \
+			&& myconf+=( "--with-${hcache#*:}" ) \
+			|| myconf+=( "--without-${hcache#*:}" )
+	done
+
+	if use mbox; then
+		myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" )
+	else
+		myconf+=( "--with-homespool=Maildir" )
+	fi
+
+	econf "${myconf[@]}" || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	if use mbox; then
+		insinto /etc/mutt
+		newins "${FILESDIR}"/Muttrc.mbox Muttrc
+	else
+		insinto /etc/mutt
+		doins "${FILESDIR}"/Muttrc
+	fi
+
+	# A newer file is provided by app-misc/mime-types. So we link it.
+	rm "${ED}"/etc/${PN}/mime.types
+	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 DESTDIR="${D}" muttrc.man || die
+		# make the fake slightly better, bug #413405
+		sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
+			-e 's#in @docdir@,#at http://www.mutt.org/,#' \
+			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
+			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
+			doc/mutt.man > mutt.1
+		cp doc/muttbug.man flea.1
+		cp doc/muttrc.man muttrc.5
+		doman mutt.1 flea.1 muttrc.5
+	else
+		# nuke manpages that should be provided by an MTA, bug #177605
+		rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
+			|| ewarn "failed to remove files, please file a bug"
+	fi
+
+	if use !prefix ; then
+		fowners root:mail /usr/bin/mutt_dotlock
+		fperms g+s /usr/bin/mutt_dotlock
+	fi
+
+	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		echo
+		elog "If you are new to mutt you may want to take a look at"
+		elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
+		elog "   https://wiki.gentoo.org/wiki/Mutt"
+		echo
+	fi
+	if use crypt || use gpg || use smime ; then
+		ewarn "Please note that the crypto related USE-flags of mutt have changed."
+		ewarn "To remove some unclarity, the following USE-flags are renamed:"
+		ewarn "(see 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.  Please update your package.use"
+		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
+}