Version bump.

(Portage version: 2.2.0_alpha97/cvs/Linux x86_64)

3 files changed, 9 insertions, 79 deletions

diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index c717bb4270b7..c785b65e188d 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/lftp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.350 2012/04/01 14:44:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.351 2012/04/02 03:25:18 jer Exp $
+
+*lftp-4.3.6 (02 Apr 2012)
+
+  02 Apr 2012; Jeroen Roovers <jer@gentoo.org> -lftp-4.3.3.ebuild,
+  -lftp-4.3.4-r1.ebuild, +lftp-4.3.6.ebuild:
+  Version bump.
 
   01 Apr 2012; Raúl Porcel <armin76@gentoo.org> lftp-4.3.5.ebuild:
   alpha/ia64/s390/sparc stable wrt #405981
diff --git a/net-ftp/lftp/lftp-4.3.3.ebuild b/net-ftp/lftp/lftp-4.3.3.ebuild
deleted file mode 100644
index 7f664e73145e..000000000000
--- a/net-ftp/lftp/lftp-4.3.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.3.3.ebuild,v 1.11 2012/01/23 10:53:37 jer Exp $
-
-EAPI="3"
-
-inherit autotools eutils
-
-DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
-HOMEPAGE="http://lftp.yar.ru/"
-SRC_URI="http://ftp.yars.free.net/pub/source/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sparc x86 ~sparc-fbsd ~x86-fbsd"
-LFTP_LINGUAS="cs de es fr it ja ko pl pt_BR ru zh_CN zh_HK zh_TW"
-
-IUSE="
-	$( for i in ${LFTP_LINGUAS}; do echo linguas_${i}; done )
-	gnutls nls socks5 +ssl
-"
-
-RDEPEND="
-	dev-libs/expat
-	>=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 )
-	)
-	>=sys-libs/readline-5.1
-"
-
-DEPEND="
-	${RDEPEND}
-	=sys-devel/libtool-2*
-	app-arch/xz-utils
-	dev-lang/perl
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-4.0.2.91-lafile.patch"
-	epatch "${FILESDIR}/${PN}-4.0.3-autoconf-2.64.patch"
-	eautoreconf
-}
-
-src_configure() {
-	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"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-
-	dodoc BUGS ChangeLog FAQ FEATURES MIRRORS \
-			NEWS README* THANKS TODO
-}
diff --git a/net-ftp/lftp/lftp-4.3.4-r1.ebuild b/net-ftp/lftp/lftp-4.3.6.ebuild
index d8cc06af986f..bef814b858a8 100644
--- a/net-ftp/lftp/lftp-4.3.4-r1.ebuild
+++ b/net-ftp/lftp/lftp-4.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.3.4-r1.ebuild,v 1.2 2012/01/23 10:53:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.3.6.ebuild,v 1.1 2012/04/02 03:25:18 jer Exp $
 
 EAPI="4"
 
@@ -51,8 +51,7 @@ DOCS=(
 src_prepare() {
 	epatch \
 		"${FILESDIR}/${PN}-4.0.2.91-lafile.patch" \
-		"${FILESDIR}/${PN}-4.0.3-autoconf-2.64.patch" \
-		"${FILESDIR}/${PN}-4.3.4-empty-local.patch"
+		"${FILESDIR}/${PN}-4.0.3-autoconf-2.64.patch"
 	eautoreconf
 }