gentoo resync : 29.03.2018

3 files changed, 78 insertions, 1 deletions

diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 95b3a75b9148..01b9f5bcfe85 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -2,7 +2,9 @@ AUX libwebsockets-2.1.1-x86-build.patch 771 BLAKE2B d4b51038dcd6717d6608bfb98da8
 DIST libwebsockets-1.7.9.tar.gz 2915358 BLAKE2B 07aad4ab716212924177aa76233d743d6258d261f6cccb286e478f51bfeac609284cf2e43004bd99c271786a7e30357895c8687c11e1c3d7589ed13dbce4fbe8 SHA512 d5bd6171d58b5d5439af48d6cc1e92623e9bf21e059a2d25d362ef81b1bff62e759fe265261dbee0ac4ceb0d0a2490dc1e030dfee2b36eb8ac74df112da1db56
 DIST libwebsockets-2.0.2.tar.gz 2998585 BLAKE2B 0eaf2301abf9a0e47bd865b6e653f3ea23f3b00d4c6da785a8bd871f3ca729dc43152cad10aeaa9a3cd360aeecd0be87e434102e91e0eeaa6b1865031310a362 SHA512 6cd0cfe14ab9aa2ce26624d41290ed3bd0ae4167e93d5db738883dbbe2db851bd75037929a417922c2ef78eae3ff00583134d42da575d961c777e4a1ad0fef4a
 DIST libwebsockets-2.1.1.tar.gz 3769593 BLAKE2B 8d3aaa0a844925fb927fffaf0d11ba1bdbd013db8a680ce4b85cd5d951219598288fa0f2b97ec22bc00ef879586cb5c2c076b774f3411cb6d8ca553e66fb90e2 SHA512 429bca62feb75136d8aff1783a6024468033536356fb3501e4dcf0819d9e9a4457f2a94248fdafe6fdceb7e0ded146ff6c4c04040e069f34a9b27a4e090d2683
+DIST libwebsockets-2.4.2.tar.gz 3777160 BLAKE2B 6aedc0d340e9e03745309cd1a9674b6c7e84ebdbd5232a265c7a4e0deb612665982353c3ba973b58a835b1747448d415a3625ed044973212b5a897b221d73106 SHA512 7bee49f6763ff3ab7861fcda25af8d80f6757c56e197ea42be53e0b2480969eee73de3aee5198f5ff06fd1cb8ab2be4c6495243e83cd0acc235b0da83b2353d1
 EBUILD libwebsockets-1.7.9.ebuild 1190 BLAKE2B c13f3292d000ca410dc8007f9e31e833780e26ded88d6a20818eecc7d0c5783da741ec69d78ba712cf7ff0fe9f244027672411318cf6c4419328f3af22953b13 SHA512 ae405094c922c0004a2b5f312b8a8c0c8b7674208bdb89b969643ba0444624ade3bbb5a8264c1c58c955e320ddb60ca6b06f0d6ab1a823e12bf1e8a8890c8afa
 EBUILD libwebsockets-2.0.2.ebuild 1191 BLAKE2B 786470eb779e4dc27bf18edb1d53940bfde004b6661e2d07d43c16edbdc30c53e60e15e6a425cfeaa443a727fe8a76607c361a3d54d3f900d23409bbe54bba6c SHA512 8f4c590d1a9c72d752190dbfb8e4e9a99f940851ea52e3ef2e1959a981a03169409d71c38e3adda3284d554bf7126342984f1861844d9f762227bdd7c7611d8b
 EBUILD libwebsockets-2.1.1.ebuild 1864 BLAKE2B c3002a67df06bff1d6f9459103557e336b701139ab165137638052c382b771af75f4cb347e9e9ff9bd2c10e1b5ba8c7f52feeec50a1ce7e69ab281dfdba2ff32 SHA512 ce55d4465133c73062ebb2fdcd28e58b277da6f099f3c020d1921e66dac3b64838ada69eb6ce5b6b3d8a4551e8d714600cf1d5d42a348096d1d8b5de7b3b4d99
