New patchset to fix bug #174403. Remove -r1 since it contains a buggy compressed patch.

(Portage version: 2.1.2.2)

4 files changed, 18 insertions, 13 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index ba71728a8614..37a3bb631a20 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/mutt
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.106 2007/04/12 21:41:16 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.107 2007/04/13 11:32:29 ferdy Exp $
+
+*mutt-1.5.15-r2 (13 Apr 2007)
+
+  13 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> -mutt-1.5.15-r1.ebuild,
+  +mutt-1.5.15-r2.ebuild:
+  New patchset to fix bug #174403. Remove -r1 since it contains a buggy
+  compressed patch.
 
   12 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> mutt-1.5.15-r1.ebuild:
   Remove some deprecated options and use flags, thanks to exg.
diff --git a/mail-client/mutt/files/digest-mutt-1.5.15-r1 b/mail-client/mutt/files/digest-mutt-1.5.15-r1
deleted file mode 100644
index b41ec091ebed..000000000000
--- a/mail-client/mutt/files/digest-mutt-1.5.15-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 af56827dcd36aa8454aec7a0214e47c4 mutt-1.5.15-gentoo-patches-r1.tar.bz2 75096
-RMD160 1e70e5cb99ec609bd67a4578ad0d084cbe0d8e56 mutt-1.5.15-gentoo-patches-r1.tar.bz2 75096
-SHA256 76eddfd760f4db2e9bdc48c0d66317daf7bdc13971e7175ed31400223cfa7eab mutt-1.5.15-gentoo-patches-r1.tar.bz2 75096
-MD5 b2c1eb45fd958f6589ee52a98f2a3ce1 mutt-1.5.15.tar.gz 3517899
-RMD160 0cc084d2fcdabc0bc41632fcff90703c206de3db mutt-1.5.15.tar.gz 3517899
-SHA256 03fa1f45d4743cd395b634d19aebbc2c1918cf6b683e0af51076ccc79f643a9a mutt-1.5.15.tar.gz 3517899
diff --git a/mail-client/mutt/files/digest-mutt-1.5.15-r2 b/mail-client/mutt/files/digest-mutt-1.5.15-r2
new file mode 100644
index 000000000000..04987edc05d6
--- /dev/null
+++ b/mail-client/mutt/files/digest-mutt-1.5.15-r2
@@ -0,0 +1,6 @@
+MD5 22865adfcd65a74b507ac6afa0e4bf1c mutt-1.5.15-gentoo-patches-r2.tar.bz2 65582
+RMD160 c370adb2aaa1ddbfb6fba0b7bb3318e9abeed625 mutt-1.5.15-gentoo-patches-r2.tar.bz2 65582
+SHA256 7b16fb3db479d4d112db3f383e28b4680fd3c435e074b11dee640676039d8987 mutt-1.5.15-gentoo-patches-r2.tar.bz2 65582
+MD5 b2c1eb45fd958f6589ee52a98f2a3ce1 mutt-1.5.15.tar.gz 3517899
+RMD160 0cc084d2fcdabc0bc41632fcff90703c206de3db mutt-1.5.15.tar.gz 3517899
+SHA256 03fa1f45d4743cd395b634d19aebbc2c1918cf6b683e0af51076ccc79f643a9a mutt-1.5.15.tar.gz 3517899
diff --git a/mail-client/mutt/mutt-1.5.15-r1.ebuild b/mail-client/mutt/mutt-1.5.15-r2.ebuild
index 67e6848d9bee..bd4908793951 100644
--- a/mail-client/mutt/mutt-1.5.15-r1.ebuild
+++ b/mail-client/mutt/mutt-1.5.15-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.15-r1.ebuild,v 1.2 2007/04/12 21:41:16 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.15-r2.ebuild,v 1.1 2007/04/13 11:32:29 ferdy Exp $
 
 inherit eutils flag-o-matic autotools
 
-PATCHSET_REV="-r1"
+PATCHSET_REV="-r2"
 
 DESCRIPTION="a small but very powerful text-based mail client"
 HOMEPAGE="http://www.mutt.org"
@@ -109,9 +109,7 @@ src_compile() {
 			--without-qdbm --without-gdbm --without-bdb"
 	fi
 
-	# there's no need for gnutls, ssl or sasl without either pop or imap.
-	# in fact mutt's configure will bail if you do:
-	#   --without-pop --without-imap --with-ssl
+	# 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"
@@ -149,7 +147,7 @@ src_compile() {
 
 src_install() {
 	make DESTDIR="${D}" install || die "install failed"
-	find ${D}/usr/share/doc -type f | grep -v "html\|manual" | xargs gzip
+	find "${D}"/usr/share/doc -type f | grep -v "html\|manual" | xargs gzip
 	if use mbox; then
 		insinto /etc/mutt
 		newins "${FILESDIR}"/Muttrc.mbox Muttrc