version bump

(Portage version: 2.0.51.22-r1)

10 files changed, 38 insertions, 123 deletions

diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index 61dfcf1acc63..9b1608443689 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,11 @@
 # 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.82 2005/04/22 21:19:35 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.83 2005/06/19 06:13:49 dragonheart Exp $
+
+*lftp-3.1.4 (13 Jun 2005)
+
+  13 Jun 2005; Daniel Black <dragonheart@gentoo.org> +lftp-3.1.4.ebuild:
+  version bump
 
   22 Apr 2005; Alin Nastac <mrness@gentoo.org> lftp-3.0.9.ebuild,
   lftp-3.0.12-r1.ebuild, lftp-3.0.13.ebuild, lftp-3.1.3.ebuild:
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index b82484510554..20b80c756a85 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 df472d18b2a00846b84756a94de24c88 lftp-3.1.3.ebuild 1806
-MD5 8343626da662fdd5335cac38ff42eba9 lftp-3.0.9.ebuild 1798
-MD5 e01f6ac1e305a91ce08a0e5b9defbade lftp-3.0.13.ebuild 1798
-MD5 e7a808236f906552b74e7474626a6e51 lftp-3.0.12-r1.ebuild 1902
 MD5 864337e96a2b4899883be933de7d1b98 ChangeLog 12078
+MD5 df472d18b2a00846b84756a94de24c88 lftp-3.1.4.ebuild 1806
 MD5 bd30469259dd912781df916084edcacd metadata.xml 430
-MD5 47641d36387cc209419ceea76c35e6e6 files/digest-lftp-3.0.12-r1 65
-MD5 d1af8a5cd6bafa180270376cbe244639 files/lftp-3.0.12.patch 290
+MD5 e01f6ac1e305a91ce08a0e5b9defbade lftp-3.0.13.ebuild 1798
+MD5 e7a808236f906552b74e7474626a6e51 lftp-3.0.12-r1.ebuild 1902
+MD5 8343626da662fdd5335cac38ff42eba9 lftp-3.0.9.ebuild 1798
+MD5 df472d18b2a00846b84756a94de24c88 lftp-3.1.3.ebuild 1806
 MD5 8e29dd236e9977e83aee442106844d7e files/digest-lftp-3.0.13 65
+MD5 35af9c9e76180e0bebd5ac76a5b10752 files/digest-lftp-3.1.4 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCaWp/jiC39V7gKu0RAozcAJwO2VzpZE17Nb5U7seZPCGBUXOwlACfVcXg
-Ztr5o2kHU2Xl1c4THbZHhjk=
-=MCQS
------END PGP SIGNATURE-----
+MD5 47641d36387cc209419ceea76c35e6e6 files/digest-lftp-3.0.12-r1 65
diff --git a/net-ftp/lftp/files/digest-lftp-3.0.12-r1 b/net-ftp/lftp/files/digest-lftp-3.0.12-r1
deleted file mode 100644
index 6d64ca14f7a1..000000000000
--- a/net-ftp/lftp/files/digest-lftp-3.0.12-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fa5ea556f82f8661a25203afefb5984f lftp-3.0.12.tar.bz2 1222836
diff --git a/net-ftp/lftp/files/digest-lftp-3.0.9 b/net-ftp/lftp/files/digest-lftp-3.0.9
deleted file mode 100644
index 5a5612ff5fa5..000000000000
--- a/net-ftp/lftp/files/digest-lftp-3.0.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 84bfef3153eb8b88bf18467363ae4e3e lftp-3.0.9.tar.bz2 1220531
diff --git a/net-ftp/lftp/files/digest-lftp-3.1.4 b/net-ftp/lftp/files/digest-lftp-3.1.4
new file mode 100644
index 000000000000..df4c2d3729f7
--- /dev/null
+++ b/net-ftp/lftp/files/digest-lftp-3.1.4
@@ -0,0 +1 @@
+MD5 44ed75aa53443a8715027e846b7f4435 lftp-3.1.4.tar.bz2 1232200
diff --git a/net-ftp/lftp/files/lftp-3.0.12.patch b/net-ftp/lftp/files/lftp-3.0.12.patch
deleted file mode 100644
index 06e1fad7eafe..000000000000
--- a/net-ftp/lftp/files/lftp-3.0.12.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ftpclass.cc 1 Dec 2004 12:17:44 -0000       1.343
-+++ ftpclass.cc 6 Dec 2004 11:53:17 -0000
-@@ -1091,7 +1091,8 @@ bool Ftp::GetBetterConnection(int level,
-
- void  Ftp::HandleTimeout()
- {
--   conn->quit_sent=true;
-+   if(conn)
-+      conn->quit_sent=true;
-    super::HandleTimeout();
- }
diff --git a/net-ftp/lftp/lftp-3.0.12-r1.ebuild b/net-ftp/lftp/lftp-3.0.12-r1.ebuild
deleted file mode 100644
index baf12a658413..000000000000
--- a/net-ftp/lftp/lftp-3.0.12-r1.ebuild
+++ /dev/null
@@ -1,73 +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.12-r1.ebuild,v 1.6 2005/04/22 21:19:35 mrness 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-proxy/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-proxy/dante-1.1.12 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src
-	epatch ${FILESDIR}/${P}.patch || die 'patch failed'
-}
-
-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.0.13.ebuild b/net-ftp/lftp/lftp-3.0.13.ebuild
index bb43a412a791..6080e26a34b1 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-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.13.ebuild,v 1.10 2005/04/22 21:19:35 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.0.13.ebuild,v 1.11 2005/06/19 06:13:50 dragonheart Exp $
 
 inherit eutils
 
