gentoo resync : 16.09.2020

11 files changed, 277 insertions, 8 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index e06c220d5b09..90576f10cc40 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/etpan-ng/Manifest b/mail-client/etpan-ng/Manifest
index 381bc57b322c..911021aaf2bb 100644
--- a/mail-client/etpan-ng/Manifest
+++ b/mail-client/etpan-ng/Manifest
@@ -2,4 +2,4 @@ AUX etpan-ng-0.7.1-as-needed.patch 1929 BLAKE2B 49893c45212c297f29f0f6f9238bd2c3
 AUX etpan-ng-0.7.1-tinfo.patch 355 BLAKE2B be2ea9432583ae6d28e371357667652e1fcd81bfcf1b046ef3557c5f104b84f7f5022ac1dc3c9f4bc075fa37068dbc289c1a0a138f329f533ac79d68e73d28db SHA512 dc26d6a64768ed3d168af06c8c80f33406ad25603116a72b090b21704fbfc175d073cf01b329b40055dd87f1297ad9fe6aecbaa3f15edbd9d3beca03c3e67f01
 DIST etpan-ng-0.7.1.tar.gz 364394 BLAKE2B 7ed1de331a85dbebf133af25a36ee312d9fe021c36c1625a4807ab38ffc056803672b322e3d28b926f44ce51d679b0e7fa9f3130660c4742282a651011ed3c73 SHA512 e56ca50030516a0a35d2471505ce2c2ef94abb8f640a896bac0bc2cdaac65af38f69efd5f52219576df0a50d8bea92716c6dae5f4cf06fbd2a722bf768681493
 EBUILD etpan-ng-0.7.1-r1.ebuild 798 BLAKE2B a1d9ee06932f9ae269e8ae077e27d7e009bed7fa64cce03d2533fc91bf8b2acd49b0533d597dc07012074e034bea086a77fe3160dc8a61529d67c7c42b16a583 SHA512 ceda1be861b384222cbc3b6fb4f4647dc82f8c406df96ca632cbd530fee982d753fd57877019237827cc34aebc13808241b9bb0192b10b567f71df7ffa2ec453
-MISC metadata.xml 339 BLAKE2B 0f298644fd94667a8e4f21581103ca689c9b1acacf3e3cf5db22d7d1f75e7f4c9da0c3b6e12dad37c53b3ac645ecd3bf0df7a87de71727b844e4343c8eaaf6f7 SHA512 4a6f4c13f2a1e5927cff173d772fdde90984ddfe14c692ad23bada91915ed4a34b1a4c843ccde205008172db9f0f010dd4b89f71e6b480aa10e1f1c27017e489
+MISC metadata.xml 245 BLAKE2B 01dd66cb4f2fd8a284cea778483c6f03d5d2ebeb5989d49b7d9c9aaca053022a31186770bff4059368bacf5ee0d3ce3fa53d2f3c3772076b332f96c003bef7df SHA512 6708398cf2d9cd1ca2d776ad2ab8391e46f139d7a899de574bb2351f503e1ef62946e442e039bbf7bd48521f6f4132c37f048875d0c5b19c8d201576c97b91ba
diff --git a/mail-client/etpan-ng/metadata.xml b/mail-client/etpan-ng/metadata.xml
index 317f20f1c6d3..ebec101d4a6b 100644
--- a/mail-client/etpan-ng/metadata.xml
+++ b/mail-client/etpan-ng/metadata.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription>etPan is a console mail client that is based on libEtPan!</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">libetpan</remote-id>
 	</upstream>
diff --git a/mail-client/mutt-wizard/Manifest b/mail-client/mutt-wizard/Manifest
index 694e1874022e..c5b233bc7369 100644
--- a/mail-client/mutt-wizard/Manifest
+++ b/mail-client/mutt-wizard/Manifest
@@ -1,4 +1,4 @@
 DIST mutt-wizard-0_pre20200808.tar.gz 30797 BLAKE2B 90b7382b6d2a687fa2ce5b267a00ee582c1ea89169185eb556f7e3aab4bbc822068fd691fbdaa843df0c525ec737a34acb39bc8a09d3c608837487825e57344b SHA512 e49de65658d4222d8932b1dd117631fffcd08493dc6e20a5157f8a3e336e179bf754ef64387f2b538c70898183a0413c99425a2751debb4b8d7cea5465076f57
