Updating liguros repov21.1.3

38 files changed, 361 insertions, 767 deletions

diff --git a/net-libs/axtls/axtls-2.1.5-r100.ebuild b/net-libs/axtls/axtls-2.1.5-r100.ebuild
index af38f5be8b31..19ef6c36eb88 100644
--- a/net-libs/axtls/axtls-2.1.5-r100.ebuild
+++ b/net-libs/axtls/axtls-2.1.5-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,7 +42,7 @@ S="${WORKDIR}/${PN}-code"
 
 LICENSE="BSD GPL-2"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 
 IUSE="httpd cgi-lua cgi-php static static-libs doc"
 
diff --git a/net-libs/gloox/files/gloox-1.0.24-slibtool.patch b/net-libs/gloox/files/gloox-1.0.24-slibtool.patch
new file mode 100644
index 000000000000..eba7ffb40613
--- /dev/null
+++ b/net-libs/gloox/files/gloox-1.0.24-slibtool.patch
@@ -0,0 +1,13 @@
+This fixes build with sys-devel/slibtool
+
+--- gloox-1.0.24/src/Makefile.am
++++ gloox-1.0.24/src/Makefile.am
+@@ -46,7 +46,7 @@
+                         carbons.cpp jinglepluginfactory.cpp jingleiceudp.cpp jinglefiletransfer.cpp \
+                         iodata.cpp
+ 
+-libgloox_la_LDFLAGS = -version-info 18:0:0 -no-undefined -no-allow-shlib-undefined
++libgloox_la_LDFLAGS = -version-info 18:0:0 -Wl,--no-undefined -Wl,--no-allow-shlib-undefined
+ libgloox_la_LIBADD =
+ libgloox_la_CFLAGS = $(CPPFLAGS)
+ 
diff --git a/net-libs/gloox/gloox-1.0.24.ebuild b/net-libs/gloox/gloox-1.0.24.ebuild
index e7a34c9e3dc3..f69f54f3f6a0 100644
--- a/net-libs/gloox/gloox-1.0.24.ebuild
+++ b/net-libs/gloox/gloox-1.0.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,6 +32,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}/${PN}-1.0.24-musl.patch"
 	"${FILESDIR}/${PN}-1.0.24-Makefile.patch"
