version bump. removed stay patches and older version

Package-Manager: portage-2.1_pre9-r4

5 files changed, 27 insertions, 147 deletions

diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 4570d49f977a..a94c885de3fc 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,40 +1,42 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 944085094c0c4248bb9e1cceceff7ef3 ChangeLog 15083
-RMD160 3bdf02138cee004ce9373d81676adc9b24e0232b ChangeLog 15083
-SHA256 882ad7996b77e680b860e5c132bb257f252e977907f28b81d020cee75068e002 ChangeLog 15083
-MD5 ebf99aea8c1221683fff716424d9899d files/digest-lftp-3.0.13 241
-RMD160 8ba14ff2f1090cad3e39443680b7c03fbc2898f1 files/digest-lftp-3.0.13 241
-SHA256 92e0302bc88a3d29f92d2509db4eef56277d118e0a579d98f8fd918f8c1b6e9c files/digest-lftp-3.0.13 241
-MD5 3d4649d081975094115336130aa4a89f files/digest-lftp-3.4.2 235
-RMD160 582b5bc04ade655adf7b4ec3e68fab39f58c78f7 files/digest-lftp-3.4.2 235
-SHA256 81348bf832bbbd8f8ab8220cbcddc17ae33940f6dd9ba8cf8858ed5f48ffeb65 files/digest-lftp-3.4.2 235
-MD5 643d46493a430acea1737ec3759b7903 files/digest-lftp-3.4.4 235
-RMD160 6ac066b436289db0973cad6f9ea1ccbcc4d2bb53 files/digest-lftp-3.4.4 235
-SHA256 45bf2997cd1ace2255656fcc3402db9e7fca8785d3642eeb5a22aceef2ac9495 files/digest-lftp-3.4.4 235
-MD5 298e04149e627c6721f2723c16306fa9 files/lftp-3.3.4-blocking-ssl-transfer.patch 683
-RMD160 044bedbbe76f1b667c3f9b79528a9ff0bc6c3dfd files/lftp-3.3.4-blocking-ssl-transfer.patch 683
-SHA256 c96a852d73faae44d8af309b560f5ff5e90e57425c3509360a2faeffdd871b3b files/lftp-3.3.4-blocking-ssl-transfer.patch 683
-MD5 23f0721bdfd44bdbb7afb954d2cc7895 files/lftp-3.4.0-remote-completion-false.patch 860
-RMD160 a4113e99abe0049ed1261e6565f102799c5b3297 files/lftp-3.4.0-remote-completion-false.patch 860
-SHA256 a5c4e9296ef59452e77db5bf8d80e8981ccca61fe4abaffcd60e0a8f274fafd3 files/lftp-3.4.0-remote-completion-false.patch 860
+DIST lftp-3.0.13.tar.bz2 1223604 RMD160 a634945e0f621d4d85d10dab6ff435ee39beeab0 SHA256 ec2560dc739f7f202c6c0a4111bbc66cc60c3c550cc931a5c8ddb80b39952e98 size 1223604
+DIST lftp-3.4.4.tar.gz 1733453 RMD160 a8fc4037ab783f3203da2acd1f824d209e60737d SHA256 f6a668f1e8814534e8d7949ae75a3cf1c2fed8de112272c97e81c32aa0204ea2 size 1733453
+DIST lftp-3.4.6.tar.gz 1735847 RMD160 801b1c0f8b68e3f5917fd59ba6d80f3f64c38a8f SHA256 6731d4b40ca694a8505d16004575ff74205e83d7456c828915cf94e7b73aa8d3 size 1735847
+EBUILD lftp-3.0.13.ebuild 1596 RMD160 0c73dfb6ea8312cfd07bb014c68c56025d8cd1c7 SHA1 a92a76c2403871e78bd5b49820f25a2bd5f5027e SHA256 7d23a0937d0b9079d9d376a76c151112624237def8d131a42ee7bfb1ee8ad495 size 1596
 MD5 0f52ea029dfd546cbf78aa57410a1b5c lftp-3.0.13.ebuild 1596
 RMD160 0c73dfb6ea8312cfd07bb014c68c56025d8cd1c7 lftp-3.0.13.ebuild 1596
 SHA256 7d23a0937d0b9079d9d376a76c151112624237def8d131a42ee7bfb1ee8ad495 lftp-3.0.13.ebuild 1596