-EBUILD mutt-wizard-0_pre20200808.ebuild 1281 BLAKE2B a69f29e3098c5bfe3dfe76e6bf52446c07863fe6df42f19cf2f145b1651a71ec391e8573c4a69b834791a623befce2e0b279d68686256523fdf82cc5ee4ef580 SHA512 5c9a72e28a9930d613e48be0f464cd8f89d3c3f5568f10a167d7ad63890e4fe5211a7236d7a58673590c60809cb34d30d1a326c9184c4fcbd651c7b47dcc194e
-EBUILD mutt-wizard-9999.ebuild 1281 BLAKE2B aff3867a74d5ee8e740552faa59da362ecd35aa5a1cb6fe00e86282d0a95134d7d8c576eb4bd772ae48d02c181b6b10abafea100f3b7c9467f2a554de2e0ca71 SHA512 cb46491f4880aeaee45834672dc29015f4245f74889ced698936976363af39370ff95a6afca45c6d810e486a104406ee6a71e9603c400d978812f65c7edc08ed
+EBUILD mutt-wizard-0_pre20200808.ebuild 1285 BLAKE2B 05f38d864706447c3872b833c17ae035481909aa6812f1bd2665d7cb0b7ee86b140b2d084eade79c561126c9a469218ecd85002d69ee0f23394ec13ba4e01b5f SHA512 16d4f645dc71e25d28fc22f59b5176bea979a7b731f68273bbdf4b9750601c9b11a2f64b4ae6f5270ceef2f82320247587f62ec7030e61c43a5ca9e62f93caec
+EBUILD mutt-wizard-9999.ebuild 1285 BLAKE2B b07c2c86360c549302cabcfa808209f1084777fa7f8fe5db9e7b775edb781e85aeb9e5e5a66f7055a84369a39ef43961fe37eb9a59de8862c36e308c32cec4f4 SHA512 48b7746b840244d184949a108ce3a3123399cc82c3538cb2f597b41ba9c575198c0659bff952aec5a6136824cf785b0622864d2ceafd1aa4ac9f5c3b5488b485
 MISC metadata.xml 661 BLAKE2B 0fb12b65b9bec3fdede05001ac566f826aab3eac22e38985c2b408133b575923aa8a6cd53ac0a118f8f6d546b7f11a4a87209147cbd4ab0f299e9f33f169787b SHA512 05597986d8114f3fcb752f2ae5ed7dcc8eb23bafa67f67db6c1fdb8d3cf404762c7929d0fb1837a1a5f7c971c539d0d277897892f3ac43530276912d64a4cfe7
diff --git a/mail-client/mutt-wizard/mutt-wizard-0_pre20200808.ebuild b/mail-client/mutt-wizard/mutt-wizard-0_pre20200808.ebuild
index 49dfef7ec510..7dacc0557672 100644
--- a/mail-client/mutt-wizard/mutt-wizard-0_pre20200808.ebuild
+++ b/mail-client/mutt-wizard/mutt-wizard-0_pre20200808.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils
+inherit optfeature
 
 DESCRIPTION="A system for automatically configuring neomutt and isync"
 HOMEPAGE="https://github.com/LukeSmithxyz/mutt-wizard"
