commit: dfea0f2cbb18555fee4a2032a096f39ed4de067f Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> AuthorDate: Thu Jun 9 15:58:51 2016 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Thu Jun 9 16:00:16 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfea0f2c
net-ftp/lftp: add libressl support, bug #565388 See https://github.com/gentoo/gentoo/pull/1199 Package-Manager: portage-2.2.28 .../{lftp-9999.ebuild => lftp-4.7.2-r1.ebuild} | 42 +++++++++++----------- net-ftp/lftp/lftp-9999.ebuild | 15 ++++---- 2 files changed, 27 insertions(+), 30 deletions(-) diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-4.7.2-r1.ebuild similarity index 59% copy from net-ftp/lftp/lftp-9999.ebuild copy to net-ftp/lftp/lftp-4.7.2-r1.ebuild index 1431458..ee27925 100644 --- a/net-ftp/lftp/lftp-9999.ebuild +++ b/net-ftp/lftp/lftp-4.7.2-r1.ebuild @@ -3,24 +3,20 @@ # $Id$ EAPI=5 -inherit autotools eutils git-r3 libtool +inherit autotools eutils libtool DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program" HOMEPAGE="http://lftp.yar.ru/"; -EGIT_REPO_URI="https://github.com/lavv17/lftp"; +SRC_URI="${HOMEPAGE}ftp/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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 idn nls openssl 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_}" -REQUIRED_USE=" - ssl? ( ^^ ( openssl gnutls ) ) -" - RDEPEND=" >=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= @@ -33,8 +29,11 @@ RDEPEND=" virtual/pam ) ssl? ( - gnutls? ( >=net-libs/gnutls-1.2.3:= ) - openssl? ( dev-libs/openssl:0= ) + gnutls? ( >=net-libs/gnutls-1.2.3:0= ) + !gnutls? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) ) verify-file? ( dev-perl/String-CRC32 @@ -44,10 +43,9 @@ RDEPEND=" DEPEND=" ${RDEPEND} - dev-libs/gnulib =sys-devel/libtool-2* app-arch/xz-utils - nls? ( sys-devel/gettext ) + nls? ( >=sys-devel/gettext-0.19 ) virtual/pkgconfig " @@ -58,22 +56,24 @@ DOCS=( src_prepare() { epatch \ - "${FILESDIR}"/${PN}-4.5.5-am_config_header.patch - - gnulib-tool --update || die - - chmod +x build-aux/git-version-gen || die + "${FILESDIR}"/${PN}-4.0.2.91-lafile.patch \ + "${FILESDIR}"/${PN}-4.5.5-am_config_header.patch \ + "${FILESDIR}"/${PN}-4.7.0-gettext.patch eautoreconf elibtoolize # for Darwin bundles + + # bug #536036 + printf 'set fish:auto-confirm no\nset sftp:auto-confirm no\n' >> ${PN}.conf || die } src_configure() { econf \ $(use_enable nls) \ - $(use_with gnutls) \ + $(usex ssl "$(use_with gnutls)" '--without-gnutls') \ $(use_with idn libidn) \ - $(use_with openssl openssl "${EPREFIX}"/usr) \ + $(use_enable ipv6) \ + $(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \ $(use_with socks5 socksdante "${EPREFIX}"/usr) \ --enable-packager-mode \ --sysconfdir="${EPREFIX}"/etc/${PN} \ @@ -82,9 +82,7 @@ src_configure() { } src_install() { - # FIXME: MKDIR_P is not getting picked up in po/Makefile - emake DESTDIR="${D}" mkdir_p="mkdir -p" install - + default local script for script in {convert-mozilla-cookies,verify-file}; do use ${script} || { rm "${ED}"/usr/share/${PN}/${script} || die ;} diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild index 1431458..306c24a7 100644 --- a/net-ftp/lftp/lftp-9999.ebuild +++ b/net-ftp/lftp/lftp-9999.ebuild @@ -13,14 +13,10 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="" -IUSE="convert-mozilla-cookies +gnutls idn nls openssl socks5 +ssl verify-file" +IUSE="convert-mozilla-cookies +gnutls idn 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_}" -REQUIRED_USE=" - ssl? ( ^^ ( openssl gnutls ) ) -" - RDEPEND=" >=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= @@ -34,7 +30,10 @@ RDEPEND=" ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:= ) - openssl? ( dev-libs/openssl:0= ) + !gnutls? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) ) verify-file? ( dev-perl/String-CRC32 @@ -71,9 +70,9 @@ src_prepare() { src_configure() { econf \ $(use_enable nls) \ - $(use_with gnutls) \ + $(usex ssl "$(use_with gnutls)" '--without-gnutls') \ $(use_with idn libidn) \ - $(use_with openssl openssl "${EPREFIX}"/usr) \ + $(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \ $(use_with socks5 socksdante "${EPREFIX}"/usr) \ --enable-packager-mode \ --sysconfdir="${EPREFIX}"/etc/${PN} \
