Patchset bump, fixing bugs #348477, #367811, #373197.

Package-Manager: portage-2.2.01.18890-prefix/cvs/Darwin powerpc

3 files changed, 244 insertions, 5 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index f6f72972944d..99ca011a78a7 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/mutt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.215 2011/06/26 16:35:32 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.216 2011/07/09 13:06:18 grobian Exp $
+
+*mutt-1.5.21-r4 (09 Jul 2011)
+
+  09 Jul 2011; Fabian Groffen <grobian@gentoo.org> +mutt-1.5.21-r4.ebuild:
+  Patchset bump, fixing bugs #348477, #367811, #373197.
 
 *mutt-1.5.21-r3 (26 Jun 2011)
 
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 30e712b9b9c4..cab2695e74b6 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -8,17 +8,19 @@ DIST mutt-1.5.20.tar.gz 3635047 RMD160 df582f79364b9fd70a0001e76a119d8f78275ebb
 DIST mutt-1.5.21-gentoo-patches-r1.tar.bz2 68796 RMD160 10b38c663d39e169c3c456e5cbf7bd855c203186 SHA1 2df153ce3870576e8dba84a6f54df698333587e8 SHA256 89b67ad863941aacdc2b1c9d3fd4f90f7b0cb50bd5fc10c9284a82ce6e7687c0
 DIST mutt-1.5.21-gentoo-patches-r2.tar.bz2 72256 RMD160 cd028c7d12e1885d8ea98ff60554a5fbf98e1922 SHA1 28ef259d8a964bbe46f72169ab597825819f244e SHA256 0ad8dcfbcb5b31321c7e96909d53a5d1e8e2f69241f9ddb0f36f69cf086ed615
 DIST mutt-1.5.21-gentoo-patches-r3.tar.bz2 73761 RMD160 75c016384a9cd37006cb9246e348b876f8316ef2 SHA1 30762d027e36b85db0c071dd18575a39c9263844 SHA256 d371712919c11d975a27c62dd91071898f2344bdbe3653b9e58ff9a152bf753b
+DIST mutt-1.5.21-gentoo-patches-r4.tar.bz2 75705 RMD160 166db2effecc1136e6420bc622774ebc55790725 SHA1 5486face6de4efc00bb303778a8f44024ee0cbd7 SHA256 39b33c40cac6a6954a52c9a918eb74c5c172c130991c758f8ea8ffdf0b5be457
 DIST mutt-1.5.21.tar.gz 3716886 RMD160 b235a42972ae410592253cdc117a90baf279f47a SHA1 a8475f2618ce5d5d33bff85c0affdf21ab1d76b9 SHA256 2141f36e8d0f4f71c9ca6780001e7cc679fe313e643953fc07f001223e67c4a0
 EBUILD mutt-1.5.20-r18.ebuild 7129 RMD160 b1733d42e80b300824fdccd7e3dfa2e790022c0d SHA1 fcb324b48d0ddec5a633efc5a03834f50ae93294 SHA256 3951ba13b64990037831bead7b52fc3b338ffa88e33659464a52f9753345de5c
 EBUILD mutt-1.5.21-r1.ebuild 7212 RMD160 8cbfa9b4583f7c630aaa8b05aee43ae9efeda501 SHA1 11ea6f79a4dbc04b53aca33795532df7b66b65f1 SHA256 866704addeee7091cdc9865a4cef6a6006f7c30490900de67936bba5858935de
 EBUILD mutt-1.5.21-r2.ebuild 7219 RMD160 0496c32af50073b8bda7c9be086c0ad1139853a1 SHA1 c3b83bace584c2bdc9b99582fb828a5a08bdcc7a SHA256 0afdd5e58b2393ec4f12cbaf68d51a459ddc8c742620274a8f3324d5da2a409a
 EBUILD mutt-1.5.21-r3.ebuild 7219 RMD160 fff7f54d14364b81911ea92f66c9c26d40acecd5 SHA1 e4ea50be36df6e47d6d94516e5674460a7515c3c SHA256 c9eea84ebd7817697071aaa14090090cd751d411cdae43ca08dea3473d8a63c0
