gentoo resync : 31.08.2021

4 files changed, 90 insertions, 5 deletions

diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 309d0548fbb9..86d158c30c2b 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,5 +1,7 @@
 DIST libwebsockets-4.2.0.tar.gz 14550541 BLAKE2B 9471d19b15decfee4407a596cb3f127534e12ac6bf49c81b04120a379ff8a8e1c7767e9a7e586ad69d5af23e869914c749da771f8db6431ac09718b971d261e0 SHA512 e1fb5b204a030ded8dfe2a75c66ec8d1a2e6a67e82c7709fe3c4277e0ccb5fb40c18db04e73c640d07ef4516aa266ae8b102f802b2a41b80980260cb6921f369
 DIST libwebsockets-4.2.1.tar.gz 14557242 BLAKE2B 07d5a7278a3f0518f8d8c1a20c6ad08d7125c276d1b0236649abe961879e3985319ce03d6800f7312f63d2a92dd96d341783257695a91864a2ee93116a5a108f SHA512 b8b03a9f099079aace448eeee6690bee519c23ba14e0b186e1813bfdb9b915462a07a5f52bdb81949021bf631d99bda2661704814575f559b5a91c70cbb2ec30
+DIST libwebsockets-4.2.2.tar.gz 14589100 BLAKE2B 371bae4790e92aa4f48e51b40fbe2e4efc3b885e07740db14c96146eb857616fd3f7a1b6c83c11fded2791b1db59cb1f6761bc4eebaee918ada7e9bcf4be52d0 SHA512 52d9b4511fc484781108a3036f870905d4427fcbab02f3e84ee38f534ae7d1979c2cc3eec0719f4609226d4aae788a79fe7d99a8506537bbcf8fc3d9b8a7b478
 EBUILD libwebsockets-4.2.0.ebuild 2302 BLAKE2B ccd6d0d167e36590d377144b1d35d2ff3cdd20c10b78616992fd39583a24bac5159732764e0395022bdc1d9977000e66047aa4bfd5a06f30322273396753dd61 SHA512 f97e085f9d3092a4f4ac24325ff92cf852681b0955a08724005d349f949a5ff21a41c803d7e427f18c6bc2d21f7fe7d2ca90bd662dfdfb52ef00fa0e80772bdf
