Remove built_with_use check for app-crypt/mit-krb5 because krb4 support was dropped.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

2 files changed, 31 insertions, 32 deletions

diff --git a/net-ftp/yafc/ChangeLog b/net-ftp/yafc/ChangeLog
index 53bfb2fffffe..6fe42ac9ba03 100644
--- a/net-ftp/yafc/ChangeLog
+++ b/net-ftp/yafc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/yafc
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/yafc/ChangeLog,v 1.36 2008/05/30 04:50:23 darkside Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/yafc/ChangeLog,v 1.37 2010/08/05 17:11:33 ssuominen Exp $
+
+  05 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> yafc-1.1.1-r1.ebuild:
+  Remove built_with_use check for app-crypt/mit-krb5 because krb4 support
+  was dropped.
 
   30 May 2008; Jeremy Olexa <darkside@gentoo.org> yafc-1.1.1-r1.ebuild:
   fixed compilation with USE=kerberos. Thanks to Kevin Fullerton & Fredrik
diff --git a/net-ftp/yafc/yafc-1.1.1-r1.ebuild b/net-ftp/yafc/yafc-1.1.1-r1.ebuild
index 1b6cfa0d44d8..ea339e2ca870 100644
--- a/net-ftp/yafc/yafc-1.1.1-r1.ebuild
+++ b/net-ftp/yafc/yafc-1.1.1-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/yafc/yafc-1.1.1-r1.ebuild,v 1.8 2008/05/30 04:50:23 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/yafc/yafc-1.1.1-r1.ebuild,v 1.9 2010/08/05 17:11:33 ssuominen Exp $
 
+EAPI=2
 inherit autotools eutils
 
 DESCRIPTION="Console ftp client with a lot of nifty features"
@@ -13,51 +14,45 @@ SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE="readline kerberos socks5"
 
-DEPEND="readline? ( >=sys-libs/readline-4.1-r4 )
+DEPEND="readline? ( >=sys-libs/readline-6 )
 	kerberos? ( virtual/krb5 )
 	socks5? ( net-proxy/dante )"
-RDEPEND=">=net-misc/openssh-3.0
-	${DEPEND}"
+RDEPEND="${DEPEND}
+	>=net-misc/openssh-3"
 
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc4.patch"
-	epatch "${FILESDIR}/${P}-heimdal_gssapi_fix.patch"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc4.patch \
+		"${FILESDIR}"/${P}-heimdal_gssapi_fix.patch
 
-	AT_M4DIR="cf"
-	eautoreconf
+	AT_M4DIR="cf" eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	local myconf=""
-	if use kerberos ; then
-		if has_version app-crypt/heimdal ; then
+
+	if use kerberos; then
+		if has_version app-crypt/heimdal; then
+			myconf="${myconf} --with-krb5=/usr/ --with-krb4=no --with-gssapi=/usr"
+		elif has_version app-crypt/mit-krb5; then
 			myconf="${myconf} --with-krb5=/usr/ --with-krb4=no --with-gssapi=/usr"
-		elif has_version app-crypt/mit-krb5 ; then
-			if built_with_use app-crypt/mit-krb5 krb4 ; then
-				myconf="${myconf} --with-krb5=/usr/ --with-krb4=/usr/ --with-gssapi=/usr"
-			else
-				myconf="${myconf} --with-krb5=/usr/ --with-krb4=no --with-gssapi=/usr"
-			fi
 		else
-			die "No supported kerberos provider detected"
+			ewarn "No supported kerberos providers detected"
+			myconf="${myconf} --without-krb4 --without-krb5"
 		fi
-	else
-		myconf="${myconf} --without-krb4 --without-krb5"
 	fi
-#	use kerberos && myconf="${myconf} --with-krb5=/usr/ --with-gssapi=/usr" \
-#		|| myconf="${myconf} --with-krb5=no --with-krb4=no --with-gssapi=no"
+
 	use socks5 && myconf="${myconf} --with-socks5=/usr" \
 		|| myconf="${myconf} --with-socks5=no"
+
 	use readline && myconf="${myconf} --with-readline=/usr" \
 		|| myconf="${myconf} --with-readline=no"
 
-	econf $(use_with readline) ${myconf} || die "./configure failed"
-	emake || die "emake failed"
+	econf \
+		$(use_with readline) \
+		${myconf}
 }
 
-src_install () {
-	make DESTDIR=${D} install || die
+src_install() {
+	emake DESTDIR="${D}" install || die
 	dodoc BUGS NEWS README THANKS TODO *.sample
 }