diff --git a/mail-client/mutt-wizard/mutt-wizard-9999.ebuild b/mail-client/mutt-wizard/mutt-wizard-9999.ebuild
index 9eaf38595153..995d3d16cda8 100644
--- a/mail-client/mutt-wizard/mutt-wizard-9999.ebuild
+++ b/mail-client/mutt-wizard/mutt-wizard-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils
+inherit optfeature
 
 DESCRIPTION="A system for automatically configuring neomutt and isync"
 HOMEPAGE="https://github.com/LukeSmithxyz/mutt-wizard"
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 7740fc9cbe30..112827506a3c 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -3,8 +3,11 @@ AUX Muttrc.mbox 486 BLAKE2B dd7f15b08f185800b2a7d26545e5a1b0f7b21f8f7cff2b4fce39
 AUX mutt-1.14.4-no-imap-preauth-with-tunnel.patch 1001 BLAKE2B 20d5210ca085d26270be5588fa8058068715e91461832bbf09e21213cc6e84d7b118437a7e11a1e1202af7c3b76edc0f33d5fef2e3b61cd47cd2ddc03a578723 SHA512 07c243290f266b1446f83448796c1871234f38f05f0586cd1360bc6d80088a693451d7f85123da04004489d12d99191196c9bbf5291e90875955f05eb87fff02
 DIST mutt-1.14.4.tar.gz 5007437 BLAKE2B 89d4327ddd86ec320c63db6ee9d3c07b7540a74aba7efdcb9605e5c5c242dec99fb5137d1cfc62fd4401e2af7589f03ebce78dfa2deae262aef408b804544656 SHA512 86484f009ca8bd1e26206694e03609a16f8a4e8c83620a07a4376fe160535a838e8c918a8a30799fb3d9cf46c059d67124f7425c42093fb5e5bf8ea4ac310daa
 DIST mutt-1.14.5.tar.gz 5008208 BLAKE2B a7c2f7f63d2ee23e743114315cbb40903db720de7f2836f551739edb0b78857c525c40ebde083064dd2430b89b21d7a17745dfc1185672f86b15a9a082c3778e SHA512 950c8df3bdc552b41ba6209aed8d5ade6fff80fe4018a75856d0fdbcd6389bd995a6dee69e7badd05a9b40d2e2293ada9a9f9a96632e88af36b61162f226e2b9
+DIST mutt-1.14.7.tar.gz 5009968 BLAKE2B f729412d3da97fe9bd76733705317660edfa3858a9eb1012179fb289b03da58d79b6e261dbdc4ab8b001e89ca455e9972bab8f270bac28e887afc7e0bd9fc8c1 SHA512 dc9739b5f0a99ca70fcbd495c71fbead23e3481f9c9e426feb827997c9c42e5f28355084f54788820c96a079dedb649fcc20e69436fb3c4df7e46f372b533e7c
 DIST mutt-gentoo-1.14.4-patches-r0.tar.xz 31124 BLAKE2B a9774a5bb5af18a275f7ea171cb08a12a98d63cbff57320d5d3fb4f995aac16f409689ac0015f3b5d37cfc20004c9fca72a3f63663aaa679a129d5f3886bc5cc SHA512 05506399a471c262479db88ef11d2a95d79598fd696fe50de5f5c1c3cae5adf30a2806a1500ba94a62bcbf7deed99acc59a8afb903f50169e41b77010e0ad8cc
 DIST mutt-gentoo-1.14.5-patches-r0.tar.xz 31100 BLAKE2B 14525b54afa1414667ebe2dc0c58b9b5d5ad4dcc5dbae3c5db13cc23d33dbd9434fa929ad297625c891b2d690e34729a4f61c526fb94857e271ac85f5a07488e SHA512 fd8e473efa02e412aeaba258afee6dc02f9ca24f9edff643e4ef53c759a091e54c6a544e39cd7faa94cd680546bfcf845e282638045ae65a88d140ebb03a4631
+DIST mutt-gentoo-1.14.7-patches-r0.tar.xz 31144 BLAKE2B 5a9806dec79f8a991e39464afde1faf2ba988e67ffd85ec16943432a83ee1d05ddcb839095a475ab56aa80a4bbe25de58835d6bde84c0c95e4487df139e16e82 SHA512 ca57af137bc5a2663724cb97a7ea04e4d62b2fe8a3864489f15552ef361c1fb8c881ebc783a4f3a6d82c5e9bb45e83fbe6cad59158c831c54361729ada24b458
 EBUILD mutt-1.14.4-r1.ebuild 8343 BLAKE2B 2d08378bb35052cce7c1ecd160dcdc8ccfbb2b58a7e0e5501a6c6309b85721163a41fd62b72334d205fd688898467053147fddbb60af12b48dfbd0170f314f4c SHA512 4829d3b8b530f805ed890f3989476e87f734d540c8cc11fdbf667c6e08be68b354ac5d61eb546f4fe8ed0eefbd5626b6b10640d07d2fa843186e64d3e27ded3d
 EBUILD mutt-1.14.5.ebuild 8054 BLAKE2B 25f08d77e4dfdf3059ecaaccd1392900658b7bbd6117ede70265a1e1d2efceb0a937d376b6996afcbecd4f7c6b85d1e57047d32d62cda6183c13ded8cb8c45ea SHA512 35a2b80a7825deddcfdd4aa8fe6e08124fd5c07a629276d24c0a392e343f6b3c87c8a3539f53c35ff404ac21f31fdefa42d2ef3bb4af14fd8bf47c0f0f9cf1ab
