Drop old versions, 1.5.20-r6 can be removed per bug #347994

(Portage version: 2.2.01.17304-prefix/cvs/Darwin powerpc)

15 files changed, 14 insertions, 1603 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index ba3459ba57f1..33088fcd0aeb 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for mail-client/mutt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.204 2010/12/07 02:37:21 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.205 2010/12/07 07:48:35 grobian Exp $
+
+  07 Dec 2010; Fabian Groffen <grobian@gentoo.org>
+  -files/mutt-1.5.13-prefix-mailcap.patch,
+  -files/mutt-1.5.16-parallel-make.patch,
+  -files/mutt-1.5.18-bdb-prefix.patch, -files/mutt-1.5.18-interix.patch,
+  -files/mutt-1.5.18-solaris-ncurses-chars.patch, -mutt-1.5.20-r6.ebuild,
+  -mutt-1.5.20-r10.ebuild, -mutt-1.5.20-r13.ebuild, -mutt-1.5.20-r15.ebuild,
+  -mutt-1.5.20-r17.ebuild,
+  -files/mutt-1.5.20-crash-on-invalid-limit-pattern.patch,
+  -files/mutt-1.5.20-dont-reveal-bbc.patch,
+  -files/mutt-1.5.20-gpgme-1.2.0.patch,
+  -files/mutt-1.5.20-realpath-slowness.patch:
+  Drop old versions, 1.5.20-r6 can be removed per bug #347994
 
   07 Dec 2010; Matt Turner <mattst88@gentoo.org> mutt-1.5.21-r1.ebuild:
   Readded ~mips keyword, bug 290154.
