Fixed cmd5checkpw dependencies for bug 110088.

Package-Manager: portage-2.0.53_rc6

diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog
index cfaea58f4277f152e81fae1013fcd59900dd0652..f3a9c98c31ee073d9455029538e50b9fafa8db32 100644 (file)
--- a/mail-mta/qmail/ChangeLog
+++ b/mail-mta/qmail/ChangeLog
@@ -1,6 +1,9 @@
 # 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.66 2005/10/20 17:44:01 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.67 2005/10/22 20:27:40 hansmi Exp $
+
+  22 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> qmail-1.03-r15.ebuild:
+  Fixed cmd5checkpw dependencies for bug 110088.
 
   20 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> qmail-1.03-r16.ebuild:
   Stable on hppa, mips, ppc, sparc, x86.

diff --git a/mail-mta/qmail/Manifest b/mail-mta/qmail/Manifest
index e9aac1b3614684acb6f50248ebd8321957068727..cc04bf3ec22b574d1332749f96dc0e4d0cbc939b 100644 (file)
--- a/mail-mta/qmail/Manifest
+++ b/mail-mta/qmail/Manifest
@@ -1,4 +1,4 @@
-MD5 868449010fea3c5fb9327dc35892abf3 ChangeLog 32007
+MD5 5d5786c17a05f51b43b8ed1abf06bc60 ChangeLog 32134
 MD5 cc5c84d3a0837007b8af4a1f2e657872 files/1.03-r14/auth-after-tls-only.patch 2151
 MD5 3eb989291a872a5ff2f5d40d6eba92d8 files/1.03-r14/maildir-quota-fix.patch 547
 MD5 b8f5d6adfb941c184715695cc58a5c72 files/1.03-r14/nullenvsender-recipcount.tls.patch 1616
@@ -67,5 +67,5 @@ MD5 b7e7c96254dabacdec5bf5904957c7b2 files/tcp.qmqp.sample 399
 MD5 2d3271eba444e0c0ad2bd39626ba9156 files/tcp.qmtp.sample 821
 MD5 fe86ebf974cc7cb1aaddff8311ae89bc files/tcp.smtp.sample 4166
 MD5 e60e7e9ed6a2c7d3a2ebcee6a6af429e metadata.xml 277
-MD5 0529d296e1768b0fd380db59728d053a qmail-1.03-r15.ebuild 18774
+MD5 753f7a8506246a680c8cbcc56590542d qmail-1.03-r15.ebuild 18759
 MD5 f4ed01942a3f1383a4c1f3c1bc6bc60f qmail-1.03-r16.ebuild 21656

diff --git a/mail-mta/qmail/qmail-1.03-r15.ebuild b/mail-mta/qmail/qmail-1.03-r15.ebuild
index 8ae4188f4a7fbe3c92507d1909fa7d9a8459a748..22416ca5ae010c3ef7ed6060ce6091b306f5482d 100644 (file)
--- a/mail-mta/qmail/qmail-1.03-r15.ebuild
+++ b/mail-mta/qmail/qmail-1.03-r15.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-r15.ebuild,v 1.35 2005/10/17 20:29:14 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r15.ebuild,v 1.36 2005/10/22 20:27:40 hansmi Exp $
 
 inherit toolchain-funcs eutils fixheadtails flag-o-matic
 
@@ -53,7 +53,7 @@ RDEPEND="!virtual/mta
        >=sys-apps/ucspi-tcp-0.88
        >=sys-process/daemontools-0.76-r1
        >=net-mail/checkpassword-0.90
-       ~net-mail/cmd5checkpw-0.22
+       <net-mail/cmd5checkpw-0.30
        >=net-mail/dot-forward-0.71
        >=net-mail/queue-fix-1.4-r1
        selinux? ( sec-policy/selinux-qmail )"
@@ -61,7 +61,6 @@ RDEPEND="!virtual/mta
 PROVIDE="virtual/mta
         virtual/mda"
 
-#MY_PVR=${PVR}
 MY_PVR=${PV}-r14
 
 TCPRULES_DIR=/etc/tcprules.d