Version bump to 1.5.20, with a bunch of post release regression fixes from upstream. The pgp_timeout patch has been dropped for this release, since it no longer applies.

Package-Manager: portage-2.2.00.13629-prefix/cvs/Darwin powerpc

13 files changed, 626 insertions, 3 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index e9431b428071..6f1128ce1fa3 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for mail-client/mutt
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.134 2009/06/20 10:34:58 grobian Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.135 2009/06/28 10:44:22 grobian Exp $
+
+*mutt-1.5.20 (28 Jun 2009)
+
+  28 Jun 2009; Fabian Groffen <grobian@gentoo.org>
+  +files/mutt-1.5.13-prefix-mailcap.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.ebuild,
+  +files/mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch,
+  +files/mutt-1.5.20-header-weeding-f40de578e8ed.patch,
+  +files/mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch,
+  +files/mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch,
+  +files/mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch,
+  +files/mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch:
+  Version bump to 1.5.20, with a bunch of post release regression fixes from
+  upstream. The pgp_timeout patch has been dropped for this release, since
+  it no longer applies.
 
   20 Jun 2009; Fabian Groffen <grobian@gentoo.org> -mutt-1.5.13-r2.ebuild,
   -mutt-1.5.14.ebuild:
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 119a13501bc2..a3e6e6ac2f10 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,10 +1,20 @@
 AUX Muttrc 667 RMD160 0405e73c6a4122869ce9a9bd408068d316740b71 SHA1 e30c96e6f21a30fe576abcb3be65a34accf4e11f SHA256 932940db69c951caaa87a17ee98a8e2262aeadf1e978f6d671b642184c5d545f
 AUX Muttrc.mbox 486 RMD160 0f692c9d3a7591f3a0611529616aa94a5c62a641 SHA1 9e231303fe9fb2fe80542115ceefb972c7b11d5a SHA256 10b251f88ccc5d4c95c96ab17b6ab6a30a16d6590ab896a60037f869fc4d44a0
+AUX mutt-1.5.13-prefix-mailcap.patch 821 RMD160 c8c7c6b97eee2a1435c160b782efec430131a415 SHA1 c60cd4eca864102940e66ac1ce550d39d85e5fb9 SHA256 76c88cab053ca6f5292554270a8e337420c177c1eccaab1610bfcf67c6e89764
 AUX mutt-1.5.15-parallel-make.patch 946 RMD160 80c9bfa187c784d650f5850469021f94547c897e SHA1 5b8b9e2d3bc8e36b8a95fc3bc79f5bfe50ec5008 SHA256 d4b6abc9f43989a6c7a22f3fbaafd4ffa524ad516c4cb5b8cfe884985cce74f6
 AUX mutt-1.5.16-parallel-make.patch 936 RMD160 f6a216d9ff06ae55d9569e05632b60332cf49ebe SHA1 0a9b98b37987ffa10039424bb6f5849a08dbb168 SHA256 3ecc199b83f6fa747d342694d8ffacf0aedd4590e0d9943c9b6004c31cbdb931
+AUX mutt-1.5.18-bdb-prefix.patch 956 RMD160 510a65fba0d17bd9184b23730dd18e64c7d2a163 SHA1 f7ec35f6b3049949f4ca98b46401d85c6fc271a1 SHA256 b9dc46feab0b10f03dec44e1ff4ecf023d3bd06e4d509d9a35590779220f6995
+AUX mutt-1.5.18-interix.patch 663 RMD160 7fe8c230167f9635d08873be5de9189f38e13183 SHA1 3d3532255df8eef9f6b4ea21f2664c139933956f SHA256 0d82f617a4d354451469c7afdb23e4626ed008879dbb0aec1077a93703730065
+AUX mutt-1.5.18-solaris-ncurses-chars.patch 1926 RMD160 dc8c17c88f66d4ed94d885ba67517bbfd566d78d SHA1 2d977d180e434aee9a15be44187d96056da203ca SHA256 1f141c49c2c9f10654fc7453991d8017954358bfee80d93c98af57870258351b
 AUX mutt-1.5.19-libgnutls-test-15c662a95b91.patch 9187 RMD160 b5d981c5aeb66f9fc1212c74884bfd91914a97c7 SHA1 76cdfe28610aa68eec2506aeab53324de9dbf57e SHA256 7fe0edbfb2ee862bfef0fd3c53e19cf589a908c52299206db72c1c701e7fb6c8
 AUX mutt-1.5.19-mutt-gnutls-7d0583e0315d-0b13183e40e0.patch 12414 RMD160 6759b26ee028fc9d5a0f5d6b7d56fd4c1c879a04 SHA1 819146a1650035ee2a9016f01f0e2d11b8c11896 SHA256 92033adfb057818a7dcae8b02b91df8a62e7d52c339268caa4a38149ac28bc45
 AUX mutt-1.5.19-mutt_ssl-3af7e8af1983-dc9ec900c657.patch 6968 RMD160 ea63c5149d78d2790bfbfbb9a5d2499e179c8ae1 SHA1 d23cab55003763d79475ef4eb95c10504dad323f SHA256 54da63a9ce41c3704a3b96288de7b8d24ef1305a9b27306c8178e900a81f196b
