Version bump.

Package-Manager: portage-2.2.0_alpha97/cvs/Linux x86_64

4 files changed, 15 insertions, 87 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/Manifest b/net-ftp/lftp/Manifest
index 762da3c8b962..8ab4740dd126 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -4,18 +4,16 @@ Hash: SHA1
 AUX lftp-4.0.2.91-lafile.patch 976 RMD160 1a866fa1340bfc3d1f634cabadf44883e9a01d93 SHA1 e5e646839a6e48f0b504a2720947462410f76710 SHA256 b54aac35c297657290a2d9571c38bdc4bf51548f826b4ec958a768c398c0cd0b
 AUX lftp-4.0.3-autoconf-2.64.patch 582 RMD160 74f242cb445a790e6bd6987eef32db1cd59c0ef9 SHA1 58289a37b786b39ec23dfeabf52bc6b73802e1fb SHA256 f8e6e1d4e114d7e122b1762f9382027541357c39f129f9d2aad9edd93659f53e
 AUX lftp-4.3.4-empty-local.patch 757 RMD160 64b6c36dcd4610441469accd7f417f7426c122be SHA1 498c5bff4c712de91c74b789868e333cab5d8a03 SHA256 9998e639389dda85fc3afe80e7d403c9be99e89551e1d5faa85be9c50f9a9af3
-DIST lftp-4.3.3.tar.xz 1382904 RMD160 5fab0c8d045b103064fa3724a86b25330fe169bb SHA1 3950fc6f1a003bcf363bfbf222fda8353782677e SHA256 71b0943193e72ea7321eeb326714082cea921de5f6f6f5d43bca414933780356
-DIST lftp-4.3.4.tar.xz 1386836 RMD160 b642e97b026a5adf4abfa6ed1c8d1f0fe6fccddd SHA1 9d08eb0341afa5b050a02e411aa713910508ee80 SHA256 f9d7a2fbba0837649191969ebb453a2f2afa142f9d816329d0897e6ea79b5592
 DIST lftp-4.3.5.tar.xz 1390824 RMD160 ade90b7b81f8afd1ef227cc17053b37bc0e800dd SHA1 84fe038bc4e7876eda8486e1022c471baaec1a7b SHA256 eab9d67518b861a5b0aed6a865ca36a385cb1d02341060800c3ec60868db36e8
-EBUILD lftp-4.3.3.ebuild 1831 RMD160 37c56871d6435a9bf850e70b9d2f1131fac24edd SHA1 ac3a985efb43685ec656772f9f2c4c98e67ae1d2 SHA256 78b10c6ac34b1fb2b900359aeacade0a75dc448ca5d20a3d57c4a747966e1922
-EBUILD lftp-4.3.4-r1.ebuild 1872 RMD160 d20afac1f4c32236eb3d8787fc4b19683e53bc49 SHA1 f6508c15f7eb33f2507461da3336ab259252704e SHA256 08dd1939cff9b55b52794a540d9e7bb7abf18a1ecfd13cff0a07b5504361e74a
+DIST lftp-4.3.6.tar.xz 1401712 RMD160 b1f8a5f7e1618185a82100db2b7a0470cfb6dbdd SHA1 804865712a66c229c291a789ec68d9c26ab5546c SHA256 89821cf38428f01ce20d646654bd4352a9a037664f7068f2aa82cf1984e45473
 EBUILD lftp-4.3.5.ebuild 1815 RMD160 84e25d6e28ed92d124125fa51d3b6c478821b962 SHA1 ca624c3db5a4ad64e83281d5547adcffcae47417 SHA256 0d3122944963824bb2ab419dc59361677b02e2b1f1c7f44d526ac540170981fc
-MISC ChangeLog 45303 RMD160 ae7eb04c7c7e12929d8b4f4c79fdad42930594d4 SHA1 e77af221d2548948a223c1a29d6c7d41840dda2d SHA256 96259953ae0d19c4f049a20282064b3988baad2d50240a256e1a111fc0186272
+EBUILD lftp-4.3.6.ebuild 1821 RMD160 b14de2f1e7adb4e819158918d3e73ce3c60cb5b8 SHA1 4cabe82a24ab6477d35ec66c23d25905d6d176bb SHA256 2522eaea3533a5d3d6b0d97f27a2c9f4bc19e433d56e99bf81a283b000ed40b7
+MISC ChangeLog 45455 RMD160 4ee6d688ace9390770c7b3b1d1af170921f2b32a SHA1 7c15e6ba256a09a7e34c57e6353729b8413faa1d SHA256 4ea8401a5c4fa80f2833bacb0e2fd80e9113b917dc686b3ac34f5bc7a86dce52
 MISC metadata.xml 228 RMD160 8cae9a76060d0e86296c88ea3502a4b3332785e9 SHA1 2de5cb3b0c34ae32a689804ca7524b7a71f86493 SHA256 766b4854103b92707706451db11bd895a0f63036677fdcbff2bccb8de5d6d289
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk94aecACgkQuQc30/atMkDh+wCfW9WL8LD+QnBl/KTerB519R/8
-+G8Anib2qoUwfijfElUZ1vUs/ZuqFAiV
-=uh7f
+iEYEARECAAYFAk95HCQACgkQVWmRsqeSphNebQCeOqxH8KqjmjnXmudUj7VDV7m3
+a9wAnRvOqZjo8ysi3lS6eGS6kEDwbXnJ
+=7F9U
 -----END PGP SIGNATURE-----
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
 }