-MD5 f706e9fc090f55dc975de71053947088 lftp-3.4.2.ebuild 1779
-RMD160 4ddfa8ffb5398ba73aeaf3c4cd2127f0772332cc lftp-3.4.2.ebuild 1779
-SHA256 3e0cf0ab99b0281974b6f1398728c87d31a5d9ab9ae8ad4e8b0cc1a58613011c lftp-3.4.2.ebuild 1779
+EBUILD lftp-3.4.4.ebuild 1785 RMD160 652821a0ce0d34de5355c0e878b38a7ed7c49b99 SHA1 6f88e56220d13a1088505fc4e9265ec65a288b10 SHA256 fe690ccc128af40d192fee959fc511ec6a9c31a6577a0475eb8a2deb69d06e41 size 1785
 MD5 94670a4a11b56d490842293738854712 lftp-3.4.4.ebuild 1785
 RMD160 652821a0ce0d34de5355c0e878b38a7ed7c49b99 lftp-3.4.4.ebuild 1785
 SHA256 fe690ccc128af40d192fee959fc511ec6a9c31a6577a0475eb8a2deb69d06e41 lftp-3.4.4.ebuild 1785
+EBUILD lftp-3.4.6.ebuild 1768 RMD160 72ede8b1f122d90835e3b2bcc0cc40a42f4078a8 SHA1 294c7fdc390a351f214d5c906d2f58308cd63c40 SHA256 70b768e2b8874a0c543cc12849a62158ad99171184109ce7ba143227ed424f26 size 1768
+MD5 b7e70f09be930ad92d8778a5996a0ad9 lftp-3.4.6.ebuild 1768
+RMD160 72ede8b1f122d90835e3b2bcc0cc40a42f4078a8 lftp-3.4.6.ebuild 1768
+SHA256 70b768e2b8874a0c543cc12849a62158ad99171184109ce7ba143227ed424f26 lftp-3.4.6.ebuild 1768
+MISC ChangeLog 15361 RMD160 aeee996c8a64ee8739170c43626536fc85a87c82 SHA1 31fe43eb1a65ab6ba7437f2caa109f77f92d8f4e SHA256 3287c742330fcc81f58e202acf5707130550860a9abdb5db25fce4bf251d8ba2 size 15361
+MD5 23c308a427c212eab441ef1adf68f4bc ChangeLog 15361
+RMD160 aeee996c8a64ee8739170c43626536fc85a87c82 ChangeLog 15361
+SHA256 3287c742330fcc81f58e202acf5707130550860a9abdb5db25fce4bf251d8ba2 ChangeLog 15361
+MISC metadata.xml 430 RMD160 e522bf2928ed5c97a1e41a3443c6c26ba64847cd SHA1 0c992ae070f385380005c35321070c3c5d318eb9 SHA256 bd840a8fc0f6882e2fc2fc80aa4b3ba5a7a1b22a296d998c368ed5628baf3b82 size 430
 MD5 bd30469259dd912781df916084edcacd metadata.xml 430
 RMD160 e522bf2928ed5c97a1e41a3443c6c26ba64847cd metadata.xml 430
 SHA256 bd840a8fc0f6882e2fc2fc80aa4b3ba5a7a1b22a296d998c368ed5628baf3b82 metadata.xml 430
