Fixed AMD64 deps for kerberos

4 files changed, 14 insertions, 9 deletions

diff --git a/net-mail/evolution/ChangeLog b/net-mail/evolution/ChangeLog
index 97806073223f..da3caebddf06 100644
--- a/net-mail/evolution/ChangeLog
+++ b/net-mail/evolution/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/evolution
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/ChangeLog,v 1.93 2004/03/23 10:22:30 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/ChangeLog,v 1.94 2004/03/23 15:14:44 avenj Exp $
+
+  24 Mar 2004; Jon Portnoy <avenj@gentoo.org> evolution-1.4.5.ebuild,
+  evolution-1.4.6.ebuild :
+  Fixed screwy AMD64 deps in 1.4.5 and modified both ebuilds to recognize
+  kerberos properly on AMD64.
 
   23 Mar 2004; Alastair Tse <liquidx@gentoo.org> evolution-1.4.6.ebuild:
   fix amd64 dep and also fix configure flag passing in src_compile for amd64
diff --git a/net-mail/evolution/Manifest b/net-mail/evolution/Manifest
index ed108eb18a13..40742670cc23 100644
--- a/net-mail/evolution/Manifest
+++ b/net-mail/evolution/Manifest
@@ -1,16 +1,16 @@
-MD5 a0d8c65d2cb953706a70238303360906 ChangeLog 15085
+MD5 ad91cd06ec0c1d35d8515c28b5ea9fa6 ChangeLog 15285
 MD5 93de36abe29ac7efb2ce14a7d9a2055c evolution-1.2.3.ebuild 5918
 MD5 50d77498b1d4cda6fe831dc8619d132e evolution-1.2.4.ebuild 6387
-MD5 ab88d1bec9aa5bd6fc5b82a05ef0acf7 evolution-1.4.5.ebuild 5735
+MD5 cd0cc57f087fa5dbb0b8694ec8aa6d8e evolution-1.4.6.ebuild 5568
+MD5 ac95ff13946df67b0f6df50c9520fe9c evolution-1.4.5.ebuild 5716
 MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
-MD5 11988b8f44bd7ef38b919401cb0f4e8f evolution-1.4.6.ebuild 5582
 MD5 f17beebbd2d9ff5d49f48352be1b359c files/digest-evolution-1.2.3 131
 MD5 3137288dd17e357d0972dab00e4f6b6d files/digest-evolution-1.2.4 1230
+MD5 6174a41481c88eb948a8e119cf93ea94 files/evolution-1.4.5-nztimezone.patch 1852
 MD5 49463c08f32ee1df0970196b6c4cef2b files/digest-evolution-1.4.5 132
 MD5 c837abd50d990dea46fcea32b8a1b001 files/evolution-1.1.90-kde.patch 689
 MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370
 MD5 f44bc5e363c1f976a7a72676886b9d13 files/evolution-1.1.90-subversion.patch 470
 MD5 a3a0071b78894fc80b10a0ec765647f5 files/evolution-1.4.4-alpha.patch 1799
-MD5 6174a41481c88eb948a8e119cf93ea94 files/evolution-1.4.5-nztimezone.patch 1852
 MD5 980771bb5349699c8d8ecd6b6f035b50 files/gnome-pilot.m4 6452
 MD5 fe0cafc4040da525377526f4a1fa297f files/digest-evolution-1.4.6 132
diff --git a/net-mail/evolution/evolution-1.4.5.ebuild b/net-mail/evolution/evolution-1.4.5.ebuild
index dc43f8857a14..b197e5f2b58f 100644
--- a/net-mail/evolution/evolution-1.4.5.ebuild
+++ b/net-mail/evolution/evolution-1.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.4.5.ebuild,v 1.15 2004/03/07 21:44:00 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.4.5.ebuild,v 1.16 2004/03/23 15:14:44 avenj Exp $
 
 # kde before gnome2, otherwise kde_src_install will override gnome2_src_install
 use kde && inherit kde
@@ -47,7 +47,7 @@ RDEPEND=">=gnome-extra/libgtkhtml-3.0.9
 	                ) )
 	ssl? ( !mozilla? ( >=dev-libs/openssl-0.9.5 ) )
 	ldap? ( >=net-nds/openldap-2.0 )
-	amd64? ( ) : ( kerberos? ( >=app-crypt/mit-krb5-1.2.5 ) )
+	kerberos? ( >=app-crypt/mit-krb5-1.2.5 )
 	doc? ( >=app-text/scrollkeeper-0.3.10-r1 )"
 
 DEPEND="${RDEPEND}
diff --git a/net-mail/evolution/evolution-1.4.6.ebuild b/net-mail/evolution/evolution-1.4.6.ebuild
index 08130095821f..7ad76683d1e4 100644
--- a/net-mail/evolution/evolution-1.4.6.ebuild
+++ b/net-mail/evolution/evolution-1.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.4.6.ebuild,v 1.2 2004/03/23 10:22:30 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.4.6.ebuild,v 1.3 2004/03/23 15:14:44 avenj Exp $
 
 # kde before gnome2, otherwise kde_src_install will override gnome2_src_install
 use kde && inherit kde
@@ -47,7 +47,7 @@ RDEPEND=">=gnome-extra/libgtkhtml-3.0.10
 	                ) )
 	ssl? ( !mozilla? ( >=dev-libs/openssl-0.9.5 ) )
 	ldap? ( >=net-nds/openldap-2.0 )
-	!amd64? ( kerberos? ( >=app-crypt/mit-krb5-1.2.5 ) )
+	kerberos? ( >=app-crypt/mit-krb5-1.2.5 )
 	doc? ( >=app-text/scrollkeeper-0.3.10-r1 )"
 
 DEPEND="${RDEPEND}