Bump to 1.5.10 #102183. Add imap-fcc-status patch, suggested by Pedro

Algarvio. This patch is primarily useful for people that send mail with
Courier IMAP's outbox feature. Remove the edit_threads and header_cache
patches since these are now integrated into 1.5.10. Re-enable berkdb for
header caching; it didn't work in 1.5.9.
Package-Manager: portage-2.0.51.22-r2

7 files changed, 253 insertions, 25 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index fdd2d47a5e4d..e6b16173e2d6 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,17 @@
 # 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.57 2005/08/15 20:54:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.58 2005/08/17 20:03:48 agriffis Exp $
+
+*mutt-1.5.10 (17 Aug 2005)
+
+  17 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  +files/mutt-1.5.10-nodoc.patch, mutt-1.4.2.1.ebuild, mutt-1.5.9.ebuild,
+  +mutt-1.5.10.ebuild:
+  Bump to 1.5.10 #102183. Add imap-fcc-status patch, suggested by Pedro
+  Algarvio. This patch is primarily useful for people that send mail with
+  Courier IMAP's outbox feature. Remove the edit_threads and header_cache
+  patches since these are now integrated into 1.5.10. Re-enable berkdb for
+  header caching; it didn't work in 1.5.9.
 
   15 Aug 2005; Aron Griffis <agriffis@gentoo.org> mutt-1.5.9.ebuild:
   mutt-1.5.9 doesn't build with berkdb, so disable hcache unless USE=gdbm.
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index b4205a3b8a6c..c29df8808f0d 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,26 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 59f8ec8d001e820c022883b080bda985 mutt-1.5.9.ebuild 6236
 MD5 b684c056a91bcad2e4f3d99c9332c1a0 mutt-1.5.8-r2.ebuild 4961
-MD5 f46d05fe0172cb035a01f40d25242d30 metadata.xml 253
-MD5 9efb8ed118b085183284578bacc99743 ChangeLog 17782
-MD5 640db6b6a90de9a4579acf772c311b94 mutt-1.4.2.1.ebuild 3331
 MD5 cb2a1c4875a1f091afd9577f4f61d2e8 mutt-1.5.8-r1.ebuild 4605
-MD5 b1da3a7a15479e6c5f08fb96c33b201e files/mutt-1.5.9-nodoc.patch 382
+MD5 8838ca64d9cd8c5e27b83645106b1ddc mutt-1.5.9.ebuild 6268
+MD5 dc42018781b04e0934dcfc4f3a6e6303 mutt-1.4.2.1.ebuild 3331
+MD5 3561f136fca8611849cf32e706444eb6 mutt-1.5.10.ebuild 5699
+MD5 3aa3a34bc04553ac132b595b5d08281b ChangeLog 18296
+MD5 f46d05fe0172cb035a01f40d25242d30 metadata.xml 253
 MD5 6064ff5a3d1a71ccdb48f88872feb3a3 files/Muttrc 667
 MD5 3f1450d2a3bdb1e595bf5820239364cc files/digest-mutt-1.5.9 659
-MD5 25e242fd402f42d5bd5230dbe9ea68a6 files/slang.patch 493
-MD5 74ddaf505ea8bd19fbeb1330a23506ea files/8patch-1.5.6.dyc.source_stat 1531
-MD5 30ce590d0284ffb0896857714c6a47d4 files/Muttrc.mbox 486
 MD5 2dfbb4deb083480353ea66f578066061 files/mutt-1.5.9-sasl.patch 1378
+MD5 b1da3a7a15479e6c5f08fb96c33b201e files/mutt-1.5.9-nodoc.patch 382
+MD5 30ce590d0284ffb0896857714c6a47d4 files/Muttrc.mbox 486
+MD5 3711d75d5d4a7d648166dcbfad6e10a3 files/mutt-1.5.10-nodoc.patch 406
 MD5 17ca1e2a5696251d01b9b488bcb0fc79 files/digest-mutt-1.5.8-r1 581
 MD5 2f50af3ba9259b1ac0dcf7faa2e9545e files/digest-mutt-1.5.8-r2 662
+MD5 7e94648d6c6faba81939c11b152f86d4 files/digest-mutt-1.5.10 580
 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDAQEeBXaUFmZvwyMRAq4HAKCBuXrpJk+IZB+xOT5YI0COlIgjhwCdHBRp
-IjfsTy/h4/6j1k13EjKWZW0=
-=upjm
+iD8DBQFDA5g9BXaUFmZvwyMRAsz3AKCje3mjeXHa92y+NVovGMWhc53LMwCfS8PX
+2K0mKsNFWWlq6XWVJf5XlOU=
+=WanG
 -----END PGP SIGNATURE-----
