cleanout and minor cleanup

Package-Manager: portage-2.1.2.9

6 files changed, 14 insertions, 125 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/Manifest b/net-ftp/lftp/Manifest
index 3c93cf0fc449..9730349f0978 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,37 +1,25 @@
-AUX lftp-3.4.6-nossl.patch 660 RMD160 f4c56f2fe7c491a9344e1b95785231957efb2711 SHA1 c70f57a5c8c1323d8a22d9f4c75a9d121d5ca43c SHA256 61f79d13b5c2f0cdb7abd300486396a39458192cd71b1a61c799afda1508d1fe
-MD5 c0465a6e318d1a1a11c6c322288df990 files/lftp-3.4.6-nossl.patch 660
-RMD160 f4c56f2fe7c491a9344e1b95785231957efb2711 files/lftp-3.4.6-nossl.patch 660
-SHA256 61f79d13b5c2f0cdb7abd300486396a39458192cd71b1a61c799afda1508d1fe files/lftp-3.4.6-nossl.patch 660
 AUX lftp-3.5.10-time-mdtm.patch 12072 RMD160 e40d458309602d09a7ae797c38a9d7c3c1f944cc SHA1 779618483e4583414679e19921b4ca8ae5bb0f70 SHA256 be18b8cb918e0f7ce6656abf92caee013f80dbf6855e084b5bb99888fb640602
 MD5 62e34f35776b76863d11687eeaa74c5f files/lftp-3.5.10-time-mdtm.patch 12072
 RMD160 e40d458309602d09a7ae797c38a9d7c3c1f944cc files/lftp-3.5.10-time-mdtm.patch 12072
 SHA256 be18b8cb918e0f7ce6656abf92caee013f80dbf6855e084b5bb99888fb640602 files/lftp-3.5.10-time-mdtm.patch 12072
-DIST lftp-3.4.6.tar.gz 1735847 RMD160 801b1c0f8b68e3f5917fd59ba6d80f3f64c38a8f SHA1 f438dfd390c8613776cddb109f4132f81c5c841e SHA256 6731d4b40ca694a8505d16004575ff74205e83d7456c828915cf94e7b73aa8d3
 DIST lftp-3.5.10.tar.bz2 1328779 RMD160 e52cadfa18c9f40bb57a847f99d07d4c7b5ec55f SHA1 4f2b26ce51356f91278ea0429ac342881a1c6d7f SHA256 aa5572d37dc823abd929bf41bd44c7cd54eb8ecfbb4d8833a7275afad5ea5b9f
 DIST lftp-3.5.11.tar.bz2 1330090 RMD160 a8c905073fcf13d50af11357662271985abcd220 SHA1 d9a3add50667cbdf98ee765d521b77f628612c0d SHA256 f98d16dc4fbdb83dcd03a781d4f51d1de33b10d54d99cc209bc1c905db38d45d
-EBUILD lftp-3.4.6.ebuild 1777 RMD160 02ccc9b120c9ad08f949ac37ff5fca2fb2dc92cf SHA1 b6fa9f015b5c8fda270f74bc0607df06b0543262 SHA256 0a6c6f12ea8610a4844b272c42a5f350843c73d19923d6a8e171b2d1a8a6c64a
-MD5 efbde13c4745a0e59574f782e8812a49 lftp-3.4.6.ebuild 1777
-RMD160 02ccc9b120c9ad08f949ac37ff5fca2fb2dc92cf lftp-3.4.6.ebuild 1777
-SHA256 0a6c6f12ea8610a4844b272c42a5f350843c73d19923d6a8e171b2d1a8a6c64a lftp-3.4.6.ebuild 1777
 EBUILD lftp-3.5.10.ebuild 1702 RMD160 c274854799a7a2bf1e632be15994cb8d43772fbf SHA1 80a588558023f78e1b645c033742707c662d68f8 SHA256 bc9d23fb8073ad120d2340dcdefd8260d9d89d35231538f88a8b8cdc1279ffa1
 MD5 88c8affd92f1e392c60f18648f94ee0a lftp-3.5.10.ebuild 1702
 RMD160 c274854799a7a2bf1e632be15994cb8d43772fbf lftp-3.5.10.ebuild 1702
 SHA256 bc9d23fb8073ad120d2340dcdefd8260d9d89d35231538f88a8b8cdc1279ffa1 lftp-3.5.10.ebuild 1702
