gentoo resync : 15.06.2021

3 files changed, 2 insertions, 85 deletions

diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 3cb938061098..349faef6b837 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,5 +1,3 @@
-DIST libwebsockets-4.1.6.tar.gz 12912895 BLAKE2B d6b8c96b8da4c177e7c730acb13bbba63996b1817bc0e0df36923c7ad3aabb6823f852c84bef865e85ed7eac1855273527ff6e92e413bbed8576388ce2ec7e3f SHA512 b83059b5405fe5c8bbfb6ef4cdfb66ce8b3fa2a660c013e64fa579f3ae09c70a6e3807d37ad4cff1d37b0c797959ba4e9c527be7e31520b3853161cfd6224a54
 DIST libwebsockets-4.2.0.tar.gz 14550541 BLAKE2B 9471d19b15decfee4407a596cb3f127534e12ac6bf49c81b04120a379ff8a8e1c7767e9a7e586ad69d5af23e869914c749da771f8db6431ac09718b971d261e0 SHA512 e1fb5b204a030ded8dfe2a75c66ec8d1a2e6a67e82c7709fe3c4277e0ccb5fb40c18db04e73c640d07ef4516aa266ae8b102f802b2a41b80980260cb6921f369
-EBUILD libwebsockets-4.1.6.ebuild 2301 BLAKE2B 373ea229a5dc8ef3af02fbdfd59efff220429f09cc620055c99a07dcf6e4e792db5a95ba70f0916cc30ad02322058feddd0b151abf55ae5d84aef1cc0ba3eacb SHA512 31064db3eccee69d33ae72b2ef0335850e765a1b85bcbb74b81c6be7d5acc1cd602f4eced2270ab83a755c738307aee742fd1dfdb5e335adcc7e9c28ce7e2d3e
-EBUILD libwebsockets-4.2.0.ebuild 2300 BLAKE2B 5cc5deb5bacde0abe6b2422643060df432c6ff553971ad01a03d5499e033b1dc058a25d3cfd8a4fe05c813032665409bbd3f6ca78fba60e60b1248b3ee640c77 SHA512 baa1c94f012584cc0cad30312a5eebbb27c38edb1736684bfba883f79d7e24aeb5b07c1c83549d4a47600113e5a19ed7233fae1720ec8b71c1382b9e3eebeb71
+EBUILD libwebsockets-4.2.0.ebuild 2302 BLAKE2B ccd6d0d167e36590d377144b1d35d2ff3cdd20c10b78616992fd39583a24bac5159732764e0395022bdc1d9977000e66047aa4bfd5a06f30322273396753dd61 SHA512 f97e085f9d3092a4f4ac24325ff92cf852681b0955a08724005d349f949a5ff21a41c803d7e427f18c6bc2d21f7fe7d2ca90bd662dfdfb52ef00fa0e80772bdf
 MISC metadata.xml 1720 BLAKE2B cd762542d4df782758246c55241a12ba6368b8db26d3814b777419b0a9b4fcf7b5a4682c6a05c41915c2b60a08efef003b83151f866d0bb3c9056fe50bd76a77 SHA512 2bf03ea4b6d1398ee685e40b4bbdba6a1f17527fba7100182c20fd5dfc87a1e88fe8cf3d02eb32f905af5ac8af5b250c98d00fb3a812602f314098bbf8f9813e
diff --git a/net-libs/libwebsockets/libwebsockets-4.1.6.ebuild b/net-libs/libwebsockets/libwebsockets-4.1.6.ebuild
deleted file mode 100644
index 4bfe5e897b82..000000000000
--- a/net-libs/libwebsockets/libwebsockets-4.1.6.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/17" # libwebsockets.so.17
-KEYWORDS="amd64 arm arm64 ppc 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 static-libs threads zip"
-
-REQUIRED_USE="
-	access-log? ( http2 )
-	generic-sessions? ( smtp sqlite3 )
-	http-proxy? ( client )
-	smtp? ( libuv )
-	socks5? ( client http-proxy )
-	mbedtls? ( ssl )
-	?? ( 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-2.0.0 )
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
-		-DDISABLE_WERROR=ON
-		-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=$(usex static-libs)
-		-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.2.0.ebuild b/net-libs/libwebsockets/libwebsockets-4.2.0.ebuild
index 65df04b22fb8..763d47c6109a 100644
--- a/net-libs/libwebsockets/libwebsockets-4.2.0.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0/18" # libwebsockets.so.18
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~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"