+MD5 ebf99aea8c1221683fff716424d9899d files/digest-lftp-3.0.13 241
+RMD160 8ba14ff2f1090cad3e39443680b7c03fbc2898f1 files/digest-lftp-3.0.13 241
+SHA256 92e0302bc88a3d29f92d2509db4eef56277d118e0a579d98f8fd918f8c1b6e9c files/digest-lftp-3.0.13 241
+MD5 643d46493a430acea1737ec3759b7903 files/digest-lftp-3.4.4 235
+RMD160 6ac066b436289db0973cad6f9ea1ccbcc4d2bb53 files/digest-lftp-3.4.4 235
+SHA256 45bf2997cd1ace2255656fcc3402db9e7fca8785d3642eeb5a22aceef2ac9495 files/digest-lftp-3.4.4 235
+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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFEPCQJmdTrptrqvGERApgZAJ4mYV8b7u+FDfXZAMDKGq0VIHQbOQCfQ1Ww
-mQhErUnN30Hvs/JllYB+6n4=
-=lGBj
+iD8DBQFETqNOmdTrptrqvGERAvcBAJ4yvAaG60DJTQezIF3S12go11j9SACfRZXU
+y29SBxkN5blPVcrgRopPdKM=
+=1QXD
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/lftp/files/digest-lftp-3.4.2 b/net-ftp/lftp/files/digest-lftp-3.4.2
deleted file mode 100644
index a67eec001d75..000000000000
--- a/net-ftp/lftp/files/digest-lftp-3.4.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c81b76b3f7a987133e8dddf55e408353 lftp-3.4.2.tar.gz 1731893
-RMD160 9e780c582517afbdf3c351f59d86abd7412050c1 lftp-3.4.2.tar.gz 1731893
-SHA256 a682431b53a8cd5c67bf4b9b2cec2753587f8299004b9026d023b1eb7c85c12a lftp-3.4.2.tar.gz 1731893
diff --git a/net-ftp/lftp/files/lftp-3.3.4-blocking-ssl-transfer.patch b/net-ftp/lftp/files/lftp-3.3.4-blocking-ssl-transfer.patch
deleted file mode 100644
index 00895b789617..000000000000
--- a/net-ftp/lftp/files/lftp-3.3.4-blocking-ssl-transfer.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: lftp_ssl.cc
-===================================================================
-RCS file: /home/lav/cvsroot/lftp/src/lftp_ssl.cc,v
-retrieving revision 1.24
-diff -u -p -r1.24 lftp_ssl.cc
---- lftp_ssl.cc	8 Nov 2005 07:21:18 -0000	1.24
-+++ lftp_ssl.cc	22 Nov 2005 12:07:34 -0000
-@@ -851,7 +851,7 @@ bool lftp_ssl_openssl::check_fatal(int r
- 
- int lftp_ssl_openssl::do_handshake()
- {
--   if(SSL_is_init_finished(ssl))
-+   if(handshake_done)
-       return DONE;
-    if(handshake_mode==SERVER)
-    {
-@@ -873,6 +873,7 @@ int lftp_ssl_openssl::do_handshake()
- 	 return ERROR;
-       }
-    }
-+   handshake_done=true;
-    return DONE;
- }
- int lftp_ssl_openssl::read(char *buf,int size)
diff --git a/net-ftp/lftp/files/lftp-3.4.0-remote-completion-false.patch b/net-ftp/lftp/files/lftp-3.4.0-remote-completion-false.patch
deleted file mode 100644
index ab6db9039ff2..000000000000
--- a/net-ftp/lftp/files/lftp-3.4.0-remote-completion-false.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: complete.cc
-===================================================================
-RCS file: /home/lav/cvsroot/lftp/src/complete.cc,v
-retrieving revision 1.70
-diff -u -p -r1.70 complete.cc
---- complete.cc	3 Nov 2004 08:37:44 -0000	1.70
-+++ complete.cc	9 Jan 2006 16:07:53 -0000
-@@ -660,7 +660,7 @@ static char **lftp_completion (const cha
- 	    type=REMOTE_DIR;
- 	 goto really_remote;
-       }
--
-+   really_local:
-       ArgV arg("", ResMgr::Query("cmd:cls-completion-default", 0));
-       fso.parse_argv(&arg);
- 
-@@ -729,7 +729,11 @@ static char **lftp_completion (const cha
-    case REMOTE_FILE:
-    case REMOTE_DIR: {
-       if(!remote_completion && !force_remote)
--	 break; // local
-+      {
-+	 if(type==REMOTE_DIR)
-+	    type=LOCAL_DIR;
-+	 goto really_local;
-+      }
-    really_remote:
-       if(!strncmp(text,"bm:",3) && !strchr(text,'/'))
-       {
diff --git a/net-ftp/lftp/lftp-3.4.2.ebuild b/net-ftp/lftp/lftp-3.4.2.ebuild
deleted file mode 100644
index 7535244b6bb5..000000000000
--- a/net-ftp/lftp/lftp-3.4.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.4.2.ebuild,v 1.2 2006/04/11 21:39:11 dragonheart Exp $
-
-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) April 2006
-SRC_URI="ftp://lftp.yar.ru/lftp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
-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
-		!ppc-macos? ( >=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_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"
-
-	use ppc-macos && myconf="${myconf} --with-included-readline"
-	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
-}