Bump to 1.5.9, finally! This includes an update to the nntp patch, and stops

trying to use the non-existent auto_decode_patch.

Sync with muttng ebuild:
- Honor gnutls, gpgme and pop USE-flags
- Don't try to build sgml docs
- Only use ssl when USE=pop or imap
- Disable header-caching unless USE=gdbm or berkdb
(Portage version: 2.0.51.22-r2)

5 files changed, 232 insertions, 22 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index 9eef64141c23..05bb282cc02a 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,19 @@
 # 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.50 2005/08/06 23:33:39 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.51 2005/08/11 22:48:36 agriffis Exp $
+
+*mutt-1.5.9 (11 Aug 2005)
+
+  11 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  +files/muttng-20050809-nodoc.patch, +mutt-1.5.9.ebuild:
+  Bump to 1.5.9, finally!  This includes an update to the nntp patch, and stops
+  trying to use the non-existent auto_decode_patch.
+  
+  Sync with muttng ebuild:
+  - Honor gnutls, gpgme and pop USE-flags
+  - Don't try to build sgml docs
+  - Only use ssl when USE=pop or imap
+  - Disable header-caching unless USE=gdbm or berkdb
 
   06 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> mutt-1.5.8-r2.ebuild:
   Stable on mips.
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index f2ca3ac8c50c..07157b3112c6 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,32 +1,26 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 bccae43e77bde6930edcc433b32c972a ChangeLog 16115
+MD5 f7cf37af82169eefe94c6c42c6f3b9cd patch-1.5.9.vvv.nntp.gz 91518
+MD5 c93d9e4809f490fcb52e4ef27a78a8c3 mutt-1.5.9.ebuild 5073
+MD5 6da429d49028d773f2a5a907b34ab9c2 mutt-1.5.8-r2.ebuild 4602
+MD5 778c46506f03eea15be9616869de3168 mutt-1.5.6.ebuild 4232
 MD5 f46d05fe0172cb035a01f40d25242d30 metadata.xml 253
+MD5 30bbaee56f61cacb2163c15394753e08 mutt-1.5.6-r5.ebuild 4723
+MD5 bccae43e77bde6930edcc433b32c972a ChangeLog 16115
 MD5 47c429a9de6aa7dc6d211b511897de59 mutt-1.4.2.1.ebuild 3355
-MD5 45ccbdc90388a20fc2dca31f9372b027 mutt-1.5.6-r2.ebuild 4624
 MD5 92b52e95eb927d89b6b9e82db333c062 mutt-1.5.6-r3.ebuild 4582
+MD5 45ccbdc90388a20fc2dca31f9372b027 mutt-1.5.6-r2.ebuild 4624
 MD5 562f5b6009dbb9e68c869d2eedaeedde mutt-1.5.6-r4.ebuild 4575
-MD5 30bbaee56f61cacb2163c15394753e08 mutt-1.5.6-r5.ebuild 4723
-MD5 778c46506f03eea15be9616869de3168 mutt-1.5.6.ebuild 4232
 MD5 7640c13a30bab5830fca372180f540b1 mutt-1.5.8-r1.ebuild 4246
-MD5 6da429d49028d773f2a5a907b34ab9c2 mutt-1.5.8-r2.ebuild 4602
-MD5 74ddaf505ea8bd19fbeb1330a23506ea files/8patch-1.5.6.dyc.source_stat 1531
-MD5 6064ff5a3d1a71ccdb48f88872feb3a3 files/Muttrc 667
-MD5 30ce590d0284ffb0896857714c6a47d4 files/Muttrc.mbox 486
-MD5 cae412df424c3f499c539c93ebd02e48 files/digest-mutt-1.4.2.1 292
+MD5 82357a1177e6c7de7b2ddcd6d95894ed patch-1.5.5.1.cd.edit_threads.9.5-gentoo-r2.bz2 6288
 MD5 6cba9546cde7ee8a8e67b44d27b62366 files/digest-mutt-1.5.6 367
