Fixed dependencies for USE=noauthcram, see bug 83415.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 17 insertions, 8 deletions

diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog
index a4b488464cdd..d9b808872b9e 100644
--- a/mail-mta/qmail/ChangeLog
+++ b/mail-mta/qmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/qmail
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.58 2005/08/12 20:42:39 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.59 2005/08/14 11:01:44 hansmi Exp $
+
+  14 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> files/conf-smtpd-r16,
+  qmail-1.03-r16.ebuild:
+  Fixed dependencies for USE=noauthcram, see bug 83415.
 
   12 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
   files/1.03-r16/qmail-remote-auth-log-fix.patch:
diff --git a/mail-mta/qmail/Manifest b/mail-mta/qmail/Manifest
index d75a5a590cdc..12fc2e4a1f4e 100644
--- a/mail-mta/qmail/Manifest
+++ b/mail-mta/qmail/Manifest
@@ -1,6 +1,6 @@
 MD5 e60e7e9ed6a2c7d3a2ebcee6a6af429e metadata.xml 277
-MD5 560a7b0266aa8051a626054259c18310 ChangeLog 31610
-MD5 16dfdae5cae93a2fcd988b3205bc2496 qmail-1.03-r16.ebuild 21423
+MD5 c4a45ded213c13f7bca0c31f85f1c11b ChangeLog 31768
+MD5 1bb1c2c7ab27c173654462e2eb461fbf qmail-1.03-r16.ebuild 21485
 MD5 8eb5e85638263cb9b63ea67369b8a886 qmail-1.03-r15.ebuild 18864
 MD5 7db09ceb9337348431fb9f8418e5892e files/dot_qmail-log 276
 MD5 180a513f34e3f00abc609672a190072c files/99qmail 137
@@ -15,7 +15,7 @@ MD5 52892cdf994815c6767ffbafc49df454 files/conf-qmqpd 465
 MD5 4ee8193d6da00d6930ecadb1e91fd964 files/run-qmailqmqpdlog 321
 MD5 05c7891e3fde628aa9aada21a4d6eebe files/run-qmailqmtpd 839
 MD5 9e5d2ac8b47e094d63eb620f5067446f files/conf-qmtpd 557
-MD5 37c08c1ad7423b6625a4dca603fe1df0 files/conf-smtpd-r16 1931
+MD5 5f99cabfe0275b576d8d33c538b676ea files/conf-smtpd-r16 2070
 MD5 9cc72fa27c9643d8b7d8388d6e045d6f files/config-sanity-check 1296
 MD5 ed8621dc81c25323e10609fc05d861df files/rc 284
 MD5 6e7b856c1034c00ee4ff63209c354c25 files/run-qmailsmtpd 839
diff --git a/mail-mta/qmail/files/conf-smtpd-r16 b/mail-mta/qmail/files/conf-smtpd-r16
index 12817730d180..5a4eba5211f3 100644
--- a/mail-mta/qmail/files/conf-smtpd-r16
+++ b/mail-mta/qmail/files/conf-smtpd-r16
@@ -1,5 +1,5 @@
 # Configuration file for qmail-smtpd
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/conf-smtpd-r16,v 1.1 2005/06/19 06:52:42 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/conf-smtpd-r16,v 1.2 2005/08/14 11:01:44 hansmi Exp $
 
 # Stuff to run before tcpserver
 #QMAIL_TCPSERVER_PRE=""
@@ -34,6 +34,9 @@ TCPSERVER_OPTS="${TCPSERVER_OPTS} -R"
 
 # This next block is for SMTP-AUTH 
 
+# WARNING: If you've installed qmail with USE=noauthcram, and you want to use
+# the following programs, you proably need to install them.
+
 # Example using cmd5checkpw
 # See the manpage for cmd5checkpw for details on the passwords
 #QMAIL_SMTP_CHECKPASSWORD="/bin/cmd5checkpw"
diff --git a/mail-mta/qmail/qmail-1.03-r16.ebuild b/mail-mta/qmail/qmail-1.03-r16.ebuild
index 4d494dde7af8..ab3e2cc0852e 100644
--- a/mail-mta/qmail/qmail-1.03-r16.ebuild
+++ b/mail-mta/qmail/qmail-1.03-r16.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-mta/qmail/qmail-1.03-r16.ebuild,v 1.34 2005/08/11 19:39:26 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.35 2005/08/14 11:01:44 hansmi Exp $
 
 inherit toolchain-funcs eutils fixheadtails flag-o-matic
 
@@ -53,8 +53,10 @@ RDEPEND="!virtual/mta
 	app-shells/bash
 	>=sys-apps/ucspi-tcp-0.88
 	>=sys-process/daemontools-0.76-r1
-	>=net-mail/checkpassword-0.90
-	>=net-mail/cmd5checkpw-0.30
+	!noauthcram? (
+		|| ( >=net-mail/checkpassword-0.90 >=net-mail/checkpassword-pam-0.99 )
+		>=net-mail/cmd5checkpw-0.30
+	)
 	>=net-mail/dot-forward-0.71
 	>=net-mail/queue-fix-1.4-r1
 	selinux? ( sec-policy/selinux-qmail )