-MISC ChangeLog 48729 RMD160 0b861651f1d0d28010261d2e2a410f68e865fbc3 SHA1 2f8bca0e65919ce56fbdebd351ed37eb207debf4 SHA256 03e71d775f28231f68884c5afa0d0f1fb3476b8bf15c8f95682cb74b99657a86
+EBUILD mutt-1.5.21-r4.ebuild 7407 RMD160 162bb7d1609563de240db46c1e324c2a3f58f71f SHA1 fb4e24c99895800eee75cbc8b549e4e4458077b5 SHA256 9b2763ff415dc8be52c979550e8adfd02114ceb5fa16b03c0aed4dd1d8ad7dc1
+MISC ChangeLog 48892 RMD160 de1ad7d8338d5b544436f910ec5937d0750a25c6 SHA1 7da760617ad773e1d4a3b22d0d785341a7933267 SHA256 b7ece69196799cadbddc6c4d0662f4cfd7822d4856dd4bb9c320fcb1a76f068d
 MISC metadata.xml 650 RMD160 499b30bbf757e578b8546c72c9d22e033bad1fd0 SHA1 0ad0c9dc1d2a2a1b9da1e32d2f3e056e5b0e6d98 SHA256 b7ca8aa383b947a5e90eafab3839a9ed2a8c4f36f4890fec19636d774ccf5320
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (Darwin)
 
-iEYEARECAAYFAk4HX6wACgkQX3X2B8XHTokaGACeKZkaCVF57WdNnz/p0WcO1/xl
-SrAAoISgT8jOnMcKLT/h1+rMlJdOFCIV
-=2gCB
+iEYEARECAAYFAk4YUhsACgkQX3X2B8XHTok0AwCfYGsqubRl8sGD3PE73fclSHmO
+ZQEAoIZ0EnzxNETJtHiGYDM174WStliq
+=twZJ
 -----END PGP SIGNATURE-----
