diff options
| author |   Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2019-09-28 02:43:02 +0000 |
|---|---|---|
| committer |   Mike Gilbert <floppym@gentoo.org> | 2019-09-28 22:56:14 -0400 |
| commit | 9c26289544a6d7a224667b97709cdacff2abf5eb (patch) | |
| tree | 73728cb5c3d966848e6552e995da063d68a659bd | |
| parent | net-libs/neon: Fix building with dev-libs/libressl-3.0.0. (diff) | |
| download | gentoo-9c26289544a6d7a224667b97709cdacff2abf5eb.tar.gz gentoo-9c26289544a6d7a224667b97709cdacff2abf5eb.tar.bz2 gentoo-9c26289544a6d7a224667b97709cdacff2abf5eb.zip | |
net-libs/neon: Use standard behavior of gnutls / ssl USE flags.
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
| -rw-r--r-- | net-libs/neon/neon-0.30.2.ebuild | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild index eea871bc8d5e..43d846944325 100644 --- a/net-libs/neon/neon-0.30.2.ebuild +++ b/net-libs/neon/neon-0.30.2.ebuild @@ -17,19 +17,20 @@ RESTRICT="test" RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] ) !expat? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) - gnutls? ( - app-misc/ca-certificates - net-libs/gnutls:0=[${MULTILIB_USEDEP}] - pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] ) - ) - !gnutls? ( ssl? ( - libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] ) - ) ) kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] ) libproxy? ( net-libs/libproxy:0=[${MULTILIB_USEDEP}] ) nls? ( virtual/libintl:0=[${MULTILIB_USEDEP}] ) + ssl? ( + gnutls? ( + app-misc/ca-certificates + net-libs/gnutls:0=[${MULTILIB_USEDEP}] + ) + !gnutls? ( + libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) + !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) + ) + pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] ) + ) zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} virtual/pkgconfig[${MULTILIB_USEDEP}]" @@ -75,10 +76,12 @@ multilib_src_configure() { myconf+=(--with-libxml2) fi - if use gnutls; then - myconf+=(--with-ssl=gnutls --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt") - elif use ssl; then - myconf+=(--with-ssl=openssl) + if use ssl; then + if use gnutls; then + myconf+=(--with-ssl=gnutls --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt") + else + myconf+=(--with-ssl=openssl) + fi fi econf \ @@ -105,7 +108,7 @@ multilib_src_install() { } multilib_src_install_all() { - find "${ED}" -name "*.la" -delete + find "${D}" -name "*.la" -type f -delete || die dodoc AUTHORS BUGS NEWS README THANKS TODO } |