+MD5 6064ff5a3d1a71ccdb48f88872feb3a3 files/Muttrc 667
+MD5 3f1450d2a3bdb1e595bf5820239364cc files/digest-mutt-1.5.9 659
+MD5 25e242fd402f42d5bd5230dbe9ea68a6 files/slang.patch 493
 MD5 b991ce8de06ca0dbfbd1fbe1dc6fe1f1 files/digest-mutt-1.5.6-r2 523
-MD5 6022a3af0a556ca2678495fde468d23f files/digest-mutt-1.5.6-r3 514
+MD5 74ddaf505ea8bd19fbeb1330a23506ea files/8patch-1.5.6.dyc.source_stat 1531
 MD5 a3b8d5ca6c4f009d4a07b6463e44820c files/digest-mutt-1.5.6-r4 508
+MD5 30ce590d0284ffb0896857714c6a47d4 files/Muttrc.mbox 486
+MD5 6022a3af0a556ca2678495fde468d23f files/digest-mutt-1.5.6-r3 514
 MD5 bbcce3c6f8bd265e1449c0631ea896b6 files/digest-mutt-1.5.6-r5 585
 MD5 17ca1e2a5696251d01b9b488bcb0fc79 files/digest-mutt-1.5.8-r1 581
 MD5 2f50af3ba9259b1ac0dcf7faa2e9545e files/digest-mutt-1.5.8-r2 662
