3 files changed, 5 insertions, 102 deletions
diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index 8aec179aa85b..e6fff3e7d594 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/lftp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.506 2014/12/08 10:58:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.507 2014/12/08 14:40:21 jer Exp $
+
+  08 Dec 2014; Jeroen Roovers <jer@gentoo.org> -lftp-4.5.5.ebuild,
+  -files/lftp-4.5.5-no_ssl.patch:
+  Old.
 
   08 Dec 2014; Agostino Sarubbo <ago@gentoo.org> lftp-4.6.0.ebuild:
   Stable for ppc64, wrt bug #529918
diff --git a/net-ftp/lftp/files/lftp-4.5.5-no_ssl.patch b/net-ftp/lftp/files/lftp-4.5.5-no_ssl.patch
deleted file mode 100644
index 8a96e1baab80..000000000000
--- a/net-ftp/lftp/files/lftp-4.5.5-no_ssl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/ftpclass.cc
-+++ b/src/ftpclass.cc
-@@ -1071,7 +1071,9 @@
- 
-    control_send=0;
-    control_recv=0;
-+#if USE_SSL
-    control_ssl=0; // ssl should be freed after send/recv
-+#endif
- 
-    if(control_sock!=-1)
-    {
diff --git a/net-ftp/lftp/lftp-4.5.5.ebuild b/net-ftp/lftp/lftp-4.5.5.ebuild
deleted file mode 100644
index 30ad936ee819..000000000000
--- a/net-ftp/lftp/lftp-4.5.5.ebuild
+++ /dev/null
@@ -1,89 +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.5.5.ebuild,v 1.12 2014/11/02 08:59: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="http://${PN}.yar.ru/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-no_ssl.patch"
-
-	sed -i configure.ac -e 's|^AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
-	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
-}