4 files changed, 5 insertions, 145 deletions
diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index e59bfd36f442..7351d1e79d83 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/lftp
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.522 2015/05/21 16:33:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.523 2015/05/25 05:29:54 jer Exp $
+
+  25 May 2015; Jeroen Roovers <jer@gentoo.org> -lftp-4.6.0.ebuild,
+  -files/lftp-4.6.0-gnutls-2-compat.patch, -files/lftp-4.6.0-no-ssl.patch:
+  Old.
 
   21 May 2015; Markus Meier <maekke@gentoo.org> lftp-4.6.2.ebuild:
   arm stable, bug #536036
diff --git a/net-ftp/lftp/files/lftp-4.6.0-gnutls-2-compat.patch b/net-ftp/lftp/files/lftp-4.6.0-gnutls-2-compat.patch
deleted file mode 100644
index 4382be08f711..000000000000
--- a/net-ftp/lftp/files/lftp-4.6.0-gnutls-2-compat.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 21823aa2b496509a7bc9bed2141d06df35d25b63 Mon Sep 17 00:00:00 2001
-From: "Alexander V. Lukyanov" <lavv17f@gmail.com>
-Date: Wed, 15 Oct 2014 08:50:19 +0400
-Subject: [PATCH] lftp_ssl.cc: fixed compilation with gnutls version < 3.0
-
----
- src/lftp_ssl.cc | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/lftp_ssl.cc b/src/lftp_ssl.cc
-index 100b90b..8ef8a8d 100644
---- a/src/lftp_ssl.cc
-+++ b/src/lftp_ssl.cc
-@@ -547,6 +547,11 @@ int lftp_ssl_gnutls::do_handshake()
- 
-    return DONE;
- }
-+
-+#ifndef GNUTLS_E_PREMATURE_TERMINATION // for gnutls < 3.0
-+# define GNUTLS_E_PREMATURE_TERMINATION GNUTLS_E_UNEXPECTED_PACKET_LENGTH
-+#endif
-+
- int lftp_ssl_gnutls::read(char *buf,int size)
- {
-    if(error)
diff --git a/net-ftp/lftp/files/lftp-4.6.0-no-ssl.patch b/net-ftp/lftp/files/lftp-4.6.0-no-ssl.patch
deleted file mode 100644
index 885733315c15..000000000000
--- a/net-ftp/lftp/files/lftp-4.6.0-no-ssl.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From db25961b46c591aecaa18e824e57a2af3d379d08 Mon Sep 17 00:00:00 2001
-From: "Alexander V. Lukyanov" <lavv17f@gmail.com>
-Date: Wed, 15 Oct 2014 08:46:09 +0400
-Subject: [PATCH] ftpclass.cc: fixed compilation without SSL (again).
-
----
- src/ftpclass.cc | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/ftpclass.cc b/src/ftpclass.cc
-index 130704d..bc148bc 100644
---- a/src/ftpclass.cc
-+++ b/src/ftpclass.cc
-@@ -1610,12 +1610,12 @@ int   Ftp::Do()
- 
-       if(expect->Has(Expect::FEAT)
-       || expect->Has(Expect::OPTS_UTF8)
--      || expect->Has(Expect::LANG)
--      || expect->Has(Expect::PROT))
-+      || expect->Has(Expect::LANG))
- 	 goto usual_return;
- 
- #if USE_SSL
--      if(expect->Has(Expect::CCC))
-+      if(expect->Has(Expect::CCC)
-+      || expect->Has(Expect::PROT))
- 	 goto usual_return;
- #endif // USE_SSL
- 
diff --git a/net-ftp/lftp/lftp-4.6.0.ebuild b/net-ftp/lftp/lftp-4.6.0.ebuild
deleted file mode 100644
index fa263949eff4..000000000000
--- a/net-ftp/lftp/lftp-4.6.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.6.0.ebuild,v 1.12 2014/12/08 10:58:58 ago Exp $
-
-EAPI=5
-inherit autotools eutils libtool
-
-DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
-HOMEPAGE="http://lftp.yar.ru/"
-SRC_URI="${HOMEPAGE}/ftp/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="convert-mozilla-cookies +gnutls idn nls openssl socks5 +ssl verify-file"
-LFTP_LINGUAS=( cs de es fr it ja ko pl pt_BR ru uk zh_CN zh_HK zh_TW )
-IUSE+=" ${LFTP_LINGUAS[@]/#/linguas_}"
-
-REQUIRED_USE="
-	ssl? ( ^^ ( openssl gnutls ) )
-"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.1
-	>=sys-libs/readline-5.1
-	dev-libs/expat
-	sys-libs/zlib
-	convert-mozilla-cookies? ( dev-perl/DBI )
-	idn? ( net-dns/libidn )
-	socks5? (
-		>=net-proxy/dante-1.1.12
-		virtual/pam
-	)
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-1.2.3 )
-		openssl? ( >=dev-libs/openssl-0.9.6 )
-	)
-	verify-file? (
-		dev-perl/string-crc32
-		virtual/perl-Digest-MD5
-	)
-"
-
-DEPEND="
-	${RDEPEND}
-	=sys-devel/libtool-2*
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-DOCS=(
-	BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels
-	README.dnssec README.modules THANKS TODO
-)
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.0.2.91-lafile.patch \
-		"${FILESDIR}"/${PN}-4.3.8-gets.patch \
-		"${FILESDIR}"/${PN}-4.5.3-autopoint.patch \
-		"${FILESDIR}"/${PN}-4.5.5-am_config_header.patch \
-		"${FILESDIR}"/${PN}-4.6.0-gnutls-2-compat.patch \
-		"${FILESDIR}"/${PN}-4.6.0-no-ssl.patch
-
-	eautoreconf
-	elibtoolize # for Darwin bundles
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with gnutls) \
-		$(use_with idn libidn) \
-		$(use_with openssl openssl "${EPREFIX}"/usr) \
-		$(use_with socks5 socksdante "${EPREFIX}"/usr) \
-		--enable-packager-mode \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--with-modules \
-		--without-included-regex
-}
-
-src_install() {
-	default
-	local script
-	for script in {convert-mozilla-cookies,verify-file}; do
-		use ${script} || { rm "${ED}"/usr/share/${PN}/${script} || die ;}
-	done
-}