From a1558bc2eb8efb5e1cc72836b3e90daa3d7c1b63 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Sat, 27 Apr 2019 18:35:04 +0200 Subject: [PATCH] net-libs/libwebsockets: [QA] Fix USE=libressl semantics Closes: https://bugs.gentoo.org/683998 Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: David Seifert --- net-libs/libwebsockets/libwebsockets-1.7.9.ebuild | 12 +++++------- net-libs/libwebsockets/libwebsockets-2.0.2.ebuild | 12 +++++------- net-libs/libwebsockets/libwebsockets-2.1.1.ebuild | 5 ++--- net-libs/libwebsockets/libwebsockets-2.4.2.ebuild | 5 ++--- 4 files changed, 14 insertions(+), 20 deletions(-) diff --git a/net-libs/libwebsockets/libwebsockets-1.7.9.ebuild b/net-libs/libwebsockets/libwebsockets-1.7.9.ebuild index 12fa48d815be..b9bba7e9a999 100644 --- a/net-libs/libwebsockets/libwebsockets-1.7.9.ebuild +++ b/net-libs/libwebsockets/libwebsockets-1.7.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,16 +14,14 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+http2 +ssl client ipv6 libev libressl libuv static-libs" -REQUIRED_USE="libressl? ( ssl )" - RDEPEND=" sys-libs/zlib - libev? ( dev-libs/libev ) - libuv? ( dev-libs/libuv ) + libev? ( dev-libs/libev ) + libuv? ( dev-libs/libuv ) ssl? ( !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) + libressl? ( dev-libs/libressl:0= ) + ) " DEPEND="${RDEPEND} dev-lang/perl diff --git a/net-libs/libwebsockets/libwebsockets-2.0.2.ebuild b/net-libs/libwebsockets/libwebsockets-2.0.2.ebuild index 47332620d0bf..b9bba7e9a999 100644 --- a/net-libs/libwebsockets/libwebsockets-2.0.2.ebuild +++ b/net-libs/libwebsockets/libwebsockets-2.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,16 +14,14 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+http2 +ssl client ipv6 libev libressl libuv static-libs" -REQUIRED_USE="libressl? ( ssl )" - RDEPEND=" sys-libs/zlib - libev? ( dev-libs/libev ) - libuv? ( dev-libs/libuv ) + libev? ( dev-libs/libev ) + libuv? ( dev-libs/libuv ) ssl? ( !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) + libressl? ( dev-libs/libressl:0= ) + ) " DEPEND="${RDEPEND} dev-lang/perl diff --git a/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild b/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild index 86151e80cb69..3dcea8a73465 100644 --- a/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild +++ b/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,7 +15,6 @@ KEYWORDS="amd64 arm x86" IUSE="+http2 +ssl access-log cgi client generic-sessions http-proxy ipv6 lejp libev libressl libuv server-status smtp sqlite3 static-libs" REQUIRED_USE=" - libressl? ( ssl ) http-proxy? ( client ) generic-sessions? ( sqlite3 ) generic-sessions? ( smtp ) @@ -31,7 +30,7 @@ RDEPEND=" ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) - ) + ) " DEPEND="${RDEPEND} dev-lang/perl diff --git a/net-libs/libwebsockets/libwebsockets-2.4.2.ebuild b/net-libs/libwebsockets/libwebsockets-2.4.2.ebuild index dc1e64652689..38798f5926c7 100644 --- a/net-libs/libwebsockets/libwebsockets-2.4.2.ebuild +++ b/net-libs/libwebsockets/libwebsockets-2.4.2.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 @@ -16,7 +16,6 @@ IUSE="+http2 +ssl access-log caps cgi client generic-sessions http-proxy ipv6 le libevent libressl libuv peer-limits server-status socks5 smtp sqlite3 static-libs +zip" REQUIRED_USE=" - libressl? ( ssl ) http-proxy? ( client ) generic-sessions? ( sqlite3 ) generic-sessions? ( smtp ) @@ -34,7 +33,7 @@ RDEPEND=" ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) - ) + ) " DEPEND="${RDEPEND} dev-lang/perl -- 2.26.2