Bump to 1.5.8 and update all patches to apply

(Portage version: 2.0.51-r15)

4 files changed, 155 insertions, 9 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index 77ea0e46b464..80c72a47c570 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/mutt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.27 2005/02/07 00:55:18 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.28 2005/02/15 23:27:50 agriffis Exp $
+
+*mutt-1.5.8 (15 Feb 2005)
+
+  15 Feb 2005; Aron Griffis <agriffis@gentoo.org> +mutt-1.5.8.ebuild:
+  Bump to 1.5.8 and update all patches to apply
 
   06 Feb 2005; Joshua Kinard <kumba@gentoo.org> mutt-1.5.6-r4.ebuild:
   Marked stable on mips.
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 62cac75ad1c8..6ed5fe3e0797 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,18 +1,20 @@
-MD5 f447d5a0f35387ba33590ceacfb3f1b6 ChangeLog 13147
-MD5 f46d05fe0172cb035a01f40d25242d30 metadata.xml 253
-MD5 47c429a9de6aa7dc6d211b511897de59 mutt-1.4.2.1.ebuild 3355
-MD5 da817d8d2fd14250490514577cdf23d0 mutt-1.5.6-r2.ebuild 4617
+MD5 0dd5b900609ba6802a157cd0b5a22f23 mutt-1.5.8.ebuild 4015
 MD5 f05d4ae1d5264d74311c231435e87b53 mutt-1.5.6-r3.ebuild 4574
-MD5 200946843d5e6653f666e745bf28ac8f mutt-1.5.6-r4.ebuild 4571
 MD5 370eac5b151b39a97e11765ee9c43849 mutt-1.5.6-r5.ebuild 4730
+MD5 da817d8d2fd14250490514577cdf23d0 mutt-1.5.6-r2.ebuild 4617
+MD5 47c429a9de6aa7dc6d211b511897de59 mutt-1.4.2.1.ebuild 3355
 MD5 778c46506f03eea15be9616869de3168 mutt-1.5.6.ebuild 4232
-MD5 74ddaf505ea8bd19fbeb1330a23506ea files/8patch-1.5.6.dyc.source_stat 1531
+MD5 f447d5a0f35387ba33590ceacfb3f1b6 ChangeLog 13147
+MD5 200946843d5e6653f666e745bf28ac8f mutt-1.5.6-r4.ebuild 4571
+MD5 f46d05fe0172cb035a01f40d25242d30 metadata.xml 253
 MD5 6064ff5a3d1a71ccdb48f88872feb3a3 files/Muttrc 667
-MD5 30ce590d0284ffb0896857714c6a47d4 files/Muttrc.mbox 486
-MD5 cae412df424c3f499c539c93ebd02e48 files/digest-mutt-1.4.2.1 292
 MD5 6cba9546cde7ee8a8e67b44d27b62366 files/digest-mutt-1.5.6 367
+MD5 1e125e0d2cb779c2fd24d08afda0bcd6 files/digest-mutt-1.5.8 508
+MD5 30ce590d0284ffb0896857714c6a47d4 files/Muttrc.mbox 486
 MD5 ea50c00af0676472a71638d84950b220 files/digest-mutt-1.5.6-r2 517
 MD5 34621fd7163fd6ffdbd78031eda37e6f files/digest-mutt-1.5.6-r3 508
 MD5 f8939fc46ee6bccbfe58480c71a26f93 files/digest-mutt-1.5.6-r4 508
 MD5 2a6eba8a3c6c4023daa24fdb1acdf87a files/digest-mutt-1.5.6-r5 585
+MD5 cae412df424c3f499c539c93ebd02e48 files/digest-mutt-1.4.2.1 292
+MD5 74ddaf505ea8bd19fbeb1330a23506ea files/8patch-1.5.6.dyc.source_stat 1531
 MD5 25e242fd402f42d5bd5230dbe9ea68a6 files/slang.patch 493
