Fix for bug #142520. Thanks to Pablo Antonio <pabloa@gmail.com>

Package-Manager: portage-2.1-r1

4 files changed, 44 insertions, 13 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index 7d35eb90b0ae..a0d17e5b70eb 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/mutt
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.83 2006/07/30 11:11:33 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.84 2006/08/07 20:12:01 ferdy Exp $
+
+  07 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/mutt-1.5.12-fix-pop-c.patch, mutt-1.5.12.ebuild:
+  Fix for bug #142520. Thanks to Pablo Antonio <pabloa@gmail.com>
 
 *mutt-1.5.12 (30 Jul 2006)
 
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index e88358fe8ec6..32977d244deb 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -29,6 +29,10 @@ AUX mutt-1.5.11-sasl.patch 777 RMD160 1f92c9b611811e05a9e092e566e6d43202703655 S
 MD5 b6fc34b06ff62e2d791baff50be9c43a files/mutt-1.5.11-sasl.patch 777
 RMD160 1f92c9b611811e05a9e092e566e6d43202703655 files/mutt-1.5.11-sasl.patch 777
 SHA256 374cd8c7cc5ab01c20b5fa3527d2d7c007291a7cc6555722b41b57fbea56044f files/mutt-1.5.11-sasl.patch 777
+AUX mutt-1.5.12-fix-pop-c.patch 753 RMD160 5d4566b5a22d2077e81b8a091f2749a3abd5f289 SHA1 ac3f520b33c2dfebf17d0445f87c81602d4615d8 SHA256 1d1c21865a1aae258eb1991a153b75f99f22e9272a4d0b74478cd65f943f7a2a
+MD5 866165cb07d60b1f28c2a27c1c57e3b4 files/mutt-1.5.12-fix-pop-c.patch 753
+RMD160 5d4566b5a22d2077e81b8a091f2749a3abd5f289 files/mutt-1.5.12-fix-pop-c.patch 753
+SHA256 1d1c21865a1aae258eb1991a153b75f99f22e9272a4d0b74478cd65f943f7a2a files/mutt-1.5.12-fix-pop-c.patch 753
 AUX mutt-1.5.9-nodoc.patch 382 RMD160 f59ffb3a8f13090df3308d61b33c0b374d73207a SHA1 a5be95ac5b2c0c75eba9f78a53fa4bd74ad56ad8 SHA256 d1a69ef3726f146d8afb5ced47dfe751be97322cbe37aac96e97dcf96fe6f3ef
 MD5 b1da3a7a15479e6c5f08fb96c33b201e files/mutt-1.5.9-nodoc.patch 382
 RMD160 f59ffb3a8f13090df3308d61b33c0b374d73207a files/mutt-1.5.9-nodoc.patch 382
@@ -90,10 +94,10 @@ EBUILD mutt-1.5.11.ebuild 5695 RMD160 55a9927561cc15c242f237ca52cc76361f571d07 S
 MD5 884f6aca64cbdbc3b1864a945f429413 mutt-1.5.11.ebuild 5695
 RMD160 55a9927561cc15c242f237ca52cc76361f571d07 mutt-1.5.11.ebuild 5695
 SHA256 8854f46072ca5d8348f6003aa3df111c7e7345b7ea22983e4b809736b0de7618 mutt-1.5.11.ebuild 5695
-EBUILD mutt-1.5.12.ebuild 4502 RMD160 74110b813a678e6ac7d7d5e6cb9444955fb58efb SHA1 da3c0bae0d77f85f9496a5157beb21502c78125f SHA256 50e5f05c82a9b0c38d65c7ebb49fdc72879cee71d8327fb0d3e049e54739d53b
-MD5 5121ab58631da19c3a40fcbadea5e764 mutt-1.5.12.ebuild 4502
-RMD160 74110b813a678e6ac7d7d5e6cb9444955fb58efb mutt-1.5.12.ebuild 4502
-SHA256 50e5f05c82a9b0c38d65c7ebb49fdc72879cee71d8327fb0d3e049e54739d53b mutt-1.5.12.ebuild 4502
+EBUILD mutt-1.5.12.ebuild 4603 RMD160 93f84ebb5f464e563208feca3853694bc873b96f SHA1 aa3c1ca32adf659768fad6fffa6356b1f17f4a01 SHA256 cdba6ab51a4758cf118859a2bf24fb7d4a6ec8cc7e7a27c408ecb3711c9b1e52
+MD5 035bf6f128c26ecd34ac15f001fe582a mutt-1.5.12.ebuild 4603
+RMD160 93f84ebb5f464e563208feca3853694bc873b96f mutt-1.5.12.ebuild 4603
+SHA256 cdba6ab51a4758cf118859a2bf24fb7d4a6ec8cc7e7a27c408ecb3711c9b1e52 mutt-1.5.12.ebuild 4603
 EBUILD mutt-1.5.8-r1.ebuild 4605 RMD160 2d62a278308483538dd88e0a6d7ef033a965cee1 SHA1 08d49171380a7d4005084089039705039a4f5d2b SHA256 2fe8fc6633d708bb12821a3c2a9f94ac330d5270ea978ac59f8cbc17b9117d7c
 MD5 cb2a1c4875a1f091afd9577f4f61d2e8 mutt-1.5.8-r1.ebuild 4605
 RMD160 2d62a278308483538dd88e0a6d7ef033a965cee1 mutt-1.5.8-r1.ebuild 4605
