Disable sasl unless pop or imap is specified; it's the same as ssl or gnutls

in that regard
Package-Manager: portage-2.0.51.22-r2

3 files changed, 18 insertions, 12 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index 973a1b543eae..3b2b23839938 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.53 2005/08/11 23:22:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.54 2005/08/11 23:28:28 agriffis Exp $
+
+  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
+  in that regard
 
   11 Aug 2005; Aron Griffis <agriffis@gentoo.org>
   +files/mutt-1.5.9-nodoc.patch, -files/muttng-20050809-nodoc.patch,
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index d74285143ec3..08840c1636cd 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ff7f3bb484b503b7ce1672a2557f8d0d mutt-1.5.9.ebuild 5979
+MD5 3e4bf6b5aa3577c204b270dde16b630c mutt-1.5.9.ebuild 6127
 MD5 b684c056a91bcad2e4f3d99c9332c1a0 mutt-1.5.8-r2.ebuild 4961
 MD5 f46d05fe0172cb035a01f40d25242d30 metadata.xml 253
-MD5 361a01deb9dc3e191afbd36d698bba52 ChangeLog 17080
+MD5 1a07b1e4f183f06bf0fc1ae6d3a60283 ChangeLog 17246
 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
@@ -19,7 +19,7 @@ MD5 cae412df424c3f499c539c93ebd02e48 files/digest-mutt-1.4.2.1 292
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC+93JBXaUFmZvwyMRArZOAJ4oMo0Fdv4a+WF/PobFgOtqwbD4CACfWBdw
-hA8kpklOoo69sbiGEYujRZA=
-=WKVF
+iD8DBQFC+98nBXaUFmZvwyMRAux6AJ9RvBhLA9Qqaluy7NHMlP9R5YuOUACeKNOO
+V1qcuFkbRa3Z2lAuvWpjmvY=
+=wbKa
 -----END PGP SIGNATURE-----
diff --git a/mail-client/mutt/mutt-1.5.9.ebuild b/mail-client/mutt/mutt-1.5.9.ebuild
index 3e052bcbaf2f..b457e92d927e 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.3 2005/08/11 23:22:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.9.ebuild,v 1.4 2005/08/11 23:28:28 agriffis Exp $
 
 inherit eutils flag-o-matic
 
@@ -41,13 +41,14 @@ RDEPEND="nls? ( sys-devel/gettext )
 	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 )
 	)
-	gpgme?   ( >=app-crypt/gpgme-0.9.0 )
-	sasl?    ( >=dev-libs/cyrus-sasl-2 )"
+	gpgme?   ( >=app-crypt/gpgme-0.9.0 )"
 DEPEND="${RDEPEND}
 	net-mail/mailbase
 	!vanilla? ( sys-devel/automake sys-devel/autoconf )"
@@ -94,7 +95,6 @@ src_compile() {
 		$(use_enable gpgme) \
 		$(use_enable imap) \
 		$(use_enable pop) \
-		$(use_with sasl sasl2) \
 		$(use_enable crypt pgp) \
 		$(use_enable smime) \
 		$(use_enable cjk default-japanese) \
@@ -120,7 +120,7 @@ src_compile() {
 		myconf="${myconf} --disable-hcache --without-gdbm --without-bdb"
 	fi
 
-	# there's no need for gnutls or ssl without either pop or imap.
+	# 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
 	if use pop || use imap; then
@@ -129,8 +129,10 @@ src_compile() {
 		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 sasl2)"
 	else
-		myconf="${myconf} --without-gnutls --without-ssl"
+		myconf="${myconf} --without-gnutls --without-ssl --without-sasl2"
 	fi
 
 	# See Bug #11170