+EBUILD mutt-1.14.7.ebuild 8054 BLAKE2B 25f08d77e4dfdf3059ecaaccd1392900658b7bbd6117ede70265a1e1d2efceb0a937d376b6996afcbecd4f7c6b85d1e57047d32d62cda6183c13ded8cb8c45ea SHA512 35a2b80a7825deddcfdd4aa8fe6e08124fd5c07a629276d24c0a392e343f6b3c87c8a3539f53c35ff404ac21f31fdefa42d2ef3bb4af14fd8bf47c0f0f9cf1ab
 MISC metadata.xml 1297 BLAKE2B 67419e66fa917ae69f015d9af534edeb809c4371b2c004c6687a942f331c70ad0513fedb8b6f45a2cb7fc5bfd9ca80c91f888e58293dee00c198d2bca7b8cb12 SHA512 9d9c30b14ce952f8099fb60eac3e8dc25e1c5ef05b88b71c1207950766cb367b56cf7c60168c6f3e431e1aa823c0a345ce851414705e9f0af015cfa51e241350
diff --git a/mail-client/mutt/mutt-1.14.7.ebuild b/mail-client/mutt/mutt-1.14.7.ebuild
new file mode 100644
index 000000000000..773c3c909520
--- /dev/null
+++ b/mail-client/mutt/mutt-1.14.7.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic autotools
+
+PATCHREV="r0"
+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="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+	hcache?           ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+	imap?             ( ssl )
+	pop?              ( ssl )
+	smime-classic?    ( ssl !gnutls )
+	smtp?             ( ssl sasl )
+	sasl?             ( || ( imap pop smtp ) )
+	kerberos?         ( || ( imap pop smtp ) )
+	autocrypt?        ( gpgme )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# yes, we overdepend on the backend impls here, hopefully one day we can
+# have REQUIRED_USE do what it is made for again. bug #607360
+CDEPEND="
+	app-misc/mime-types
+	virtual/libiconv
+
+	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/libidn2 )
+	gpgme?         ( >=app-crypt/gpgme-0.9.0:= )
+	autocrypt?     ( >=dev-db/sqlite-3 )
+	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-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
+	pgp-classic? ( app-crypt/gnupg )
+"
+
+src_prepare() {
+	local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV}
+
+	if use !vanilla ; then
+		# apply patches
+		export EPATCH_FORCE="yes"
+		export EPATCH_SUFFIX="patch"
+		# http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10
+		local patches=(
+			patches-mutt
+			bugs-gentoo
+			features-common
+			features-extra
+			gentoo
+		)
+		local patchset
+		for patchset in "${patches[@]}" ; do
+			[[ -d "${PATCHDIR}/${patchset}" ]] || continue
+			einfo "Patches for ${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
+		$(use_enable autocrypt) $(use_with autocrypt sqlite3)
+		$(use_enable pgp-classic pgp)
+		$(use_enable smime-classic smime)
+		$(use_enable gpgme)
+
+		# features
+		$(use_enable debug)
+		$(use_enable doc)
+		$(use_enable nls)
+
+		# protocols
+		$(use_enable imap)
+		$(use_enable pop)
+		$(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 idn2) --without-idn  # avoid automagic libidn dep
+		$(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-iconv"
+		"--enable-nfs-fix"
+		"--enable-sidebar"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		"--without-bundled-regex"     # use the implementation from libc
+		"--with-exec-shell=${EPREFIX}/bin/sh"
+	)
+
+	if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then
+		# arrows in index view do not show when using wchar_t
+		# or misalign due to wrong computations
+		myconf+=( "--without-wc-funcs" )
+	fi
+
+	# note: REQUIRED_USE should have selected only one of these, but for
+	# bug #607360 we're forced to allow multiple.  For that reason, this
+	# list is ordered to preference, and only the first is taken.
+	local hcaches=(
+		"lmdb"
+		"qdbm"
+		"tokyocabinet"
+		"gdbm"
+		"berkdb:bdb"
+	)
+	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[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	insinto /etc/${PN}
+	if use mbox; then
+		newins "${FILESDIR}"/Muttrc.mbox Muttrc
+	else
+		doins "${FILESDIR}"/Muttrc
+	fi
+
+	# include attachment settings, it's mandatory and shouldn't harm
+	# when not being referenced (index_format using %X)
+	{
+		echo
+		echo "# mandatory attachments settings, not setting these is a BUG!"
+		echo "# see https://marc.info/?l=mutt-dev&m=158347284923517&w=2"
+		grep '^attachments' "${ED}"/etc/${PN}/Muttrc.dist
+	} >> "${ED}"/etc/${PN}/Muttrc
+
+	# add setting to actually enable gpgme usage
+	if use gpgme || use autocrypt ; then
+		{
+		echo
+		echo "# this setting enables the gpgme backend (via USE=gpgme)"
+		# https is broken due to a certificate mismatch :(
+		echo "# see http://www.mutt.org/doc/manual/#crypt-use-gpgme"
+		echo "set crypt_use_gpgme = yes"
+		} >> "${ED}"/etc/${PN}/Muttrc
+	fi
+
+	# similar for autocrypt
+	if use autocrypt ; then
+		{
+			echo
+			echo "# enables autocrypt (via USE=autocrypt)"
+			echo "# see http://www.mutt.org/doc/manual/#autocryptdoc"
+			echo "set autocrypt = yes"
+		} >> "${ED}"/etc/${PN}/Muttrc
+	fi
+
+	# A newer file is provided by app-misc/mime-types. So we link it.
+	rm "${ED}"/etc/${PN}/mime.types
+	dosym ../mime.types /etc/${PN}/mime.types
+
+	# 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"
+
+	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
+}
diff --git a/mail-client/trojita/Manifest b/mail-client/trojita/Manifest
index 2a9b55bce557..1d689bca1b50 100644
--- a/mail-client/trojita/Manifest
+++ b/mail-client/trojita/Manifest
@@ -9,6 +9,6 @@ AUX trojita-0.7-qt-5.11b3.patch 9678 BLAKE2B 0bcf00db610594ff084f5ca3bcfe2d3ad40
 AUX trojita-0.7-qt-5.13.patch 1044 BLAKE2B 4c110d49c9352f526470b2af255c98c8f8b80df0ddc6da5a8fdecee9a1d5000c473a17f64790ffa95e20f03431ddb7fc294bb1e20d11fd549ca4451bb030ebba SHA512 bce7713fb5bef29b2b189d281dee57ddfc57f1c0601f424aba2185668215878b9bfd3bb80f0d2f8b73219e782db5e64973e79190fe62afa8ba98327535139146
 AUX trojita-0.7-qt-5.15.patch 774 BLAKE2B 0c1de7d7eebc9782d2e3e889365b283b3c5c82b7d792f167783857e8544f29f0a29284923a9b5f2974a5dbf8b9b3e6147c14654d78a57b67b8151407a63863b6 SHA512 42d45246c49ae99d9a49ed2c2186042427c8ea35b84123c876951f1d9ddcf9236acd14fd36e592041296ca6f6200e20eca786c967dade37bf8be8148dd7b3cca
 DIST trojita-0.7.tar.xz 1038212 BLAKE2B 92dfb01fc1849d04958fd26ea731835c7287d5a6989d8e0c97c6679ce8f1c9f33a0f67c3f293fc85188e9d289c0dddee9847f4151b6f64396f3de86635b11f32 SHA512 fe4d9316f97d913619f27d24a5023c3d8dd4a6b9fb058651be12c67188f394aa8cbb60c7593e5eb28fc12fc883b76deeeb5f4f631edd255fdec4c5862c9a91c8
