remove krb4 as per bug #173354

(Portage version: 2.1.2.2)

2 files changed, 25 insertions, 26 deletions

diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index 03a5f10c58b6..0dbb7c155aa5 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-crypt/heimdal
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.115 2006/12/03 22:20:43 dev-zero Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.116 2007/04/14 00:43:47 dragonheart Exp $
+
+  14 Apr 2007; <dan@gentoo.org> heimdal-0.7.2-r3.ebuild:
+  remove krb4 as per bug #173354
 
   03 Dec 2006; Tiziano Müller <dev-zero@gentoo.org> -heimdal-0.7.2.ebuild,
   -heimdal-0.7.2-r2.ebuild, heimdal-0.7.2-r3.ebuild:
diff --git a/app-crypt/heimdal/heimdal-0.7.2-r3.ebuild b/app-crypt/heimdal/heimdal-0.7.2-r3.ebuild
index 562e3894e8be..409aa743a6d4 100644
--- a/app-crypt/heimdal/heimdal-0.7.2-r3.ebuild
+++ b/app-crypt/heimdal/heimdal-0.7.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.7.2-r3.ebuild,v 1.12 2006/12/03 22:20:43 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.7.2-r3.ebuild,v 1.13 2007/04/14 00:43:47 dragonheart Exp $
 
 WANT_AUTOMAKE=1.8
 WANT_AUTOCONF=latest
@@ -19,11 +19,10 @@ SRC_URI="ftp://ftp.pdc.kth.se/pub/heimdal/src/${P}.tar.gz
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="ssl berkdb ipv6 krb4 ldap X"
+IUSE="ssl berkdb ipv6 ldap X"
 
 RDEPEND="ssl? ( dev-libs/openssl )
 	berkdb? ( sys-libs/db )
-	krb4? ( >=app-crypt/kth-krb-1.2.2-r2 )
 	ldap? ( net-nds/openldap )
 	sys-libs/ss
 	sys-libs/com_err
@@ -38,7 +37,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	EPATCH_SUFFIX="patch" epatch ${GENTOODIR}/patches
+	EPATCH_SUFFIX="patch" epatch "${GENTOODIR}"/patches
 
 	AT_M4DIR="cf" eautoreconf
 }
@@ -46,9 +45,6 @@ src_unpack() {
 src_compile() {
 	local myconf=""
 
-	use krb4 \
-		&& myconf="${myconf} --with-krb4-config=/usr/athena/bin/krb4-config"
-
 	use ldap && myconf="${myconf} --with-openldap=/usr"
 
 	econf \
@@ -56,7 +52,7 @@ src_compile() {
 		$(use_with berkdb berkeley-db) \
 		$(use_with ssl openssl) \
 		$(use_with X x) \
-		$(use_with krb4) \
+		--disable-krb4 \
 		--enable-kcm \
 		--enable-shared \
 		--includedir=/usr/include/heimdal \
@@ -69,7 +65,7 @@ src_compile() {
 	cd lib/kadm5
 	tc-export CC
 	${CC} -shared -fPIC \
-		${CFLAGS} -I${S}/include \
+		${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"
@@ -80,9 +76,9 @@ src_test() {
 	addpredict /proc/fs/nnpfs/afs_ioctl
 
 	if use X ; then
-		KRB5_CONFIG=${S}/krb5.conf Xmake check || die
+		KRB5_CONFIG="${S}"/krb5.conf Xmake check || die
 	else
-		KRB5_CONFIG=${S}/krb5.conf make check || die
+		KRB5_CONFIG="${S}"/krb5.conf make check || die
 	fi
 }
 
@@ -96,18 +92,18 @@ src_install() {
 	# Begin client rename and install
 	for i in {telnetd,ftpd,rshd}
 	do
-		mv ${D}/usr/share/man/man8/{,k}${i}.8
-		mv ${D}/usr/sbin/{,k}${i}
+		mv "${D}"/usr/share/man/man8/{,k}${i}.8
+		mv "${D}"/usr/sbin/{,k}${i}
 	done
 
 	for i in {rcp,rsh,telnet,ftp,su,login}
 	do
-		mv ${D}/usr/share/man/man1/{,k}${i}.1
-		mv ${D}/usr/bin/{,k}${i}
+		mv "${D}"/usr/share/man/man1/{,k}${i}.1
+		mv "${D}"/usr/bin/{,k}${i}
 	done
 
-	mv ${D}/usr/share/man/man5/{,k}ftpusers.5
-	mv ${D}/usr/share/man/man5/{,k}login.access.5
+	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
@@ -120,18 +116,18 @@ src_install() {
 	dosym heimdal/k524_err.h /usr/include/k524_err.h
 	dosym heimdal/krb5-protos.h /usr/include/krb5-protos.h
 
-	doinitd ${GENTOODIR}/configs/heimdal-kdc
-	doinitd ${GENTOODIR}/configs/heimdal-kadmind
-	doinitd ${GENTOODIR}/configs/heimdal-kpasswdd
+	doinitd "${GENTOODIR}"/configs/heimdal-kdc
+	doinitd "${GENTOODIR}"/configs/heimdal-kadmind
+	doinitd "${GENTOODIR}"/configs/heimdal-kpasswdd
 
 	insinto /etc
-	newins ${GENTOODIR}/configs/krb5.conf krb5.conf.example
+	newins "${GENTOODIR}"/configs/krb5.conf krb5.conf.example
 
-	sed -i "s:/lib:/$(get_libdir):" ${D}/etc/krb5.conf.example || die "sed failed"
+	sed -i "s:/lib:/$(get_libdir):" "${D}"/etc/krb5.conf.example || die "sed failed"
 
 	if use ldap; then
 		insinto /etc/openldap/schema
-		doins ${GENTOODIR}/configs/krb5-kdc.schema
+		doins "${GENTOODIR}"/configs/krb5-kdc.schema
 	fi
 
 	# default database dir