Add mutt-1.5.16 fixing bugs #182160, #174080, #178003 and #175023.

(Portage version: 2.1.2.7)

3 files changed, 198 insertions, 1 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index 37a3bb631a20..d8e723669653 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/mutt
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.107 2007/04/13 11:32:29 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.108 2007/08/08 09:40:36 ferdy Exp $
+
+*mutt-1.5.16 (08 Aug 2007)
+
+  08 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org> +mutt-1.5.16.ebuild:
+  Add mutt-1.5.16 fixing bugs #182160, #174080, #178003 and #175023.
 
 *mutt-1.5.15-r2 (13 Apr 2007)
 
diff --git a/mail-client/mutt/files/digest-mutt-1.5.16 b/mail-client/mutt/files/digest-mutt-1.5.16
new file mode 100644
index 000000000000..554aef849a3d
--- /dev/null
+++ b/mail-client/mutt/files/digest-mutt-1.5.16
@@ -0,0 +1,9 @@
+MD5 040ddb45389b3cff13aa79d6093a6b0a mutt-1.5.16-gentoo-patches.tar.bz2 57959
+RMD160 27723d0fa025db93792291f7643b2ebcd452928c mutt-1.5.16-gentoo-patches.tar.bz2 57959
+SHA256 b5af2633b54ce19928afab12ea4ab42908f19557f73d9fb06a6280c3421a03b3 mutt-1.5.16-gentoo-patches.tar.bz2 57959
+MD5 10eff7024dbb7ce1f773d688a69ea9db mutt-1.5.16.tar.gz 3534894
+RMD160 3b345599aa62a956b9c881994ffd74156a5bf808 mutt-1.5.16.tar.gz 3534894
+SHA256 825e920b394db6f56fa8deb45977c061331f59d953944e27ff595625bbad3e83 mutt-1.5.16.tar.gz 3534894
+MD5 e6e1a6e258ec6ce6ee489b0f3ff8e2cf patch-1.5.16.sidebar.20070704.txt 51103
+RMD160 a91a1eefe48c15a048231a632fe285cb2360f365 patch-1.5.16.sidebar.20070704.txt 51103
+SHA256 49123e14bebd33d0e8c7733cab319f3e5bfa591d5f5d74a3dd8964b44bf34ae7 patch-1.5.16.sidebar.20070704.txt 51103
diff --git a/mail-client/mutt/mutt-1.5.16.ebuild b/mail-client/mutt/mutt-1.5.16.ebuild
new file mode 100644
index 000000000000..48c26a3f8fe5
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.16.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.16.ebuild,v 1.1 2007/08/08 09:40:36 ferdy Exp $
+
+inherit eutils flag-o-matic autotools
+
+PATCHSET_REV=""
+
+SIDEBAR_PATCH_N="patch-1.5.16.sidebar.20070704.txt"
+
+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
+	!vanilla? (
+		!sidebar? (
+			mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
+		)
+	)
+	sidebar? (
+		http://www.lunar-linux.org/~tchan/mutt/${SIDEBAR_PATCH_N}
+	)"
+IUSE="berkdb crypt debug gdbm gnutls gpgme idn imap mbox nls nntp pop qdbm sasl
+sidebar smime smtp ssl vanilla"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+RDEPEND=">=sys-libs/ncurses-5.2
+	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 )
+	gpgme?   ( >=app-crypt/gpgme-0.9.0 )
+	smime?   ( >=dev-libs/openssl-0.9.6 )
+	app-misc/mime-types"
+DEPEND="${RDEPEND}
+	net-mail/mailbase
+	!vanilla? (
+		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_unpack() {
+	unpack ${A//${SIDEBAR_PATCH_N}} && cd "${S}" || die "unpack failed"
+
+	if ! use vanilla && ! use sidebar ; then
+		epatch "${FILESDIR}"/${P}-parallel-make.patch
+
+		use nntp || rm "${PATCHDIR}"/06-nntp.patch
+
+		for p in "${PATCHDIR}"/*.patch ; do
+			epatch "${p}"
+		done
+
+		AT_M4DIR="m4" eautoreconf
+	fi
+
+	if use sidebar ; then
+		use vanilla || \
+			ewarn "The sidebar patch is only applied to a vanilla mutt tree."
+		epatch "${DISTDIR}"/${SIDEBAR_PATCH_N}
+	fi
+}
+
+src_compile() {
+	declare myconf="
+		$(use_enable nls) \
+		$(use_enable gpgme) \
+		$(use_enable imap) \
+		$(use_enable pop) \
+		$(use_enable smtp) \
+		$(use_enable crypt pgp) \
+		$(use_enable smime) \
+		$(use_enable debug) \
+		$(use_with idn) \
+		--with-curses \
+		--sysconfdir=/etc/${PN} \
+		--with-docdir=/usr/share/doc/${PN}-${PVR} \
+		--with-regex \
+		--disable-fcntl --enable-flock \
+		--enable-nfs-fix --enable-external-dotlock \
+		--with-mixmaster"
+
+	# See Bug #22787
+	unset WANT_AUTOCONF_2_5 WANT_AUTOCONF
+
+	# mutt prioritizes gdbm over bdb, so we will too.
+	# hcache feature requires at least one database is in USE.
+	if use qdbm; then
+		myconf="${myconf} --enable-hcache \
+		--with-qdbm --without-gdbm --without-bdb"
+	elif use gdbm ; then
+		myconf="${myconf} --enable-hcache \
+			--without-qdbm --with-gdbm --without-bdb"
+	elif use berkdb; then
+		myconf="${myconf} --enable-hcache \
+			--without-gdbm --without-qdbm --with-bdb"
+	else
+		myconf="${myconf} --disable-hcache \
+			--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
+
+	# See Bug #11170
+	case ${ARCH} in
+		alpha|ppc) replace-flags "-O[3-9]" "-O2" ;;
+	esac
+
+	if use mbox; then
+		myconf="${myconf} --with-mailpath=/var/spool/mail"
+	else
+		myconf="${myconf} --with-homespool=Maildir"
+	fi
+
+	if ! use vanilla; then
+		# rr.compressed patch
+		myconf="${myconf} --enable-compressed"
+
+		# nntp patch
+		myconf="${myconf} $(use_enable nntp)"
+	fi
+
+	econf ${myconf} || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "install failed"
+	find "${D}"/usr/share/doc -type f | grep -v "html\|manual" | xargs gzip
+	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 "${D}"/etc/${PN}/mime.types
+	dosym /etc/mime.types /etc/${PN}/mime.types
+
+	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://www.gentoo.org/doc/en/guide-to-mutt.xml"
+	echo
+}