@@ -106,10 +110,10 @@ EBUILD mutt-1.5.9.ebuild 6268 RMD160 83d0d5965a820a15110d4640bea7f0cd4327e5fb SH
 MD5 8838ca64d9cd8c5e27b83645106b1ddc mutt-1.5.9.ebuild 6268
 RMD160 83d0d5965a820a15110d4640bea7f0cd4327e5fb mutt-1.5.9.ebuild 6268
 SHA256 21673d75333ef51f57cae5da0c9b6664be5b67e2f46facd6d0e66d5c4c0b0259 mutt-1.5.9.ebuild 6268
-MISC ChangeLog 21642 RMD160 a58fa4532b03906048b460b802eccb1e7402985a SHA1 bcdbebffda38bbf4953764e9bd51dd398eba6a28 SHA256 039ac113cbb4e643123f0fec862472bbdeb1bc037ce1f6a4e7dfda0913f61843
-MD5 3ea9ab6eb7f5dcd541d8f949ca324103 ChangeLog 21642
-RMD160 a58fa4532b03906048b460b802eccb1e7402985a ChangeLog 21642
-SHA256 039ac113cbb4e643123f0fec862472bbdeb1bc037ce1f6a4e7dfda0913f61843 ChangeLog 21642
+MISC ChangeLog 21820 RMD160 ae3b24e0eb512d4fc89bdabcd191759f375e5aa1 SHA1 f3fe789496db5d4f9da6229594e15c7a9d7be9e5 SHA256 6e62ab98d367c5a169396998636f399e44f2ddff0ee348352c7061ecc7b4d012
+MD5 fc54c30d2de500d0fbc8a08231f153d1 ChangeLog 21820
+RMD160 ae3b24e0eb512d4fc89bdabcd191759f375e5aa1 ChangeLog 21820
+SHA256 6e62ab98d367c5a169396998636f399e44f2ddff0ee348352c7061ecc7b4d012 ChangeLog 21820
 MISC metadata.xml 348 RMD160 67219e2080107537dc52f7de5c201a8e52ee0270 SHA1 8aa712f8642faf21ab136add0670cba3f8dc15d4 SHA256 a8c434275334e18b2e8c1b68fc88b5a1f6faef5a4344267d7ed708c0794b386d
 MD5 ab8fa36a71860fbc36c89a2c91745d28 metadata.xml 348
 RMD160 67219e2080107537dc52f7de5c201a8e52ee0270 metadata.xml 348
@@ -144,7 +148,7 @@ SHA256 cb3e4d84e1f3f26021e75b4b8e6d78f0545615c46b2f1953d9fbbe50fdb7bc63 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEzJPzViELBEf1JB0RAtO+AJwIFyKjgo2dh5dyHEP0GpHz9ntR0wCePCaq
-LRgQX4TVzhHxQFptd1H9nms=
-=ciOq
+iD8DBQFE156lViELBEf1JB0RAkKjAJ9L+jnwXMeb8EUrknLoAu6KYIvPAwCffHVq
+v/iNwipLwf3qTcxqU5In6uM=
+=3gNK
 -----END PGP SIGNATURE-----
diff --git a/mail-client/mutt/files/mutt-1.5.12-fix-pop-c.patch b/mail-client/mutt/files/mutt-1.5.12-fix-pop-c.patch
new file mode 100644
index 000000000000..c0bb0a487a3b
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.12-fix-pop-c.patch
@@ -0,0 +1,20 @@
+From: brendan <brendan>
+Date: Wed, 19 Jul 2006 23:29:54 +0000 (+0000)
+Subject: From: Rocco Rutte <pdmef@gmx.net>
+X-Git-Url: http://dev.mutt.org/cgi-bin/gitweb.cgi?p=mutt/.git;a=commitdiff;h=4734283f3a1f3209453f275710313673352fc288
+
+  From: Rocco Rutte <pdmef@gmx.net>
+  
+  Fix linking for body cache without IMAP support.
+---
+
+--- a/configure.in
++++ b/configure.in
+@@ -500,6 +500,7 @@ AC_ARG_ENABLE(pop,  AC_HELP_STRING([--en
+ [       if test x$enableval = xyes ; then
+                 AC_DEFINE(USE_POP,1,[ Define if you want support for the POP3 protocol. ])
+                 MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pop.o pop_lib.o pop_auth.o"
++                need_pop="yes"
+                 need_socket="yes"
+                 need_md5="yes"
+         fi
diff --git a/mail-client/mutt/mutt-1.5.12.ebuild b/mail-client/mutt/mutt-1.5.12.ebuild
index fcca5b5c0724..4c5fe978299b 100644
--- a/mail-client/mutt/mutt-1.5.12.ebuild
+++ b/mail-client/mutt/mutt-1.5.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.12.ebuild,v 1.1 2006/07/30 11:11:33 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.12.ebuild,v 1.2 2006/08/07 20:12:01 ferdy Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -49,6 +49,9 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A} && cd "${S}" || die "unpack failed"
 
+	# fix for linking problem (bug #142520) in configure.in
+	epatch "${FILESDIR}"/${P}-fix-pop-c.patch
+
 	if ! use vanilla ; then
 		if ! use nntp ; then
 			rm "${PATCHDIR}"/07-vvv.nntp-gentoo.patch