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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 33 insertions, 34 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/Manifest b/net-ftp/yafc/Manifest
index 224226268486..d2905a9cd54e 100644
--- a/net-ftp/yafc/Manifest
+++ b/net-ftp/yafc/Manifest
@@ -1,6 +1,6 @@
 AUX yafc-1.1.1-gcc4.patch 1059 RMD160 b7e5b088236c9fa587e42ab17e9d8abb9db43f16 SHA1 17215e5bb968d0d10ca590faff93cef87c81d2da SHA256 1b58aa3f23e4255265955c3ed96cb2fdcde34624ae52dc25646d60cf5006f9ce
 AUX yafc-1.1.1-heimdal_gssapi_fix.patch 1030 RMD160 60ee14973731048e0f376e0c5655d61ae9495563 SHA1 9fdf8abc123d944c905e0ae54255b4527cd66809 SHA256 8b3e1ccd89345089bc8ae2233ca3cbae0dcb570a6ba8ec5738f6d5657901a530
 DIST yafc-1.1.1.tar.bz2 858991 RMD160 1a1af7f618e9fada90b23390e64ec0ee4c8ed370 SHA1 d88132e1b389d74533f9eaa94f1a6d02787c03c8 SHA256 ab72b2ed89fb75dbe8ebd119458cf513392225f367cccfad881e9780aefcd7e6
-EBUILD yafc-1.1.1-r1.ebuild 1902 RMD160 84b2cfbd90324dfabe233c4dbc30c008bf6cf33e SHA1 7f5164e71b5154083199181c090d0662bd28da75 SHA256 8f957b8085d62673575011729d253a8e099c29005c8d598d9dbe27d4db95b7a3
-MISC ChangeLog 4496 RMD160 0e96b6c12dd7c4cece85cea9e2c4522da81439a1 SHA1 baf0dcd2ec162adaf149d79ecd934dd97f18be73 SHA256 24430e915f5e3dc2992e7fdfa80a26e7ced1eb8c818ceaffef8a0da75eaca814
+EBUILD yafc-1.1.1-r1.ebuild 1533 RMD160 811d308d43b6ac21b0c6eede372644a2d70dc089 SHA1 070b7bc9706f878bee1532df5b1f8dadec955c3d SHA256 bfe85c36338b461e4b4389bce8aa4fc105f5495eaa434b00b57f87af299f80ba
+MISC ChangeLog 4663 RMD160 d6c2fbc461d84444bd86fb2d22a999ed1a2fd95c SHA1 6a902423a0eea30fd3990815acf96e1f3fdb2177 SHA256 4929202712164b271f99a252cae5fbd6f0a543ca94238219dc415b266a118e89
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
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
 }