From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DD3B6138350 for ; Sun, 3 May 2020 08:00:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1973E0998; Sun, 3 May 2020 08:00:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 24525E099C for ; Sun, 3 May 2020 08:00:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5BE4834F2DB for ; Sun, 3 May 2020 08:00:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DE7871B4 for ; Sun, 3 May 2020 08:00:30 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1588492770.d5d1bb7b0a8384a707a52f7c267ae73c56d800f9.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libwebsockets/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libwebsockets/libwebsockets-4.0.4.ebuild net-libs/libwebsockets/metadata.xml X-VCS-Directories: net-libs/libwebsockets/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: d5d1bb7b0a8384a707a52f7c267ae73c56d800f9 X-VCS-Branch: master Date: Sun, 3 May 2020 08:00:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 897fc020-66a7-4c7e-809c-3dfebf5d5f86 X-Archives-Hash: fbe501a51a8a93167ae9358e3e8709ce commit: d5d1bb7b0a8384a707a52f7c267ae73c56d800f9 Author: Joonas Niilola gentoo org> AuthorDate: Sun May 3 07:54:52 2020 +0000 Commit: Joonas Niilola gentoo 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 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 @@ Support generating Apache-compatible access logs Include CGI (spawn process with network-connected stdin/out/err) APIs - Enable directory scanning api support - Support file operations vfs The client part of the library and libwebsockets-test-client - Compile with extensions With the Generic Sessions plugin Support the HTTP/2 protocol Support for rewriting HTTP proxying - Inlude less common http header support With the Lightweight JSON Parser Support event loops via dev-libs/libev Support event loops via dev-libs/libevent Support asynchronous I/O via dev-libs/libuv - Use mbedTLS replacement for OpenSSL - Build the libwebsocket-test-apps Track peers and restrict resources a single peer can allocate Support json + jscript server monitoring Provide SMTP support