-MISC metadata.xml 1524 BLAKE2B bdd58ebfaea42d07dc5db5a9fbdb5c7eb019174eaf7b6eafed7ab388e2b2eb120ce7dea7001b83d39e083b9549cce0cbccce6e501ef1247d9252286ee8f1f962 SHA512 d43b3715a0387a4662aa7b3def3384a1eed5f840f4c187a74df33785efc855d4879bd1bdc4d339326787984cece87cfeafe957f6abe91d30de854199968cd406
+EBUILD libwebsockets-2.4.2.ebuild 2143 BLAKE2B f6f3dbbbec4e227305552552239438dc1c0f14048c69046d3580e5d90079466fca692b9e2c5f90f2fa362d88019f5550e7aba0040ab25e1d4859dbd612a0b488 SHA512 07729c4069c8a70f207b16a1076caa6c5512601a4a1e319c4dd989ddd674da2fb356ec2cc30f136b5009c79ca6ff47238426cf80322d668d1edd781e9e646261
+MISC metadata.xml 1829 BLAKE2B f5f9a3e819382eeaf1a024ef53ff6d2c94f34566b4d0220f9a3a289ba5fd55c0d3d3d73d8ac46a9e10b7a5223cce44ebad2048efcf0d896762adfb04c6a2b67c SHA512 b29f893c28c5c27260838b440ae98a42d30291272c2c78aa80f61ea2ba877c29c2bed1bf10e68e59f98c732703c6a975938b7aee04f051cbb775d85cd93e00c2
diff --git a/net-libs/libwebsockets/libwebsockets-2.4.2.ebuild b/net-libs/libwebsockets/libwebsockets-2.4.2.ebuild
new file mode 100644
index 000000000000..dc1e64652689
--- /dev/null
+++ b/net-libs/libwebsockets/libwebsockets-2.4.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="canonical libwebsockets.org websocket library"
+HOMEPAGE="https://libwebsockets.org/"
+SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+http2 +ssl access-log caps cgi client generic-sessions http-proxy ipv6 lejp libev
+	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 )
+	smtp? ( libuv )
+"
+
+RDEPEND="
+	sys-libs/zlib
+	http-proxy? ( net-libs/libhubbub )
+	caps?		( sys-libs/libcap )
+	libev?      ( dev-libs/libev )
+	libevent?   ( dev-libs/libevent )
+	libuv?      ( dev-libs/libuv )
+	sqlite3?    ( dev-db/sqlite )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl?  ( dev-libs/libressl:0= )
+		)
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLWS_IPV6=$(usex ipv6 ON OFF)
+		-DLWS_LINK_TESTAPPS_DYNAMIC=$(usex !static-libs ON OFF)
+		-DLWS_WITH_HTTP2=$(usex http2 ON OFF)
+		-DLWS_WITH_STATIC=$(usex static-libs ON OFF)
+		-DLWS_HAVE_LIBCAP=$(usex caps ON OFF)
+		-DLWS_WITH_LIBEV=$(usex libev ON OFF)
+		-DLWS_WITH_LIBEVENT=$(usex libevent ON OFF)
+		-DLWS_WITH_LIBUV=$(usex libuv ON OFF)
+		-DLWS_WITH_PEER_LIMITS=$(usex peer-limits ON OFF)
+		-DLWS_WITH_SSL=$(usex ssl ON OFF)
+		-DLWS_WITHOUT_CLIENT=$(usex !client ON OFF)
+		-DLWS_WITHOUT_TEST_CLIENT=$(usex !client ON OFF)
+		-DLWS_WITH_CGI=$(usex cgi ON OFF)
+		-DLWS_WITH_HTTP_PROXY=$(usex http-proxy ON OFF)
+		-DLWS_WITH_ACCESS_LOG=$(usex access-log ON OFF)
+		-DLWS_WITH_SERVER_STATUS=$(usex server-status ON OFF)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
+		-DLWS_WITH_LEJP=$(usex lejp ON OFF)
+		-DLWS_WITH_GENERIC_SESSIONS=$(usex generic-sessions ON OFF)
+		-DLWS_WITH_SQLITE3=$(usex sqlite3 ON OFF)
+		-DLWS_WITH_SMTP=$(usex smtp ON OFF)
+		-DLWS_WITH_SOCKS5=$(usex socks5 ON OFF)
+		-DLWS_WITH_ZIP_FOPS=$(usex zip ON OFF)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/net-libs/libwebsockets/metadata.xml b/net-libs/libwebsockets/metadata.xml
index 353ac742f140..482bbee780d0 100644
--- a/net-libs/libwebsockets/metadata.xml
+++ b/net-libs/libwebsockets/metadata.xml
@@ -25,10 +25,14 @@
 		<flag name="http-proxy">Support for rewriting HTTP proxying</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="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>
+		<flag name="socks5">Allow use of SOCKS5 proxy on client connections</flag>
 		<flag name="sqlite3">Require SQLITE3 support</flag>
+		<flag name="zip">Support serving pre-zipped files</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">warmcat/libwebsockets</remote-id>