+AUX mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch 1197 RMD160 59f3df7d7f299e90e4c0080d1cc98dcc3a82abfb SHA1 8deb3b88ff64f31ed1ce027de74e76be5a485147 SHA256 4790449de5476f570e95ebdec9db59afd50dd7507485d22d3848ad7bd1327b20
+AUX mutt-1.5.20-header-weeding-f40de578e8ed.patch 619 RMD160 3f6e4b734f6857d0ccef60df0a1b3d21e86584ae SHA1 76487cf18f0d7ff43441e70a6902298990c2cd3a SHA256 f06b539879b4bf7cf511f7ca03d02bb4ff8dd28a864ad7dc7cf498416c20d17c
+AUX mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch 567 RMD160 1c32139a95717e1675dca18f1f5a7baeb2c9dbaa SHA1 422621d233b5414987b2153ea81037622ed3158c SHA256 d2042d4b7ba37bfcf3173af243368a2b05f5db51a09cdbe11c3f225491d84fd0
+AUX mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch 2324 RMD160 a71d7fdebcb409947f664b96f1e7d808974f5101 SHA1 035cfaa9290121b3c6c7e57fbda94495239162d3 SHA256 adc78114cc72efb181f20050b24358d2b3959bd78b8795c8245d6049e00ab5fa
+AUX mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch 1502 RMD160 bf7503b9c10fc903b31f85ee3f38efe57fa5489a SHA1 de44ba3e404bb44ea57a663938b91a0c9c51fb5b SHA256 701fd49be77c97ca53b1cfcf9e6a2c0afb37793a3827d453d45c4587cdd4ba41
+AUX mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch 455 RMD160 63b73ed21d42d0849f38ef1098029c64933c47a5 SHA1 9da6a6914d3ae276887efd1a30ed3ea55bc57bcb SHA256 7d44b98e8f7538ce85ddb80877a0caabd1edcfd5e558258896d50691c51a3d0e
 AUX slang.patch 493 RMD160 16dcedee86fe91ecac48ec5be8a6f67798ef7ac0 SHA1 f913e8c717f76186b0edc8856bf02a167d540c70 SHA256 040c8b63b2d805dae800fa9b1826d158b7104641339cee9a404985616b3502c7
 DIST mutt-1.5.15-gentoo-patches-r2.tar.bz2 65582 RMD160 c370adb2aaa1ddbfb6fba0b7bb3318e9abeed625 SHA1 2ef0e193d963d52395df6d89281df7c3ec36c8bc SHA256 7b16fb3db479d4d112db3f383e28b4680fd3c435e074b11dee640676039d8987
 DIST mutt-1.5.15.tar.gz 3517899 RMD160 0cc084d2fcdabc0bc41632fcff90703c206de3db SHA1 1adabf6e07e099bb664c83e3c0100bbbdfec7a9a SHA256 03fa1f45d4743cd395b634d19aebbc2c1918cf6b683e0af51076ccc79f643a9a
