10 files changed, 333 insertions, 3 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 521dc23997ab..cf4e18a65548 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 630ae466a308..3cb938061098 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,3 +1,5 @@
 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
 MISC metadata.xml 1720 BLAKE2B cd762542d4df782758246c55241a12ba6368b8db26d3814b777419b0a9b4fcf7b5a4682c6a05c41915c2b60a08efef003b83151f866d0bb3c9056fe50bd76a77 SHA512 2bf03ea4b6d1398ee685e40b4bbdba6a1f17527fba7100182c20fd5dfc87a1e88fe8cf3d02eb32f905af5ac8af5b250c98d00fb3a812602f314098bbf8f9813e
diff --git a/net-libs/libwebsockets/libwebsockets-4.2.0.ebuild b/net-libs/libwebsockets/libwebsockets-4.2.0.ebuild
new file mode 100644
index 000000000000..65df04b22fb8
--- /dev/null
+++ b/net-libs/libwebsockets/libwebsockets-4.2.0.ebuild
@@ -0,0 +1,81 @@
+# 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 ~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/nodejs/Manifest b/net-libs/nodejs/Manifest
index a2888ac15805..8a56e80b6066 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -12,10 +12,12 @@ AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5
 DIST node-v12.22.1.tar.xz 23650180 BLAKE2B 90b0a8ab3842483fea0c776e0245e63539a986c18f55abd8c7cd22ec399ccde22fa5b008d3e07c0f07713b5a45a1ee2a0bc370c04408800db2ee59cd92fcb5be SHA512 eaead633611bda04ab9be200aeddf3b4004b8104e9c6af246023b8008003dd3a7103e1508ea690443e59c6591521b04a2d71c7344343f2a20d1c935ef51c66a0
 DIST node-v14.16.1.tar.xz 33297064 BLAKE2B 0927434c63cd248e90a4002b50c7a0fd68a5527a4cd7424b451840ddf0c403ba452979b195e598cc3b323e24233248a74a1274519ce8cd3a2f4e71dc7a8f3dcb SHA512 d4f5fbab69592ae555613b2186090b85a458d2211b6035989aee2617bfd0f6768ca767ec45ce12756a9c452d00af7237edee3b1ae526049e9fcd01f8f67680c0
 DIST node-v16.0.0.tar.xz 33784448 BLAKE2B 3286cf6522074cb7b17dce8fce642204777fef26fd4bdb904fdef638061913a1eccda13b8e2f170906dd9098500c8fae7eaea7275e41bf97ea6d9fdd644b215c SHA512 6b976a8959079751bfdece15614a6286088d9145fc4db4ae048aca2ede4b7e38e86e91b1722be51eb4c934749a144a745e425ccf118bed9848c30ff254de2557
