gentoo resync : 20.03.2022

3 files changed, 2 insertions, 85 deletions

diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 7afb238f1f34..aae1f51a997c 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,5 +1,3 @@
-DIST libwebsockets-4.3.0.tar.gz 15605272 BLAKE2B 6ea48fedf3755f55885f32bc289513182cf735472c161f15d720a76ddfa54e5e2c2d93a343f98d941d14b88f8ca8a13039922f8669b85562c5c0c4312f878b98 SHA512 7f183cb0417a902cb18e76431a8580d87db09c973483f3a129e138e4644b9d0e78e0539e985dc6286d9fe429edea7f63147864dc0413cf8e40fca3d67f9c3c42
 DIST libwebsockets-4.3.1.tar.gz 15607585 BLAKE2B 420343dd358e4ca45d0cadde7f0a6398dbd5043c4cd2c1a70f32dc9b5ef4cb222239971c4ce758ee156deac4d06bd18289a8e975a7f41508abfdcb05870994f6 SHA512 3cc2daadd7d2587ce946209a31741662d98367f0f9f77a1555497bef6fc6acc6cb97f5196d6ecef2d13828bb5613c60cccada03d9a01a5c970a9cfd25baeb0ae
-EBUILD libwebsockets-4.3.0.ebuild 2302 BLAKE2B 518b38be595d1e64deaf3c03fdd1d6f400edff952505a02e06d089a7408b6ff1f99430bcbc2311eed4cf3b29d3866e643838ef15cdcdd3d65fdf138e85b118f5 SHA512 195cfa3acb7e8e1cb7734fb54ce83908c5f983315a0675ef626e1bf50ce6bb771cfd5c91a0fef2bbb20d3ac17412dd677d5c39b55bbf75c0bd29a89ba438da11
-EBUILD libwebsockets-4.3.1.ebuild 2307 BLAKE2B ba68a6eb7d6e788016d609ea7fe7e5ba3f4c97e0785adcb1c67a795a499203d12917da52662524b744a41682ff72e0de3b5bf1b1c91d93daadd62b4713076917 SHA512 c2ecd7ff76040b3dd08c72ee54caa329ec4a02905543619ee4bdce3a41431f5113fea081337fa8a647bf58be1190797e7b819098db9a61059bab86798158d1bd
+EBUILD libwebsockets-4.3.1.ebuild 2302 BLAKE2B 57120058a60d6cf22d821e0527a17f443d82b98ab98708b6958327860a9f151bf33699712cafb97dee1a02620e66b62665abb5c78e872bb433e3fb3025d3f020 SHA512 6409af3d8398bd8032f5bf6ccc110ecf71c202ef4e9d6b9663bf441758da06e7a40977c922d1d9ed64fa2b6883ab23bb568129d4bf9aead8ae1249f52cb14999
 MISC metadata.xml 1703 BLAKE2B 7ebe447535ebfd38c9df8e0bb865a7e3302fe5c820d768433c33f714c28e2b24ccd6b54d9b8f82e3d1296c50f655d6595c2e0cf41da456b4132b9fbdd0ea5769 SHA512 f1f62216dcc707501003f1da3386235fe53a6df6c14339b8c2371170224a11159c75ad88a6d3cf6abf848c6d73d4970982d2f1ec49aa6a2db5ebccdad44ef574
diff --git a/net-libs/libwebsockets/libwebsockets-4.3.0.ebuild b/net-libs/libwebsockets/libwebsockets-4.3.0.ebuild
deleted file mode 100644
index 5c1d4449fa63..000000000000
--- a/net-libs/libwebsockets/libwebsockets-4.3.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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/19" # libwebsockets.so.19
-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_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/libwebsockets-4.3.1.ebuild b/net-libs/libwebsockets/libwebsockets-4.3.1.ebuild
index 5db0694c894d..48932f3cb202 100644
--- a/net-libs/libwebsockets/libwebsockets-4.3.1.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0/19" # libwebsockets.so.19
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+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"