Moved from net-mail/mutt to mail-client/mutt.

13 files changed, 851 insertions, 0 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
new file mode 100644
index 000000000000..ca21d5a43187
--- /dev/null
+++ b/mail-client/mutt/ChangeLog
@@ -0,0 +1,284 @@
+# ChangeLog for net-mail/mutt
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.1 2004/05/30 02:51:41 seemant Exp $
+
+*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 000000000000..3f7f12ceb6e9
--- /dev/null
+++ b/mail-client/mutt/Manifest
@@ -0,0 +1,12 @@
+MD5 fb7471e44cba561c7616ffcf9198e9e9 mutt-1.5.6-r2.ebuild 4525
+MD5 e170aef6acb390b5badf3867a6f82f08 mutt-1.4.2.1.ebuild 3376
+MD5 106c594080a2ea37facfa02e23ad2601 mutt-1.5.6.ebuild 4229
+MD5 631509cc76a87d6cb0e9936605966b77 ChangeLog 9543
+MD5 f46d05fe0172cb035a01f40d25242d30 metadata.xml 253
+MD5 b2b515e96b060771a00646405c620755 files/Muttrc 678
+MD5 6cba9546cde7ee8a8e67b44d27b62366 files/digest-mutt-1.5.6 367
+MD5 30ce590d0284ffb0896857714c6a47d4 files/Muttrc.mbox 486
+MD5 7c84826c8250c278a094d039bb91c6b1 files/digest-mutt-1.5.6-r2 446
+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
diff --git a/mail-client/mutt/files/8patch-1.5.6.dyc.source_stat b/mail-client/mutt/files/8patch-1.5.6.dyc.source_stat
new file mode 100644
index 000000000000..da380763263c
--- /dev/null
+++ b/mail-client/mutt/files/8patch-1.5.6.dyc.source_stat
@@ -0,0 +1,61 @@
+? mutt/build
+? mutt/stamp-h1
+Index: mutt/init.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/init.c,v
+retrieving revision 3.19
+diff -u -r3.19 init.c
+--- mutt/init.c	1 Feb 2004 18:00:16 -0000	3.19
++++ mutt/init.c	6 Feb 2004 20:29:08 -0000
+@@ -1368,18 +1368,6 @@
+   char *linebuf = NULL;
+   size_t buflen;
+   pid_t pid;
+-  struct stat s;
+-
+-  if (stat (rcfile, &s) < 0)
+-  {
+-    snprintf (err->data, err->dsize, _("%s: stat: %s"), rcfile, strerror (errno));
+-    return (-1);
+-  }
+-  if (!S_ISREG (s.st_mode))
+-  {
+-    snprintf (err->data, err->dsize, _("%s: not a regular file"), rcfile);
+-    return (-1);
+-  }
+ 
+   if ((f = mutt_open_read (rcfile, &pid)) == NULL)
+   {
+Index: mutt/muttlib.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/muttlib.c,v
+retrieving revision 3.18
+diff -u -r3.18 muttlib.c
+--- mutt/muttlib.c	1 Feb 2004 17:10:43 -0000	3.18
++++ mutt/muttlib.c	6 Feb 2004 20:29:09 -0000
+@@ -1134,6 +1134,8 @@
+ FILE *mutt_open_read (const char *path, pid_t *thepid)
+ {
+   FILE *f;
++  struct stat s;
++
+   int len = mutt_strlen (path);
+ 
+   if (path[len - 1] == '|')
+@@ -1149,6 +1151,16 @@
+   }
+   else
+   {
++    if (stat (path, &s) < 0)
++    {
++      mutt_error (_("%s: stat: %s"), path, strerror (errno));
++      return (NULL);
++    }
++    if (!S_ISREG (s.st_mode))
++    {
++      mutt_error (_("%s: not a regular file"), path);
++      return (NULL);
++    }
+     f = fopen (path, "r");
+     *thepid = -1;
+   }
diff --git a/mail-client/mutt/files/Muttrc b/mail-client/mutt/files/Muttrc
new file mode 100644
index 000000000000..b751753210f2
--- /dev/null
+++ b/mail-client/mutt/files/Muttrc
@@ -0,0 +1,20 @@
+# 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/
+unset mbox
+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 000000000000..1382a374ea68
--- /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/digest-mutt-1.4.2.1 b/mail-client/mutt/files/digest-mutt-1.4.2.1
new file mode 100644
index 000000000000..48f9e079c6bd
--- /dev/null
+++ b/mail-client/mutt/files/digest-mutt-1.4.2.1
@@ -0,0 +1,4 @@
+MD5 710bd56d3c4c4bcd1403bc4e053f7476 mutt-1.4.2.1i.tar.gz 2611253
+MD5 47b4dbd95f07d9ec2d8e0939f822b7c3 patch-1.4.2.rr.compressed.1-gentoo.bz2 13939
+MD5 18aec38f77a88995e6941df798ce4cd7 patch-1.4.0.cd.edit_threads.9.5 22168
+MD5 e5e108a990346eacff0b2648e03d098f mutt-1.4.2.1i-ja.1.tar.gz 78266
diff --git a/mail-client/mutt/files/digest-mutt-1.5.6 b/mail-client/mutt/files/digest-mutt-1.5.6
new file mode 100644
index 000000000000..40aa16b70976
--- /dev/null
+++ b/mail-client/mutt/files/digest-mutt-1.5.6
@@ -0,0 +1,5 @@
+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 c3a4b9868bcaa0f8e79caa8429ba43fa patch-1.5.6.vvv.nntp-gentoo.bz2 83489
diff --git a/mail-client/mutt/files/digest-mutt-1.5.6-r2 b/mail-client/mutt/files/digest-mutt-1.5.6-r2
new file mode 100644
index 000000000000..9f44628eedf0
--- /dev/null
+++ b/mail-client/mutt/files/digest-mutt-1.5.6-r2
@@ -0,0 +1,6 @@
+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 fa7dae5a50ecb9e79c20cb3c5f695478 patch-1.5.6.vvv.nntp-gentoo-r1.bz2 83418
+MD5 b901329a115d23ff8e6db8cfd1a0d39e mutt-cvs-maildir-header-cache.16 23431
diff --git a/mail-client/mutt/files/slang.patch b/mail-client/mutt/files/slang.patch
new file mode 100644
index 000000000000..f3740bdc85f6
--- /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 000000000000..27aa1d1dbc79
--- /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>agriffis@gentoo.org</email>
+  <name>Aron Griffis</name>
+</maintainer>
+</pkgmetadata>
diff --git a/mail-client/mutt/mutt-1.4.2.1.ebuild b/mail-client/mutt/mutt-1.4.2.1.ebuild
new file mode 100644
index 000000000000..b09c51a0f7ec
--- /dev/null
+++ b/mail-client/mutt/mutt-1.4.2.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/05/30 02:51:41 seemant Exp $
+
+IUSE="ssl nls slang mbox cjk vanilla"
+
+inherit eutils flag-o-matic
+
+edit_threads_patch="patch-1.4.0.cd.edit_threads.9.5"
+compressed_patch="patch-1.4.2.rr.compressed.1-gentoo.bz2"
+cjk_patch="mutt-${PV}i-ja.1.tar.gz"
+
+DESCRIPTION="a small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org"
+SRC_URI="ftp://ftp.mutt.org/mutt/mutt-${PV}i.tar.gz
+	mirror://gentoo/${compressed_patch}
+	http://cedricduval.free.fr/mutt/patches/download/${edit_threads_patch}
+	cjk? ( http://www.emaillab.org/mutt/1.4/${cjk_patch} )"
+#	http://www.spinnaker.de/mutt/compressed/${compressed_patch}
+
+RDEPEND="nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}
+	>=sys-libs/ncurses-5.2
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	slang? ( >=sys-libs/slang-1.4.2 )
+	>=sys-apps/sed-4"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc alpha hppa ~mips"
+
+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"
+		echo
+	fi
+}
+
+src_unpack() {
+	unpack ${P}i.tar.gz && cd ${S} || die "unpack failed"
+	if ! use vanilla; then
+		epatch ${DISTDIR}/${compressed_patch} || die
+		epatch ${DISTDIR}/${edit_threads_patch} || die
+	fi
+	if use cjk; then
+		cd ${WORKDIR}
+		unpack ${cjk_patch} && cd ${S} || die "unpack cjk failed"
+		epatch ${WORKDIR}/${cjk_patch%.t*}/patch-${PV}.tt.ja.1 || die
+	fi
+}
+
+src_compile() {
+	local myconf="
+		$(use_enable nls) \
+		$(use_with ssl) \
+		$(use_enable imap) \
+		$(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"
+	fi
+	econf ${myconf} || die
+	sed -i 's/README.UPGRADE//' doc/Makefile || die "sed failed"
+	make || die "make failed (myconf=${myconf})"
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	find ${D}/usr/share/doc -type f | grep -v html | xargs gzip
+	if [ "`use mbox`" ]; then
+		echo "Not installing an /etc/Muttrc as mbox is default configuration"
+		echo "with mutt"
+	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"
+}
diff --git a/mail-client/mutt/mutt-1.5.6-r2.ebuild b/mail-client/mutt/mutt-1.5.6-r2.ebuild
new file mode 100644
index 000000000000..14f5786050e0
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.6-r2.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.6-r2.ebuild,v 1.1 2004/05/30 02:51:41 seemant Exp $
+
+IUSE="ssl nls slang crypt imap mbox nntp vanilla"
+
+inherit eutils
+
+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-r1.bz2"
+mbox_hook_patch="patch-${PV}.dw.mbox-hook.1"
+maildir_header_cache_patch="mutt-cvs-maildir-header-cache.16"
+
+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/${maildir_header_cache_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 )"
+DEPEND="${RDEPEND}
+	>=sys-libs/ncurses-5.2
+	>=sys-apps/sed-4
+	net-mail/mailbase
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	slang? ( >=sys-libs/slang-1.4.2 )
+	!vanilla? (
+		sys-libs/gdbm
+		nntp? ( sys-devel/automake sys-devel/autoconf )
+	)"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64 ~amd64 ~mips"
+
+inherit flag-o-matic
+
+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}/${maildir_header_cache_patch}
+		use nntp && epatch ${DISTDIR}/${nntp_patch}
+
+		# The following steps are necessary for the nntp patch and the
+		# maildir_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"
+		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
+	sed -i -e 's/README.UPGRADE//' doc/Makefile || die "sed failed"
+	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"
+}
diff --git a/mail-client/mutt/mutt-1.5.6.ebuild b/mail-client/mutt/mutt-1.5.6.ebuild
new file mode 100644
index 000000000000..fde7b9fa5deb
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.6.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.6.ebuild,v 1.1 2004/05/30 02:51:41 seemant Exp $
+
+IUSE="ssl nls slang crypt imap mbox nntp vanilla"
+
+inherit eutils
+
+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.bz2"
+mbox_hook_patch="patch-${PV}.dw.mbox-hook.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
+	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} )"
+#	nntp? ( http://mutt.kiev.ua/download/${P}/${nntp_patch} )
+#	http://cedricduval.free.fr/mutt/patches/download/${edit_threads_patch}
+
+RDEPEND="nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}
+	>=sys-libs/ncurses-5.2
+	>=sys-apps/sed-4
+	net-mail/mailbase
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	slang? ( >=sys-libs/slang-1.4.2 )
+	!vanilla? ( nntp? ( sys-devel/automake sys-devel/autoconf ) )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc alpha hppa ia64 amd64 mips"
+
+inherit flag-o-matic
+
+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"
+		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}
+		if use nntp; then
+			epatch ${DISTDIR}/${nntp_patch}
+			# I don't know how much of this is truly necessary, but it
+			# was all in the ebuild proposed in bug 23196
+			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"
+			autoconf						|| die "autoconf failed"
+		fi
+	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)"
+	fi
+
+	econf ${myconf} || die
+	sed -i -e 's/README.UPGRADE//' doc/Makefile || die "sed failed"
+	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"
+}