+DIST node-v16.1.0.tar.xz 33770472 BLAKE2B 2b7cf5f07dbf72eb25018cd046ce15cf6c5a444225e34d425614c19e69888b4f5c9488b079fed12e6fe52cb8dfdee20cf61c4df5a39f53e60b95c4da445f2091 SHA512 dc12078203940e7b280198ae15f51f68aaefcf8cab71a9f988952e67045e4b16dc48ec471abcc497bd15b0b426c06678e376b53762349d6568b48d52888cc2d5
 EBUILD nodejs-12.22.1-r1.ebuild 6862 BLAKE2B f3dc14d263dccc7303cb4474ab793d3c6c0114feb1f75966576c908c0f049591b45bad99b3a9fbead5a76adce9e13d238bc1ff583b199be648b3d95abbda082d SHA512 c3ebea970e031fc1692b6f8bc3a4de1e57100e7f1a36cdaab69159816fbba5d8098b9820a464b3fb05f1c4ae658a4410d783306a10bedd1baa2b6f0178dd2aae
 EBUILD nodejs-12.22.1.ebuild 6412 BLAKE2B 7e5671b07a93b739c8b3a84730f0a873dc18c6746fe25a112ef8efc6bcc44c5c68a4df3eb16cea05cbe0ef786857a4b417c463ae3469d3d09c1d1bb1ae5e1725 SHA512 b38fef7e77ac63f589d52b4836483aaa36ec36597f130e83334b3a59a9bc7e7c98fa3d2ada868472db556240b355ebf4415b656823adc60b5f1965a010e97a4a
 EBUILD nodejs-14.16.1-r1.ebuild 6890 BLAKE2B a6e1eb484326c55b3a38ab13e76a46f634d3d03e61186b7323444f11063d3d58a82bbb3d8b63b38ec583a16455306fa466a74fa1595d2a4dca0d8422f7b38dff SHA512 ac0e157c8291b3388e219a22fadf25f4350e49888769ba306b12f9fb2c90d48b568cf7a9213d002a6eac046b1c26ba4cf9294c6b75194b54cc38ba55462af8b1
 EBUILD nodejs-14.16.1.ebuild 6109 BLAKE2B 55b923b81044645154639c0768f2905b612dcea70e703451bc5bb0868f17c7c635017ab9d390cff31c2903e0b0226e5c5c0a5323d73eecb3ea730ca7ace83cc7 SHA512 017c31360f866ea46b435dcf1ba84cb8075bcdf3925da51e1c81a0b3f0a73e3b4f31b0192ea6efa890e64eb9d3ccf548fc57f17bb44f5c20c5cdf0736b287eb3
 EBUILD nodejs-16.0.0-r1.ebuild 6572 BLAKE2B b96895e82435e6801d839f2b4d87b08f337c2b3d03e09d20f900a9371835956601d15c023d2472759737001708be3591e7aaeb6fec316b2565754bceb5ce58e9 SHA512 306f97d21a259a07511ba666a37aa9b3bf21546da4e0447d46403ce141d638e34d9f3e7a80fddf8821d8cdb154582cd2458c0c03fbc474802dee0dfc4062812a
+EBUILD nodejs-16.1.0.ebuild 6261 BLAKE2B e6fcaf943e25b08de9ae6708779ce495b9390c03c3dd3750e06c4ee609753a22e48b41d43229632240a2c26edc966f89dcea2860d722f02f0f85c4617a04c9ab SHA512 6e5405b52b9b292bf5cf72d5dc7887b982c8521765188061782e83e7c8ea5531a904d16e536e3ce7efcf4a972451a785da9b12b02892db274853398e9db6db2a
 EBUILD nodejs-99999999.ebuild 5829 BLAKE2B c6c38b692df78a6292fda7f651ab9be5502f202d4c69831c4ae639b873e7d5b846899f245e88bb49bcbfe154750e6512dab01223e57c3188dae61112696b0a65 SHA512 ecc304e439c60d1f7f64e448e81eb12675fda7f8471b0a6341711c435509de81c90eb170c63a4c2b9f4cc5fcbd8fc604c40d6affa41d827f4f5ec46f474f0ae9
 MISC metadata.xml 1000 BLAKE2B 4785dba31037ad28281266047c8e59cd1d3e0e723128831f3aebc0436727b41c283284a450b5c619868e0317d3bc61e239a85e0d47773e9867f2606d5dd59047 SHA512 6556cf00ea009b394a56de614226b8cf0e04e868f47d827dba1907b5d89b957d738e4529b6338126cff9ccbd573c4451e9c2d5d4f93e4e4dad376e88419ef489
