Marked stable for x86 and changed kerberos dep to mit-krb5

6 files changed, 34 insertions, 25 deletions

diff --git a/net-mail/cyrus-imap-admin/ChangeLog b/net-mail/cyrus-imap-admin/ChangeLog
index 974d5a8097b0..bc336f54c642 100644
--- a/net-mail/cyrus-imap-admin/ChangeLog
+++ b/net-mail/cyrus-imap-admin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-mail/cyrus-imap-admin
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/ChangeLog,v 1.15 2003/07/13 13:32:32 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/ChangeLog,v 1.16 2003/07/13 20:29:41 raker Exp $
+
+  13 Jul 2003; Nick Hadaway <raker@gentoo.org> cyrus-imap-admin-2.1.14.ebuild:
+  Marked stable for x86 and changed kerberos kep to mit-krb5
 
 *cyrus-imap-admin-2.1.14 (09 Jul 2003)
  
diff --git a/net-mail/cyrus-imap-admin/Manifest b/net-mail/cyrus-imap-admin/Manifest
index ac73c3c745f2..02039e0e0bc2 100644
--- a/net-mail/cyrus-imap-admin/Manifest
+++ b/net-mail/cyrus-imap-admin/Manifest
@@ -1,20 +1,20 @@
-MD5 86761cabdb2db244e47b2185c083acc9 files/config.diff 389
-MD5 e2c00049c69e3eca58d5a635dd3fd6dc files/configure.diff 6285
+MD5 a53e9ed71d9f196b12018cf9b43352e6 cyrus-imap-admin-2.1.12.ebuild 2810
+MD5 e0742157c1e1a3131a990c64c09cd9ff cyrus-imap-admin-2.1.9.ebuild 2170
+MD5 4d11b1a3e17d728a4bc55e44810a7918 cyrus-imap-admin-2.1.11-r1.ebuild 2248
+MD5 76fb53822ada98d98d2d8384b2523b42 cyrus-imap-admin-2.1.14.ebuild 3396
+MD5 dea52407dd1128b672afbf246c57c5a2 cyrus-imap-admin-2.1.11.ebuild 2216
+MD5 62a5f924c6051b17a04a351870a920e4 cyrus-imap-admin-2.1.13.ebuild 2830
+MD5 7a5e4ffd5c33a0cbfab80578543acaa1 ChangeLog 2381
 MD5 24cfd296507c04e376368f15665041d1 files/cyrus-imap-admin-2.1.12-libwrap.patch 494
-MD5 074362acae4027842361a769407b8645 files/digest-cyrus-imap-admin-2.1.11 71
+MD5 374ae77d5cbb38777c1416e60b12c1d6 files/libsieve-overflow.diff 1898
 MD5 074362acae4027842361a769407b8645 files/digest-cyrus-imap-admin-2.1.11-r1 71
-MD5 a73606d0350e6883a11a4c525af59551 files/digest-cyrus-imap-admin-2.1.12 71
+MD5 e2c00049c69e3eca58d5a635dd3fd6dc files/configure.diff 6285
+MD5 419f3372b21d1eea29593634a57bc134 files/cyrus-imapd-2.1.12-includepath.patch 2721
 MD5 cb725a049e69aaf090ea308ecf7b41ab files/digest-cyrus-imap-admin-2.1.9 70
 MD5 a26c1601811d0fd0cc3da0bae6d76693 files/imap-overflow.diff 871
-MD5 374ae77d5cbb38777c1416e60b12c1d6 files/libsieve-overflow.diff 1898
-MD5 d63d317f0f8fa042638be86b663fffc0 files/digest-cyrus-imap-admin-2.1.13 71
+MD5 86761cabdb2db244e47b2185c083acc9 files/config.diff 389
 MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032
-MD5 419f3372b21d1eea29593634a57bc134 files/cyrus-imapd-2.1.12-includepath.patch 2721
+MD5 074362acae4027842361a769407b8645 files/digest-cyrus-imap-admin-2.1.11 71
+MD5 a73606d0350e6883a11a4c525af59551 files/digest-cyrus-imap-admin-2.1.12 71
+MD5 d63d317f0f8fa042638be86b663fffc0 files/digest-cyrus-imap-admin-2.1.13 71
 MD5 aa678d0f596367397edeea90763ab29e files/digest-cyrus-imap-admin-2.1.14 155
-MD5 4d11b1a3e17d728a4bc55e44810a7918 cyrus-imap-admin-2.1.11-r1.ebuild 2248
-MD5 dea52407dd1128b672afbf246c57c5a2 cyrus-imap-admin-2.1.11.ebuild 2216
-MD5 f609b25c04a85b6a153e39bc6fcc975d cyrus-imap-admin-2.1.12.ebuild 2816
-MD5 e0742157c1e1a3131a990c64c09cd9ff cyrus-imap-admin-2.1.9.ebuild 2170
-MD5 785a36334e14660661b26e89784a5d0f ChangeLog 2116
-MD5 62a5f924c6051b17a04a351870a920e4 cyrus-imap-admin-2.1.13.ebuild 2830
-MD5 99a3c40227ec7129fb72736f5b370e57 cyrus-imap-admin-2.1.14.ebuild 3382
diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.14.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.14.ebuild
index a50179c05d6e..380c9c48e479 100644
--- a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.14.ebuild
+++ b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.14.ebuild,v 1.1 2003/07/09 09:50:09 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.14.ebuild,v 1.2 2003/07/13 20:29:41 raker Exp $
 
 inherit perl-module eutils
 