@@ -12,10 +22,14 @@ DIST mutt-1.5.16-gentoo-patches-r1.tar.bz2 58021 RMD160 bff5f1c5f0053635419eba6e
 DIST mutt-1.5.16.tar.gz 3534894 RMD160 3b345599aa62a956b9c881994ffd74156a5bf808 SHA1 4aaa82bdc75d5e12acc72df4f61fbbf87fd64fc1 SHA256 825e920b394db6f56fa8deb45977c061331f59d953944e27ff595625bbad3e83
 DIST mutt-1.5.19-gentoo-patches.tar.bz2 62837 RMD160 6f0eb14f7e06440608ffdb73b23884aa14bbb5cd SHA1 5d1a6a5af621453dca768b1070e049ba54a1545a SHA256 dc247df06be57dae2095d4a1494e5cd175b91523a467106e9b99acab4c0423a8
 DIST mutt-1.5.19.tar.gz 3558746 RMD160 dcb8d027593bfccd62eb7aba338007bce3c7e22e SHA1 96e4cc1e1419ba816fcc19d77255978e62c20793 SHA256 b160baedf2676a4c2c1a5c74049e2c63f00fccff43ee2594367087a08bfd63c8
+DIST mutt-1.5.20-gentoo-patches-r1.tar.bz2 61865 RMD160 8f207a9230ee584941716d1f006ab19f12765871 SHA1 33347dec2215f0fdfd3e721ec332a9aab534f9ac SHA256 284ade774df1fd968e02b6130f921feb4c4039b4e0f29ca970c9f1688255b605
+DIST mutt-1.5.20.tar.gz 3635047 RMD160 df582f79364b9fd70a0001e76a119d8f78275ebb SHA1 d2bec7a33771f128ca49b1723b06b6d248a35d31 SHA256 9579fc079d74ff5c89223ff09df402ef4e508ba8ca925c49e74aa09c02a9a796
 DIST patch-1.5.16.sidebar.20070704.txt 51103 RMD160 a91a1eefe48c15a048231a632fe285cb2360f365 SHA1 0284a09dfa000d279a0f87c9a0a296f473d4509b SHA256 49123e14bebd33d0e8c7733cab319f3e5bfa591d5f5d74a3dd8964b44bf34ae7
 DIST patch-1.5.19.sidebar.20090522.txt 52307 RMD160 116451d59aa746644f269f8c028484360c84e342 SHA1 056c394657c78e054909dcfde0692007cea33fe3 SHA256 64b2282aac88a3374bb48a9a07b6374443fe3c8f5905def9ac3cdc26d9f8355a
+DIST patch-1.5.20.sidebar.20090619.txt 53335 RMD160 4c693b100a320d11ea94aedb75cff63d9f6cfb3f SHA1 d72355e39674bb4f892e4af3b84fe49c94415487 SHA256 6e925319adbfa0ba7f120f0ef4ddc62f99b1dc8f6a8b5bdc31dd8a0040aded1b
 EBUILD mutt-1.5.15-r2.ebuild 4528 RMD160 2359d39b6d5758d977b1cbfce4c320dc0abb0ed7 SHA1 9a34328905989c05c7ebc5892c0e8151433897b0 SHA256 37c613bcdc54cef3d93b013c6cb792deb2be3ca2de85765a937323bae5041264
 EBUILD mutt-1.5.16.ebuild 4989 RMD160 2a9ae3ece8f56692e0077b7b3940e607c79f2a14 SHA1 a79646fbfce1e85ecc2f8aaa4728e3c7303185f0 SHA256 55a70c2bb8f144549e6a12a4ba6bcb8796202d4f7be25fb809fefa2848615368
 EBUILD mutt-1.5.19-r1.ebuild 5933 RMD160 3317bb5ee6c7d076c141fc1dc4998116872a32f8 SHA1 c9786de58bfa87b6ed392fb6190cc0bf69df8464 SHA256 d5c91dc2f7c620a36f690b56560ba8f5122b21c65259310366e245d3a660a692