diff --git a/net-libs/nodejs/nodejs-16.1.0.ebuild b/net-libs/nodejs/nodejs-16.1.0.ebuild
new file mode 100644
index 000000000000..61ddcf50edb9
--- /dev/null
+++ b/net-libs/nodejs/nodejs-16.1.0.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax_kernel +snapshot +ssl system-icu +system-ssl systemtap test"
+REQUIRED_USE="inspector? ( icu ssl )
+	npm? ( ssl )
+	system-icu? ( icu )
+	system-ssl? ( ssl )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-arch/brotli-1.0.9
+	>=dev-libs/libuv-1.40.0:=
+	>=net-dns/c-ares-1.17.0
+	>=net-libs/nghttp2-1.41.0
+	sys-libs/zlib
+	system-icu? ( >=dev-libs/icu-67:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
+BDEPEND="${PYTHON_DEPS}
+	sys-apps/coreutils
+	virtual/pkgconfig
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+	pax_kernel? ( sys-apps/elfix )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
+	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
+)
+
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if use lto; then
+			if tc-is-gcc; then
+				if [[ $(gcc-major-version) -ge 11 ]]; then
+					# Bug #787158
+					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
+				fi
+			else
+				# configure.py will abort on this later if we do not
+				die "${PN} only supports LTO for gcc"
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	tc-export AR CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# See https://github.com/nodejs/node/issues/38558
+	# FIXME: temporary, until we have figured out why that one single test fails.
+	rm -f test/parallel/test-repl-history-navigation.js
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	# We need to disable mprotect on two files when it builds Bug 694100.
+	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	# LTO compiler flags are handled by configure.py itself
+	filter-flags '-flto*'
+
+	local myconf=(
+		--shared-brotli
+		--shared-cares
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use lto && myconf+=( --enable-lto )
+	if use system-icu; then
+		myconf+=( --with-intl=system-icu )
+	elif use icu; then
+		myconf+=( --with-intl=full-icu )
+	else
+		myconf+=( --with-intl=none )
+	fi
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		keepdir /etc/npm
+
+		# Install bash completion for `npm`
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	# parallel/test-fs-mkdir is known to fail with FEATURES=usersandbox
+	if has usersandbox ${FEATURES}; then
+		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+	fi
+
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
+}
diff --git a/net-libs/socket_wrapper/Manifest b/net-libs/socket_wrapper/Manifest
index b8eecd893909..dc89905ef05a 100644
--- a/net-libs/socket_wrapper/Manifest
+++ b/net-libs/socket_wrapper/Manifest
@@ -2,5 +2,5 @@ AUX 1.2.4-tests-pid.patch 1229 BLAKE2B 96466d9b8da797a31140d862326f5aaa3ecab0098
 DIST socket_wrapper-1.2.3.tar.gz 67476 BLAKE2B 66858406398ce3f33311390812f5fe377a7064d94be5af15fe03c363ab39798fd5a5dad7259e4ef477887c3de8b1d4d1739d08128adea0b1759b3227b4657214 SHA512 78eb85da900b43cbb5b639f19a159fc55ec1209a1a86d5d1eee5f22225d749043712b74c0f8fcb77f5a9bb705568f4cd1cbc89f85941946c745ca2d3a60878b2
 DIST socket_wrapper-1.3.2.tar.gz 86255 BLAKE2B 33f526a8871cfb1a889a84660ea8e82b6e591646924e16d2c452bb001e0eb4c1457b8151208bbec55c13c40fd124c160fc85d0df227519f62a2683e4ea1acb85 SHA512 f4d3a7026f1777a4c3b5481a0f6e6057b6372e9b64f44523ec1ebf0a34159d7154493dce6ee3c95fbea15607c6ada1382f2475d5d553133a061c80719c135b9d
 EBUILD socket_wrapper-1.2.3.ebuild 654 BLAKE2B bb26492c7be4e1bf50190fdc4bb4114ed4ed22613076f90e6500fe568ff1b1363e4b84f9b72e746728eeab3115ef9f224f5d583b789ff5437404dec5dab4dd70 SHA512 68604ee3717a131e17eb8e8f165b8b05b950e9b41c4cc2a19471d4a6fc1784cc9170f292613fdf97b76832b8a785ce00ab8cccc94991d28931d3df0e023b7c77