diff --git a/mail-client/mutt/files/mutt-1.5.13-prefix-mailcap.patch b/mail-client/mutt/files/mutt-1.5.13-prefix-mailcap.patch
deleted file mode 100644
index 9a5a67b52f6c..000000000000
--- a/mail-client/mutt/files/mutt-1.5.13-prefix-mailcap.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.am
-+++ Makefile.am
-@@ -51,7 +51,7 @@
- 
- DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
- 	-DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \
--	-DHAVE_CONFIG_H=1
-+	-DHAVE_CONFIG_H=1 -DPREFIX=\"$(prefix)/..\"
- 
- AM_CPPFLAGS=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(LIBGPGME_CFLAGS) -Iintl
- 
---- init.c
-+++ init.c
-@@ -2862,7 +2862,7 @@
-   else
-   {
-     /* Default search path from RFC1524 */
--    MailcapPath = safe_strdup ("~/.mailcap:" PKGDATADIR "/mailcap:" SYSCONFDIR "/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap");
-+    MailcapPath = safe_strdup ("~/.mailcap:" PKGDATADIR "/mailcap:" SYSCONFDIR "/mailcap:" PREFIX "/etc/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap");
-   }
- 
-   Tempdir = safe_strdup ((p = getenv ("TMPDIR")) ? p : "/tmp");
diff --git a/mail-client/mutt/files/mutt-1.5.16-parallel-make.patch b/mail-client/mutt/files/mutt-1.5.16-parallel-make.patch
deleted file mode 100644
index 9fb39c86a4d1..000000000000
--- a/mail-client/mutt/files/mutt-1.5.16-parallel-make.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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/mutt-1.5.18-bdb-prefix.patch b/mail-client/mutt/files/mutt-1.5.18-bdb-prefix.patch
deleted file mode 100644
index bb978ea24dd9..000000000000
--- a/mail-client/mutt/files/mutt-1.5.18-bdb-prefix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-* berkely db check is completely broken, but mess with it just enough
-  such that it works for Gentoo Prefix
-
---- configure.ac
-+++ configure.ac
-@@ -891,7 +891,7 @@
-     then
-         if test x$ac_bdb_prefix = xyes || test x$ac_bdb_prefix = x
-         then
--          ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr"
-+          ac_bdb_prefix="$mutt_cv_prefix"
-         fi
-         for d in $ac_bdb_prefix; do
-             bdbpfx="$bdbpfx $d"
-@@ -899,7 +899,7 @@
-                 bdbpfx="$bdbpfx $d/$v"
-             done
-         done
--        BDB_VERSIONS="db-4 db4 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''"
-+        BDB_VERSIONS="db db-4 db4 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 ''"
-         AC_MSG_CHECKING([for BerkeleyDB > 4.0])
-         for d in $bdbpfx; do
-             BDB_INCLUDE_DIR=""
diff --git a/mail-client/mutt/files/mutt-1.5.18-interix.patch b/mail-client/mutt/files/mutt-1.5.18-interix.patch
deleted file mode 100644
index 4cbb21731353..000000000000
--- a/mail-client/mutt/files/mutt-1.5.18-interix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-* Interix doesn't have btowc, but it does have mbtowc.  Linux manpage
-  also discourages the use of btowc.
-
---- regex.c
-+++ regex.c
-@@ -2212,6 +2212,7 @@
-                         boolean is_lower = STREQ (str, "lower");
-                         boolean is_upper = STREQ (str, "upper");
- 			wctype_t wt;
-+			wchar_t twt;
-                         int ch;
- 
- 			wt = wctype (str);
-@@ -2226,7 +2227,7 @@
- 
-                         for (ch = 0; ch < 1 << BYTEWIDTH; ++ch)
- 			  {
--			    if (iswctype (btowc (ch), wt))
-+			    if (mbtowc (&twt, (char *)&ch, 1) >= 0 && iswctype (twt, wt))
- 			      SET_LIST_BIT (ch);
- 
- 			    if (translate && (is_upper || is_lower)
diff --git a/mail-client/mutt/files/mutt-1.5.18-solaris-ncurses-chars.patch b/mail-client/mutt/files/mutt-1.5.18-solaris-ncurses-chars.patch
deleted file mode 100644
index 41761b7bc310..000000000000
--- a/mail-client/mutt/files/mutt-1.5.18-solaris-ncurses-chars.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- menu.c
-+++ menu.c
-@@ -58,7 +58,7 @@
- 	    if (option (OPTASCIICHARS))
- 	      addch ('`');
- 	    else if (Charset_is_utf8)
--	      addstr ("\342\224\224"); /* WACS_LLCORNER */
-+	      add_wch (WACS_LLCORNER);
- 	    else
- 	      addch (ACS_LLCORNER);
- 	    break;
-@@ -66,7 +66,7 @@
- 	    if (option (OPTASCIICHARS))
- 	      addch (',');
- 	    else if (Charset_is_utf8)
--	      addstr ("\342\224\214"); /* WACS_ULCORNER */
-+	      add_wch (WACS_ULCORNER);
- 	    else
- 	      addch (ACS_ULCORNER);
- 	    break;
-@@ -74,7 +74,7 @@
- 	    if (option (OPTASCIICHARS))
- 	      addch ('|');
- 	    else if (Charset_is_utf8)
--	      addstr ("\342\224\234"); /* WACS_LTEE */
-+	      add_wch (WACS_LTEE);
- 	    else
- 	      addch (ACS_LTEE);
- 	    break;
-@@ -82,7 +82,7 @@
- 	    if (option (OPTASCIICHARS))
- 	      addch ('-');
- 	    else if (Charset_is_utf8)
--	      addstr ("\342\224\200"); /* WACS_HLINE */
-+	      add_wch (WACS_HLINE);
- 	    else
- 	      addch (ACS_HLINE);
- 	    break;
-@@ -90,7 +90,7 @@
- 	    if (option (OPTASCIICHARS))
- 	      addch ('|');
- 	    else if (Charset_is_utf8)
--	      addstr ("\342\224\202"); /* WACS_VLINE */
-+	      add_wch (WACS_VLINE);
- 	    else
- 	      addch (ACS_VLINE);
- 	    break;
-@@ -98,7 +98,7 @@
- 	    if (option (OPTASCIICHARS))
- 	      addch ('-');
- 	    else if (Charset_is_utf8)
--	      addstr ("\342\224\254"); /* WACS_TTEE */
-+	      add_wch (WACS_TTEE);
- 	    else
- 	      addch (ACS_TTEE);
- 	    break;
-@@ -106,7 +106,7 @@
- 	    if (option (OPTASCIICHARS))
- 	      addch ('-');
- 	    else if (Charset_is_utf8)
--	      addstr ("\342\224\264"); /* WACS_BTEE */
-+	      add_wch (WACS_BTEE);
- 	    else
- 	      addch (ACS_BTEE);
- 	    break;
---- mutt_curses.h
-+++ mutt_curses.h
-@@ -43,6 +43,7 @@
- #else /* USE_SLANG_CURSES */
- 
- #if HAVE_NCURSESW_NCURSES_H
-+# define _XOPEN_SOURCE_EXTENDED
- # include <ncursesw/ncurses.h>
- #elif HAVE_NCURSES_NCURSES_H
- # include <ncurses/ncurses.h>
diff --git a/mail-client/mutt/files/mutt-1.5.20-crash-on-invalid-limit-pattern.patch b/mail-client/mutt/files/mutt-1.5.20-crash-on-invalid-limit-pattern.patch
deleted file mode 100644
index fae98830ce74..000000000000
--- a/mail-client/mutt/files/mutt-1.5.20-crash-on-invalid-limit-pattern.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=323613
-http://dev.mutt.org/trac/ticket/3417
-
---- pattern.c
-+++ pattern.c
-@@ -1310,6 +1310,7 @@
-   simple = safe_strdup (buf);
-   mutt_check_simple (buf, sizeof (buf), NONULL (SimpleSearch));
- 
-+  memset(&err, 0, sizeof(err));
-   err.data = error;
-   err.dsize = sizeof (error);
-   if ((pat = mutt_pattern_comp (buf, M_FULL_MSG, &err)) == NULL)
diff --git a/mail-client/mutt/files/mutt-1.5.20-dont-reveal-bbc.patch b/mail-client/mutt/files/mutt-1.5.20-dont-reveal-bbc.patch
deleted file mode 100644
index 2404f9b56945..000000000000
--- a/mail-client/mutt/files/mutt-1.5.20-dont-reveal-bbc.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-original patch:
-http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=28;filename=write_bcc.patch.1.5.20-2;att=1;bug=467432
-
-adapted for Gentoo
-
-additional information:
-http://dev.mutt.org/trac/ticket/3337
-http://bugs.debian.org/467432
-
-
-Index: mutt/headers.c
-===================================================================
---- mutt.orig/headers.c	2009-06-30 17:51:05.276042945 +0200
-+++ mutt/headers.c	2009-06-30 17:53:33.055007250 +0200
-@@ -52,7 +52,7 @@
-   }
-   
-   mutt_env_to_local (msg->env);
--  mutt_write_rfc822_header (ofp, msg->env, NULL, 1, 0);
-+  mutt_write_rfc822_header (ofp, msg->env, NULL, 1, 0, 1);
-   fputc ('\n', ofp);	/* tie off the header. */
- 
-   /* now copy the body of the message. */
-Index: mutt/init.h
-===================================================================
---- mutt.orig/init.h	2009-06-30 17:53:32.683367849 +0200
-+++ mutt/init.h	2009-06-30 17:53:33.075058388 +0200
-@@ -3365,11 +3365,9 @@
-   { "write_bcc",	DT_BOOL, R_NONE, OPTWRITEBCC, 1},
-   /*
-   ** .pp
--  ** Controls whether mutt writes out the ``Bcc:'' header when preparing
--  ** messages to be sent.  Exim users may wish to unset this. If mutt
--  ** is set to deliver directly via SMTP (see $$smtp_url), this
--  ** option does nothing: mutt will never write out the ``Bcc:'' header
--  ** in this case.
-+  ** Controls whether mutt writes out the Bcc header when saving
-+  ** messages to FCC. Bcc headers will never be written to a message
-+  ** when sending it.
-   */
-   { "write_inc",	DT_NUM,	 R_NONE, UL &WriteInc, 10 },
-   /*
-Index: mutt/protos.h
-===================================================================
---- mutt.orig/protos.h	2009-06-30 17:51:05.437001183 +0200
-+++ mutt/protos.h	2009-06-30 17:53:33.079080252 +0200
-@@ -372,7 +372,7 @@
- int mutt_write_mime_body (BODY *, FILE *);
- int mutt_write_mime_header (BODY *, FILE *);
- int mutt_write_one_header (FILE *fp, const char *tag, const char *value, const char *pfx, int wraplen, int flags);
--int mutt_write_rfc822_header (FILE *, ENVELOPE *, BODY *, int, int);
-+int mutt_write_rfc822_header (FILE *, ENVELOPE *, BODY *, int, int, int);
- void mutt_write_references (LIST *, FILE *, int);
- int mutt_yesorno (const char *, int);
- void mutt_set_header_color(CONTEXT *, HEADER *);
-Index: mutt/send.c
-===================================================================
---- mutt.orig/send.c	2009-06-30 17:51:05.517523685 +0200
-+++ mutt/send.c	2009-06-30 17:53:33.087100946 +0200
-@@ -994,10 +994,10 @@
-     unset_option (OPTWRITEBCC);
- #endif
- #ifdef MIXMASTER
--  mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0, msg->chain ? 1 : 0);
-+  mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0, msg->chain ? 1 : 0, 0);
- #endif
- #ifndef MIXMASTER
--  mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0, 0);
-+  mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0, 0, 0);
- #endif
- #ifdef USE_SMTP
-   if (old_write_bcc)
-Index: mutt/sendlib.c
-===================================================================
---- mutt.orig/sendlib.c	2009-06-30 17:51:05.610742969 +0200
-+++ mutt/sendlib.c	2009-06-30 17:53:33.095126896 +0200
-@@ -1835,7 +1835,7 @@
- 
- 
- int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach,
--			      int mode, int privacy)
-+			      int mode, int privacy, int should_write_bcc)
- {
-   char buffer[LONG_STRING];
-   char *p, *q;
-@@ -1878,7 +1878,7 @@
-   else if (mode > 0)
-     fputs ("Cc: \n", fp);
- 
--  if (env->bcc)
-+  if (env->bcc && should_write_bcc)
-   {
-     if(mode != 0 || option(OPTWRITEBCC))
-     {
-@@ -2616,7 +2616,7 @@
-   /* post == 1 => postpone message. Set mode = -1 in mutt_write_rfc822_header()
-    * post == 0 => Normal mode. Set mode = 0 in mutt_write_rfc822_header()
-    * */
--  mutt_write_rfc822_header (msg->fp, hdr->env, hdr->content, post ? -post : 0, 0);
-+  mutt_write_rfc822_header (msg->fp, hdr->env, hdr->content, post ? -post : 0, 0, 1);
- 
-   /* (postponment) if this was a reply of some sort, <msgid> contians the
-    * Message-ID: of message replied to.  Save it using a special X-Mutt-
diff --git a/mail-client/mutt/files/mutt-1.5.20-gpgme-1.2.0.patch b/mail-client/mutt/files/mutt-1.5.20-gpgme-1.2.0.patch
deleted file mode 100644
index ff3ce9f80e0a..000000000000
--- a/mail-client/mutt/files/mutt-1.5.20-gpgme-1.2.0.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=278394
-http://dev.mutt.org/trac/ticket/3300
-
-
---- mutt-1.5.20/init.c
-+++ mutt-1.5.20/init.c
-@@ -50,6 +49,10 @@
- #include <errno.h>
- #include <sys/wait.h>
- 
-+#if defined(CRYPT_BACKEND_GPGME)
-+#include <gpgme.h>
-+#endif
-+
- #define CHECK_PAGER \
-   if ((CurrentMenu == MENU_PAGER) && (idx >= 0) &&	\
- 	    (MuttVars[idx].flags & R_RESORT)) \
-@@ -3262,6 +3265,11 @@
- 
-   mutt_read_histfile ();
- 
-+#ifdef CRYPT_BACKEND_GPGME
-+  /* needed since version 1.2.0, ticket #3300 */
-+  gpgme_check_version (NULL);
-+#endif
-+
- #if 0
-   set_option (OPTWEED); /* turn weeding on by default */
- #endif
diff --git a/mail-client/mutt/files/mutt-1.5.20-realpath-slowness.patch b/mail-client/mutt/files/mutt-1.5.20-realpath-slowness.patch
deleted file mode 100644
index 9a9753e24297..000000000000
--- a/mail-client/mutt/files/mutt-1.5.20-realpath-slowness.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- buffy.c.orig	2010-04-09 08:47:36.000000000 +0200
-+++ buffy.c	2010-04-09 08:51:38.000000000 +0200
-@@ -223,10 +223,18 @@
-     if(!*buf) continue;
- 
-     /* avoid duplicates */
--    p = realpath (buf, f1);
-+#ifdef USE_IMAP
-+    p = q = NULL;
-+    if (!mx_is_imap (buf))
-+#endif
-+      p = realpath (buf, f1);
-+
-     for (tmp = &Incoming; *tmp; tmp = &((*tmp)->next))
-     {
--      q = realpath ((*tmp)->path, f2);
-+#ifdef USE_IMAP
-+      if (!mx_is_imap ((*tmp)->path))
-+#endif
-+	q = realpath ((*tmp)->path, f2);
-       if (mutt_strcmp (p ? p : buf, q ? q : (*tmp)->path) == 0)
-       {
- 	dprint(3,(debugfile,"mailbox '%s' already registered as '%s'\n", buf, (*tmp)->path));
diff --git a/mail-client/mutt/mutt-1.5.20-r10.ebuild b/mail-client/mutt/mutt-1.5.20-r10.ebuild
deleted file mode 100644
index f253c9a8ba7e..000000000000
--- a/mail-client/mutt/mutt-1.5.20-r10.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r10.ebuild,v 1.9 2010/04/12 08:31:17 grobian Exp $
-
-inherit eutils flag-o-matic autotools
-
-PATCHSET_REV="-r5.1"
-
-# note: latest sidebar patches can be found here:
-# http://www.lunar-linux.org/index.php?option=com_content&task=view&id=44
-SIDEBAR_PATCH_N="patch-1.5.20.sidebar.20090619.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
-			http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
-		)
-	)
-	sidebar? (
-		http://www.lunar-linux.org/~tchan/mutt/${SIDEBAR_PATCH_N}
-	)"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl tokyocabinet vanilla"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-RDEPEND=">=sys-libs/ncurses-5.2
-	tokyocabinet?  ( dev-db/tokyocabinet )
-	!tokyocabinet? (
-		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 )
-	gpg?   ( >=app-crypt/gpgme-0.9.0 )
-	smime?   ( >=dev-libs/openssl-0.9.6 )
-	app-misc/mime-types"
-DEPEND="${RDEPEND}
-	net-mail/mailbase
-	doc? (
-		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}"
-
-	# this patch is non-generic and only works because we use a sysconfdir
-	# different from the one used by the mailbase ebuild
-	use prefix && epatch "${FILESDIR}"/mutt-1.5.13-prefix-mailcap.patch
-
-	epatch "${FILESDIR}"/mutt-1.5.18-bdb-prefix.patch # fix bdb detection
-	epatch "${FILESDIR}"/mutt-1.5.18-interix.patch
-	built_with_use sys-libs/ncurses unicode && \
-		epatch "${FILESDIR}"/mutt-1.5.18-solaris-ncurses-chars.patch
-	epatch "${FILESDIR}"/mutt-1.5.20-gpgme-1.2.0.patch
-	epatch "${FILESDIR}"/mutt-1.5.20-dont-reveal-bbc.patch
-
-	# post-release hot-fixes
-	for rev in $(eval echo {0..${PR#r}}) ; do
-		local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
-		[[ -e ${revpatch} ]] && \
-			epatch "${revpatch}"
-	done
-
-	# patch version string for bug reports
-	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \
-		muttlib.c || die "failed patching in Gentoo version"
-
-	if use !vanilla && use !sidebar ; then
-		use nntp || rm "${PATCHDIR}"/06-nntp.patch
-		for p in "${PATCHDIR}"/[0-9][0-9]-*.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
-
-	AT_M4DIR="m4" eautoreconf
-
-	# the configure script contains some "cleverness" whether or not to setgid
-	# the dotlock program, resulting in bugs like #278332
-	sed -i -e 's/@DOTLOCK_GROUP@//' \
-		Makefile.in || die "sed failed"
-
-	# don't just build documentation (lengthy process, with big dependencies)
-	if use !doc ; then
-		sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
-	fi
-}
-
-src_compile() {
-	declare myconf="
-		$(use_enable nls) \
-		$(use_enable gpg 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="${EPREFIX}"/etc/${PN} \
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PN}-${PVR} \
-		--with-regex \
-		--enable-nfs-fix --enable-external-dotlock \
-		$(use_with !nntp mixmaster) \
-		--with-exec-shell=${EPREFIX}/bin/sh"
-
-	case $CHOST in
-		*-darwin7)
-			# locales are broken on Panther
-			myconf="${myconf} --enable-locales-fix --without-wc-funcs"
-			myconf="${myconf} --disable-fcntl --enable-flock"
-		;;
-		*-solaris*)
-			# Solaris has no flock in the standard headers
-			myconf="${myconf} --enable-fcntl --disable-flock"
-		;;
-		*)
-			myconf="${myconf} --disable-fcntl --enable-flock"
-		;;
-	esac
-
-	# 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 tokyocabinet; then
-		myconf="${myconf} --enable-hcache \
-			--with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
-	elif use qdbm; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
-	elif use gdbm ; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
-	elif use berkdb; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
-	else
-		myconf="${myconf} --disable-hcache \
-			--without-tokyocabinet --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
-
-	if use mbox; then
-		myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
-	else
-		myconf="${myconf} --with-homespool=Maildir"
-	fi
-
-	if use !vanilla && use !sidebar ; then
-		# rr.compressed patch
-		myconf="${myconf} --enable-compressed"
-
-		# nntp patch applied conditionally, so avoid QA warning when doing
-		# --disable-nntp while patch not being applied, bug #262069
-		use nntp && myconf="${myconf} --enable-nntp"
-	fi
-
-	econf ${myconf} || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	local ED=${ED-${D}}
-	make DESTDIR="${D}" install || die "install failed"
-	find "${ED}"/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 "${ED}"/etc/${PN}/mime.types
-	dosym /etc/mime.types /etc/${PN}/mime.types
-
-	# A man-page is always handy
-	if use !doc; then
-		cp doc/mutt.man mutt.1
-		cp doc/muttbug.man flea.1
-		doman mutt.1 flea.1
-	else
-		# nuke manpages that should be provided by an MTA, bug #177605
-		rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
-			|| ewarn "failed to remove files, please file a bug"
-	fi
-
-	if use !prefix ; then
-		fowners root:mail /usr/bin/mutt_dotlock
-		fperms g+s /usr/bin/mutt_dotlock
-	fi
-
-	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_setup() {
-	if ! use gpg &&
-		has_version "<${CATEGORY}/${PN}-1.5.20-r2" &&
-		built_with_use ${CATEGORY}/${PN} gpgme ;
-	then
-		ewarn 'The "gpgme" USE-flag has been changed into "gpg".  You'
-		ewarn 'previously had "gpgme" set, and you most likely want to'
-		ewarn 'enable "gpg" instead, right now, to obtain equivalent behaviour.'
-	fi
-}
-
-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
-}
diff --git a/mail-client/mutt/mutt-1.5.20-r13.ebuild b/mail-client/mutt/mutt-1.5.20-r13.ebuild
deleted file mode 100644
index db81c222eb7e..000000000000
--- a/mail-client/mutt/mutt-1.5.20-r13.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r13.ebuild,v 1.3 2010/04/12 08:31:17 grobian Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic autotools
-
-PATCHSET_REV="-r5.1"
-
-# note: latest sidebar patches can be found here:
-# http://www.lunar-linux.org/index.php?option=com_content&task=view&id=44
-SIDEBAR_PATCH_N="patch-1.5.20.sidebar.20090619.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
-			http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
-		)
-	)
-	sidebar? (
-		http://www.lunar-linux.org/~tchan/mutt/${SIDEBAR_PATCH_N}
-	)"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl tokyocabinet vanilla"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-RDEPEND=">=sys-libs/ncurses-5.2
-	tokyocabinet?  ( dev-db/tokyocabinet )
-	!tokyocabinet? (
-		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 )
-	gpg?   ( >=app-crypt/gpgme-0.9.0 )
-	smime?   ( >=dev-libs/openssl-0.9.6 )
-	app-misc/mime-types"
-DEPEND="${RDEPEND}
-	net-mail/mailbase
-	doc? (
-		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}}
-}
-
-src_prepare() {
-	# this patch is non-generic and only works because we use a sysconfdir
-	# different from the one used by the mailbase ebuild
-	use prefix && epatch "${FILESDIR}"/mutt-1.5.13-prefix-mailcap.patch
-
-	epatch "${FILESDIR}"/mutt-1.5.18-bdb-prefix.patch # fix bdb detection
-	epatch "${FILESDIR}"/mutt-1.5.18-interix.patch
-	built_with_use sys-libs/ncurses unicode && \
-		epatch "${FILESDIR}"/mutt-1.5.18-solaris-ncurses-chars.patch
-	epatch "${FILESDIR}"/mutt-1.5.20-gpgme-1.2.0.patch
-	epatch "${FILESDIR}"/mutt-1.5.20-dont-reveal-bbc.patch
-
-	# post-release hot-fixes
-	for rev in $(eval echo {0..${PR#r}}) ; do
-		local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
-		[[ -e ${revpatch} ]] && \
-			epatch "${revpatch}"
-	done
-
-	# patch version string for bug reports
-	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \
-		muttlib.c || die "failed patching in Gentoo version"
-
-	if use !vanilla && use !sidebar ; then
-		use nntp || rm "${PATCHDIR}"/06-nntp.patch
-		for p in "${PATCHDIR}"/[0-9][0-9]-*.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
-
-	AT_M4DIR="m4" eautoreconf
-
-	# the configure script contains some "cleverness" whether or not to setgid
-	# the dotlock program, resulting in bugs like #278332
-	sed -i -e 's/@DOTLOCK_GROUP@//' \
-		Makefile.in || die "sed failed"
-
-	# don't just build documentation (lengthy process, with big dependencies)
-	if use !doc ; then
-		sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
-	fi
-}
-
-src_configure() {
-	declare myconf="
-		$(use_enable nls) \
-		$(use_enable gpg 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="${EPREFIX}"/etc/${PN} \
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PN}-${PVR} \
-		--with-regex \
-		--enable-nfs-fix --enable-external-dotlock \
-		$(use_with !nntp mixmaster) \
-		--with-exec-shell=${EPREFIX}/bin/sh"
-
-	case $CHOST in
-		*-solaris*)
-			# Solaris has no flock in the standard headers
-			myconf="${myconf} --enable-fcntl --disable-flock"
-		;;
-		*)
-			myconf="${myconf} --disable-fcntl --enable-flock"
-		;;
-	esac
-
-	# mutt prioritizes gdbm over bdb, so we will too.
-	# hcache feature requires at least one database is in USE.
-	if use tokyocabinet; then
-		myconf="${myconf} --enable-hcache \
-			--with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
-	elif use qdbm; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
-	elif use gdbm ; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
-	elif use berkdb; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
-	else
-		myconf="${myconf} --disable-hcache \
-			--without-tokyocabinet --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
-
-	if use mbox; then
-		myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
-	else
-		myconf="${myconf} --with-homespool=Maildir"
-	fi
-
-	if use !vanilla && use !sidebar ; then
-		# rr.compressed patch
-		myconf="${myconf} --enable-compressed"
-
-		# nntp patch applied conditionally, so avoid QA warning when doing
-		# --disable-nntp while patch not being applied, bug #262069
-		use nntp && myconf="${myconf} --enable-nntp"
-	fi
-
-	econf ${myconf} || die "configure failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	find "${ED}"/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 "${ED}"/etc/${PN}/mime.types
-	dosym /etc/mime.types /etc/${PN}/mime.types
-
-	# A man-page is always handy
-	if use !doc; then
-		cp doc/mutt.man mutt.1
-		cp doc/muttbug.man flea.1
-		doman mutt.1 flea.1
-	else
-		# nuke manpages that should be provided by an MTA, bug #177605
-		rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
-			|| ewarn "failed to remove files, please file a bug"
-	fi
-
-	if use !prefix ; then
-		fowners root:mail /usr/bin/mutt_dotlock
-		fperms g+s /usr/bin/mutt_dotlock
-	fi
-
-	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_setup() {
-	if ! use gpg &&
-		has_version "<${CATEGORY}/${PN}-1.5.20-r2" &&
-		built_with_use ${CATEGORY}/${PN} gpgme ;
-	then
-		ewarn 'The "gpgme" USE-flag has been changed into "gpg".  You'
-		ewarn 'previously had "gpgme" set, and you most likely want to'
-		ewarn 'enable "gpg" instead, right now, to obtain equivalent behaviour.'
-	fi
-}
-
-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
-}
diff --git a/mail-client/mutt/mutt-1.5.20-r15.ebuild b/mail-client/mutt/mutt-1.5.20-r15.ebuild
deleted file mode 100644
index 5c348b2c67bf..000000000000
--- a/mail-client/mutt/mutt-1.5.20-r15.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r15.ebuild,v 1.6 2010/07/16 07:11:48 grobian Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic autotools
-
-PATCHSET_REV="-r7"
-
-# note: latest sidebar patches can be found here:
-# http://www.lunar-linux.org/index.php?option=com_content&task=view&id=44
-SIDEBAR_PATCH_N="patch-1.5.20.sidebar.20090619.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
-			http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
-		)
-	)
-	sidebar? (
-		http://www.lunar-linux.org/~tchan/mutt/${SIDEBAR_PATCH_N}
-	)"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl tokyocabinet vanilla"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-RDEPEND=">=sys-libs/ncurses-5.2
-	tokyocabinet?  ( dev-db/tokyocabinet )
-	!tokyocabinet? (
-		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 )
-	gpg?   ( >=app-crypt/gpgme-0.9.0 )
-	smime?   ( >=dev-libs/openssl-0.9.6 )
-	app-misc/mime-types"
-DEPEND="${RDEPEND}
-	net-mail/mailbase
-	doc? (
-		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}}
-}
-
-src_prepare() {
-	# this patch is non-generic and only works because we use a sysconfdir
-	# different from the one used by the mailbase ebuild
-	use prefix && epatch "${FILESDIR}"/mutt-1.5.13-prefix-mailcap.patch
-
-	# must haves to compile or behave correctly
-	epatch "${FILESDIR}"/mutt-1.5.18-bdb-prefix.patch # fix bdb detection
-	epatch "${FILESDIR}"/mutt-1.5.18-interix.patch
-	built_with_use sys-libs/ncurses unicode && \
-		epatch "${FILESDIR}"/mutt-1.5.18-solaris-ncurses-chars.patch
-	epatch "${FILESDIR}"/mutt-1.5.20-gpgme-1.2.0.patch
-
-	local pristine=$(use vanilla && echo yes)
-	if use sidebar && use !vanilla ; then
-		ewarn "due to the complexity of the sidebar patch and requests"
-		ewarn "from the author of the patch, USE=sidebar implies USE=vanilla"
-		pristine=yes
-	fi
-	if [[ ${pristine} == yes ]] ; then
-		ewarn "USE=vanilla excludes any post-release or feature patches!"
-		use sidebar && ewarn "(except the sidebar patch you requested)"
-		ewarn "you are very likely to encounter known bugs due to upstream's"
-		ewarn "\"almost never\" release policy, please only use USE=vanilla"
-		ewarn "if you have to test an (almost) pristine mutt tarball."
-	fi
-
-	if [[ ${pristine} != yes ]] ; then
-		# fixes that are not yet upstream, or that upstream doesn't like
-		epatch "${FILESDIR}"/mutt-1.5.20-dont-reveal-bbc.patch
-		epatch "${FILESDIR}"/mutt-1.5.20-realpath-slowness.patch
-		epatch "${FILESDIR}"/mutt-1.5.20-crash-on-invalid-limit-pattern.patch
-
-		# post-release hot-fixes grabbed from HG
-		for rev in $(eval echo {0..${PR#r}}) ; do
-			local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
-			[[ -e ${revpatch} ]] && \
-				epatch "${revpatch}"
-		done
-
-		# patch version string for bug reports
-		sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \
-			muttlib.c || die "failed patching in Gentoo version"
-
-		# the big feature patches that upstream doesn't want to include, but
-		# nearly every distro has due to their usefulness
-		use nntp || rm "${PATCHDIR}"/06-nntp.patch
-		for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
-			epatch "${p}"
-		done
-	else
-		use sidebar && epatch "${DISTDIR}"/${SIDEBAR_PATCH_N}
-	fi
-
-	AT_M4DIR="m4" eautoreconf
-
-	# the configure script contains some "cleverness" whether or not to setgid
-	# the dotlock program, resulting in bugs like #278332
-	sed -i -e 's/@DOTLOCK_GROUP@//' \
-		Makefile.in || die "sed failed"
-
-	# don't just build documentation (lengthy process, with big dependencies)
-	if use !doc ; then
-		sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
-	fi
-}
-
-src_configure() {
-	declare myconf="
-		$(use_enable nls) \
-		$(use_enable gpg 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="${EPREFIX}"/etc/${PN} \
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PN}-${PVR} \
-		--with-regex \
-		--enable-nfs-fix --enable-external-dotlock \
-		$(use_with !nntp mixmaster) \
-		--with-exec-shell=${EPREFIX}/bin/sh"
-
-	case $CHOST in
-		*-solaris*)
-			# Solaris has no flock in the standard headers
-			myconf="${myconf} --enable-fcntl --disable-flock"
-		;;
-		*)
-			myconf="${myconf} --disable-fcntl --enable-flock"
-		;;
-	esac
-
-	# mutt prioritizes gdbm over bdb, so we will too.
-	# hcache feature requires at least one database is in USE.
-	if use tokyocabinet; then
-		myconf="${myconf} --enable-hcache \
-			--with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
-	elif use qdbm; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
-	elif use gdbm ; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
-	elif use berkdb; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
-	else
-		myconf="${myconf} --disable-hcache \
-			--without-tokyocabinet --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
-
-	if use mbox; then
-		myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
-	else
-		myconf="${myconf} --with-homespool=Maildir"
-	fi
-
-	if use !vanilla && use !sidebar ; then
-		# rr.compressed patch
-		myconf="${myconf} --enable-compressed"
-
-		# nntp patch applied conditionally, so avoid QA warning when doing
-		# --disable-nntp while patch not being applied, bug #262069
-		use nntp && myconf="${myconf} --enable-nntp"
-	fi
-
-	econf ${myconf} || die "configure failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	find "${ED}"/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 "${ED}"/etc/${PN}/mime.types
-	dosym /etc/mime.types /etc/${PN}/mime.types
-
-	# A man-page is always handy
-	if use !doc; then
-		cp doc/mutt.man mutt.1
-		cp doc/muttbug.man flea.1
-		doman mutt.1 flea.1
-	else
-		# nuke manpages that should be provided by an MTA, bug #177605
-		rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
-			|| ewarn "failed to remove files, please file a bug"
-	fi
-
-	if use !prefix ; then
-		fowners root:mail /usr/bin/mutt_dotlock
-		fperms g+s /usr/bin/mutt_dotlock
-	fi
-
-	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_setup() {
-	if ! use gpg &&
-		has_version "<${CATEGORY}/${PN}-1.5.20-r2" &&
-		built_with_use ${CATEGORY}/${PN} gpgme ;
-	then
-		ewarn 'The "gpgme" USE-flag has been changed into "gpg".  You'
-		ewarn 'previously had "gpgme" set, and you most likely want to'
-		ewarn 'enable "gpg" instead, right now, to obtain equivalent behaviour.'
-	fi
-}
-
-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
-}
diff --git a/mail-client/mutt/mutt-1.5.20-r17.ebuild b/mail-client/mutt/mutt-1.5.20-r17.ebuild
deleted file mode 100644
index 564fb4304bf4..000000000000
--- a/mail-client/mutt/mutt-1.5.20-r17.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r17.ebuild,v 1.1 2010/08/02 20:41:35 grobian Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic autotools
-
-PATCHSET_REV="-r10"
-
-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
-	mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
-	http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl tokyocabinet"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-RDEPEND=">=sys-libs/ncurses-5.2
-	tokyocabinet?  ( dev-db/tokyocabinet )
-	!tokyocabinet? (
-		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 )
-	gpg?   ( >=app-crypt/gpgme-0.9.0 )
-	smime?   ( >=dev-libs/openssl-0.9.6 )
-	app-misc/mime-types"
-DEPEND="${RDEPEND}
-	net-mail/mailbase
-	doc? (
-		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_prepare() {
-	# Post-release hot-fixes grabbed from HG, this is what all following
-	# patches are based on in my Mercurial patchqueue (mq).
-	# If you ever take over or need to modify patches here, just ask me
-	# (grobian) for a Mercurial clone of my gentoo branch(es) and
-	# patchqueue as it'll save you a lot of work.
-	for rev in $(eval echo {0..${PR#r}}) ; do
-		local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
-		[[ -e ${revpatch} ]] && \
-			epatch "${revpatch}"
-	done
-
-	# this patch is non-generic and only works because we use a sysconfdir
-	# different from the one used by the mailbase ebuild
-	use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch
-
-	# must have fixes to compile or behave correctly, upstream
-	# ignores, disagrees or simply doesn't respond/apply
-	epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection
-	epatch "${PATCHDIR}"/interix-btowc.patch
-	epatch "${PATCHDIR}"/solaris-ncurses-chars.patch
-	epatch "${PATCHDIR}"/gpgme-1.2.0.patch
-	# same category, but functional bits
-	epatch "${PATCHDIR}"/dont-reveal-bbc.patch
-	epatch "${PATCHDIR}"/realpath-slowness.patch
-	epatch "${PATCHDIR}"/crash-on-invalid-limit-pattern.patch
-
-	# the big feature patches that upstream doesn't want to include, but
-	# nearly every distro has due to their usefulness
-	for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
-		epatch "${p}"
-	done
-
-	use sidebar && epatch "${PATCHDIR}"/sidebar.20090619.patch
-
-	# patch version string for bug reports
-	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \
-		muttlib.c || die "failed patching in Gentoo version"
-
-	# many patches touch the buildsystem, we always need this
-	AT_M4DIR="m4" eautoreconf
-
-	# the configure script contains some "cleverness" whether or not to setgid
-	# the dotlock program, resulting in bugs like #278332
-	sed -i -e 's/@DOTLOCK_GROUP@//' \
-		Makefile.in || die "sed failed"
-
-	# don't just build documentation (lengthy process, with big dependencies)
-	if use !doc ; then
-		sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
-	fi
-}
-
-src_configure() {
-	local myconf="
-		$(use_enable crypt pgp) \
-		$(use_enable debug) \
-		$(use_enable gpg gpgme) \
-		$(use_enable imap) \
-		$(use_enable nls) \
-		$(use_enable nntp) \
-		$(use_enable pop) \
-		$(use_enable smime) \
-		$(use_enable smtp) \
-		$(use_with idn) \
-		$(use_with !nntp mixmaster) \
-		--enable-compressed \
-		--enable-external-dotlock \
-		--enable-nfs-fix \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--with-curses \
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PN}-${PVR} \
-		--with-regex \
-		--with-exec-shell=${EPREFIX}/bin/sh"
-
-	case $CHOST in
-		*-solaris*)
-			# Solaris has no flock in the standard headers
-			myconf="${myconf} --enable-fcntl --disable-flock"
-		;;
-		*)
-			myconf="${myconf} --disable-fcntl --enable-flock"
-		;;
-	esac
-
-	# mutt prioritizes gdbm over bdb, so we will too.
-	# hcache feature requires at least one database is in USE.
-	if use tokyocabinet; then
-		myconf="${myconf} --enable-hcache \
-			--with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
-	elif use qdbm; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
-	elif use gdbm ; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
-	elif use berkdb; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
-	else
-		myconf="${myconf} --disable-hcache \
-			--without-tokyocabinet --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
-
-	if use mbox; then
-		myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
-	else
-		myconf="${myconf} --with-homespool=Maildir"
-	fi
-
-	econf ${myconf} || die "configure failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	find "${ED}"/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 "${ED}"/etc/${PN}/mime.types
-	dosym /etc/mime.types /etc/${PN}/mime.types
-
-	# A man-page is always handy
-	if use !doc; then
-		cp doc/mutt.man mutt.1
-		cp doc/muttbug.man flea.1
-		doman mutt.1 flea.1
-	else
-		# nuke manpages that should be provided by an MTA, bug #177605
-		rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
-			|| ewarn "failed to remove files, please file a bug"
-	fi
-
-	if use !prefix ; then
-		fowners root:mail /usr/bin/mutt_dotlock
-		fperms g+s /usr/bin/mutt_dotlock
-	fi
-
-	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
-}
diff --git a/mail-client/mutt/mutt-1.5.20-r6.ebuild b/mail-client/mutt/mutt-1.5.20-r6.ebuild
deleted file mode 100644
index 9618f202bb60..000000000000
--- a/mail-client/mutt/mutt-1.5.20-r6.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r6.ebuild,v 1.6 2010/04/12 08:31:17 grobian Exp $
-
-inherit eutils flag-o-matic autotools
-
-PATCHSET_REV="-r5.1"
-
-# note: latest sidebar patches can be found here:
-# http://www.lunar-linux.org/index.php?option=com_content&task=view&id=44
-SIDEBAR_PATCH_N="patch-1.5.20.sidebar.20090619.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
-			http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
-		)
-	)
-	sidebar? (
-		http://www.lunar-linux.org/~tchan/mutt/${SIDEBAR_PATCH_N}
-	)"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl vanilla"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~mips"
-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 )
-	gpg?   ( >=app-crypt/gpgme-0.9.0 )
-	smime?   ( >=dev-libs/openssl-0.9.6 )
-	app-misc/mime-types"
-DEPEND="${RDEPEND}
-	net-mail/mailbase
-	doc? (
-		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}"
-
-	# this patch is non-generic and only works because we use a sysconfdir
-	# different from the one used by the mailbase ebuild
-	use prefix && epatch "${FILESDIR}"/mutt-1.5.13-prefix-mailcap.patch
-
-	epatch "${FILESDIR}"/mutt-1.5.18-bdb-prefix.patch # fix bdb detection
-	epatch "${FILESDIR}"/mutt-1.5.18-interix.patch
-	built_with_use sys-libs/ncurses unicode && \
-		epatch "${FILESDIR}"/mutt-1.5.18-solaris-ncurses-chars.patch
-	epatch "${FILESDIR}"/mutt-1.5.20-gpgme-1.2.0.patch
-	epatch "${FILESDIR}"/mutt-1.5.20-dont-reveal-bbc.patch
-
-	# post-release hot-fixes
-	for rev in $(eval echo {0..${PR#r}}) ; do
-		local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
-		[[ -e ${revpatch} ]] && \
-			epatch "${revpatch}"
-	done
-
-	# patch version string for bug reports
-	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \
-		muttlib.c || die "failed patching in Gentoo version"
-
-	if use !vanilla && use !sidebar ; then
-		use nntp || rm "${PATCHDIR}"/06-nntp.patch
-		for p in "${PATCHDIR}"/[0-9][0-9]-*.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
-
-	AT_M4DIR="m4" eautoreconf
-
-	# the configure script contains some "cleverness" whether or not to setgid
-	# the dotlock program, resulting in bugs like #278332
-	sed -i -e 's/@DOTLOCK_GROUP@//' \
-		Makefile.in || die "sed failed"
-
-	# don't just build documentation (lengthy process, with big dependencies)
-	if use !doc ; then
-		sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
-	fi
-}
-
-src_compile() {
-	declare myconf="
-		$(use_enable nls) \
-		$(use_enable gpg 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="${EPREFIX}"/etc/${PN} \
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PN}-${PVR} \
-		--with-regex \
-		--enable-nfs-fix --enable-external-dotlock \
-		$(use_with !nntp mixmaster) \
-		--with-exec-shell=${EPREFIX}/bin/sh"
-
-	case $CHOST in
-		*-darwin7)
-			# locales are broken on Panther
-			myconf="${myconf} --enable-locales-fix --without-wc-funcs"
-			myconf="${myconf} --disable-fcntl --enable-flock"
-		;;
-		*-solaris*)
-			# Solaris has no flock in the standard headers
-			myconf="${myconf} --enable-fcntl --disable-flock"
-		;;
-		*)
-			myconf="${myconf} --disable-fcntl --enable-flock"
-		;;
-	esac
-
-	# 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
-
-	if use mbox; then
-		myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
-	else
-		myconf="${myconf} --with-homespool=Maildir"
-	fi
-
-	if use !vanilla && use !sidebar ; then
-		# rr.compressed patch
-		myconf="${myconf} --enable-compressed"
-
-		# nntp patch applied conditionally, so avoid QA warning when doing
-		# --disable-nntp while patch not being applied, bug #262069
-		use nntp && myconf="${myconf} --enable-nntp"
-	fi
-
-	econf ${myconf} || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	local ED=${ED-${D}}
-	make DESTDIR="${D}" install || die "install failed"
-	find "${ED}"/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 "${ED}"/etc/${PN}/mime.types
-	dosym /etc/mime.types /etc/${PN}/mime.types
-
-	# A man-page is always handy
-	if use !doc; then
-		cp doc/mutt.man mutt.1
-		cp doc/muttbug.man flea.1
-		doman mutt.1 flea.1
-	fi
-
-	if use !prefix ; then
-		fowners root:mail /usr/bin/mutt_dotlock
-		fperms g+s /usr/bin/mutt_dotlock
-	fi
-
-	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_setup() {
-	if ! use gpg &&
-		has_version "<${CATEGORY}/${PN}-1.5.20-r2" &&
-		built_with_use ${CATEGORY}/${PN} gpgme ;
-	then
-		ewarn 'The "gpgme" USE-flag has been changed into "gpg".  You'
-		ewarn 'previously had "gpgme" set, and you most likely want to'
-		ewarn 'enable "gpg" instead, right now, to obtain equivalent behaviour.'
-	fi
-}
-
-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
-}