diff --git a/mail-client/mutt/files/digest-mutt-1.5.10 b/mail-client/mutt/files/digest-mutt-1.5.10
new file mode 100644
index 000000000000..276766f47e99
--- /dev/null
+++ b/mail-client/mutt/files/digest-mutt-1.5.10
@@ -0,0 +1,8 @@
+MD5 59400d12c6b5b3d122531000e53d1914 mutt-1.5.10i.tar.gz 3156345
+MD5 ba2f45b05aa7ef453dbd3dccddf7baef patch-1.5.10.tt.assumed_charset.1.gz 2565
+MD5 f6cd5bd6c030d5d691d347a6e9d75b6a patch-1.5.10.rr.compressed.gz 10095
+MD5 1ea285e44d0fe45eb841559914b57170 patch-1.5.6.dw.mbox-hook.1 6445
+MD5 758dff57c494e86ac885ef2ecb736f11 patch-1.5.6.dw.pgp-timeout.1 1448
+MD5 b65ec75e68ff9a0b6aca59d40822affc mutt-1.5.4-imap-fcc-status.patch 380
+MD5 b6c5ba3052ce62173d8773094afacbdf patch-1.5.10.vvv.nntp-gentoo.bz2 72894
+MD5 404cb8677bb50937405531931629562f mutt-1.5.7-mixmaster+nntp.patch 310
diff --git a/mail-client/mutt/files/mutt-1.5.10-nodoc.patch b/mail-client/mutt/files/mutt-1.5.10-nodoc.patch
new file mode 100644
index 000000000000..e88176d7134d
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.10-nodoc.patch
@@ -0,0 +1,11 @@
+--- mutt-1.5.10/doc/Makefile.in.nodoc	2005-08-17 11:50:30.000000000 -0400
++++ mutt-1.5.10/doc/Makefile.in	2005-08-17 11:50:38.000000000 -0400
+@@ -64,7 +64,7 @@
+ 	ChangeLog.old					\
+ 	README NEWS TODO README.SECURITY README.SSL 
+ 
+-all: mutt.1 muttrc.man try-html try-txt
++all: mutt.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.4.2.1.ebuild b/mail-client/mutt/mutt-1.4.2.1.ebuild
index 2ca0d000ac16..26bf6d64f5de 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-2005 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.8 2005/08/11 22:57:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.4.2.1.ebuild,v 1.9 2005/08/17 20:03:48 agriffis Exp $
 
 IUSE="cjk imap mbox nls slang ssl vanilla"
 
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa ~mips"
+KEYWORDS="alpha hppa ~mips ppc sparc x86"
 
 pkg_setup() {
 	if ! use imap; then
diff --git a/mail-client/mutt/mutt-1.5.10.ebuild b/mail-client/mutt/mutt-1.5.10.ebuild
new file mode 100644
index 000000000000..f88cb4dfc186
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.10.ebuild
@@ -0,0 +1,195 @@
+# 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.10.ebuild,v 1.1 2005/08/17 20:03:48 agriffis Exp $
+
+inherit eutils flag-o-matic
+
+patch_assumed_charset="patch-1.5.10.tt.assumed_charset.1.gz"
+patch_compressed="patch-${PV}.rr.compressed.gz"
+patch_mbox_hook="patch-1.5.6.dw.mbox-hook.1"
+patch_pgp_timeout="patch-1.5.6.dw.pgp-timeout.1"
+patch_imap_fcc_status="mutt-1.5.4-imap-fcc-status.patch"
+opt_patch_nntp="patch-${PV}.vvv.nntp-gentoo.bz2"
+
+DESCRIPTION="a small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org"
+SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}i.tar.gz
+	!vanilla? (
+		http://www.emaillab.org/${PN}/${PV}/${patch_assumed_charset}
+		http://mutt.kiev.ua/download/${P}/${patch_compressed}
+		http://www.woolridge.ca/${PN}/patches/${patch_mbox_hook}
+		http://www.woolridge.ca/${PN}/patches/${patch_pgp_timeout}
+		http://www.plumlocosoft.com/software/download/${patch_imap_fcc_status}
+		nntp? (
+			http://dev.gentoo.org/~agriffis/dist/${opt_patch_nntp}
+			mirror://gentoo/mutt-1.5.7-mixmaster+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="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+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 ) )
+		sasl?    ( >=dev-libs/cyrus-sasl-2 )
+	)
+	pop?     (
+		gnutls?  ( >=net-libs/gnutls-1.0.17 )
+		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+		sasl?    ( >=dev-libs/cyrus-sasl-2 )
+	)
+	gpgme?   ( >=app-crypt/gpgme-0.9.0 )"
+DEPEND="${RDEPEND}
+	net-mail/mailbase
+	sys-devel/autoconf
+	!vanilla? ( sys-devel/automake )"
+
+pkg_setup() {
+	if ! use imap; then
+		echo
+		einfo "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"
+		echo
+	fi
+}
+
+src_unpack() {
+	unpack ${P}i.tar.gz && cd ${S} || die "unpack failed"
+
+	# fix sasl support in configure.in
+	epatch ${FILESDIR}/mutt-1.5.9-sasl.patch
+
+	# disable sgml conversion since it fails with sgml2html
+	epatch ${FILESDIR}/mutt-1.5.10-nodoc.patch
+
+	if ! use vanilla ; then
+		for p in ${!patch_*} ; do
+			epatch ${DISTDIR}/${!p}
+		done
+
+		if use nntp; then
+			epatch ${DISTDIR}/${opt_patch_nntp}
+			# Allow mutt to build with mixmaster and nntp both enabled
+			epatch ${DISTDIR}/mutt-1.5.7-mixmaster+nntp.patch
+		fi
+
+		rm -rf configure autom4te.cache
+		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"
+	fi
+
+	WANT_AUTOCONF=2.13 autoconf		|| die "autoconf failed"
+}
+
+src_compile() {
+	declare myconf="
+		$(use_enable nls) \
+		$(use_enable gpgme) \
+		$(use_enable imap) \
+		$(use_enable pop) \
+		$(use_enable crypt pgp) \
+		$(use_enable smime) \
+		$(use_enable cjk default-japanese) \
+		$(use_enable debug) \
+		--sysconfdir=/etc/${PN} \
+		--with-docdir=/usr/share/doc/${PN}-${PVR} \
+		--with-regex \
+		--disable-fcntl --enable-flock \
+		--enable-nfs-fix --enable-external-dotlock \
+		--with-mixmaster \
+		--without-sasl"
+
+	# 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, ssl or sasl 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
+		# not sure if this should be mutually exclusive with the other two
+		myconf="${myconf} $(use_with sasl sasl2)"
+	else
+		myconf="${myconf} --without-gnutls --without-ssl --without-sasl2"
+	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"
+	else
+		# --without-slang won'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-mailpath=/var/spool/mail"
+	else
+		myconf="${myconf} --with-homespool=Maildir"
+	fi
+
+	if ! use vanilla; then
+		# rr.compressed patch
+		myconf="${myconf} --enable-compressed"
+
+		# nntp patch
+		myconf="${myconf} $(use_enable nntp)"
+	fi
+
+	econf ${myconf} || die "configure failed"
+	make || die "make failed"
+}
+
+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() {
+	echo
+	einfo "If you are new to mutt you may want to take a look at"
+	einfo "the Gentoo QuickStart Guide to Mutt E-Mail:"
+	einfo "   http://www.gentoo.org/doc/en/guide-to-mutt.xml"
+	echo
+}
diff --git a/mail-client/mutt/mutt-1.5.9.ebuild b/mail-client/mutt/mutt-1.5.9.ebuild
index 8178576fa175..e879fb7f34a9 100644
--- a/mail-client/mutt/mutt-1.5.9.ebuild
+++ b/mail-client/mutt/mutt-1.5.9.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.9.ebuild,v 1.8 2005/08/15 20:54:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.9.ebuild,v 1.9 2005/08/17 20:03:48 agriffis Exp $
 
 inherit eutils flag-o-matic
 
@@ -32,7 +32,7 @@ SRC_URI="ftp://ftp.mutt.org/mutt/devel/mutt-${PV}i.tar.gz
 IUSE="buffysize cjk crypt debug gdbm gnutls gpgme imap mbox nls nntp pop sasl slang smime ssl vanilla" # berkdb
 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"
 RDEPEND="nls? ( sys-devel/gettext )
 	>=sys-libs/ncurses-5.2
 	gdbm?    ( sys-libs/gdbm )
@@ -57,7 +57,7 @@ DEPEND="${RDEPEND}
 pkg_setup() {
 	if ! use imap; then
 		echo
-		einfo "NOTE: The USE variable 'imap' is not in your USE flags."
+		einfo "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"
 		echo
 	fi
@@ -104,14 +104,13 @@ src_compile() {
 		$(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 \
+		--disable-fcntl --enable-flock \
+		--enable-nfs-fix --enable-external-dotlock \
 		--with-mixmaster \
-		--without-sasl \
-		--enable-external-dotlock"
+		--without-sasl"
 
 	# See Bug #22787
 	unset WANT_AUTOCONF_2_5 WANT_AUTOCONF
@@ -178,8 +177,8 @@ src_compile() {
 		myconf="${myconf} $(use_enable nntp)"
 	fi
 
-	econf ${myconf}
-	emake || die "emake failed (myconf=${myconf})"
+	econf ${myconf} || die "configure failed"
+	make || die "make failed"
 }
 
 src_install() {
@@ -198,7 +197,8 @@ src_install() {
 
 pkg_postinst() {
 	echo
-	einfo "For information about using mutt, please refer to:"
-	einfo "  http://www.gentoo.org/doc/en/guide-to-mutt.xml"
+	einfo "If you are new to mutt you may want to take a look at"
+	einfo "the Gentoo QuickStart Guide to Mutt E-Mail:"
+	einfo "   http://www.gentoo.org/doc/en/guide-to-mutt.xml"
 	echo
 }