+	"${FILESDIR}/${PN}-1.0.24-slibtool.patch"
 )
 
 src_prepare() {
diff --git a/net-libs/gsoap/files/gsoap-2.8.70-parallel.patch b/net-libs/gsoap/files/gsoap-2.8.70-parallel.patch
deleted file mode 100644
index 8abd36d937c9..000000000000
--- a/net-libs/gsoap/files/gsoap-2.8.70-parallel.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gsoap-2.8/gsoap/src/Makefile.am
-+++ gsoap-2.8/gsoap/src/Makefile.am
-@@ -5,6 +5,7 @@
- ## you have all needed files, that a GNU package needs
- AUTOMAKE_OPTIONS = foreign 1.4
- 
-+include MakefileManual
- 
- #LIBS=
- AM_YFLAGS=-d -v
diff --git a/net-libs/gsoap/files/gsoap-2.8.70-shared_libs.patch b/net-libs/gsoap/files/gsoap-2.8.70-shared_libs.patch
deleted file mode 100644
index cb3f11ed129a..000000000000
--- a/net-libs/gsoap/files/gsoap-2.8.70-shared_libs.patch
+++ /dev/null
@@ -1,141 +0,0 @@
---- gsoap-2.8/configure.ac
-+++ gsoap-2.8/configure.ac
-@@ -17,7 +17,7 @@
- AC_PROG_YACC
- AC_PROG_CPP
- AC_PROG_RANLIB
--#AM_PROG_LIBTOOL
-+AM_PROG_LIBTOOL
- AC_PROG_LN_S
- AC_PROG_AWK
- AC_PROG_INSTALL
-@@ -278,15 +278,17 @@
-     WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz"
-     SAMPLE_INCLUDES=
-     SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz"
--    WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
-+    WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a"
-+    WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la"
-   else
-     AC_MSG_RESULT(no)
-     WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP"
-     # compile with wsdl2h when OPENSSL is available
--    WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lssl -lcrypto -lz"
-+    WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lcrypto"
-     SAMPLE_INCLUDES=
-     SAMPLE_SSL_LIBS="-lssl -lcrypto -lz"
--    WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
-+    WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a"
-+    WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la"
-   fi
-   if test -n "$ZLIB"; then
-     WSDL2H_EXTRA_FLAGS="-I${ZLIB}/include ${WSDL2H_EXTRA_FLAGS}"
-@@ -305,7 +307,8 @@
-   WSDL2H_EXTRA_FLAGS=
-   SAMPLE_SSL_LIBS=
-   SAMPLE_INCLUDES=
--  WSDL2H_SOAP_CPP_LIB="libgsoap++.a"
-+  WSDL2H_SOAP_CPP_STATIC_LIB="libgsoap++.a"
-+  WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la"
- fi
- AM_CONDITIONAL(WITH_OPENSSL, test "x$with_openssl" = "xyes" -a "x$with_gnutls" != "xyes")
- AC_SUBST(WITH_OPENSSL)
-@@ -313,7 +316,8 @@
- AC_SUBST(WSDL2H_EXTRA_LIBS)
- AC_SUBST(SAMPLE_INCLUDES)
- AC_SUBST(SAMPLE_SSL_LIBS)
--AC_SUBST(WSDL2H_SOAP_CPP_LIB)
-+AC_SUBST(WSDL2H_SOAP_CPP_SHARED_LIB)
-+AC_SUBST(WSDL2H_SOAP_CPP_STATIC_LIB)
- 
- # enable the compile of the samples
- AC_ARG_ENABLE(samples,
---- gsoap-2.8/gsoap/Makefile.am
-+++ gsoap-2.8/gsoap/Makefile.am
-@@ -49,6 +49,29 @@
- libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
- libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
- 
-+lib_LTLIBRARIES = libgsoap.la libgsoap++.la libgsoapck.la libgsoapck++.la libgsoapssl.la libgsoapssl++.la
-+SOVERSION = 0
-+libgsoap_la_SOURCES = stdsoap2.c dom.c
-+libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
-+libgsoap_la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoap___la_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp
-+libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
-+libgsoap___la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoapck_la_SOURCES = stdsoap2_ck.c dom.c
-+libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
-+libgsoapck_la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoapck___la_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp
-+libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
-+libgsoapck___la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoapssl_la_SOURCES = stdsoap2_ssl.c dom.c
-+libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
-+libgsoapssl_la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoapssl_la_LIBADD = -lssl -lcrypto -lz
-+libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
-+libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
-+libgsoapssl___la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoapssl___la_LIBADD = -lssl -lcrypto -lz
-+
- BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp stdsoap2_ck.c stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp
- 
- include_HEADERS = stdsoap2.h
---- gsoap-2.8/gsoap/samples/autotest/Makefile.am
-+++ gsoap-2.8/gsoap/samples/autotest/Makefile.am
-@@ -14,7 +14,7 @@
- WSDLINPUT=$(top_srcdir)/gsoap/samples/autotest/examples.wsdl
- SOAPHEADER=$(top_srcdir)/gsoap/samples/autotest/examples.h
- SOAP_CPP_SRC=soapC.cpp soapServer.cpp
--SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
-+SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.a
- 
- $(SOAP_CPP_SRC) : $(WSDLINPUT)
- 	$(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
-@@ -40,6 +40,6 @@
- autotest_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform)
- autotest_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS)
- autotest_SOURCES=$(SOAP_CPP_SRC) soapTester.cpp duration.cpp long_time.cpp struct_tm.cpp struct_tm_date.cpp
--autotest_LDADD=$(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS)
-+autotest_LDADD=$(SOAP_CPP_SHARED_LIB) $(SAMPLE_EXTRA_LIBS)
- 
- CLEANFILES= *~ *.h *.cpp *.xml *.log *.nsmap
---- gsoap-2.8/gsoap/samples/databinding/Makefile.am
-+++ gsoap-2.8/gsoap/samples/databinding/Makefile.am
-@@ -14,7 +14,7 @@
- WSDLINPUT=$(top_srcdir)/gsoap/samples/databinding/address.xsd
- SOAPHEADER=$(top_srcdir)/gsoap/samples/databinding/address.h
- SOAP_CPP_SRC=addressC.cpp
--SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
-+SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.a
- 
- $(SOAP_CPP_SRC) : $(WSDLINPUT)
- 	$(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
-@@ -28,6 +28,6 @@
- address_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform)
- address_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS)
- address_SOURCES=$(SOAP_CPP_SRC) address.cpp
--address_LDADD=$(SOAP_CPP_LIB)
-+address_LDADD=$(SOAP_CPP_SHARED_LIB)
- 
- CLEANFILES= *~ address.h *C.cpp *H.h *Stub.h *.nsmap
---- gsoap-2.8/gsoap/wsdl/Makefile.am
-+++ gsoap-2.8/gsoap/wsdl/Makefile.am
-@@ -10,7 +10,7 @@
- AM_LDFLAGS=-L$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin
- AM_CPPFLAGS=-I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin
- SOAP=$(top_builddir)/gsoap/src/soapcpp2$(EXEEXT)
--SOAP_CPP_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_LIB)
-+SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_SHARED_LIB)
- SOAP_CPP_SRC=wsdlC.cpp
- SOAPHEADER=$(top_srcdir)/gsoap/wsdl/wsdl.h
- SOAP_FLAGS=-SC -pwsdl -I$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap/import
-@@ -32,6 +32,6 @@
- if WITH_OPENSSL
- wsdl2h_SOURCES += $(top_srcdir)/gsoap/plugin/httpda.c $(top_srcdir)/gsoap/plugin/smdevp.c $(top_srcdir)/gsoap/plugin/threads.c
- endif
--wsdl2h_LDADD=$(SOAP_CPP_LIB) $(WSDL2H_EXTRA_LIBS)
-+wsdl2h_LDADD=$(SOAP_CPP_SHARED_LIB) $(WSDL2H_EXTRA_LIBS)
- 
- CLEANFILES= *~ *C.cpp *H.h *Stub.h *.nsmap
diff --git a/net-libs/gsoap/files/gsoap-2.8.93-fix-parallel-build.patch b/net-libs/gsoap/files/gsoap-2.8.93-fix-parallel-build.patch
deleted file mode 100644
index 27e2a94d14e5..000000000000
--- a/net-libs/gsoap/files/gsoap-2.8.93-fix-parallel-build.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/gsoap/src/Makefile.am
-+++ b/gsoap/src/Makefile.am
-@@ -10,11 +10,13 @@ AUTOMAKE_OPTIONS = foreign 1.4
- AM_YFLAGS=-d -v
- AM_LFLAGS=$(LEX_FLAGS)
- 
-+BUILT_SOURCES = soapcpp2_yacc.h
-+
- bin_PROGRAMS=soapcpp2
- 
- soapcpp2_CFLAGS=$(BISON_DEFINE) $(LEX_DEFINE) $(C_DEBUG_FLAGS) $(SOAPCPP2_IMPORTPATH) -D$(platform)
- soapcpp2_LDADD=$(YACC_LIB) $(LEXLIB)
--soapcpp2_SOURCES= soapcpp2_yacc.y soapcpp2_yacc.h soapcpp2_lex.l symbol2.c error2.c init2.c soapcpp2.c
-+soapcpp2_SOURCES= soapcpp2_yacc.y soapcpp2_lex.l symbol2.c error2.c init2.c soapcpp2.c
- 
- CLEANFILES= *~ soapcpp2_lex.c soapcpp2_yacc.c soapcpp2_yacc.h soapcpp2_yacc.output
- 
diff --git a/net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild b/net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild
index a880bb0cb67d..0d59cdd5dafa 100644
--- a/net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild
+++ b/net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VER
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest
index caa968a9c39a..16d898727cf0 100644
--- a/net-libs/libbitcoinconsensus/Manifest
+++ b/net-libs/libbitcoinconsensus/Manifest
@@ -1,8 +1,2 @@
-DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
-DIST bitcoin-0.19.1.knots20200304.patches.tar.xz 399864 BLAKE2B de5591072b62c65c8a0fdcee7a7ed4b74d13614e47b679a05f272207b9ca0a09d476aa8ecb66321f39953a320f4d47f7d2aa62848192d493de02525c3d5abdfa SHA512 3b08023f0788535dc5943e47a595da5637172263ac8c2ad97d42c0707da7468a9843efbf90a2eb6ac99db65e362e99cbe9209ab64785c79de908e20801ba4fe5
-DIST bitcoin-0.20.0.knots20200614.patches.tar.xz 392356 BLAKE2B 17c5d5c89e279c870492ac4f98cfde6545fa3c4b5169f42c020e45ca14c133673e271b248e90286ae875aaef6b031e578d14554777a89dca5366aa4bda079012 SHA512 208234b2e7fa46e19da9954dab9828993aa62a7623d85de8e7d43ffd4b367c5e8641e82154357526a11b95c0426ec16039d2910dbbe9187daba9d14a3b2fda92
 DIST bitcoin-0.20.1.knots20200815.patches.tar.xz 413244 BLAKE2B bc8fd6bfe0454439ae514086ea3e728df4f1ba069d33f79b047049a1a4d18543334217f25607b738f7f2d1245f64e5289aed00473c94edf5d660e0953e4d6b93 SHA512 98468f4f22d5b9d35c616796aa5a8fda20f775606f0cd4927b3b822dd5afd0fc208c23136306f79d01dbfd532b14a5905a8fb60a2d171d5022d2008772cf7b58
-DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
-DIST bitcoin-v0.19.1.tar.gz 6660702 BLAKE2B 93ed83f663a833f6be40195ddaf62a8ef9fcd86c3f983fe0cf1e75eaf9ae54cdc88fcdfc36d798842f29636dc8037af5b67e82643c90a6c276fa504ed022f863 SHA512 bc1afad7de5b43042d24780b07e3faf73dda69af9ef0c75fa1a32bd25b0b37e315955614ffbb2864fe827b77b63446fd88cae22da3d0706ff73df495a519ba5d
-DIST bitcoin-v0.20.0.tar.gz 6984988 BLAKE2B 2c189826b7171276df62fb8cbf713d8b4cb4307de413247f2951950ec173d069930447d7d420d1c73ba0abc97fd613a05fc527bcc796e5e2d2f3dfb57fb29b80 SHA512 7628efb70bf51e4165605d9e77f6119b855994e99d8cb6653dfbd89628304862f3a98cfe352aa8b435913000e74d297565d8a7e3f22a23006d1779b70d04a8cd
 DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.16.3.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.16.3.ebuild
deleted file mode 100644
index 3d00e4c0f957..000000000000
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.16.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 2010-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-BITCOINCORE_COMMITHASH="49e34e288005a5b144a642e197b628396f5a0765"
-KNOTS_PV="${PV}.knots20180918"
-KNOTS_P="bitcoin-${KNOTS_PV}"
-
-DESCRIPTION="Bitcoin Core consensus library"
-HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
-SRC_URI="
-	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="+asm knots libressl"
-
-DEPEND="
-	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md )
-
-S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
-
-pkg_pretend() {
-	if use knots; then
-		elog "You are building ${PN} from Bitcoin Knots."
-		elog "For more information, see:"
-		elog "https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
-	else
-		elog "You are building ${PN} from Bitcoin Core."
-		elog "For more information, see:"
-		elog "https://bitcoincore.org/en/2018/09/18/release-${PV}/"
-	fi
-}
-
-src_prepare() {
-	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
-
-	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
-
-	if use knots; then
-		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
-	fi
-
-	eapply_user
-
-	echo '#!/bin/true' >share/genbuild.sh || die
-	mkdir -p src/obj || die
-	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
-
-	eautoreconf
-	rm -r src/leveldb src/secp256k1 || die
-}
-
-src_configure() {
-	local my_econf=(
-		$(use_enable asm)
-		--without-qtdbus
-		--without-libevent
-		--without-qrencode
-		--without-miniupnpc
-		--disable-tests
-		--disable-wallet
-		--disable-zmq
-		--with-libs
-		--disable-util-cli
-		--disable-util-tx
-		--disable-bench
-		--without-daemon
-		--without-gui
-		--disable-ccache
-		--disable-static
-		--with-system-libsecp256k1
-	)
-	econf "${my_econf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.19.1.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.19.1.ebuild
deleted file mode 100644
index dd26ed1999c7..000000000000
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.19.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-BITCOINCORE_COMMITHASH="58ba7c314d552cea8cb024960a8504577aee586f"
-KNOTS_PV="${PV}.knots20200304"
-KNOTS_P="bitcoin-${KNOTS_PV}"
-
-DESCRIPTION="Bitcoin Core consensus library"
-HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
-SRC_URI="
-	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.19.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+asm knots libressl"
-
-DEPEND="
-	>dev-libs/libsecp256k1-0.1_pre20170321:=[recovery]
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md )
-
-S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
-
-pkg_pretend() {
-	if use knots; then
-		elog "You are building ${PN} from Bitcoin Knots."
-		elog "For more information, see:"
-		elog "https://bitcoinknots.org/files/0.19.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
-	else
-		elog "You are building ${PN} from Bitcoin Core."
-		elog "For more information, see:"
-		elog "https://bitcoincore.org/en/2020/03/04/release-${PV}/"
-	fi
-}
-
-src_prepare() {
-	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
-
-	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
-
-	if use knots; then
-		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
-	fi
-
-	eapply_user
-
-	echo '#!/bin/true' >share/genbuild.sh || die
-	mkdir -p src/obj || die
-	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
-
-	eautoreconf
-	rm -r src/leveldb src/secp256k1 || die
-}
-
-src_configure() {
-	local my_econf=(
-		$(use_enable asm)
-		--without-qtdbus
-		--without-qrencode
-		--without-miniupnpc
-		--disable-tests
-		--disable-wallet
-		--disable-zmq
-		--with-libs
-		--disable-util-cli
-		--disable-util-tx
-		--disable-util-wallet
-		--disable-bench
-		--without-daemon
-		--without-gui
-		--without-rapidcheck
-		--disable-fuzz
-		--disable-ccache
-		--disable-static
-		--with-system-libsecp256k1
-	)
-	econf "${my_econf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.0.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.0.ebuild
deleted file mode 100644
index 0f5c0bfb4ec2..000000000000
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-BITCOINCORE_COMMITHASH="a62f0ed64f8bbbdfe6467ac5ce92ef5b5222d1bd"
-KNOTS_PV="${PV}.knots20200614"
-KNOTS_P="bitcoin-${KNOTS_PV}"
-
-DESCRIPTION="Bitcoin Core consensus library"
-HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
-SRC_URI="
-	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+asm knots libressl"
-
-DEPEND="
-	>dev-libs/libsecp256k1-0.1_pre20170321:=[recovery]
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=sys-devel/autoconf-2.69
-	>=sys-devel/automake-1.13
-"
-
-DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md )
-
-S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
-
-pkg_pretend() {
-	if use knots; then
-		elog "You are building ${PN} from Bitcoin Knots."
-		elog "For more information, see:"
-		elog "https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
-	else
-		elog "You are building ${PN} from Bitcoin Core."
-		elog "For more information, see:"
-		elog "https://bitcoincore.org/en/2020/06/03/release-${PV}/"
-	fi
-}
-
-src_prepare() {
-	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
-
-	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
-
-	if use knots; then
-		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
-	fi
-
-	eapply_user
-
-	echo '#!/bin/true' >share/genbuild.sh || die
-	mkdir -p src/obj || die
-	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
-
-	eautoreconf
-	rm -r src/leveldb src/secp256k1 || die
-}
-
-src_configure() {
-	local my_econf=(
-		$(use_enable asm)
-		--without-qtdbus
-		--without-qrencode
-		--without-miniupnpc
-		--disable-tests
-		--disable-wallet
-		--disable-zmq
-		--with-libs
-		--disable-util-cli
-		--disable-util-tx
-		--disable-util-wallet
-		--disable-bench
-		--without-daemon
-		--without-gui
-		--disable-fuzz
-		--disable-ccache
-		--disable-static
-		--with-system-libsecp256k1
-	)
-	econf "${my_econf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libgsasl/libgsasl-1.8.1.ebuild b/net-libs/libgsasl/libgsasl-1.8.1.ebuild
index 06a3058dc239..1cb716fb63b5 100644
--- a/net-libs/libgsasl/libgsasl-1.8.1.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="idn gcrypt kerberos nls ntlm static-libs"
 
 DEPEND="
diff --git a/net-libs/libircclient/files/libircclient-1.8-shared.patch b/net-libs/libircclient/files/libircclient-1.8-shared.patch
deleted file mode 100644
index 1fbc0e693502..000000000000
--- a/net-libs/libircclient/files/libircclient-1.8-shared.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- libircclient-1.7.orig/src/Makefile.in
-+++ libircclient-1.7/src/Makefile.in
-@@ -1,8 +1,10 @@
- # $Id$
- CC = @CC@
--CFLAGS = -Wall -DIN_BUILDING_LIBIRC @CFLAGS@
-+CFLAGS = -fPIC -Wall -DIN_BUILDING_LIBIRC @CFLAGS@
- AR=@AR@ cr
- RANLIB=@RANLIB@
-+INSTALL=install
-+LN=ln -sf
- INCLUDES=-I../include
- DESTDIR=
- APIVERSION = 1
-@@ -15,19 +17,24 @@
- shared: libircclient.so
- shared_mingw: libircclient.dll
- 
--install:
--	-mkdir -p $(DESTDIR)@prefix@/include
--	-mkdir -p $(DESTDIR)@libdir@
--	cp ../include/libircclient.h $(DESTDIR)@prefix@/include/libircclient.h
--	cp ../include/libirc_errors.h $(DESTDIR)@prefix@/include/libirc_errors.h
--	cp ../include/libirc_events.h  $(DESTDIR)@prefix@/include/libirc_events.h 
--	cp ../include/libirc_options.h  $(DESTDIR)@prefix@/include/libirc_options.h 
--	cp ../include/libirc_rfcnumeric.h  $(DESTDIR)@prefix@/include/libirc_rfcnumeric.h 
--	cp libircclient.so $(DESTDIR)@libdir@/libircclient.so.$(APIVERSION)
--	ln -fs libircclient.so.$(APIVERSION) $(DESTDIR)@libdir@/libircclient.so
-+install: install-headers install-static install-shared
-+install-headers:
-+	$(INSTALL) -d $(DESTDIR)@prefix@/include
-+	$(INSTALL) -m0644 ../include/libircclient.h $(DESTDIR)@prefix@/include/libircclient.h
-+	$(INSTALL) -m0644 ../include/libirc_errors.h $(DESTDIR)@prefix@/include/libirc_errors.h
-+	$(INSTALL) -m0644 ../include/libirc_events.h  $(DESTDIR)@prefix@/include/libirc_events.h 
-+	$(INSTALL) -m0644 ../include/libirc_options.h  $(DESTDIR)@prefix@/include/libirc_options.h 
-+	$(INSTALL) -m0644 ../include/libirc_rfcnumeric.h  $(DESTDIR)@prefix@/include/libirc_rfcnumeric.h 
-+install-shared:
-+	$(INSTALL) -d $(DESTDIR)@libdir@
-+	$(INSTALL) -m0755 libircclient.so $(DESTDIR)@libdir@/libircclient.so.$(APIVERSION)
-+	$(LN) libircclient.so.$(APIVERSION) $(DESTDIR)@libdir@/libircclient.so
-+install-static:
-+	$(INSTALL) -d $(DESTDIR)@libdir@
-+	$(INSTALL) -m0644 libircclient.a $(DESTDIR)@libdir@/libircclient.a
- 
- libircclient.so: libircclient.o
--	$(CC) -shared -s -Wl,-soname,libircclient.so.$(APIVERSION) -o libircclient.so libircclient.o @LIBS@
-+	$(CC) $(CFLAGS) -shared -Wl,-soname,libircclient.so.$(APIVERSION) -o libircclient.so libircclient.o $(LDFLAGS) @LIBS@
- 
- libircclient.dll: libircclient.o
- 	$(CC) -shared -s -o libircclient.dll -Wl,-out-implib,libircclient.lib libircclient.o libircclient.def -lkernel32 -lwsock32 @LIBS@
diff --git a/net-libs/libisds/Manifest b/net-libs/libisds/Manifest
index 12b9bb9ee5b0..3314dc794a8b 100644
--- a/net-libs/libisds/Manifest
+++ b/net-libs/libisds/Manifest
@@ -1,2 +1 @@
-DIST libisds-0.10.8.tar.xz 726040 BLAKE2B e3509202cb95e6e2bd0a6e7592c3d1d649ecb47806823265e5e12fa3a79a5daff9d249b2f0642d13aaebf1c64243690d06c9387fcb3a166f4b989c19f337c059 SHA512 648ba30c3156ece329d663d0d6e649319d8d104de97ca1946d94c24205c44189be08cb0c573df1f5a889fba487f2d088ac472c3f922a1920e172dda0c592b41e
 DIST libisds-0.11.1.tar.xz 741992 BLAKE2B e1895450b1148c63a365a569fcdfa0d3cf3f2cdd011da6dbe92ea876aa1a9082470f3c7efc5757766df7e870559dd4ba62b59973e22d47401ef575e0fd412ec1 SHA512 8baf126ebf49c5eae6aa7b8f872ad90882a9a5088c8a33ffb415983eaf1ffc1df489f44ae6ba14a69a94bc4f79f455c7937276885afaa29e61c5c67408f7080a
diff --git a/net-libs/libisds/libisds-0.10.8.ebuild b/net-libs/libisds/libisds-0.10.8.ebuild
deleted file mode 100644
index fde0eecc3be8..000000000000
--- a/net-libs/libisds/libisds-0.10.8.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Client library for accessing ISDS Soap services"
-HOMEPAGE="https://xpisar.wz.cz/libisds/"
-SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.xz"
-KEYWORDS="amd64 ~mips x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="+curl debug nls openssl static-libs test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/expat
-	dev-libs/libxml2
-	curl? ( net-misc/curl[ssl] )
-	openssl? ( dev-libs/openssl:= )
-	!openssl? (
-		app-crypt/gpgme
-		dev-libs/libgcrypt:=
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=net-libs/gnutls-2.12.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!openssl? ( >=app-crypt/gnupg-2 )
-"
-
-DOCS=( NEWS README AUTHORS ChangeLog )
-
-src_configure() {
-	local myeconfargs=(
-		--disable-fatalwarnings
-		$(use_with curl libcurl)
-		$(use_enable curl curlreauthorizationbug)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable openssl openssl-backend)
-		$(use_enable static-libs static)
-		$(use_enable test)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}/" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/net-libs/libisds/libisds-0.11.1.ebuild b/net-libs/libisds/libisds-0.11.1.ebuild
index df1d8c3f3084..f4e7a1711524 100644
--- a/net-libs/libisds/libisds-0.11.1.ebuild
+++ b/net-libs/libisds/libisds-0.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 DESCRIPTION="Client library for accessing ISDS Soap services"
 HOMEPAGE="https://xpisar.wz.cz/libisds/"
 SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.xz"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="amd64 ~mips x86"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.65.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.65-r1.ebuild
index e8edd69c90fc..a63868673689 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.65.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.65-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -17,17 +17,12 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="+epoll messages ssl static-libs test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="ssl? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls
-	)"
+RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:= )"
 
 # We disable tests below because they're broken,
 # but if enabled, we'll need this.
 DEPEND="${RDEPEND}
