Mark 1.5.8-r1 stable on alpha, ia64, x86. In mutt-1.5.8-r2, add

assumed_charset patch #70405, use emake #83413, and honor USE=buffysize to
enable the buffysize workaround #72422. Thanks to Chris Korn for helping out
with these patches and the updated ebuild
Package-Manager: portage-2.0.51.19

5 files changed, 195 insertions, 16 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index db7a48e2b6dc..7e7034a65343 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,15 @@
 # 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.34 2005/03/17 09:03:11 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.35 2005/03/17 22:36:34 agriffis Exp $
+
+*mutt-1.5.8-r2 (17 Mar 2005)
+
+  17 Mar 2005; Aron Griffis <agriffis@gentoo.org> mutt-1.5.8-r1.ebuild,
+  +mutt-1.5.8-r2.ebuild:
+  Mark 1.5.8-r1 stable on alpha, ia64, x86. In mutt-1.5.8-r2, add
+  assumed_charset patch #70405, use emake #83413, and honor USE=buffysize to
+  enable the buffysize workaround #72422. Thanks to Chris Korn for helping out
+  with these patches and the updated ebuild
 
   17 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> mutt-1.5.6-r5.ebuild:
   Stable on ppc.
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index cdb40b3b2839..587bac42621e 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,20 +1,32 @@
-MD5 47c429a9de6aa7dc6d211b511897de59 mutt-1.4.2.1.ebuild 3355
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 f05d4ae1d5264d74311c231435e87b53 mutt-1.5.6-r3.ebuild 4574
-MD5 f46d05fe0172cb035a01f40d25242d30 metadata.xml 253
-MD5 5fc1582e9b41cf46830c0e225274fbee ChangeLog 14090
-MD5 562f5b6009dbb9e68c869d2eedaeedde mutt-1.5.6-r4.ebuild 4575
 MD5 778c46506f03eea15be9616869de3168 mutt-1.5.6.ebuild 4232
+MD5 bcd5f3432637136a954d4589bb2cc831 ChangeLog 14486
+MD5 47c429a9de6aa7dc6d211b511897de59 mutt-1.4.2.1.ebuild 3355
+MD5 fbb8de4f55223aa0bf4924dfc8a4bdcf mutt-1.5.8-r1.ebuild 4253
 MD5 30bbaee56f61cacb2163c15394753e08 mutt-1.5.6-r5.ebuild 4723
-MD5 371998d5fbdc88d3d9b52c31725bb18c mutt-1.5.8-r1.ebuild 4256
+MD5 f46d05fe0172cb035a01f40d25242d30 metadata.xml 253
 MD5 da817d8d2fd14250490514577cdf23d0 mutt-1.5.6-r2.ebuild 4617
-MD5 bbcce3c6f8bd265e1449c0631ea896b6 files/digest-mutt-1.5.6-r5 585
-MD5 74ddaf505ea8bd19fbeb1330a23506ea files/8patch-1.5.6.dyc.source_stat 1531
-MD5 a3b8d5ca6c4f009d4a07b6463e44820c files/digest-mutt-1.5.6-r4 508
+MD5 562f5b6009dbb9e68c869d2eedaeedde mutt-1.5.6-r4.ebuild 4575
+MD5 fe12a56793ad08ea831fa190d2ba5749 mutt-1.5.8-r2.ebuild 4610
+MD5 d789f6060e71c1a95e52d74e15474096 files/digest-mutt-1.5.8-r2 659
 MD5 25e242fd402f42d5bd5230dbe9ea68a6 files/slang.patch 493
-MD5 ea50c00af0676472a71638d84950b220 files/digest-mutt-1.5.6-r2 517
+MD5 a3b8d5ca6c4f009d4a07b6463e44820c files/digest-mutt-1.5.6-r4 508
 MD5 6064ff5a3d1a71ccdb48f88872feb3a3 files/Muttrc 667