diff --git a/mail-client/mutt/mutt-1.5.21-r4.ebuild b/mail-client/mutt/mutt-1.5.21-r4.ebuild
new file mode 100644
index 000000000000..20feb1e4a88f
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.21-r4.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.21-r4.ebuild,v 1.1 2011/07/09 13:06:18 grobian Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic autotools
+
+PATCHSET_REV="-r4"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org"
+SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
+	http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl tokyocabinet"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+RDEPEND=">=sys-libs/ncurses-5.2
+	tokyocabinet?  ( dev-db/tokyocabinet )
+	!tokyocabinet? (
+		qdbm?  ( dev-db/qdbm )
+		!qdbm? (
+			gdbm?  ( sys-libs/gdbm )
+			!gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
+		)
+	)
+	imap?    (
+		gnutls?  ( >=net-libs/gnutls-1.0.17 )
+		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+		sasl?    ( >=dev-libs/cyrus-sasl-2 )
+	)
+	pop?     (
+		gnutls?  ( >=net-libs/gnutls-1.0.17 )
+		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+		sasl?    ( >=dev-libs/cyrus-sasl-2 )
+	)
+	smtp?     (
+		gnutls?  ( >=net-libs/gnutls-1.0.17 )
+		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+		sasl?    ( >=dev-libs/cyrus-sasl-2 )
+	)
+	idn?     ( net-dns/libidn )
+	gpg?   ( >=app-crypt/gpgme-0.9.0 )
+	smime?   ( >=dev-libs/openssl-0.9.6 )
+	app-misc/mime-types"
+DEPEND="${RDEPEND}
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| ( www-client/lynx www-client/w3m www-client/elinks )
+	)"
+
+PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
+
+src_prepare() {
+	# Post-release hot-fixes grabbed from HG, this is what all following
+	# patches are based on in my Mercurial patchqueue (mq).
+	# If you ever take over or need to modify patches here, just check
+	# out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and
+	# the patchqueue as it'll save you a lot of work.
+	# http://prefix.gentooexperimental.org:8000/mutt/
+	# http://prefix.gentooexperimental.org:8000/mutt-patches/
+	for rev in $(eval echo {0..${PR#r}}) ; do
+		local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
+		[[ -e ${revpatch} ]] && \
+			epatch "${revpatch}"
+	done
+
+	# this patch is non-generic and only works because we use a sysconfdir
+	# different from the one used by the mailbase ebuild
+	use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch
+
+	# must have fixes to compile or behave correctly, upstream
+	# ignores, disagrees or simply doesn't respond/apply
+	epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection
+	epatch "${PATCHDIR}"/interix-btowc.patch
+	epatch "${PATCHDIR}"/solaris-ncurses-chars.patch
+	epatch "${PATCHDIR}"/gpgme-1.2.0.patch
+	# same category, but functional bits
+	epatch "${PATCHDIR}"/dont-reveal-bbc.patch
+
+	# the big feature patches that upstream doesn't want to include, but
+	# nearly every distro has due to their usefulness
+	for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
+		epatch "${p}"
+	done
+
+	# we conditionalise this one, simply because it has considerable
+	# impact on the code
+	if use sidebar ; then
+		epatch "${PATCHDIR}"/sidebar.patch
+		epatch "${PATCHDIR}"/sidebar-utf8.patch
+		epatch "${PATCHDIR}"/sidebar-dotpathsep.patch
+	fi
+
+	# patch version string for bug reports
+	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \
+		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"
+
+	# don't just build documentation (lengthy process, with big dependencies)
+	if use !doc ; then
+		sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
+	fi
+}
+
+src_configure() {
+	local myconf="
+		$(use_enable crypt pgp) \
+		$(use_enable debug) \
+		$(use_enable gpg gpgme) \
+		$(use_enable imap) \
+		$(use_enable nls) \
+		$(use_enable nntp) \
+		$(use_enable pop) \
+		$(use_enable smime) \
+		$(use_enable smtp) \
+		$(use_with idn) \
+		$(use_with !nntp mixmaster) \
+		--enable-compressed \
+		--enable-external-dotlock \
+		--enable-nfs-fix \
+		--sysconfdir="${EPREFIX}"/etc/${PN} \
+		--with-curses \
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PN}-${PVR} \
+		--with-regex \
+		--with-exec-shell=${EPREFIX}/bin/sh"
+
+	case $CHOST in
+		*-solaris*)
+			# Solaris has no flock in the standard headers
+			myconf="${myconf} --enable-fcntl --disable-flock"
+		;;
+		*)
+			myconf="${myconf} --disable-fcntl --enable-flock"
+		;;
+	esac
+
+	# mutt prioritizes gdbm over bdb, so we will too.
+	# hcache feature requires at least one database is in USE.
+	if use tokyocabinet; then
+		myconf="${myconf} --enable-hcache \
+			--with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+	elif use qdbm; then
+		myconf="${myconf} --enable-hcache \
+			--without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
+	elif use gdbm ; then
+		myconf="${myconf} --enable-hcache \
+			--without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
+	elif use berkdb; then
+		myconf="${myconf} --enable-hcache \
+			--without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
+	else
+		myconf="${myconf} --disable-hcache \
+			--without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+	fi
+
+	# there's no need for gnutls, ssl or sasl without socket support
+	if use pop || use imap || use smtp ; then
+		if use gnutls; then
+			myconf="${myconf} --with-gnutls"
+		elif use ssl; then
+			myconf="${myconf} --with-ssl"
+		fi
+		# not sure if this should be mutually exclusive with the other two
+		myconf="${myconf} $(use_with sasl)"
+	else
+		myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
+	fi
+
+	if use mbox; then
+		myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
+	else
+		myconf="${myconf} --with-homespool=Maildir"
+	fi
+
+	econf ${myconf} || die "configure failed"
+}
+
+src_install() {
+	make 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 /etc/mime.types /etc/${PN}/mime.types
+
+	# A man-page is always handy
+	if use !doc; then
+		make -C doc DESTDIR="${D}" muttrc.man || die
+		cp 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() {
+	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 "   http://dev.gentoo.org/~grobian/guide-to-mutt.xml"
+	echo
+}