-MD5 25e242fd402f42d5bd5230dbe9ea68a6 files/slang.patch 493
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC9UjeEZCkKN40op4RAnsOAKCOIf+vUmIZzvLo1jtV11TQu9RqmQCfW7Ba
-pcn5VfumEy/gHdyYYl7XFqA=
-=Xc2n
------END PGP SIGNATURE-----
+MD5 cae412df424c3f499c539c93ebd02e48 files/digest-mutt-1.4.2.1 292
diff --git a/mail-client/mutt/files/digest-mutt-1.5.9 b/mail-client/mutt/files/digest-mutt-1.5.9
new file mode 100644
index 000000000000..a2baff20e0e9
--- /dev/null
+++ b/mail-client/mutt/files/digest-mutt-1.5.9
@@ -0,0 +1,9 @@
+MD5 c5318eba3404ebd78a15c680fa1b6056 mutt-1.5.9i.tar.gz 3036003
+MD5 82357a1177e6c7de7b2ddcd6d95894ed patch-1.5.5.1.cd.edit_threads.9.5-gentoo-r2.bz2 6288
+MD5 c20f30c8cb6002a503aa373c5934f3bb patch-1.5.6.tt.assumed_charset.1.gz 4640
+MD5 9d9ef4ec0e970f9fc3de2d5c6219a349 patch-1.5.9.rr.compressed.gz 10260
+MD5 1ea285e44d0fe45eb841559914b57170 patch-1.5.6.dw.mbox-hook.1 6445
+MD5 52778aa7e5b9d46a724e1c386f6ef9f9 patch-1.5.9.vvv.nntp-gentoo.bz2 72024
+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/files/muttng-20050809-nodoc.patch b/mail-client/mutt/files/muttng-20050809-nodoc.patch
new file mode 100644
index 000000000000..f89a8c18c9fc
--- /dev/null
+++ b/mail-client/mutt/files/muttng-20050809-nodoc.patch
@@ -0,0 +1,14 @@
+sgml2html from sgmltools-lite fails miserably trying to build the
+documentation.  Just skip it for now...
+
+--- muttng-20050809/doc/Makefile.in.nodoc	2005-08-06 14:07:10.000000000 -0400
++++ muttng-20050809/doc/Makefile.in	2005-08-10 16:50:11.000000000 -0400
+@@ -62,7 +62,7 @@
+ topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog	\
+ 	UPGRADING README NEWS TODO TODO.mutt-ng README.SSL 
+ 
+-all: muttng.1 muttrc.man try-html try-txt
++all: muttng.1 muttrc.man
+ 
+ try-html: ../makedoc$(EXEEXT)
+ 	test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
diff --git a/mail-client/mutt/mutt-1.5.9.ebuild b/mail-client/mutt/mutt-1.5.9.ebuild
new file mode 100644
index 000000000000..4b4992b81e08
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.9.ebuild
@@ -0,0 +1,180 @@
+# 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.9.ebuild,v 1.1 2005/08/11 22:48:36 agriffis Exp $
+
+inherit eutils flag-o-matic
+
+edit_threads_patch="patch-1.5.5.1.cd.edit_threads.9.5-gentoo-r2.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? (
+		http://dev.gentoo.org/~agriffis/dist/${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? (
+			http://dev.gentoo.org/~agriffis/${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}
+#	http://www.mutt.org.ua/download/${P}/${nntp_patch}
+IUSE="berkdb buffysize cjk crypt debug gdbm gnutls gpgme imap mbox nls nntp pop sasl slang smime ssl vanilla"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64 ~amd64 ~mips ~ppc64 ~ppc-macos"
+RDEPEND="nls? ( sys-devel/gettext )
+	>=sys-libs/ncurses-5.2
+	gdbm?    ( sys-libs/gdbm )
+	!gdbm?   ( berkdb? ( >=sys-libs/db-4 ) )
+	slang?   ( >=sys-libs/slang-1.4.2 )
+	imap?    (
+		gnutls?  ( >=net-libs/gnutls-1.0.17 )
+		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+	)
+	pop?     (
+		gnutls?  ( >=net-libs/gnutls-1.0.17 )
+		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+	)
+	gpgme?   ( >=app-crypt/gpgme-0.9.0 )
+	sasl?    ( >=dev-libs/cyrus-sasl-2 )"
+DEPEND="${RDEPEND}
+	net-mail/mailbase
+	!vanilla? ( sys-devel/automake sys-devel/autoconf )"
+
+src_unpack() {
+	unpack ${P}i.tar.gz && cd ${S} || die "unpack failed"
+
+	# disable sgml conversion since it fails with sgml2html
+	epatch ${FILESDIR}/muttng-20050809-nodoc.patch
+
+	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}
+		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
+
+		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() {
+	declare myconf="
+		$(use_enable nls) \
+		$(use_enable gpgme) \
+		$(use_enable imap) \
+		$(use_enable pop) \
+		$(use_with sasl sasl2) \
+		$(use_enable crypt pgp) \
+		$(use_enable smime) \
+		$(use_enable cjk default-japanese) \
+		$(use_enable debug) \
+		--enable-compressed \
+		--sysconfdir=/etc/${PN} \
+		--with-docdir=/usr/share/doc/${PN}-${PVR} \
+		--with-regex \
+		--disable-fcntl --enable-flock --enable-nfs-fix \
+		--with-mixmaster \
+		--enable-external-dotlock"
+
+	# 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 gdbm; then
+		myconf="${myconf} --enable-hcache --with-gdbm --without-bdb"
+	elif use berkdb; then
+		myconf="${myconf} --enable-hcache --with-bdb --without-gdbm"
+	else
+		myconf="${myconf} --disable-hcache --without-gdbm --without-bdb"
+	fi
+
+	# there's no need for gnutls or ssl without either pop or imap.
+	# in fact mutt's configure will bail if you do:
+	#   --without-pop --without-imap --with-ssl
+	if use pop || use imap; then
+		if use gnutls; then
+			myconf="${myconf} --with-gnutls"
+		elif use ssl; then
+			myconf="${myconf} --with-ssl"
+		fi
+	else
+		myconf="${myconf} --without-gnutls --without-ssl"
+	fi
+
+	# See Bug #11170
+	case ${ARCH} in
+		alpha|ppc) replace-flags "-O[3-9]" "-O2" ;;
+	esac
+
+	if use buffysize; then
+		ewarn "USE=buffy-size 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, merge ${PN} 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)"
+	fi
+
+	econf ${myconf}
+	emake || die "emake 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
+}