From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A7619138334 for ; Sat, 27 Apr 2019 20:28:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92E9DE0839; Sat, 27 Apr 2019 20:28:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 61CA7E0839 for ; Sat, 27 Apr 2019 20:28:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DF57A342A63 for ; Sat, 27 Apr 2019 20:28:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5DA565CC for ; Sat, 27 Apr 2019 20:28:54 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1556396868.fa508597570deec743b18a1d5d0405c1c970c222.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/openvpn/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/openvpn/openvpn-2.4.6-r1.ebuild net-vpn/openvpn/openvpn-2.4.6.ebuild net-vpn/openvpn/openvpn-2.4.7-r1.ebuild net-vpn/openvpn/openvpn-9999.ebuild X-VCS-Directories: net-vpn/openvpn/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: fa508597570deec743b18a1d5d0405c1c970c222 X-VCS-Branch: master Date: Sat, 27 Apr 2019 20:28:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 04c7beb1-ea27-4b77-b308-b8773680ac12 X-Archives-Hash: 1f1c81f07298bd93d37e3c2515aa5dd2 commit: fa508597570deec743b18a1d5d0405c1c970c222 Author: David Seifert gentoo org> AuthorDate: Sat Apr 27 16:35:03 2019 +0000 Commit: David Seifert gentoo 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 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) \