Use newer headercache patchset.

4 files changed, 186 insertions, 8 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index b756151cb87a..880180f34ae5 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,12 @@
 # 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.19 2004/09/13 18:31:39 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.20 2004/09/25 17:42:10 ticho Exp $
+
+*mutt-1.5.6-r4 (25 Sep 2004)
+
+  25 Sep 2004; Andrej Kacian <ticho@gentoo.org> +mutt-1.5.6-r4.ebuild:
+  Use newer headercache patchset. Closes #65060, reported by Horst Schirmeier
+  <gentoo@schirmeier.com>.
 
   13 Sep 2004; Guy Martin <gmsoft@gentoo.org> mutt-1.5.6-r3.ebuild:
   Stable on hppa.
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index b715d8d4d9b4..723c29f1e49e 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,14 +1,26 @@
-MD5 8a7fbbf5ae05d74c5d388fb67139c1c3 ChangeLog 11916
-MD5 f46d05fe0172cb035a01f40d25242d30 metadata.xml 253
-MD5 005b1bb529f6c57a79b3db2100d8a787 mutt-1.4.2.1.ebuild 3367
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 58c3e5d8eeff99c61f1d1008eba1027a ChangeLog 12122
 MD5 d2d2257af2c9c8888b00c08c4b02d51b mutt-1.5.6-r2.ebuild 4625
-MD5 0b4fa83b55e7e0a35d7267915ff0a32a mutt-1.5.6-r3.ebuild 4583
+MD5 24571ff3298b918d6b78faa032b27edb mutt-1.5.6-r4.ebuild 4586
+MD5 f46d05fe0172cb035a01f40d25242d30 metadata.xml 253
 MD5 c719facdc640f1e4583f5e52f00b6eed mutt-1.5.6.ebuild 4223
-MD5 74ddaf505ea8bd19fbeb1330a23506ea files/8patch-1.5.6.dyc.source_stat 1531
+MD5 0b4fa83b55e7e0a35d7267915ff0a32a mutt-1.5.6-r3.ebuild 4583
+MD5 005b1bb529f6c57a79b3db2100d8a787 mutt-1.4.2.1.ebuild 3367
+MD5 cae412df424c3f499c539c93ebd02e48 files/digest-mutt-1.4.2.1 292
 MD5 6064ff5a3d1a71ccdb48f88872feb3a3 files/Muttrc 667
+MD5 34621fd7163fd6ffdbd78031eda37e6f files/digest-mutt-1.5.6-r3 508
+MD5 f8939fc46ee6bccbfe58480c71a26f93 files/digest-mutt-1.5.6-r4 508
 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 ea50c00af0676472a71638d84950b220 files/digest-mutt-1.5.6-r2 517
-MD5 34621fd7163fd6ffdbd78031eda37e6f files/digest-mutt-1.5.6-r3 508
+MD5 74ddaf505ea8bd19fbeb1330a23506ea files/8patch-1.5.6.dyc.source_stat 1531
 MD5 25e242fd402f42d5bd5230dbe9ea68a6 files/slang.patch 493
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBVa4E10xuJSrg3/sRAv8tAJ4hOHLw4+2YmddeXc4EMq2a76G6+QCfRMYH
+2zKlBmwwhXqgJeygv0tfQqw=
+=x9UV
+-----END PGP SIGNATURE-----
diff --git a/mail-client/mutt/files/digest-mutt-1.5.6-r4 b/mail-client/mutt/files/digest-mutt-1.5.6-r4
new file mode 100644
index 000000000000..7fc9e2fabfe0
--- /dev/null
+++ b/mail-client/mutt/files/digest-mutt-1.5.6-r4
@@ -0,0 +1,7 @@
+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 bb4f3a9529e3fc14594ee2d4cf6f523f patch-1.5.6.tg.hcache.8 37794
+MD5 758dff57c494e86ac885ef2ecb736f11 patch-1.5.6.dw.pgp-timeout.1 1448
diff --git a/mail-client/mutt/mutt-1.5.6-r4.ebuild b/mail-client/mutt/mutt-1.5.6-r4.ebuild
new file mode 100644
index 000000000000..96ecdb707500
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.6-r4.ebuild
@@ -0,0 +1,153 @@
+# 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.1 2004/09/25 17:42:10 ticho 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.8"
+pgp_timeout_patch="patch-${PV}.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}
+	)"
+#	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? ( nntp? ( sys-devel/automake sys-devel/autoconf ) )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64 ~amd64 ~mips ~ppc64 ~macos ~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}
+		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} || die
+	make || die "make failed (myconf=${myconf})"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	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"
+}