-	test?	(
-		ssl? ( net-misc/curl[ssl] )
-	)"
+	test?	( net-misc/curl[ssl?] )"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.68.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild
index 455a6c307e14..00526a94512d 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.68.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -17,17 +17,12 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="+epoll ssl static-libs test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="ssl? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls
-	)"
+RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:= )"
 
 # We disable tests below because they're broken,
 # but if enabled, we'll need this.
 DEPEND="${RDEPEND}
-	test?	(
-		ssl? ( net-misc/curl[ssl] )
-	)"
+	test?	( net-misc/curl[ssl?] )"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.69.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.69.ebuild
index c17a93c12ff6..74e07fa7baab 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.69.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.69.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="ssl? (
 		dev-libs/libgcrypt:0=
-		net-libs/gnutls
+		net-libs/gnutls:=
 	)"
 
 # We disable tests below because they're broken,
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.70.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.70-r1.ebuild
index e131da4973db..a73721de9062 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.70.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.70-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -17,17 +17,12 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="+epoll ssl static-libs test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="ssl? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls
-	)"
+RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:= )"
 
 # We disable tests below because they're broken,
 # but if enabled, we'll need this.
 DEPEND="${RDEPEND}
-	test?	(
-		ssl? ( net-misc/curl[ssl] )
-	)"
+	test?	( net-misc/curl[ssl?] )"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.71.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.71.ebuild
index 919f28a7b44c..18d6a3dce369 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.71.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.71.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="ssl? (
 		dev-libs/libgcrypt:0=
