gentoo resync : 24.12.2018

2 files changed, 285 insertions, 0 deletions

diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index cc56a6db6bd9..ff4e1fea80d9 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,8 +1,11 @@
 AUX Muttrc 667 BLAKE2B 49aaefba7ceeefde9d727ad88574fc599a48bcd334ac8e99d8d5e555f2317f4595c480f1903df4b82854bfd272b8aee86a02369769f38a3cadf35f6a6348bf14 SHA512 b64d6e857f0c7de2e2e5b23cecd869f8a9807aa827ad6221e3c5864b2a31fb0136aeaf09ffdb2549645507fe92f724774a80395b6ab2345068903f5ee1269f29
 AUX Muttrc.mbox 486 BLAKE2B dd7f15b08f185800b2a7d26545e5a1b0f7b21f8f7cff2b4fce39fb58d8e336bec6fd500b88c0b14d026c9578d12cd1e4bca45c0d2f3d286d2c9d132b2b5e137e SHA512 aece9a734d292b6f638d2a0dd39f20d9894b4bb6e6888da606a49274faef9c1864e98eec907ffa7742af58d46456e46b8945d2d47c8b89fc95daa2a8833d3e90
 DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9874decec9453cf01ae0780c7993ac0104db7987571f27c04e408c1eff47d3b73918eb9754c253b6249ad48f4 SHA512 13509ff159c65e23614696967b4bd8baf7b8e16c0e85cfd89e2df8201de2dc97e6c4a426f5919f05051dee2b14f847c7203e0b236931d3cdf81dbbb221551726
+DIST mutt-1.11.1.tar.gz 4579062 BLAKE2B e0bc0fffbed0f9df36d0773ccc1032d797d2d693f315976ceaf7e21f7d22f027e5b7e857e2c3a1fe90e66f4764235b0394f8f0addf7a310b1a3200812f5c55eb SHA512 dc6cfe5c2aa23650c362a8b9c1a13c0d65902e71f8effd517304f183fcc1d1fddf7df1e0b8be5547b847c75afe3732b198353559e2c947839a009be38b087de0
 DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
 DIST mutt-gentoo-1.10.1-patches-r1.tar.xz 108416 BLAKE2B 22383f7d2f4ad405d6e691104d925b9547897f5bd730b5c573e8ac2d6902b0efa70432db077539122baff8d542964caa6204e6f09c235fe3454c30cf2a72af85 SHA512 ae23ddf13508ab565f6023544add7e2f8cf3d6b2e1cc64aa66f8b38fdabb2c1e3ca17c9b65ffab795428568c1d8eaf088f5dc823d377a9de4773c29bce228a33
+DIST mutt-gentoo-1.11.1-patches-r0.tar.xz 108864 BLAKE2B 22d2fca8395ad0a6aaec8c2ede7acd011408df5c2d71ece29077355ee83ad694440286793f609734b2231e7ce8f9f785ad9f4a3ba8045670971e59addeec7c3e SHA512 ba6923ed11b3d92a71a93e6bb296083648f32fbb0801faa0ac1d4f1ea0fd97fa65eb1abd057bd231f55b7896838c03cd981564ccad0376f38be0a4ce264723be
 EBUILD mutt-1.10.1-r1.ebuild 9194 BLAKE2B da9d4600117ea3feda606c584b80cb2d29d18a978287cdd325443c80edecf7be31cf9e691f9d27dda42ff4faac9caf73181ec57f215207b1e272570e69393c44 SHA512 383bea4158740cbe594b73811b34d5d09668a54852411afc4dea4c1c68dced92158694c6a994df07cdc177b40c06f8d270d77ac7589267c8905c8a11cbe4d196
 EBUILD mutt-1.10.1.ebuild 9186 BLAKE2B c7a021dea37478bfd55c1987cbc3387cbf84e9be2d83441e6e3349a39ff6343ebd8cf7f4d864bb6565ddbf8681175dbc8d052e88aae5b4d886c97d2b00b52e76 SHA512 4531b6ab5e7cde1e90fc155869cd6c5fb102d8b9b2638d23262430fa252eb491d45c06c74666044bbe6e4f4be210f3fc5268f5f7afc901370fab5f4430ff3fe8
+EBUILD mutt-1.11.1.ebuild 9191 BLAKE2B b169430f19d635e93328eac63a1bf1ea6378b8fa104918b384a4d3cb6922b880c970d653be9a4331c04ffc7a0b37f482714ec18ea7bd05cf56071d67ede41ddf SHA512 795e77a1d851dc5f3414cd8088de3221001157128d83bbb5db680ac1c84fc8630aad83c5d02a0f0b04fa43d0740ec6c3df23df64c4a03c2627887937b862d2ec
 MISC metadata.xml 1809 BLAKE2B 55772e2ff845cd7106179138fcb98c96eb4e3b6a40adf43fee91119d0c8608853f10aa1c32cfe44ff6bbde858670411fa78a9ba33cfb9a34d320d3c9f34ad8d9 SHA512 fca920e7ee455ce8991635f46a1badd4f4a191a21fdaffffea78cabfdb556ad23ca3eaed6dc8474b239a7e71d7610590c3df8b697a996fefbf01143c94bfc36a
diff --git a/mail-client/mutt/mutt-1.11.1.ebuild b/mail-client/mutt/mutt-1.11.1.ebuild
new file mode 100644
index 000000000000..84e3dc40704b
--- /dev/null
+++ b/mail-client/mutt/mutt-1.11.1.ebuild
@@ -0,0 +1,282 @@
+# Copyright 1999-2018 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="berkdb crypt debug doc gdbm gnutls gpg gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls nntp notmuch pgp_classic pop qdbm +sasl selinux slang smime smime_classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+	hcache?           ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+	imap?             ( ssl )
+	pop?              ( ssl )
+	nntp?             ( ssl )
+	smime?            ( ssl !gnutls )
+	smime_classic?    ( ssl !gnutls )
+	smtp?             ( ssl sasl )
+	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"
+# 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
+
+	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 )
+	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-${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
+		# 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)
+
+		# 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"
+		"--enable-sidebar"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		"--with-regex"
+		"--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[@]}" || 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 || die
+		cp doc/muttrc.man muttrc.5 || die
+		doman mutt.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
+	if use gpgme ; then
+		ewarn "Note: in order for Mutt to actually use the gpgme backend"
+		ewarn "      you MUST include 'set crypt_use_gpgme=yes' in .muttrc"
+		ewarn "      https://dev.mutt.org/doc/manual.html#crypt-use-gpgme"
+	fi
+}