Bump to -r5 with auto_decode_patch #66545 and updated header_cache patch. Remove redundant dies after epatch and econf. Fix DEPEND to include automake and autoconf regardless of USE=nntp since the header_cache patch also needs them.

9 files changed, 204 insertions, 28 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index 331b6ba1f3a3..d81490b4a8c1 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for mail-client/mutt
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.22 2004/11/12 18:10:18 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.23 2004/11/24 14:55:14 agriffis Exp $
+
+*mutt-1.5.6-r5 (24 Nov 2004)
+
+  24 Nov 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.4.2.1.ebuild,
+  mutt-1.5.6-r2.ebuild, mutt-1.5.6-r3.ebuild, mutt-1.5.6-r4.ebuild,
+  +mutt-1.5.6-r5.ebuild, mutt-1.5.6.ebuild:
+  Bump to -r5 with auto_decode_patch #66545 and updated header_cache
+  patch.  Remove redundant dies after epatch and econf.  Fix DEPEND to
+  include automake and autoconf regardless of USE=nntp since the
+  header_cache patch also needs them.
 
   12 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> mutt-1.5.6-r4.ebuild:
   Stable on sparc
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 1635782b38de..433fd568964a 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,12 +1,13 @@
 MD5 a9c1b4474c58e02a0349bf0073fd0b3c ChangeLog 12326
 MD5 f46d05fe0172cb035a01f40d25242d30 metadata.xml 253
-MD5 005b1bb529f6c57a79b3db2100d8a787 mutt-1.4.2.1.ebuild 3367
-MD5 ad5bac971fc963aaa0ab2ba60b4ee315 mutt-1.5.6-r2.ebuild 4619
-MD5 c719facdc640f1e4583f5e52f00b6eed mutt-1.5.6.ebuild 4223
-MD5 0cf2dc62611d7f97102f87adf32731bb mutt-1.5.6-r3.ebuild 4576
-MD5 c33f3267ab801de70f929a227a2c8e9c mutt-1.5.6-r4.ebuild 4577
-MD5 74ddaf505ea8bd19fbeb1330a23506ea files/8patch-1.5.6.dyc.source_stat 1531
+MD5 708c5a056a105127eb39bab132649b99 mutt-1.4.2.1.ebuild 3444
+MD5 8437093dd94755b37771b8d8379d3570 mutt-1.5.6-r5.ebuild 4710
+MD5 dd28340f4e41bd6656b1aedb646e9c43 mutt-1.5.6.ebuild 4252
+MD5 e59df224bd567fc3c72f9598c23d8f61 mutt-1.5.6-r2.ebuild 4648
+MD5 4cd6bc1c225ee6c8e6506a69db0ab0f5 mutt-1.5.6-r3.ebuild 4605
+MD5 ce9be26a68a0f61ed9e001601bda9d38 mutt-1.5.6-r4.ebuild 4606
 MD5 6064ff5a3d1a71ccdb48f88872feb3a3 files/Muttrc 667
+MD5 74ddaf505ea8bd19fbeb1330a23506ea files/8patch-1.5.6.dyc.source_stat 1531
 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
@@ -14,3 +15,4 @@ MD5 ea50c00af0676472a71638d84950b220 files/digest-mutt-1.5.6-r2 517
 MD5 25e242fd402f42d5bd5230dbe9ea68a6 files/slang.patch 493
 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
diff --git a/mail-client/mutt/files/digest-mutt-1.5.6-r5 b/mail-client/mutt/files/digest-mutt-1.5.6-r5
new file mode 100644
index 000000000000..e49c52e39099
--- /dev/null
+++ b/mail-client/mutt/files/digest-mutt-1.5.6-r5
@@ -0,0 +1,8 @@
+MD5 aa1433635d7c86beba1675a3408b0324 mutt-1.5.6i.tar.gz 2910730
+MD5 dbbde55d5865c76822bc13baa6dd6293 patch-1.5.5.1.cd.edit_threads.9.5-gentoo.bz2 6890
+MD5 0d57a62f17c93eb1d2eff60e070933b3 patch-1.5.6.rr.compressed.gz 10077
+MD5 1ea285e44d0fe45eb841559914b57170 patch-1.5.6.dw.mbox-hook.1 6445
+MD5 4f66ba09feaee08cf96aad42879477e5 patch-1.5.6.vvv.nntp-gentoo-r2.bz2 83484
+MD5 068e8c331756e0fc007d240456ff7d85 patch-1.5.6.tg.hcache.11 38888
+MD5 758dff57c494e86ac885ef2ecb736f11 patch-1.5.6.dw.pgp-timeout.1 1448
+MD5 f2d3e1322e1bfb38ae9722c50c599bf9 patch-1.5.6.ddm.pgp-auto-decode.1 4536
diff --git a/mail-client/mutt/mutt-1.4.2.1.ebuild b/mail-client/mutt/mutt-1.4.2.1.ebuild
index 226f9be7a816..93ec4f54c149 100644
--- a/mail-client/mutt/mutt-1.4.2.1.ebuild
+++ b/mail-client/mutt/mutt-1.4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.4.2.1.ebuild,v 1.5 2004/08/17 18:18:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.4.2.1.ebuild,v 1.6 2004/11/24 14:55:14 agriffis Exp $
 
 IUSE="cjk imap mbox nls slang ssl vanilla"
 
