[gentoo-commits] repo/gentoo:master commit in: net-libs/libwebsockets/

[Joonas Niilola]

commit:     d5d1bb7b0a8384a707a52f7c267ae73c56d800f9
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun May  3 07:54:52 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun May  3 07:59:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5d1bb7b

Revert "net-libs/libwebsockets: change of IUSE flags"

This reverts commit eedb87e4ca9074a1b5f982be059d7d5a6a653279.
Added complexity breaks some builds - needs more testing.

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-libs/libwebsockets/libwebsockets-4.0.4.ebuild | 28 +++++++----------------
 net-libs/libwebsockets/metadata.xml               |  6 -----
 2 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/net-libs/libwebsockets/libwebsockets-4.0.4.ebuild b/net-libs/libwebsockets/libwebsockets-4.0.4.ebuild
index 66623dc9f91..7620aaaa024 100644
--- a/net-libs/libwebsockets/libwebsockets-4.0.4.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.0.4.ebuild
@@ -12,16 +12,14 @@ SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.
 LICENSE="MIT"
 SLOT="0/16" # libwebsockets.so.16
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="access-log caps cgi client dbus +dir +extensions +file-ops generic-sessions http-proxy +http-uncommon-headers http2 ipv6
-	+lejp libev libevent libressl libuv mbedtls peer-limits server-status smtp socks5
-	sqlite3 ssl static-libs +testapps threads zip"
+IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6
+	+lejp libev libevent libressl libuv peer-limits server-status smtp socks5
+	sqlite3 ssl static-libs threads zip"
 
 REQUIRED_USE="
 	generic-sessions? ( smtp sqlite3 )
 	http-proxy? ( client )
 	smtp? ( libuv )
-	ssl? ( ?? ( libressl mbedtls ) )
-	testapps? ( extensions )
 	?? ( libev libevent )
 "
 
@@ -34,12 +32,10 @@ RDEPEND="
 	libuv? ( dev-libs/libuv:= )
 	sqlite3? ( dev-db/sqlite:= )
 	ssl? (
-		!libressl? (
-			!mbedtls? ( dev-libs/openssl:0= )
-			mbedtls? ( >net-libs/mbedtls-2.0.0 )
-			)
-		)"
-
+		!libressl? ( dev-libs/openssl:0= )
+		libressl?  ( dev-libs/libressl:0= )
+	)
+"
 DEPEND="${RDEPEND}"
 BDEPEND="dev-lang/perl"
 
@@ -51,28 +47,20 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
 		-DLWS_HAVE_LIBCAP=$(usex caps)
-		-DLWS_HAVE_SYS_CAPABILITY_H=$(usex caps)
 		-DLWS_IPV6=$(usex ipv6)
-		-DLWS_LINK_TESTAPPS_DYNAMIC=$(usex testapps)
 		-DLWS_ROLE_DBUS=$(usex dbus)
 		-DLWS_WITHOUT_CLIENT=$(usex !client)
 		-DLWS_WITHOUT_TEST_CLIENT=$(usex !client)
 		-DLWS_WITH_ACCESS_LOG=$(usex access-log)
 		-DLWS_WITH_CGI=$(usex cgi)
-		-DLWS_WITH_DIR=$(usex dir)
-		-DLWS_WITHOUT_EXTENSIONS=$(usex !extensions)
-		-DLWS_WITH_FILE_OPS=$(usex file-ops)
 		-DLWS_WITH_GENERIC_SESSIONS=$(usex generic-sessions)
 		-DLWS_WITH_HTTP2=$(usex http2)
-		-DLWS_WITH_HTTP_BASIC_AUTH=$(usex http-uncommon-headers)
 		-DLWS_WITH_HTTP_PROXY=$(usex http-proxy)
-		-DLWS_WITH_HTTP_UNCOMMON_HEADERS=$(usex http-uncommon-headers)
 		-DLWS_WITH_HUBBUB=$(usex http-proxy)
 		-DLWS_WITH_LEJP=$(usex lejp)
 		-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)
@@ -82,7 +70,7 @@ src_configure() {
 		-DLWS_WITH_STATIC=$(usex static-libs)
 		-DLWS_WITH_THREADPOOL=$(usex threads)
 		-DLWS_WITH_ZIP_FOPS=$(usex zip)
-		-DLWS_WITHOUT_TESTAPPS=$(usex !testapps)
+		-DLWS_WITHOUT_TESTAPPS=ON
 	)
 
 	cmake_src_configure

diff --git a/net-libs/libwebsockets/metadata.xml b/net-libs/libwebsockets/metadata.xml
index 026a4eee25a..6aa0f75c884 100644
--- a/net-libs/libwebsockets/metadata.xml
+++ b/net-libs/libwebsockets/metadata.xml
@@ -20,20 +20,14 @@
 	<use>
 		<flag name="access-log">Support generating Apache-compatible access logs</flag>
 		<flag name="cgi">Include CGI (spawn process with network-connected stdin/out/err) APIs</flag>
-		<flag name="dir">Enable directory scanning api support</flag>
-		<flag name="file-ops">Support file operations vfs</flag>
 		<flag name="client">The client part of the library and libwebsockets-test-client</flag>
-		<flag name="extensions">Compile with extensions</flag>
 		<flag name="generic-sessions">With the Generic Sessions plugin</flag>
 		<flag name="http2">Support the HTTP/2 protocol</flag>
 		<flag name="http-proxy">Support for rewriting HTTP proxying</flag>
-		<flag name="http-uncommon-headers">Inlude less common http header support</flag>
 		<flag name="lejp">With the Lightweight JSON Parser</flag>
 		<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="testapps">Build the libwebsocket-test-apps</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>