summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlastair Tse <liquidx@gentoo.org>2004-03-23 10:22:30 +0000
committerAlastair Tse <liquidx@gentoo.org>2004-03-23 10:22:30 +0000
commit4ba3197335947de9f9d3fa3568cdf4df0a2e4b85 (patch)
tree85a43f20e872973d8928f0166befaa8f6c360a4e /net-mail/evolution
parentThis package has a qt dep, and for mips, qt needs some testing and issues res... (diff)
downloadgentoo-2-4ba3197335947de9f9d3fa3568cdf4df0a2e4b85.tar.gz
gentoo-2-4ba3197335947de9f9d3fa3568cdf4df0a2e4b85.tar.bz2
gentoo-2-4ba3197335947de9f9d3fa3568cdf4df0a2e4b85.zip
fix amd64 dep and also fix configure flag passing in src_compile for amd64
Diffstat (limited to 'net-mail/evolution')
-rw-r--r--net-mail/evolution/ChangeLog5
-rw-r--r--net-mail/evolution/evolution-1.4.6.ebuild6
2 files changed, 7 insertions, 4 deletions
diff --git a/net-mail/evolution/ChangeLog b/net-mail/evolution/ChangeLog
index 9ba2b5508205..97806073223f 100644
--- a/net-mail/evolution/ChangeLog
+++ b/net-mail/evolution/ChangeLog
@@ -1,6 +1,9 @@
# 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.92 2004/03/22 10:15:50 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/ChangeLog,v 1.93 2004/03/23 10:22:30 liquidx Exp $
+
+ 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
*evolution-1.4.6 (22 Mar 2004)
diff --git a/net-mail/evolution/evolution-1.4.6.ebuild b/net-mail/evolution/evolution-1.4.6.ebuild
index 4522d6eb26f8..08130095821f 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.1 2004/03/22 10:15:50 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.4.6.ebuild,v 1.2 2004/03/23 10:22:30 liquidx 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 ) )
+ !amd64? ( kerberos? ( >=app-crypt/mit-krb5-1.2.5 ) )
doc? ( >=app-text/scrollkeeper-0.3.10-r1 )"
DEPEND="${RDEPEND}
@@ -125,7 +125,7 @@ src_compile() {
&& myconf="${myconf} --with-openldap=yes --with-static-ldap=no" \
|| myconf="${myconf} --with-openldap=no"
- use kerberos \
+ [ `use kerberos` -a ! `use amd64` ] \
&& myconf="${myconf} --with-krb5=/usr" \
|| myconf="${myconf} --without-krb5"