diff --git a/mail-client/mutt/files/digest-mutt-1.5.8 b/mail-client/mutt/files/digest-mutt-1.5.8
new file mode 100644
index 000000000000..098e38d77873
--- /dev/null
+++ b/mail-client/mutt/files/digest-mutt-1.5.8
@@ -0,0 +1,7 @@
+MD5 9b9bdef4ef7107332f8782b3a910d00e mutt-1.5.8i.tar.gz 3010088
+MD5 44df2038c3cb03b1f6f5d0b998a64aed patch-1.5.5.1.cd.edit_threads.9.5-gentoo-r1.bz2 6269
+MD5 994108508f9890329ff4ee07604a374d patch-1.5.8.rr.compressed.gz 10230
+MD5 1ea285e44d0fe45eb841559914b57170 patch-1.5.6.dw.mbox-hook.1 6445
+MD5 80e81a9df998d6c65821b21a864e45ed patch-1.5.8.vvv.nntp-gentoo.bz2 71780
+MD5 8bd12eb073ef94712f3a88eb8493f195 mutt-cvs-header-cache.29 5120
+MD5 758dff57c494e86ac885ef2ecb736f11 patch-1.5.6.dw.pgp-timeout.1 1448
diff --git a/mail-client/mutt/mutt-1.5.8.ebuild b/mail-client/mutt/mutt-1.5.8.ebuild
new file mode 100644
index 000000000000..25c6650b0cb9
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.8.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.8.ebuild,v 1.1 2005/02/15 23:27:50 agriffis Exp $
+
+inherit eutils flag-o-matic
+IUSE="cjk ssl nls slang crypt imap mbox nntp sasl vanilla"
+
+edit_threads_patch="patch-1.5.5.1.cd.edit_threads.9.5-gentoo-r1.bz2"
+compressed_patch="patch-${PV}.rr.compressed.gz"
+nntp_patch="patch-${PV}.vvv.nntp-gentoo.bz2"
+mbox_hook_patch="patch-1.5.6.dw.mbox-hook.1"
+header_cache_patch="mutt-cvs-header-cache.29"
+pgp_timeout_patch="patch-1.5.6.dw.pgp-timeout.1"
+
+DESCRIPTION="a small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org"
+SRC_URI="ftp://ftp.mutt.org/mutt/devel/mutt-${PV}i.tar.gz
+	!vanilla? (
+		mirror://gentoo/${edit_threads_patch}
+		http://mutt.kiev.ua/download/${P}/${compressed_patch}
+		http://www.woolridge.ca/mutt/patches/${mbox_hook_patch}
+		nntp? ( mirror://gentoo/${nntp_patch} )
+		http://wwwcip.informatik.uni-erlangen.de/~sithglan/mutt/${header_cache_patch}
+		http://www.woolridge.ca/mutt/patches/${pgp_timeout_patch}
+	)"
+#	http://cedricduval.free.fr/mutt/patches/download/${edit_threads_patch}
+
+RDEPEND="nls? ( sys-devel/gettext )
+	>=sys-libs/ncurses-5.2
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	slang? ( >=sys-libs/slang-1.4.2 )
+	!vanilla? ( sys-libs/gdbm )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )"
+DEPEND="${RDEPEND}
+	net-mail/mailbase
+	!vanilla? ( sys-devel/automake sys-devel/autoconf )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64 ~amd64 ~mips ~ppc64 ~ppc-macos"
+
+src_unpack() {
+	unpack ${P}i.tar.gz && cd ${S} || die "unpack failed"
+	if ! use vanilla; then
+		epatch ${DISTDIR}/${compressed_patch}
+		epatch ${DISTDIR}/${edit_threads_patch}
+		epatch ${DISTDIR}/${mbox_hook_patch}
+		epatch ${DISTDIR}/${header_cache_patch}
+		epatch ${DISTDIR}/${pgp_timeout_patch}
+		epatch ${DISTDIR}/${auto_decode_patch}
+		use nntp && epatch ${DISTDIR}/${nntp_patch}
+
+		# The following steps are necessary for the nntp patch and the
+		# header_cache_patch
+		aclocal -I m4					|| die "aclocal failed"
+		autoheader						|| die "autoheader failed"
+		make -C m4 -f Makefile.am.in	|| die "make in m4 failed"
+		automake --foreign				|| die "automake failed"
+		WANT_AUTOCONF=2.13 autoconf		|| die "autoconf failed"
+	fi
+}
+
+src_compile() {
+	local myconf="
+		$(use_enable nls) \
+		$(use_with ssl) \
+		$(use_enable imap) \
+		$(use_enable crypt pgp) \
+		$(use_enable crypt smime) \
+		$(use_enable cjk default-japanese) \
+		$(use_with sasl sasl2) \
+		--sysconfdir=/etc/mutt \
+		--with-docdir=/usr/share/doc/mutt-${PVR} \
+		--with-regex --enable-pop --enable-nfs-fix \
+		--disable-fcntl --enable-flock --enable-external-dotlock"
+
+	# See Bug #22787
+	unset WANT_AUTOCONF_2_5 WANT_AUTOCONF
+
+	# See Bug #11170
+	case ${ARCH} in
+		alpha|ppc) replace-flags "-O[3-9]" "-O2" ;;
+	esac
+
+	if use slang; then
+		myconf="${myconf} --with-slang"
+		ewarn "If you want a transparent background,"
+		ewarn "please merge mutt with USE=-slang."
+	else
+		# --without-slang doesn't work;
+		# specify --with-curses if you don't want slang
+		# (26 Sep 2001 agriffis)
+		myconf="${myconf} --with-curses"
+	fi
+
+	if use mbox; then
+		myconf="${myconf} --with-maildir=/var/spool/mail"
+	else
+		myconf="${myconf} --with-homespool=Maildir"
+	fi
+
+	if ! use vanilla; then
+		# imap part of edit_threads patch
+		myconf="${myconf} $(use_enable imap imap-edit-threads)"
+
+		# rr.compressed patch
+		myconf="${myconf} --enable-compressed"
+
+		# nntp patch
+		myconf="${myconf} $(use_enable nntp)"
+
+		# maildir_header_cache_patch
+		myconf="${myconf} --enable-hcache"
+	fi
+
+	econf ${myconf}
+	make || die "make failed (myconf=${myconf})"
+}
+
+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
+
+	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
+}