finally transistioned to --with-included-readline because 5.0 is just too much - bug #95958 and bug #74815. Version bump as per bug #117810. May fix bug #112487 - gnutls unexpected end.

(Portage version: 2.1_pre3)

5 files changed, 21 insertions, 20 deletions

diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index cc42d5a15a8d..868806547471 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,15 @@
 # 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.91 2005/11/23 19:44:53 dragonheart Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.92 2006/01/05 10:25:53 dragonheart Exp $
+
+*lftp-3.4.0 (05 Jan 2006)
+
+  05 Jan 2006; Daniel Black <dragonheart@gentoo.org> -lftp-3.3.0.ebuild,
+  +lftp-3.4.0.ebuild:
+  finally transistioned to --with-included-readline because 5.0 is just too
+  much - bug #95958 and bug #74815 thankyou to all those people on those bugs.
+  Version bump as per bug #117810 - thanks Tim Harder. May fix bug #112487 -
+  gnutls unexpected end.
 
 *lftp-3.3.4-r1 (23 Nov 2005)
 
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index a92e5ee9e07c..2462e57e8810 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 4f628fd578ab0bdcd8a9152054126f43 ChangeLog 13500
 MD5 8e29dd236e9977e83aee442106844d7e files/digest-lftp-3.0.13 65
-MD5 0401db3592b8f8ee8b750f12b84cfde3 files/digest-lftp-3.3.0 63
 MD5 16ab74adb63da682a17a18f1d7885b91 files/digest-lftp-3.3.4-r1 63
+MD5 0875626252a85b8c7d94dd225754542b files/digest-lftp-3.4.0 63
 MD5 298e04149e627c6721f2723c16306fa9 files/lftp-3.3.4-blocking-ssl-transfer.patch 683
 MD5 929ba0e30bdea8ef09f54152b9aa0c8f lftp-3.0.13.ebuild 1804
-MD5 2e06b00d03a53136c81d8d8e18c6c13f lftp-3.3.0.ebuild 1777
 MD5 80fe5afdc5fdb8eb57e8f32106421fc3 lftp-3.3.4-r1.ebuild 1892
+MD5 80a60aba7ccfc7038e248b5c604cc784 lftp-3.4.0.ebuild 1829
 MD5 bd30469259dd912781df916084edcacd metadata.xml 430
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDhMbkmdTrptrqvGERAvcHAJ0djcTdBlM8DCa/il1g+WJ+PWBK1gCfaPTs
-XaZajVao521fZXL+OFzumGw=
-=mT7B
------END PGP SIGNATURE-----
diff --git a/net-ftp/lftp/files/digest-lftp-3.3.0 b/net-ftp/lftp/files/digest-lftp-3.3.0
deleted file mode 100644
index 8d92e9637dde..000000000000
--- a/net-ftp/lftp/files/digest-lftp-3.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 628176828766011dbd318851e417c963 lftp-3.3.0.tar.gz 1721496
diff --git a/net-ftp/lftp/files/digest-lftp-3.4.0 b/net-ftp/lftp/files/digest-lftp-3.4.0
new file mode 100644
index 000000000000..812167c0a4ff
--- /dev/null
+++ b/net-ftp/lftp/files/digest-lftp-3.4.0
@@ -0,0 +1 @@
+MD5 6b09694b97b5eb4a939f093e221b5b8c lftp-3.4.0.tar.gz 1737033
diff --git a/net-ftp/lftp/lftp-3.3.0.ebuild b/net-ftp/lftp/lftp-3.4.0.ebuild
index 704eebd3bd36..591281c37b03 100644
--- a/net-ftp/lftp/lftp-3.3.0.ebuild
+++ b/net-ftp/lftp/lftp-3.4.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.0.ebuild,v 1.1 2005/09/26 11:01:46 dragonheart Exp $
+# $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/"
@@ -22,7 +24,6 @@ RDEPEND=">=sys-libs/ncurses-5.1
 			gnutls? ( >=net-libs/gnutls-1.2.3 )
 			!gnutls? ( >=dev-libs/openssl-0.9.6 )
 		)
-		sys-libs/readline
 		virtual/libc"
 
 DEPEND="${RDEPEND}
@@ -47,7 +48,8 @@ src_compile() {
 	use socks5 && myconf="${myconf} --with-socksdante=/usr" \
 		|| myconf="${myconf} --without-socksdante"
 
-	use ppc-macos && myconf="${myconf} --with-included-readline"
+	# using this because of bug #95958 / bug #74815 - big faults with readline-5
+	myconf="${myconf} --with-included-readline"
 
 	econf \
 		--sysconfdir=/etc/lftp \
@@ -63,6 +65,6 @@ src_install() {
 	# hrmph, empty..
 	rm -rf ${D}/usr/lib
 
-	dodoc BUGS COPYING ChangeLog FAQ FEATURES MIRRORS \
+	dodoc BUGS ChangeLog FAQ FEATURES MIRRORS \
 		NEWS README* THANKS TODO
 }