--- heimdal-1.0.ebuild	2008-03-30 13:32:46.000000000 +0000
+++ /usr/local/portage/app-crypt/heimdal/heimdal-1.1.ebuild	2008-03-30 13:24:04.000000000 +0000
@@ -11,14 +11,13 @@
 PATCH_P=${P}-gentoo-patches-${PATCHVER}
 
 DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.pdc.kth.se/heimdal/"
-SRC_URI="ftp://ftp.pdc.kth.se/pub/heimdal/src/${P}.tar.gz
-	http://dev.gentoo.org/~seemant/distfiles/${PATCH_P}.tar.bz2
+HOMEPAGE="http://www.h5l.org/"
+SRC_URI="http://www.h5l.org/dist/src/${P}.tar.gz
 	mirror://gentoo/${PATCH_P}.tar.bz2"
 
-LICENSE="as-is"
+LICENSE="three clause BSD style license"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="ssl berkdb ipv6 ldap X"
 
 RDEPEND="ssl? ( dev-libs/openssl )
@@ -48,12 +47,11 @@
 
 	if use ldap; then
 		myconf="${myconf} --with-openldap=/usr"
-		#append-flags -DLDAP_DEPRECATED=1
 	fi
 
 	econf \
 		$(use_with ipv6) \
-		$(use_with berkdb berkeley-db) \
+		$(use_enable berkdb berkeley-db) \
 		$(use_with ssl openssl) \
 		$(use_with X x) \
 		--disable-krb4 \
@@ -62,19 +60,11 @@
 		--enable-netinfo \
 		--enable-pthread-support \
 		--libexecdir=/usr/sbin \
-		--includedir=/usr/include/heimdal \
+		--prefix=/usr \
 		${myconf} || die "econf failed"
 
 	emake || die "emake failed"
 
-	# Compile the added password checker:
-	#cd lib/kadm5
-	#tc-export CC
-	#${CC} -shared -fPIC \
-	#	${CFLAGS} -I"${S}"/include \
-	#	-DDICTPATH=\"/usr/$(get_libdir)/cracklib_dict\" \
-	#	-o sample_passwd_check.so sample_passwd_check.c -lcrack || \
-	#	die "Failed to compile password checker"
 }
 
 src_test() {
@@ -91,8 +81,6 @@
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
-	#dolib lib/kadm5/sample_passwd_check.so
-
 	dodoc ChangeLog README NEWS TODO
 
 	# Begin client rename and install
@@ -111,21 +99,6 @@
 	mv "${D}"/usr/share/man/man5/{,k}ftpusers.5
 	mv "${D}"/usr/share/man/man5/{,k}login.access.5
 
-	# Create symlinks for the includes
-	#dosym heimdal /usr/include/gssapi
-	#dosym heimdal/krb5-types.h /usr/include/krb5-types.h
-	#dosym heimdal/krb5.h /usr/include/krb5.h
-	#dosym heimdal/asn1_err.h /usr/include/asn1_err.h
-	#dosym heimdal/krb5_asn1.h /usr/include/krb5_asn1.h
-	#dosym heimdal/krb5_err.h /usr/include/krb5_err.h
-	#dosym heimdal/heim_err.h /usr/include/heim_err.h
-	#dosym heimdal/k524_err.h /usr/include/k524_err.h
-	#dosym heimdal/krb5-protos.h /usr/include/krb5-protos.h
-
-	# Hacky symlinks for silly old SASL checks
-	dosym . /usr/include/heimdal/include
-	dosym /usr/lib /usr/include/heimdal/lib
-
 	doinitd "${GENTOODIR}"/configs/heimdal-kdc
 	doinitd "${GENTOODIR}"/configs/heimdal-kadmind
 	doinitd "${GENTOODIR}"/configs/heimdal-kpasswdd