From: Jakov Smolic <jakov.smolic@sartura.hr>
Date: Tue, 5 May 2020 10:24:30 +0000 (+0200)
Subject: net-libs/libwebsockets: change of IUSE flags
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e7cc544fb599cc222e3bd56de8fb13fb6caf7f79;p=gentoo.git

net-libs/libwebsockets: change of IUSE flags

Closes: https://bugs.gentoo.org/720926
Closes: https://bugs.gentoo.org/720020

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
Acked-by: Jaco Kroon <jaco@uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/15637
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
---

diff --git a/net-libs/libwebsockets/libwebsockets-4.0.7.ebuild b/net-libs/libwebsockets/libwebsockets-4.0.7.ebuild
index 7620aaaa0249..081c762f0a8f 100644
--- a/net-libs/libwebsockets/libwebsockets-4.0.7.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.0.7.ebuild
@@ -13,13 +13,15 @@ LICENSE="MIT"
 SLOT="0/16" # libwebsockets.so.16
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6
-	+lejp libev libevent libressl libuv peer-limits server-status smtp socks5
+	+lejp libev libevent libressl libuv mbedtls peer-limits server-status smtp socks5
 	sqlite3 ssl static-libs threads zip"
 
 REQUIRED_USE="
+	access-log? ( http2 )
 	generic-sessions? ( smtp sqlite3 )
 	http-proxy? ( client )
 	smtp? ( libuv )
+	ssl? ( ?? ( libressl mbedtls ) )
 	?? ( libev libevent )
 "
 
@@ -32,8 +34,10 @@ RDEPEND="
 	libuv? ( dev-libs/libuv:= )
 	sqlite3? ( dev-db/sqlite:= )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl?  ( dev-libs/libressl:0= )
+		!libressl? (
+			!mbedtls? ( dev-libs/openssl:0= )
+			mbedtls? ( >net-libs/mbedtls-2.0.0 )
+		)
 	)
 "
 DEPEND="${RDEPEND}"
@@ -44,6 +48,7 @@ PATCHES=(
 )
 
 src_configure() {
+	append-cflags -Wno-error
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
 		-DLWS_HAVE_LIBCAP=$(usex caps)
@@ -61,6 +66,7 @@ src_configure() {
 		-DLWS_WITH_LIBEV=$(usex libev)
 		-DLWS_WITH_LIBEVENT=$(usex libevent)
 		-DLWS_WITH_LIBUV=$(usex libuv)
+		-DLWS_WITH_MBEDTLS=$(usex mbedtls)
 		-DLWS_WITH_PEER_LIMITS=$(usex peer-limits)
 		-DLWS_WITH_SERVER_STATUS=$(usex server-status)
 		-DLWS_WITH_SMTP=$(usex smtp)
diff --git a/net-libs/libwebsockets/metadata.xml b/net-libs/libwebsockets/metadata.xml
index 6aa0f75c8847..23c9033fcec9 100644
--- a/net-libs/libwebsockets/metadata.xml
+++ b/net-libs/libwebsockets/metadata.xml
@@ -28,6 +28,7 @@
 		<flag name="libev">Support event loops via dev-libs/libev</flag>
 		<flag name="libevent">Support event loops via dev-libs/libevent</flag>
 		<flag name="libuv">Support asynchronous I/O via dev-libs/libuv</flag>
+		<flag name="mbedtls">Use mbedTLS replacement for OpenSSL</flag>
 		<flag name="peer-limits">Track peers and restrict resources a single peer can allocate</flag>
 		<flag name="server-status">Support json + jscript server monitoring</flag>
 		<flag name="smtp">Provide SMTP support</flag>