--- usr/portage/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r4.ebuild	2007-05-03 12:06:33.000000000 +0000
+++ usr/local/portage/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r4.ebuild	2007-05-10 01:47:58.000000000 +0000
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r4.ebuild,v 1.1 2007/05/03 12:06:33 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r3.ebuild,v 1.1 2007/05/01 16:44:48 pva Exp $
 
 WANT_AUTOMAKE="1.9"
 WANT_AUTOCONF="latest"
@@ -48,7 +48,7 @@
 
 pkg_setup() {
 	G2CONF="$(use_with ldap openldap)	\
-		$(use_with kerberos krb5 /usr)	\
+		$(use_with kerberos krb5 `krb5-config --prefix`) \
 		$(use_enable ssl nss)		\
 		$(use_enable ssl smime)		\
 		$(use_enable ipv6)		\
@@ -67,6 +67,12 @@
 	else
 		G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)"
 	fi
+
+	if use kerberos; then
+		G2CONF="${G2CONF} \
+			--with-krb5-libs=`krb5-config --libs |sed -e's/^-L\([^ ]*\)\($\| .*$\)/\1/'` \
+			--with-krb5-includes=`krb5-config --cflags |sed -e's/^-I\([^ ]*\)\($\| .*$\)/\1/'`"
+	fi
 }
 
 src_unpack() {