@@ -18,13 +18,15 @@ IUSE="ssl socks5 nls"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	ssl? ( >=dev-libs/openssl-0.9.6 )
-	socks5? ( >=net-proxy/dante-1.1.12 )
+	!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
-	socks5? ( sys-libs/pam )
 	sys-apps/gawk
 	sys-devel/bison
 	sys-devel/libtool"
@@ -34,8 +36,7 @@ RDEPEND="nls? ( sys-devel/gettext )
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	virtual/libc
 	sys-libs/readline
-	socks5? ( sys-libs/pam )
-	socks5? ( >=net-proxy/dante-1.1.12 )"
+	!ppc-macos? ( socks5? ( sys-libs/pam >=net-proxy/dante-1.1.12 ) )"
 
 src_compile() {
 	local myconf="`use_enable nls`"
diff --git a/net-ftp/lftp/lftp-3.1.3.ebuild b/net-ftp/lftp/lftp-3.1.3.ebuild
index 1719acc9f8aa..9f91f8c63ee4 100644
--- a/net-ftp/lftp/lftp-3.1.3.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.3.ebuild,v 1.2 2005/04/22 21:19:35 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.1.3.ebuild,v 1.3 2005/06/19 06:13:50 dragonheart Exp $
 
 inherit eutils
 
@@ -18,13 +18,14 @@ IUSE="ssl socks5 nls"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	ssl? ( >=dev-libs/openssl-0.9.6 )
-	socks5? ( >=net-proxy/dante-1.1.12 )
+	!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
-	socks5? ( sys-libs/pam )
 	sys-apps/gawk
 	sys-devel/bison
 	sys-devel/libtool"
@@ -34,8 +35,9 @@ RDEPEND="nls? ( sys-devel/gettext )
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	virtual/libc
 	sys-libs/readline
-	socks5? ( sys-libs/pam )
-	socks5? ( >=net-proxy/dante-1.1.12 )"
+	!ppc-macos? ( socks5? ( >=net-proxy/dante-1.1.12
+			 sys-libs/pam )
+	)"
 
 src_compile() {
 	local myconf="`use_enable nls`"
diff --git a/net-ftp/lftp/lftp-3.0.9.ebuild b/net-ftp/lftp/lftp-3.1.4.ebuild
index ab32df70b7f1..2a8a6f32e2db 100644
--- a/net-ftp/lftp/lftp-3.0.9.ebuild
+++ b/net-ftp/lftp/lftp-3.1.4.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.0.9.ebuild,v 1.12 2005/04/22 21:19:35 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.1.4.ebuild,v 1.1 2005/06/19 06:13:50 dragonheart Exp $
 
 inherit eutils
 
@@ -13,18 +13,18 @@ SRC_URI="http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~ppc-macos s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc ~x86"
 IUSE="ssl socks5 nls"
 
-DEPEND=">=sys-libs/ncurses-5.1
+DEPEND="nls? ( sys-devel/gettext )
+	>=sys-libs/ncurses-5.1
 	ssl? ( >=dev-libs/openssl-0.9.6 )
-	socks5? ( >=net-proxy/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 )
+	!ppc-macos? ( sys-libs/readline
+		socks5? ( >=net-proxy/dante-1.1.12 )
+	)
 	sys-apps/gawk
 	sys-devel/bison
 	sys-devel/libtool"
@@ -33,9 +33,9 @@ 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-proxy/dante-1.1.12 )"
+	!ppc-macos? ( sys-libs/readline
+		socks5? ( >=net-proxy/dante-1.1.12 )
+	)"
 
 src_compile() {
 	local myconf="`use_enable nls`"