Fix configure.in to work correctly when --without-sasl is specified

Package-Manager: portage-2.0.51.22-r2

4 files changed, 59 insertions, 9 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index 3b2b23839938..10c3d71570e9 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/mutt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.54 2005/08/11 23:28:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.55 2005/08/11 23:46:31 agriffis Exp $
+
+  11 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  +files/mutt-1.5.9-sasl.patch, mutt-1.5.9.ebuild:
+  Fix configure.in to work correctly when --without-sasl is specified
 
   11 Aug 2005; Aron Griffis <agriffis@gentoo.org> mutt-1.5.9.ebuild:
   Disable sasl unless pop or imap is specified; it's the same as ssl or gnutls
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 08840c1636cd..061bca24910c 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3e4bf6b5aa3577c204b270dde16b630c mutt-1.5.9.ebuild 6127
+MD5 22a62f562e3a8d378096af9adf0ddda7 mutt-1.5.9.ebuild 6207
 MD5 b684c056a91bcad2e4f3d99c9332c1a0 mutt-1.5.8-r2.ebuild 4961
 MD5 f46d05fe0172cb035a01f40d25242d30 metadata.xml 253
-MD5 1a07b1e4f183f06bf0fc1ae6d3a60283 ChangeLog 17246
+MD5 7a5a9e7e7a8a08abbaed9b9c07cf812d ChangeLog 17418
 MD5 640db6b6a90de9a4579acf772c311b94 mutt-1.4.2.1.ebuild 3331
 MD5 cb2a1c4875a1f091afd9577f4f61d2e8 mutt-1.5.8-r1.ebuild 4605
 MD5 b1da3a7a15479e6c5f08fb96c33b201e files/mutt-1.5.9-nodoc.patch 382
@@ -13,13 +13,14 @@ MD5 3f1450d2a3bdb1e595bf5820239364cc files/digest-mutt-1.5.9 659
 MD5 25e242fd402f42d5bd5230dbe9ea68a6 files/slang.patch 493
 MD5 74ddaf505ea8bd19fbeb1330a23506ea files/8patch-1.5.6.dyc.source_stat 1531
 MD5 30ce590d0284ffb0896857714c6a47d4 files/Muttrc.mbox 486
+MD5 2dfbb4deb083480353ea66f578066061 files/mutt-1.5.9-sasl.patch 1378
 MD5 17ca1e2a5696251d01b9b488bcb0fc79 files/digest-mutt-1.5.8-r1 581
 MD5 2f50af3ba9259b1ac0dcf7faa2e9545e files/digest-mutt-1.5.8-r2 662
 MD5 cae412df424c3f499c539c93ebd02e48 files/digest-mutt-1.4.2.1 292
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC+98nBXaUFmZvwyMRAux6AJ9RvBhLA9Qqaluy7NHMlP9R5YuOUACeKNOO
-V1qcuFkbRa3Z2lAuvWpjmvY=
-=wbKa
+iD8DBQFC++NiBXaUFmZvwyMRAhmvAJ9hvGHlmtwiegcmfpytIfvBud2PIwCgmHja
+vBDtKw7KXA/12wBDmevFa7U=
+=TEYu
 -----END PGP SIGNATURE-----
diff --git a/mail-client/mutt/files/mutt-1.5.9-sasl.patch b/mail-client/mutt/files/mutt-1.5.9-sasl.patch
new file mode 100644
index 000000000000..dead1a793fe1
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.9-sasl.patch
@@ -0,0 +1,40 @@
+--- mutt-1.5.9/configure.in.sasl	2005-08-11 19:39:15.000000000 -0400
++++ mutt-1.5.9/configure.in	2005-08-11 19:39:41.499356683 -0400
+@@ -645,13 +645,13 @@
+ 
+ AC_ARG_WITH(sasl, AC_HELP_STRING([--with-sasl[=PFX]], [Use Cyrus SASL library for POP/IMAP authentication]),
+         [
+-        if test "$need_socket" != "yes"
+-        then
+-          AC_MSG_ERROR([SASL support is only useful with POP or IMAP support])
+-        fi
+-
+         if test "$with_sasl" != "no"
+         then
++          if test "$need_socket" != "yes"
++          then
++            AC_MSG_ERROR([SASL support is only useful with POP or IMAP support])
++          fi
++
+           if test "$with_sasl" != "yes"
+           then
+             CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
+@@ -675,13 +675,13 @@
+ 
+ AC_ARG_WITH(sasl2, AC_HELP_STRING([--with-sasl2[=PFX]], [Use Cyrus SASL library version 2 for POP/IMAP authentication]),
+         [
+-        if test "$need_socket" != "yes"
+-        then
+-          AC_MSG_ERROR([SASL support is only useful with POP or IMAP support])
+-        fi
+-
+         if test "$with_sasl2" != "no"
+         then
++          if test "$need_socket" != "yes"
++          then
++            AC_MSG_ERROR([SASL support is only useful with POP or IMAP support])
++          fi
++
+           if test "$with_sasl2" != "yes"
+           then
+             CPPFLAGS="$CPPFLAGS -I$with_sasl2/include"
diff --git a/mail-client/mutt/mutt-1.5.9.ebuild b/mail-client/mutt/mutt-1.5.9.ebuild
index b457e92d927e..a3f3652d06cd 100644
--- a/mail-client/mutt/mutt-1.5.9.ebuild
+++ b/mail-client/mutt/mutt-1.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.9.ebuild,v 1.4 2005/08/11 23:28:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.9.ebuild,v 1.5 2005/08/11 23:46:31 agriffis Exp $
 
 inherit eutils flag-o-matic
 
@@ -51,7 +51,8 @@ RDEPEND="nls? ( sys-devel/gettext )
 	gpgme?   ( >=app-crypt/gpgme-0.9.0 )"
 DEPEND="${RDEPEND}
 	net-mail/mailbase
-	!vanilla? ( sys-devel/automake sys-devel/autoconf )"
+	sys-devel/autoconf
+	!vanilla? ( sys-devel/automake )"
 
 pkg_setup() {
 	if ! use imap; then
@@ -65,6 +66,9 @@ pkg_setup() {
 src_unpack() {
 	unpack ${P}i.tar.gz && cd ${S} || die "unpack failed"
 
+	# fix sasl support in configure.in
+	epatch ${FILESDIR}/mutt-1.5.9-sasl.patch
+
 	# disable sgml conversion since it fails with sgml2html
 	epatch ${FILESDIR}/mutt-1.5.9-nodoc.patch
 
@@ -85,8 +89,9 @@ src_unpack() {
 		autoheader						|| die "autoheader failed"
 		emake -C m4 -f Makefile.am.in	|| die "emake in m4 failed"
 		automake --foreign				|| die "automake failed"
-		WANT_AUTOCONF=2.13 autoconf		|| die "autoconf failed"
 	fi
+
+	WANT_AUTOCONF=2.13 autoconf		|| die "autoconf failed"
 }
 
 src_compile() {