version bump and old version cleanout

9 files changed, 23 insertions, 166 deletions

diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index 7b6dde3ce770..ecff4356dbbc 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/lftp
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.59 2004/09/16 13:48:08 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.60 2004/09/27 08:15:54 dragonheart Exp $
+
+*lftp-3.0.9 (27 Sep 2004)
+
+  27 Sep 2004; Daniel Black <dragonheart@gentoo.org>
+  -files/lftp-3.0.7-memleak.patch, -lftp-2.6.11.ebuild, -lftp-3.0.7-r1.ebuild,
+  lftp-3.0.8.ebuild, +lftp-3.0.9.ebuild:
+  version bump and old version cleanout
 
 *lftp-3.0.8 (16 Sep 2004)
 
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 9949e7841eb2..fd1f4519fc85 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,23 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7e15ec4b7c14267a3bbf35d5bc6928b5 ChangeLog 8609
+MD5 05192c27c7e3fe55ad54a6b69a26a857 ChangeLog 8850
 MD5 12b9a2c28624e5232b2e8016de89ef77 lftp-2.6.10.ebuild 1356
-MD5 08697d1f660f48d0b1d4e9737dc05c9f lftp-2.6.11.ebuild 1361
 MD5 bd30469259dd912781df916084edcacd metadata.xml 430
-MD5 7e058edad7cd4b4a42a3372ca31fc3d4 lftp-3.0.7-r1.ebuild 1937
-MD5 4c1dfe5c7f1338180bea2821a26f3b9a lftp-3.0.8.ebuild 1809
+MD5 973d3f90c7e9e52fc1df0347f052e076 lftp-3.0.8.ebuild 1808
+MD5 d549bc5c37528be90c5e977cc92c4010 lftp-3.0.9.ebuild 1811
 MD5 4d3bdb3a88810b6157f5ecd8ea7d6ea8 lftp-3.0.6.ebuild 1629
 MD5 0000187694fd92f30e8669216ab2d7a4 files/digest-lftp-2.6.10 65
-MD5 d640fa2520c5748b7ebfba9feeae8f91 files/digest-lftp-2.6.11 65
-MD5 7b66f57f1380f19e455c42358b43ed54 files/digest-lftp-3.0.7-r1 64
 MD5 854986c25de66ff768c3277afa834b32 files/digest-lftp-3.0.8 64
+MD5 1bd10abe800fc5aac7bd57f88e2696c8 files/digest-lftp-3.0.9 64
 MD5 eceb1084634c247eeee6cc05ce894f4e files/digest-lftp-3.0.6 64
