Merge remote-tracking branch 'remotes/nvinson/yafc'

Pull request: https://github.com/gentoo/gentoo/pull/894

diff --git a/net-ftp/yafc/Manifest b/net-ftp/yafc/Manifest
index f190c4bfdddb18229bdcd20298b015b51a51e193..08e888af01463d5285f2aeb8e8fededad882ad45 100644 (file)
--- a/net-ftp/yafc/Manifest
+++ b/net-ftp/yafc/Manifest
@@ -1,2 +1 @@
-DIST yafc-1.2.6.tar.xz 367408 SHA256 96bd46c4dbfbff5d83cb0cec0809b2d1d73c66aff6b30fdd44a291267325b617 SHA512 155339f04eb17e63383e35573497e4838a09ac6f6608c07e8639b0e163c755c40a426f0ade941efd8ba774c6b577358dac6fd18c56bbea7d1fec57b00cb05d35 WHIRLPOOL 673ebaba7e816f3901b696004dddfa0727344aec3f6a4edd86f8dd69058d1dcbe607334a942974e7b8180519292961ce44dc5b656024eb6aa73120f9cec41947
 DIST yafc-1.3.7.tar.xz 363692 SHA256 4b3ebf62423f21bdaa2449b66d15e8d0bb04215472cb63a31d473c3c3912c1e0 SHA512 2547cf3d6f1918a5cd2d3bc29455311d48fcd7dbccfdc8ae4ce08d1fd63cfabae07b70ebf005206a61937bd5b686e19d3af095f876616a5ac4b0593e90cd39c5 WHIRLPOOL e9f0f39de54131b8fb237cda99463ff9cc8badb4cd902fced1cb3024c9379f5db1972d5ed3df58787b5f81f8d5c01a5683af06aba16bd5319574a29677465873

diff --git a/net-ftp/yafc/yafc-1.2.6.ebuild b/net-ftp/yafc/yafc-1.2.6.ebuild
deleted file mode 100644 (file)
index 3d89d53..0000000
--- a/net-ftp/yafc/yafc-1.2.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="Console ftp client with a lot of nifty features"
-HOMEPAGE="http://www.yafc-ftp.com/"
-SRC_URI="http://www.yafc-ftp.com/upload/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-IUSE="ipv6 readline kerberos socks5 ssh"
-
-DEPEND="dev-libs/openssl:0
-       readline? ( >=sys-libs/readline-6 )
-       kerberos? ( virtual/krb5 )
-       socks5? ( net-proxy/dante )
-       ssh? ( net-libs/libssh )"
-RDEPEND="${DEPEND}"
-
-DOCS=( BUGS NEWS README THANKS TODO )
-
-src_prepare() {
-       epatch_user
-}
-
-src_configure() {
-       export ac_cv_ipv6=$(usex ipv6)
-       econf \
-               $(use_with readline readline /usr) \
-               $(use_with socks5 socks /usr) \
-               $(use_with socks5 socks5 /usr) \
-               $(use_with kerberos krb5) \
-               $(use_with ssh) \
-               --with-bash-completion="$(get_bashcompdir)" \
-               --without-krb4
-}
-
-src_install() {
-       default
-       dodoc -r samples
-}