Add another patch from upstream. Don't show tabs in the subject as question marks in the index.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 43 insertions, 4 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index c50075b0da76..4f7dd0eca2f7 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/mutt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.136 2009/06/29 09:04:52 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.137 2009/06/29 13:25:08 grobian Exp $
+
+  29 Jun 2009; Fabian Groffen <grobian@gentoo.org>
+  +files/mutt-1.5.20-tab-subject-questionmark-298194c414f0.patch,
+  mutt-1.5.20.ebuild:
+  Add another patch from upstream. Don't show tabs in the subject as question
+  marks in the index.
 
   29 Jun 2009; Fabian Groffen <grobian@gentoo.org>
   +files/mutt-1.5.20-imap-start-fatal-fe30f394cbe6.patch,
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 74dd965c0c8d..fb41ba9ff2c7 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -15,6 +15,7 @@ AUX mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch 567 RMD160 1c32139a95717e16
 AUX mutt-1.5.20-imap-start-fatal-fe30f394cbe6.patch 451 RMD160 ce68b1841fa9b05cf2e30a7cb53d3475c674081a SHA1 92e8f2bbcfeb9812f727364759f58a0e3656b4fc SHA256 ed7e9295959fad0c0702550e36d83e786bec5a041a74680c3289d1698d0c8435
 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-tab-subject-questionmark-298194c414f0.patch 920 RMD160 7d34f480255b232c06cb3487cda2c9d0379107c1 SHA1 f4ab33bc6737ff39a8cdd3d1ee1fd597ec0f9c2a SHA256 89a176154634ee5c8278d553e62da6c244078454da04772c90149ef2e57868ea
 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
@@ -31,6 +32,6 @@ DIST patch-1.5.20.sidebar.20090619.txt 53335 RMD160 4c693b100a320d11ea94aedb75cf
 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
-EBUILD mutt-1.5.20.ebuild 6868 RMD160 a97f1732ef08cba484825195b6cc93dd5576c5b2 SHA1 5676db909e3dd83eed94d45c2a92f76a3c294e3c SHA256 efc6f81634ff40cdd56c64dd9e055519092464a4521fbe4ae6112fa37ab60e51
-MISC ChangeLog 31019 RMD160 47e417146dee8a42cb02e44e4a1b0980b89d8b37 SHA1 106826e19fd37f88f8d41b3d4e5698036f786300 SHA256 4429bda914835b755c662620a08e89c1d0a5b7995293900103ae015685412bee
+EBUILD mutt-1.5.20.ebuild 6946 RMD160 080b1733358cab2a3acd0909ee103ff9614fd1e2 SHA1 fd2c0a5463d9231fd39612f2e2fc90f82cb531cc SHA256 f3e8f0123b2b7d8c1dfd6c8d2f3dfedea2eca95126666760baaa2bd26aedce89
+MISC ChangeLog 31259 RMD160 bb560e7d9eeeb3e074f21a023c3b5bcfb08c6b55 SHA1 1a44a943032e2ee614020e09ed93846aebb76988 SHA256 a69eee2998cbd959e1b24acabf95c79f1268de2cb8ac1f0ebf35ce5710213a11
 MISC metadata.xml 553 RMD160 39ed7b190e5bf898f53b3ab6e071593ae3327eb8 SHA1 9cd6777e4563f035716b15fcb62dd95393ae7772 SHA256 91c70bd34eda2e3e33dfebd4a92bff235704d9b256f8b84815fdc4e6607c8069
diff --git a/mail-client/mutt/files/mutt-1.5.20-tab-subject-questionmark-298194c414f0.patch b/mail-client/mutt/files/mutt-1.5.20-tab-subject-questionmark-298194c414f0.patch
new file mode 100644
index 000000000000..4ceed884628b
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.20-tab-subject-questionmark-298194c414f0.patch
@@ -0,0 +1,31 @@
+http://dev.mutt.org/trac/changeset/298194c414f0
+
+Allow tabs in index subject. Closes #3270.
+
+
+Index: configure.ac
+===================================================================
+--- configure.ac (revision 5939:199b126a7623)
++++ configure.ac (revision 5958:298194c414f0)
+@@ -1216,5 +1216,5 @@
+ 
+ AC_CHECK_HEADERS(wctype.h)
+-AC_CHECK_FUNCS(iswalnum iswalpha  iswcntrl iswdigit)
++AC_CHECK_FUNCS(iswalnum iswalpha iswblank iswcntrl iswdigit)
+ AC_CHECK_FUNCS(iswgraph iswlower iswprint iswpunct iswspace iswupper)
+ AC_CHECK_FUNCS(iswxdigit towupper towlower)
+Index: curs_lib.c
+===================================================================
+--- curs_lib.c (revision 5936:642987450d83)
++++ curs_lib.c (revision 5958:298194c414f0)
+@@ -726,5 +726,9 @@
+     else
+     {
+-      if (!IsWPrint (wc))
++      if (!IsWPrint (wc)
++#ifdef HAVE_ISWBLANK
++	  && !iswblank (wc)
++#endif
++      )
+ 	wc = '?';
+       w = wcwidth (wc);
diff --git a/mail-client/mutt/mutt-1.5.20.ebuild b/mail-client/mutt/mutt-1.5.20.ebuild
index de6665f97a59..384a95a5cfc6 100644
--- a/mail-client/mutt/mutt-1.5.20.ebuild
+++ b/mail-client/mutt/mutt-1.5.20.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2009/06/29 09:04:52 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20.ebuild,v 1.3 2009/06/29 13:25:08 grobian Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -82,6 +82,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch
 	epatch "${FILESDIR}"/mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch
 	epatch "${FILESDIR}"/mutt-1.5.20-imap-start-fatal-fe30f394cbe6.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-tab-subject-questionmark-298194c414f0.patch
 
 	if use !vanilla && use !sidebar ; then
 		use nntp || rm "${PATCHDIR}"/06-nntp.patch