cleanout and minor cleanup

(Portage version: 2.1.2.9)

5 files changed, 6 insertions, 105 deletions

diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index ba521a2b7dca..b943af0fb3fc 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/lftp
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.134 2007/07/13 09:15:34 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.135 2007/07/17 11:39:51 dragonheart Exp $
+
+  17 Jul 2007; Daniel Black <dragonheart@gentoo.org>
+  -files/lftp-3.4.6-nossl.patch, -lftp-3.4.6.ebuild, lftp-3.5.11.ebuild:
+  cleanout and minor cleanup
 
   13 Jul 2007; Roy Marples <uberlord@gentoo.org> lftp-3.5.11.ebuild:
   Keyworded ~sparc-fbsd
diff --git a/net-ftp/lftp/files/digest-lftp-3.4.6 b/net-ftp/lftp/files/digest-lftp-3.4.6
deleted file mode 100644
index c98eaece67a0..000000000000
--- a/net-ftp/lftp/files/digest-lftp-3.4.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ea74ff2bcda30a76f1aced71eed490a3 lftp-3.4.6.tar.gz 1735847
-RMD160 801b1c0f8b68e3f5917fd59ba6d80f3f64c38a8f lftp-3.4.6.tar.gz 1735847
-SHA256 6731d4b40ca694a8505d16004575ff74205e83d7456c828915cf94e7b73aa8d3 lftp-3.4.6.tar.gz 1735847
diff --git a/net-ftp/lftp/files/lftp-3.4.6-nossl.patch b/net-ftp/lftp/files/lftp-3.4.6-nossl.patch
deleted file mode 100644
index e92eee006a6c..000000000000
--- a/net-ftp/lftp/files/lftp-3.4.6-nossl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: ftpclass.cc
-===================================================================
-RCS file: /home/lav/cvsroot/lftp/src/ftpclass.cc,v
-retrieving revision 1.380
-diff -u -p -r1.380 ftpclass.cc
---- ftpclass.cc	24 Apr 2006 10:24:18 -0000	1.380
-+++ ftpclass.cc	3 May 2006 07:48:47 -0000
-@@ -1326,12 +1326,14 @@ int   Ftp::Do()
- 	 goto usual_return;
- 
-    pre_CONNECTED_STATE:
-+#if USE_SSL
-       if(ftps && (!proxy || conn->proxy_is_http))
-       {
- 	 conn->MakeSSLBuffers(hostname);
- 	 const char *initial_prot=ResMgr::Query("ftps:initial-prot",hostname);
- 	 conn->prot=initial_prot[0];
-       }
-+#endif
-       if(use_telnet_iac)
- 	 conn->InitTelnetLayer();
- 
diff --git a/net-ftp/lftp/lftp-3.4.6.ebuild b/net-ftp/lftp/lftp-3.4.6.ebuild
deleted file mode 100644
index cd134bc3820d..000000000000
--- a/net-ftp/lftp/lftp-3.4.6.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.4.6.ebuild,v 1.13 2007/05/21 19:51:46 grobian Exp $
-
-inherit eutils
-
-DESCRIPTION="A sophisticated ftp/http client, file transfer program"
-HOMEPAGE="http://lftp.yar.ru/"
-
-#SRC_URI="http://the.wiretapped.net/mirrors/lftp/${P}.tar.bz2"
-# Was a bit too slow and unreliable last time I tried (dragonheart)
-SRC_URI="ftp://lftp.yar.ru/lftp/old/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd"
-IUSE="ssl gnutls socks5 nls"
-
-RDEPEND=">=sys-libs/ncurses-5.1
-		socks5? ( >=net-proxy/dante-1.1.12 )
-		socks5? ( virtual/pam )
-		ssl? (
-			gnutls? ( >=net-libs/gnutls-1.2.3 )
-			!gnutls? ( >=dev-libs/openssl-0.9.6 )
-		)
-		virtual/libc
-		>=sys-libs/readline-5.1"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	dev-lang/perl
-	>=sys-apps/sed-4
-	sys-apps/gawk
-	sys-devel/bison
-	sys-devel/libtool"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src
-	epatch ${FILESDIR}/${P}-nossl.patch
-}
-
-src_compile() {
-	local myconf="$(use_enable nls)"
-
-	if use ssl && use gnutls ; then
-		myconf="${myconf} --without-openssl"
-	elif use ssl && ! use gnutls ; then
-		myconf="${myconf} --without-gnutls --with-openssl=/usr"
-	else
-		myconf="${myconf} --without-gnutls --without-openssl"
-	fi
-
-	use socks5 && myconf="${myconf} --with-socksdante=/usr" \
-		|| myconf="${myconf} --without-socksdante"
-
-	econf \
-		--sysconfdir=/etc/lftp \
-		--without-modules \
-		${myconf} || die "econf failed"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake install DESTDIR=${D} || die
-
-	# hrmph, empty..
-	rm -rf ${D}/usr/lib
-
-	dodoc BUGS ChangeLog FAQ FEATURES MIRRORS \
-		NEWS README* THANKS TODO
-}
diff --git a/net-ftp/lftp/lftp-3.5.11.ebuild b/net-ftp/lftp/lftp-3.5.11.ebuild
index 528cf39d984e..aa4048926a9b 100644
--- a/net-ftp/lftp/lftp-3.5.11.ebuild
+++ b/net-ftp/lftp/lftp-3.5.11.ebuild
@@ -1,14 +1,9 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.5.11.ebuild,v 1.3 2007/07/13 09:15:34 uberlord Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.5.11.ebuild,v 1.4 2007/07/17 11:39:51 dragonheart Exp $
 
 DESCRIPTION="A sophisticated ftp/sftp/http/https client and file transfer program"
 HOMEPAGE="http://lftp.yar.ru/"
-
-#SRC_URI="http://the.wiretapped.net/mirrors/lftp/${P}.tar.bz2"
-# Was a bit too slow and unreliable last time I tried (dragonheart)
 SRC_URI="ftp://lftp.yar.ru/lftp/${P}.tar.bz2"
 
 LICENSE="GPL-2"