gettext not an rdepend - thanks exg. Removed old versions

(Portage version: 2.1_pre4-r1)

7 files changed, 9 insertions, 152 deletions

diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index cc00833cf2b9..9503df0f7084 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/lftp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.95 2006/02/17 21:12:19 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.96 2006/02/18 01:50:05 dragonheart Exp $
+
+  18 Feb 2006; Daniel Black <dragonheart@gentoo.org> lftp-3.0.13.ebuild,
+  -lftp-3.3.4-r1.ebuild, -lftp-3.4.0.ebuild, lftp-3.4.0-r1.ebuild:
+  gettext not an rdepend - thanks exg. Removed old versions
 
   17 Feb 2006; Fabian Groffen <grobian@gentoo.org> lftp-3.3.4-r1.ebuild:
   disable readline dependency for ppc-macos as it uses the internal readline
diff --git a/net-ftp/lftp/files/digest-lftp-3.3.4-r1 b/net-ftp/lftp/files/digest-lftp-3.3.4-r1
deleted file mode 100644
index e75f06f930d8..000000000000
--- a/net-ftp/lftp/files/digest-lftp-3.3.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3811e0e60aeb22a62d231907f08cfc32 lftp-3.3.4.tar.gz 1728880
diff --git a/net-ftp/lftp/files/digest-lftp-3.4.0 b/net-ftp/lftp/files/digest-lftp-3.4.0
deleted file mode 100644
index 812167c0a4ff..000000000000
--- a/net-ftp/lftp/files/digest-lftp-3.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6b09694b97b5eb4a939f093e221b5b8c lftp-3.4.0.tar.gz 1737033
diff --git a/net-ftp/lftp/lftp-3.0.13.ebuild b/net-ftp/lftp/lftp-3.0.13.ebuild
index f0a360a20c67..7880a4c95f35 100644
--- a/net-ftp/lftp/lftp-3.0.13.ebuild
+++ b/net-ftp/lftp/lftp-3.0.13.ebuild
@@ -1,6 +1,6 @@
 # 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.0.13.ebuild,v 1.13 2006/01/11 09:22:14 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.0.13.ebuild,v 1.14 2006/02/18 01:50:05 dragonheart Exp $
 
 inherit eutils
 
@@ -31,7 +31,7 @@ DEPEND=">=sys-libs/ncurses-5.1
 	sys-devel/bison
 	sys-devel/libtool"
 
-RDEPEND="nls? ( sys-devel/gettext )
+RDEPEND="
 	>=sys-libs/ncurses-5.1
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	virtual/libc
diff --git a/net-ftp/lftp/lftp-3.3.4-r1.ebuild b/net-ftp/lftp/lftp-3.3.4-r1.ebuild
deleted file mode 100644
index 5e63f2824f2e..000000000000
--- a/net-ftp/lftp/lftp-3.3.4-r1.ebuild
+++ /dev/null
@@ -1,75 +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.3.4-r1.ebuild,v 1.2 2006/02/17 21:12:19 grobian 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="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
-		nls? ( sys-devel/gettext )
-		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 )
-		)
-		!ppc-macos? ( sys-libs/readline )
-		virtual/libc"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	>=sys-apps/sed-4
-	sys-apps/gawk
-	sys-devel/bison
-	sys-devel/libtool"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src
-	epatch ${FILESDIR}/${P}-blocking-ssl-transfer.patch
-}
-
-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 COPYING ChangeLog FAQ FEATURES MIRRORS \
-		NEWS README* THANKS TODO
-}
diff --git a/net-ftp/lftp/lftp-3.4.0-r1.ebuild b/net-ftp/lftp/lftp-3.4.0-r1.ebuild
index 59001fd27cbe..6416bd041571 100644
--- a/net-ftp/lftp/lftp-3.4.0-r1.ebuild
+++ b/net-ftp/lftp/lftp-3.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.0-r1.ebuild,v 1.2 2006/01/11 20:36:15 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.4.0-r1.ebuild,v 1.3 2006/02/18 01:50:05 dragonheart Exp $
 
 inherit eutils
 
@@ -17,7 +17,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~spa
 IUSE="ssl gnutls socks5 nls"
 
 RDEPEND=">=sys-libs/ncurses-5.1
-		nls? ( sys-devel/gettext )
 		socks5? ( >=net-proxy/dante-1.1.12 )
 		socks5? ( virtual/pam )
 		ssl? (
@@ -28,6 +27,7 @@ RDEPEND=">=sys-libs/ncurses-5.1
 		!ppc-macos? ( >=sys-libs/readline-5.1 )"
 
 DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
 	dev-lang/perl
 	>=sys-apps/sed-4
 	sys-apps/gawk
diff --git a/net-ftp/lftp/lftp-3.4.0.ebuild b/net-ftp/lftp/lftp-3.4.0.ebuild
deleted file mode 100644
index 591281c37b03..000000000000
--- a/net-ftp/lftp/lftp-3.4.0.ebuild
+++ /dev/null
@@ -1,70 +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.0.ebuild,v 1.1 2006/01/05 10:25:53 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="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
-		nls? ( sys-devel/gettext )
-		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"
-
-DEPEND="${RDEPEND}
-	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"
-
-	# using this because of bug #95958 / bug #74815 - big faults with readline-5
-	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
-}