-EBUILD libwebsockets-4.2.1.ebuild 2307 BLAKE2B 11b75577ca954c0cbb444b43016b8c55d08c3a319ea97c7338e92f3f1db0ff390d0c5f04cde4ee9f864e9a0fef38d3fd88fba6d72a3b986b097d01728373fc32 SHA512 eac2509485c6b9f2bb277a994cf1670543d965f8995e0e34c492364c89e1054f51e34de26570fb70d05433840265803a839b6f59ae7ce58fcabdf8ac8dc41c69
-MISC metadata.xml 1720 BLAKE2B cd762542d4df782758246c55241a12ba6368b8db26d3814b777419b0a9b4fcf7b5a4682c6a05c41915c2b60a08efef003b83151f866d0bb3c9056fe50bd76a77 SHA512 2bf03ea4b6d1398ee685e40b4bbdba6a1f17527fba7100182c20fd5dfc87a1e88fe8cf3d02eb32f905af5ac8af5b250c98d00fb3a812602f314098bbf8f9813e
+EBUILD libwebsockets-4.2.1.ebuild 2351 BLAKE2B 8d3ab6bfd878f0d6f2adc024cf55259d11ef8937e3b4442a2390341b78865f5f68605008c309358cf48281739fa11bc0c3d209f55058e15ca858d57e10ea888b SHA512 2af4352af03055910abb539b45f5810d469f9035ec712d6abfbfdc59eec8eaba0d922319a69ca66d195031db587fe80e1a62cb451cedb5dc9ec367763568b3ec
+EBUILD libwebsockets-4.2.2.ebuild 2351 BLAKE2B 8d3ab6bfd878f0d6f2adc024cf55259d11ef8937e3b4442a2390341b78865f5f68605008c309358cf48281739fa11bc0c3d209f55058e15ca858d57e10ea888b SHA512 2af4352af03055910abb539b45f5810d469f9035ec712d6abfbfdc59eec8eaba0d922319a69ca66d195031db587fe80e1a62cb451cedb5dc9ec367763568b3ec
+MISC metadata.xml 1702 BLAKE2B fe3cdfb0f81d88cfbb120e616fa6ce9c33c47a7f4232d0eb965ff595e585765870ed509093f9b7d688419c3b20bc54bbcab75a5abf1d9301682a8223ca376b74 SHA512 82de669fe0936c5e4f0fe7c6753a5efce2b8acf6eeffbdc3f1be3f948fd300cdbb1f6a8f5f02f1b0f6b9dcf6137176f6216b31f3ace21d169c15818f1e44a08e
diff --git a/net-libs/libwebsockets/libwebsockets-4.2.1.ebuild b/net-libs/libwebsockets/libwebsockets-4.2.1.ebuild
index e2cb3c1838c5..180d8b2a195a 100644
--- a/net-libs/libwebsockets/libwebsockets-4.2.1.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.2.1.ebuild
@@ -51,6 +51,7 @@ src_configure() {
 		-DLWS_HAVE_LIBCAP=$(usex caps)
 		-DLWS_IPV6=$(usex ipv6)
 		-DLWS_ROLE_DBUS=$(usex dbus)
+		-DLWS_SUPPRESS_DEPRECATED_API_WARNINGS=ON
 		-DLWS_WITHOUT_CLIENT=$(usex !client)
 		-DLWS_WITHOUT_TEST_CLIENT=$(usex !client)
 		-DLWS_WITH_ACCESS_LOG=$(usex access-log)
diff --git a/net-libs/libwebsockets/libwebsockets-4.2.2.ebuild b/net-libs/libwebsockets/libwebsockets-4.2.2.ebuild
new file mode 100644
index 000000000000..180d8b2a195a
--- /dev/null
+++ b/net-libs/libwebsockets/libwebsockets-4.2.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A flexible pure-C library for implementing network protocols"
+HOMEPAGE="https://libwebsockets.org/"
+SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/18" # libwebsockets.so.18
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6
+	+lejp libev libevent libuv mbedtls peer-limits server-status smtp socks5
+	sqlite3 ssl threads zip"
+
+REQUIRED_USE="
+	access-log? ( http2 )
+	generic-sessions? ( smtp sqlite3 )
+	http-proxy? ( client )
+	mbedtls? ( ssl )
+	smtp? ( libuv )
+	socks5? ( client http-proxy )
+	?? ( libev libevent )"
+
+RDEPEND="
+	sys-libs/zlib
+	caps? ( sys-libs/libcap )
+	dbus? ( sys-apps/dbus )
+	http-proxy? ( net-libs/libhubbub )
+	libev? ( dev-libs/libev )
+	libevent? ( dev-libs/libevent:= )
+	libuv? ( dev-libs/libuv:= )
+	sqlite3? ( dev-db/sqlite:= )
+	ssl? (
+		!mbedtls? ( dev-libs/openssl:0= )
+		mbedtls? ( net-libs/mbedtls:= )
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
+		-DDISABLE_WERROR=ON
+		-DLWS_BUILD_HASH="unknown"
+		-DLWS_HAVE_LIBCAP=$(usex caps)
+		-DLWS_IPV6=$(usex ipv6)
+		-DLWS_ROLE_DBUS=$(usex dbus)
+		-DLWS_SUPPRESS_DEPRECATED_API_WARNINGS=ON
+		-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_GENERIC_SESSIONS=$(usex generic-sessions)
+		-DLWS_WITH_HTTP2=$(usex http2)
+		-DLWS_WITH_HTTP_PROXY=$(usex http-proxy)
+		-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)
+		-DLWS_WITH_SOCKS5=$(usex socks5)
+		-DLWS_WITH_SQLITE3=$(usex sqlite3)
+		-DLWS_WITH_SSL=$(usex ssl)
+		-DLWS_WITH_STATIC=OFF
+		-DLWS_WITH_STRUCT_JSON=$(usex lejp)
+		-DLWS_WITH_THREADPOOL=$(usex threads)
+		-DLWS_WITH_ZIP_FOPS=$(usex zip)
+		-DLWS_WITHOUT_TESTAPPS=ON
+	)
+
+	cmake_src_configure
+}
diff --git a/net-libs/libwebsockets/metadata.xml b/net-libs/libwebsockets/metadata.xml
index 6f7b1d027276..bbc5761a4734 100644
--- a/net-libs/libwebsockets/metadata.xml
+++ b/net-libs/libwebsockets/metadata.xml
@@ -5,9 +5,9 @@
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<maintainer type="person" proxied="yes">
 		<email>luka.perkov@sartura.hr</email>