Version bug inspired by bug #85827. Removed 3.1.[01] because of described memory leak. Removed old version too.

(Portage version: 2.0.51.19)

9 files changed, 22 insertions, 146 deletions

diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index 2bda43c0cbb9..b29276721367 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-ftp/lftp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.80 2005/04/09 12:38:19 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.81 2005/04/21 09:21:17 dragonheart Exp $
+
+*lftp-3.1.3 (21 Apr 2005)
+
+  21 Apr 2005; Daniel Black <dragonheart@gentoo.org> -lftp-3.0.6.ebuild,
+  -lftp-3.1.0.ebuild, -lftp-3.1.1.ebuild, +lftp-3.1.3.ebuild:
+  Version bug inspired by bug #85827. Removed 3.1.[01] because of described
+  memory leak. Removed old version too. Thanks to BigBug
+  <BigBug@mafiN0_SPAMa.lv>
 
   09 Apr 2005; Markus Rothe <corsair@gentoo.org> lftp-3.0.13.ebuild:
   Stable on ppc64
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 716429363205..93e87413a5ee 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,15 +1,17 @@
 MD5 08d463a072898ee34355977621327c7a ChangeLog 11589
-MD5 e247ff3082d33b4545928cc4b1312b28 lftp-3.0.12-r1.ebuild 1900
-MD5 d2e269e311da70d4b1b46f3e88981644 lftp-3.0.13.ebuild 1796
-MD5 9135b54b9369c3225c8ab829e490bdd1 lftp-3.0.6.ebuild 1628
-MD5 64b91090cde2d0fb0385d189817c8a54 lftp-3.0.9.ebuild 1796
 MD5 526cbc0345d971ada1d5e78fb6ffa1cd lftp-3.1.0.ebuild 1809
-MD5 bd30469259dd912781df916084edcacd metadata.xml 430
 MD5 de5f8aecbf672f405d56388a3db26c5e lftp-3.1.1.ebuild 1805
-MD5 47641d36387cc209419ceea76c35e6e6 files/digest-lftp-3.0.12-r1 65
+MD5 bd30469259dd912781df916084edcacd metadata.xml 430
+MD5 d2e269e311da70d4b1b46f3e88981644 lftp-3.0.13.ebuild 1796
+MD5 e247ff3082d33b4545928cc4b1312b28 lftp-3.0.12-r1.ebuild 1900
+MD5 64b91090cde2d0fb0385d189817c8a54 lftp-3.0.9.ebuild 1796
+MD5 9135b54b9369c3225c8ab829e490bdd1 lftp-3.0.6.ebuild 1628
+MD5 de5f8aecbf672f405d56388a3db26c5e lftp-3.1.3.ebuild 1805
 MD5 8e29dd236e9977e83aee442106844d7e files/digest-lftp-3.0.13 65
-MD5 eceb1084634c247eeee6cc05ce894f4e files/digest-lftp-3.0.6 64
-MD5 1bd10abe800fc5aac7bd57f88e2696c8 files/digest-lftp-3.0.9 64
 MD5 e0632fc719d434ba6a38d7c36481cdb6 files/digest-lftp-3.1.0 64
-MD5 d1af8a5cd6bafa180270376cbe244639 files/lftp-3.0.12.patch 290
 MD5 be9a9757ba79b9babebf7d6fb9da5919 files/digest-lftp-3.1.1 64