@@ -42,13 +42,13 @@ pkg_setup() {
 src_unpack() {
 	unpack ${P}i.tar.gz && cd ${S} || die "unpack failed"
 	if ! use vanilla; then
-		epatch ${DISTDIR}/${compressed_patch} || die
-		epatch ${DISTDIR}/${edit_threads_patch} || die
+		epatch ${DISTDIR}/${compressed_patch}
+		epatch ${DISTDIR}/${edit_threads_patch}
 	fi
 	if use cjk; then
 		cd ${WORKDIR}
 		unpack ${cjk_patch} && cd ${S} || die "unpack cjk failed"
-		epatch ${WORKDIR}/${cjk_patch%.t*}/patch-${PV}.tt.ja.1 || die
+		epatch ${WORKDIR}/${cjk_patch%.t*}/patch-${PV}.tt.ja.1
 	fi
 }
 
@@ -96,13 +96,13 @@ src_compile() {
 		# rr.compressed patch
 		myconf="${myconf} --enable-compressed"
 	fi
-	econf ${myconf} || die
+	econf ${myconf}
 	sed -i 's/README.UPGRADE//' doc/Makefile || die "sed failed"
 	make || die "make failed (myconf=${myconf})"
 }
 
 src_install () {
-	make DESTDIR=${D} install || die
+	make DESTDIR=${D} install || die "install failed"
 	find ${D}/usr/share/doc -type f | grep -v html | xargs gzip
 	if use mbox; then
 		echo "Not installing an /etc/Muttrc as mbox is default configuration"
diff --git a/mail-client/mutt/mutt-1.5.6-r2.ebuild b/mail-client/mutt/mutt-1.5.6-r2.ebuild
index 0a89b02b7c7f..ca50cb592b8d 100644
--- a/mail-client/mutt/mutt-1.5.6-r2.ebuild
+++ b/mail-client/mutt/mutt-1.5.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.6-r2.ebuild,v 1.15 2004/10/23 07:53:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.6-r2.ebuild,v 1.16 2004/11/24 14:55:14 agriffis Exp $
 
 inherit eutils flag-o-matic
 IUSE="cjk ssl nls slang crypt imap mbox nntp vanilla"
@@ -33,7 +33,7 @@ RDEPEND="nls? ( sys-devel/gettext )
 	!vanilla? ( sys-libs/gdbm )"
 DEPEND="${RDEPEND}
 	net-mail/mailbase
-	!vanilla? ( nntp? ( sys-devel/automake sys-devel/autoconf ) )"
+	!vanilla? ( sys-devel/automake sys-devel/autoconf )"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -129,12 +129,12 @@ src_compile() {
 		myconf="${myconf} --enable-hcache"
 	fi
 
-	econf ${myconf} || die
+	econf ${myconf}
 	make || die "make failed (myconf=${myconf})"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	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
diff --git a/mail-client/mutt/mutt-1.5.6-r3.ebuild b/mail-client/mutt/mutt-1.5.6-r3.ebuild
index 30ff19b34f24..9bc21d6cf88c 100644
--- a/mail-client/mutt/mutt-1.5.6-r3.ebuild
+++ b/mail-client/mutt/mutt-1.5.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.6-r3.ebuild,v 1.7 2004/10/23 07:53:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.6-r3.ebuild,v 1.8 2004/11/24 14:55:14 agriffis Exp $
 
 inherit eutils flag-o-matic
 IUSE="cjk ssl nls slang crypt imap mbox nntp vanilla"
@@ -33,7 +33,7 @@ RDEPEND="nls? ( sys-devel/gettext )
 	!vanilla? ( sys-libs/gdbm )"
 DEPEND="${RDEPEND}
 	net-mail/mailbase
-	!vanilla? ( nntp? ( sys-devel/automake sys-devel/autoconf ) )"
+	!vanilla? ( sys-devel/automake sys-devel/autoconf )"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -129,12 +129,12 @@ src_compile() {
 		myconf="${myconf} --enable-hcache"
 	fi
 
-	econf ${myconf} || die
+	econf ${myconf}
 	make || die "make failed (myconf=${myconf})"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	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
diff --git a/mail-client/mutt/mutt-1.5.6-r4.ebuild b/mail-client/mutt/mutt-1.5.6-r4.ebuild
index 2632bc9a748c..c52860e4b12d 100644
--- a/mail-client/mutt/mutt-1.5.6-r4.ebuild
+++ b/mail-client/mutt/mutt-1.5.6-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.6-r4.ebuild,v 1.4 2004/11/12 18:10:18 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.6-r4.ebuild,v 1.5 2004/11/24 14:55:14 agriffis Exp $
 
 inherit eutils flag-o-matic
 IUSE="cjk ssl nls slang crypt imap mbox nntp vanilla"
@@ -33,7 +33,7 @@ RDEPEND="nls? ( sys-devel/gettext )
 	!vanilla? ( sys-libs/gdbm )"
 DEPEND="${RDEPEND}
 	net-mail/mailbase
-	!vanilla? ( nntp? ( sys-devel/automake sys-devel/autoconf ) )"
+	!vanilla? ( sys-devel/automake sys-devel/autoconf )"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -129,12 +129,12 @@ src_compile() {
 		myconf="${myconf} --enable-hcache"
 	fi
 
-	econf ${myconf} || die
+	econf ${myconf}
 	make || die "make failed (myconf=${myconf})"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	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
diff --git a/mail-client/mutt/mutt-1.5.6-r5.ebuild b/mail-client/mutt/mutt-1.5.6-r5.ebuild
new file mode 100644
index 000000000000..751d23ea3f0d
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.6-r5.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.6-r5.ebuild,v 1.1 2004/11/24 14:55:14 agriffis Exp $
+
+inherit eutils flag-o-matic
+IUSE="cjk ssl nls slang crypt imap mbox nntp vanilla"
+
+edit_threads_patch="patch-1.5.5.1.cd.edit_threads.9.5-gentoo.bz2"
+compressed_patch="patch-${PV}.rr.compressed.gz"
+nntp_patch="patch-${PV}.vvv.nntp-gentoo-r2.bz2"
+mbox_hook_patch="patch-${PV}.dw.mbox-hook.1"
+header_cache_patch="patch-${PV}.tg.hcache.11"
+pgp_timeout_patch="patch-${PV}.dw.pgp-timeout.1"
+auto_decode_patch="patch-${PV}.ddm.pgp-auto-decode.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://www.pizzashack.org/mutt/${auto_decode_patch}
+	)"
+#	nntp? ( http://mutt.kiev.ua/download/${P}/${nntp_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 )"
+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"
+
+
+pkg_setup() {
+	if ! use imap; then
+		echo
+		einfo
+		einfo "NOTE: The USE variable 'imap' is not in your USE flags."
+		einfo "For imap support in mutt, you will need to restart the build with USE=imap"
+		einfo
+		echo
+	fi
+}
+
+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.5 autoconf		|| die "autoconf failed"
+	fi
+
+	# Fix a slang problem that is already fixed in upstream cvs
+	epatch ${FILESDIR}/slang.patch
+
+	# Fix ability to read from a subprocess with source script.sh|
+	# Bug #42738 (25 Feb 2004 agriffis)
+	epatch ${FILESDIR}/8patch-1.5.6.dyc.source_stat
+}
+
+src_compile() {
+	local myconf="
+		$(use_enable nls) \
+		$(use_with ssl) \
+		$(use_enable imap) \
+		$(use_enable crypt pgp) \
+		$(use_enable cjk default-japanese) \
+		--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
+}
+
+pkg_postinst() {
+	einfo "The USE variable 'imap' is not set by default on most architectures."
+	einfo "To enable imap support in mutt, make sure you have USE=imap"
+}
diff --git a/mail-client/mutt/mutt-1.5.6.ebuild b/mail-client/mutt/mutt-1.5.6.ebuild
index 6ab2e8b30ea4..0f410434656b 100644
--- a/mail-client/mutt/mutt-1.5.6.ebuild
+++ b/mail-client/mutt/mutt-1.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.6.ebuild,v 1.6 2004/08/17 18:18:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.6.ebuild,v 1.7 2004/11/24 14:55:14 agriffis Exp $
 
 inherit eutils flag-o-matic
 IUSE="cjk ssl nls slang crypt imap mbox nntp vanilla"
@@ -118,13 +118,13 @@ src_compile() {
 		myconf="${myconf} $(use_enable nntp)"
 	fi
 
-	econf ${myconf} || die
+	econf ${myconf}
 	sed -i -e 's/README.UPGRADE//' doc/Makefile || die "sed failed"
 	make || die "make failed (myconf=${myconf})"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	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