--- a/net-ftp/lftp/lftp-9999.ebuild 2015-08-09 22:34:52.000000000 +0200 +++ b/net-ftp/lftp/lftp-9999-r1.ebuild 2015-11-10 15:54:45.172482220 +0100 @@ -13,13 +13,11 @@ 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 ) ) -" +REQUIRED_USE="|| ( !gnutls !libressl )" RDEPEND=" >=sys-libs/ncurses-5.1 @@ -32,10 +30,11 @@ >=net-proxy/dante-1.1.12 virtual/pam ) - ssl? ( - gnutls? ( >=net-libs/gnutls-1.2.3 ) - openssl? ( >=dev-libs/openssl-0.9.6 ) - ) + gnutls? ( >=net-libs/gnutls-1.2.3 ) + ssl? ( !gnutls? ( + !libressl? ( >=dev-libs/openssl-0.9.6 ) + libressl? ( dev-libs/libressl ) + ) ) verify-file? ( dev-perl/string-crc32 virtual/perl-Digest-MD5 @@ -68,12 +67,20 @@ } src_configure() { + if use ssl && ! use gnutls; then + # USE="ssl -gnutls" implies OpenSSL or LibreSSL + # both are enabled with this + openssl_conf="--with-openssl=${EPREFIX}/usr" + else + openssl_conf="--without-openssl" + fi + econf \ $(use_enable nls) \ $(use_with gnutls) \ $(use_with idn libidn) \ - $(use_with openssl openssl "${EPREFIX}"/usr) \ $(use_with socks5 socksdante "${EPREFIX}"/usr) \ + "${openssl_conf}" \ --enable-packager-mode \ --sysconfdir="${EPREFIX}"/etc/${PN} \ --with-modules \