-EBUILD trojita-0.7-r5.ebuild 2026 BLAKE2B df0cacdd3a64ef2ac780aaa1547a3a7d7961f47dfbfcb4ae7e2e2bc9d3d8d3140b721d850f73a43159e005ca0da51b626be0fbe3fe2737fca087b07299b47dc4 SHA512 fe195830a905c0eba59afe8d6ac92cd9aedd27c71bd61dcf873d44d94c8738b5fe44710e72decd5852322326eea3bc8c6d11426096fccc28af30d0b2c8845e91
-EBUILD trojita-9999.ebuild 1791 BLAKE2B 13bf1d7c29c274cc473948fc40058de9757d6ad51911767c29c961303510f52d6f215365d90ad7d8e0085be610d4edc25df07e443757678f4ff71a8f245de14e SHA512 8f3e67e677262e29a2d26996d741f2fa4685f9c480791e95eb5d925c37dfcc2d3316b5129e0fc677951f0b174ae89e53e35223a6cbc9620f85fea5b16d0cc945
+EBUILD trojita-0.7-r5.ebuild 2077 BLAKE2B 786ee921fdecc4da2eca6790ee7119b1ccd966d867353c522cdc26ec75db065f9bb0567811b823b09d26bc4e2a60dd3de2c430c68ac38bd8508eb675464531aa SHA512 bdc62843ececb61eb30726cd1f35a5fec5406f0c1e34d95977605b7c69d3ef0a26b77d369019ea84486ec843a18c86c415e31605eb4fec81c8909df05aa04c72
+EBUILD trojita-9999.ebuild 1842 BLAKE2B 80189d12128508e5cfbb520fe3ca38f05c27966e5b4448037d638b2001cd326e5cbce94999a599b19ce55a2a30d9b23926108a0138d96e7ae89b0586ce1b6726 SHA512 1ca293cafab7231724698f14cce7304d63fe4ba06ad9b963361f0a52de3da04d16df6b8f0f7775c40666a9a607e42825ad698c3e73f1bed0db94db50921a927a
 MISC metadata.xml 766 BLAKE2B b3fccdefcadc2ab93429fd991581a8b085546605ad00e68899a2d731f2217113f7271d5b53cef35dfab8063db05fd9662bdaff715a95bf73cfd8fa9c636f184f SHA512 b13adf41bd68543886b25fb0dfdc3c924e5fc050de4f4bbea383e91cb2d4542de83050695bd67b913f2707d8f6a689d6d387253c718ec7c78dd50abed3a3f633
diff --git a/mail-client/trojita/trojita-0.7-r5.ebuild b/mail-client/trojita/trojita-0.7-r5.ebuild
index c746c83d059c..f7b60c366360 100644
--- a/mail-client/trojita/trojita-0.7-r5.ebuild
+++ b/mail-client/trojita/trojita-0.7-r5.ebuild
@@ -71,6 +71,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DWITH_RAGEL=OFF # bug 739866, broken by ragel-7
 		-DWITH_CRYPTO_MESSAGES=$(usex crypt)
 		-DWITH_GPGMEPP=$(usex crypt)
 		-DWITH_MIMETIC=$(usex crypt)
diff --git a/mail-client/trojita/trojita-9999.ebuild b/mail-client/trojita/trojita-9999.ebuild
index 672e67f6cd69..0908d71cbc95 100644
--- a/mail-client/trojita/trojita-9999.ebuild
+++ b/mail-client/trojita/trojita-9999.ebuild
@@ -60,6 +60,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DWITH_RAGEL=OFF # bug 739866, broken by ragel-7
 		-DWITH_ABOOKADDRESSBOOK_PLUGIN=ON
 		-DWITH_CRYPTO_MESSAGES=$(usex crypt)
 		-DWITH_GPGMEPP=$(usex crypt)