x86 stable - removed memory leaking and excess versions

9 files changed, 16 insertions, 193 deletions

diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index 909ba2d122cc..3a3163208bbc 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,10 @@
 # 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.56 2004/09/11 16:25:15 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.57 2004/09/13 11:18:56 dragonheart Exp $
+
+  13 Sep 2004; Daniel Black <dragonheart@gentoo.org> lftp-3.0.7-r1.ebuild,
+  -lftp-3.0.7.ebuild, -lftp-3.0.3.ebuild, -lftp-3.0.2.ebuild:
+  x86 stable - removed memory leaking and excess versions
 
   11 Sep 2004; Tom Martin <slarti@gentoo.org> lftp-3.0.6.ebuild:
   Stable on amd64.
@@ -10,7 +14,7 @@
 
 *lftp-3.0.7-r1 (27 Aug 2004)
 
-  27 Aug 2004; <dan@gentoo.org> +files/lftp-3.0.7-memleak.patch,
+  27 Aug 2004; <dragonheart@gentoo.org> +files/lftp-3.0.7-memleak.patch,
   +lftp-3.0.7-r1.ebuild:
   Memory leak fixed - thanks to Luke Macken in bug #61335. OSX fix thanks to
   Miguel Sousa Filipe in bug #61349
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 05d1793674f1..5206fbebc74d 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,27 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 62c0e6cceacfea18a633fdcb972e3bdc lftp-3.0.3.ebuild 1360
+MD5 74c6445bdee18d14e5c522bbc6db6aa5 ChangeLog 8307
 MD5 12b9a2c28624e5232b2e8016de89ef77 lftp-2.6.10.ebuild 1356
-MD5 cb6332f049aa4315def19df02f538af0 lftp-3.0.7.ebuild 1767
-MD5 b8efc5c19381f538632f196250ef98a0 lftp-3.0.2.ebuild 1360
-MD5 084647c41f99b314955b38d3e284cb91 lftp-3.0.7-r1.ebuild 1944
 MD5 08697d1f660f48d0b1d4e9737dc05c9f lftp-2.6.11.ebuild 1361
-MD5 4d3bdb3a88810b6157f5ecd8ea7d6ea8 lftp-3.0.6.ebuild 1629
-MD5 1f6847da5a778a700a2c0318794c3f21 ChangeLog 8098
 MD5 bd30469259dd912781df916084edcacd metadata.xml 430
-MD5 7b66f57f1380f19e455c42358b43ed54 files/digest-lftp-3.0.7-r1 64
+MD5 e44ec29304652a8bd082391d8f320ff8 lftp-3.0.7-r1.ebuild 1943
+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 ba66deeb3a908e8a736d776bd858bfc2 files/digest-lftp-3.0.2 64
-MD5 295df847317ee8c852dc8b6f4f200812 files/digest-lftp-3.0.3 64
+MD5 7b66f57f1380f19e455c42358b43ed54 files/digest-lftp-3.0.7-r1 64
 MD5 eceb1084634c247eeee6cc05ce894f4e files/digest-lftp-3.0.6 64
-MD5 7b66f57f1380f19e455c42358b43ed54 files/digest-lftp-3.0.7 64
 MD5 de08110867637b5ad75b721453671510 files/lftp-3.0.7-memleak.patch 2161
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFBQyb+CHk4+ZoBpvsRAq11AJ0fREopnJfp7NMlBLIL1ea/hEjv0wCbBXQe
-TsNHHqFKrfByQPHwXlQKaDA=
-=+QWt
+iD8DBQFBRYJEmdTrptrqvGERAoxHAJ9YtPjv3r0VTe2WP2hOaOviiMQQDQCgimT2
+mhJJW7BRG4EOBjAraUE+rCo=
+=dg9d
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/lftp/files/digest-lftp-3.0.2 b/net-ftp/lftp/files/digest-lftp-3.0.2
deleted file mode 100644
index 0591c7b76f6d..000000000000
--- a/net-ftp/lftp/files/digest-lftp-3.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 45d11d68fc2e1dd62939db7b28996bea lftp-3.0.2.tar.bz2 1214608
diff --git a/net-ftp/lftp/files/digest-lftp-3.0.3 b/net-ftp/lftp/files/digest-lftp-3.0.3
deleted file mode 100644
index 4c9982780be7..000000000000
--- a/net-ftp/lftp/files/digest-lftp-3.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ee346d91ecd280a8e7f6ea406ceed144 lftp-3.0.3.tar.bz2 1214354
diff --git a/net-ftp/lftp/files/digest-lftp-3.0.7 b/net-ftp/lftp/files/digest-lftp-3.0.7
deleted file mode 100644
index 5449f3a1081c..000000000000
--- a/net-ftp/lftp/files/digest-lftp-3.0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7a7c0b7b81719d2993280efdcec91c49 lftp-3.0.7.tar.bz2 1219131
diff --git a/net-ftp/lftp/lftp-3.0.2.ebuild b/net-ftp/lftp/lftp-3.0.2.ebuild
deleted file mode 100644
index 896fe58e33d4..000000000000
--- a/net-ftp/lftp/lftp-3.0.2.ebuild
+++ /dev/null
@@ -1,52 +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-3.0.2.ebuild,v 1.3 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.3.ebuild b/net-ftp/lftp/lftp-3.0.3.ebuild
deleted file mode 100644
index f2d88d2e6bfd..000000000000
--- a/net-ftp/lftp/lftp-3.0.3.ebuild
+++ /dev/null
@@ -1,52 +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-3.0.3.ebuild,v 1.3 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.7-r1.ebuild b/net-ftp/lftp/lftp-3.0.7-r1.ebuild
index 09f4087a6f81..ec499b47534b 100644
--- a/net-ftp/lftp/lftp-3.0.7-r1.ebuild
+++ b/net-ftp/lftp/lftp-3.0.7-r1.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.1 2004/08/26 21:15:09 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.0.7-r1.ebuild,v 1.2 2004/09/13 11:18:56 dragonheart Exp $
 
 IUSE="ssl socks5 nls"
 
@@ -14,7 +14,7 @@ SRC_URI="http://the.wiretapped.net/mirrors/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 )
diff --git a/net-ftp/lftp/lftp-3.0.7.ebuild b/net-ftp/lftp/lftp-3.0.7.ebuild
deleted file mode 100644
index e7b95aac36d4..000000000000
--- a/net-ftp/lftp/lftp-3.0.7.ebuild
+++ /dev/null
@@ -1,68 +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-3.0.7.ebuild,v 1.2 2004/08/19 02:39:41 gustavoz 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://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"
-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
-}