-EBUILD socket_wrapper-1.3.2.ebuild 630 BLAKE2B 2f69e7d4e1e0d3ed3cee6a8aada444e0cbad271c77f5d02c0a18c41f41b2f83f0d7782f6a7d837b8ba30277a12d5988e6b166c769627742132be1c06fa80322e SHA512 de4285d800493fa7fd1ff7779600539b991a352d4e764509d92402a48df6ca8a41fe56a7e373a4dea45bf9ae07957c0d4bdcbcba614c75c031b9a806e268a850
+EBUILD socket_wrapper-1.3.2.ebuild 629 BLAKE2B 1324ea81c9aa6f37176adafdceedaf4687e37c519564435db746cfcda785bfe13d9e4044a8a9f016164fa90454788e806742b14832fc37247582d6a2e4201e57 SHA512 0f93abec3130512e153936a6353884da8e09818d14d872de5821e5a81fd7266633533166ea72135dc45a4f08186e80052276c0f2012ad6b1bd3299c355d42b44
 MISC metadata.xml 249 BLAKE2B 274f77317bba157c3ad4c3e9827ce5ce934c855b8bd41e603df69f1343c296abf7faec755a56f5f8d0e76f43058156e95480a386494265385604401e70484acf SHA512 940515e5f54189b5ba3c1118ea45f679182c9075091ade1959b197a6dc5fba894cd52cd0289e00a4a139b1cd3c6563771a1e21d2baa460a25892b0fa20e819a8
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.3.2.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.3.2.ebuild
index 8ef0b817450f..10e7451f7c0a 100644
--- a/net-libs/socket_wrapper/socket_wrapper-1.3.2.ebuild
+++ b/net-libs/socket_wrapper/socket_wrapper-1.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest
index f2f897b5beb5..6252ff76ea57 100644
--- a/net-libs/srt/Manifest
+++ b/net-libs/srt/Manifest
@@ -1,7 +1,8 @@
+AUX srt-1.4.2-cxx-include-gcc11.patch 577 BLAKE2B 152d5faa123816088d7d49220c27400d8dfac5cd2234f4f290b48e21b54d78a5ce4f7bd92abdb5ef9c7bdf959fb249b3ff483ae88681fbe6115c657fd8cfd159 SHA512 95d0d67f7dc42621832037f94ee8eddb46ccd56c813cbdc87a43b59b8bb8827b20269d59fed46a8a1f348b7979ed7e39986d71c923ca5f1eab90d02af410d1a6
 AUX srt-always-GNUInstallDirs.patch 875 BLAKE2B 22aac6b20131ff48c4f9809de288d3be1d96dbc7929dc211e04aef129dc8d700d298a0e51ebaecdeb67f689f08ec07c76b6f5da0fc0e04a3328db10ca4eb107d SHA512 a85bab8e2c0b10e0aa91cae302005f37851c2387a5e841a391b68ed8b93f088c4b914776c9a2172f914dba5853b78190209d9b3afc5a7c8b320e71707b1a2ea7
 DIST srt-1.4.1.tar.gz 1316195 BLAKE2B 1831494c9817d03b7f69e46344b41ace13c22e1817aced2fdeef715ecc7da9e3cf421c399951177ce052328e5baa56445b66769b7a9e4762efee3394c43568a4 SHA512 ff30b7e413c4b9f0b5076d9ebf5f0942b5d802773a27ed1f7b886a12eb01eec0148d1c305e933d4f54ee1b451a445a48cba582111eb2057326c0f61fab097f94
 DIST srt-1.4.2.tar.gz 1538231 BLAKE2B 1b3f625bb5a6436d6c35f957796217ed8c7f9d2412e96cbb2b83b8372f0738b5c9219b218b644e74f6f16457d1b8606fedc238310e800cce84fe127f86b33be1 SHA512 4c978e3898737e566f47222a0095df1b49591d79927850cc94c838b7eaccf401faf1c5d038fa45b6fd30c85f980e7c212a79c07ed6f9008430e8a5a594a31ffe
 EBUILD srt-1.4.1-r1.ebuild 1048 BLAKE2B 5a975b1bd7558d44ab22a241eb2a77e7afbb3056d3db5b3239b025334678fda68bab539c9bc0ddfd08ad918a10fe23361728f8a651b407306dccd762cb409a32 SHA512 e108397cb685914a93644878df8523f80e254e2dee8d8269a614c6b098aab2a60c0d5df0a2350394b28104a25219caa28709c9080b3db81850e7456958d4442b