+MD5 d1af8a5cd6bafa180270376cbe244639 files/lftp-3.0.12.patch 290
+MD5 1bd10abe800fc5aac7bd57f88e2696c8 files/digest-lftp-3.0.9 64
+MD5 ea65aa4442e75800a316d23bbbb58ea7 files/digest-lftp-3.1.3 64
+MD5 eceb1084634c247eeee6cc05ce894f4e files/digest-lftp-3.0.6 64
+MD5 47641d36387cc209419ceea76c35e6e6 files/digest-lftp-3.0.12-r1 65
diff --git a/net-ftp/lftp/files/digest-lftp-3.0.6 b/net-ftp/lftp/files/digest-lftp-3.0.6
deleted file mode 100644
index a0f13d5157ea..000000000000
--- a/net-ftp/lftp/files/digest-lftp-3.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 db6cb85639ff8c0c33406c272563ffa3 lftp-3.0.6.tar.bz2 1219493
diff --git a/net-ftp/lftp/files/digest-lftp-3.1.0 b/net-ftp/lftp/files/digest-lftp-3.1.0
deleted file mode 100644
index c646ef0693d0..000000000000
--- a/net-ftp/lftp/files/digest-lftp-3.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b5db403af9bbb69298abc9c6d6b84491 lftp-3.1.0.tar.bz2 1228182
diff --git a/net-ftp/lftp/files/digest-lftp-3.1.1 b/net-ftp/lftp/files/digest-lftp-3.1.1
deleted file mode 100644
index 723a1812fdd1..000000000000
--- a/net-ftp/lftp/files/digest-lftp-3.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 22c1c9bb14e4642320492fb751ae9943 lftp-3.1.1.tar.bz2 1229302
diff --git a/net-ftp/lftp/files/digest-lftp-3.1.3 b/net-ftp/lftp/files/digest-lftp-3.1.3
new file mode 100644
index 000000000000..a6bc912c7922
--- /dev/null
+++ b/net-ftp/lftp/files/digest-lftp-3.1.3
@@ -0,0 +1 @@
+MD5 4f5016eb8e7f2f731d95c27ed0c6e8ad lftp-3.1.3.tar.bz2 1232798
diff --git a/net-ftp/lftp/lftp-3.0.6.ebuild b/net-ftp/lftp/lftp-3.0.6.ebuild
deleted file mode 100644
index cc50f1c238bc..000000000000
--- a/net-ftp/lftp/lftp-3.0.6.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.0.6.ebuild,v 1.12 2005/01/22 18:30:23 kloeri Exp $
-
-IUSE="ssl socks5 nls"
-
-inherit eutils
-
-DESCRIPTION="A sophisticated ftp/http client, file transfer program."
-HOMEPAGE="http://ftp.yars.free.net/projects/lftp/"
-SRC_URI="http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/${P}.tar.bz2"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64 ppc sparc alpha hppa ~mips ~ia64 ppc64"
-
-DEPEND=">=sys-libs/ncurses-5.1
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	socks5? ( >=net-misc/dante-1.1.12 )
-	nls? ( sys-devel/gettext )
-	alpha? ( dev-lang/perl )
-	alpha? ( >=sys-apps/sed-4 )
-	virtual/libc
-	sys-libs/readline
-	socks5? ( sys-libs/pam )
-	sys-apps/gawk
-	sys-devel/bison
-	sys-devel/libtool"
-
-RDEPEND="nls? ( sys-devel/gettext )
-	>=sys-libs/ncurses-5.1
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	virtual/libc
-	sys-libs/readline
-	socks5? ( sys-libs/pam )
-	socks5? ( >=net-misc/dante-1.1.12 )"
-
-src_compile() {
-	local myconf
-
-	use nls && myconf="--enable-nls" \
-		|| myconf="--disable-nls"
-
-	use ssl && myconf="${myconf} --with-ssl=/usr" \
-		|| myconf="${myconf} --without-ssl"
-
-	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 COPYING ChangeLog FAQ FEATURES MIRRORS \
-		NEWS README* THANKS TODO
-}
diff --git a/net-ftp/lftp/lftp-3.1.1.ebuild b/net-ftp/lftp/lftp-3.1.1.ebuild
deleted file mode 100644
index 711eec5a779c..000000000000
--- a/net-ftp/lftp/lftp-3.1.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.1.1.ebuild,v 1.1 2005/03/25 12:42:26 ka0ttic Exp $
-
-inherit eutils
-
-DESCRIPTION="A sophisticated ftp/http client, file transfer program"
-HOMEPAGE="http://ftp.yars.free.net/projects/lftp/"
-
-#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="http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc ~x86"
-IUSE="ssl socks5 nls"
-
-DEPEND=">=sys-libs/ncurses-5.1
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	socks5? ( >=net-misc/dante-1.1.12 )
-	nls? ( sys-devel/gettext )
-	alpha? ( dev-lang/perl )
-	alpha? ( >=sys-apps/sed-4 )
-	virtual/libc
-	sys-libs/readline
-	socks5? ( sys-libs/pam )
-	sys-apps/gawk
-	sys-devel/bison
-	sys-devel/libtool"
-
-RDEPEND="nls? ( sys-devel/gettext )
-	>=sys-libs/ncurses-5.1
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	virtual/libc
-	sys-libs/readline
-	socks5? ( sys-libs/pam )
-	socks5? ( >=net-misc/dante-1.1.12 )"
-
-src_compile() {
-	local myconf="`use_enable nls`"
-
-	use ssl && myconf="${myconf} --with-ssl=/usr" \
-		|| myconf="${myconf} --without-ssl"
-
-	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 COPYING ChangeLog FAQ FEATURES MIRRORS \
-		NEWS README* THANKS TODO
-}
diff --git a/net-ftp/lftp/lftp-3.1.0.ebuild b/net-ftp/lftp/lftp-3.1.3.ebuild
index 92b3c43e153e..a590e2c7bced 100644
--- a/net-ftp/lftp/lftp-3.1.0.ebuild
+++ b/net-ftp/lftp/lftp-3.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.1.0.ebuild,v 1.1 2005/03/02 08:42:10 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.1.3.ebuild,v 1.1 2005/04/21 09:21:17 dragonheart Exp $
 
 inherit eutils