net-misc/openconnect: drop broken libressl support

Bug: https://bugs.gentoo.org/593546

Package-Manager: portage-2.3.0_p24

diff --git a/net-misc/openconnect/openconnect-7.06-r4.ebuild b/net-misc/openconnect/openconnect-7.06-r4.ebuild
index d403ff1c96218734935bb832bda7095b61d6507a..c2727fafc79904253a746e3488835dcc3460e28b 100644 (file)
--- a/net-misc/openconnect/openconnect-7.06-r4.ebuild
+++ b/net-misc/openconnect/openconnect-7.06-r4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="doc +gnutls gssapi java libressl libproxy nls smartcard static-libs stoken"
+IUSE="doc +gnutls gssapi java libproxy nls smartcard static-libs stoken"
 ILINGUAS="ar cs de el en_GB en_US es eu fi fr gl id lt nl pa pl pt pt_BR sk sl tg ug uk zh_CN zh_TW"
 for lang in $ILINGUAS; do
        IUSE="${IUSE} linguas_${lang}"
@@ -27,8 +27,7 @@ done
 DEPEND="dev-libs/libxml2
        sys-libs/zlib
        !gnutls? (
-               !libressl? ( >=dev-libs/openssl-1.0.1h:0[static-libs?] )
-               libressl? ( dev-libs/libressl[static-libs?] )
+               >=dev-libs/openssl-1.0.1h:0[static-libs?]
        )
        gnutls? (
                >=net-libs/gnutls-3:0=[static-libs?] dev-libs/nettle

diff --git a/net-misc/openconnect/openconnect-7.06_p20160614.ebuild b/net-misc/openconnect/openconnect-7.06_p20160614.ebuild
index 01fc3ed78029755752c6d906825270025dbd0c97..025c72184d9b2568779397dfa8449cd1c535e1a0 100644 (file)
--- a/net-misc/openconnect/openconnect-7.06_p20160614.ebuild
+++ b/net-misc/openconnect/openconnect-7.06_p20160614.ebuild
@@ -26,13 +26,12 @@ HOMEPAGE="http://www.infradead.org/openconnect.html"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5"
-IUSE="doc +gnutls gssapi java libressl libproxy nls smartcard static-libs stoken"
+IUSE="doc +gnutls gssapi java libproxy nls smartcard static-libs stoken"
 
 DEPEND="dev-libs/libxml2
        sys-libs/zlib
        !gnutls? (
-               !libressl? ( >=dev-libs/openssl-1.0.1h:0[static-libs?] )
-               libressl? ( dev-libs/libressl[static-libs?] )
+               >=dev-libs/openssl-1.0.1h:0[static-libs?]
        )
        gnutls? (
                >=net-libs/gnutls-3:0=[static-libs?] dev-libs/nettle

diff --git a/net-misc/openconnect/openconnect-7.07-r1.ebuild b/net-misc/openconnect/openconnect-7.07-r1.ebuild
index b490e176530f6fead03e020f52d8ee648ecc3492..1fe1adad2ea94ac38d93a3b3a4c3e1ed2752c7e7 100644 (file)
--- a/net-misc/openconnect/openconnect-7.07-r1.ebuild
+++ b/net-misc/openconnect/openconnect-7.07-r1.ebuild
@@ -25,13 +25,12 @@ HOMEPAGE="http://www.infradead.org/openconnect.html"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5"
-IUSE="doc +gnutls gssapi java libressl libproxy nls smartcard static-libs stoken"
+IUSE="doc +gnutls gssapi java libproxy nls smartcard static-libs stoken"
 
 DEPEND="dev-libs/libxml2
        sys-libs/zlib
        !gnutls? (
-               !libressl? ( >=dev-libs/openssl-1.0.1h:0[static-libs?] )
-               libressl? ( dev-libs/libressl[static-libs?] )
+               >=dev-libs/openssl-1.0.1h:0[static-libs?]
        )
        gnutls? (
                >=net-libs/gnutls-3:0=[static-libs?] dev-libs/nettle

diff --git a/net-misc/openconnect/openconnect-9999.ebuild b/net-misc/openconnect/openconnect-9999.ebuild
index b490e176530f6fead03e020f52d8ee648ecc3492..1fe1adad2ea94ac38d93a3b3a4c3e1ed2752c7e7 100644 (file)
--- a/net-misc/openconnect/openconnect-9999.ebuild
+++ b/net-misc/openconnect/openconnect-9999.ebuild
@@ -25,13 +25,12 @@ HOMEPAGE="http://www.infradead.org/openconnect.html"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5"
-IUSE="doc +gnutls gssapi java libressl libproxy nls smartcard static-libs stoken"
+IUSE="doc +gnutls gssapi java libproxy nls smartcard static-libs stoken"
 
 DEPEND="dev-libs/libxml2
        sys-libs/zlib
        !gnutls? (
-               !libressl? ( >=dev-libs/openssl-1.0.1h:0[static-libs?] )
-               libressl? ( dev-libs/libressl[static-libs?] )
+               >=dev-libs/openssl-1.0.1h:0[static-libs?]
        )
        gnutls? (
                >=net-libs/gnutls-3:0=[static-libs?] dev-libs/nettle