net-vpn/openvpn: [QA] Fix USE=libressl semantics

Closes: https://bugs.gentoo.org/683990
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: David Seifert <soap@gentoo.org>

diff --git a/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild
index 81d3d655a3838d0f495b50f870bec9f09d418106..d90a72c8b4e05e0dd4114ed85f6d21022d460cfb 100644 (file)
--- a/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild
@@ -18,7 +18,6 @@ IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
 IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD"
 
 REQUIRED_USE="static? ( !plugins !pkcs11 )
-       mbedtls? ( ssl !libressl )
        pkcs11? ( ssl )
        !plugins? ( !pam !down-root )
        inotify? ( plugins )"
@@ -72,9 +71,9 @@ src_configure() {
        IFCONFIG=/bin/ifconfig \
        ROUTE=/bin/route \
        econf \
-               $(usex mbedtls '--with-crypto-library=mbedtls' '') \
                $(use_enable inotify async-push) \
                $(use_enable ssl crypto) \
+               $(use_with ssl crypto-library $(usex mbedtls mbedtls openssl)) \
                $(use_enable lz4) \
                $(use_enable lzo) \
                $(use_enable pkcs11) \

diff --git a/net-vpn/openvpn/openvpn-2.4.6.ebuild b/net-vpn/openvpn/openvpn-2.4.6.ebuild
index 09a11b23f0474c51ae748f3a0f53a6608124869d..41badc7b0794db305839213cf64e52f20a86cca6 100644 (file)
--- a/net-vpn/openvpn/openvpn-2.4.6.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,6 @@ IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
 IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD"
 
 REQUIRED_USE="static? ( !plugins !pkcs11 )
-       mbedtls? ( ssl !libressl )
        pkcs11? ( ssl )
        !plugins? ( !pam !down-root )
        inotify? ( plugins )"
@@ -31,8 +30,8 @@ CDEPEND="
        pam? ( virtual/pam )
        ssl? (
                !mbedtls? (
-                       !libressl? ( >=dev-libs/openssl-0.9.8:* )
-                       libressl? ( dev-libs/libressl )
+                       !libressl? ( >=dev-libs/openssl-0.9.8:0= )
+                       libressl? ( dev-libs/libressl:0= )
                )
                mbedtls? ( net-libs/mbedtls )
        )
@@ -72,9 +71,9 @@ src_configure() {
        IFCONFIG=/bin/ifconfig \
        ROUTE=/bin/route \
        econf \
-               $(usex mbedtls '--with-crypto-library=mbedtls' '') \
                $(use_enable inotify async-push) \
                $(use_enable ssl crypto) \
+               $(use_with ssl crypto-library $(usex mbedtls mbedtls openssl)) \
                $(use_enable lz4) \
                $(use_enable lzo) \
                $(use_enable pkcs11) \

diff --git a/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
index 0ae13d41d8c675e0f984bc110ab08ab04724a743..47ecc313e5d0ed9c0c496a4c462caea407c8b4f8 100644 (file)
--- a/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
@@ -18,7 +18,6 @@ IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
 IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD"
 
 REQUIRED_USE="static? ( !plugins !pkcs11 )
-       mbedtls? ( ssl !libressl )
        pkcs11? ( ssl )
        !plugins? ( !pam !down-root )
        inotify? ( plugins )"
@@ -73,9 +72,9 @@ src_configure() {
        IFCONFIG=/bin/ifconfig \
        ROUTE=/bin/route \
        econf \
-               $(usex mbedtls '--with-crypto-library=mbedtls' '') \
                $(use_enable inotify async-push) \
                $(use_enable ssl crypto) \
+               $(use_with ssl crypto-library $(usex mbedtls mbedtls openssl)) \
                $(use_enable lz4) \
                $(use_enable lzo) \
                $(use_enable pkcs11) \

diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild
index 8ad3d42ffc35beee9250d2b1061253376c58e6b7..8cf7c4dc80939c89e1f54162b82e506eb1e080a7 100644 (file)
--- a/net-vpn/openvpn/openvpn-9999.ebuild
+++ b/net-vpn/openvpn/openvpn-9999.ebuild
@@ -64,10 +64,10 @@ src_configure() {
        SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
        TMPFILES_DIR="/usr/lib/tmpfiles.d" \
        econf \
-               --with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
-               $(usex mbedtls 'with-crypto-library' 'mbedtls' '' '') \
+               --with-plugindir="${EPREFIX}/usr/$(get_libdir)/$PN" \
                $(use_enable inotify async-push) \
                $(use_enable ssl crypto) \
+               $(use_with ssl crypto-library $(usex mbedtls mbedtls openssl)) \
                $(use_enable lz4) \
                $(use_enable lzo) \
                $(use_enable pkcs11) \