-		net-libs/gnutls
+		net-libs/gnutls:=
 	)"
 
 # We disable tests below because they're broken,
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild
index b8e3599fc5f8..09b440b4bf51 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc
 IUSE="+epoll ssl static-libs test thread-names"
 RESTRICT="!test? ( test )"
 
-RDEPEND="ssl? ( >net-libs/gnutls-2.12.20 )"
+RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:= )"
 
 DEPEND="${RDEPEND}
 	test?	( net-misc/curl[ssl?] )
diff --git a/net-libs/libndp/libndp-1.7.ebuild b/net-libs/libndp/libndp-1.7.ebuild
index f9a4610a060f..b0479a6248fb 100644
--- a/net-libs/libndp/libndp-1.7.ebuild
+++ b/net-libs/libndp/libndp-1.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit gnome2 multilib-minimal
 
 DESCRIPTION="Library for Neighbor Discovery Protocol"
@@ -10,13 +10,9 @@ SRC_URI="http://libndp.org/files/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE=""
 
 KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 
-DEPEND=""
-RDEPEND=""
-
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" \
 	gnome2_src_configure \
diff --git a/net-libs/libproxy/files/libproxy-0.4.15-avoid-nm-build-dep.patch b/net-libs/libproxy/files/libproxy-0.4.15-avoid-nm-build-dep.patch
deleted file mode 100644
index e896baa3bacc..000000000000
--- a/net-libs/libproxy/files/libproxy-0.4.15-avoid-nm-build-dep.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 703ac16ea2b508dc16d433b3fd597fcd496d05c1 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 29 Apr 2013 23:02:25 -0400
-Subject: [PATCH] Avoid build-time dependency on NetworkManager
-
-Needed to prevent a dependency loop:
-nm -> libsoup -> glib-networking -> libproxy -> nm
-
-https://bugs.gentoo.org/467696
-
-* asturm@gentoo.org: Rebased on top of 0.4.15
-  also revert 423801295921ab1ec0d98565fcbc2635088d45da
----
- libproxy/cmake/modules.cmk                    |  6 ++---
- .../cmake/modules/network_networkmanager.cmk  |  5 +---
- libproxy/modules/network_networkmanager.cpp   | 23 ++++++++++++++-----
- 3 files changed, 21 insertions(+), 13 deletions(-)
-
-diff --git a/libproxy/cmake/modules.cmk b/libproxy/cmake/modules.cmk
-index b3211f2..d4436e1 100644
---- a/libproxy/cmake/modules.cmk
-+++ b/libproxy/cmake/modules.cmk
-@@ -38,10 +38,10 @@ px_module(config_w32reg            "${WIN32}"        1)
- px_module(ignore_domain            1                 1)
- px_module(ignore_hostname          1                 1)
- px_module(ignore_ip                1                 1)
--if(NM_FOUND OR NMold_FOUND)
-+if(NM_FOUND)
-   set(NM_BUILD 1)
--endif(NM_FOUND OR NMold_FOUND)
--px_module(network_networkmanager   "${NM_BUILD}"     0       ${NM_LIBRARIES}${NMold_LIBRARIES})
-+endif(NM_FOUND)
-+px_module(network_networkmanager   "${NM_BUILD}"     0       ${NM_LIBRARIES})
- px_module(pacrunner_mozjs          "${MOZJS_FOUND}"  ${BIPR} ${MOZJS_LIBRARIES})
- px_module(pacrunner_natus          "${NATUS_FOUND}"  ${BIPR} ${NATUS_LIBRARIES})
- px_module(pacrunner_webkit         "${WEBKIT_FOUND}" ${BIPR} ${WEBKIT_LIBRARIES})
-diff --git a/libproxy/cmake/modules/network_networkmanager.cmk b/libproxy/cmake/modules/network_networkmanager.cmk
-index 6ef6ead..2586bbd 100644
---- a/libproxy/cmake/modules/network_networkmanager.cmk
-+++ b/libproxy/cmake/modules/network_networkmanager.cmk
-@@ -1,6 +1,3 @@
- if (NOT WIN32 AND NOT APPLE)
--  px_check_modules(NM libnm dbus-1)
--  if (NOT NM_FOUND)
--    px_check_modules(NMold NetworkManager dbus-1)
--  endif (NOT NM_FOUND)
-+  px_check_modules(NM dbus-1)
- endif()
-diff --git a/libproxy/modules/network_networkmanager.cpp b/libproxy/modules/network_networkmanager.cpp
-index 546a8ee..4dc3d8d 100644
---- a/libproxy/modules/network_networkmanager.cpp
-+++ b/libproxy/modules/network_networkmanager.cpp
-@@ -23,13 +23,24 @@
- using namespace libproxy;
- 
- #include <dbus/dbus.h>
--#include <NetworkManager.h>
- 
--// Backwards compatibility: with the switch to libnm, NM_STATE_CONNECTED is no
--// longer defined. NM_STATE_CONNECTED_GLOBAL appeared with NM 0.9 and was aliased
--#ifndef NM_STATE_CONNECTED
--  #define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL
--#endif
-+/*
-+ * copy-pasted from NetworkManager-0.9.6.4's NetworkManager.h to prevent
-+ * a circular dependency; https://bugs.gentoo.org/467696
-+ */
-+#define	NM_DBUS_PATH                        "/org/freedesktop/NetworkManager"
-+#define	NM_DBUS_INTERFACE                   "org.freedesktop.NetworkManager"
-+typedef enum {
-+	NM_STATE_UNKNOWN          = 0,
-+	NM_STATE_ASLEEP           = 10,
-+	NM_STATE_DISCONNECTED     = 20,
-+	NM_STATE_DISCONNECTING    = 30,
-+	NM_STATE_CONNECTING       = 40,
-+	NM_STATE_CONNECTED_LOCAL  = 50,
-+	NM_STATE_CONNECTED_SITE   = 60,
-+	NM_STATE_CONNECTED_GLOBAL = 70
-+} NMState;
-+#define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL
- 
- class networkmanager_network_extension : public network_extension {
- public:
--- 
-2.25.0
-
diff --git a/net-libs/libquotient/Manifest b/net-libs/libquotient/Manifest
index 6e04ad57d674..eca3bedcf5cc 100644
--- a/net-libs/libquotient/Manifest
+++ b/net-libs/libquotient/Manifest
@@ -1 +1,2 @@
 DIST libquotient-0.6.3.tar.gz 559142 BLAKE2B 77ba0583a90e9d29d44ce9a70909d6b51462a1f16dbc2e9d321eb9d638329af41fe7b0c4f7569e5d46f3a9c12d32b1ef0b926c5e285bc3ed9b70ba6d4dbe8024 SHA512 a81d88b00edc2af8ad9a6a297f1d65ef5d96fb305f503b46f29381df1bb007b42e44b207fb649316c38c977a5b03c93f884407dccdc48ab066af6b004dd9a9d6
+DIST libquotient-0.6.4.tar.gz 559830 BLAKE2B 23a2d5bed5a5bcd30ffa00465291f5670d187d44991fe424bce5a2ce1ffc9d4fc09b0cc1e44e7b2b2470f82f6a3bcf4be2d6d9185d2952761a9a94d6f4fae2ce SHA512 6f505a697b6bd123004faaaae4ea6788ed985dafd965c5768cc838be98d6b27f65d5fb04c02d41c6a9ca2ce622acbd49264a9a14a99a087126d2852a926184ce
diff --git a/net-libs/libquotient/libquotient-0.6.4.ebuild b/net-libs/libquotient/libquotient-0.6.4.ebuild
new file mode 100644
index 000000000000..0474fff2b604
--- /dev/null
+++ b/net-libs/libquotient/libquotient-0.6.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Qt5-based SDK to develop applications for Matrix"
+HOMEPAGE="https://github.com/quotient-im/libQuotient"
+SRC_URI="https://github.com/quotient-im/libQuotient/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/libQuotient-${PV}"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	# downstream patches
+	"${FILESDIR}"/${PN}-0.6.3-no-android.patch
+	"${FILESDIR}"/${PN}-0.6.3-no-tests.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DQuotient_INSTALL_TESTS=OFF
+		-DQuotient_ENABLE_E2EE=OFF # TODO: libolm, libqtolm not packaged
+		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON # no thanks.
+	)
+	cmake_src_configure
+}
diff --git a/net-libs/libwebsockets/files/libwebsockets-3.2.0-check_chown_result.patch b/net-libs/libwebsockets/files/libwebsockets-3.2.0-check_chown_result.patch
deleted file mode 100644
index 3dafd60e7315..000000000000
--- a/net-libs/libwebsockets/files/libwebsockets-3.2.0-check_chown_result.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- libwebsockets-3.2.0.o/lib/misc/lws-struct-sqlite.c	2019-08-14 10:22:50.000000000 +0200
-+++ libwebsockets-3.2.0/lib/misc/lws-struct-sqlite.c	2019-11-07 20:03:43.939423877 +0200
-@@ -23,6 +23,7 @@
- #include <core/private.h>
- 
- #include <sqlite3.h>
-+#include <string.h>
- 
- /*
-  * we get one of these per matching result from the query
-@@ -253,8 +254,9 @@
- 	}
- 
- 	lws_get_effective_uid_gid(context, &uid, &gid);
--	if (uid)
--		chown(sqlite3_path, uid, gid);
-+	if (uid && chown(sqlite3_path, uid, gid) < 0)
-+		lwsl_err("%s: Error setting ownership of %s: %s\n",
-+				__func__, sqlite3_path, strerror(errno));
- 	chmod(sqlite3_path, 0600);
- 
- 	lwsl_notice("%s: created %s owned by %u:%u mode 0600\n", __func__,
diff --git a/net-libs/libwebsockets/files/libwebsockets-3.2.1-socks5-noclient-compilefailure.patch b/net-libs/libwebsockets/files/libwebsockets-3.2.1-socks5-noclient-compilefailure.patch
deleted file mode 100644
index a7cffbb1f111..000000000000
--- a/net-libs/libwebsockets/files/libwebsockets-3.2.1-socks5-noclient-compilefailure.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a27dabfd3a422a348135e49ffd4f163cc5c6baae Mon Sep 17 00:00:00 2001
-From: Jaco Kroon <jaco@iewc.co.za>
-Date: Mon, 6 Jan 2020 11:52:54 +0200
-Subject: [PATCH] lws_create_vhost compile failure with +SOCKS5 -client.
-
-If LWS is build with SOCKS5 support, but WITHOUT_CLIENT then a compile
-failure occurs which this fixes.
-
-Signed-off-by: Jaco Kroon <jaco@iewc.co.za>
----
- lib/core-net/vhost.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/core-net/vhost.c b/lib/core-net/vhost.c
-index 69fe26a5..283b802e 100644
---- a/lib/core-net/vhost.c
-+++ b/lib/core-net/vhost.c
-@@ -437,7 +437,7 @@ lws_create_vhost(struct lws_context *context,
-	struct lws_protocols *lwsp;
-	int m, f = !info->pvo, fx = 0, abs_pcol_count = 0;
-	char buf[96];
--#if !defined(LWS_WITHOUT_CLIENT) && defined(LWS_HAVE_GETENV)
-+#if (!defined(LWS_WITHOUT_CLIENT) || defined(LWS_WITH_SOCKS5)) && defined(LWS_HAVE_GETENV)
-	char *p;
- #endif
-	int n;
--- 
-2.23.0
-
diff --git a/net-libs/mbedtls/mbedtls-2.25.0.ebuild b/net-libs/mbedtls/mbedtls-2.25.0.ebuild
index 02354b030f80..3a3fe113f9f9 100644
--- a/net-libs/mbedtls/mbedtls-2.25.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.25.0.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/6.13.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/neon/neon-0.31.2.ebuild b/net-libs/neon/neon-0.31.2.ebuild
index 06d89576f8d4..f4bdd2f905db 100644
--- a/net-libs/neon/neon-0.31.2.ebuild
+++ b/net-libs/neon/neon-0.31.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://notroj.github.io/neon/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/27"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"
 RESTRICT="test"
 
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 681dcedc3f8a..85f323e78137 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,3 +1,4 @@
 DIST node-v12.20.1.tar.xz 23641412 BLAKE2B 1c1d828a46c7d3ba3a8995d65902f20ff4d3e3c992a90e4cd0d0e985d5537a8251a1b789cac106caccca9050e5e74ca2e15b27100f715ef453d194fa07271a7a SHA512 a8948cfa64cc5222a975294a6403c1fb0c2443552ad739a049f7e50beed542c22e0004a456f1a225af847cfd06fcb4101d8f70e3f932750e74be86b14402af4d
 DIST node-v14.15.4.tar.xz 33296076 BLAKE2B a707dc15bdb670cdb239560d9b7a10541b793cad2339d02dafac2974df38dbe57d141b60d934f8b91cd65961f3a2df4ce92bcccf8b4359c7041f5f5531f1b704 SHA512 0d497a5d51de52412d09dd0fbcb936dbf0cba810f84d598be8f02c876d55f614e00c1ea0b25a00838e7b9f9c73a7882e3de0e9507d1c6ee45270a62d3438ab41
 DIST node-v15.5.1.tar.xz 33380504 BLAKE2B 508ba56370fd2ebd32f917da1dfc5fc5f46929397ce92826d73d1c4e7bd76a14ca712ebfe55f7e2c60d44a1abc15a05dae01de3f574b3e181e0a1e107049c9d4 SHA512 ca27dcc541287bc4d2f661d793ead02390b844cc70bfce7f3affe79618426201eff40d430e3b68a2194b6269c32d150b15b617169bd063576308fab9714cb7a2
+DIST node-v15.6.0.tar.xz 33419420 BLAKE2B 10385dc89fef6a7399ce76c54e5237f39b367dda1fdbbc546020580abda9def22649faf76a04a260846c97f142b87d08f49f02c06e198421799d406420282a95 SHA512 911ff2cdaece8b57c2537bd3bc42988756ec616b6f187ad9e4b37355d3d741b78a87b7d0069faadc837a66f5fd5a729b4e52034b213fd8a63bd71572b5a9e2ec
diff --git a/net-libs/nodejs/nodejs-15.6.0.ebuild b/net-libs/nodejs/nodejs-15.6.0.ebuild
new file mode 100644
index 000000000000..12118ecfc433
--- /dev/null
+++ b/net-libs/nodejs/nodejs-15.6.0.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+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 +npm pax_kernel +snapshot +ssl system-icu +system-ssl systemtap test"
+REQUIRED_USE="inspector? ( icu ssl )
+	npm? ( ssl )
+	system-icu? ( icu )
+	system-ssl? ( ssl )"
+
+# FIXME: test-fs-mkdir fails with "no such file or directory". Investigate.
+RESTRICT="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
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+	pax_kernel? ( sys-apps/elfix )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${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."
+}
+
+src_prepare() {
+	tc-export AR CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# 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
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || 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
+
+	local myconf=(
+		--shared-brotli
+		--shared-cares
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	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 "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		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() {
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
diff --git a/net-libs/pjproject/pjproject-2.10-r1.ebuild b/net-libs/pjproject/pjproject-2.10-r1.ebuild
index cb8904e54ee8..814ee95d814c 100644
--- a/net-libs/pjproject/pjproject-2.10-r1.ebuild
+++ b/net-libs/pjproject/pjproject-2.10-r1.ebuild
@@ -1,20 +1,20 @@
-# Copyright 2020 Liguros Authors
+# Copyright 2020-2021 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 
-inherit autotools flag-o-matic
+inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
 HOMEPAGE="https://www.pjsip.org/"
-SRC_URI="https://github.com/pjsip/pjproject/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~ppc ~x86"
+SRC_URI="https://github.com/pjsip/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 LICENSE="GPL-2"
 SLOT="0"
 
 # g729 not included due to special bcg729 handling.
 CODEC_FLAGS="g711 g722 g7221 gsm ilbc speex l16"
-VIDEO_FLAGS="sdl ffmpeg v4l2 openh264 libyuv"
+VIDEO_FLAGS="sdl ffmpeg v4l2 openh264 libyuv vpx"
 SOUND_FLAGS="alsa portaudio"
 IUSE="amr debug epoll examples ipv6 libressl opus resample silk ssl static-libs webrtc
 	${CODEC_FLAGS} g729
@@ -38,7 +38,10 @@ RDEPEND="net-libs/libsrtp:=
 	portaudio? ( media-libs/portaudio )
 	resample? ( media-libs/libsamplerate )
 	sdl? ( media-libs/libsdl )
-	speex? ( media-libs/speexdsp )
+	speex? (
+		media-libs/speex
+		media-libs/speexdsp
+	)
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
@@ -77,7 +80,7 @@ src_configure() {
 
 	[ "${videnable}" = "--enable-video" ] && append-cflags -DPJMEDIA_HAS_VIDEO=1
 
-	econf \
+	LD="$(tc-getCC)" econf \
 		--enable-shared \
 		--with-external-srtp \
 		${videnable} \
@@ -100,8 +103,8 @@ src_configure() {
 }
 
 src_compile() {
-	emake dep
-	emake
+	emake dep LD="$(tc-getCC)"
+	emake LD="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/net-libs/srt/srt-1.4.2.ebuild b/net-libs/srt/srt-1.4.2.ebuild
index cad2371d541f..262ecbb7e3d5 100644
--- a/net-libs/srt/srt-1.4.2.ebuild
+++ b/net-libs/srt/srt-1.4.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="MPL-2.0"
diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
index d41cb86cc3a1..ea0b5a06c678 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index 6b14ec8b6aa3..59db8d2e153a 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -1 +1,2 @@
 DIST zeromq-4.3.3.tar.gz 2117050 BLAKE2B 69bd1544fa76232ecf860b364592762c4170c327c444bf79a916947e1c370eb8c6c20b2ae271374d70bde11db9116ef6a64262e287982e5f41d6a5029649348f SHA512 4c18d784085179c5b1fcb753a93813095a12c8d34970f2e1bfca6499be6c9d67769c71c68b7ca54ff181b20390043170e89733c22f76ff1ea46494814f7095b1
+DIST zeromq-4.3.4.tar.gz 2486520 BLAKE2B 3c10989a9359a79317adaa8bf6e138357196b82078656911437ee848a347759acc1ef49feda5e1a8912974026e55907b9ffd5172111ddb83ba8cf92dd6715379 SHA512 e198ef9f82d392754caadd547537666d4fba0afd7d027749b3adae450516bcf284d241d4616cad3cb4ad9af8c10373d456de92dc6d115b037941659f141e7c0e
diff --git a/net-libs/zeromq/zeromq-4.3.3.ebuild b/net-libs/zeromq/zeromq-4.3.3.ebuild
index 9d912f36c50a..54387064008c 100644
--- a/net-libs/zeromq/zeromq-4.3.3.ebuild
+++ b/net-libs/zeromq/zeromq-4.3.3.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 inherit autotools
 
 DESCRIPTION="A brokerless kernel"
-HOMEPAGE="https://www.zeromq.org/"
+HOMEPAGE="https://zeromq.org/"
 SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
diff --git a/net-libs/zeromq/zeromq-4.3.4.ebuild b/net-libs/zeromq/zeromq-4.3.4.ebuild
new file mode 100644
index 000000000000..21302e285a65
--- /dev/null
+++ b/net-libs/zeromq/zeromq-4.3.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools
+
+DESCRIPTION="A brokerless kernel"
+HOMEPAGE="https://zeromq.org/"
+SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/5"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc drafts pgm +sodium static-libs test unwind elibc_Darwin"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )
+	sodium? ( dev-libs/libsodium:= )
+	pgm? ( ~net-libs/openpgm-5.2.122 )"
+DEPEND="${RDEPEND}
+	!elibc_Darwin? ( sys-apps/util-linux )
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+	)
+	pgm? ( virtual/pkgconfig )"
+
+src_prepare() {
+	sed \
+		-e '/libzmq_werror=/s:yes:no:g' \
+		-i configure.ac || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable drafts)
+		$(use_enable static-libs static)
+		$(use_enable unwind libunwind)
+		$(use_with sodium libsodium)
+		$(use_with pgm)
+		$(use_with doc docs)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Restricting to one job because multiple tests are using the same port.
+	# Upstream knows the problem and says it doesn't support parallel test
+	# execution, see ${S}/INSTALL.
+	emake -j1 check
+}
+
+src_install() {
+	default
+	find "${ED}"/usr/lib* -name '*.la' -delete || die
+}