-EBUILD srt-1.4.2.ebuild 1061 BLAKE2B 9255a79a07098b725f0813872abf0f2fcd1f85895ad328ee7a69c12c3574890b14febded416ab529402ea57793feec84e4adb6b1066ce884a73b4583f093069e SHA512 a603c03cfb702e01c52ddba0d6a26524e520dec19bd1e689ff095255d5223bfaa2c0563c581c93ffd13a10c3b045ac18208c8bba7951732a2ae601f8c995fc96
+EBUILD srt-1.4.2.ebuild 1105 BLAKE2B c2b7597509470db7a5d51d5c420ba5e4fb1d6c412fe8cc28b28d8f231d81ddb2dfc984766bb41fe46f2f99e5979ebd0aabb6a35ec6fb1ca9cc60e9bc703e638b SHA512 5ea2b7ea7b000b3d6324a8255d0df89f8b5cc769319580db4d570e711f0f6c8d9c5598dc9759cf9e931060c1009f5fc35b7a8f17b9b1fda25cd2af52ca109c3c
 EBUILD srt-9999.ebuild 1154 BLAKE2B ae9be19f6f30adc4b52d2c313644b7780b20dd8343ee0b8ef859ce93742b93581148b6664ca5793a6aa0f49c9e9669fdd418cf2cdb995dbee8346693183cb389 SHA512 a1b1604c405278952a709c50d74eb6c32a3182b26a0849c9101647f7b06bed4926ca8de68233dea454714af0a3de6494c5f8198bc11c38ef27a4d2e9cbf386e4
 MISC metadata.xml 429 BLAKE2B d4e74c1d35b8fe63e3c0380392f846d303d57992f17345ae5adfd859c6079d5e493e231fa33bd564df9c5832e180365c2fdcf4603689aabcfa8d3bef18d45e29 SHA512 146f7efe7d26123367b77a484f372e4e146f821b3b359d06056c319440b02389b337e98e7f4ee921f2420c8f852cc46b2cef55abc7ea1f91f336d81a14278bd0
diff --git a/net-libs/srt/files/srt-1.4.2-cxx-include-gcc11.patch b/net-libs/srt/files/srt-1.4.2-cxx-include-gcc11.patch
new file mode 100644
index 000000000000..16c57af80929
--- /dev/null
+++ b/net-libs/srt/files/srt-1.4.2-cxx-include-gcc11.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/787023
+https://github.com/Haivision/srt/commit/f1b35cbf5b9b42b031e9b119e4c802b5f744468c
+
+From f1b35cbf5b9b42b031e9b119e4c802b5f744468c Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <krop@users.noreply.github.com>
+Date: Wed, 10 Feb 2021 12:42:45 +0000
+Subject: [PATCH] [core] Fix build with GCC 11. (#1806)
+
+The 'limits' header must be included explicitly.
+--- a/srtcore/sync.h
++++ b/srtcore/sync.h
+@@ -15,6 +15,7 @@
+ //#define ENABLE_CXX17
+ 
+ #include <cstdlib>
++#include <limits>
+ #ifdef ENABLE_STDCXX_SYNC
+ #include <chrono>
+ #include <thread>
diff --git a/net-libs/srt/srt-1.4.2.ebuild b/net-libs/srt/srt-1.4.2.ebuild
index cbade3405e2a..de77f27cd91a 100644
--- a/net-libs/srt/srt-1.4.2.ebuild
+++ b/net-libs/srt/srt-1.4.2.ebuild
@@ -34,6 +34,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-always-GNUInstallDirs.patch"
+	"${FILESDIR}/${P}-cxx-include-gcc11.patch"
 )
 
 src_prepare() {