-EBUILD lftp-3.5.11.ebuild 1636 RMD160 54ebd77cfa4d0b650b3c5fbe6a66a566d40ba4e3 SHA1 cd0f05a50aaeeffed8a7c8eb08261d0e053a6f49 SHA256 1de79de419390e3ee9892ff90aeb199a5f7be37c8da59e3f98e5db6ce643cf1f
-MD5 042dc97cf06dc1e17662e2116b56843a lftp-3.5.11.ebuild 1636
-RMD160 54ebd77cfa4d0b650b3c5fbe6a66a566d40ba4e3 lftp-3.5.11.ebuild 1636
-SHA256 1de79de419390e3ee9892ff90aeb199a5f7be37c8da59e3f98e5db6ce643cf1f lftp-3.5.11.ebuild 1636
-MISC ChangeLog 20722 RMD160 7f8dbc1b9b46634308f2818b35fefa0137d9d812 SHA1 c3b55c50a8765d2b942d4fbebe425df69d59a9ae SHA256 23a0d4017ff4760fe519d6aef7a9ef74a9f6727c9703a567595fc52bb4f1ec20
-MD5 816c8da2f1bc798a0db88317997a2749 ChangeLog 20722
-RMD160 7f8dbc1b9b46634308f2818b35fefa0137d9d812 ChangeLog 20722
-SHA256 23a0d4017ff4760fe519d6aef7a9ef74a9f6727c9703a567595fc52bb4f1ec20 ChangeLog 20722
+EBUILD lftp-3.5.11.ebuild 1491 RMD160 f23d3ef6d856063e424a0c7a01e044d39c9a3594 SHA1 ff03f0cd4d1f7ec59099a3dfdfcbe5782693324e SHA256 4abcc8f4a605ea6160069cf1ed28ec9e516b72dc0c6e250883b0abf051ed63e2
+MD5 d65a586a1c2148618d3104681f65f04f lftp-3.5.11.ebuild 1491
+RMD160 f23d3ef6d856063e424a0c7a01e044d39c9a3594 lftp-3.5.11.ebuild 1491
+SHA256 4abcc8f4a605ea6160069cf1ed28ec9e516b72dc0c6e250883b0abf051ed63e2 lftp-3.5.11.ebuild 1491
+MISC ChangeLog 20881 RMD160 797e2c061d961833640d7534ec90a3cbb3081560 SHA1 77120d54c45369834e318924b6f8d1038e2fe41c SHA256 5c4f6163413d851bb77a9fa1f04f69ead2c260afadef9aae757cad315c28d697
+MD5 806f8cfd28e86509ca6a75351c19841f ChangeLog 20881
+RMD160 797e2c061d961833640d7534ec90a3cbb3081560 ChangeLog 20881
+SHA256 5c4f6163413d851bb77a9fa1f04f69ead2c260afadef9aae757cad315c28d697 ChangeLog 20881
 MISC metadata.xml 430 RMD160 e522bf2928ed5c97a1e41a3443c6c26ba64847cd SHA1 0c992ae070f385380005c35321070c3c5d318eb9 SHA256 bd840a8fc0f6882e2fc2fc80aa4b3ba5a7a1b22a296d998c368ed5628baf3b82
 MD5 bd30469259dd912781df916084edcacd metadata.xml 430
 RMD160 e522bf2928ed5c97a1e41a3443c6c26ba64847cd metadata.xml 430
 SHA256 bd840a8fc0f6882e2fc2fc80aa4b3ba5a7a1b22a296d998c368ed5628baf3b82 metadata.xml 430
-MD5 3521cb857ca543b1c9346c9474bb6253 files/digest-lftp-3.4.6 235
-RMD160 88fa9abdddd8dda1c30a4dfb4e06ddb662dc694e files/digest-lftp-3.4.6 235
-SHA256 371a5c09ffb0e66d03379735df8c510e0dbbde4ea78072a093950f24bf8c3759 files/digest-lftp-3.4.6 235
 MD5 2df363acd5459310df757f0002543fe6 files/digest-lftp-3.5.10 241
 RMD160 c53b7c55bb8adad48c0be3b16b55b4f98d5fca97 files/digest-lftp-3.5.10 241
 SHA256 668797d9112251f23c2d597eb30c5ee3de876ac6eca8dc2963def441d0503e92 files/digest-lftp-3.5.10 241
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"