@@ -16,14 +16,14 @@ SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 -ppc -sparc "
+KEYWORDS="x86 -ppc -sparc "
 
 PROVIDE="virtual/imapd"
 DEPEND="virtual/glibc
 	afs? ( >=net-fs/openafs-1.2.2 )
 	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
 	ssl? ( >=dev-libs/openssl-0.9.6 )
-	kerberos? ( virtual/krb5 )
+	kerberos? ( >=app-crypt/mit-krb5-1.2.6 )
     	>=dev-lang/perl-5.6.1
 	>=sys-libs/db-3.2
 	>=sys-libs/pam-0.75
@@ -76,6 +76,7 @@ src_compile() {
 	# Kerberos IV is not working in cyrus-sasl so it's not enabled here.  Only Kerberos V.
 	#use kerberos && myconf="${myconf} --with-krb=/usr/athena --with-auth=krb --enable-gssapi" \
 	#	|| myconf="${myconf} --without-krb --with-auth=unix --disable-gssapi"
+
 	use kerberos && myconf="${myconf} --with-auth=krb --enable-gssapi" \
 		|| myconf="${myconf} --without-krb --with-auth=unix --disable-gssapi"
 
diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index ad2fd163cda3..792d54f84e7b 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/cyrus-imapd
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.28 2003/07/09 14:00:25 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.29 2003/07/13 20:27:38 raker Exp $
+
+  13 Jul 2003; Nick Hadaway <raker@gentoo.org> cyrus-imapd-2.1.14.ebuild:
+  Changed kerberos dep to app-crypt/mit-krb5 as heimdal isn't supported
+  properly.  Marked stable for x86
 
   09 Jul 2003; Peter Johanson <latexer@gentoo.org> :
   Fixed digest to include ipv6 patch
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 777b17c65bd7..d1c29ad3690b 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,8 +1,8 @@
 MD5 b354cf699fb14cf670b3d4d5a14d24c4 cyrus-imapd-2.1.13.ebuild 6905
-MD5 f87cd5a05541e3c4f357bf6108a695da cyrus-imapd-2.1.12.ebuild 6877
+MD5 b0b0edd00d017fbd1f4f30ffff53602c cyrus-imapd-2.1.12.ebuild 6876
 MD5 e2494a6bb94bf802cd1b0d0a8dc4ef0e cyrus-imapd-2.1.11-r1.ebuild 6299
-MD5 641c7e785c979325b33626721669f7ac cyrus-imapd-2.1.14.ebuild 7328
-MD5 262923a16b40cbeec125e9b3dcd8f72b ChangeLog 5458
+MD5 97fa1bf509d81b1e95a9fd76e1eeebdc cyrus-imapd-2.1.14.ebuild 7342
+MD5 ffda78d8b0c34c46a640de235913536f ChangeLog 5640
 MD5 374ae77d5cbb38777c1416e60b12c1d6 files/libsieve-overflow.diff 1898
 MD5 e2c00049c69e3eca58d5a635dd3fd6dc files/configure.diff 6285
 MD5 8ef2ff8ab18c79ca0fc96e0ec58e084a files/cyrus_2.conf 1340
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.14.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.14.ebuild
index 6588c78f3bb8..d351acaad023 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.14.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.14.ebuild,v 1.1 2003/07/09 09:39:35 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.14.ebuild,v 1.2 2003/07/13 20:27:38 raker Exp $
 
 inherit eutils
 IPV6_P="${P}-ipv6-20030703"
@@ -14,14 +14,14 @@ SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 -ppc -sparc"
+KEYWORDS="x86 -ppc -sparc"
 
 PROVIDE="virtual/imapd"
 DEPEND="virtual/glibc
 	afs? ( >=net-fs/openafs-1.2.2 )
 	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
 	ssl? ( >=dev-libs/openssl-0.9.6 )
-	kerberos? ( virtual/krb5 )
+	kerberos? ( >=app-crypt/mit-krb5-1.2.6 )
 	>=sys-libs/db-3.2
 	>=sys-libs/pam-0.75
 	>=dev-libs/cyrus-sasl-2.1.14
@@ -78,6 +78,7 @@ src_compile() {
 	# Kerberos IV is not working in cyrus-sasl so it's not enabled here.  Only Kerberos V.
 	#use kerberos && myconf="${myconf} --with-krb=/usr/athena --with-auth=krb --enable-gssapi" \
 	#	|| myconf="${myconf} --without-krb --with-auth=unix --disable-gssapi"
+
 	use kerberos && myconf="${myconf} --with-auth=krb --enable-gssapi" \
 		|| myconf="${myconf} --without-krb --with-auth=unix --disable-gssapi"