-MD5 de08110867637b5ad75b721453671510 files/lftp-3.0.7-memleak.patch 2161
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFBSZmemdTrptrqvGERAiDLAJ0Zqx8QGzmpkPnvDE1up2HnlBg/FQCdGmhQ
-PsD+hboqhySb7iie6ImOuxk=
-=EsAO
+iD8DBQFBV8xBmdTrptrqvGERAp8CAJ45da3N8yJu2itbAMM/IKQrz2GizQCdGqbT
+gjwy1Fjk3X0p+Poqc0mY7oI=
+=rS2N
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/lftp/files/digest-lftp-2.6.11 b/net-ftp/lftp/files/digest-lftp-2.6.11
deleted file mode 100644
index cd123e7ea393..000000000000
--- a/net-ftp/lftp/files/digest-lftp-2.6.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 58e67606046174175e8cdee4c74fdaf7 lftp-2.6.11.tar.bz2 1187882
diff --git a/net-ftp/lftp/files/digest-lftp-3.0.7-r1 b/net-ftp/lftp/files/digest-lftp-3.0.7-r1
deleted file mode 100644
index 5449f3a1081c..000000000000
--- a/net-ftp/lftp/files/digest-lftp-3.0.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7a7c0b7b81719d2993280efdcec91c49 lftp-3.0.7.tar.bz2 1219131
diff --git a/net-ftp/lftp/files/digest-lftp-3.0.9 b/net-ftp/lftp/files/digest-lftp-3.0.9
new file mode 100644
index 000000000000..5a5612ff5fa5
--- /dev/null
+++ b/net-ftp/lftp/files/digest-lftp-3.0.9
@@ -0,0 +1 @@
+MD5 84bfef3153eb8b88bf18467363ae4e3e lftp-3.0.9.tar.bz2 1220531
diff --git a/net-ftp/lftp/files/lftp-3.0.7-memleak.patch b/net-ftp/lftp/files/lftp-3.0.7-memleak.patch
deleted file mode 100644
index 047bbc773447..000000000000
--- a/net-ftp/lftp/files/lftp-3.0.7-memleak.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- src/SMTask.cc	2004-08-03 07:34:37.000000000 -0400
-+++ newsrc/SMTask.cc	2004-08-23 21:20:04.000000000 -0400
-@@ -221,6 +221,11 @@
-    return count;
- }
- 
-+void SMTask::Cleanup()
-+{
-+  delete init_task;
-+}
-+
- #include <errno.h>
- #include "ResMgr.h"
- ResDecl enospc_fatal ("xfer:disk-full-fatal","no",ResMgr::BoolValidate,ResMgr::NoClosure);
---- src/SMTask.h	2004-08-02 06:47:44.000000000 -0400
-+++ newsrc/SMTask.h	2004-08-23 21:19:35.000000000 -0400
-@@ -97,6 +97,8 @@
-    static int TaskCount();
-    static bool NonFatalError(int err);
-    static bool TemporaryNetworkError(int err);
-+   
-+   static void Cleanup();
- };
- 
- class SMTaskInit : public SMTask
---- src/SignalHook.cc	2003-10-03 10:18:46.000000000 -0400
-+++ newsrc/SignalHook.cc	2004-08-23 20:53:17.000000000 -0400
-@@ -93,3 +93,10 @@
-    Ignore(SIGXFSZ);  // and EFBIG
- #endif
- }
-+
-+void SignalHook::Cleanup()
-+{
-+   delete [] counts;
-+   delete [] old_handlers;
-+   delete [] old_saved;
-+}
---- src/SignalHook.h	1999-10-04 13:45:40.000000000 -0400
-+++ newsrc/SignalHook.h	2004-08-23 20:51:27.000000000 -0400
-@@ -49,6 +49,7 @@
-    static void RestoreAll();
- 
-    static void ClassInit();
-+   static void Cleanup();
- };
- 
- #endif//SIGNALHOOK_H
---- src/log.cc	2004-03-15 04:03:55.000000000 -0500
-+++ newsrc/log.cc	2004-08-24 11:18:18.062682431 -0400
-@@ -125,6 +125,10 @@
-    Write(l,buf);
- }
- 
-+void Log::Cleanup()
-+{
-+   delete global;
-+}
- Log::~Log()
- {
-    CloseOutput();
---- src/log.h	2004-02-04 16:40:06.000000000 -0500
-+++ newsrc/log.h	2004-08-23 21:03:02.000000000 -0400
-@@ -84,6 +84,8 @@
-    void ShowPID(bool yes=true) { show_pid=yes; }
-    void ShowTime(bool yes=true) { show_time=yes; }
-    void ShowContext(bool yes=true) { show_context=yes; }
-+
-+   static void Cleanup();
- };
- 
- #endif // LOG_H
---- src/lftp.cc	2004-04-16 10:27:36.000000000 -0400
-+++ newsrc/lftp.cc	2004-08-23 21:21:24.000000000 -0400
-@@ -421,6 +421,9 @@
-    ProcWait::DeleteAll();
-    DirColors::DeleteInstance();
-    IdNameCacheCleanup();
-+   SignalHook::Cleanup();
-+   Log::Cleanup();
-+   SMTask::Cleanup();
- 
-    // the tasks left: SMTaskInit, LsCache::ExpireHelper, Log::global.
-    int task_count=SMTask::TaskCount();
diff --git a/net-ftp/lftp/lftp-2.6.11.ebuild b/net-ftp/lftp/lftp-2.6.11.ebuild
deleted file mode 100644
index 5a9c0cf7f2a7..000000000000
--- a/net-ftp/lftp/lftp-2.6.11.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-2.6.11.ebuild,v 1.6 2004/06/24 22:46:41 agriffis 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"
-
-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 )"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-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"
-
-	make || die "compile problem"
-}
-
-src_install() {
-	make 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.0.8.ebuild b/net-ftp/lftp/lftp-3.0.8.ebuild
index b9664fc88c35..05c2d428a902 100644
--- a/net-ftp/lftp/lftp-3.0.8.ebuild
+++ b/net-ftp/lftp/lftp-3.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.0.8.ebuild,v 1.1 2004/09/16 13:48:08 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.0.8.ebuild,v 1.2 2004/09/27 08:15:54 dragonheart Exp $
 
 IUSE="ssl socks5 nls"
 
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="x86 ~amd64 ~ppc sparc ~alpha hppa ~mips ~ia64 ~ppc64"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	ssl? ( >=dev-libs/openssl-0.9.6 )
diff --git a/net-ftp/lftp/lftp-3.0.7-r1.ebuild b/net-ftp/lftp/lftp-3.0.9.ebuild
index 9f93e1a49c0d..c51550a6da30 100644
--- a/net-ftp/lftp/lftp-3.0.7-r1.ebuild
+++ b/net-ftp/lftp/lftp-3.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.0.7-r1.ebuild,v 1.3 2004/09/13 18:48:02 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.0.9.ebuild,v 1.1 2004/09/27 08:15:54 dragonheart Exp $
 
 IUSE="ssl socks5 nls"
 
@@ -9,12 +9,12 @@ 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"
+#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"
+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"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~hppa ~mips ~ia64 ~ppc64"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	ssl? ( >=dev-libs/openssl-0.9.6 )
@@ -37,17 +37,8 @@ RDEPEND="nls? ( sys-devel/gettext )
 	socks5? ( sys-libs/pam )
 	socks5? ( >=net-misc/dante-1.1.12 )"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/lftp-3.0.7-memleak.patch
-}
-
 src_compile() {
-	local myconf
-
-	use nls && myconf="--enable-nls" \
-		|| myconf="--disable-nls"
+	local myconf="`use_enable nls`"
 
 	use ssl && myconf="${myconf} --with-ssl=/usr" \
 		|| myconf="${myconf} --without-ssl"