net-ftp/lftp: Update live ebuild.

Package-Manager: portage-2.3.2

diff --git a/net-ftp/lftp/lftp-4.7.3.ebuild b/net-ftp/lftp/lftp-4.7.3.ebuild
index e9edcfa7399ca8b2ea9aeb2893806bf25cd9c031..5961dc1467cf3854c8b4b85e42ce087c5c455dc4 100644 (file)
--- a/net-ftp/lftp/lftp-4.7.3.ebuild
+++ b/net-ftp/lftp/lftp-4.7.3.ebuild
@@ -69,16 +69,16 @@ src_prepare() {
 
 src_configure() {
        econf \
+               $(use_enable ipv6) \
                $(use_enable nls) \
-               $(usex ssl "$(use_with gnutls)" '--without-gnutls') \
                $(use_with idn libidn) \
-               $(use_enable ipv6) \
-               $(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \
                $(use_with socks5 socksdante "${EPREFIX}"/usr) \
-               --with-readline="${EPREFIX}"/usr \
+               $(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \
+               $(usex ssl "$(use_with gnutls)" '--without-gnutls') \
                --enable-packager-mode \
                --sysconfdir="${EPREFIX}"/etc/${PN} \
                --with-modules \
+               --with-readline="${EPREFIX}"/usr \
                --without-included-regex
 }
 

diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild
index 306c24a71e82acee67f32a220ae0d841ec636876..f3ab965c756439355f78845e229b7511cd4fa263 100644 (file)
--- a/net-ftp/lftp/lftp-9999.ebuild
+++ b/net-ftp/lftp/lftp-9999.ebuild
@@ -2,18 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 inherit autotools eutils git-r3 libtool
 
 DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
-HOMEPAGE="http://lftp.yar.ru/"
+HOMEPAGE="http://lftp.tech/"
 EGIT_REPO_URI="https://github.com/lavv17/lftp"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="convert-mozilla-cookies +gnutls idn libressl nls socks5 +ssl verify-file"
+IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls 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_}"
 
@@ -29,7 +29,7 @@ RDEPEND="
                virtual/pam
        )
        ssl? (
-               gnutls? ( >=net-libs/gnutls-1.2.3:= )
+               gnutls? ( >=net-libs/gnutls-1.2.3:0= )
                !gnutls? (
                        !libressl? ( dev-libs/openssl:0= )
                        libressl? ( dev-libs/libressl:0= )
@@ -46,7 +46,7 @@ DEPEND="
        dev-libs/gnulib
        =sys-devel/libtool-2*
        app-arch/xz-utils
-       nls? ( sys-devel/gettext )
+       nls? ( >=sys-devel/gettext-0.19 )
        virtual/pkgconfig
 "
 
@@ -54,10 +54,12 @@ DOCS=(
        BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels
        README.dnssec README.modules THANKS TODO
 )
+PATCHES=(
+       "${FILESDIR}"/${PN}-4.5.5-am_config_header.patch
+)
 
 src_prepare() {
-       epatch \
-               "${FILESDIR}"/${PN}-4.5.5-am_config_header.patch
+       default
 
        gnulib-tool --update || die
 
@@ -69,14 +71,16 @@ src_prepare() {
 
 src_configure() {
        econf \
+               $(use_enable ipv6) \
                $(use_enable nls) \
-               $(usex ssl "$(use_with gnutls)" '--without-gnutls') \
                $(use_with idn libidn) \
-               $(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \
                $(use_with socks5 socksdante "${EPREFIX}"/usr) \
+               $(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \
+               $(usex ssl "$(use_with gnutls)" '--without-gnutls') \
                --enable-packager-mode \
                --sysconfdir="${EPREFIX}"/etc/${PN} \
                --with-modules \
+               --with-readline="${EPREFIX}"/usr \
                --without-included-regex
 }