version bump as per bug #235422

(Portage version: 2.2_rc8/cvs/Linux 2.6.22-vs2.2.0.7-gentoo x86_64)

3 files changed, 9 insertions, 79 deletions

diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index a27af5926de2..04f6b241f1c0 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/lftp
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.161 2008/06/30 21:00:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.162 2008/08/30 12:27:39 dragonheart Exp $
+
+*lftp-3.7.4 (30 Aug 2008)
+
+  30 Aug 2008; Daniel Black <dragonheart@gentoo.org> -lftp-3.6.1-r1.ebuild,
+  -lftp-3.7.1.ebuild, +lftp-3.7.4.ebuild:
+  version bump as per bug #235422
 
   30 Jun 2008; Raúl Porcel <armin76@gentoo.org> lftp-3.7.3.ebuild:
   alpha/ia64/sparc/x86 stable
diff --git a/net-ftp/lftp/lftp-3.7.1.ebuild b/net-ftp/lftp/lftp-3.7.1.ebuild
deleted file mode 100644
index 8ff166b7c829..000000000000
--- a/net-ftp/lftp/lftp-3.7.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.7.1.ebuild,v 1.2 2008/06/17 11:58:10 armin76 Exp $
-
-inherit eutils
-
-DESCRIPTION="A sophisticated ftp/sftp/http/https client and file transfer program"
-HOMEPAGE="http://lftp.yar.ru/"
-SRC_URI="http://ftp.yars.free.net/pub/source/lftp/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="ssl gnutls socks5 nls"
-
-RDEPEND=">=sys-libs/ncurses-5.1
-		socks5? (
-			>=net-proxy/dante-1.1.12
-			virtual/pam )
-		ssl? (
-			gnutls? ( >=net-libs/gnutls-1.2.3 )
-			!gnutls? ( >=dev-libs/openssl-0.9.6 )
-		)
-		virtual/libc
-		>=sys-libs/readline-5.1"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	dev-lang/perl"
-
-#src_unpack() {
-#	unpack ${A}
-#	cd "${S}"
-#
-#	epatch "${FILESDIR}"/${PV}-segfault.patch
-#	epatch "${FILESDIR}"/${PV}-specialchars.patch
-#}
-
-src_compile() {
-	local myconf="$(use_enable nls) --enable-packager-mode"
-
-	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"
-
-	econf \
-		--sysconfdir=/etc/lftp \
-		--with-modules \
-		${myconf} || die "econf failed"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-
-	dodoc BUGS ChangeLog FAQ FEATURES MIRRORS \
-			NEWS README* THANKS TODO
-}
diff --git a/net-ftp/lftp/lftp-3.6.1-r1.ebuild b/net-ftp/lftp/lftp-3.7.4.ebuild
index cb1634be0c30..51de0d1e94e9 100644
--- a/net-ftp/lftp/lftp-3.6.1-r1.ebuild
+++ b/net-ftp/lftp/lftp-3.7.4.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.6.1-r1.ebuild,v 1.6 2008/02/26 02:39:26 rich0 Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.7.4.ebuild,v 1.1 2008/08/30 12:27:39 dragonheart Exp $
 
 DESCRIPTION="A sophisticated ftp/sftp/http/https client and file transfer program"
 HOMEPAGE="http://lftp.yar.ru/"
@@ -10,7 +8,7 @@ SRC_URI="http://ftp.yars.free.net/pub/source/lftp/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="ssl gnutls socks5 nls"
 
 RDEPEND=">=sys-libs/ncurses-5.1
@@ -28,14 +26,6 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	dev-lang/perl"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PV}-segfault.patch
-	epatch "${FILESDIR}"/${PV}-specialchars.patch
-}
-
 src_compile() {
 	local myconf="$(use_enable nls) --enable-packager-mode"