-MD5 34621fd7163fd6ffdbd78031eda37e6f files/digest-mutt-1.5.6-r3 508
-MD5 17ca1e2a5696251d01b9b488bcb0fc79 files/digest-mutt-1.5.8-r1 581
-MD5 6cba9546cde7ee8a8e67b44d27b62366 files/digest-mutt-1.5.6 367
-MD5 30ce590d0284ffb0896857714c6a47d4 files/Muttrc.mbox 486
+MD5 ea50c00af0676472a71638d84950b220 files/digest-mutt-1.5.6-r2 517
+MD5 bbcce3c6f8bd265e1449c0631ea896b6 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 30ce590d0284ffb0896857714c6a47d4 files/Muttrc.mbox 486
+MD5 6cba9546cde7ee8a8e67b44d27b62366 files/digest-mutt-1.5.6 367
+MD5 17ca1e2a5696251d01b9b488bcb0fc79 files/digest-mutt-1.5.8-r1 581
+MD5 34621fd7163fd6ffdbd78031eda37e6f files/digest-mutt-1.5.6-r3 508
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCOgZ/BXaUFmZvwyMRAiNaAJ9aNZ+TImYWm3zyKDy9FpnH4A2+HgCfetpo
+C/0M+3TFXrhK5EpxSr8/wvc=
+=wt6B
+-----END PGP SIGNATURE-----
diff --git a/mail-client/mutt/files/digest-mutt-1.5.8-r2 b/mail-client/mutt/files/digest-mutt-1.5.8-r2
new file mode 100644
index 000000000000..ad138ec6a899
--- /dev/null
+++ b/mail-client/mutt/files/digest-mutt-1.5.8-r2
@@ -0,0 +1,9 @@
+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 c20f30c8cb6002a503aa373c5934f3bb patch-1.5.6.tt.assumed_charset.1.gz 4640
+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 404cb8677bb50937405531931629562f mutt-1.5.7-mixmaster+nntp.patch 310
+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-r1.ebuild b/mail-client/mutt/mutt-1.5.8-r1.ebuild
index e8c9a9c20af6..a1b9fd6a8804 100644
--- a/mail-client/mutt/mutt-1.5.8-r1.ebuild
+++ b/mail-client/mutt/mutt-1.5.8-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.3 2005/02/20 21:16:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.8-r1.ebuild,v 1.4 2005/03/17 22:36:34 agriffis Exp $
 
 inherit eutils flag-o-matic
 IUSE="cjk ssl nls slang crypt imap mbox nntp sasl vanilla"
@@ -40,7 +40,7 @@ DEPEND="${RDEPEND}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64 ~amd64 ~mips ~ppc64 ~ppc-macos"
+KEYWORDS="alpha ~amd64 ~hppa ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc x86"
 
 src_unpack() {
 	unpack ${P}i.tar.gz && cd ${S} || die "unpack failed"
diff --git a/mail-client/mutt/mutt-1.5.8-r2.ebuild b/mail-client/mutt/mutt-1.5.8-r2.ebuild
new file mode 100644
index 000000000000..acad988de739
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.8-r2.ebuild
@@ -0,0 +1,149 @@
+# 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-r2.ebuild,v 1.1 2005/03/17 22:36:34 agriffis Exp $
+
+inherit eutils flag-o-matic
+IUSE="cjk ssl nls slang crypt imap mbox nntp sasl buffysize 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"
+assumed_charset_patch="patch-1.5.6.tt.assumed_charset.1.gz"
+
+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://www.emaillab.org/mutt/1.5/${assumed_charset_patch}
+		http://mutt.kiev.ua/download/${P}/${compressed_patch}
+		http://www.woolridge.ca/mutt/patches/${mbox_hook_patch}
+		nntp? (
+			mirror://gentoo/${nntp_patch}
+			mirror://gentoo/mutt-1.5.7-mixmaster+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}/${assumed_charset_patch}
+		epatch ${DISTDIR}/${auto_decode_patch}
+		if use nntp; then
+			epatch ${DISTDIR}/${nntp_patch}
+			# Allow mutt to build with mixmaster and nntp both enabled
+			epatch ${DISTDIR}/mutt-1.5.7-mixmaster+nntp.patch
+		fi
+
+		# The following steps are necessary for the nntp patch and the
+		# header_cache_patch
+		aclocal -I m4					|| die "aclocal failed"
+		autoheader						|| die "autoheader failed"
+		emake -C m4 -f Makefile.am.in	|| die "emake 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) \
+		--enable-compressed \
+		--with-mixmaster \
+		--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 buffysize; then
+		ewarn "You're using --enable-buffy-size. This is just a workaround. Disable it if you don't need it."
+		myconf="${myconf} --enable-buffy-size"
+	fi
+
+	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}
+	emake || die "emake failed (myconf=${myconf})"
+}
+
+src_install() {
+	emake 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
+}