Add mutt 1.5.17, sidebar patch is the only tested path.

8 files changed, 1041 insertions, 0 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
new file mode 100644
index 0000000..255ab92
--- /dev/null
+++ b/mail-client/mutt/ChangeLog
@@ -0,0 +1,760 @@
+# ChangeLog for mail-client/mutt
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.121 2008/03/09 21:36:14 ricmm Exp $
+
+  09 Mar 2008; <ricmm@gentoo.org> mutt-1.5.11-r2.ebuild,
+  mutt-1.5.13-r1.ebuild, mutt-1.5.16.ebuild:
+  Marked unstable on mips due to unstable deps
+
+  29 Aug 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
+  Removing agriffis from metadata due to his retirement (see #182294 for
+  reference).
+
+  23 Aug 2007; Joshua Kinard <kumba@gentoo.org> mutt-1.5.16.ebuild:
+  Stable on mips, per #178003.
+
+  16 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org>
+  files/mutt-1.5.16-parallel-make.patch, mutt-1.5.16.ebuild:
+  Hopefully fix parallel make for every USE combination
+
+  11 Aug 2007; Steve Dibb <beandog@gentoo.org> mutt-1.5.16.ebuild:
+  amd64 stable, security bug 178003
+
+  10 Aug 2007; Markus Rothe <corsair@gentoo.org> mutt-1.5.16.ebuild:
+  Stable on ppc64; bug #178003
+
+  09 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org> mutt-1.5.16.ebuild:
+  Stable on sparc wrt security #178003
+
+  09 Aug 2007; Raúl Porcel <armin76@gentoo.org> mutt-1.5.16.ebuild:
+  alpha/ia64 stable wrt security #178003
+
+  09 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> mutt-1.5.16.ebuild:
+  ppc stable, bug #178003
+
+  09 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org> mutt-1.5.16.ebuild:
+  The nntp patch was faulty. Bumping patchset to -r1, no revbump to avoid
+  silly recompiles.
+
+  09 Aug 2007; Christian Faulhammer <opfer@gentoo.org> mutt-1.5.16.ebuild:
+  stable x86, security bug 178003
+
+  09 Aug 2007; Jeroen Roovers <jer@gentoo.org> mutt-1.5.16.ebuild:
+  Stable for HPPA (bug #178003).
+
+  08 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/mutt-1.5.16-parallel-make.patch:
+  Add mutt-1.5.16-parallel-make, oooops.
+
+*mutt-1.5.16 (08 Aug 2007)
+
+  08 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org> +mutt-1.5.16.ebuild:
+  Add mutt-1.5.16 fixing bugs #182160, #174080, #178003 and #175023.
+
+*mutt-1.5.15-r2 (13 Apr 2007)
+
+  13 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> -mutt-1.5.15-r1.ebuild,
+  +mutt-1.5.15-r2.ebuild:
+  New patchset to fix bug #174403. Remove -r1 since it contains a buggy
+  compressed patch.
+
+  12 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> mutt-1.5.15-r1.ebuild:
+  Remove some deprecated options and use flags, thanks to exg.
+
+*mutt-1.5.15-r1 (12 Apr 2007)
+
+  12 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/mutt-1.5.15-parallel-make.patch, -mutt-1.5.15.ebuild,
+  +mutt-1.5.15-r1.ebuild:
+  Refresh nntp patch in our patchset. Add smtp support as per bug #174123. Fix
+  parallel make as per bug #173969. Fix dependencies. Remove 1.5.15-r0
+
+  10 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> mutt-1.5.15.ebuild:
+  Force -j1 as per bug #173969
+
+*mutt-1.5.15 (09 Apr 2007)
+
+  09 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> +mutt-1.5.15.ebuild:
+  New upstream version. Added sidebar patch to our patchset
+
+*mutt-1.5.14 (20 Mar 2007)
+
+  20 Mar 2007; Fernando J. Pereda <ferdy@gentoo.org> +mutt-1.5.14.ebuild:
+  New upstream version.
+
+  18 Mar 2007; Marius Mauch <genone@gentoo.org> mutt-1.5.11-r2.ebuild,
+  mutt-1.5.12.ebuild, mutt-1.5.13.ebuild, mutt-1.5.13-r1.ebuild,
+  mutt-1.5.13-r2.ebuild:
+  Replacing einfo with elog
+
+  10 Mar 2007; Peter Weller <welp@gentoo.org> mutt-1.5.13-r1.ebuild:
+  Keyworded ~x86-fbsd
+
+*mutt-1.5.13-r2 (22 Nov 2006)
+
+  22 Nov 2006; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/mutt-1.5.13-paranoid-temp-file.patch, +mutt-1.5.13-r2.ebuild:
+  Fix for bug #154310
+
+  11 Nov 2006; Alexander H. Færøy <eroyf@gentoo.org>
+  mutt-1.5.13-r1.ebuild:
+  Stable on MIPS. Bug 152657.
+
+  28 Oct 2006; Tom Knight <tomk@gentoo.org> mutt-1.5.13-r1.ebuild:
+  Stable on amd64. Bug #152657
+
+  26 Oct 2006; Jason Wever <weeve@gentoo.org> mutt-1.5.13-r1.ebuild:
+  Stable on SPARC wrt bug #152657.
+
+  25 Oct 2006; Chris White <chriswhite@gentoo.org> mutt-1.5.13-r1.ebuild:
+  ppc stable for bug #152657.
+
+  25 Oct 2006; Joshua Jackson <tsunam@gentoo.org> mutt-1.5.13-r1.ebuild:
+  Stable x86; bug #152657
+
+  25 Oct 2006; Jeroen Roovers <jer@gentoo.org> mutt-1.5.13-r1.ebuild:
+  Stable for HPPA (bug #152657).
+
+  24 Oct 2006; Markus Rothe <corsair@gentoo.org> mutt-1.5.13-r1.ebuild:
+  Stable on ppc64; bug #152657
+
+  21 Oct 2006; Aron Griffis <agriffis@gentoo.org> mutt-1.5.13-r1.ebuild:
+  Mark 1.5.13-r1 stable on alpha/ia64
+
+  02 Oct 2006; Fabian Groffen <grobian@gentoo.org> mutt-1.5.11-r2.ebuild,
+  mutt-1.5.12.ebuild, mutt-1.5.13.ebuild, mutt-1.5.13-r1.ebuild:
+  Dropped ppc-macos keyword, as we don't have all dependencies any more. We
+  live on in the prefix.
+
+*mutt-1.5.13-r1 (11 Sep 2006)
+
+  11 Sep 2006; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/mutt-1.5.13-sasl.patch, +mutt-1.5.13-r1.ebuild:
+  Add a patch to fix mutt with dev-libs/cyrus-sasl-2.1.22. Fixes bug #146696.
+  Thanks to Sebastian <sebastian_ml@gmx.net>
+
+  04 Sep 2006; Fernando J. Pereda <ferdy@gentoo.org> -mutt-1.5.11.ebuild:
+  Remove mutt-1.5.11 wrt bug #140514
+
+  03 Sep 2006; Joshua Kinard <kumba@gentoo.org> mutt-1.5.11-r2.ebuild:
+  Marked stable on mips.
+
+  14 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org>
+  -files/8patch-1.5.6.dyc.source_stat, -files/mutt-1.5.9-nodoc.patch,
+  -files/mutt-1.5.9-sasl.patch, -files/mutt-1.5.10-nodoc.patch,
+  -mutt-1.4.2.1.ebuild, -mutt-1.5.8-r1.ebuild, -mutt-1.5.8-r2.ebuild,
+  -mutt-1.5.9.ebuild, -mutt-1.5.10-r1.ebuild, -mutt-1.5.11-r1.ebuild:
+  Security cleanup wrt bug #140514.
+
+*mutt-1.5.13 (14 Aug 2006)
+
+  14 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org> mutt-1.4.2.1.ebuild,
+  mutt-1.5.8-r1.ebuild, mutt-1.5.8-r2.ebuild, mutt-1.5.9.ebuild,
+  mutt-1.5.10-r1.ebuild, mutt-1.5.11.ebuild, mutt-1.5.11-r1.ebuild,
+  +mutt-1.5.13.ebuild:
+  Version bump. Fixed dependencies on =sys-libs/slang-1* as per bug #141947.
+  Changed invalid values for WANT_AUTOCONF as per bug #143429.
+
+  07 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/mutt-1.5.12-fix-pop-c.patch, mutt-1.5.12.ebuild:
+  Fix for bug #142520. Thanks to Pablo Antonio <pabloa@gmail.com>
+
+*mutt-1.5.12 (30 Jul 2006)
+
+  30 Jul 2006; Fernando J. Pereda <ferdy@gentoo.org>
+  -mutt-1.5.11-r30.ebuild, +mutt-1.5.12.ebuild:
+  Version bump, bug #141033. Reported by Shark <shark@bitchx.it>.
+
+  13 Jul 2006; Aron Griffis <agriffis@gentoo.org> mutt-1.5.11-r2.ebuild:
+  Mark 1.5.11-r2 stable on ia64
+
+  28 Jun 2006; Luis Medinas <metalgod@gentoo.org> mutt-1.5.11-r2.ebuild:
+  Stable on amd64. See security bug #138125.
+
+  27 Jun 2006; Gustavo Zacarias <gustavoz@gentoo.org> mutt-1.5.11-r2.ebuild:
+  Stable on sparc wrt security #138125
+
+  27 Jun 2006; Fernando J. Pereda <ferdy@gentoo.org> mutt-1.5.11-r2.ebuild:
+  Stable on alpha (bug #138125)
+
+  27 Jun 2006; Rene Nussbaumer <killerfox@gentoo.org> mutt-1.5.11-r2.ebuild:
+  Stable on hppa. See bug #138125.
+
+  27 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> mutt-1.5.11-r2.ebuild:
+  Stable on x86 wrt bug #138125.
+
+  27 Jun 2006; Markus Rothe <corsair@gentoo.org> mutt-1.5.11-r2.ebuild:
+  Stable on ppc64; bug #138125
+
+  27 Jun 2006; Fabian Groffen <grobian@gentoo.org> mutt-1.5.11-r2.ebuild:
+  Marked ppc-macos stable (bug #138125)
+
+  27 Jun 2006; Emanuele Giaquinta <exg@gentoo.org> mutt-1.5.11-r2.ebuild:
+  Stable on ppc; bug #138125
+
+  27 Jun 2006; Fernando J. Pereda <ferdy@gentoo.org> mutt-1.5.11-r2.ebuild:
+  Remove explicit autoconf and automake dependencies.
+
+*mutt-1.5.11-r2 (27 Jun 2006)
+
+  27 Jun 2006; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/mutt-1.5.11-imap-browse.patch, +mutt-1.5.11-r2.ebuild:
+  Add a patch to fix security bug #138125. Also use autotools.eclass to
+  reconfigure the build framework when needed.
+
+*mutt-1.5.11-r30 (18 May 2006)
+
+  18 May 2006; Fernando J. Pereda <ferdy@gentoo.org>
+  +mutt-1.5.11-r30.ebuild:
+  Add a package.mask'd version for patch testing.
+
+  20 Feb 2006; Joshua Kinard <kumba@gentoo.org> mutt-1.5.11.ebuild:
+  Marked stable on mips.
+
+*mutt-1.5.11-r1 (26 Nov 2005)
+
+  26 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/mutt-1.5.11-fix-smime.patch, +mutt-1.5.11-r1.ebuild:
+  Fix smime sign handling wrt bug #113593
+
+  25 Nov 2005; Fabian Groffen <grobian@gentoo.org> mutt-1.5.11.ebuild:
+  Marked ppc-macos (bug #112609)
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> mutt-1.5.11.ebuild:
+  Stable on ppc64; bug #112609
+
+  18 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> mutt-1.5.11.ebuild:
+  Stable on hppa, ppc.
+
+  15 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> mutt-1.5.11.ebuild:
+  Stable on sparc wrt #112609
+
+  15 Nov 2005; Aron Griffis <agriffis@gentoo.org> mutt-1.5.11.ebuild:
+  Mark 1.5.11 stable on alpha/amd64/ia64/x86
+
+  29 Sep 2005; Fabian Groffen <grobian@gentoo.org> mutt-1.5.11.ebuild:
+  Rekeywording for ~ppc-macos (bug #106498)
+
+  19 Sep 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/mutt-1.5.11-sasl.patch, mutt-1.5.11.ebuild:
+  fix sasl wrt bug #106545
+
+*mutt-1.5.11 (19 Sep 2005)
+
+  19 Sep 2005; Fernando J. Pereda <ferdy@gentoo.org> metadata.xml,
+  +mutt-1.5.11.ebuild:
+  version bump. dropped ppc-macos keyword wrt bug #106498. adding myself to
+  metadata
+
+*mutt-1.5.10-r1 (17 Aug 2005)
+
+  17 Aug 2005; Aron Griffis <agriffis@gentoo.org> -mutt-1.5.10.ebuild,
+  +mutt-1.5.10-r1.ebuild:
+  Bump to 1.5.10-r1 to push out slang change.  Add collapse_flagged patch #71351
+
+  17 Aug 2005; Aron Griffis <agriffis@gentoo.org> mutt-1.5.10.ebuild:
+  Stop honoring USE=slang #96603 #102558 #57416
+
+*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.
+  This is fixed in 1.5.10, so whenever that lands in portage, we can re-enable
+  it #95139
+
+  15 Aug 2005; Aron Griffis <agriffis@gentoo.org> mutt-1.5.9.ebuild:
+  Explicitly disable sasl-1 as we do in the muttng ebuild
+
+  11 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  +files/mutt-1.5.9-sasl.patch, mutt-1.5.9.ebuild:
+  Fix configure.in to work correctly when --without-sasl is specified
+
+  11 Aug 2005; Aron Griffis <agriffis@gentoo.org> mutt-1.5.9.ebuild:
+  Disable sasl unless pop or imap is specified; it's the same as ssl or gnutls
+  in that regard
+
+  11 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  +files/mutt-1.5.9-nodoc.patch, -files/muttng-20050809-nodoc.patch,
+  mutt-1.5.9.ebuild:
+  Fix the nodoc patch to apply to mutt. The muttng patch didn't apply
+  correctly. Use --with-mailpath instead of --with-maildir #100831
+
+  11 Aug 2005; Aron Griffis <agriffis@gentoo.org> mutt-1.4.2.1.ebuild,
+  mutt-1.5.8-r1.ebuild, mutt-1.5.8-r2.ebuild, mutt-1.5.9.ebuild:
+  Move imap warning to pkg_setup. Mention quick start guide in pkg_postinst
+  #77315
+
+*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.
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> mutt-1.5.8-r2.ebuild:
+  Stable on ppc64
+
+  27 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> mutt-1.5.8-r2.ebuild:
+  Stable on sparc
+
+  27 May 2005; Rene Nussbaumer <killerfox@gentoo.org> mutt-1.5.8-r2.ebuild:
+  Stable on hppa
+
+  27 May 2005; Joseph Jezak <josejx@gentoo.org> mutt-1.5.8-r2.ebuild:
+  Marked ppc stable.
+
+  26 May 2005; Aron Griffis <agriffis@gentoo.org> mutt-1.5.8-r2.ebuild:
+  stable on alpha amd64 ia64 x86
+
+  29 Apr 2005; Lina Pezzella <j4rg0n@gentoo.org> mutt-1.5.8-r1.ebuild:
+  Stable ppc-macos
+
+  28 Apr 2005; Aron Griffis <agriffis@gentoo.org> mutt-1.5.6-r2.ebuild,
+  mutt-1.5.6-r3.ebuild:
+  Fix digest problem for patch that was updated locally but got mixed up on
+  the mirrors #90767
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> mutt-1.5.8-r1.ebuild:
+  Stable on ppc64
+
+  01 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> mutt-1.5.8-r1.ebuild:
+  Stable on hppa.
+
+  26 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> mutt-1.5.8-r1.ebuild:
+  Stable on ppc.
+
+  25 Mar 2005; Aron Griffis <agriffis@gentoo.org> mutt-1.5.8-r2.ebuild:
+  Update nntp patch to apply with assumed_charset. Thanks to Saleem A.
+  (compnerd) in bug 85715 for updating the patch
+
+  24 Mar 2005; Aron Griffis <agriffis@gentoo.org> mutt-1.5.8-r2.ebuild:
+  Don't use emake for installation... duh #85790
+
+  23 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> mutt-1.5.8-r1.ebuild:
+  Stable on sparc
+
+  17 Mar 2005; Tom Martin <slarti@gentoo.org> mutt-1.5.8-r1.ebuild:
+  Stable on amd64.
+
+*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.
+
+  28 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> mutt-1.5.6-r5.ebuild:
+  Stable on sparc
+
+  25 Feb 2005; Aron Griffis <agriffis@gentoo.org> mutt-1.5.6-r4.ebuild,
+  mutt-1.5.6-r5.ebuild:
+  Fix the nntp patch to apply to both -r4 and -r5. Bump the nntp patch to -r3
+  since it has been updated. #83151
+
+  21 Feb 2005; Aron Griffis <agriffis@gentoo.org> mutt-1.5.6-r5.ebuild:
+  Mark 1.5.6-r5 stable on alpha, amd64, ia64 and x86
+
+  20 Feb 2005; Aron Griffis <agriffis@gentoo.org> mutt-1.5.8-r1.ebuild:
+  Enable compressed folder support via --enable-compressed
+
+*mutt-1.5.8-r1 (18 Feb 2005)
+
+  18 Feb 2005; Aron Griffis <agriffis@gentoo.org> +mutt-1.5.8-r1.ebuild:
+  Enable mixmaster support #80717
+
+*mutt-1.5.8 (15 Feb 2005)
+
+  15 Feb 2005; Aron Griffis <agriffis@gentoo.org> +mutt-1.5.8.ebuild:
+  Bump to 1.5.8 and update all patches to apply
+
+  06 Feb 2005; Joshua Kinard <kumba@gentoo.org> mutt-1.5.6-r4.ebuild:
+  Marked stable on mips.
+
+  05 Feb 2005; Michael Hanselmann <hansmi@gentoo.org> mutt-1.5.6-r4.ebuild:
+  Stable on ppc.
+
+  11 Jan 2005; Guy Martin <gmsoft@gentoo.org> mutt-1.5.6-r4.ebuild:
+  Stable on hppa.
+
+  01 Jan 2005; Markus Rothe <corsair@gentoo.org> mutt-1.5.6-r5.ebuild:
+  Stable on ppc64
+
+*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
+
+  11 Nov 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.5.6-r4.ebuild:
+  stable on x86 alpha ia64 amd64
+
+*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.
+
+  31 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> mutt-1.5.6-r3.ebuild:
+  Stable on sparc
+
+  23 Aug 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.5.6-r3.ebuild:
+  stable on alpha, amd64, ia64 and x86
+
+  18 Aug 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.5.6-r2.ebuild, 
+  +mutt-1.5.6-r3.ebuild:
+  Mark 1.5.6-r2 stable on alpha, ia64, x86. Bump to -r3 to pick up new
+  header_cache patch #60435. This should be marked stable after a couple days.
+
+  17 Aug 2004; Aron Griffis <agriffis@gentoo.org> files/Muttrc:
+  There doesn't seem to be any reason to `unset mbox' in Muttrc, and it causes
+  problems, so don't do it #60507
+
+  17 Aug 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.5.6-r2.ebuild:
+  Modify nntp patch to co-exist with pgp_timeout patch by eliminating context
+  for PATCHES file #59129
+
+  17 Aug 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.4.2.1.ebuild,
+  mutt-1.5.6-r2.ebuild, mutt-1.5.6.ebuild:
+  Move some items to RDEPEND #60134
+
+  29 Jul 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.5.6-r2.ebuild:
+  Fix bug 54177: Increase range of pgp_timeout setting with patch from
+  http://www.woolridge.ca/mutt/
+
+  23 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> mutt-1.5.6-r2.ebuild:
+  Added to macos, closing bug #57947
+
+  12 Jul 2004; Tuan Van <langthang@gentoo.org> mutt-1.5.6-r2.ebuild,
+  mutt-1.5.6.ebuild:
+  moved IUSE below "inherit" line. Consolidate two lines of inherit into one.
+
+  12 Jul 2004; Tuan Van <langthang@gentoo.org> mutt-1.5.6-r2.ebuild,
+  mutt-1.5.6.ebuild:
+  added cjk to IUSE.
+
+  30 Jun 2004; Tom Gall <tgall@gentoo.org> mutt-1.5.6-r2.ebuild:
+  stable on ppc64 #55664
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.5.6-r2.ebuild:
+  add ~ppc64 #55664
+
+  08 Jun 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.5.6-r2.ebuild:
+  Fix bug 52251 (mutt-1.5.6-r2 does not compile with autoconf-2.59-r4) with
+  patch from Lars T. Mikkelsen
+
+  05 Jun 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.4.2.1.ebuild:
+  Fix use invocation
+
+*mutt-1.5.6 (29 May 2004)
+
+  29 May 2004; Seemant Kulleen <seemant@gentoo.org> +metadata.xml,
+  +files/8patch-1.5.6.dyc.source_stat, +files/Muttrc, +files/Muttrc.mbox,
+  +files/slang.patch, +mutt-1.4.2.1.ebuild, +mutt-1.5.6-r2.ebuild,
+  +mutt-1.5.6.ebuild:
+  Moved from net-mail/mutt to mail-client/mutt.
+
+  26 May 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.5.6-r2.ebuild:
+  Fix bug 52008 (again): Require gdbm instead of bothering with Berkeley DB,
+  which seems to be a maze of twisty passages
+
+  26 May 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.5.6-r2.ebuild:
+  Update patch-1.5.6.vvv.nntp-gentoo-r1.bz2 to coincide with
+  mutt-cvs-maildir-header-cache.16
+
+*mutt-1.5.6-r2 (25 May 2004)
+
+  25 May 2004; Aron Griffis <agriffis@gentoo.org> -mutt-1.5.4-r1.ebuild,
+  -mutt-1.5.4.ebuild, -mutt-1.5.5.1.ebuild, -mutt-1.5.6-r1.ebuild,
+  +mutt-1.5.6-r2.ebuild:
+  Fix bug 52008 by bumping mutt-cvs-maildir-header-cache from .15 to .16 --
+  thanks to khai for debugging
+
+  24 May 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.5.6-r1.ebuild,
+  mutt-1.5.6.ebuild:
+  Change doins to newins for Muttrc.mbox
+
+  24 May 2004; Aron Griffis <agriffis@gentoo.org> -files/Muttrc.color,
+  +files/Muttrc.mbox, mutt-1.5.6-r1.ebuild, mutt-1.5.6.ebuild:
+  Fix bug 47121 (mutt installs strange Muttrc when USE=mbox) by installing
+  files/Muttrc.mbox in that case
+
+*mutt-1.5.6-r1 (24 May 2004)
+
+  24 May 2004; Aron Griffis <agriffis@gentoo.org> +mutt-1.5.6-r1.ebuild:
+  Add maildir header caching patch from
+  http://wwwcip.informatik.uni-erlangen.de/~sithglan/mutt/ for bug 46842
+
+  14 May 2004; Lars Weiler <pylon@gentoo.org> mutt-1.5.6.ebuild:
+  Stable on ppc
+
+  07 May 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.5.6.ebuild:
+  Add mailbase to DEPEND for bug 45513
+
+  27 Mar 2004; Guy Martin <gmsoft@gentoo.org> mutt-1.5.6.ebuild:
+  Marked stable on hppa.
+
+  26 Mar 2004; <tuxus@gentoo.org> mutt-1.5.6.ebuild:
+  Added mips to KEYWORDS.
+
+  09 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> mutt-1.5.6.ebuild:
+  Bumping amd64 to stable. Closing #43469.
+
+  27 Feb 2004; Sven Blumenstein <bazik@gentoo.org> mutt-1.5.6.ebuild:
+  Stable on sparc.
+
+  26 Feb 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.5.6.ebuild:
+  stable on x86, alpha and ia64
+
+  26 Feb 2004; Guy Martin <gmsoft@gentoo.org> mutt-1.5.5.1.ebuild:
+  Marked stable on hppa.
+
+  25 Feb 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.5.6.ebuild,
+  files/8patch-1.5.6.dyc.source_stat:
+  Fix bug #42738 with patch submitted by José Romildo Malaquias
+
+  25 Feb 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.5.6.ebuild:
+  Always apply slang fix, even when USE=vanilla
+
+*mutt-1.4.2.1 (17 Feb 2004)
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.4.2.1.ebuild,
+  mutt-1.5.5.1.ebuild, mutt-1.5.6.ebuild:
+  Add 1.4.2.1 since 1.5.x is officially the devel series
+
+  13 Feb 2004; Lars Weiler <pylon@gentoo.org> mutt-1.5.6.ebuild,
+  files/slang.patch:
+  Fast and dirty patch for those who use mutt with USE="slang".  See bug
+  #41312.  There should be an upstream patch soon.
+
+  11 Feb 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.4.1-r1.ebuild,
+  mutt-1.4.1.ebuild:
+  remove insecurity-afflicted versions
+
+  11 Feb 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.5.4-r1.ebuild,
+  mutt-1.5.5.1.ebuild, mutt-1.5.6.ebuild:
+  use WANT_AUTOCONF, not WANT_AUTOMAKE (bug 33919)
+
+  11 Feb 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.5.4-r1.ebuild,
+  mutt-1.5.4.ebuild, mutt-1.5.5.1.ebuild:
+  change edit_threads URL, thanks to Tom Knight-Markiegi in bug 38320
+
+*mutt-1.5.6 (11 Feb 2004)
+
+  11 Feb 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.5.6.ebuild:
+  version bump to 1.5.6
+
+  22 Feb 2004; Greg Fitzgerald <gregf@gentoo.org> mutt-1.5.5.1.ebuild:
+  Bumped stable version to 1.5.5.1 this should fix some problems with
+  WANT_AUTOCONF in version 1.4.1-r1
+
+  18 Jan 2004; <tuxus@gentoo.org> mutt-1.4.1-r1.ebuild:
+  Added ~mips to KEYWORDS.
+
+  15 Jan 2004; Jon Portnoy <avenj@gentoo.org> mutt-1.5.4-r1.ebuild,
+  mutt-1.5.5.1.ebuild :
+  AMD64 keywords.
+
+*mutt-1.5.5.1 (19 Nov 2003)
+
+  19 Nov 2003; Greg Fitzgerald <gregf@gentoo.org> mutt-1.5.5.1.ebuild:
+  Version bump.
+
+  02 Oct 2003; Brad House <brad_mssw@gentoo.org> mutt-1.5.4.ebuild:
+  add ~amd64 flag
+
+  02 Oct 2003; Brad House <brad_mssw@gentoo.org> mutt-1.5.4.ebuild:
+  add ~amd64 flag
+
+  17 Sep 2003; Hallgrimur H. Gunnarsson <hhg@gentoo.org> mutt-1.5.4-r1.ebuild:
+  Don't gzip manual. Added maildir to IUSE. See bug #28186
+
+  09 Sep 2003; Aron Griffis <agriffis@gentoo.org> mutt-1.5.4-r1.ebuild:
+  Mark stable on alpha
+
+  15 Jul 2003; Christian Birchinger <joker@gentoo.org> mutt-1.5.4-r1.ebuild:
+  Added sparc stable keyword
+
+  07 Jul 2003; Peter Johanson <latexer@gentoo.org> mutt-1.5.4-r1.ebuild:
+  unset WANT_AUTOMAKE_2_5 to fix compilation. bug #22787
+
+*mutt-1.5.4-r1 (29 May 2003)
+
+  05 Aug 2003; Guy Martin <gmsoft@gentoo.org> mutt-1.5.4-r1.ebuild :
+  Marked stable on hppa.
+
+  29 May 2003; Stanislav Brabec <utx@gentoo.org> mutt-1.4.1-r1.ebuild,
+  mutt-1.5.4-r1.ebuild: Fixed mbox build (from mutt-1.4-r3). Added message
+  about transparent background.
+
+  26 Mar 2003; Peter Johanson <latexer@gentoo.org> :
+  Changed 'use_enable ssl' to 'use_with ssl'. bug #18253
+
+*mutt-1.5.4 (25 Mar 2003)
+
+  31 Mar 2003; Aron Griffis <agriffis@gentoo.org> mutt-1.4.1.ebuild,
+  mutt-1.5.4.ebuild:
+  Fix bug 18427 on alpha by restricting optimization to -O2. This seems to be
+  the same as bug 11170 on ppc.
+
+  29 Mar 2003; Aron Griffis <agriffis@gentoo.org> mutt-1.5.4.ebuild:
+  Disable on alpha until we debug it. At the moment it just segfaults when
+  sorting the inbox.  See bug #18427
+
+  29 Mar 2003; Masatomo Nakano <nakano@gentoo.org> mutt-1.5.4.ebuild:
+  fixed bug. #18317
+
+  25 Mar 2003; Peter Johanson <latexer@gentoo.org> mutt-1.5.4.ebuild:
+  Version bump. thanks to knghtbrd for the ebuild
+
+  14 Feb 2003; Guy Martin <gmsoft@gentoo.org> mutt-1.4-r3.ebuild :
+  Added hppa to keywords.
+
+*mutt-1.4.1-r1 (29 May 2003)
+ 
+  13 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*mutt-1.4.1 (22 Mar 2003)
+
+  29 Mar 2003; Masatomo Nakano <nakano@gentoo.org> mutt-1.4.1.ebuild:
+  fixed bug. #18317
+
+  22 Mar 2003; Lars Weiler <pylon@gentoo.org> mutt-1.4.1.ebuild:
+  version bump
+  
+  closes security bug 17857
+  
+  adds a feature for thread editing (bug 12165)
+  change on ppc -O3 to -O2 so that it won't segfault on config-files with
+  lines larger than 255 characters (closes bug 11170)
+
+*mutt-1.4-r3 (03 Sept 2002)
+
+  27 Feb 2003; Aron Griffis <agriffis@gentoo.org> mutt-1.4-r3.ebuild:
+  Mark stable on alpha
+
+  14 Feb 2003; Jungmin Seo <seo@gentoo.org> mutt-1.4-r3.ebuild :
+  added pkg_setup. Now it needs WANT_JA variable to use the
+  japanese patch.  This is to avoid the patch for korean or
+  chinese.
+
+  28 Jan 2003; Martin Holzer <mholzer@gentoo.org> mutt-1.4-r3.ebuild :
+  Added mbox support. Closes #13234.
+
+  14 Dec 2002; Aron Griffis <agriffis@gentoo.org> mutt-1.4-r3.ebuild :
+
+  Added ~alpha to KEYWORDS
+
+  07 Dec 2002; Jack Morgan <jmorgan@gentoo.org> mutt-1.4-r2.ebuild, mutt-1.4-r3.ebuild :
+  Changed sparc64 to sparc keyword
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+  16 Nov 2002; Calum Selkirk <cselkirk@gentoo.org> mutt-1.4-r3.ebuild :
+
+  Changed the ebuild not to install an /etc/Muttrc if USE="mbox" is defined.
+  "mbox" is the default behavior with mutt.
+
+  22 Oct 2002; Seemant Kulleen <seemant@gentoo.org> mutt-1.4-r3.ebuild :
+
+  SRC_URI fix by: jeffthorsett@hotmail.com (Jeff Thorsett) in bug #9503.
+
+  03 Sept 2002; Calum Selkirk <cselkirk@gentoo.org> mutt-1.4-r3.ebuild 
+  files/digest-mutt-1.4-r3 :
+
+  Added the compressed folder patch. This closes bug #7398
+
+*mutt-1.4-r2 (28 Jul 2002) 
+
+  28 Jul 2002; Calum Selkirk <cselkirk@gentoo.org> mutt-1.4-r2.ebuild :
+
+  Tested the jp.patch on ppc
+  Added ppc to keywords.
+
+  28 Jul 2002; Stuart Bouyer <stubear@gentoo.org> mutt-1.4-r2.ebuild :
+
+  Added patch for Japanese support (submitted by Cong 
+  <vo.chi.cong-linux@is.titech.ac.jp> ). 
+  Removed PPC from KEYWORDS, cause I can't test that the patch works on PPC.
+
+*mutt-1.4-r1 (27 Jul 2002)
+
+  28 Jul 2002; Calum Selkirk <cselkirk@gentoo.org> mutt-1.4-r1.ebuild,
+  mutt-1.3.28.ebuild, mutt-1.4.ebuild :
+
+  Added PPC to KEYWORDS
+  Seemant: the compressed folder patch author is Roland Rosenfeld
+  <roland@spinnaker.de>.
+
+  27 Jul 2002; Seemant Kulleen <seemant@gentoo.org> mutt-1.4-r1.ebuild :
+
+  Enabled support for compressed folders.  Submitted by Lim Swee Tat
+  <st_lim@eXtropia.com> in an email to me.
+
+*mutt-1.4 (29 May 2002)
+
+  29 Apr 2002; Ryan Phillips <rphillips@gentoo.org> mutt-1.4.ebuild :
+
+  new version
+  
+*mutt-1.3.28-r1 (25 Apr 2002)
+
+  25 Apr 2002; Ryan Phillips <rphillips@gentoo.org> mutt-1.3.28-r1.ebuild :
+
+  Mutt couldn't fcntl() the ~/Mail directory on a NFS volume.  Changed
+  ebuild to enable flock() support per bug #2005.
+
+*mutt-1.3.28 (21 Mar 2002)
+
+  21 Mar 2002; Seemant Kulleen <seemant@gentoo.org> mutt-1.3.28.ebuild :
+
+  Version upgrade to release candidate version.  Copied over the .25 ebuild.
+
+*mutt-1.3.25 (21 Mar 2002)
+
+  21 Mar 2002; Seemant Kulleen <seemant@gentoo.org> mutt-1.3.25.ebuild :
+
+  HTML documentation need not be gzipped.
+
+*mutt-1.3.25 (1 Feb 2002)
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way. This changelog is targetted to users. This means that the
+  comments should well explained and written in clean English. The details about
+  writing correct changelogs are explained in the skel.ChangeLog file which you
+  can find in the root directory of the portage repository.
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
new file mode 100644
index 0000000..4c7f312
--- /dev/null
+++ b/mail-client/mutt/Manifest
@@ -0,0 +1,10 @@
+AUX Muttrc 667 RMD160 0405e73c6a4122869ce9a9bd408068d316740b71 SHA1 e30c96e6f21a30fe576abcb3be65a34accf4e11f SHA256 932940db69c951caaa87a17ee98a8e2262aeadf1e978f6d671b642184c5d545f
+AUX Muttrc.mbox 486 RMD160 0f692c9d3a7591f3a0611529616aa94a5c62a641 SHA1 9e231303fe9fb2fe80542115ceefb972c7b11d5a SHA256 10b251f88ccc5d4c95c96ab17b6ab6a30a16d6590ab896a60037f869fc4d44a0
+AUX mutt-1.5.17-parallel-make.patch 936 RMD160 f6a216d9ff06ae55d9569e05632b60332cf49ebe SHA1 0a9b98b37987ffa10039424bb6f5849a08dbb168 SHA256 3ecc199b83f6fa747d342694d8ffacf0aedd4590e0d9943c9b6004c31cbdb931
+AUX slang.patch 493 RMD160 16dcedee86fe91ecac48ec5be8a6f67798ef7ac0 SHA1 f913e8c717f76186b0edc8856bf02a167d540c70 SHA256 040c8b63b2d805dae800fa9b1826d158b7104641339cee9a404985616b3502c7
+DIST mutt-1.5.17-gentoo-patches-r1.tar.bz2 57823 RMD160 3608a91545dc070ddeda3ae22a67f1225c29be22 SHA1 377c4c6c2b7124b2f905e496b5c480cdc53921c6 SHA256 8717d9320e638464bb6e7b677127ddbb16bef0dc704e668eebc19b5168e52539
+DIST mutt-1.5.17.tar.gz 3572651 RMD160 e5c84a27ad25730afe64879e91bed89a021e0580 SHA1 6b51745fc4baf463adde53e91efb2a6c7eec8492 SHA256 17865b1a10e23ccf8757c05657c7d7f7055457f0a04eeacd9ee560eeb6defa81
+DIST patch-1.5.17.sidebar.20071102.txt 50439 RMD160 a1542286bc6a3833c358d2ac20c7f7819b5d7988 SHA1 65f95206d53c427ea743173058344e4dcfc34e25 SHA256 1d8dda9fed1e1592ff9004e2c776c2f4a84e4e75ca872542e8e07113516fc27b
+EBUILD mutt-1.5.17.ebuild 4864 RMD160 2415c33b86edb9d00587179a879abfb5a0a033e3 SHA1 9e9d7f2d4c4ffb7f1df02c21bea9f0216e2e17cd SHA256 09889a0a188a8d588e6c697e88195e6a6eb3ab2c7b4636fa0f903651d23fd036
+MISC ChangeLog 27479 RMD160 24bb07c2595a086165a1d109817f8c93c329b5c1 SHA1 f2c0da2d912b03844401ed85b2aa4f68827833f8 SHA256 0e3ca04e6170888f551983c374ad6ce74d2dd082dfa197ae7d798e764a7667ca
+MISC metadata.xml 259 RMD160 ce66370016fba0ddf047802d9dc8463041b4a585 SHA1 9f7a04d0cab1654d39498db3f124fc755202adb7 SHA256 d0e8725b6ece5de6014dd4b18064854b993b1e3ab04d838370d7744756656ae5
diff --git a/mail-client/mutt/files/Muttrc b/mail-client/mutt/files/Muttrc
new file mode 100644
index 0000000..6f0d63e
--- /dev/null
+++ b/mail-client/mutt/files/Muttrc
@@ -0,0 +1,19 @@
+# Some minimal Mutt settings, Gentoo-style.  These reflect the Gentoo
+# predilection for maildir folders.
+#
+# Please don't add settings to this file to change other user
+# preferences (such as colors), since those can be hard for a user to
+# undo if their preference doesn't match yours!  For example, it is
+# *impossible* currently in mutt to remove color settings from objects
+# other than the index.
+
+set mbox_type=Maildir
+set folder=~/.maildir
+set spoolfile=~/.maildir/
+set record=~/.maildir-sent/
+set move=no
+
+# Maybe we shouldn't set index_format here, but this is a recommended
+# one for maildir-style folders.
+
+set index_format="%4C %Z %{%b %d} %-16.16L  %s"
diff --git a/mail-client/mutt/files/Muttrc.mbox b/mail-client/mutt/files/Muttrc.mbox
new file mode 100644
index 0000000..1382a37
--- /dev/null
+++ b/mail-client/mutt/files/Muttrc.mbox
@@ -0,0 +1,9 @@
+# Some minimal Mutt settings, Gentoo-style.  Since mutt was installed
+# with USE=mbox, this file doesn't have any changes from the default
+# mutt settings, making it very minimal indeed...
+#
+# Please don't add settings to this file to change other user
+# preferences (such as colors), since those can be hard for a user to
+# undo if their preference doesn't match yours!  For example, it is
+# *impossible* currently in mutt to remove color settings from objects
+# other than the index.
diff --git a/mail-client/mutt/files/mutt-1.5.17-parallel-make.patch b/mail-client/mutt/files/mutt-1.5.17-parallel-make.patch
new file mode 100644
index 0000000..9fb39c8
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.17-parallel-make.patch
@@ -0,0 +1,34 @@
+diff --git a/Makefile.am b/Makefile.am
+index 1f36629..20d205e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,14 +2,16 @@
+ ## Use aclocal -I m4; automake --foreign
+ 
+ AUTOMAKE_OPTIONS = 1.6 foreign
+-EXTRA_PROGRAMS = mutt_dotlock pgpring pgpewrap makedoc
++EXTRA_PROGRAMS = mutt_dotlock pgpring pgpewrap
++
++noinst_PROGRAMS = makedoc
+ 
+ if BUILD_IMAP
+ IMAP_SUBDIR = imap
+ IMAP_INCLUDES = -I$(top_srcdir)/imap
+ endif
+ 
+-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
++SUBDIRS = m4 po intl $(IMAP_SUBDIR) . doc contrib
+ 
+ bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
+ 
+@@ -37,10 +39,6 @@ mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
+ mutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAPDEPS) \
+ 	$(INTLDEPS)
+ 
+-makedoc_SOURCES = makedoc.c
+-makedoc_LDADD =
+-makedoc_DEPENDENCIES = 
+-
+ # $(makedoc_OBJECTS): $(makedoc_SOURCES)
+ # 	$(HOST_CC) $(DEFS) $(AM_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -c $<
+ 
diff --git a/mail-client/mutt/files/slang.patch b/mail-client/mutt/files/slang.patch
new file mode 100644
index 0000000..f3740bd
--- /dev/null
+++ b/mail-client/mutt/files/slang.patch
@@ -0,0 +1,19 @@
+diff -Naurbd mutt-1.5.6~orig/menu.c mutt-1.5.6/menu.c
+--- mutt-1.5.6~orig/menu.c	2004-02-12 01:00:30.537293896 +0000
++++ mutt-1.5.6/menu.c	2004-02-12 01:00:35.748501672 +0000
+@@ -45,6 +45,7 @@
+   {
+     if (*s < M_TREE_MAX)
+     {
++#ifndef USE_SLANG_CURSES
+       if (do_color)
+       {
+ 	pair_content(PAIR_NUMBER(ColorDefs[MT_COLOR_TREE]), &f1, &b1);
+@@ -52,6 +53,7 @@
+ 	if (b1 == b2)
+ 	  SETCOLOR (MT_COLOR_TREE);
+       }
++#endif
+       while (*s && *s < M_TREE_MAX)
+       {
+ 	switch (*s)
diff --git a/mail-client/mutt/metadata.xml b/mail-client/mutt/metadata.xml
new file mode 100644
index 0000000..f13b107
--- /dev/null
+++ b/mail-client/mutt/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<maintainer>
+		<email>ferdy@gentoo.org</email>
+		<name>Fernando J. Pereda</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/mail-client/mutt/mutt-1.5.17.ebuild b/mail-client/mutt/mutt-1.5.17.ebuild
new file mode 100644
index 0000000..7f959ed
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.17.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.16.ebuild,v 1.12 2008/03/09 21:36:14 ricmm Exp $
+
+inherit eutils flag-o-matic autotools
+
+PATCHSET_REV="-r1"
+
+SIDEBAR_PATCH_N="patch-1.5.17.sidebar.20071102.txt"
+
+DESCRIPTION="a small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org"
+SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
+	!vanilla? (
+		!sidebar? (
+			mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
+		)
+	)
+	sidebar? (
+		http://www.lunar-linux.org/~tchan/mutt/${SIDEBAR_PATCH_N}
+	)"
+IUSE="berkdb crypt debug gdbm gnutls gpgme idn imap mbox nls nntp pop qdbm sasl
+sidebar smime smtp ssl vanilla"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+RDEPEND=">=sys-libs/ncurses-5.2
+	qdbm?    ( dev-db/qdbm )
+	!qdbm?   (
+		gdbm?  ( sys-libs/gdbm )
+		!gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
+	)
+	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 )
+	)
+	smtp?     (
+		gnutls?  ( >=net-libs/gnutls-1.0.17 )
+		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+		sasl?    ( >=dev-libs/cyrus-sasl-2 )
+	)
+	idn?     ( net-dns/libidn )
+	gpgme?   ( >=app-crypt/gpgme-0.9.0 )
+	smime?   ( >=dev-libs/openssl-0.9.6 )
+	app-misc/mime-types"
+DEPEND="${RDEPEND}
+	net-mail/mailbase
+	!vanilla? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| ( www-client/lynx www-client/w3m www-client/elinks )
+	)"
+
+PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
+
+src_unpack() {
+	unpack ${A//${SIDEBAR_PATCH_N}} && cd "${S}" || die "unpack failed"
+
+	if ! use vanilla && ! use sidebar ; then
+		use nntp || rm "${PATCHDIR}"/06-nntp.patch
+		for p in "${PATCHDIR}"/*.patch ; do
+			epatch "${p}"
+		done
+	fi
+
+	if use sidebar ; then
+		use vanilla || \
+			ewarn "The sidebar patch is only applied to a vanilla mutt tree."
+		epatch "${DISTDIR}"/${SIDEBAR_PATCH_N}
+	fi
+
+	epatch "${FILESDIR}"/${P}-parallel-make.patch
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	declare myconf="
+		$(use_enable nls) \
+		$(use_enable gpgme) \
+		$(use_enable imap) \
+		$(use_enable pop) \
+		$(use_enable smtp) \
+		$(use_enable crypt pgp) \
+		$(use_enable smime) \
+		$(use_enable debug) \
+		$(use_with idn) \
+		--with-curses \
+		--sysconfdir=/etc/${PN} \
+		--with-docdir=/usr/share/doc/${PN}-${PVR} \
+		--with-regex \
+		--disable-fcntl --enable-flock \
+		--enable-nfs-fix --enable-external-dotlock \
+		--with-mixmaster"
+
+	# 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 qdbm; then
+		myconf="${myconf} --enable-hcache \
+		--with-qdbm --without-gdbm --without-bdb"
+	elif use gdbm ; then
+		myconf="${myconf} --enable-hcache \
+			--without-qdbm --with-gdbm --without-bdb"
+	elif use berkdb; then
+		myconf="${myconf} --enable-hcache \
+			--without-gdbm --without-qdbm --with-bdb"
+	else
+		myconf="${myconf} --disable-hcache \
+			--without-qdbm --without-gdbm --without-bdb"
+	fi
+
+	# there's no need for gnutls, ssl or sasl without socket support
+	if use pop || use imap || use smtp ; 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)"
+	else
+		myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
+	fi
+
+	# See Bug #11170
+	case ${ARCH} in
+		alpha|ppc) replace-flags "-O[3-9]" "-O2" ;;
+	esac
+
+	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"
+	emake || 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
+
+	# A newer file is provided by app-misc/mime-types. So we link it.
+	rm "${D}"/etc/${PN}/mime.types
+	dosym /etc/mime.types /etc/${PN}/mime.types
+
+	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
+}
+
+pkg_postinst() {
+	echo
+	elog "If you are new to mutt you may want to take a look at"
+	elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
+	elog "   http://www.gentoo.org/doc/en/guide-to-mutt.xml"
+	echo
+}