gentoo resync : 03.11.2019

4 files changed, 281 insertions, 8 deletions

diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 166a7faea770..ae1b79702e01 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -7,9 +7,10 @@ DIST mutt-1.12.2.tar.gz 4675774 BLAKE2B 0b0a4695f31db97437e7d6e52ca8e131376bd0ae
 DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
 DIST mutt-gentoo-1.11.4-patches-r0.tar.xz 107064 BLAKE2B f8ad915fd0ceea729fdc14719e69c43751e75fd4afc9f19460d15493fd97baee9606703d7d6a8239a34b2c0d6f2458fc007277933bbc724b6a8588bb7514decd SHA512 57714259f802efe54e21cd23560bb158777b50320604db0a8ff8a47c25166a873d13d64b03eba4cb1c5067a586e7c64d9d0ba84ddbe0e179745e92d704a55cd1
 DIST mutt-gentoo-1.12.1-patches-r0.tar.xz 106064 BLAKE2B 60b73bcfd9713261c7b88fe74d70a630954511a38331c3e8e958ef7f6459b3bf8548211ee920fe238085c6481c03633cec21e7ae70c1473c89914ce720bd7c21 SHA512 feffbd49ad8156e226e7d4dc56b1c976f3f2a0f8dc3551c11696d5653342b91b4406a494d6081b969fe8267bf09a441a4f3c5a0014d108000e55c985aaafa596
-DIST mutt-gentoo-1.12.2-patches-r0.tar.xz 106384 BLAKE2B 9329c3629d4c8d34e42a422e76dc0ec0f3a4b697fc59586c0258716bb9e4a1ff26cccc20f7ecbc340a92e23b24baa7514041274b3b2b4a73ef9dd36536d8206a SHA512 0aafa589a98e10044a36e578cae5e1e08ae66a0fe773763852441d9410f65f8bf6bd0256e1b0f059bd5ace6fb7ed90f63b5c3dd4b6fbdb6e7c3d2af8a95b266f
+DIST mutt-gentoo-1.12.2-patches-r1.tar.xz 106720 BLAKE2B 788735757dd4cf8c1d9fe09350eaf4780b1e90f1e1d9bf39c98ee03255b9b84847a387402940d1a05e4be2b8684688216ea62f564c40715cd6ccf4bebaeebdc0 SHA512 ec8c0989bff2008e6df0c43a8e833fb4f463993eacb1cbdd11722a6c49bb400804c80f74ac0073883a050f352a65d2743c4aebc882a2cd7db369a4e214a95701
 EBUILD mutt-1.10.1.ebuild 9172 BLAKE2B 193ea31b3ee6fd8a65082361d824ab27babedda8e9547f132832080fd6cd7fa7a4fac9ea8bb532d0b8597fcd8d7cc008d0f2718a498f4d32259121ee4a779fde SHA512 0c025d12aad93596931310140b561d9964bea527d26070b094a22ed918c590df01b69945aa82ee359abe702dd0a90885786ca037b1c28d9ef890f954286ae2c5
 EBUILD mutt-1.11.4.ebuild 9455 BLAKE2B b61fa4ed1a67a8068631d5ecd71c512afce81794c9e3bd5669dcf14b8b14a435cf1843b516e7aa15f335b4d5fe35e8e28ea5572453f4ec757318e28309cdd993 SHA512 1f7e20cd4d8a5595790c8a68689faf73ec13025c18cf85313a994510414289a9dbe56271adf72b731c450182d5d2a4c8ba7a2f1ddfddb5c9b9f287796b67fdb7
 EBUILD mutt-1.12.1.ebuild 9493 BLAKE2B 64fbef4a2abd922a8161303a343bec10737c0e3089bee00a1d97c459a15cc60089cefd943f7dce72051adc2813581e50a0c90a95fbe075adbf18ab8c2fa0f1c9 SHA512 3b6359164106898bc039cd2115f212bca412ef80c3722aebace5446df1ae98a6f38936bf540422be5d75dc3fd013e2bca41c2089af15753fd5c273696a3239b7