-MISC ChangeLog 30008 RMD160 d89809e8a50b7052567e8867bbe6365c6e03d9ba SHA1 a9fe00fd77f4e27a4afc5619401ddc6be321d122 SHA256 a37c593bb19a3da5b9ce473eeaf0fb6be20ff1c349fb58aac2f3abed2563d2c6
+EBUILD mutt-1.5.20.ebuild 6798 RMD160 46170854b0d4405b51b2964cfdc5ca5975d87848 SHA1 5793760b162937dea54829cc672cbc1ea27583ef SHA256 06f11da54bbd07367eaba8921a0899eb07ce15b20f95907cd5192eaca6de9814
+MISC ChangeLog 30808 RMD160 126eb2d1e0ec27988b3b7a8ad60b4b5de8151606 SHA1 f256db33a9dca18c44aee1ff05e4d28784009927 SHA256 8ff856e32ae0920ca9a6f7a4e65e96fa1726802d006a6ddf1147cd65deac7b9f
 MISC metadata.xml 553 RMD160 39ed7b190e5bf898f53b3ab6e071593ae3327eb8 SHA1 9cd6777e4563f035716b15fcb62dd95393ae7772 SHA256 91c70bd34eda2e3e33dfebd4a92bff235704d9b256f8b84815fdc4e6607c8069
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
new file mode 100644
index 000000000000..9a5a67b52f6c
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.13-prefix-mailcap.patch
@@ -0,0 +1,22 @@
+--- 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.18-bdb-prefix.patch b/mail-client/mutt/files/mutt-1.5.18-bdb-prefix.patch
new file mode 100644
index 000000000000..bb978ea24dd9
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.18-bdb-prefix.patch
@@ -0,0 +1,23 @@
+* 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
new file mode 100644
index 000000000000..4cbb21731353
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.18-interix.patch
@@ -0,0 +1,22 @@
+* 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
new file mode 100644
index 000000000000..41761b7bc310
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.18-solaris-ncurses-chars.patch
@@ -0,0 +1,75 @@
+--- 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-display-unsigned-pgp-7f37d0a57d83.patch b/mail-client/mutt/files/mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch
new file mode 100644
index 000000000000..4e32011591de
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch
@@ -0,0 +1,45 @@
+http://dev.mutt.org/trac/changeset/5908%3A7f37d0a57d83?format=diff&new=5908:7f37d0a57d83
+
+Display unsigned part of traditional PGP messages.
+Unbreaks [e2780a423d96], closes #3269
+
+Index: crypt-gpgme.c
+===================================================================
+--- crypt-gpgme.c (revision 5801:19e62bd1549b)
++++ crypt-gpgme.c (revision 5908:7f37d0a57d83)
+@@ -2372,8 +2372,7 @@
+             }
+         }
+-#if 0
+       else
+       {
+-        /* why would we want to display this at all? */
++	/* A traditional PGP part may mix signed and unsigned content */
+         /* XXX - we may wish to recode here */
+         if (s->prefix)
+@@ -2381,5 +2380,4 @@
+         state_puts (buf, s);
+       }
+-#endif
+     }
+ 
+Index: pgp.c
+===================================================================
+--- pgp.c (revision 5827:776ef9dbe4d2)
++++ pgp.c (revision 5908:7f37d0a57d83)
+@@ -483,8 +483,7 @@
+       }
+     }
+-#if 0
+     else
+     {
+-      /* why would we want to display this at all? */
++      /* A traditional PGP part may mix signed and unsigned content */
+       /* XXX - we may wish to recode here */
+       if (s->prefix)
+@@ -492,5 +491,4 @@
+       state_puts (buf, s);
+     }
+-#endif
+   }
+ 
diff --git a/mail-client/mutt/files/mutt-1.5.20-header-weeding-f40de578e8ed.patch b/mail-client/mutt/files/mutt-1.5.20-header-weeding-f40de578e8ed.patch
new file mode 100644
index 000000000000..710601f0080b
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.20-header-weeding-f40de578e8ed.patch
@@ -0,0 +1,15 @@
+http://dev.mutt.org/trac/changeset/5904%3Af40de578e8ed
+
+Unbreak header weeding for message/rfc822 parts. Closes #3265.
+
+Index: handler.c
+===================================================================
+--- handler.c (revision 5882:536771b4e085)
++++ handler.c (revision 5904:f40de578e8ed)
+@@ -1091,5 +1091,5 @@
+ 	(((s->flags & M_WEED) || ((s->flags & (M_DISPLAY|M_PRINTING)) && option (OPTWEED))) ? (CH_WEED | CH_REORDER) : 0) |
+ 	(s->prefix ? CH_PREFIX : 0) | CH_DECODE | CH_FROM |
+-	(s->flags & M_DISPLAY) ? CH_DISPLAY : 0, s->prefix);
++	((s->flags & M_DISPLAY) ? CH_DISPLAY : 0), s->prefix);
+ 
+     if (s->prefix)
diff --git a/mail-client/mutt/files/mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch b/mail-client/mutt/files/mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch
new file mode 100644
index 000000000000..19ae6885f177
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch
@@ -0,0 +1,20 @@
+http://dev.mutt.org/trac/changeset/5899%3Ad6f88fbf8387
+
+Don't parse URL port as signed short, but to int and cast to unsigned
+short. Closes #3264.
+
+Index: url.c
+===================================================================
+--- url.c (revision 5845:0698e8195545)
++++ url.c (revision 5899:d6f88fbf8387)
+@@ -144,7 +144,9 @@
+   if ((p = strchr (t, ':')))
+   {
++    int t;
+     *p++ = '\0';
+-    if (mutt_atos (p, (short*) &ciss->port) < 0)
++    if (mutt_atoi (p, &t) < 0 || t < 0 || t > 0xffff)
+       return NULL;
++    ciss->port = (unsigned short)t;
+   }
+   else
diff --git a/mail-client/mutt/files/mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch b/mail-client/mutt/files/mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch
new file mode 100644
index 000000000000..b06c506fe85e
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch
@@ -0,0 +1,89 @@
+http://dev.mutt.org/trac/changeset/bd59be56c6b0
+
+Don't mangle atime/mtime for mbox folders without new mail upon sync.
+Closes #1362, #3271.
+
+Index: mbox.c
+===================================================================
+--- mbox.c (revision 5916:508bfe4a2e23)
++++ mbox.c (revision 5921:bd59be56c6b0)
+@@ -682,20 +682,28 @@
+ /* if mailbox has at least 1 new message, sets mtime > atime of mailbox
+  * so buffy check reports new mail */
+-static void reset_atime (CONTEXT *ctx)
++static void reset_atime (CONTEXT *ctx, struct stat *st)
+ {
+   struct utimbuf utimebuf;
+-  int i;
+-  time_t now = time (NULL);
+-
+-  for (i = 0; i < ctx->msgcount; i++)
+-  {
++  int i, found = 0;
++  struct stat _st;
++
++  if (!st)
++  {
++    if (stat (ctx->path, &_st) < 0)
++      return;
++    st = &_st;
++  }
++
++  utimebuf.actime = st->st_atime;
++  utimebuf.modtime = st->st_mtime;
++
++  for (i = 0; !found && i < ctx->msgcount; i++)
+     if (!ctx->hdrs[i]->deleted && !ctx->hdrs[i]->read && !ctx->hdrs[i]->old)
+-    {
+-      utimebuf.actime = now - 1;
+-      utimebuf.modtime = now;
+-      utime (ctx->path, &utimebuf);
+-      return;
+-    }
+-  }
++      found = 1;
++
++  if (found && utimebuf.actime >= utimebuf.modtime)
++    utimebuf.actime = utimebuf.modtime - 1;
++
++  utime (ctx->path, &utimebuf);
+ }
+ 
+@@ -713,4 +721,5 @@
+   int first = -1;	/* first message to be written */
+   LOFF_T offset;	/* location in mailbox to write changed messages */
++  struct stat statbuf;
+   struct m_update_t *newOffset = NULL;
+   struct m_update_t *oldOffset = NULL;
+@@ -904,4 +913,13 @@
+   fp = NULL;
+ 
++  /* Save the state of this folder. */
++  if (stat (ctx->path, &statbuf) == -1)
++  {
++    mutt_perror (ctx->path);
++    mutt_sleep (5);
++    unlink (tempfile);
++    goto bail;
++  }
++
+   if ((fp = fopen (tempfile, "r")) == NULL)
+   {
+@@ -973,4 +991,7 @@
+   }
+ 
++  /* Restore the previous access/modification times */
++  reset_atime (ctx, &statbuf);
++
+   /* reopen the mailbox in read-only mode */
+   if ((ctx->fp = fopen (ctx->path, "r")) == NULL)
+@@ -998,9 +1019,4 @@
+   unlink (tempfile); /* remove partial copy of the mailbox */
+   mutt_unblock_signals ();
+-
+-  /* if mailbox has new mail, mangle atime+mtime to make buffy check
+-   * report new mail for it */
+-  if (!option (OPTCHECKMBOXSIZE))
+-    reset_atime (ctx);
+ 
+   return (0); /* signal success */
diff --git a/mail-client/mutt/files/mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch b/mail-client/mutt/files/mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch
new file mode 100644
index 000000000000..ca2b04699884
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch
@@ -0,0 +1,44 @@
+http://dev.mutt.org/trac/changeset/9ae13dedb5ed
+
+Fixup atime for mbox/mmdf also when mailbox is unchanged but has new
+mail. See #1362.
+
+Index: mbox.c
+===================================================================
+--- mbox.c (revision 5921:bd59be56c6b0)
++++ mbox.c (revision 5922:9ae13dedb5ed)
+@@ -682,5 +682,5 @@
+ /* if mailbox has at least 1 new message, sets mtime > atime of mailbox
+  * so buffy check reports new mail */
+-static void reset_atime (CONTEXT *ctx, struct stat *st)
++void mbox_reset_atime (CONTEXT *ctx, struct stat *st)
+ {
+   struct utimbuf utimebuf;
+@@ -992,5 +992,5 @@
+ 
+   /* Restore the previous access/modification times */
+-  reset_atime (ctx, &statbuf);
++  mbox_reset_atime (ctx, &statbuf);
+ 
+   /* reopen the mailbox in read-only mode */
+Index: mx.c
+===================================================================
+--- mx.c (revision 5907:a2a868fc40ea)
++++ mx.c (revision 5922:9ae13dedb5ed)
+@@ -927,4 +927,6 @@
+     if (!ctx->quiet)
+       mutt_message _("Mailbox is unchanged.");
++    if (ctx->magic == M_MBOX || ctx->magic == M_MMDF)
++      mbox_reset_atime (ctx, NULL);
+     mx_fastclose_mailbox (ctx);
+     return 0;
+Index: mx.h
+===================================================================
+--- mx.h (revision 4343:2bccf51eedac)
++++ mx.h (revision 5922:9ae13dedb5ed)
+@@ -57,4 +57,5 @@
+ void mbox_unlock_mailbox (CONTEXT *);
+ int mbox_check_empty (const char *);
++void mbox_reset_atime (CONTEXT *, struct stat *);
+ 
+ int mh_read_dir (CONTEXT *, const char *);
diff --git a/mail-client/mutt/files/mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch b/mail-client/mutt/files/mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch
new file mode 100644
index 000000000000..5cc32d69d785
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch
@@ -0,0 +1,15 @@
+http://dev.mutt.org/trac/changeset/25e46aad362b#file0
+
+Do not free statically-allocated buffy buffer.
+Unbreaks unmailboxes, closes #3273.
+
+Index: buffy.c
+===================================================================
+--- buffy.c (revision 5851:8b2af5b64981)
++++ buffy.c (revision 5914:25e46aad362b)
+@@ -237,5 +237,4 @@
+       if(*tmp)
+       {
+-        FREE (&((*tmp)->path));
+         tmp1=(*tmp)->next;
+         FREE (tmp);		/* __FREE_CHECKED__ */
diff --git a/mail-client/mutt/mutt-1.5.20.ebuild b/mail-client/mutt/mutt-1.5.20.ebuild
new file mode 100644
index 000000000000..395e6d4eada1
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.20.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2009 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.ebuild,v 1.1 2009/06/28 10:44:22 grobian Exp $
+
+inherit eutils flag-o-matic autotools
+
+PATCHSET_REV="-r1"
+
+# 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 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 ~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
+	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}"
+
+	# 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
+	epatch "${FILESDIR}"/mutt-1.5.18-solaris-ncurses-chars.patch
+	# post-release hot-fixes
+	epatch "${FILESDIR}"/mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-header-weeding-f40de578e8ed.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch
+
+	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
+
+	AT_M4DIR="m4" eautoreconf
+
+	# this should be done only when we're not root
+	if [[ ${UID} != 0 ]] ; then
+		sed -i \
+			-e 's/@DOTLOCK_GROUP@/'"`id -gn`"'/g' \
+			Makefile.in \
+			|| die "sed failed"
+	fi
+}
+
+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="${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
+
+	# charset.alias is installed by libiconv
+	rm -f "${ED}"/usr/lib/charset.alias
+	rm -f "${ED}"/usr/share/locale/locale.alias
+
+	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
+}