diff options
| author | Jeroen Roovers <jer@gentoo.org> | 2016-11-07 18:44:54 +0100 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2016-11-07 18:45:44 +0100 |
| commit | d8487d3f8eea069b02daa037777a210b178c0deb (patch) | |
| tree | 5ae995832e16a4a47e96899bc4b92a840f2aa658 /net-ftp/lftp | |
| parent | 864b6a87917fcefb853671e359811a299ac831a4 (diff) | |
| download | gentoo-d8487d3f8eea069b02daa037777a210b178c0deb.tar.gz gentoo-d8487d3f8eea069b02daa037777a210b178c0deb.tar.xz | |
net-ftp/lftp: Update live ebuild.
Package-Manager: portage-2.3.2
Diffstat (limited to 'net-ftp/lftp')
| -rw-r--r-- | net-ftp/lftp/lftp-4.7.3.ebuild | 8 | ||||
| -rw-r--r-- | net-ftp/lftp/lftp-9999.ebuild | 22 |
2 files changed, 17 insertions, 13 deletions
diff --git a/net-ftp/lftp/lftp-4.7.3.ebuild b/net-ftp/lftp/lftp-4.7.3.ebuild index e9edcfa7399..5961dc1467c 100644 --- 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 306c24a71e8..f3ab965c756 100644 --- 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 } |