commit: fa508597570deec743b18a1d5d0405c1c970c222 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat Apr 27 16:35:03 2019 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Apr 27 20:27:48 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa508597
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 <AT> gentoo.org> net-vpn/openvpn/openvpn-2.4.6-r1.ebuild | 3 +-- net-vpn/openvpn/openvpn-2.4.6.ebuild | 9 ++++----- net-vpn/openvpn/openvpn-2.4.7-r1.ebuild | 3 +-- net-vpn/openvpn/openvpn-9999.ebuild | 4 ++-- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild index 81d3d655a38..d90a72c8b4e 100644 --- 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 09a11b23f04..41badc7b079 100644 --- 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 0ae13d41d8c..47ecc313e5d 100644 --- 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 8ad3d42ffc3..8cf7c4dc809 100644 --- 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) \