-EBUILD mutt-1.12.2.ebuild 9493 BLAKE2B 64fbef4a2abd922a8161303a343bec10737c0e3089bee00a1d97c459a15cc60089cefd943f7dce72051adc2813581e50a0c90a95fbe075adbf18ab8c2fa0f1c9 SHA512 3b6359164106898bc039cd2115f212bca412ef80c3722aebace5446df1ae98a6f38936bf540422be5d75dc3fd013e2bca41c2089af15753fd5c273696a3239b7
-MISC metadata.xml 1606 BLAKE2B 4b25867379e06da3cb6cc6500c42c731e18512be107f69df9764689ce2de3741ce235d0f610711e4fbfb256319b1343647075da7808532a63946451f7e6107f5 SHA512 054aee931ba2bffe79982ffbb2f32282f8c7277319915ef55a2a2cd3e39f20b1ab90c664016630aef63f0d325fbd3934336f0d5bb25ff610ecb26fc9f9fc66d1
+EBUILD mutt-1.12.2-r1.ebuild 9493 BLAKE2B acb1125fa8ff85f9bc5d0573a3711330744fa6597ae79303d417db93dd49f5584bf2308a975fbf490e99f0b44a2b7e22b24f7cbde4b02f02b854dcf95826755f SHA512 41d4706393de508c63ca8af3e0c5be4668b1cc93805b64d4e829c5167d0e26d0baaab4338756917968a7c94bc7412638f2d68b40bd69d2c6c21bd254d6eccfae
+EBUILD mutt-1.12.2-r2.ebuild 8743 BLAKE2B 881bef343954251a21d3af809b99f537efe5f84dd0abe4b7ffa45f4867acd885da06e4f0de025e517425057683f739ee36c3f1ce0e24fc6f632cb937a91971a4 SHA512 8e75c4e38930bb208db3c29d9eac7c088f80c8063b45354bb9f6cf053eb103823c9e2e23b77e6829c093cb0fc25f6ec366ce842408531afc5f967a0a3b226f91
+MISC metadata.xml 1633 BLAKE2B 86c5eea8025bff6323e0ac1f703839caf87e868dfb934f6d42e5265bc31da40fa55145ca474174163feba2863e65ea53e22c1de811703d262f195ad89b17648b SHA512 2248ee20a23502741fbd1b1cc9d7d9cc60f88864e70ccb5729fee6448297146599b073c5124ffe04653ef04faffae532ba5a7d906bb515e6f399be8e7ef06368
diff --git a/mail-client/mutt/metadata.xml b/mail-client/mutt/metadata.xml
index d3cb60f1c327..3c9478157012 100644
--- a/mail-client/mutt/metadata.xml
+++ b/mail-client/mutt/metadata.xml
@@ -20,18 +20,18 @@
 			database backend for header caching</flag>
 		<flag name="pgp_classic">Build classic_pgp backend to support PGP/MIME
 			and traditional/inline PGP</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>
+		<flag name="smime-classic">Build classic_smime backend to support
+			S/MIME</flag>
 	</use>
 	<upstream>
-		<!-- for releases before 1.9.2 -->
-		<remote-id type="sourceforge">mutt</remote-id>
-		<remote-id type="bitbucket">mutt/mutt</remote-id>
-		<!-- from 1.9.2 onwards -->
 		<remote-id type="gitlab">muttmua/mutt</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/mail-client/mutt/mutt-1.12.2.ebuild b/mail-client/mutt/mutt-1.12.2-r1.ebuild
index 9f35aa2497e0..ddd2e3013ea7 100644
--- a/mail-client/mutt/mutt-1.12.2.ebuild
+++ b/mail-client/mutt/mutt-1.12.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 inherit eutils flag-o-matic autotools
 
-PATCHREV="r0"
+PATCHREV="r1"
 PATCHSET="gentoo-${PVR}/${PATCHREV}"
 
 DESCRIPTION="A small but very powerful text-based mail client"
diff --git a/mail-client/mutt/mutt-1.12.2-r2.ebuild b/mail-client/mutt/mutt-1.12.2-r2.ebuild
new file mode 100644
index 000000000000..94df0e4f961c
--- /dev/null
+++ b/mail-client/mutt/mutt-1.12.2-r2.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic autotools
+
+PATCHREV="r1"
+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 debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls nntp notmuch pgp_classic pgp-classic pop qdbm +sasl selinux slang smime_classic 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_classic?    ( ssl !gnutls )
+	smtp?             ( ssl sasl )
+	sasl?             ( || ( imap pop smtp nntp ) )
+	kerberos?         ( || ( imap pop smtp nntp ) )
+	vanilla?          ( !nntp !notmuch )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~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:= )
+	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_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
+		# clumpsy blocks for transition period of USE-flag renames
+		$(use pgp_classic   && use_enable pgp_classic pgp)
+		$(use pgp-classic   && use_enable pgp-classic pgp)
+		$(use !pgp_classic && use !pgp-classic && echo "--disable-pgp")
+
+		$(use smime_classic && use_enable smime_classic smime)
+		$(use smime-classic && use_enable smime-classic smime)
+		$(use !smime_classic && use !smime-classic && echo "--disable-smime")
+
+		$(use_enable 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 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}"
+		"--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 pgp_classic || use smime_classic ; then
+		ewarn "Please note that crypto related USE-flags of mutt have changed."
+		ewarn "To compile to PMS, the following USE-flags are renamed:"
+		ewarn "(see https://bugs.gentoo.org/695078)"
+		ewarn "  pgp_classic   -> pgp-classic"
+		ewarn "  smime_classic -> 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"
+	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
+}