version bump as per bug #110957. removed older versions

(Portage version: 2.0.53_rc7)

9 files changed, 15 insertions, 161 deletions

diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index e07d6f69e583..23a7ba0543bc 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,12 @@
 # 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.88 2005/09/26 11:01:46 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.89 2005/11/13 12:35:48 dragonheart Exp $
+
+*lftp-3.3.3 (13 Nov 2005)
+
+  13 Nov 2005; Daniel Black <dragonheart@gentoo.org> -lftp-3.1.3.ebuild,
+  -lftp-3.1.4.ebuild, -lftp-3.2.1.ebuild, +lftp-3.3.3.ebuild:
+  version bump as per bug #110957. Thanks to Philip Lafleur
 
 *lftp-3.3.0 (26 Sep 2005)
 
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 86ac4a325c1a..dc953da9dc5c 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,22 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 8ecadfed9fd2d124c21448dd7c275226 ChangeLog 12894
-MD5 2fdddf920d0ecf2c6d15688bb0c4c127 lftp-3.1.4.ebuild 1784
-MD5 48ffc4ae1771b8f83faeae280db3df68 lftp-3.2.1.ebuild 1771
-MD5 bd30469259dd912781df916084edcacd metadata.xml 430
-MD5 929ba0e30bdea8ef09f54152b9aa0c8f lftp-3.0.13.ebuild 1804
-MD5 2e06b00d03a53136c81d8d8e18c6c13f lftp-3.3.0.ebuild 1777
-MD5 9735deda8abe8d172798a8360f4dcd35 lftp-3.1.3.ebuild 1816
 MD5 8e29dd236e9977e83aee442106844d7e files/digest-lftp-3.0.13 65
-MD5 35af9c9e76180e0bebd5ac76a5b10752 files/digest-lftp-3.1.4 64
-MD5 a825d8d725203ff2ac5bd4c6d17cbdce files/digest-lftp-3.2.1 63
 MD5 0401db3592b8f8ee8b750f12b84cfde3 files/digest-lftp-3.3.0 63
-MD5 ea65aa4442e75800a316d23bbbb58ea7 files/digest-lftp-3.1.3 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDN9UxmdTrptrqvGERAsiGAJwJvi1yZG6BNpV88E8nzEiW2lvaSwCZAaWn
-vK2kWvfZrMkhfWOAIbsoRNY=
-=uwYY
------END PGP SIGNATURE-----
+MD5 500f6bc400867598be6e6ef4ee5274a5 files/digest-lftp-3.3.3 63
+MD5 929ba0e30bdea8ef09f54152b9aa0c8f lftp-3.0.13.ebuild 1804
+MD5 2e06b00d03a53136c81d8d8e18c6c13f lftp-3.3.0.ebuild 1777
+MD5 2e06b00d03a53136c81d8d8e18c6c13f lftp-3.3.3.ebuild 1777
+MD5 bd30469259dd912781df916084edcacd metadata.xml 430
diff --git a/net-ftp/lftp/files/digest-lftp-3.1.3 b/net-ftp/lftp/files/digest-lftp-3.1.3
deleted file mode 100644
index a6bc912c7922..000000000000
--- a/net-ftp/lftp/files/digest-lftp-3.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4f5016eb8e7f2f731d95c27ed0c6e8ad lftp-3.1.3.tar.bz2 1232798
diff --git a/net-ftp/lftp/files/digest-lftp-3.1.4 b/net-ftp/lftp/files/digest-lftp-3.1.4
deleted file mode 100644
index df4c2d3729f7..000000000000
--- a/net-ftp/lftp/files/digest-lftp-3.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 44ed75aa53443a8715027e846b7f4435 lftp-3.1.4.tar.bz2 1232200
diff --git a/net-ftp/lftp/files/digest-lftp-3.2.1 b/net-ftp/lftp/files/digest-lftp-3.2.1
deleted file mode 100644
index b8c7faa7c266..000000000000
--- a/net-ftp/lftp/files/digest-lftp-3.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5270eead73ad0ce164c7b71e8af68c31 lftp-3.2.1.tar.gz 1687774
diff --git a/net-ftp/lftp/files/digest-lftp-3.3.3 b/net-ftp/lftp/files/digest-lftp-3.3.3
new file mode 100644
index 000000000000..6a252535861a
--- /dev/null
+++ b/net-ftp/lftp/files/digest-lftp-3.3.3
@@ -0,0 +1 @@
+MD5 9986ccb2954562994847c968c12238e3 lftp-3.3.3.tar.gz 1724412
diff --git a/net-ftp/lftp/lftp-3.1.3.ebuild b/net-ftp/lftp/lftp-3.1.3.ebuild
deleted file mode 100644
index 6f97e0c69a0b..000000000000
--- a/net-ftp/lftp/lftp-3.1.3.ebuild
+++ /dev/null
@@ -1,69 +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.3.ebuild,v 1.4 2005/06/21 12:10:03 dragonheart 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 ~s390 ~sparc ~x86"
-IUSE="ssl socks5 nls"
-
-DEPEND=">=sys-libs/ncurses-5.1
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	!ppc-macos? ( socks5? ( >=net-proxy/dante-1.1.12
-			 sys-libs/pam )
-	)
-	nls? ( sys-devel/gettext )
-	alpha? ( dev-lang/perl )
-	alpha? ( >=sys-apps/sed-4 )
-	virtual/libc
-	sys-libs/readline
-	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
-	!ppc-macos? ( socks5? ( >=net-proxy/dante-1.1.12
-			 sys-libs/pam )
-	)"
-
-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.4.ebuild b/net-ftp/lftp/lftp-3.1.4.ebuild
deleted file mode 100644
index 1df19a329ecc..000000000000
--- a/net-ftp/lftp/lftp-3.1.4.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.4.ebuild,v 1.2 2005/06/21 12:10:03 dragonheart 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 ~s390 ~sparc ~x86"
-IUSE="ssl socks5 nls"
-
-DEPEND="nls? ( sys-devel/gettext )
-	>=sys-libs/ncurses-5.1
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	alpha? ( dev-lang/perl )
-	alpha? ( >=sys-apps/sed-4 )
-	virtual/libc
-	!ppc-macos? ( sys-libs/readline
-		socks5? ( >=net-proxy/dante-1.1.12 )
-	)
-	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
-	!ppc-macos? ( sys-libs/readline
-		socks5? ( >=net-proxy/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.2.1.ebuild b/net-ftp/lftp/lftp-3.3.3.ebuild
index becbe85c78b3..e196e09acef4 100644
--- a/net-ftp/lftp/lftp-3.2.1.ebuild
+++ b/net-ftp/lftp/lftp-3.3.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.2.1.ebuild,v 1.5 2005/08/16 05:12:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.3.3.ebuild,v 1.1 2005/11/13 12:35:48 dragonheart Exp $
 
 DESCRIPTION="A sophisticated ftp/http client, file transfer program"
 HOMEPAGE="http://ftp.yars.free.net/projects/lftp/"
@@ -34,7 +34,7 @@ DEPEND="${RDEPEND}
 
 
 src_compile() {
-	local myconf="`use_enable nls`"
+	local myconf="$(use_enable nls)"
 
 	if use ssl && use gnutls ; then
 		myconf="${myconf} --without-openssl"