Version bump. Add USE=idn.

(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 22 insertions, 11 deletions

diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index 648ad974ae63..79d9be7f4445 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/lftp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.487 2014/10/10 15:31:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.488 2014/10/13 19:28:18 jer Exp $
+
+*lftp-4.6.0 (13 Oct 2014)
+
+  13 Oct 2014; Jeroen Roovers <jer@gentoo.org> lftp-4.5.5.ebuild,
+  -lftp-4.5.5.20141003.ebuild, +lftp-4.6.0.ebuild, lftp-9999.ebuild:
+  Version bump. Add USE=idn.
 
 *lftp-9999 (10 Oct 2014)
 
diff --git a/net-ftp/lftp/lftp-4.5.5.ebuild b/net-ftp/lftp/lftp-4.5.5.ebuild
index 64b0d1f419d5..197e606982ab 100644
--- a/net-ftp/lftp/lftp-4.5.5.ebuild
+++ b/net-ftp/lftp/lftp-4.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.5.5.ebuild,v 1.6 2014/10/10 10:56:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.5.5.ebuild,v 1.7 2014/10/13 19:28:18 jer Exp $
 
 EAPI=5
 inherit autotools eutils libtool
@@ -13,7 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
-IUSE="convert-mozilla-cookies +gnutls nls openssl socks5 +ssl verify-file"
+IUSE="convert-mozilla-cookies +gnutls idn nls openssl socks5 +ssl verify-file"
 LFTP_LINGUAS=( cs de es fr it ja ko pl pt_BR ru uk zh_CN zh_HK zh_TW )
 IUSE+=" ${LFTP_LINGUAS[@]/#/linguas_}"
 
@@ -27,6 +27,7 @@ RDEPEND="
 	dev-libs/expat
 	sys-libs/zlib
 	convert-mozilla-cookies? ( dev-perl/DBI )
+	idn? ( net-dns/libidn )
 	socks5? (
 		>=net-proxy/dante-1.1.12
 		virtual/pam
@@ -70,6 +71,7 @@ src_configure() {
 	econf \
 		$(use_enable nls) \
 		$(use_with gnutls) \
+		$(use_with idn libidn) \
 		$(use_with openssl openssl "${EPREFIX}"/usr) \
 		$(use_with socks5 socksdante "${EPREFIX}"/usr) \
 		--enable-packager-mode \
diff --git a/net-ftp/lftp/lftp-4.5.5.20141003.ebuild b/net-ftp/lftp/lftp-4.6.0.ebuild
index 15bebe99a848..a9638189855a 100644
--- a/net-ftp/lftp/lftp-4.5.5.20141003.ebuild
+++ b/net-ftp/lftp/lftp-4.6.0.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.5.5.20141003.ebuild,v 1.2 2014/10/10 15:31:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.6.0.ebuild,v 1.1 2014/10/13 19:28:18 jer Exp $
 
 EAPI=5
 inherit autotools eutils libtool
 
 DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
 HOMEPAGE="http://lftp.yar.ru/"
-SRC_URI="${HOMEPAGE}/ftp/devel/${P}.tar.gz"
+SRC_URI="${HOMEPAGE}/ftp/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
-IUSE="convert-mozilla-cookies +gnutls nls openssl socks5 +ssl verify-file"
+IUSE="convert-mozilla-cookies +gnutls idn nls openssl socks5 +ssl verify-file"
 LFTP_LINGUAS=( cs de es fr it ja ko pl pt_BR ru uk zh_CN zh_HK zh_TW )
 IUSE+=" ${LFTP_LINGUAS[@]/#/linguas_}"
 
@@ -27,6 +27,7 @@ RDEPEND="
 	dev-libs/expat
 	sys-libs/zlib
 	convert-mozilla-cookies? ( dev-perl/DBI )
+	idn? ( net-dns/libidn )
 	socks5? (
 		>=net-proxy/dante-1.1.12
 		virtual/pam
@@ -59,9 +60,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-4.0.2.91-lafile.patch \
 		"${FILESDIR}"/${PN}-4.3.8-gets.patch \
 		"${FILESDIR}"/${PN}-4.5.3-autopoint.patch \
-		"${FILESDIR}"/${PN}-4.5.5-nls-socks.patch
+		"${FILESDIR}"/${PN}-4.5.5-am_config_header.patch
 
-	sed -i configure.ac -e 's|^AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
 	eautoreconf
 	elibtoolize # for Darwin bundles
 }
@@ -70,6 +70,7 @@ src_configure() {
 	econf \
 		$(use_enable nls) \
 		$(use_with gnutls) \
+		$(use_with idn libidn) \
 		$(use_with openssl openssl "${EPREFIX}"/usr) \
 		$(use_with socks5 socksdante "${EPREFIX}"/usr) \
 		--enable-packager-mode \
diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild
index b1870be31e75..f57824ed66b8 100644
--- a/net-ftp/lftp/lftp-9999.ebuild
+++ b/net-ftp/lftp/lftp-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-9999.ebuild,v 1.1 2014/10/10 15:31:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-9999.ebuild,v 1.2 2014/10/13 19:28:18 jer Exp $
 
 EAPI=5
 inherit autotools eutils git-r3 libtool
@@ -13,7 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="convert-mozilla-cookies +gnutls nls openssl socks5 +ssl verify-file"
+IUSE="convert-mozilla-cookies +gnutls idn nls openssl socks5 +ssl verify-file"
 LFTP_LINGUAS=( cs de es fr it ja ko pl pt_BR ru uk zh_CN zh_HK zh_TW )
 IUSE+=" ${LFTP_LINGUAS[@]/#/linguas_}"
 
@@ -27,6 +27,7 @@ RDEPEND="
 	dev-libs/expat
 	sys-libs/zlib
 	convert-mozilla-cookies? ( dev-perl/DBI )
+	idn? ( net-dns/libidn )
 	socks5? (
 		>=net-proxy/dante-1.1.12
 		virtual/pam
@@ -71,6 +72,7 @@ src_configure() {
 	econf \
 		$(use_enable nls) \
 		$(use_with gnutls) \
+		$(use_with idn libidn) \
 		$(use_with openssl openssl "${EPREFIX}"/usr) \
 		$(use_with socks5 socksdante "${EPREFIX}"/usr) \
 		--enable-packager-mode \