commit:     ec170227d5fcde74bdae7583fc2665f3a5d11750
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 10:49:09 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 10:49:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec170227

net-vpn/openvpn: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 net-vpn/openvpn/metadata.xml            | 1 -
 net-vpn/openvpn/openvpn-2.4.9.ebuild    | 7 ++-----
 net-vpn/openvpn/openvpn-2.5.0-r1.ebuild | 7 ++-----
 net-vpn/openvpn/openvpn-2.5.1-r1.ebuild | 7 ++-----
 net-vpn/openvpn/openvpn-9999.ebuild     | 7 ++-----
 5 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/net-vpn/openvpn/metadata.xml b/net-vpn/openvpn/metadata.xml
index caa9b97acdf..699f7fa4ff8 100644
--- a/net-vpn/openvpn/metadata.xml
+++ b/net-vpn/openvpn/metadata.xml
@@ -17,7 +17,6 @@ networks using an encrypted tunnel.</longdescription>
     <flag name="iproute2">Enabled iproute2 support instead of net-tools</flag>
     <flag name="mbedtls">Use mbed TLS as the backend crypto library</flag>
     <flag name="openssl">Use OpenSSL as the backend crypto library</flag>
-    <flag name="libressl">Use OpenSSL as the backend crypto library</flag>
     <flag name="pkcs11">Enable PKCS#11 smartcard support</flag>
     <flag name="plugins">Enable the OpenVPN plugin system</flag>
   </use>

diff --git a/net-vpn/openvpn/openvpn-2.4.9.ebuild 
b/net-vpn/openvpn/openvpn-2.4.9.ebuild
index 6d6d5d7a02d..b29d88937b0 100644
--- a/net-vpn/openvpn/openvpn-2.4.9.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.9.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 
~amd64-linux ~x86-linux"
 
-IUSE="down-root examples inotify iproute2 libressl +lz4 +lzo mbedtls pam"
+IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls pam"
 IUSE+=" pkcs11 +plugins selinux +ssl systemd test userland_BSD"
 
 RESTRICT="!test? ( test )"
@@ -29,10 +29,7 @@ CDEPEND="
        )
        pam? ( sys-libs/pam )
        ssl? (
-               !mbedtls? (
-                       !libressl? ( >=dev-libs/openssl-0.9.8:0= )
-                       libressl? ( dev-libs/libressl:0= )
-               )
+               !mbedtls? ( >=dev-libs/openssl-0.9.8:0= )
                mbedtls? ( net-libs/mbedtls:= )
        )
        lz4? ( app-arch/lz4 )

diff --git a/net-vpn/openvpn/openvpn-2.5.0-r1.ebuild 
b/net-vpn/openvpn/openvpn-2.5.0-r1.ebuild
index 2744ace9271..f0b8f56f6fc 100644
--- a/net-vpn/openvpn/openvpn-2.5.0-r1.ebuild
+++ b/net-vpn/openvpn/openvpn-2.5.0-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux"
 
-IUSE="down-root examples inotify iproute2 libressl +lz4 +lzo mbedtls +openssl"
+IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
 IUSE+=" pam pkcs11 +plugins selinux systemd test userland_BSD"
 
 RESTRICT="!test? ( test )"
@@ -31,10 +31,7 @@ CDEPEND="
        lz4? ( app-arch/lz4 )
        lzo? ( >=dev-libs/lzo-1.07 )
        mbedtls? ( net-libs/mbedtls:= )
-       openssl? (
-               !libressl? ( >=dev-libs/openssl-0.9.8:0= )
-               libressl? ( dev-libs/libressl:0= )
-       )
+       openssl? ( >=dev-libs/openssl-0.9.8:0= )
        pam? ( sys-libs/pam )
        pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
        systemd? ( sys-apps/systemd )

diff --git a/net-vpn/openvpn/openvpn-2.5.1-r1.ebuild 
b/net-vpn/openvpn/openvpn-2.5.1-r1.ebuild
index 5d4782a0359..5234e90577c 100644
--- a/net-vpn/openvpn/openvpn-2.5.1-r1.ebuild
+++ b/net-vpn/openvpn/openvpn-2.5.1-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux"
 
-IUSE="down-root examples inotify iproute2 libressl +lz4 +lzo mbedtls +openssl"
+IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
 IUSE+=" pam pkcs11 +plugins selinux systemd test userland_BSD"
 
 RESTRICT="!test? ( test )"
@@ -31,10 +31,7 @@ CDEPEND="
        lz4? ( app-arch/lz4 )
        lzo? ( >=dev-libs/lzo-1.07 )
        mbedtls? ( net-libs/mbedtls:= )
-       openssl? (
-               !libressl? ( >=dev-libs/openssl-0.9.8:0= )
-               libressl? ( dev-libs/libressl:0= )
-       )
+       openssl? ( >=dev-libs/openssl-0.9.8:0= )
        pam? ( sys-libs/pam )
        pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
        systemd? ( sys-apps/systemd )

diff --git a/net-vpn/openvpn/openvpn-9999.ebuild 
b/net-vpn/openvpn/openvpn-9999.ebuild
index b2945c23a0f..dd958ea3cc0 100644
--- a/net-vpn/openvpn/openvpn-9999.ebuild
+++ b/net-vpn/openvpn/openvpn-9999.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="down-root examples inotify iproute2 libressl +lz4 +lzo mbedtls pam"
+IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls pam"
 IUSE+=" pkcs11 +plugins selinux +ssl systemd test userland_BSD"
 
 RESTRICT="!test? ( test )"
@@ -30,10 +30,7 @@ CDEPEND="
        )
        pam? ( sys-libs/pam )
        ssl? (
-               !mbedtls? (
-                       !libressl? ( >=dev-libs/openssl-0.9.8:0= )
-                       libressl? ( dev-libs/libressl:0= )
-               )
+               !mbedtls? ( >=dev-libs/openssl-0.9.8:0= )
                mbedtls? ( net-libs/mbedtls:= )
        )
        lz4? ( app-arch/lz4 )

Reply via email to