gentoo resync : 13.06.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-06-13 10:39:22 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-06-13 10:39:22 +0100
commit: 9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch)
tree: 8ac67e26b45f34d71c5aab3621813b100a0d5f00 /net-libs
parent: f516638b7fe9592837389826a6152a7e1b251c54 (diff)
105 files changed, 1395 insertions, 916 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 7204264fb96c..c3a929ac702c 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/cppzmq/Manifest b/net-libs/cppzmq/Manifest
index a5ba211010aa..f474a8ee3488 100644
--- a/net-libs/cppzmq/Manifest
+++ b/net-libs/cppzmq/Manifest
@@ -1,5 +1,7 @@
-DIST cppzmq-0_pre130717.tar.xz 3736 BLAKE2B ae894bd4436c9e4a4597d90c9ab2b06543ba51c847f6e2c0b655108e592e7c2c12f888e57a31e90f94f5f635d2c164c46bab5a73a305787c2f3a1ee32694927f SHA512 3dbff2d3c1cc9f40b58477d2654cd1af4b639c71ca332dd6bcf33cce3d420a2c9e56312c0824bbccc6cea721b5688f8ec255180aace898dca57eb98a8d40c142
+AUX cppzmq-disable-static.patch 1063 BLAKE2B 4361fed647857fecb98450a6dac6f46322bc960e624fa4ea85074c3c3d976f96c660697b5e21a465e778df20ef20d9490f04c6b2d66631fb00add199824a1032 SHA512 c5770c4b053b025ec205554b0d780d2f2c26b99c0111920b6990400270c896135391035e815ce14c7bb61e44180ed4242b36b95e42b5617637a2fea5d35e2d4f
+AUX cppzmq-use-system-catch2.patch 784 BLAKE2B 15ad4fe99048651d9b1f00fb43e1da428e484f985f480d13011c75f0a2c9287ee7cc92225d1e2e44d39c21fb182bfd1189dcf7593212aaf988f015333fd0f57f SHA512 fa0ed955260c7902427f57f13781c9048754551b9b84cd77ee43454e1040ecc1dc6aa8f786d23432a81b74f1c7c34681a023998474562533159e8225f316cf43
 DIST cppzmq-0_pre150606.tar.xz 4032 BLAKE2B 80918dc148d22a4ddced41bd9dbec2a39f5d69d73724177b186fda490b899ed7dbeaa5aa67a348411b5a34948b167f8def6dfe688a9facd2d56ca6fe41df32d3 SHA512 d5ab584989f0eec7ce227de4534820f6e00582b8f45ebab5472c8244823a14a89e74005edb8ae933037a1df9684cc21641cd271a147f39577331b96474927efe
-EBUILD cppzmq-0_pre130717-r1.ebuild 662 BLAKE2B 9328c3545534f960fcb499865f32803ce3bc3ea33f70738e29683c2c0ca12099e958b35dc1709a8bd79a361b57065a3bfc2a825421716f9708219caf1a0cc3b8 SHA512 7e50eb1243161ecc53f1c46cb5742cc18e57818f4f8cc81a2063db692d05928fe72ccec51e0b166aba3298676d7709940342e8959aa1094cd2ff199d409f1882
+DIST cppzmq-4.6.0.tar.gz 35078 BLAKE2B 282cc8db524eb76a35835db12ae1d5f18d7729149979afb9e7a364497b8fb1db1f65b4df5c0aa905440e260cc797d45e839fc61694560cf60c20f855e34eb2c0 SHA512 f30b37c970790de2684086638084e65310396072c1c1d00415c9a36b7ef6d79fe500ce174fddab699a602a80341e2fb7f309dec2eb96252531b5ca5cf7ac5027
 EBUILD cppzmq-0_pre150606.ebuild 664 BLAKE2B a782f9142c209224fde2b68505866e0901e7bed600cd0df3ff572aafd88b31b2aab08c9bc30ad2653d3ca1d61d56dc2b0912a85032370eadb48636b1502ce6d4 SHA512 9cc680f474dd763f3718d2d72d59f58215b8e058b7899fb3be2eb6bba79c05c5255f401407c1e97ac91a5bcb2ba7c7ee9ec5bd056a36b12993588f8f815445cc
+EBUILD cppzmq-4.6.0.ebuild 1014 BLAKE2B 4c2c241abf6087dbffd9edb7588fa20cff52f21739becb9babe6edd65e3c2f34da20dc6cd11d6c9d03dadd4df631f8cffddc151076ffe623c4e00855a40e9a33 SHA512 8da33a0453425d20f009900b310ecc4a0a64be387c7f14255fad177c2f01d328a8bac5f8dd9d3b78501bbdf88a9d6ffefc9285e23a4bb8b441993f2c0c262dab
 MISC metadata.xml 341 BLAKE2B cebd14f5acb08924cfe8941e5ca4c5ff7894e2d52e5f8dbb9a9d648681b6dc7b68b6949e19497fdf34af84eff780e8b52e282d4b5eb48bc110e18f5538eee84c SHA512 20bc14d462ee04fe3bce142640dacf724ff8970bb23e71f97bad89a2837cd0184d77304f34faa8780436c1824d458433d4b0ad644150234d7b11be094963131b
diff --git a/net-libs/cppzmq/cppzmq-0_pre130717-r1.ebuild b/net-libs/cppzmq/cppzmq-0_pre130717-r1.ebuild
deleted file mode 100644
index e4e77133a7d0..000000000000
--- a/net-libs/cppzmq/cppzmq-0_pre130717-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="High-level CPP Binding for ZeroMQ"
-HOMEPAGE="https://github.com/zeromq/cppzmq"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=net-libs/zeromq-3"
-DEPEND=""
-
-src_install() {
-	doheader zmq.hpp
-	dodoc README
-}
-
-src_test() {
-	$(tc-getCC) -c ./zmq.hpp -L ./.libs/ -I ./include/ -o ./test.o || die "This version of cppzmq is not compatible with the installed version of net-libs/zeromq"
-	rm -f ./test.o
-}
diff --git a/net-libs/cppzmq/cppzmq-4.6.0.ebuild b/net-libs/cppzmq/cppzmq-4.6.0.ebuild
new file mode 100644
index 000000000000..477975337ae1
--- /dev/null
+++ b/net-libs/cppzmq/cppzmq-4.6.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="High-level CPP Binding for ZeroMQ"
+HOMEPAGE="https://github.com/zeromq/cppzmq"
+SRC_URI="https://github.com/zeromq/${PN}/archive/v${PV}.tar.gz ->  ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=net-libs/zeromq-4.3.1"
+# Tests require cmake modules from catch2 and headers from older version of catch
+DEPEND="${RDEPEND}
+	test? ( >=dev-cpp/catch-2.5.0
+		<dev-cpp/catch-2
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-disable-static.patch"
+	"${FILESDIR}/${PN}-use-system-catch2.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCPPZMQ_CMAKECONFIG_INSTALL_DIR="/usr/$(get_libdir)/cmake/${PN}/"
+		-DCPPZMQ_BUILD_TESTS="$(usex test)"
+	)
+	if has_version -d '>=net-libs/zeromq-4.3.1[drafts]'; then
+		mycmakeargs+=( -DENABLE_DRAFTS=on )
+	fi
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	einstalldocs
+}
diff --git a/net-libs/cppzmq/files/cppzmq-disable-static.patch b/net-libs/cppzmq/files/cppzmq-disable-static.patch
new file mode 100644
index 000000000000..12b1c2231205
--- /dev/null
+++ b/net-libs/cppzmq/files/cppzmq-disable-static.patch
@@ -0,0 +1,35 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,7 +20,7 @@
+     message(FATAL_ERROR "ZeroMQ was not found, neither as a CMake package nor via pkg-config")
+ endif()
+ 
+-if (ZeroMQ_FOUND AND (NOT TARGET libzmq OR NOT TARGET libzmq-static))
++if (ZeroMQ_FOUND AND NOT TARGET libzmq)
+   message(FATAL_ERROR "ZeroMQ version not supported!")
+ endif()
+ 
+@@ -43,19 +43,20 @@
+     zmq_addon.hpp
+ )
+ 
+-foreach (target cppzmq cppzmq-static)
++set (cppzmq_targets cppzmq cppzmq-static)
++
++foreach (target ${cppzmq_targets})
+   add_library(${target} INTERFACE)
+   target_include_directories(${target} INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+                                                  $<INSTALL_INTERFACE:include>)
+ endforeach()
+ 
+ target_link_libraries(cppzmq INTERFACE libzmq)
+-target_link_libraries(cppzmq-static INTERFACE libzmq-static)
+ 
+ include(GNUInstallDirs)
+ include(CMakePackageConfigHelpers)
+ 
+-install(TARGETS cppzmq cppzmq-static
++install(TARGETS ${cppzmq_targets}
+         EXPORT ${PROJECT_NAME}-targets)
+ 
+ install(FILES ${CPPZMQ_HEADERS}
diff --git a/net-libs/cppzmq/files/cppzmq-use-system-catch2.patch b/net-libs/cppzmq/files/cppzmq-use-system-catch2.patch
new file mode 100644
index 000000000000..b15b9172ad43
--- /dev/null
+++ b/net-libs/cppzmq/files/cppzmq-use-system-catch2.patch
@@ -0,0 +1,27 @@
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -9,9 +9,10 @@
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
+ 
++find_package(Catch2 REQUIRED)
+ include(CTest)
+-include(cmake/catch.cmake)
+-include(${CATCH_MODULE_PATH}/Catch.cmake)
++include(Catch)
++find_path(CATCH_INCLUDE_DIR "catch.hpp" HINT /usr/include/catch/)
+ 
+ find_package(Threads)
+ 
+@@ -31,9 +32,9 @@
+     utilities.cpp
+ )
+ 
+-add_dependencies(unit_tests catch)
++add_dependencies(unit_tests Catch2::Catch2)
+ 
+-target_include_directories(unit_tests PUBLIC ${CATCH_MODULE_PATH})
++target_include_directories(unit_tests PUBLIC ${CATCH_INCLUDE_DIR})
+ target_link_libraries(
+     unit_tests
+     PRIVATE cppzmq
diff --git a/net-libs/davix/Manifest b/net-libs/davix/Manifest
index 729320f0fb5e..a200beae20ce 100644
--- a/net-libs/davix/Manifest
+++ b/net-libs/davix/Manifest
@@ -1,11 +1,5 @@
-AUX davix-0.6.7-uio.patch 316 BLAKE2B 71bf63feb080a4c34f8b672516d8237149bee9d360c7b0d289ac6b226e65427651a688679ec42cc2bf30304a53211d33b06fdccdda228e90b40e21ed7da48cea SHA512 0874cc8c04118e97c176e901bfeaafa13d3a76ec8589b045845133f3f8633e7b75a007ba10990ac4ee1bfe344294d27265510f64171cecd9110fd0b41d71ada2
-AUX davix-0.6.7-uuid.patch 1868 BLAKE2B 24d94348745db5a6b85acca3d050dd7bf44f5b7eb2c7eded0771f251459bc391e4b8a22ad1ad685918525ff0ef89bd319e562a221530ce70807f2161efdef65d SHA512 683257bf61dca6394e5ab0b375e35ea3e28c85f0e01a308a514f91f1da18aca4c63f57e45db7b3862fd7d9e0f80e7129e518798241bfec1ddefd87affc1bad4e
-DIST davix-0.6.7.tar 3346429 BLAKE2B 7510c628cd1d346ed5f4dca6100207e5e2efa3a98d0caf63dbe3ba39f58a9b11c330c95cd2d40d60d8f2497355d4cb2f2d7537babfef287a5905f32322363d90 SHA512 5cb830e415a4ab87b7b046fbd8ba615379766f4fa4b886a271b0c248c05968b9a3cb144751b44d5fd62f5e07bdb7610c0505e44f2702147f6f006b49a4b3d8ce
-DIST davix-0.7.3.tar 4341865 BLAKE2B 8ba2855f7170ca24f4a15edc32562e47711304f48eaeb1e2870e1325396ae2b664f8af7a482986da6883ab5c92ab6e61034e8840baf3f59c3bd691e7e483fc7e SHA512 b7e7814066ca53c44c2aa0a0d1d6a2d995ea44d3d122da1d19f12849d8c2d4e91eafb40c18d4d18d1736a7c5c5099972519c08a6c7ab5b32300fc8a1fcdc5bfd
-DIST davix-0.7.4.tar 4343614 BLAKE2B 0fd618a4575cfdcbb0142b26ed8bd5ea0b8d880706ec6ebcc8e9a8755a8f392c715e2bc3cb25dd316fa90f06e7223ecd3e8272a0e5867eb2f5d74eec3053ddf2 SHA512 835d49f1729be95b88c1c422723a2ac6fa9fa0c4a85089e67d68a365c482bf648471fea000b90e7797add0809a9262b5c7275a965fde437bb8206154266fd970
 DIST davix-0.7.5.tar 4343329 BLAKE2B dfb71e0524e47a2378cd8a49fa4c7d209b8b658e8515f4f0750c9c98cb03073e2ff82a5fbdb2f7fb563f31671789cd7e9cb1656a16dfd0811934730961695db4 SHA512 4be448d6d28f315c0d098d9cf2ddf95bbd818659821935571d83dad1b2724b8f90b87be298ca8a7984cb57a88b18b0253e23f6e8cb192cd1792472993da36bcc
-EBUILD davix-0.6.7.ebuild 1464 BLAKE2B f5b3cbcdfb1cde1b6f594b7af4893ece11c40ac8c0dfed1cb9c199b65da69b576ba71eb9463a4c4447a30751bd6086c5159a0b7167d079eda16e48855d43a52e SHA512 c51508c6a7e6d8663acc401d4355805f9399455de6945e058a7fb5e836e270de1531b3caccbb27de98469132174141504bb89920ffb47c11fd1a3b9adf17fb9b
-EBUILD davix-0.7.3.ebuild 1580 BLAKE2B 04d697777e0fc8d456b479dfcc81884b2d66651bf6c14ea3b4f1ac349c9ccdc3d903bd8822ce5e2b0c7523d1ee2c56a1cbedd018fdb6e0a2d08da3bfac459cee SHA512 40c25c86f080a13586638295c643c64e8b8297f9c121d770c89fdacbbd4df3225fcebfe430359621a26b474009bb7adb6fca2c7ece425507891262cea7e690f3
-EBUILD davix-0.7.4.ebuild 1582 BLAKE2B ce0ad5889ceb6e2ada88ea0625e622b85e3a15f5653742ce0f7916ac770a312cf645f252062cbda05b49db1d75041abc745b2ef057a36c82c28d6d552b934c16 SHA512 7a64300cebab997a4f34dc3fcd482cd85a23a10f108c017083d87b0bc0af923d75c27229ceb83dec74512e5838c79744df5ec3be8a9ed77340649ca7754d6639
-EBUILD davix-0.7.5.ebuild 1582 BLAKE2B ce0ad5889ceb6e2ada88ea0625e622b85e3a15f5653742ce0f7916ac770a312cf645f252062cbda05b49db1d75041abc745b2ef057a36c82c28d6d552b934c16 SHA512 7a64300cebab997a4f34dc3fcd482cd85a23a10f108c017083d87b0bc0af923d75c27229ceb83dec74512e5838c79744df5ec3be8a9ed77340649ca7754d6639
+DIST davix-0.7.6.tar 4338692 BLAKE2B 72a918f52993ea358f243df671823a4624ac5650753e06c8f70f75a800f10adfe7f6c63d9c8fdcefb94874e3c60c3909e7aa96969af1210347ea941a42f4b9df SHA512 3e379acc763e72e2e1684121e2688da6c617b2c1f52ffd7a2a2559998a64aba957f09f7b138c57f8f4d7a26caff4fef09952cca48585bb4f6aea1f071aa9a7b7
+EBUILD davix-0.7.5.ebuild 1580 BLAKE2B cb2581cc8b04095fc76a03b9353a8c20692c784c5d4b45b35451d8be4d134b293d11712e9459f744ca74777475201c14eeb5584d88a373cca58cace474233e51 SHA512 17b939f136d9741c6a08c581a0bbbe19622280e04ab92a46cee411365fccdb4e92416bcf24ccb2eedfbbe588be396c26046f916f4980f9e6798fab4c13dbff14
+EBUILD davix-0.7.6.ebuild 1683 BLAKE2B 2dfb7c4c887337082f8d3a7065629c99b073812ade32299fe43555aa5f8cfd4db328b11ffb422ee912912ac6ec94955c4e021f4c4201468263637cf8a54c553f SHA512 4c3db9f7ac923237eb7df6da59081f08163c8497bd97338d346063b2005013cf5b48809f1b9e0cb5f97e51364e278668cfd32439e09e59fa094da1cadb0727c4
 MISC metadata.xml 327 BLAKE2B c075f375c74797f407cff004dd39e41ab7b60d4e5039f8c9d6c214ce7af54ccec989807d1a09656c87dbce164f1da0289c655f215265ef011abd40b47c5fa841 SHA512 12db2d285a12948788387cbb97fdb299ebd3cdaf50832f1271fcb8cae3a9f7acd1deb7aff4392bdd082e97747d714359fa427bcd0ec9f28f2ecea74703ab9ab0
diff --git a/net-libs/davix/davix-0.6.7.ebuild b/net-libs/davix/davix-0.6.7.ebuild
deleted file mode 100644
index 400abcdd50b8..000000000000
--- a/net-libs/davix/davix-0.6.7.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="High-performance file management over WebDAV/HTTP"
-HOMEPAGE="https://dmc.web.cern.ch/projects/davix"
-SRC_URI="http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/${PN}/${PV}/${P}.tar.gz -> ${P}.tar"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc ipv6 kernel_linux test tools"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-		dev-libs/libxml2:2=
-		dev-libs/openssl:0=
-		kernel_linux? ( sys-apps/util-linux )
-"
-
-DEPEND="${CDEPEND}
-		doc? (
-			app-doc/doxygen[dot]
-			dev-python/sphinx
-		)
-		virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}"
-
-PATCHES=(
-		"${FILESDIR}"/${P}-uio.patch
-		"${FILESDIR}"/${P}-uuid.patch
-)
-
-REQUIRED_USE="test? ( tools )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}"
-		-DENABLE_HTML_DOCS=$(usex doc)
-		-DENABLE_IPV6=$(usex ipv6)
-		-DENABLE_TOOLS=$(usex tools)
-		-DHTML_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}/html"
-		-DSOUND_INSTALL_DIR="${EPREFIX}/usr/share/${PN}/sounds"
-		-DSTATIC_LIBRARY=OFF
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}/etc"
-		-DBUILD_TESTING=$(usex test)
-		-DUNIT_TESTS=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		cmake-utils_src_compile doc
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if ! use tools; then
-		rm -rf "${ED}/usr/share/man/man1"
-	fi
-}
diff --git a/net-libs/davix/davix-0.7.3.ebuild b/net-libs/davix/davix-0.7.3.ebuild
deleted file mode 100644
index 9f6b21036665..000000000000
--- a/net-libs/davix/davix-0.7.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="High-performance file management over WebDAV/HTTP"
-HOMEPAGE="https://dmc.web.cern.ch/projects/davix"
-SRC_URI="http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/${PN}/${PV}/${P}.tar.gz -> ${P}.tar"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc ipv6 kernel_linux test tools"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-		dev-libs/libxml2:2=
-		dev-libs/openssl:0=
-		kernel_linux? ( sys-apps/util-linux )
-"
-
-DEPEND="${CDEPEND}
-		doc? (
-			app-doc/doxygen[dot]
-			dev-python/sphinx
-		)
-		virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="test? ( tools )"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	for x in doc test; do
-		if ! use $x; then
-			sed -i -e "/add_subdirectory ($x)/d" CMakeLists.txt
-		fi
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}"
-		-DENABLE_HTML_DOCS=$(usex doc)
-		-DENABLE_IPV6=$(usex ipv6)
-		-DENABLE_TOOLS=$(usex tools)
-		-DHTML_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}/html"
-		-DSOUND_INSTALL_DIR="${EPREFIX}/usr/share/${PN}/sounds"
-		-DSTATIC_LIBRARY=OFF
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}/etc"
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		cmake-utils_src_compile doc
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if ! use tools; then
-		rm -rf "${ED}/usr/share/man/man1"
-	fi
-
-	if use test; then
-		rm -rf "${ED}/usr/bin/davix-unit-tests"
-	fi
-}
diff --git a/net-libs/davix/davix-0.7.5.ebuild b/net-libs/davix/davix-0.7.5.ebuild
index 6c4acef445a9..3d61be504eec 100644
--- a/net-libs/davix/davix-0.7.5.ebuild
+++ b/net-libs/davix/davix-0.7.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/${PN
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc ipv6 kernel_linux test tools"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/davix/davix-0.7.4.ebuild b/net-libs/davix/davix-0.7.6.ebuild
index 6c4acef445a9..d667decd21ad 100644
--- a/net-libs/davix/davix-0.7.4.ebuild
+++ b/net-libs/davix/davix-0.7.6.ebuild
@@ -18,6 +18,7 @@ RESTRICT="!test? ( test )"
 CDEPEND="
 		dev-libs/libxml2:2=
 		dev-libs/openssl:0=
+		net-libs/gsoap[ssl,-gnutls,-libressl]
 		kernel_linux? ( sys-apps/util-linux )
 "
 
@@ -48,6 +49,8 @@ src_configure() {
 		-DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}"
 		-DENABLE_HTML_DOCS=$(usex doc)
 		-DENABLE_IPV6=$(usex ipv6)
+		-DENABLE_TCP_NODELAY=TRUE
+		-DENABLE_THIRD_PARTY_COPY=TRUE
 		-DENABLE_TOOLS=$(usex tools)
 		-DHTML_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}/html"
 		-DSOUND_INSTALL_DIR="${EPREFIX}/usr/share/${PN}/sounds"
diff --git a/net-libs/davix/files/davix-0.6.7-uio.patch b/net-libs/davix/files/davix-0.6.7-uio.patch
deleted file mode 100644
index fc7194d05d3d..000000000000
--- a/net-libs/davix/files/davix-0.6.7-uio.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/deps/libneon/src/ne_socket.c b/deps/libneon/src/ne_socket.c
-index affc8d7..b4f8ea1 100644
---- a/deps/libneon/src/ne_socket.c
-+++ b/deps/libneon/src/ne_socket.c
-@@ -34,6 +34,7 @@
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
-+#include <sys/uio.h>
- 
- #ifdef __linux__
- #include <sys/ioctl.h>
diff --git a/net-libs/davix/files/davix-0.6.7-uuid.patch b/net-libs/davix/files/davix-0.6.7-uuid.patch
deleted file mode 100644
index 97d56315ca3d..000000000000
--- a/net-libs/davix/files/davix-0.6.7-uuid.patch
+++ /dev/null
@@ -1,66 +0,0 @@
----
- cmake/modules/Finduuid.cmake | 48 +++++++++++++++++-------------------
- 1 file changed, 22 insertions(+), 26 deletions(-)
-
-diff --git a/cmake/modules/Finduuid.cmake b/cmake/modules/Finduuid.cmake
-index 2f97a1f..e2c7d13 100644
---- a/cmake/modules/Finduuid.cmake
-+++ b/cmake/modules/Finduuid.cmake
-@@ -1,32 +1,28 @@
--# Try to find uuid
--# Once done, this will define
--#
--# UUID_FOUND        - system has uuid
--# UUID_INCLUDE_DIRS - uuid include directories
--# UUID_LIBRARIES    - libraries needed to use uuid
--
-+include(CheckCXXSymbolExists)
-+include(CheckLibraryExists)
- include(FindPackageHandleStandardArgs)
- 
--if(UUID_INCLUDE_DIRS AND UUID_LIBRARIES)
--  set(UUID_FIND_QUIETLY TRUE)
--else()
--  find_path(
--    UUID_INCLUDE_DIR
--    NAMES uuid.h
--    HINTS ${UUID_ROOT_DIR}
--    PATH_SUFFIXES include uuid)
--
--  find_library(
--    UUID_LIBRARY
--    NAMES uuid
--    HINTS ${UUID_ROOT_DIR}
--    PATH_SUFFIXES ${LIBRARY_PATH_PREFIX})
-+if(NOT UUID_INCLUDE_DIR)
-+  find_path(UUID_INCLUDE_DIR uuid/uuid.h)
-+endif()
- 
-+if(EXISTS UUID_INCLUDE_DIR)
-   set(UUID_INCLUDE_DIRS ${UUID_INCLUDE_DIR})
--  set(UUID_LIBRARIES ${UUID_LIBRARY})
--
--  find_package_handle_standard_args(
--    uuid DEFAULT_MSG UUID_LIBRARY UUID_INCLUDE_DIR)
-+  set(CMAKE_REQUIRED_INCLUDES ${UUID_INCLUDE_DIRS})
-+  check_cxx_symbol_exists("uuid_generate_random" "uuid/uuid.h" _uuid_header_only)
-+endif()
- 
--  mark_as_advanced(UUID_INCLUDE_DIR UUID_LIBRARY)
-+if(NOT _uuid_header_only AND NOT UUID_LIBRARY)
-+  check_library_exists("uuid" "uuid_generate_random" "" _have_libuuid)
-+  if(_have_libuuid)
-+    set(UUID_LIBRARY "uuid")
-+    set(UUID_LIBRARIES ${UUID_LIBRARY})
-+  endif()
- endif()
-+
-+unset(CMAKE_REQUIRED_INCLUDES)
-+unset(_uuid_header_only)
-+unset(_have_libuuid)
-+
-+find_package_handle_standard_args(uuid DEFAULT_MSG UUID_INCLUDE_DIR)
-+mark_as_advanced(UUID_INCLUDE_DIR UUID_LIBRARY)
--- 
-2.17.0
-
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index efa849f262ea..2d8f7a9361f6 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -3,7 +3,7 @@ DIST glib-networking-2.62.3.tar.xz 183996 BLAKE2B 3841a355fe485f30970ab571fbe7ae
 DIST glib-networking-2.64.0.tar.xz 187708 BLAKE2B c80a575a48bd5fd77a53a823e0a1ad98f63f75a1f83990a9ba28bd35b401f867b5be0afb3ce2650855b34e6d5a043b354086620c6c1caeb93feeeddab92292e1 SHA512 c5788167c114ab69812d4784912e0e468086f1ba1a8037dffc98466605af3f7a77f7a2666176da260669640bfbdf94ee959878c6297d93fe078d22fc6ff0584c
 DIST glib-networking-2.64.2.tar.xz 189680 BLAKE2B efadec24a601b2a93a720444e328e31308ed8e72a96638514d5f8510f8fa9a88b1e58809f4a610baf0c17ff1eccc84cb0e30e12753fa27ecc7b80d03fe2b4967 SHA512 b796d3ef82f7ceea1c69a1d4ef7cf09e88ff8e702e93abd37cca4ea2f09650c1bdfdf8d8c57360a4bbafdd8d3cf5f88f0aad668b5ce77b92b60c08b7456ffa12
 EBUILD glib-networking-2.60.4.ebuild 1767 BLAKE2B 2333935562c3520aecac692b63c22d5693322ef3c823678349c48895a6835e239259ffc1ff7e733838c8c48edd385411ace855e845ea454e41a1c828abdacfd2 SHA512 1b4a8e165182cb3ceea9587fcb18747cb9a33fb01571767918ec313e06c7161eb5a9553327aaa648827c6b338fc7612823d3ad31c729b8f0ffafef30b231d723
-EBUILD glib-networking-2.62.3.ebuild 1770 BLAKE2B 7c7b7eb889d4aadac5bea7d5a772baa476ecb2c531764199c07c4c46da15290a7572620166e115483dbb1e50307edd84e23d8ea4229d1d2c440c527bbafa3452 SHA512 1d4f451dab4bc6b0af82d5e7474471e874222201feada2024977901a865fe0b32e9a3add16cbfda3c9a9432fa59534c668deb01c5f31eb35c82faf14c1f234b3
+EBUILD glib-networking-2.62.3.ebuild 1768 BLAKE2B a20ee582cf6f490f2893adefc764980a986a735930a59c0f394fbd6131515eb9a22edc8f158fe9af4f8a229852358d8b81fcedb088937ac9b55489b7552079a4 SHA512 eca650e4eecea3cdbe7be74bd14bdd887d3726ae242fca8e9a13826a000de3da6d3223ae05bee9d3179579361b3d22dae78a24a52f26a4108c9f5abeb7cc6973
 EBUILD glib-networking-2.64.0.ebuild 1776 BLAKE2B 86f26398b596fc5ea94ed0bdb750523fcb3daeba92d8fa6425b97195477932aba70f8d31379bfbd4e12f2c30f1bf83547849042858072f0e49bc2149cb5cb4c9 SHA512 e8221e8d4c0cddcca0dff06fee174d300836ce549f0f9b4d75e9a9e9a658c5a75479379123b5c520e606ee6b958df515b67a2e8875fa3583f71647d8a7ed6822
 EBUILD glib-networking-2.64.2.ebuild 1776 BLAKE2B 86f26398b596fc5ea94ed0bdb750523fcb3daeba92d8fa6425b97195477932aba70f8d31379bfbd4e12f2c30f1bf83547849042858072f0e49bc2149cb5cb4c9 SHA512 e8221e8d4c0cddcca0dff06fee174d300836ce549f0f9b4d75e9a9e9a658c5a75479379123b5c520e606ee6b958df515b67a2e8875fa3583f71647d8a7ed6822
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/glib-networking-2.62.3.ebuild b/net-libs/glib-networking/glib-networking-2.62.3.ebuild
index e26b85fa56f3..402238e5e1d0 100644
--- a/net-libs/glib-networking/glib-networking-2.62.3.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.62.3.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.60.0:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index fdaff3527b51..d44be142cf5e 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-online-accounts-3.32.1.tar.xz 863252 BLAKE2B 69345a5e7a9ccfef231cb012a1e3240a31db898f32b654f6275fd18e027eebe5cda07b4a0f8fea1447ca33ac120d8476aea7d2c824238b327c0c207009fcae7c SHA512 548e6c983899bc1f4093fcf0b7b08819f2803182f52c2cdfb4cffa8bfb00e513322973fdfce2aeadeb52b0cd43c7c1e3941cff187927577cefb4fba51f4fda5b
 DIST gnome-online-accounts-3.34.1.tar.xz 856288 BLAKE2B 99a6c242dd57acf009a2b4451287fff5bbc61b0aeb0396b13368b179d1b1604b413ff9dcb56bf4415c990cb4f2cb434a0fcf17b9381dcb5055a99985249af5d4 SHA512 233f1b15d4a7bdbee4ed85ba252ea0d9af2ac15a2edd3ce2b40d76434285fd093f07375313a599fa191f8df1551eb37f48c4784e389fcbaec0565bb3aba28426
-EBUILD gnome-online-accounts-3.32.1.ebuild 2066 BLAKE2B cde080c07f3570a8ecabf1f828d27cc241e2892671509d8c754dc3d5182d398190a5dd679a2572e9d09d54fd773b61c2acbd0c6ba928a364e4bb16d0f4c5f459 SHA512 a2919d353e1ba260f4ceebe22242d5bc0a60d1b788567cafe7ef2c6fd731c0a65172aa81a6f3338ad05ebe232e7d24269ab20ddfdd8a637a3f88c28520b6fe35
-EBUILD gnome-online-accounts-3.34.1.ebuild 2060 BLAKE2B 5c5d877acc659ae43fdaa648f1ce8cb7df8370e57c31770da063dd880ea1854a91cf26fac7f1e8a6822c3938236450178f1a69e52ba5c52dbffbad3efb252aee SHA512 f6f9b3953f81c0c7bed37e7bee331dc044b4bd6905e738e941683e24da31507f88878dfc73a3641ac622d2d339f42a467c542ebe684b2c2e7e9b28364f9742f5
+EBUILD gnome-online-accounts-3.34.1.ebuild 2059 BLAKE2B 89b20e5a0a5e155059747182e96b77b08ca73c06eb53808e7abce7de260314a1e99d5669f15b50e9d85814d0cba43a705b194f665f8ac871ff2eda51489e7dcc SHA512 580da9db2dd08cdc04e925d16a64463feb7f177b32cb5d3ff6bceaaa607e42264e6f8f04f36745ed8ee39a5376f1938d390a7766f9afc82d28b036cf4bb156c5
 MISC metadata.xml 379 BLAKE2B 36ab13a2c6483f81247083c86d6424d66e0780ac4e16c485588bbceb8ce8174de38796de29af933831ec3075dacef135d2c06d18b22d601e28a1f5fe5f7661dc SHA512 fbd620273932175e14f89a7c155819d7733309eabdb0a82113f9a88d8e33aae3c2b35bdfe5f0883c133e94d4eccf456ba496c419d15e98fd0cf79b685f7a8c69
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.32.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.32.1.ebuild
deleted file mode 100644
index 603ccca0aba2..000000000000
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.32.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="GNOME framework for accessing online accounts"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
-
-LICENSE="LGPL-2+"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="debug gnome +introspection kerberos +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-# pango used in goaeditablelabel
-# libsoup used in goaoauthprovider
-# goa kerberos provider is incompatible with app-crypt/heimdal, see
-# https://bugzilla.gnome.org/show_bug.cgi?id=692250
-# json-glib-0.16 needed for bug #485092
-RDEPEND="
-	>=dev-libs/glib-2.52:2
-	>=app-crypt/libsecret-0.5
-	>=dev-libs/json-glib-0.16
-	dev-libs/libxml2:2
-	>=net-libs/libsoup-2.42:2.4
-	net-libs/rest:0.7
-	>=net-libs/webkit-gtk-2.12.0:4
-	>=x11-libs/gtk+-3.19.12:3
-	x11-libs/pango
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )
-	kerberos? (
-		app-crypt/gcr:0=[gtk]
-		app-crypt/mit-krb5 )
-"
-#	telepathy? ( net-libs/telepathy-glib )
-# goa-daemon can launch gnome-control-center
-PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
-
-DEPEND="${RDEPEND}
-	vala? ( $(vala_depend) )
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.3
-	>=dev-util/gdbus-codegen-2.30.0
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# TODO: Give users a way to set the G/FB/Windows Live secrets
-	gnome2_src_configure \
-		--disable-static \
-		--enable-backend \
-		--enable-documentation \
-		--enable-exchange \
-		--enable-facebook \
-		--enable-flickr \
-		--enable-foursquare \
-		--enable-imap-smtp \
-		--enable-lastfm \
-		--enable-media-server \
-		--enable-owncloud \
-		--enable-pocket \
-		--enable-windows-live \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable kerberos) \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.34.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.34.1.ebuild
index 2463c4054f59..8988b05aadfa 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.34.1.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.34.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
 
 LICENSE="LGPL-2+"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="debug gnome +introspection kerberos +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 93c27cda2ff8..bb06d49c0735 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,3 +1,3 @@
-DIST gnutls-3.6.13.tar.xz 5958956 BLAKE2B de67f96198b6456f397bf203f13bf1f906b69c7ce632dd96b72539fea12f2bd8ee8b2c608d1ed8b06d3b189023fa81e9a2cfcdd6c9bbd174e5bd2b0673f6ca47 SHA512 23581952cb72c9a34f378c002bb62413d5a1243b74b48ad8dc49eaea4020d33c550f8dc1dd374cf7fbfa4187b0ca1c5698c8a0430398268a8b8a863f8633305c
-EBUILD gnutls-3.6.13.ebuild 3985 BLAKE2B f8800a3883fbd2f04ac22f51d6486558ea48aae6393acde4361e1f634a74dfd0b9dbc1311fb8813725dfd14f45ad8f33e3338189fefcf554540c85df244181e2 SHA512 235d6a4c22ec21768d6feeb05f83cd7fbbe31ba78c20380cf7530ee17aa82d50d1465959fd62d5bcbd8c3cda4394600820f94a34c95e70b36592c778a8da6a61
+DIST gnutls-3.6.14.tar.xz 6069088 BLAKE2B a1cd88a7c977f3a94a49e4187878560a8d9589a6fd32d8ad41b84c33534597fb85a88cf6b260a4a5e8b1a100790a7ba701acac2368f1ad42dcaba7e5c90b6758 SHA512 b2d427b5542a4679117c011dffa8efb0e0bffa3ce9cebc319f8998d03f80f4168d08f9fda35df18dbeaaada59e479d325a6c1c77d5ca7f8ce221b44e42bfe604
+EBUILD gnutls-3.6.14.ebuild 3985 BLAKE2B f8800a3883fbd2f04ac22f51d6486558ea48aae6393acde4361e1f634a74dfd0b9dbc1311fb8813725dfd14f45ad8f33e3338189fefcf554540c85df244181e2 SHA512 235d6a4c22ec21768d6feeb05f83cd7fbbe31ba78c20380cf7530ee17aa82d50d1465959fd62d5bcbd8c3cda4394600820f94a34c95e70b36592c778a8da6a61
 MISC metadata.xml 1258 BLAKE2B 4dbd1ceb49d79ae699d79471e636807b79f68d6e81f403d8c458eb5110dbf172d5839ea1550a32581bac1da039549731d397e91069570a76c8ef0c871feccad5 SHA512 749eb5f798cd04170a5dcf44c2e7fbc26e19210217791d92c0fdb1a53586a219c183686c74385bed1ff0f743b9972fa1d92fc216f53d3870127d39a6b3adb87a
diff --git a/net-libs/gnutls/gnutls-3.6.13.ebuild b/net-libs/gnutls/gnutls-3.6.14.ebuild
index 1969a8391568..1969a8391568 100644
--- a/net-libs/gnutls/gnutls-3.6.13.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.14.ebuild
diff --git a/net-libs/gssdp/Manifest b/net-libs/gssdp/Manifest
index 7e7d77b7c49e..5c2b68132035 100644
--- a/net-libs/gssdp/Manifest
+++ b/net-libs/gssdp/Manifest
@@ -1,5 +1,5 @@
 DIST gssdp-1.0.3.tar.xz 316740 BLAKE2B 50293e653ec5596a986770f3ea81a244b8f9772e9d0c13df0e48f00ee34445c2fc7250702d7928e7dba081715e6d4e379d7a899905c35da84915e6b4058a3307 SHA512 ef72335c3f796aff0d3dce1781d5a0b015508f614d4a73699ebce411b0593419b40c09839ffb62e50cf9d77e16ec0e31d0e23f92d35abb4d105dea47c00a0506
 DIST gssdp-1.2.2.tar.xz 61444 BLAKE2B 917936ba61ef6074939a11792ddb4f3baf0bd88475df7e49fd6e598dc2530610f04661a4b5efcb2a024e0d37011bfab32bcffd644d2a3be2eb1325c9020b73bf SHA512 3d962ac5a633492979d49c722bbbbeec88385fdbd063d3b68f6b82edbc62c9e78c556d48a904460dd04328bf7a79668dcf3ee33bf61a271ac926e01e2e645f68
 EBUILD gssdp-1.0.3.ebuild 1417 BLAKE2B 81ede79120c65986eacc364c409c8fd001badf4f70f1d5f52fa5b2af7623c252d107c6c33fe31522bdb53c8d50c6abffd7a29942f96099d6e8b67d467aff64b5 SHA512 512021422a7bbf9c4744211ab6f33352175dee773df90a41c07b38cbe0a00aab830c7e02da024346eefed22d6d9513250df120e2f73d4eb8e5f127a8ab81ab3b
-EBUILD gssdp-1.2.2.ebuild 1478 BLAKE2B f5480c7a27b165feba3c44a56a5b4384aebc8f90c87fc6ae6e42e1c9a5ca344c913b6088b3d0c8df4d57c046a2b1f7d2b2e38eb57df1c64754d0a74b20fc9e08 SHA512 a5220cea4e096de3b6deb4271ea0d56d83d3dd6f997a116e3c4d0e595388355ba8f49f131b9373d30c442bbd77babbe3ef0a26cb2dc88b515ec802b3cc51eaba
+EBUILD gssdp-1.2.2.ebuild 1477 BLAKE2B 9892f7fe3a4511d65909051c21f106b1e82ee664d5a515ce4c0a1a9b7711a7a0d278d1184a6e722e75a8c2dcb32fd3f65517227dbc9d7105c2e40d6ba3e5213d SHA512 f15c0fc98b494e73f221562a83312f3263dc5ed4f25815f03a42f19940242f7c76065069e7aac11905b6e751487d2965c2deaf87ccaacdbc6fa41a80f939f0d7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gssdp/gssdp-1.2.2.ebuild b/net-libs/gssdp/gssdp-1.2.2.ebuild
index b4fddf4dd85f..d7d1dca09cee 100644
--- a/net-libs/gssdp/gssdp-1.2.2.ebuild
+++ b/net-libs/gssdp/gssdp-1.2.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
 
 LICENSE="LGPL-2+"
 SLOT="0/1.2-0" # <API version>-<soname>
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
 IUSE="gtk-doc +introspection gtk vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
index fdc7dbffe4e6..3e52b51b519d 100644
--- a/net-libs/gupnp-igd/Manifest
+++ b/net-libs/gupnp-igd/Manifest
@@ -1,5 +1,5 @@
 AUX 0.2.5-gupnp-1.2.patch 3485 BLAKE2B 83de24ae98ed70d6e92fec605b17772ea3d86d90fc4f34376f8f5ea2eeeec239159baf0f7364b0be54406cab6833cf47129a08274704d231aa93e00460486238 SHA512 d1577e146b9274fa5e1e9652995c188b9c58d48ef6cd7ea82e08a966e31cbc5f36d27988628645d195c44601d2dc3861c5030dbc4fc4626955e709d74881ed3f
 DIST gupnp-igd-0.2.5.tar.xz 287964 BLAKE2B 2267b991a0137006f122b3454bfb1bd9df0fd7fae2c47b50a394a2859f6e04375b55447830f6606c8a25260b9cafb75329cbdcd201c220a66fe881dce368abfe SHA512 3d2af29d10c2939a81c8745a50d9cc20be53f97a2112cec6e45bf05373d807d86404b61c776fea34b15ac341f9b7bfff2f3c48901dd241e64e18b5bc7e614cc8
-EBUILD gupnp-igd-0.2.5-r10.ebuild 1458 BLAKE2B 43e5cfac05b6e6bb445155bd3b61cddad30995f9f5ea70baab4c3968cd7a035cfcb4e0fa9a7255e0dc9079d81d9beaca7cfc0c89a6f570781a4f6fa99456e4f0 SHA512 2fcf2b460ecc2bd5094349dd2aaef41e4067541358168e384fbd2380424b7578a65fe58ab8a8f09deaa2941e06b961723c1d142fc74152ca0b5c5f2e3141fb0b
+EBUILD gupnp-igd-0.2.5-r10.ebuild 1457 BLAKE2B e93ff3f559fbebb9e84800c6f48850f0970b96921396b48ee893af4c283567249b280e21f81ba400a9157d8bb490feb25a06eb6db48bbd718de31e5877b57b23 SHA512 7df87ecbc205765250386137fa5bed23323008b5aca991cb8b5ff7fe137f70c13d910c1b75fa792c36b232964d9a9ebc3d9217146fe9081bb3347ba5b8e9bd72
 EBUILD gupnp-igd-0.2.5.ebuild 1195 BLAKE2B da2b4bd36ddac42b51ec0aa59cf07038e71f59819262abb21191c93c66d90978de7d21650df65a146aa15d7de4ffedc1eddee7c6047b1ad5ada50d89d32255da SHA512 e34a657520c195b9b50d9586b4f79196074d139045418a0d88a90b38d4bd87cffb809ce6d299541a7bf7c3ca4e376c247e33e0364de06756adf5850c73b4c1bc
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
index fc0f99501c5e..756607d9a69e 100644
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
+++ b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://gupnp.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/1.2" # pkg-config file links in gupnp API, so some consumers of gupnp-igd need to be relinked for it
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index 6a1576d70800..fe3bab03db5a 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -2,5 +2,5 @@ AUX 1.2.2-build-manpage.patch 1447 BLAKE2B b876a44ac3930f087e3c00530d0b5cba2d283
 DIST gupnp-1.0.4.tar.xz 427616 BLAKE2B ab5d34e701e253dc48ebafabc908f9aacd7a325805c61b11b5668cfa105d56a37f0d93593eeedd0e63630b986f2a2c18d4d9cdd82b653c9cc7a5d57262a819ef SHA512 54a133ce043e9b3d5ea23041c04fbbf5483aea98a72421cdb59bada0ab2e3ab3fc85452c4c743b794eeb7c929f5ef38bf0e6ba7f9539d86182a77612c898205a
 DIST gupnp-1.2.2.tar.xz 136556 BLAKE2B f38018c76972f1b60b8274353a60d4bb1e4687ead6fd3fb084e050c070e5da4cbb7118807f65d47787c50af3174e7c2b87ff0b920cdcf13e7c5be17f8b156588 SHA512 08a715b06f30b9d9d11b914136f89b0c53d6b07b09dddf622619073fc6f144fc8d711eec28ede80fd14fc71a6addfe88de15740d0748302522ce71555fd18d2a
 EBUILD gupnp-1.0.4.ebuild 1963 BLAKE2B 0839c63f1431786e5d256690dbedc58f35e90e65f57f890ab502ce81dcfc54b4eac23133ffee1de727ca5a254f40377dc42887b67e735f786da646097554a0dc SHA512 8bb01a528b8a89602068765bfff9eb377833e7e2ebb39d93a4e78fcb6f29ced1e05f3f73b16de02f95d39bc61b6aa9b03ff937692cecbbc5936219f91bf8e0b5
-EBUILD gupnp-1.2.2.ebuild 2410 BLAKE2B dcc7398f9dd52d5be647ac4904abeb0a218f1fba8706c6cf917f1e94f8c900482e4a0132a092185c0fe6262869c83c36f65b5140c1b37a4bb07076cac667e160 SHA512 cbe73061e571c580e26d69bf754f6fb80f9d20c753a458b7e41cd5c6fff4d63210c24e0e043ef825df9c441be4b06d309188836cb8212ac2ebb98d1629fad8f7
+EBUILD gupnp-1.2.2.ebuild 2409 BLAKE2B ae08a58c780fb8905d610a32e37f054f202dac91eab9de0318509220010f77fbf0e7bfb0e92a2e95f17bda672ed69d039e96aaec802f92e432d7098d2551f450 SHA512 521a369deb7b1d4c198e73f5bec5ade78ef304a28ee4269ddb112c6c49c383d2686d160e88880a68ed0187d5645d684e78b93966b63d6c464049446e43e025e3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp/gupnp-1.2.2.ebuild b/net-libs/gupnp/gupnp-1.2.2.ebuild
index 367abaf8e512..5f5d8143a021 100644
--- a/net-libs/gupnp/gupnp-1.2.2.ebuild
+++ b/net-libs/gupnp/gupnp-1.2.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
 
 LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+
 SLOT="0/1.2-0" # <API version>-<soname>
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
 
 IUSE="connman gtk-doc +introspection kernel_linux networkmanager vala"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/net-libs/libbloom/Manifest b/net-libs/libbloom/Manifest
index af93198bcab6..b1245ebdb4d2 100644
--- a/net-libs/libbloom/Manifest
+++ b/net-libs/libbloom/Manifest
@@ -1,3 +1,5 @@
+AUX libbloom-1.5-AR.patch 492 BLAKE2B 1149e58d6c333b0ae442633e1c4824fc37cd07eb29d75c18cd0509f36114c8e458773fb4aee38b9b01193a92ace06aa193dee133da49c007d42399c8977d9e48 SHA512 da775a1e99a161c8f3433930b224aafaff681ffd96f89441bbce9b39a789d75de055eea95e799cac3769c9f9c5d14308968ee65a7daf5121d5ef024f3350c2ed
 DIST libbloom-1.5.tar.gz 1210081 BLAKE2B 8af463c487c2898c5a4cf3f7541490e2b069d4667ccda4b536f347535be5c7f5664c8ee17e0789ac5325feb8f325ae30a89e2de34323962e89378724cf130a84 SHA512 0dd69e3ee102e5808ba4350c71d212876db56235e263f8d5a66d6c3616d2e51cc18b5ca3a5a946d79c12751d9cc5667f7c633d77645c4b88a4d16ea344b51929
 EBUILD libbloom-1.5-r1.ebuild 558 BLAKE2B 9cbdaed054ecabfe74c7bc1a055faeab93ad354e956147dbe981ef06f8bc3ad99203a5125edf6337ebd4630bb81a618f5858c764529fe12cba09367938e5d765 SHA512 4fb9a57f55112108bf17b9dd587a56631985d2d828fb3038143826217acffc9d31c7523e1813c352c0ac9879dda5a6036ae48fca4b4f87601320c61b18ffa1a0
+EBUILD libbloom-1.5-r2.ebuild 595 BLAKE2B 5d19e1dcc14096cb5190d151cbd55dca99e2e444e23516e3d6cb331efb1959a2e104ea0d5519440b92276c65c14707d8aac05a7e99829d2d09ad9d64ca28fa7b SHA512 3858e3f238c753c2da1ba6e8d717f870613a34c811ad76f2fb4813e9ab9bad9c4d4639c6d07183aa9f14835f8f0daa7ec3377d2666f587a3583dd5158c73c2e9
 MISC metadata.xml 321 BLAKE2B b9276958b83d4101521b0946b8cd6db70acfc4e7257fe1773cf0e85a1f6d9434c2d27022f3628578aad4156fedafd635f89c273b09933918149491c96918d207 SHA512 c744f0f8c72f05d96c85a7dade513d5aae40413450902b66d30a0eff88c92e4f9bbf2a1f0ccfef29bef817115dd85ff7ce4386592a25ee9f5e492a398a9ff4f8
diff --git a/net-libs/libbloom/files/libbloom-1.5-AR.patch b/net-libs/libbloom/files/libbloom-1.5-AR.patch
new file mode 100644
index 000000000000..5a1b14d76b0c
--- /dev/null
+++ b/net-libs/libbloom/files/libbloom-1.5-AR.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -97,7 +97,7 @@ $(BUILD)/$(SO_VERSIONED): $(BUILD)/murmurhash2.o $(BUILD)/bloom.o
+ 		rm -f libbloom.$(SO) && ln -s $(BLOOM_SONAME) libbloom.$(SO))
+ 
+ $(BUILD)/libbloom.a: $(BUILD)/murmurhash2.o $(BUILD)/bloom.o
+-	(cd $(BUILD) && ar rcs libbloom.a bloom.o murmurhash2.o)
++	(cd $(BUILD) && $(AR) rcs libbloom.a bloom.o murmurhash2.o)
+ 
+ $(BUILD)/test-libbloom: $(TESTDIR)/test.c $(BUILD)/$(SO_VERSIONED)
+ 	$(COM) -I$(TOP) -c $(TESTDIR)/test.c -o $(BUILD)/test.o
diff --git a/net-libs/libbloom/libbloom-1.5-r2.ebuild b/net-libs/libbloom/libbloom-1.5-r2.ebuild
new file mode 100644
index 000000000000..9be6bd8a03a9
--- /dev/null
+++ b/net-libs/libbloom/libbloom-1.5-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A simple and small bloom filter implementation in plain C."
+HOMEPAGE="https://github.com/jvirkki/libbloom"
+SRC_URI="https://github.com/jvirkki/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=("${FILESDIR}"/${PN}-1.5-AR.patch)
+
+src_compile() {
+	tc-export AR CC
+	emake BITS=default OPT=
+}
+
+src_install() {
+	doheader bloom.h
+	dolib.so build/${PN}.so*
+}
diff --git a/net-libs/libcork/Manifest b/net-libs/libcork/Manifest
index 8de15cc1b466..618c13ac093b 100644
--- a/net-libs/libcork/Manifest
+++ b/net-libs/libcork/Manifest
@@ -1,5 +1,5 @@
 AUX libcork-0.15.0-git.patch 539 BLAKE2B c3b50675afd74b3bd5c5049bf311ccf33dd4fc257bb4b9ccfb50007bff022ec9c260de0b507dfcf2ecd3ce3036e00fa1ef52f0d437003e6c2e5c52a8de3daab5 SHA512 2e32bd6c53c9fc3f7c27344a724138e5f3073a8d6f5b63a30cd86b48bf430a63b70cc0a2fdb93000f944cbc12655d12926c01ba374ec52e12cc126712fc41442
 AUX libcork-0.15.0-version.patch 498 BLAKE2B 15fbafc607e6a3dab0376ade883db9a783b1490b7a9063f1d3d815149198caf962e9375ed752fc077a5bf9a5cb767499071cf2aab8bf29a912024bac6eaa33da SHA512 1a0a0cf02bf51423760626a3e886c36b3e58f02cc09a5898313c185c339f08194b4bc9e118d8546aa8529d2a3047faecf85dbcf7a9097d0422b416306db05222
 DIST libcork-0.15.0.tar.gz 182736 BLAKE2B cfabcf4b040d3d2796511b5d7dce005fcff9bc6704dfaf89ea9eac36617b0c544e932ab3e12c0b06e4e3e916c50da10ba26401527a8e83bde523b91b911fd6da SHA512 8f41cce2101b96707068a21e5bd0a43c23f996c3620e7dd36621ed4bdd3f92851a92ea56ed92db40d7d8fe55ddfbdfcdaac4d2c8b2fc6cb3b1abe3b0e74c6a75
-EBUILD libcork-0.15.0.ebuild 719 BLAKE2B 978d3df2aa767ab574ce54efdf08801a0779eee4f8ddc9521b734de8bbe41d844481308fb3bcf08a2afbc53e246341888bc417e0427ce47c50f42517148e006f SHA512 7198a9ba11c06c326321e59467ef51e8512944e3e352f7cc94ad272ce4d7039ae22891e97c482c6f7e126cb3f47ad07b1931c9723e3a6b7aafb787d685a2c05a
+EBUILD libcork-0.15.0-r1.ebuild 945 BLAKE2B 79459e83a2faf85f8a6193ded118d3ed21fb14ab822180c8c0e7cd534ba7b0f42c7f070db59fe1ae0f50094f977ac8f42574a931ce4e2116032b0915d69ba7fd SHA512 748e0a47a597114f0eccafbe8b671efb2b196f8a36ddc6234fdfaf9fa137b4232c84afb97a217d2eaab250717db838743870270d67c888794650ee373c6e2fbc
 MISC metadata.xml 321 BLAKE2B 413fda934011eb441b90050b4b07cb32143b70be324588f93a2d34076f67e65dac26bbfac264155c62d03a8feccfa42e14e33f80dcbc3c92d9ca8606a57ee108 SHA512 b51116388b073e857b090b791063df90c082fb7268ae80b594362e84999e4f22de11636dbb8abc9d214f651799cf1385905706de5b875c9fefdcc3c9cbc09594
diff --git a/net-libs/libcork/libcork-0.15.0.ebuild b/net-libs/libcork/libcork-0.15.0-r1.ebuild
index 0db7956e7c1a..24782aabf811 100644
--- a/net-libs/libcork/libcork-0.15.0.ebuild
+++ b/net-libs/libcork/libcork-0.15.0-r1.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 cmake-utils
 
@@ -12,22 +12,34 @@ SRC_URI="https://github.com/dcreager/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
+IUSE="static-libs"
 
 RDEPEND="dev-libs/check"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}/${P}-git.patch"
+	"${FILESDIR}/${P}-version.patch"
+)
+
 src_prepare() {
 	if ! [ -e "${S}"/RELEASE-VERSION ] ; then
 		echo ${PV} > "${S}"/RELEASE-VERSION || die
 	fi
-	eapply "${FILESDIR}"/${P}-git.patch
-	eapply "${FILESDIR}"/${P}-version.patch
+	sed -i -e "/DESTINATION/s/\${PROJECT_NAME}/\${PROJECT_NAME}-${PVR}/g" \
+		docs/old/CMakeLists.txt || die
 
 	cmake-utils_src_prepare
 }
 
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_STATIC=$(usex static-libs)
+	)
+	cmake-utils_src_configure
+}
+
 src_install() {
 	cmake-utils_src_install
 }
diff --git a/net-libs/libgadu/Manifest b/net-libs/libgadu/Manifest
index f503b054f33c..e18ee61c0d80 100644
--- a/net-libs/libgadu/Manifest
+++ b/net-libs/libgadu/Manifest
@@ -2,5 +2,5 @@ AUX libgadu-1.12.2-fno-common.patch 907 BLAKE2B 22e147267c88ba1bd7fc1f289332517f
 DIST libgadu-1.11.4.tar.gz 210937 BLAKE2B 05719b31f1d3ffd7df059d33597943787c1f10ac1dea89dce893050719394e1f2c7b5858b4ff3d0d2421bf68c977d4dfafd20689b3a7c0dc2c0593cb4d49599c SHA512 3fc8e414470864eb953d6d0d7dc6071679907c435d76e05a0b95a2e58365fc795427679f893d337dbf9896611a6bf68047c36806b977643cf4a773d930916639
 DIST libgadu-1.12.2.tar.gz 298884 BLAKE2B eee364204e9106b080a62ed4e180739b4dd9f2699fe3ddcb36493e3e29cc4e8074df17601900372c0a68da4b119f938521d4dd33baf730b279a13d80f74dbbee SHA512 d3b4fde94327ef312b1df668b8eb73fea9325c9258d85aa65e2746b73f00c2606ebe23f3330493a135a0fec1d0f24988f0cec607d4d899d880853ee8bf60e677
 EBUILD libgadu-1.11.4.ebuild 1290 BLAKE2B f360de4d3d93f538576aa0cf3bc7d7888a5a74da1758a465116338aaed0d899008b86518d34ac3d321bf74036e56ec10043a39a99c7d76727284b8315742ba90 SHA512 f6710a4fb1cfd290e30f310542ea34e1e18474d7de928082240c80220e787d4a234233ad8658eeed4bac34a59c2f4a4f62aebf7f59664076fdc0a2d5c6f536ed
-EBUILD libgadu-1.12.2-r1.ebuild 1167 BLAKE2B 7a958645eac6de6940898e694a30670638b896584429b9548c4f9c6cbe7212bff31bbd4f3bce3f7774f7c12d1e22f082c26d71bf84cc0da246f137b8eb7e5670 SHA512 1bf5c42b94b28bb4ce396d5c4f3573c28bf243de37a19fbec753c13a147efc9e91a84935df3f3d6dc90a81f968b04f8c81bc2f2a5beb85ba6bc422f34d878254
+EBUILD libgadu-1.12.2-r1.ebuild 1174 BLAKE2B 91701542fc2da10d0f2edfac28585eca79c6e410b2df68863d703f8b4c4d3173e25c67c57f77720ee763ed083b49d2afcc24f6d47c3a51b3c35770fd6421985b SHA512 799e5a6ec731501e4a6aa12a608861f0fec8d9c66f2f4f4cdc7c3069c40584cd99fa8d1e9c93935ed9ac972f4023f2216fef528e20e8d4f74ba71e3fe2353b95
 MISC metadata.xml 332 BLAKE2B d29e6205dff565647900434cfab8660dcc980bdccec03dccd6b16070659bec0b36c7030de139e6d0d0179c1ff36186d386b16cbb878cb82f5821f04ca615e73f SHA512 1b4a93d0fce0c628f5e85500c8f325423c961cb755eac978627abbdb039cd56de08b48afcc443b0a52b84c1ea82fe75758770dcfa0efe7639a530ee80262135e
diff --git a/net-libs/libgadu/libgadu-1.12.2-r1.ebuild b/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
index 441404784a46..d7aa78fb95d8 100644
--- a/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
+++ b/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wojtekka/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc ssl test threads"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libhackrf/Manifest b/net-libs/libhackrf/Manifest
index 8abe0d18611f..270791701c68 100644
--- a/net-libs/libhackrf/Manifest
+++ b/net-libs/libhackrf/Manifest
@@ -1,4 +1,4 @@
 DIST hackrf-2018.01.1.tar.xz 15464500 BLAKE2B 3a56305ce17b46660621b8f3e996e35909d7a8e7ab88ef643ed8f4c8d68f346e11dfe5fd2cb37aa23af62f202f28d9a8dc1da0cd8768fdbd6f293c65562f25a4 SHA512 89848fb58a8a29f7fe85bd817d5716117a2c7a5f2c4bb8582ad1ba8186831ca3054ea1314de943d1e923641eb18b6008cd8af79585e58fa50d55d5a7fd1b04e4
-EBUILD libhackrf-2018.01.1.ebuild 1021 BLAKE2B 54aab9b60ef3bd2f5690f3f36601ff8f5f5acf95f1b005e53b107833ffa6de82c42a5d686d234ae3f2685fc718d182119dc173346c7e12d2286ff4161c96fcf7 SHA512 29e7712df24ce91f481e3eb54d575f3f682d7ed654657bae571890013ffca4a5945171437b99fe9d3d39c4e5ed43bbeef56292159023aa16b1da7049eedbce45
-EBUILD libhackrf-9999.ebuild 1021 BLAKE2B 54aab9b60ef3bd2f5690f3f36601ff8f5f5acf95f1b005e53b107833ffa6de82c42a5d686d234ae3f2685fc718d182119dc173346c7e12d2286ff4161c96fcf7 SHA512 29e7712df24ce91f481e3eb54d575f3f682d7ed654657bae571890013ffca4a5945171437b99fe9d3d39c4e5ed43bbeef56292159023aa16b1da7049eedbce45
+EBUILD libhackrf-2018.01.1.ebuild 1007 BLAKE2B 6bec7c1a938fa883218ac3e1d2af9280baff3e6ad0552e598fc63ff815debb1c621b5bb413b645934882d6c1ddd349065e866e7e0de2c5760478e03de5cf7af6 SHA512 1696a2d932930bd128e0cbae2b334a290e686263cbf85881994d922f155d31d3558dd1fc37047f531ab5d569814f74bfc30c8f94937af88a59181a73cf75293a
+EBUILD libhackrf-9999.ebuild 1007 BLAKE2B 6bec7c1a938fa883218ac3e1d2af9280baff3e6ad0552e598fc63ff815debb1c621b5bb413b645934882d6c1ddd349065e866e7e0de2c5760478e03de5cf7af6 SHA512 1696a2d932930bd128e0cbae2b334a290e686263cbf85881994d922f155d31d3558dd1fc37047f531ab5d569814f74bfc30c8f94937af88a59181a73cf75293a
 MISC metadata.xml 477 BLAKE2B b801f5f0a79afbd3227a4ee2688b9332824f61b8bda623565d2f36408dc792aacc273495d7ada5a37a69092bedc61b7ca28952738a5969bfe3132253423d437d SHA512 ba679c6d4942d6a0f8efb480f820434676e37148bc60b481e9b7b0fe13b6037ee8c450632a85de25ed08e96b6e3308ee7b54b8a5f5130cd43827ad811d59a825
diff --git a/net-libs/libhackrf/libhackrf-2018.01.1.ebuild b/net-libs/libhackrf/libhackrf-2018.01.1.ebuild
index 8acce1696f84..06468417d0d7 100644
--- a/net-libs/libhackrf/libhackrf-2018.01.1.ebuild
+++ b/net-libs/libhackrf/libhackrf-2018.01.1.ebuild
@@ -11,7 +11,6 @@ HOMEPAGE="http://greatscottgadgets.com/hackrf/"
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/mossmann/hackrf.git"
 	inherit git-r3
-	KEYWORDS=""
 	EGIT_CHECKOUT_DIR="${WORKDIR}/hackrf"
 	S="${WORKDIR}/hackrf/host/libhackrf"
 else
@@ -28,8 +27,8 @@ DEPEND="virtual/libusb:1"
 RDEPEND="${DEPEND}"
 
 src_configure() {
-	mycmakeargs=(
-		-DENABLE_INSTALL_UDEV_RULES="$(usex udev)"
+	local mycmakeargs=(
+		-DINSTALL_UDEV_RULES="$(usex udev)"
 	)
 	if use udev; then
 		mycmakeargs+=(
diff --git a/net-libs/libhackrf/libhackrf-9999.ebuild b/net-libs/libhackrf/libhackrf-9999.ebuild
index 8acce1696f84..06468417d0d7 100644
--- a/net-libs/libhackrf/libhackrf-9999.ebuild
+++ b/net-libs/libhackrf/libhackrf-9999.ebuild
@@ -11,7 +11,6 @@ HOMEPAGE="http://greatscottgadgets.com/hackrf/"
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/mossmann/hackrf.git"
 	inherit git-r3
-	KEYWORDS=""
 	EGIT_CHECKOUT_DIR="${WORKDIR}/hackrf"
 	S="${WORKDIR}/hackrf/host/libhackrf"
 else
@@ -28,8 +27,8 @@ DEPEND="virtual/libusb:1"
 RDEPEND="${DEPEND}"
 
 src_configure() {
-	mycmakeargs=(
-		-DENABLE_INSTALL_UDEV_RULES="$(usex udev)"
+	local mycmakeargs=(
+		-DINSTALL_UDEV_RULES="$(usex udev)"
 	)
 	if use udev; then
 		mycmakeargs+=(
diff --git a/net-libs/libident/Manifest b/net-libs/libident/Manifest
index 8dd61e0bde2e..93ccd73c2875 100644
--- a/net-libs/libident/Manifest
+++ b/net-libs/libident/Manifest
@@ -1,3 +1,3 @@
 DIST libident-0.32.tar.bz2 205831 BLAKE2B c1f7798c83764774be933d0c34ec8729c66f3fd2bee6c7f8e5e472d929068c56bda9353cfa1b2fa5e7636fbecb38c02fe133233958992ccde766d1b614dd7a0f SHA512 5e5d0e3dd2514fa5af9dba02eca52cc8015d091fca05beeb23bae1c98d33a1a1313081cafc9e1e49d2beb5c524beaf1eb3679ff54330164aa170d74dbd84b244
-EBUILD libident-0.32-r1.ebuild 536 BLAKE2B 6ffb3cf5f35f510c72c11389340fc6127377028456d1817578c18731730a9ebe754438f9b8c2bdf0a5e51ac0cb34087b9f227e068ec3d1d8250bdfca7b079dce SHA512 f0d6a1cc9d88a0d3f693f248483ef717c331eebe35f8ee05a153ab7cd52751fc07d71749c03d4bdcf3d56e6aa65bc19c8cc6be3613cd67c92599e6f32d7d3dc5
+EBUILD libident-0.32-r1.ebuild 540 BLAKE2B f95920ccd8b3a085de149aa545511fa73b1e31dabb1a4f609e6b621be78acd7a3434d721ea4f7f8fea97851d6193da32fa2d8df0ac740402f454029a483bda99 SHA512 c8b4631ad50bc00d26541561bcdc577c629c36583822f517137c1d66f9a48d7762f9c07c1d1c2bc5a83dadaff28ed8d8b60b978fa3c6b9acbcc939684c7e7e7f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libident/libident-0.32-r1.ebuild b/net-libs/libident/libident-0.32-r1.ebuild
index 7f46a68d56f7..99d4cc5919bf 100644
--- a/net-libs/libident/libident-0.32-r1.ebuild
+++ b/net-libs/libident/libident-0.32-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://people.via.ecp.fr/~rem/libident/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index fb03a19d2fe2..eddc25fbfa01 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,5 +1,7 @@
 AUX libktorrent-2.1-unused-link.patch 649 BLAKE2B 246274feed30df570ba174699b48c702a9b77bbbdda66d7ae44fa0a83993a007897ed2cc9193a4ddd8aba6c8ddc4b1319694246c0bb6bae94bf4dfc4c1591588 SHA512 94f2663bef9c5d31ebdc69538a4dc80b17b9f6835c4975f5b52f13a6bc03ba526b50ee91e1b4515c426e80e95e64f41e8d38980585638a4eb15c328e37fe6ac4
 AUX libktorrent-2.1.1-fileops.patch 748 BLAKE2B 5c36ed8660b28b76ea2302801ffc2cd098f3743a80fbdc29ac15ce2afe00e0fe05717bbd8ad3375c0a95e4a1c9072b3d1257a572ef1392441393443ea35e764f SHA512 f07cfbbd135d8a726ddbc16a8263676126370438d219c49e23f2796321970dbf10c34a96df92b96da870f5a488b2832049579dab3aabf48370ebb787b30be104
 DIST libktorrent-2.1.1.tar.xz 357516 BLAKE2B 8bcec166fa1d4f09b72c4f31c771d5316f7411da538b789b111b641c8ba551d9c88bd1d68d8ad96396e125bb6b16f9d4e2a42a6b2166b40572d730d692d3cf5d SHA512 5c7f0218193cae148b03ae86a886b89d08a46200755728468ef271a6201add88eca617898d486d1823699def282d0251e26e3b28d2642f45cab966c286127d37
+DIST libktorrent-2.2.0.tar.xz 357364 BLAKE2B 66a91fc32dc11a680d22755468513896c9cea1cbaef8664c84633860b78efba85e5c9e47684fdaaf7fb6f03f624268f9158ee2b8c6fc3d14b0e70339c1f6903e SHA512 2edcb3a230f4fa3a55a6b774c819f4964fe8f2f5447b723ba81cdb0c187dc0268b6e78566d710fa364abe2cc40cd618d1874ecb1637e872fbad0ea8c340abc1a
 EBUILD libktorrent-2.1.1.ebuild 1549 BLAKE2B b28f9f065dc542e90fb9ba9b74f3594446a5953ca760e7cce92129ed3af7b7f2910d771a4928c61729ef263042a09f6c8fa30bf2515fd0ee02201b555f3a04cc SHA512 23c283c72592ca9369187514a286ce2b6a1f0add2ae4ab99a79eba8428305fab30fa1b44ac55f214986b2fe816be52f9e0d1bc826ac1103c481d0e3aa66b36cb
+EBUILD libktorrent-2.2.0.ebuild 1498 BLAKE2B 6564bc13ed8debff400ce18e9b2b90645c3a59302c12ca7c6cad119a40d54f113de2d661fca10fe2a1e6cc7f2e9cd0818d8f082b4c4c29bcb372e93c086d7fa9 SHA512 6895485134172a9c0834367d04a5fc5fc8fae85d86bed4e5483739a722620c2af1c92c8aeb4290a4cf47591343d2d6aff6b7aa67bb0750394d58a714068306cb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libktorrent/libktorrent-2.2.0.ebuild b/net-libs/libktorrent/libktorrent-2.2.0.ebuild
new file mode 100644
index 000000000000..ea246055bc8d
--- /dev/null
+++ b/net-libs/libktorrent/libktorrent-2.2.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KDE_ORG_CATEGORY="network"
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="BitTorrent library based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/internet/org.kde.ktorrent
+https://userbase.kde.org/KTorrent"
+SRC_URI="mirror://kde/stable/ktorrent/5.2.0/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="sys-devel/gettext"
+COMMON_DEPEND="
+	app-crypt/qca:2[qt5(+)]
+	>=dev-libs/gmp-6.0.0a:0=
+	dev-libs/libgcrypt:0=
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-libs/botan[gmp(-)]
+"
+
+src_prepare() {
+	ecm_src_prepare
+
+	# Gentoo workaround because gmp.h in MULTILIB_WRAPPED_HEADERS is breaking this
+	sed -i -e "/^find_package/ s/\"\${LibGMP_MIN_VERSION}\" //" \
+		CMakeLists.txt || die
+	sed -i -e "/^find_dependency/ s/ \"@LibGMP_MIN_VERSION@\"//" \
+		KF5TorrentConfig.cmake.in || die
+}
+
+src_test() {
+	# failing network tests
+	local myctestargs=(
+		-E "(fin|packetloss|send|superseedtest|transmit|utppolltest)"
+	)
+
+	ecm_src_test
+}
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index d7010e7711f0..49fae579347a 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -5,5 +5,5 @@ DIST libmicrohttpd-0.9.70.tar.gz 1886435 BLAKE2B 09ae33c66f151d9ce03b8333b26c32e
 EBUILD libmicrohttpd-0.9.65.ebuild 1292 BLAKE2B d0be1dcbb538eda2814e853c153df3121e5c9ccd64e5f422754a636c0078e4a701b08ccbc69103c1780b76dd8839b20bbda79125e4029e30594ad4cda8166362 SHA512 fde791d2ac45759eb1f0170607ee84dcddb26230b3721f54a95c3adca12c65a0361446d95fd7e73e33479eefef6a9b4082e3b1041034f8db166aaa6c54c7faaf
 EBUILD libmicrohttpd-0.9.68.ebuild 1279 BLAKE2B 03e4684290e50bf89b3270c7916bdbc72da590b747aac3e7cf6e72f98331c2abeffa61de886b3a87dfc49e941f33ab165e77c24e186a1631d21ff0c3b51a77a4 SHA512 82ab3db6aae947b5aca12ce0c4fb5728f77d95db4bf5b04feab81b0ce89cc58840bb1bcd1c7f7459a8a3db9182442f92b777ba232e890ad0f7620cd022dd98c3
 EBUILD libmicrohttpd-0.9.69.ebuild 1285 BLAKE2B ce52828fe3645d47525d8b31eebdced9d5eb5262244279d910afb7106c775a923b1cdf408950aa0f330c2800619b432a0a2029b13c9d5bc7c9c9bb6becbc76e9 SHA512 a767bf9a0aeb8b1bd14728496e8d442b59b862ceda2db42ddef5227afe18313a1b315326256ad431f873e2c4944968641d3a423252118a7c1bb049aecab2faea
-EBUILD libmicrohttpd-0.9.70.ebuild 1285 BLAKE2B 57cc4ca3b7701b4a5d84cc671069840e980cdca2918e524a656b89c7bceda0bb36349f7c869fd83076f0541a1079f587c43e491e6750898dad0ef56f593b7de3 SHA512 b576aa126f50138ad3471c1ff90a3f3409f8aae194968064df4b9f198129f43280900d629ce9841f3f30dcf056efa2801d323dbdc76a20b3212fe9ce6a6acc38
+EBUILD libmicrohttpd-0.9.70.ebuild 1279 BLAKE2B 03e4684290e50bf89b3270c7916bdbc72da590b747aac3e7cf6e72f98331c2abeffa61de886b3a87dfc49e941f33ab165e77c24e186a1631d21ff0c3b51a77a4 SHA512 82ab3db6aae947b5aca12ce0c4fb5728f77d95db4bf5b04feab81b0ce89cc58840bb1bcd1c7f7459a8a3db9182442f92b777ba232e890ad0f7620cd022dd98c3
 MISC metadata.xml 458 BLAKE2B 3b4d5cbe9453997287bdd1ce08b3a23422076d27c5a0fa7d18c936a7a81651cfe109f7531386871cba45f756c6f09dbc98c4987c17f8ec7b151421bbb82ac146 SHA512 2e775d144e0469c6c7467674da543bc72966ee6641fcf4072703d990eeb6f4903c6a4c2368d299b96afa77a1328319f88848b9c12df8b889c3265128d49e3ea9
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.70.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.70.ebuild
index 63a50da01def..455a6c307e14 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.70.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.70.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/12"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="+epoll ssl static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libmrss/Manifest b/net-libs/libmrss/Manifest
index ae128f1c507d..8c6c2d23509a 100644
--- a/net-libs/libmrss/Manifest
+++ b/net-libs/libmrss/Manifest
@@ -1,3 +1,3 @@
 DIST libmrss-0.19.2.tar.gz 375238 BLAKE2B e01682d9223d3f2cea444b5e6b5e9b6e476782ef0ae1c4a85d5ea8e8e5383d5317f2d35eff93347e6b5fde0778060c212b8e489915f50b20f098f7e94805e148 SHA512 0997ced472b767174977b7623484c57bfd0b901a9650cb7f7738ad7393153752ebfc1f717e2eacfb5f7eb319140599128d73de7e095327ee089cd1f85ab42b24
-EBUILD libmrss-0.19.2.ebuild 978 BLAKE2B 0556b62d1b1e86104b3181fc5b92d72ba9d3e60e1010e2cc654eb5e97475d8f72170578dff6c0030c68ed746ff92ee190d4738d416f57ea065e9a51138c733da SHA512 0fa630105a7f356ffb490147d6415a641f3df9416fd9dce29d483ed0586254341f7c38d06adee1a27a4871d93ce63561c20ce8e190a740011ff0701578ba29d9
+EBUILD libmrss-0.19.2.ebuild 980 BLAKE2B 973b0eed41f64477fb7d00a55a0ef32dfe7d6e2f252dbad8a7c25453fdac8b7161aac4422348105a3d52dd4c1d258c0f22b6d45d0acca0f38fcd6829713ba7ab SHA512 f3fc8203513bddd479e496329cbc524670c2a0a81fa79e6b88758b69a1b5e0b746b14906d9b5f3dfce4d8041f992885f1805f204ac4d740aee07db967c1976c0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libmrss/libmrss-0.19.2.ebuild b/net-libs/libmrss/libmrss-0.19.2.ebuild
index f4ce0a9497b3..4676489f4776 100644
--- a/net-libs/libmrss/libmrss-0.19.2.ebuild
+++ b/net-libs/libmrss/libmrss-0.19.2.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 DESCRIPTION="A C-library for parsing and writing RSS 0.91/0.92/1.0/2.0 files or streams"
-HOMEPAGE="http://www.autistici.org/bakunin/libmrss/doc/"
-SRC_URI="http://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.autistici.org/bakunin/libmrss/doc/"
+SRC_URI="https://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/net-libs/libnetfilter_queue/Manifest b/net-libs/libnetfilter_queue/Manifest
index cb5a63021f86..c4e3a144b25e 100644
--- a/net-libs/libnetfilter_queue/Manifest
+++ b/net-libs/libnetfilter_queue/Manifest
@@ -1,5 +1,5 @@
-DIST libnetfilter_queue-1.0.2.tar.bz2 354201 BLAKE2B 5df5a94ca07a6fb919d8a153143a0e340c323bac6491c3d03f9d871eb3c31e85ab0290cc6f67f678038605e829af0dfbfbb966b1a6b9bb76ea7acc4275a7d3a4 SHA512 89fec4d943b85f35e7cef3b1b9071b1280c6e1b282b7e5cb97eb17d05b9ddd175194639ead986767d27152540fe8e167383a1f7bbfe3cdf874a5a42a2c096f11
 DIST libnetfilter_queue-1.0.3.tar.bz2 314857 BLAKE2B c25b0395b13af3cecb960c39bcbc4f10a3f203aad7acaeb277346423310700d9abb5b8a65f27b008e5f45194aa6e0fd6a99c8ad25a1e3200904be70c5c6ddaa4 SHA512 1d9e0202878bc0ae26ceecd0f4fa4c21f89056e5671d46949f92f21c155d589958b7775760fc837547da34eb9a81e537e95c770d25c166e709dad16de4ca452e
-EBUILD libnetfilter_queue-1.0.2.ebuild 732 BLAKE2B c8ff9d89e95321aafb844c352c029ec532d757f605d48f57b8238940e05d7cf36f1c5b93e0efdbfe5fbea713d8e2babfd474b4b53861929693d4ac66d0f2523b SHA512 baddfdc66514d1a924a4e77d812bd6095b87d75e81109ab0b68b4db52a9c382efa39bc7d13020bea2df9b0ffca43282dab00004481d87f20c0257e756fe86371
-EBUILD libnetfilter_queue-1.0.3.ebuild 731 BLAKE2B af4d66659b119dbb220e8d01a735641447c01e1bfddb5359c9eac608b874264046597c28f9c98a3df9fbdf6eccf233e3a1701b6604851c62763ad6b4a96b7a05 SHA512 9dc9aa4d5041c691faf05cd855b60d5a60eb87632bb9f702ce768f79d761b305cdbc45f88f3e0fd440185a254f6ff440e72fe03a50e8045dd1237fdfa108c8e8
+DIST libnetfilter_queue-1.0.4.tar.bz2 312699 BLAKE2B 29d553c36af551cbaa3b1b4382ad38d6ea7402efafa5ff4ae99c6f05d0ddd15d24b007a4ccdcbc21b8bd9cea28859668a27a6fae4e6534f68dea79d6d0a02789 SHA512 5d81d8e8190a80c9b42bc851a87cc4f749709803b8c9964508013bafb033f1b51b65222a244885f321a2be90517c6a636533ff72b653935a2b8d819560a51187
+EBUILD libnetfilter_queue-1.0.3.ebuild 724 BLAKE2B 4ef7a43fa54add5f2b3b664434927a160778721eee0e98949eebe08a6253f8eac08b42e6ebee68122a947fdd023abc0d6de8bf5fa3855f17d8e61a495590f63a SHA512 6604f86cd9bf16b5fbf347219dcb2613e1ad47c83939976abf29703783ca961f6daaa140ed772dcf076f9ceedf735c4ab5fa6ada96018a2807a38aea7570042f
+EBUILD libnetfilter_queue-1.0.4.ebuild 895 BLAKE2B 2839c19ee5ebbe3dd18348ed49cd88843fab057bf878a5b860d5374d4bff43133ca94cbbcc9b4892471632716f46bf3484073ba6edd8211ab24ef280a696924c SHA512 b4bf7aca2998a878e8c71fa7f6cd3f8bd45f66735503f4dd523dabe937cd988ed56a6ac2a7ecbcef6b4f9918cc9872810bb2b60986ed464fc78005672176288a
 MISC metadata.xml 370 BLAKE2B 5ffcfd5d89a391b532e7d64188fe64b9a99a72c9072aa8bea89157a3b322b0f1ee0edab1ba3d2b088857748ab2e5402dc6ba0db514e9c1ba465bf0b6716b6fc9 SHA512 d81ab4bbba709f4b4dd90ba5029ed20471230817f7c538e502ce3cd533e1439326d101e8e7a34e81c8714699d87f195dd95c2157216f9926baafe7b5c8aeb213
diff --git a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.ebuild b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.ebuild
index ad6618c7143b..2d79ab927382 100644
--- a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.ebuild
+++ b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.2.ebuild b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.4.ebuild
index 1f9dc3269782..288764d2e4b6 100644
--- a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.2.ebuild
+++ b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools-utils linux-info
+EAPI=7
+inherit linux-info
 
 DESCRIPTION="API to packets that have been queued by the kernel packet filter"
 HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_queue/"
@@ -10,19 +10,30 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs"
 
 RDEPEND="
 	>=net-libs/libmnl-1.0.3
 	>=net-libs/libnfnetlink-0.0.41
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	app-doc/doxygen
+	virtual/pkgconfig
+"
 CONFIG_CHECK="~NETFILTER_NETLINK_QUEUE"
 
 pkg_setup() {
 	linux-info_pkg_setup
 	kernel_is lt 2 6 14 && ewarn "requires at least 2.6.14 kernel version"
 }
+
+src_prepare() {
+	default
+
+	# hack for script that was not distributed
+	[[ -x fixmanpages.sh ]] || ln -s $(type -P true) fixmanpages.sh
+}
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index b279bdf5a424..c6b3a80222fe 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -3,8 +3,10 @@ DIST libnftnl-1.1.3.tar.bz2 366521 BLAKE2B 9a46a46b68fd6d3e0ffc3d28713ee9a70017d
 DIST libnftnl-1.1.4.tar.bz2 368262 BLAKE2B e5f396b582221b9f9a7d3303d65548e3597474b1cedf931728f3105b04a851eeeeff98fd2a49772f29849a9094c2e0cfef7d500050e8f205565e8dfd1ec7a49d SHA512 6fe248b1340decc1ec8ae40dd0ed60b8d4b819c2f36f2399d39e13e92fc5e6f6ec693b736d6c188bff954afb2bf2dbce67d54a9e664b45f43288b2c5c6cc08f6
 DIST libnftnl-1.1.5.tar.bz2 373930 BLAKE2B cfd06084fb7de5dd6120a22faa43ac578f170e5209564579ff26bdf49e2b70b5b3944275861e32fcc7f6f2bb1d9f43bf51157665d0d5faea259e14cf930030c0 SHA512 a0495e1a99ea9efcf3994db48e50943023ff3d8101055887574ff4eb6b0df8600cf7db68a9c91ca02bbbcc1f01099b008649f88321bb956897bcc90eb4167ee7
 DIST libnftnl-1.1.6.tar.bz2 376340 BLAKE2B b5ca243af71462f7c91cae3f368bca7ba19151f5e14bdc459efc136cbf1d6f0234a097337dcee2a2e733a173c72c71496f34222dbd217e79b2a5b614315e6b30 SHA512 3de13cb667060f0942c8dd9e139ee8c7aff1854c544793774a827c01d06e432a4ce05d54846e1062aa620b5e54533da09daa9588467866c82c9119ef4cfbb57d
+DIST libnftnl-1.1.7.tar.bz2 387829 BLAKE2B e21ca38edbc7c651a061fcd6db80278ba99b4fe0c92c1912039fd0a1cd4b7636c87e17f538eaad8c6b963748c7c77800eaa83ddb80d344865504329984ac9c96 SHA512 80fd09147b1e2c1533cc2c8347d35137ff94f14118d5ba7bf3c1fbd0a226f6443560d5eca03273129e091b3442f820cd24455e72e917a8b7fedc8f3c9b6dc407
 EBUILD libnftnl-1.1.3.ebuild 1193 BLAKE2B de38ffd4dd0740b905ae7736201550806cac8671acca11f8999e1daef009799efdb673d234f9ace51409dd243bd50d4cbe7dac8869538a02441bfded17811916 SHA512 47a7b1b84dde93caf3fa1b2bc098ad62063584b185d96465140a8f661db5021e25e4a2109b91331faa186747991188ffd419768fd8b2139179a1656d229f2e27
 EBUILD libnftnl-1.1.4.ebuild 1200 BLAKE2B 10bc5492908945a9ef24ca430e528a18bd485c4a584414b5d001865ad3cb37d705be9c3772a451593a362a1fe8ea2915ce2e96153cd6031cb1b29589dabf85ed SHA512 0bdbdc05baa72d840d135c8bb628f576cc747b1140111e4568a97c0cad4fa79686fc6700d418b4091e3d0df289d73b3332b403066e8e8eb770f2187f5c37677a
 EBUILD libnftnl-1.1.5.ebuild 1255 BLAKE2B f0a32d76a4cc25ccb33e16c1f9b0544f4b94da741fb335f7978ecffcb7e3289a42917773b293dcf383b77a72840d5a65cb21f21b502bba0c4f846309600d346e SHA512 dd42cb3ea1475d8f39034a7365c90f7e976f3cbc6f11020ccc7915c0d8bd27fe04dd2f7d784c1d08a8abaab02045119c705d10a802f3ff9a736a098fa6d5d615
 EBUILD libnftnl-1.1.6.ebuild 1200 BLAKE2B af974af8061f7789020a3efc449416e43af663ff1b8b098f820e5aff395bb25f9d99228bf363b5da8b5a32b8d38275564374f59088c24d0f11ac213d98e32590 SHA512 c6ee6faec8cab4159745be8665ad7363addc99f07d7a70b1c2e23337041ab2e5ff2b3262d9f13f946abda41c092482632249968c91fd6a31a4dd4005c551518c
+EBUILD libnftnl-1.1.7.ebuild 1200 BLAKE2B 6d0bb8f977e3a2910288ab3a5a3e7576b18f523c2c94172fdab12dfc5e4ce7604374da769ed66077dddef9cbe616695163ddb24f5e0f403d0e7a070a019b7377 SHA512 416d4570ac5dcb1d147e9ad0d7fd2c75dfe38ad7a2841cd99199723cdbf896abc68c4e5f551f8dd1f6745a999ff68724c15570b96d1bdea2cab41463c7be2ec9
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnftnl/libnftnl-1.1.7.ebuild b/net-libs/libnftnl/libnftnl-1.1.7.ebuild
new file mode 100644
index 000000000000..992fe51d51ef
--- /dev/null
+++ b/net-libs/libnftnl/libnftnl-1.1.7.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info toolchain-funcs usr-ldscript
+
+DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/11" # libnftnl.so version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples static-libs test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=net-libs/libmnl-1.0.4"
+BDEPEND="virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	gen_usr_ldscript -a nftnl
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use examples; then
+		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/net-libs/libnma/Manifest b/net-libs/libnma/Manifest
index 5e59fec8503e..138df71c15cc 100644
--- a/net-libs/libnma/Manifest
+++ b/net-libs/libnma/Manifest
@@ -1,2 +1,5 @@
+AUX 1.8.28-nma-ws-leak-fix.patch 2559 BLAKE2B a399b22f1f9c2a4d0acca2fac72f17211ec360204e8029ae980a46f67aff1b39dc20e6d4dbe88c55885d85f19b270b1c77e3bccde52884831383f168df5c2671 SHA512 35a8c8b4cb85dd0c0e7af1b9c424f9b69908b71c30605274dc8c383f72fbd3793780209ddbb1e82422aef3a8a297fecada0233a31f285090c5c037ff4f454228
+DIST libnma-1.8.28.tar.xz 1366584 BLAKE2B 598c2d310844930a5ed8b8d4b8bc0ae91193a8e62bccdb60050cc980cd37d198adf728b98694d9f1cf9f523998b865d9682fd271c88e434ead777ed5b69866b4 SHA512 d3996da3433493149edf0743b7f2280a83db2efc2228f04eddb773bbcb08ea2efcb640f781cb1d0a5cbabd8b25b1c612387682ff5239151d8ce249568e877f5b
 EBUILD libnma-1.8.24.ebuild 585 BLAKE2B 14955a958ecb2ef65e729f46dc4cabbedf020ca1ede426efd0291101fed11d8dc5ef70051143c4ea5f638cc1a08aeca5426f09595fcdc67d8127228c98af247e SHA512 e67925f59d07a5cba47cb44ec50721e8c365b5ec9d73882b31c2ddfa82ee5daee1241e152a7f2fe7a7f4035a8aa9ea563594d8722ed3e0bc340c9c8fe8e15c95
-MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
+EBUILD libnma-1.8.28.ebuild 1689 BLAKE2B 6da4564ecf1a70c90ffd4b9f46b67a062eefc031961ff05b702465065f6637da500ac4dc6bd41590d975c953ccac5fb2650068fc53d9334d43248ab37ad2e727 SHA512 194b9f092912f8a5df01b0f64962f87ca9b613984fe2b8ff8abde42e525dadd2c35411ee0311cccdb40d84486e5f1b2e2170d79dbd1a12c0b952dc8b9d83f4de
+MISC metadata.xml 372 BLAKE2B e55e51eff966d0806e416c520f700ab28219271b0b92cbab359e9b894813e0cf48b978279a4c3d0b460fe5477e12bd016cf2d401b22134c609432284d1e01ff3 SHA512 b644f5bbd965ea13b9097aec503e0d9448bd013feb1abc24cc2bf9b2b4612a984a4ec6b36b67bf0c8b920c82c812e79afcc9dceccde4b37652a61e71c6cdf16e
diff --git a/net-libs/libnma/files/1.8.28-nma-ws-leak-fix.patch b/net-libs/libnma/files/1.8.28-nma-ws-leak-fix.patch
new file mode 100644
index 000000000000..8f2042a2568b
--- /dev/null
+++ b/net-libs/libnma/files/1.8.28-nma-ws-leak-fix.patch
@@ -0,0 +1,86 @@
+From 55e33e4ce01c8b2b8dc98a5ee40a5636579cd577 Mon Sep 17 00:00:00 2001
+From: Beniamino Galvani <bgalvani@redhat.com>
+Date: Sat, 11 Apr 2020 15:44:17 +0200
+Subject: [PATCH] nma-ws: properly dispose wireless security objects
+
+Chain up to parent to properly free resources on dispose().
+
+Fixes: b61cc1b9fa040 ("nma-ws: add")
+
+https://gitlab.gnome.org/GNOME/libnma/-/issues/7
+---
+ src/nma-ws/nma-ws-802-1x.c  | 2 ++
+ src/nma-ws/nma-ws-leap.c    | 2 ++
+ src/nma-ws/nma-ws-sae.c     | 2 ++
+ src/nma-ws/nma-ws-wep-key.c | 2 ++
+ src/nma-ws/nma-ws-wpa-psk.c | 2 ++
+ 5 files changed, 10 insertions(+)
+
+diff --git a/src/nma-ws/nma-ws-802-1x.c b/src/nma-ws/nma-ws-802-1x.c
+index ba348266..0c148ce5 100644
+--- a/src/nma-ws/nma-ws-802-1x.c
++++ b/src/nma-ws/nma-ws-802-1x.c
+@@ -482,6 +482,8 @@ dispose (GObject *object)
+ 	g_clear_pointer (&self->secrets_hints, g_strfreev);
+ 	g_clear_pointer (&self->username, g_free);
+ 	g_clear_pointer (&self->password, g_free);
++
++	G_OBJECT_CLASS (nma_ws_802_1x_parent_class)->dispose (object);
+ }
+ 
+ static void
+diff --git a/src/nma-ws/nma-ws-leap.c b/src/nma-ws/nma-ws-leap.c
+index f90d43aa..df6d2dde 100644
+--- a/src/nma-ws/nma-ws-leap.c
++++ b/src/nma-ws/nma-ws-leap.c
+@@ -260,6 +260,8 @@ dispose (GObject *object)
+ 	NMAWsLeap *self = NMA_WS_LEAP (object);
+ 
+ 	g_clear_object (&self->connection);
++
++	G_OBJECT_CLASS (nma_ws_leap_parent_class)->dispose (object);
+ }
+ 
+ static void
+diff --git a/src/nma-ws/nma-ws-sae.c b/src/nma-ws/nma-ws-sae.c
+index e3454bbd..00fb6ff5 100644
+--- a/src/nma-ws/nma-ws-sae.c
++++ b/src/nma-ws/nma-ws-sae.c
+@@ -252,6 +252,8 @@ dispose (GObject *object)
+ 	NMAWsSae *self = NMA_WS_SAE (object);
+ 
+ 	g_clear_object (&self->connection);
++
++	G_OBJECT_CLASS (nma_ws_sae_parent_class)->dispose (object);
+ }
+ 
+ static void
+diff --git a/src/nma-ws/nma-ws-wep-key.c b/src/nma-ws/nma-ws-wep-key.c
+index cae8c272..992aabf7 100644
+--- a/src/nma-ws/nma-ws-wep-key.c
++++ b/src/nma-ws/nma-ws-wep-key.c
+@@ -404,6 +404,8 @@ dispose (GObject *object)
+ 	NMAWsWepKey *self = NMA_WS_WEP_KEY (object);
+ 
+ 	g_clear_object (&self->connection);
++
++	G_OBJECT_CLASS (nma_ws_wep_key_parent_class)->dispose (object);
+ }
+ 
+ static void
+diff --git a/src/nma-ws/nma-ws-wpa-psk.c b/src/nma-ws/nma-ws-wpa-psk.c
+index 1c73922a..27604960 100644
+--- a/src/nma-ws/nma-ws-wpa-psk.c
++++ b/src/nma-ws/nma-ws-wpa-psk.c
+@@ -270,6 +270,8 @@ dispose (GObject *object)
+ 	NMAWsWpaPsk *self = NMA_WS_WPA_PSK (object);
+ 
+ 	g_clear_object (&self->connection);
++
++	G_OBJECT_CLASS (nma_ws_wpa_psk_parent_class)->dispose (object);
+ }
+ 
+ static void
+-- 
+2.20.1
+
diff --git a/net-libs/libnma/libnma-1.8.28.ebuild b/net-libs/libnma/libnma-1.8.28.ebuild
new file mode 100644
index 000000000000..140757c9ecb7
--- /dev/null
+++ b/net-libs/libnma/libnma-1.8.28.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg vala
+
+DESCRIPTION="NetworkManager GUI library"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+# pkcs11 default enabled as it's a small dep often already present by libnma users, and it was default enabled as IUSE=+gcr in nm-applet before
+IUSE="gtk-doc +introspection +pkcs11 vala"
+REQUIRED_USE="vala? ( introspection )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+	app-text/iso-codes
+	net-misc/mobile-broadband-provider-info
+	>=dev-libs/glib-2.38:2
+	>=x11-libs/gtk+-3.10:3[introspection?]
+	>=net-misc/networkmanager-1.7[introspection?]
+	pkcs11? ( >=app-crypt/gcr-3.14:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+"
+RDEPEND="${DEPEND}
+	!<gnome-extra/nm-applet-1.16.0" # gschema moved to here before nm-applet-1.16.0
+BDEPEND="
+	dev-libs/libxml2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	vala? ( $(vala_depend)
+		net-misc/networkmanager[vala]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-nma-ws-leak-fix.patch
+)
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dlibnma_gtk4=false
+		$(meson_use pkcs11 gcr)
+		-Dmore_asserts=0
+		-Diso_codes=true
+		-Dmobile_broadband_provider_info=true
+		-Dld_gc=false
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/net-libs/libnma/metadata.xml b/net-libs/libnma/metadata.xml
index 996e7cacd217..5c94e2f316c0 100644
--- a/net-libs/libnma/metadata.xml
+++ b/net-libs/libnma/metadata.xml
@@ -5,4 +5,7 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
+	<use>
+		<flag name="pkcs11">Enable PKCS#11 support in certificate chooser via <pkg>app-crypt/gcr</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/net-libs/libnxml/Manifest b/net-libs/libnxml/Manifest
index da55bd199f9b..75d3a6c2d292 100644
--- a/net-libs/libnxml/Manifest
+++ b/net-libs/libnxml/Manifest
@@ -1,3 +1,3 @@
 DIST libnxml-0.18.3.tar.gz 361977 BLAKE2B babe5773f102889d52d0d63511984201e220205925b703221559cf73c8e380b78b3788ff48bdc2da382746bb95acf4c9a70c69d689c4fd7db3be4bd65f44000d SHA512 fc420a4b773eca68608ac1d509930a0528c3a41b53fc7cc340c09fd53f92a88afb4091e810d97d59e73a8beeaaeed52dd3c880273ef512a5305800b3ef46717a
-EBUILD libnxml-0.18.3.ebuild 912 BLAKE2B 4d3729f8b862c08a2d6d06ed672379e0a30296548e881432fd536505f73040474faa5381fa7c6e9bf0fda6f25c9a0ebedb97335c7b684631694b3a8ddf7b3098 SHA512 934c9f1d41f0e1215b9f55a4953972234821c639e6ac3a09dfa2b2614153d5bdbf3d1f542e5ea6bf321812eed1045bc9a3d0d0f8bd5037171c7720b985ae05b8
+EBUILD libnxml-0.18.3.ebuild 914 BLAKE2B 38f973759899df9afe7145d82b18f4a3f7eb7a2235ffe96b347cea12a7e83670904c4a2e23a0c4e4b5ec4190d9f5c4500865961fe773a95d1f94647d7340d03f SHA512 cc55562815a60568fd34427304273830bf9a3d4eb85a8f4dd7db433dc6748aedabef84d5e2d40f3810b011f7bf502f5bd8b37ef80f0d5279f4dda0b14d04268f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libnxml/libnxml-0.18.3.ebuild b/net-libs/libnxml/libnxml-0.18.3.ebuild
index 8d4062c2bd02..c153deafa5a7 100644
--- a/net-libs/libnxml/libnxml-0.18.3.ebuild
+++ b/net-libs/libnxml/libnxml-0.18.3.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 DESCRIPTION="A C-library for parsing and writing XML 1.0/1.1 files or streams"
-HOMEPAGE="http://www.autistici.org/bakunin/libnxml/doc/"
-SRC_URI="http://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.autistici.org/bakunin/libnxml/doc/"
+SRC_URI="https://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/net-libs/librsync/Manifest b/net-libs/librsync/Manifest
index 14cc9eef8877..3e9724fbbcb1 100644
--- a/net-libs/librsync/Manifest
+++ b/net-libs/librsync/Manifest
@@ -10,10 +10,12 @@ DIST librsync-2.0.2.tar.gz 174480 BLAKE2B e77d554ad08a852459fe2798249f47ca7f2684
 DIST librsync-2.1.0.tar.gz 175630 BLAKE2B effd2a8c79fae202921220db7581be1d9f7d278e6ee5155a23e586d9d4a7a27bbc4a50049ddca3b187a8e08451c6dcde7340d22be9fde0c2c12462392043fd8e SHA512 9b91f4b696c1d1cdacb5c0679c7df7a92641e0a6a599c2e5de2bc0af3052b2045bb16c40b072c40859074d792c78c57afb0817917fa9843b179befa4506ebf04
 DIST librsync-2.2.1.tar.gz 180649 BLAKE2B 6dd97a7f140655317c5258d9588ba831716a8909c0d145665b742640a02b317f8736c05b04106f7a221726680f9ccf0ec1bd9a7f760851a993b7783f93193804 SHA512 6581a4285ebcfa1c4dfecac2d6796dab736a4c66a7fb82863c778506073446d9a113d39de7eb29e845a484646f1d8fec29019338bce31a091b0acdc461ab1bcd
 DIST librsync-2.3.0.tar.gz 192493 BLAKE2B c9bb0f211d0d579bec3b7236cfac0ec1dcca6b87458c823430c588b4398b06a559e55e3b9ff8a9f635f7e79bb9c57fbb4b301b55c51c3a694287051557b45a16 SHA512 49b2243b7515a6e69abce438a27515a35ecfe327aee849514af539975418d24b7be2d2c2f8c753860f43bf9596c6a7833694e7d94c30f14093aa12363e0d7ffc
+DIST librsync-2.3.1.tar.gz 194573 BLAKE2B e18c5d76b45701d881f64bf642ec40844bca507b99ab3161b1bf9446a7a0e2cc954d5d5b37a0d8894fabde2a8f6e2896ef1fc51942cf5c40b2f8a1bb94c20ee0 SHA512 89e5b5ad960b8036acce41df09f5e50601d7eb57d48a2bd21c4ee54a3a375f62ee514036b9a562277b5656735b84cadf6f54cbf48c364bbf0c04f2d95ae3b5a6
 EBUILD librsync-0.9.7-r3.ebuild 876 BLAKE2B 9fdb782c3fb719f663cceb1eb1b75d58dcad0a687e5fe94f25775753a60ec55d02ad879eac6774f7d695fc0240227024b5976bbc23a2029d2843d94709012cb4 SHA512 1c9a485c1f074adac359ce05e72c8108a24e1a57503e8643c63375c9668272eb09493fbe114c3fbf6969b9ec125c6a9216d5b28a7bc31b1ea4c8beab904476b8
 EBUILD librsync-2.0.1-r1.ebuild 665 BLAKE2B 5baee133d997787e922ac979461b6447ac4b6bf41522a5e1fd96f4443fd3673528c9fa0e2bd35c84a83b71e710e772563f6067ae83d725d2bcc22150efaa5e93 SHA512 e0b7d4a56fb01cb4f6767b958f7afe3d1f92afd87b52fc34779ce17a9f579c3a4d6899cdfa183c60afb3023ee550045f29bee3589638b1802f6210c16dcadc4f
 EBUILD librsync-2.0.2.ebuild 608 BLAKE2B 4d452311f2727375b3e4934b6abbddf83c09a13f554a6c2299e23cab6ac18216a53f9c49ac08d22f5768f515a45a19d325cd3f75635ec71564909cff3155418c SHA512 108df8dea5da1f8e7a2b2a380f530f355c0d204c04858ebd5eec8360fbdddf79c7e7ed7e3ebd4cdfcd94a212992b2b728e136b2d8137f05e6ed10cc70eb15218
 EBUILD librsync-2.1.0.ebuild 611 BLAKE2B c7a769d9d594417d1218f13be7aacf42da098a22f2563f19b437d96058c742cc45aca890fc156bd1532f3f722eafae6861e0248eee4f6a96044c1f3a2647a238 SHA512 54155f0e126bea498763f15aa2dc747d1edaba0d84ce6045e386c3acde3306e6d094e16f55e2afee0e97e90330d3ac829e313db0c9ad7214194e6abd2af17347
 EBUILD librsync-2.2.1.ebuild 611 BLAKE2B 07e6107faf15ad3c3c969df45a0b5069e068f702610ff74cd941e3e2d40f02e68740606e2af4b3f975696d907867337ee423c6bdacd5d0d466495fdb8531ec58 SHA512 01131e9a9b9797220767a9000cc0cf16bfe591eda90bcdcbe30f1f9a5a4adf09717922366532ace47225ba82155dc3387935d2fcaecbea50c6f69edd0ba4a912
 EBUILD librsync-2.3.0.ebuild 611 BLAKE2B 07e6107faf15ad3c3c969df45a0b5069e068f702610ff74cd941e3e2d40f02e68740606e2af4b3f975696d907867337ee423c6bdacd5d0d466495fdb8531ec58 SHA512 01131e9a9b9797220767a9000cc0cf16bfe591eda90bcdcbe30f1f9a5a4adf09717922366532ace47225ba82155dc3387935d2fcaecbea50c6f69edd0ba4a912
+EBUILD librsync-2.3.1.ebuild 611 BLAKE2B 07e6107faf15ad3c3c969df45a0b5069e068f702610ff74cd941e3e2d40f02e68740606e2af4b3f975696d907867337ee423c6bdacd5d0d466495fdb8531ec58 SHA512 01131e9a9b9797220767a9000cc0cf16bfe591eda90bcdcbe30f1f9a5a4adf09717922366532ace47225ba82155dc3387935d2fcaecbea50c6f69edd0ba4a912
 MISC metadata.xml 388 BLAKE2B e0e7f313d2baa7954ea0c1f5dcdeac08c196a55ac99e218ae4dfe0dd7ef67f8855bcbf4e63f1b00721ed9c336cc2f3a9010b05006c2b9a144e659d4a9b8b0504 SHA512 ab83505af5ac18233945e6ec0a2318be8e6ac01120d28164849ab888b1f9023305afea214338049dec008885eb492a0513a9beb2491aa363950806c651eb1525
diff --git a/net-libs/librsync/librsync-2.3.1.ebuild b/net-libs/librsync/librsync-2.3.1.ebuild
new file mode 100644
index 000000000000..4a6965cbd509
--- /dev/null
+++ b/net-libs/librsync/librsync-2.3.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Remote delta-compression library"
+HOMEPAGE="https://librsync.github.io/"
+SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/2.2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+RDEPEND="
+	dev-libs/popt
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_LIBB2=OFF
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 876620d06245..89b6ee82b1a5 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -6,5 +6,5 @@ DIST libsoup-2.66.4.tar.xz 1451200 BLAKE2B 4ee37592beb9227eb5a61901e4b100b613fef
 DIST libsoup-2.70.0.tar.xz 1494220 BLAKE2B f6bf30c741c7919a31598132ca65c0081d074e7c90d915f3598cb986e1f51f5354538f76dc7117a94d946bd8cd5fe8477ead689f343797757224014932061d28 SHA512 c3e2a963f4b38b2eee5d772b68a325c076fde19c26413bb3ada91824d3c7e108fbc325bfdc49a28141a641233485d3044d18142720c2aebaa7cc820f8718159b
 EBUILD libsoup-2.62.3.ebuild 2917 BLAKE2B 3565f682f83a4a9658c232ff6949fa630c6415bbeb998f2cdee9c8b303b31f8f1cebd48f07860f54cbb8100c724b8c9e4a8d92cd71ecb60811868de14035069c SHA512 183d28406eabef85b826b64d385cd39c8a64c0175f0c0c9a2bad5d40d7d450ec2e353dff827c7819ef1c506348c96b5ccd86186240850366e2e9492be683809f
 EBUILD libsoup-2.66.4.ebuild 2776 BLAKE2B 259436379c1e6248f94c8fd2f2598b5be157efdc6faa4aad1a58b3abec05c147644633d338fd4cd6d99dc2f2ed917b043ef5badc5eaedd6aa6488c79b7ea2451 SHA512 ff6af7154565c638f0236c918e5e448026bf7966d72d138f5b9a319af5e81cb0b32e2de3b1c157cfa2d1acdc0777166176ef40d13f0aeeafdac4b0677a019ef5
-EBUILD libsoup-2.70.0.ebuild 3030 BLAKE2B 414552c85bd72c8a65cd165a6a0b6d4dd1680da27a4e57773d9dd4560a21cbdc880070b335a4689aa82e737b38c3160997c9c01b2d95b1077c09fdfe21fa5db0 SHA512 81c8f85c6ceca2300ed702bf6dc456ccc431356e02619d3a2151dda400928a4a8b864831deebc739bd58432cb51f714b65536f87e90ee7d9ea4633145b5be13e
+EBUILD libsoup-2.70.0.ebuild 3028 BLAKE2B b71ddbb144d811a76a755b8b30d1d67063440d02012b09eabcd7fa67e29241aadcf69af274cc3a853ca2e67790087c6273c3938aca0145b71b6ad06121fd0bca SHA512 6c1e4075b5f75ad9f7ade2c8abd4485f910fd2f3aef4cf53237b6c9dca14ba221b5c9757c121f662b2db16f9a493f38f33370ad3900bafa9812f0f84ac602cbc
 MISC metadata.xml 467 BLAKE2B d794fe938763955e050add0d57db197ff4445a7b9d6467cdf0f47ab46ca26e1b9cf4fcebbe0e90df798ab08c8a4d7cdc5b547b347e6caa2f5c83f9be698d0396 SHA512 287cf2cc758d653374e5b58aeab4a96fa45ee0846e902cbc5c7f051e31a6b9300aa4e27814b4a2eb27d6386a2bf0a57cf7032dcac081749141bac1f98851487c
diff --git a/net-libs/libsoup/libsoup-2.70.0.ebuild b/net-libs/libsoup/libsoup-2.70.0.ebuild
index 23a4e7177708..4edf27d7e113 100644
--- a/net-libs/libsoup/libsoup-2.70.0.ebuild
+++ b/net-libs/libsoup/libsoup-2.70.0.ebuild
@@ -17,7 +17,7 @@ IUSE="brotli gssapi gtk-doc +introspection samba ssl test +vala"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index 79effc1051e7..58923b9a4e74 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -4,9 +4,14 @@ AUX libsrtp-1.6.0-openssl-aem_icm-key.patch 3870 BLAKE2B 47dd3f9def13b48cc19657b
 AUX libsrtp-1.6.0-openssl-hmac.patch 7673 BLAKE2B 92d4aa2699b324b81540f2e2fb360e1a4864b2626062c96265dade3581ad3af7119e0f6ebd8b1bdcd3591bcde29bffa2b516ed9ee0bdd4c578a5274805c1a7cd SHA512 c187d0249243e26d6cdae4a24b593651fb006b473d0a72b6c4c9b6ad2025893a37e33b163adbee728aa702223397b98fbc38ac2856b737dd03fd067b4dc4baf0
 AUX libsrtp-2.2.0-gcc-10.patch 724 BLAKE2B 559079dd02413b25fa03b90bdbf709d2b16ccc5b0f0db97fb2558ab21773648d3e0fbded74b8bee2fe6d94c68da746f156b9d7b3b3b682d809715929f4e597a5 SHA512 3a1c51620af703e9dd061101e29288458452f9d0f2758dd29e9494689357d3adf408cdc7e2f60fe606680970364c0d55cc2bb4e7618b86b76384f6ab208352ed
 AUX libsrtp-2.2.0-pcap-automagic-r0.patch 729 BLAKE2B 8933586830cab4c911ff5271cdddb6a959dc59d0fcaa340faf5d04ad9b6803d676d626ce6cecdee1e097defc3c69df7e1216f012276e81c22fb043e6b0e633c4 SHA512 b3c80f5d05748eeb5d93f1c5fe2cc73b3380529a8de44315291fe2a9fbf32df861dec511038f551df65c2cb2592ce337d497c06c8855ce8dd1def9a67bae40ad
+AUX libsrtp-2.3.0-gcc-10.patch 752 BLAKE2B 6d401cbbc0c57487183390293b54c572dc3d263b94c6edd66be5986d46746390160f8d3c95346b311bf00439eb826d7734568be462ac8c7eafcc5f3a8556b24b SHA512 4bce9f8b95fce4b89f8e9a2c10cead73e363dc966ec0574516b56cb3124edf49a8d00806f5d5de6cc8610140c21183350b4dec7b1225bcaa6e5592250293cd40
+AUX libsrtp-2.3.0-nss.patch 431 BLAKE2B f56fcf59fd43618b76fca02873b57a9bd073cc67cafe9797b58702379f01e825ba4f3391f62cab9e4a1173b66c55bdea82bfb5e108bd8f68af1b0a29fe6fdafb SHA512 0e54f320a8fc4c27ad5ac40bad07c45a3f75b01ba375aa07a1c35804ba73c1f3cd4b830b6626bff128e59d6f69433bc80028eac55cc4038db25874fde882c53d
+AUX libsrtp-2.3.0-rtp-header.patch 904 BLAKE2B f2756956a913e6be8c49d0d178f2351cb3ac634523979f47add96814d9514c7b2c4343f9302d4f24f0e75cd543aee9c587552b3cb415ceca32403d51c8550036 SHA512 e2e9dea744f6cc41a4351a443e2712b9471ffb1df0f69c41e99e562d896db3c4b29bd684352334b31a03de61a18154ac9d7fb94ab40192a5058cfa2574b81711
 AUX libsrtp-pcap-automagic-r0.patch 615 BLAKE2B 5e4edeafd8f9e921c211b67064c72aecd10a708d16c8e89ea6be01ff69126ca546528532b05bc23aae80f07bac6dd2dacfc0ce6b977f6f0efae44ab017ab03d9 SHA512 ee55bdf6f9c77ebacd7469db92f42ed09728fe91a81496ff425c07ad8610e9998fec2a8992b4fafd7c684bb06989837b0244172ed96483984d1c2e6ff6c0dc0c
 DIST libsrtp-1.6.0.tar.gz 1648862 BLAKE2B 5526d7659db160df3b6d9f14922bd731d083f04c6dd084ef473c439d720733d0fd8b38bdfe92e30e05a8a94c41df965d04bca52601b2644352428b49b1ed9093 SHA512 5ac712d0d343c3b63ed248503cc7d33c637895a274c4434c91f513be117836f27cd5daba83088b4647bbd9c82d841e216e6346af8d485cb9ddcd35dee21d4887
 DIST libsrtp-2.2.0.tar.gz 308469 BLAKE2B 4ef318bdf5c69b69b5869f478d5f0b9ee82d7d8a52440d10e931722c75b2f3a62b59f7542bb932cc93a21b7af24e6b253d70b4722833c5e1e5afce052e3b00e2 SHA512 3a5214b02199ae8dff45a2ed225ed9b1dcb75a9c6b07669e23bf86f97ad26e3e22b4930acdf3c56b21b605211a89a53a17c61602195b391a5b29a09823ba868c
+DIST libsrtp-2.3.0.tar.gz 633819 BLAKE2B 9ea40e9689fabc29b7a2c637bd4e4a2c44eec79205a6e5c5e5abf1069dfec7ba28d868ba620462205d61fdb28d0ca3b8532c1f59db704edd508e01afb551d255 SHA512 34b1a01cb9a75aed175be09aadd2827224203b9801becc3fbc5214667cce79c3b87b0f59e4315583863ab5a2cc4fc81d56ab604a5e4c984518b8a8a2a7b77461
 EBUILD libsrtp-1.6.0-r1.ebuild 2400 BLAKE2B 184f09d2d76d04e071f39e586f561f9513b95697a64433fc00ba66712e35355452f2ae8ef92ade71769fe8c40251cdd8144ba0fdb4e4148ac09c885aeeda660d SHA512 2e1ec0bb8d1cadb2f7709a9a6a63980f51585418f8cba4fabc044c98e849fa6352a754c1a5c4d2d4e811c3fa1c3526fd6f1c3b88db26fdafb1214f12a87b7c9d
 EBUILD libsrtp-2.2.0.ebuild 1899 BLAKE2B ef1b0dab4409a0da2811094516d413ca1709bde65dfac72b305e5247e9e6c6944de7e56e2c638b6c4f5c94e499652fba31debb580cddbb87028e14dc0cae1644 SHA512 c1cf00d2cfcfaed74251b989801482a606cca5e05d0a323ac055085d49f1dadcdfd3e2cbb3c440a73ff15dfe8c7dfc5f60561867559c9d00a888f9ca2ead86c7
-MISC metadata.xml 785 BLAKE2B 4dca0339742c5c52eede087bc89e86b8f1da07dd895e1c3361f11456d2408361ead847997ea9d344e369949cf0d29ff88a22fa65917b7c74143b642f8d28d716 SHA512 3c23a7d6242dc7d42e34681850ad861bb67a5c44c5113ef5a82201127900e66bfbe03d065f60410d5652ed2abada24b1ac373a6c061392b48afb97080caa718d
+EBUILD libsrtp-2.3.0-r1.ebuild 2012 BLAKE2B e48af05709bf26b8d1cf20cd2fdeb31634bf03f81a9f25cf9346422e5882535ab75df5c2e3a1688fd29541fbb562e626a5ee8a269bbdcb50a03f3f0d75f3bd11 SHA512 6acbc170ce15f60dd7fb524933baaf76f0653206f351db2920a304167c2ee14aed6e3f06c604c6861b7c102a27f5883eb84cdc1f03348caf91d36b8c27f04e7f
+MISC metadata.xml 837 BLAKE2B f256f76392707dd326a4640809e9333d5ac89d2d7da768b3d630d6c78ed3f873ff8d9060463c07561d9da810088b7f6cc766038192ec995486de08c421e1dded SHA512 ba6fd1852b9b226f2a418670df78c75e0a8bb509b23a0a4cc9b806daa82f4f6f0af4624a13f2788931ec758635549df31a0b2c2d6588388695523a7d511fd055
diff --git a/net-libs/libsrtp/files/libsrtp-2.3.0-gcc-10.patch b/net-libs/libsrtp/files/libsrtp-2.3.0-gcc-10.patch
new file mode 100644
index 000000000000..67d4ad86d516
--- /dev/null
+++ b/net-libs/libsrtp/files/libsrtp-2.3.0-gcc-10.patch
@@ -0,0 +1,26 @@
+diff --git a/crypto/math/datatypes.c b/crypto/math/datatypes.c
+index 001584c..4fcb396 100644
+--- a/crypto/math/datatypes.c
++++ b/crypto/math/datatypes.c
+@@ -79,7 +79,7 @@ int octet_get_weight(uint8_t octet)
+ 
+ /* the value MAX_PRINT_STRING_LEN is defined in datatypes.h */
+ 
+-char bit_string[MAX_PRINT_STRING_LEN];
++static char bit_string[MAX_PRINT_STRING_LEN];
+ 
+ uint8_t srtp_nibble_to_hex_char(uint8_t nibble)
+ {
+diff --git a/test/util.c b/test/util.c
+index 2abc28e..c0f7614 100644
+--- a/test/util.c
++++ b/test/util.c
+@@ -49,7 +49,7 @@
+ #include <stdint.h>
+ 
+ /* include space for null terminator */
+-char bit_string[MAX_PRINT_STRING_LEN + 1];
++static char bit_string[MAX_PRINT_STRING_LEN + 1];
+ 
+ static inline int hex_char_to_nibble(uint8_t c)
+ {
diff --git a/net-libs/libsrtp/files/libsrtp-2.3.0-nss.patch b/net-libs/libsrtp/files/libsrtp-2.3.0-nss.patch
new file mode 100644
index 000000000000..6f71839e69da
--- /dev/null
+++ b/net-libs/libsrtp/files/libsrtp-2.3.0-nss.patch
@@ -0,0 +1,12 @@
+diff --git a/crypto/cipher/aes_gcm_nss.c b/crypto/cipher/aes_gcm_nss.c
+index 54547cd..ecbba64 100644
+--- a/crypto/cipher/aes_gcm_nss.c
++++ b/crypto/cipher/aes_gcm_nss.c
+@@ -284,6 +284,7 @@ static srtp_err_status_t srtp_aes_gcm_nss_do_crypto(void *cv,
+ 
+     c->params.pIv = c->iv;
+     c->params.ulIvLen = GCM_IV_LEN;
++    c->params.ulIvBits = 8 * GCM_IV_LEN;
+     c->params.pAAD = c->aad;
+     c->params.ulAADLen = c->aad_size;
+ 
diff --git a/net-libs/libsrtp/files/libsrtp-2.3.0-rtp-header.patch b/net-libs/libsrtp/files/libsrtp-2.3.0-rtp-header.patch
new file mode 100644
index 000000000000..096b19e8f344
--- /dev/null
+++ b/net-libs/libsrtp/files/libsrtp-2.3.0-rtp-header.patch
@@ -0,0 +1,24 @@
+From 55299517f39e2e1a34df05c27cbc9898071ac9db Mon Sep 17 00:00:00 2001
+From: Lennart Grahl <lennart.grahl@gmail.com>
+Date: Mon, 18 May 2020 18:01:08 +0200
+Subject: [PATCH] Fix two-byte RTP header extension encryption
+
+Also ignores the application bits as required by RFC 8285, sec 4.3
+Fixes #490
+---
+ srtp/srtp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/srtp/srtp.c b/srtp/srtp.c
+index b45cee0f..176b01f0 100644
+--- a/srtp/srtp.c
++++ b/srtp/srtp.c
+@@ -1423,7 +1423,7 @@ static srtp_err_status_t srtp_process_header_encryption(
+                 xtn_hdr_data++;
+             }
+         }
+-    } else if ((ntohs(xtn_hdr->profile_specific) & 0x1fff) == 0x100) {
++    } else if ((ntohs(xtn_hdr->profile_specific) & 0xfff0) == 0x1000) {
+         /* RFC 5285, section 4.3. Two-Byte Header */
+         while (xtn_hdr_data + 1 < xtn_hdr_end) {
+             uint8_t xid = *xtn_hdr_data;
diff --git a/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild b/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..552f914255bf
--- /dev/null
+++ b/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
+HOMEPAGE="https://github.com/cisco/libsrtp"
+SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="2/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug doc libressl nss openssl static-libs test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="?? ( nss openssl )"
+
+RDEPEND="
+	openssl? (
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+	nss? ( >=dev-libs/nss-3.52[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+"
+
+DOCS=( CHANGES )
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc-10.patch"
+	"${FILESDIR}/${P}-nss.patch"
+	"${FILESDIR}/${P}-rtp-header.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	if use doc; then
+		echo "${PV}" > "${S}/VERSION"
+	fi
+
+	# sadly, tests are too broken to even consider using work-arounds
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# stdout: default error output for messages in debug
+	# pcap: seems to be test-only
+	# openssl-kdf: OpenSSL 1.1.0+
+	econf \
+		--enable-log-stdout \
+		--disable-pcap \
+		--disable-openssl-kdf \
+		$(use_enable debug debug-logging) \
+		$(use_enable openssl) \
+		$(use_enable nss)
+}
+
+multilib_src_compile() {
+	use static-libs && emake ${PN}2.a
+	emake shared_library
+	use test && emake test
+	if multilib_is_native_abi && use doc; then
+		emake libsrtp2doc
+	fi
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}" emake -j1 runtest
+
+	# Makefile.in has '$(testapp): libsrtp2.a'
+	if ! use static-libs; then
+		rm libsrtp2.a || die
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		dodoc -r doc/html
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
diff --git a/net-libs/libsrtp/metadata.xml b/net-libs/libsrtp/metadata.xml
index 452aeee73ceb..1ee9c5bae6cd 100644
--- a/net-libs/libsrtp/metadata.xml
+++ b/net-libs/libsrtp/metadata.xml
@@ -14,6 +14,7 @@
 		<flag name="console">
 			Use /dev/console instead of stdout for error messages
 		</flag>
+		<flag name="nss">Use NSS crypto primitives</flag>
 		<flag name="openssl">Use OpenSSL crypto primitives</flag>
 		<flag name="syslog">Use syslog for error messages</flag>
 	</use>
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index a5c08cf4697d..4a4d51efa594 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,6 +1,6 @@
 AUX libssh2-1.8.0-mansyntax_sh.patch 770 BLAKE2B 743bb8032baab056fb578429bf540c8f41d2cdf07c1285a7abe25e804b2ada3c8d7f0c126f8b6973461279e891d2e3e942e2cea7d1cb352f17541f22757c11f0 SHA512 9da051dd5dda823ae8797b0dadb9a3734590e196898b0985f389492f1225c720dac0ce374ba6d9cc8956820128fc2d7457350248b486f0da4d12cc3bb93e275a
 AUX libssh2-1.9.0-libdir.patch 573 BLAKE2B 5464910fdb5a9461ad4ad6e94c0c682bb1106d437a47a035cb107c9dbec6d2d9e89f791b4f7309fdba307b898f229dff8bba5b5af5b8c6af2ca6ddc21d949695 SHA512 5b389312a4b0bdb6d724f54ce9659612b11f86add4b185b10ee4277b641b26c63256264e11225ea5f28775f0ac9367b391fe77470f34851aeca2e3b5e3408446
 DIST libssh2-1.9.0_p20190913.tar.gz 467616 BLAKE2B 2df7569aa118cf339340f32a106a547265a777af5834e0e22d18ac71946747e708c48d3125489b277b5c266d66cb35e7e224425bfc6a9b2e37e5d267fd7792b2 SHA512 0e095770b059b28aebd47a1219873bfe3b6e5775bbee5d526a7b6a287090e474ceac91c03b1b8a619a2a77916a110d8d20db22edc3cbfd1772190fb394a53f8a
-EBUILD libssh2-1.9.0_p20190913.ebuild 1519 BLAKE2B af546f62e5c45362aedc8e719e401609d9b8a07d594c0786309ebf877caecd3a21f6dbc86dde773cb768839877a3a52bb43bb23838bccbebf0fb3e22184d9bb4 SHA512 1d2a280d3fbfb91c32fbd5a427f98c29851ab62a9eb29bff32cd2995d497734d9d05b60f4607ba82dfb6f24180ee8eb2a71fe3cdd9197a271dd7edfa3f1a313b
-EBUILD libssh2-9999.ebuild 1237 BLAKE2B 0a4ace453cacc7e735fc5df42d1bbadfb3a231954a94e992b8c7141037cd07b73a3f262f3ad9dcad9e98d51fe024a41220e0d34593f96e563c26f632e0f172f7 SHA512 f8f597a5adee5b882d3e6d22ce1dd739d5f1a57da4466bfedeebe1d7bfecddac296f687cf4982ece60f5e3e0b52eb4ae8fda30a2e6e4d091f479fbb0872116e2
+EBUILD libssh2-1.9.0_p20190913.ebuild 1532 BLAKE2B 2ac72fed78fd2d1510ca14872a7063b5ade8dfb575e08c81ad467b0ed30219c34d08cb56a510cb93729edf6e08d06bbb16fd5f2b1ce99316a1c239a8e21b1999 SHA512 e24826c6a106467e144e60786b70a43246bc8d1fb90f1dd49ce74bb5079b55344b490f0346073182f3657ec1f6e2a4ba6240736f7e82d1168d27321ae34db557
+EBUILD libssh2-9999.ebuild 1250 BLAKE2B a76d19e2dfba73b98e161d959b686be14b985b6b9833a88c6eb9700590126b290db4c12ade2eea580051e5811108c72b1ce24329dee4aa6dc0fc51f228165f8c SHA512 c40f416a3913e5f452ef2cf6392989cd7a5b87bfe7d35f36cb8e9750cec67056d22b8a41b16920be182827ec4b64a137dbfc097cbd76f83db8eab062de6edcd4
 MISC metadata.xml 634 BLAKE2B 09afb03a2a77e95f5717d21936668a650f01d0dc44173a57cf6d702d5a51076ae41b1a71974dfbaf66baf3b746af2dbb07e02556aeed793edfff93d0b38e14ba SHA512 4596f1e9a12c3d35d2a0b69e349b12a9bba72e57ea505e10fb814a3d310a7e63f75d1e5628946cd2045260c7466bc654a6770aea5743afa52c742913f7c62960
diff --git a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
index f75ac77f2f15..9850017d5700 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 EGIT_COMMIT=336bd86d2ca4030b808d76e56a0387914982e289
@@ -50,7 +51,7 @@ multilib_src_configure() {
 		-DCRYPTO_BACKEND=${crypto_backend}
 		-DENABLE_ZLIB_COMPRESSION=$(usex zlib)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_install_all() {
diff --git a/net-libs/libssh2/libssh2-9999.ebuild b/net-libs/libssh2/libssh2-9999.ebuild
index 5bf05457d9ad..ecb95eb5807f 100644
--- a/net-libs/libssh2/libssh2-9999.ebuild
+++ b/net-libs/libssh2/libssh2-9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+CMAKE_ECLASS=cmake
 inherit git-r3 cmake-multilib
 
 DESCRIPTION="Library implementing the SSH2 protocol"
@@ -47,7 +48,7 @@ multilib_src_configure() {
 		-DCRYPTO_BACKEND=${crypto_backend}
 		-DENABLE_ZLIB_COMPRESSION=$(usex zlib)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_install_all() {
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index d14293bec1ca..860b99ea95c1 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -1,13 +1,7 @@
-DIST libtorrent-rasterbar-1.1.13.tar.gz 3896007 BLAKE2B b94f843437be348b10082f19d0b416f909daf15078b1461ab6724ee086d3194f6c378c305174676a3399fc3e6cb23133faaa334ac5dfc9457fb597c65dad7d36 SHA512 021fc54353fdf5063d55ccdc2057dada292bb0008fb92e93e8d94dd89f529630f290fcdc4f4d095e3192522c57fe0f0da260b5ef8e8e15a8c6ac05728f5f7160
 DIST libtorrent-rasterbar-1.1.14.tar.gz 4040571 BLAKE2B 38ea1a71e46bf18c9beeb869280e4949b199ab58c32f41e63f1c15c7c32db0d256b741ea707350e9e153695b9cc28e0a95385944bf76dbd5eb2055e66bb0f919 SHA512 b640ada016f8e68a3fb0e033dd33ab79b345b0f691aa722c4256b8cd8524c6e55067ccd1f11584984bbb82c0f64151f0b5223bd2b8431b899ffca46d2d31fff5
-DIST libtorrent-rasterbar-1.2.3.tar.gz 3591081 BLAKE2B 9766a21c948997b35c6d209940a2d2cfd76b130f1a9d1f611e07d3eeb27f634a3c5eca12c92261139200084b9678913d85f6a56f98ab6894e5def761615c39ad SHA512 11a81c9f4b968ed360740553f8d856a2fad4eb2f6962f6403394e0a4a6b198ef6f04ce92d11fc6bed9aa979c84efd03fb396027dfe6603f394104b4302e04d82
-DIST libtorrent-rasterbar-1.2.4.tar.gz 3598403 BLAKE2B 7a9a6b3244137fff785d0bd82dc0b1900b9e8c673f1cf9492bbde2c8f14d0a9d4ac3e4835eb9721bb9fa388d1a5d0635f2ffeb0f2a6f5a61f4fda7f89d6a10e3 SHA512 d24901acc0f462b6ff873f9aea880bf44698165db5343e8437b1dd7d7f20dfa6e7fe1e72a44a518fff5f2167a48552ec359696bb682c82e86012737177e082d3
-DIST libtorrent-rasterbar-1.2.5.tar.gz 3603956 BLAKE2B b537ce709fb7941551d50cca8a29543f9735bad25cf33ecf99fc21e54a4ae4e24207e13800888111aec813dfea6811c702c2a1247e415eee8532d967ab8dfdb1 SHA512 2139f09fa20ce8e04a3e3340408abd744e58e1bd698d8509c2d0f166147a3894b36aa3e7e65574750d986259002d4dbd2b7e5052125d41d300116a810bbfaff8
 DIST libtorrent-rasterbar-1.2.6.tar.gz 3611015 BLAKE2B 39323c223927272a4eb9bb93ad70acd62165b9b3eb3f4f45cb76f99a23b1e131b526c8d8370fbd7cc30c7e776a5f9b7990c989ceaa3566272adc25df639fc5ba SHA512 9f03e28449b08e18a98a1f1bf0571f470c56fabd2becde5bde56ad566611c8519b0b387939f285a552d1f0382446633b67d00b6b5ff7083e4d1420a3ce9232fc
-EBUILD libtorrent-rasterbar-1.1.13-r1.ebuild 2342 BLAKE2B 4118bbd1671e24dda1058a36a636c4d39e6984f28afbe3cf73213dcf5d75ab81db88f9f5afe46a0cd91bc061efdd20522be777bff4dad3a837b4dec119008cd7 SHA512 c45067ef4bbc8028f489c7a215cebcc06d5725719aa3973e469a4112f763a972c8dd5c63a836a2d8e8708a44a5539d65fcfe776ab0afdecabb354b311ab7ea2e
-EBUILD libtorrent-rasterbar-1.1.14.ebuild 2344 BLAKE2B d3472024ebb0899e3c2ad0324c0979132d3c7fe22faf8d1b06e42dfd5e4124a3dee9ff9933150d6a4889f5e721a40c92058eea0e7235a8d5022c47c9a5f19fbc SHA512 c35da92eaaad529fb54b322264d46062da827ede04c946165c3d7781a2965e0fa7f7f9403455bf6a823aa46b2887e8f1206370e33bbf5f55cbfdcfe961cbc571
-EBUILD libtorrent-rasterbar-1.2.3.ebuild 2525 BLAKE2B 79459d0f7d63dc1f2e1d0346b20d977bfd268407a8f2b13eec97acc7f213a69cba8daa8a2cc93d1bdcd3cc1f6138b5e4cbf528a6e5cc2b888a3f78fd31e67c6d SHA512 8c852b637e791bb5e2ead035267e0f42ef006cc0381c924eb1ae3393e43b296d9734be071a8fbaf7209deb0a0168d233406e5801545f82ef91ea30e382777950
-EBUILD libtorrent-rasterbar-1.2.4.ebuild 2495 BLAKE2B 6a7eb156674f799069ba333c33c634596cf92941fedf74671a86bbee66979b0c651d290672c8c8ef12983db9dfabdd6f7170c374fa99420dbb11fa6c0b9a50ed SHA512 459d78616a5d265aa572cc856df10f2004a8fdc6d2b097aed863b2c694cf4cfb95a1ea8648bbf977a73fc97d3c0daff1fca4a74eb76ede6edd8d7fb55566e5aa
-EBUILD libtorrent-rasterbar-1.2.5.ebuild 2529 BLAKE2B d7e9956570a1d916a7d69ce1989efd24879cef06ff0d9f4454fa2bdd82ac966643caf1357c652c2b5eaa00d6e9742caa154a06ad957416595b5c78483abed767 SHA512 7f77b3512366ca5396dedc4ccc917943729a470b752eb8ea2aa917b68c9fc639128285d954a3f25eb822984a601c629097da550eba83f45c11833967a77f2f83
-EBUILD libtorrent-rasterbar-1.2.6.ebuild 2529 BLAKE2B d7e9956570a1d916a7d69ce1989efd24879cef06ff0d9f4454fa2bdd82ac966643caf1357c652c2b5eaa00d6e9742caa154a06ad957416595b5c78483abed767 SHA512 7f77b3512366ca5396dedc4ccc917943729a470b752eb8ea2aa917b68c9fc639128285d954a3f25eb822984a601c629097da550eba83f45c11833967a77f2f83
+DIST libtorrent-rasterbar-1.2.7.tar.gz 4105179 BLAKE2B 126bb0b287c0573f755e918b3cf32a0a98c14b3b41f676d7842ea58deecc141b046b4bc18579cb9c20b324fb1361794ee6afedeff64d0b76f1bb6a95b82e10f7 SHA512 60dfb31b1300b3aa2219227b3a263ba73aedb54a90aa940c117027651779cb972d6e1badf9519f6ad7947233b54df608b829bab34493ceda9e4cb8913041a752
+EBUILD libtorrent-rasterbar-1.1.14.ebuild 2331 BLAKE2B a127a6db0a7266fc6f8ac0797693166aaf0104f2fa22b964d3630e1f09a0a2713e2e6b0bb089e8589033113432fdb0ec17e526e973bc224ee3c81b59984d88fe SHA512 dad2f1bfc68595be30c72a67eddc439e07bc394567144e6d81da407f5b3c115f0885815dcf5e4081264aa97a1161fb5c762285b3eee1e54ba8809adfc58ce6ac
+EBUILD libtorrent-rasterbar-1.2.6.ebuild 2516 BLAKE2B 62917b73acec8bdb2b7112402dece5f50ebb888d4bddb581e124eb03b2da7e72f245e27cdfb542fba80e8a48ef9a99f02cee7fff0741733fa1914af5c760cf79 SHA512 9e762812c7f09fc129e3309c9883c24e8ea425daf938e8a0b3a88fddbd729980330b515a372eb016e0d711b67c862fefa315402f024836b4529a3deb9a033c2c
+EBUILD libtorrent-rasterbar-1.2.7.ebuild 2454 BLAKE2B fc6c9d855dc9fa56ee0fec1ca77d0e31cf19e749004617046d67835d537107621342a8d854a6d58ef86d33269d823ec7236b8d178feaae937e1fe04ab489a501 SHA512 780ff64b582acdb7d39698d08fd22f3a80739afd917698571a441b7599b6f24a21075315233dbbbaa588a0da577f8bd3700a3edd072a1e7bf59fd52e29a95064
 MISC metadata.xml 524 BLAKE2B cb56b15139e8d52871acb1f2979178e182c385658d3fb59025e3f19e1844deb4c0442c12ad490c645d456ec09dd68c268fd6863a205f30a0c241a3d02f10a45b SHA512 47c117d10a88cd13375fa10bfaaa827012d0451713bfff80c587295f68f1243051c477611d9b830a7b525ff2bd77d38c2a45f172ecbe18ba66827e3e6ca664f3
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13-r1.ebuild
deleted file mode 100644
index 124d02ee3417..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="threads"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit distutils-r1 flag-o-matic
-
-MY_PV=$(ver_rs 1-2 '_')
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org"
-SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/9"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-IUSE="debug +dht doc examples libressl python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	virtual/libiconv
-	examples? ( !net-p2p/mldonkey )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-src_prepare() {
-	default
-
-	# bug 578026
-	# prepend -L${S}/... to ensure bindings link against the lib we just built
-	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
-	# prepend -I${S}/... to ensure bindings use the right headers
-	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	append-cxxflags -std=c++11 # bug 634506
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug disk-stats)
-		$(use_enable debug logging)
-		$(use_enable dht)
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-libiconv
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		python_configure() {
-			econf "${myeconfargs[@]}" \
-				--enable-python-binding \
-				--with-boost-python="boost_${EPYTHON/./}"
-		}
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	python_compile() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_compile
-	}
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${S}"/docs )
-
-	default
-
-	python_install() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_install
-	}
-	use python && distutils-r1_src_install
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.14.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.14.ebuild
index ba92cba4ef5e..917926fb1b40 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.14.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.14.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_
 
 LICENSE="BSD"
 SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -61,13 +61,13 @@ src_configure() {
 	local myeconfargs=(
 		$(use_enable debug)
 		$(use_enable debug disk-stats)
-		$(use_enable debug logging)
 		$(use_enable dht)
 		$(use_enable examples)
 		$(use_enable ssl encryption)
 		$(use_enable static-libs static)
 		$(use_enable test tests)
 		--with-libiconv
+		--enable-logging
 	)
 	econf "${myeconfargs[@]}"
 
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.3.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.3.ebuild
deleted file mode 100644
index 07fe2821efc9..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.3.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit autotools distutils-r1
-
-MY_PV=$(ver_rs 1-2 '_')
-MY_P=${PN/-rasterbar}-${MY_PV}
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
-SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-IUSE="debug +dht doc examples libressl python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	virtual/libiconv
-	examples? ( !net-p2p/mldonkey )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-S="${WORKDIR}/${PN/-rasterbar}-${MY_P}"
-
-src_prepare() {
-	mkdir "${S}"/build-aux/ || die
-	touch "${S}"/build-aux/config.rpath || die
-	eautoreconf
-
-	default
-
-	# bug 578026
-	# prepend -L${S}/... to ensure bindings link against the lib we just built
-	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
-	# prepend -I${S}/... to ensure bindings use the right headers
-	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug export-all)
-		$(use_enable debug logging)
-		$(use_enable dht)
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-boost="${EPREFIX}/usr"
-		--with-libiconv
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		python_configure() {
-			econf "${myeconfargs[@]}" \
-				--enable-python-binding \
-				--with-boost-python="boost_${EPYTHON/./}"
-		}
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	python_compile() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_compile
-	}
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${S}"/docs )
-
-	default
-
-	python_install() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_install
-	}
-	use python && distutils-r1_src_install
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.4.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.4.ebuild
deleted file mode 100644
index 2e6c5ab5e939..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit autotools distutils-r1
-
-MY_PV=$(ver_rs 1-2 '_')
-MY_P=${PN/-rasterbar}-${MY_PV}
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
-SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug +dht doc examples libressl python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	virtual/libiconv
-	examples? ( !net-p2p/mldonkey )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-S="${WORKDIR}/${PN/-rasterbar}-${MY_P}"
-
-src_prepare() {
-	mkdir "${S}"/build-aux/ || die
-	touch "${S}"/build-aux/config.rpath || die
-	eautoreconf
-
-	default
-
-	# bug 578026
-	# prepend -L${S}/... to ensure bindings link against the lib we just built
-	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
-	# prepend -I${S}/... to ensure bindings use the right headers
-	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug export-all)
-		$(use_enable debug logging)
-		$(use_enable dht)
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-libiconv
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		python_configure() {
-			econf "${myeconfargs[@]}" \
-				--enable-python-binding \
-				--with-boost-python="boost_${EPYTHON/./}"
-		}
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	python_compile() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_compile
-	}
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${S}"/docs )
-
-	default
-
-	python_install() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_install
-	}
-	use python && distutils-r1_src_install
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6.ebuild
index 11c321e78751..2fb8281a2df6 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0/10"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -67,7 +67,6 @@ src_configure() {
 	local myeconfargs=(
 		$(use_enable debug)
 		$(use_enable debug export-all)
-		$(use_enable debug logging)
 		$(use_enable dht)
 		$(use_enable examples)
 		$(use_enable ssl encryption)
@@ -75,6 +74,7 @@ src_configure() {
 		$(use_enable test tests)
 		--with-boost="${EPREFIX}/usr"
 		--with-libiconv
+		--enable-logging
 	)
 	econf "${myeconfargs[@]}"
 
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.5.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.7.ebuild
index 11c321e78751..5db9e76e2041 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.5.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 PYTHON_REQ_USE="threads(+)"
 DISTUTILS_OPTIONAL=true
 DISTUTILS_IN_SOURCE_BUILD=true
@@ -11,11 +11,10 @@ DISTUTILS_IN_SOURCE_BUILD=true
 inherit autotools distutils-r1
 
 MY_PV=$(ver_rs 1-2 '_')
-MY_P=${PN/-rasterbar}-${MY_PV}
 
 DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
 HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
-SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent_${MY_PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/10"
@@ -43,10 +42,7 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool
 "
 
-S="${WORKDIR}/${PN/-rasterbar}-${MY_P}"
-
 src_prepare() {
-	mkdir "${S}"/build-aux/ || die
 	touch "${S}"/build-aux/config.rpath || die
 	eautoreconf
 
@@ -75,6 +71,7 @@ src_configure() {
 		$(use_enable test tests)
 		--with-boost="${EPREFIX}/usr"
 		--with-libiconv
+		--enable-logging
 	)
 	econf "${myeconfargs[@]}"
 
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 8a3712f89214..bd573c2f4352 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,5 +1,5 @@
 DIST mbedtls-2.16.6.tar.gz 2603563 BLAKE2B a4011bb2b7e3eca554cded05c4650fc16b48d86ae1ac7fefe29df6b29e38c1e76c880f082be83759b4dddd96f831a1238c2df41671bd9794b028402b3dd63f60 SHA512 a4c2e70c0cc6b1f1571a9f2ec27ede2620eb1937361599cab0e05b807068397d25695d5cd23931fd0f4cc051de6367c2b6c77f3507ed8b33cd492589c51eebac
 DIST mbedtls-2.22.0.tar.gz 3822997 BLAKE2B 0857479e89f9850f611cb8c946c489f715a83edba88673b874cd3e6530a7f72c48671e02435087a48aa9a550d0901a5fd2990f9b3a4d69edceecf1fa01772ab6 SHA512 391b99a59ed4edf9625e71e610ea71c6cefa4ea1210d306eb595d85f7408d5decf5fc995d4a411698f1536651ee1230b305dd354df15dbeef9469aa6a7980e09
-EBUILD mbedtls-2.16.6.ebuild 2456 BLAKE2B 824980b51af9638aeaff09e840d570c0ae353064101e483a7544efdea43c211f4ff05d9656ad01987269cf3826a303196319460bb66c727ebd5055b6bccb0e1c SHA512 41169cfda1cbdb59eedcd9addad2bd6e3aaea65a5ad2f3d2ef1aa155ad7427825b6338cf212fec49821996fd985b96de97220d8cf7d689370fabd48cd5fcd7b7
-EBUILD mbedtls-2.22.0-r1.ebuild 2456 BLAKE2B b45760f975b321105ca5c8d71c9ec08b73a9bcf16acd35b72b48d4200c1dd4bbaef247d4b6702178c8d0f3847d858d804712a969dc5026a5bb9be4b54c67cdda SHA512 be621cdabf58009ea35059af3fe8a6e7600167301707099df92e255b018d8f504ca1915492f542e218982f24f8c2da7dfeed44443b5431f489df905fbaaa71df
+EBUILD mbedtls-2.16.6.ebuild 2466 BLAKE2B a385e37e1c506efbd1894af6a8b08643000a1561640c46fa602f29c50f19ac2fef9ff6351070c63ed8d3bce0b57c2804e947670f5d935abd1376edb6a0006d4e SHA512 0ffc68758eb5aeb0223a284308d531cb74b627290133e6ccbd517f14bc2d47fa189b1100f658c7c3998e91dca6e0265e944d27a5501bbb7410318ed408d9a5be
+EBUILD mbedtls-2.22.0-r1.ebuild 2466 BLAKE2B 90da7d7d549d86b4e1d4c8f2ea81cbe1264e3da6feff6f1c6278ca55c66f3ffe877a98b878873466479df551af1cbe87578572ffea7caa7949ba2951b6d4b582 SHA512 cb69ae5bb9eb99cbaa73f51d31fd253566f5d0bfd1bc55ca5abbc61f13ffb0d834ddbc8c8f8915e34bbaafda381c22e9349f8474c2547a6f2546d3762cf111cd
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/mbedtls-2.16.6.ebuild b/net-libs/mbedtls/mbedtls-2.16.6.ebuild
index 0301e84906b2..d62684916aa0 100644
--- a/net-libs/mbedtls/mbedtls-2.16.6.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.16.6.ebuild
@@ -52,7 +52,7 @@ multilib_src_configure() {
 		-DENABLE_TESTING=$(usex test)
 		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
 		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
 	)
 
 	cmake-utils_src_configure
diff --git a/net-libs/mbedtls/mbedtls-2.22.0-r1.ebuild b/net-libs/mbedtls/mbedtls-2.22.0-r1.ebuild
index f638299b90f4..447630263d2e 100644
--- a/net-libs/mbedtls/mbedtls-2.22.0-r1.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.22.0-r1.ebuild
@@ -52,7 +52,7 @@ multilib_src_configure() {
 		-DENABLE_TESTING=$(usex test)
 		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
 		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
 	)
 
 	cmake-utils_src_configure
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 4f1cf1d7010f..08e163da7d5f 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,4 +1,6 @@
 DIST nghttp2-1.40.0.tar.xz 1637004 BLAKE2B 7735ba06cd0655450a6379ea33cc79e557f73b5b4b2ba746564a53e6c305aa656b62da7c3b00dbb70472dffc471271f73af0bcbfadab99406d217d1989ad052a SHA512 3f9b989c4bd9571b11bb9d59fe2dfd5596ba3962babfc836587d5047e780400a6cf46e43c602caa25ca83c03b84a1629953140d45223099b193df54a719745ce
+DIST nghttp2-1.41.0.tar.xz 1640712 BLAKE2B 8dbd5f80bb9617d792e2eece09f6cae82907ad3a14a90084578b213191015c32ac38de87d9a39246651087b5d0e9c6c624ff806a0690973b5faa8624ee033d8f SHA512 c92e8022ccc876fa311f21bc5bf5af75feff8232efb56a4b2ab198031e974d15b67c16c046188cc76552f75a1b2e7115925d6ce1e42d6f94ae482fe69727466d
 EBUILD nghttp2-1.40.0.ebuild 1969 BLAKE2B 559beb9693a6fb4df96d19a57fae0884776a53673c8721b8502a72f0854133167ce42f136fdf3ad0a6366f3996f17b8b168d9f44f43d4584f6400a4c9d975e27 SHA512 6caec7f67d01715604b67a1ca1bf668490ae28e0c4b8d5d8a4606e8a92b212288e63279b04ee7fe49e44752e63a8f2965a62319f4511df505c9804b0595b501f
+EBUILD nghttp2-1.41.0.ebuild 1969 BLAKE2B 559beb9693a6fb4df96d19a57fae0884776a53673c8721b8502a72f0854133167ce42f136fdf3ad0a6366f3996f17b8b168d9f44f43d4584f6400a4c9d975e27 SHA512 6caec7f67d01715604b67a1ca1bf668490ae28e0c4b8d5d8a4606e8a92b212288e63279b04ee7fe49e44752e63a8f2965a62319f4511df505c9804b0595b501f
 EBUILD nghttp2-9999.ebuild 1978 BLAKE2B 3681270a1343a533630adecc2b1edb7b32cef71368da48df558e5587d3ac85364a5e556409a920b9a0c695667b0e3bac9da1410ad1319e69d832d8a21a3fd13c SHA512 99ca054a9bf82567ce3620831b7eb42e6283545c62f8c333a5c876962fbf6f1a5b7b4acc1d9decf9307d2a6bcc25ddaaeee83b5c3f25e51a256ee3a4a2df3eed
 MISC metadata.xml 492 BLAKE2B 76628f4a35c08fe73292c1c50fc6bc90dd44527ee36fb44ff4630a606fe27d9a950afe412fe1565c9eb85355c6fff13400ecb1da5d8c5de8a4765d40b23686f3 SHA512 0e67d6891d7fef473f906db3456a34b4c61f762bf87af6583ce1d477ff090cb69c749669e5cc1a3ef21ee9de3484ea1a094a5971c539edd32a0ab810a4867dcf
diff --git a/net-libs/nghttp2/nghttp2-1.41.0.ebuild b/net-libs/nghttp2/nghttp2-1.41.0.ebuild
new file mode 100644
index 000000000000..c0d775bb37c8
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.41.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: Add python support.
+
+EAPI=7
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.14" # <C++>.<C> SONAMEs
+IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
+
+RESTRICT="!test? ( test )"
+
+SSL_DEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	cxx? (
+		${SSL_DEPEND}
+		dev-libs/boost:=[${MULTILIB_USEDEP},threads]
+	)
+	hpack-tools? ( >=dev-libs/jansson-2.5 )
+	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
+	utils? (
+		${SSL_DEPEND}
+		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
+		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
+		net-dns/c-ares:=[${MULTILIB_USEDEP}]
+	)
+	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-examples
+		--disable-failmalloc
+		--disable-python-bindings
+		--disable-werror
+		--without-cython
+		$(use_enable cxx asio-lib)
+		$(use_enable debug)
+		$(multilib_native_use_enable hpack-tools)
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(multilib_native_use_enable utils app)
+		$(multilib_native_use_with jemalloc)
+		$(multilib_native_use_with xml libxml2)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${ED}"/usr -name '*.la' -delete || die
+	fi
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 2541dff0552a..c134626f9ed6 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -10,6 +10,7 @@ DIST node-v12.16.3.tar.xz 23682432 BLAKE2B 91b97c0de9c76f33d080f3f12a42a15140be6
 DIST node-v12.17.0.tar.xz 23702040 BLAKE2B 4b35c6f7a3c16a7b737bc5b71f075fe6c66c9c4a5cd3ee240a0c1af9cfd4e10c61520d0489169a74354734083b7f7c68b97eefaa6f40e3320ec5b0126d36169f SHA512 0fc8483c6ae8994ff4f4b2465f1b8b1d3c620c90222fb270fe3d317d967294cc9e6bdcc50277fbe0ab28cb3ce9e73ec122c19adf8a686ecc95de3268b82ca4f7
 DIST node-v14.2.0.tar.xz 32884616 BLAKE2B 7bcb07cb7623c5e08c20267c320cdf23ad110f124c5ad1f2447ef8b76ab8dc44ed50dab7c5651424d9d3a36f7eeecdf3292b07c02cb2e22c3fbe4ed633c4b842 SHA512 47e5ec0b7a207082d43419a7e0a6ea9242ec43b4d7c2217eb66d0b45e2f4d5cb561b3f6fe35fdc41a8be95c182dc122ba262f696ebd12833596d71b372ec85d2
 DIST node-v14.3.0.tar.xz 32985344 BLAKE2B 32ee357e109484422c3b22423ab9a593cd5d4611073c820f90c196dae4df2860573cdd06170879f675b738b01885eb2fe0f25c2328841838bf9367324cc981a7 SHA512 3afcc430bad57150baa8d1c0e5ef0f64691ef6549a052be654a86313fe28f31e7fdfeea4d2b3993798a7141bc6d7b1642747d1bc2636139e2f2fd79441580148
+DIST node-v14.4.0.tar.xz 33005312 BLAKE2B bc1462d897e24a6b842e6f8146971866c73b54ff5383d76cfc5728a73e2c135d28ced068744174b3fb5af4a6ec05ef1f115ea51c2d65517cbe18e1d733460d04 SHA512 f1a7c788a8a149b942ec2b90a4314baaa5355c381029eda45002728ce7209925c016323b0ec1e0dfe2359fddb24f494df125805d0d266b738a333dcddb3f59c3
 DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d13cdaa2b48e83f013885fa3590ba4a28378baf036ed26b7304bf234753d1d4014f72571496f5bb6cd5b221e5f0 SHA512 665d2dba287d78bcd723d7b4d00a6897fb996f4aa69a541e010a3dfeb2614257892117fcce7123966b1ecaddc9269a6667e0e262df693baea1f476c96de55c42
 EBUILD nodejs-10.19.0.ebuild 6357 BLAKE2B b44a9661af496c8ba80b1ee680b2c511b3b6c2f7702d23710ff2876312e1f20016e579a36531083699a9881001e65150565c3b1fe6f5875b667aa9b79e87a665 SHA512 b290ea8a99c36e16fc0dcae001a3466a094c7ab6953c04f04a86ee0cef14b8ba861e86ad44e0a2b882636b16e95de6975afe40bb5d5e090791322bad6c276b8c
 EBUILD nodejs-10.20.1.ebuild 6361 BLAKE2B 347a4d538848e42a071ecab801743002b1a2c979dfbf67be153024541b53ab7ad9814d25bdeb31ee13a659a24470c6a73fefcecd7b1175836506bb25681ff4cf SHA512 6858af544698d7b343bc41b0c6a57956cdff1602d0018b00662d0ceb4b619e821fd14dcef67573b96c680e1584714745e007088dbeda9f5f410937892260186e
@@ -17,8 +18,9 @@ EBUILD nodejs-12.16.1.ebuild 6199 BLAKE2B 401807f39cc6cb178a532cb99f73558c47916f
 EBUILD nodejs-12.16.2.ebuild 6203 BLAKE2B 013443da57ae66e7a58247e7ab3599d72fbfcb1a62f9bf6d06b4412a5bae1372eefd7e8cbc68aed2d97b72734c60ce3a38effb34b6961872c946bfa4c5bba4b6 SHA512 9b56e373305402bd499d09b04f748f555f6e1966bbc5c112ddb0e1a372615c89b58850bc802b86f9e0b06942d6707095f156a05b15ad9c01b55c4c23c1301d53
 EBUILD nodejs-12.16.3.ebuild 6203 BLAKE2B 244b4c61b0f6272b26e5664ddfbd67eb6bb8637af78b1e57b5a077d7ee978499875e7d4a8dacb29d93cfe6e589415c969fe52012b41d5dc718c78a25bc1d913f SHA512 19b19f7c108ae641833c1c8e1351de8ed511bf04b53a5003d5d6225b5aa59933857368ba8415afb88b2278d1daac8f4de9d57f3b755a3a27fa33b04a3f470a9e
 EBUILD nodejs-12.17.0.ebuild 6203 BLAKE2B 79828e49fec7611daefdaf87a5153b97feb88495fdbf666c4c7dd61abc6189d98dd978bdc19f1bfb4049fbb6a4dcea29d4ced7feda206a5f2b58c2b3e568c469 SHA512 3f73c09dc1e215985423e217276478b7ac160d85e2aea53feee017fb03a81358382725972e4c039887c50674521f2c37927ceca3c23412bdc415ebd7c4e25cc0
-EBUILD nodejs-14.2.0.ebuild 5858 BLAKE2B a55c2d19e5aae5b1bccf69df37ed387465bb3adb10bfd7c0660f4a72cd3de20d1d5237c6c5bdc1332a7c983a77b923abbcc90c3c38cec6877910652af196f8d2 SHA512 9a220c64ff886b46f45a726b6c92049cc0eacb8fbc546a305c8d6292b6aed77f9bdbd13be7cb703cf17e5ff6ed095baf90f2249519f32fdd394b0663c2b0c273
+EBUILD nodejs-14.2.0.ebuild 5854 BLAKE2B b738a893013811417c3dfbc5b9a51541193c2152f60b2ea8989e59f51788be98580e3f300dcb752a89196bd1dced51bb577e63cc60ac25194bc00a3c00818524 SHA512 9f4403626435df54d28a0f0f20e10d1f90f601e9330ac6b94a4717bbd851caeb85db260c3b1967ca66778db29098056cf7641de4840976efaa38bf853083f5e8
 EBUILD nodejs-14.3.0.ebuild 5860 BLAKE2B f06c5967350ba2a80010fd7fbdde840cd1357e3c0144bc56120dc8a97db85950d27b1739e13da8cf9352d425a69bf5a583897e777f3506b324248882a0636106 SHA512 f62d937f362a16c3025ccc81c95e1f85d1a85bda1df86b1778faa1bc8da85f69f02f6cd80acd92bd670781690f66ae43c00bfa21f04dd74c3b161839ae367134
+EBUILD nodejs-14.4.0.ebuild 5860 BLAKE2B 668d26dfe8d4c274274851f8b96e8d77dc69205dccdce38b188776ec3f72488f92790f4132a0e3da624b20a52763a67b50bf0b73804339b6a6713e4de23a5dfe SHA512 054656d522edaa005c1cf3efedf29c0cbcbd41ea2ee94aa7000b87b219ececaf4e2d0dc53f728a945b0028fcaac9c38467327f48c23e4d360c2a69a40e7bb7ba
 EBUILD nodejs-8.12.0.ebuild 6352 BLAKE2B 15a9b98d89d83fb5959b3b2582cea6a430e9dad5ac6033d7ea32647122ed8cf6a093f7dd90abb93f8585c7c1506d2c801bd439651a447b366fbe75a43259fa55 SHA512 df0848a3e96a62d6191ff0dbcf7ce55eb8da34913c39960e8eb02eb2b3c6d6f6d2202e884c77612b93048c85e6079cc95469c17e8357690936ea92eba400ba7c
-EBUILD nodejs-99999999.ebuild 5778 BLAKE2B 9b07315384b4d725acb2839907378a4354bce227f3f920147b295f0d49541da3bb92dc20a2d179d97c9f14e7217db1ee16005af17de09cb31a2744b278cc0cb3 SHA512 5d576f85135cf1ec0ca2c4f7723e9e0d349f5df8ae69b4dbb4183924ee6987c9da91764716e7ed287aa9d73e7d41fb0ce4ddd2e03fb6276c6628e50ec443afd3
+EBUILD nodejs-99999999.ebuild 5782 BLAKE2B 91b3e65a9809f00405872d40032d9411b655d00c6e498050efe303e578a723a0e3245d846fd84e4ed9ce91cd677df71d744bbbc956017d869a93e5c19d2113e3 SHA512 051a3e32e82faf388137f4be8be8df4d95fa9f1ec39ebed2ddea41c1f445262bdc6fe4538d9109d8dab60bc793e0e6fe178e79c5571ebc1e366cf240c7111d43
 MISC metadata.xml 628 BLAKE2B 0276a9cc8a0c7a08efb17e5635f561b50dec54e41ee239d96c026bc9609826a8f544faa43eb1b7244cffbdc052ca969b51b0540c08cc8276142dc8305eab2d00 SHA512 619954806c55cb873fd460bcf2f1edb4e4c2064dc60286cfb3292f3a583f5ca8d1d65d9fe0575ef3ed4148d73da817ee589750daf4b5a0147d276240db39ce87
diff --git a/net-libs/nodejs/nodejs-14.2.0.ebuild b/net-libs/nodejs/nodejs-14.2.0.ebuild
index c671beff662a..a46c7ef71090 100644
--- a/net-libs/nodejs/nodejs-14.2.0.ebuild
+++ b/net-libs/nodejs/nodejs-14.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
 REQUIRED_USE="
 	inspector? ( icu ssl )
diff --git a/net-libs/nodejs/nodejs-14.4.0.ebuild b/net-libs/nodejs/nodejs-14.4.0.ebuild
new file mode 100644
index 000000000000..a96306904aee
--- /dev/null
+++ b/net-libs/nodejs/nodejs-14.4.0.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+inherit bash-completion-r1 eutils 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"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+	system-ssl? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.37.0:=
+	>=net-dns/c-ares-1.16.0
+	>=net-libs/nghttp2-1.41.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-65:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+	pax_kernel? ( sys-apps/elfix )
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+)
+RESTRICT="test"
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+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-cares --shared-libuv --shared-nghttp2 --shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	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
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# 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/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 4f9bf8953720..e7b61f1ab582 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -13,7 +13,7 @@ EGIT_REPO_URI="https://github.com/nodejs/node"
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	inspector? ( icu ssl )
@@ -51,7 +51,7 @@ pkg_pretend() {
 }
 
 src_prepare() {
-	tc-export CC CXX PKG_CONFIG
+	tc-export AR CC CXX PKG_CONFIG
 	export V=1
 	export BUILDTYPE=Release
 
diff --git a/net-libs/onion/Manifest b/net-libs/onion/Manifest
index 26178f14202d..1e1fa62a0f1d 100644
--- a/net-libs/onion/Manifest
+++ b/net-libs/onion/Manifest
@@ -1,5 +1,5 @@
 AUX protos.patch 1239 BLAKE2B e20e0efee1cbbb04caee2d1754164e54545d17ff79a36100b5abc5de2f6174dc49daf776fff137dadb9a298977083a2dccb09286c7f1acaf5c8e8a784fba8712 SHA512 0dd7f95dab267b1df6279fc60869696d506b62756a863c86ade9725dc17e48bc4b71b984d53bce94e88448ab295673fbe27e7687e2807d32841d0ad5ddf6b018
 DIST onion-0.8.tar.gz 344347 BLAKE2B c43bbbf31d29ccc99d2969c7c8dc9aec8d5e514cc785091e3e0e6d1fc1d5db5f8561d5c2c745b4150a493b607c6c271d669e7ca541f72bf4d8872beeba00b220 SHA512 c40a36346de7dee6e98d0b5c38b5e133606046e29bacb06a0055a361013077ec0f6adb04dfcbf2f4ce0b72317c9ed918573299aed8760f069dcfd7c211a302d7
-EBUILD onion-0.8.ebuild 1910 BLAKE2B 2d289f327f7de8b66f384c36822525e1116b5476dd6ac1aeff41b68346a387db0b6257faf7ef46cfae3b8e2d232cf5ac1c7cc99a7e357f2b524c1294e7f11bf2 SHA512 79a92b12bea34fde6df357374e136da2fa42ac51ed0a5167aeba6cfea756b75ac71955422352ed7075968c8786f6153ef09234dbc13dfed818555c3557e1e08f
-EBUILD onion-9999.ebuild 1870 BLAKE2B eb59107fb8dc80f1b93438768586b2722549b5d9111354838e2c22c2222e433bb04a949604c85f6351d5048dc878114d23cf09176d593a9ad0e5db40b9c781fb SHA512 6695440cf94a0a7a803fef66a2dac4546451f3ab3cda9d9372a6096a4b1101631d8abd888935a2f033812d7360d9aa6f831d619ba353789a0fe2327b16b60863
+EBUILD onion-0.8.ebuild 1911 BLAKE2B 062feda3a8e7a1e5321fc3efbaa3aa430b9d1f68db13fd0c0fb446aa697bc5a962cf5a9f7c76c77b35130960f2e78573e826180c9c4ce83b9c35f6525e2a4499 SHA512 9dc32cc05e6d2d198a5b7e87bdf3ff112a6c37e8210ae82f28624ad61de12cdce1e35e1d7f137c796062a15cdd4ba52f6d1bb154aec9af60a940e20c1ba8f7f9
+EBUILD onion-9999.ebuild 1871 BLAKE2B 3569e4734d436378ca13313ac64aaa01a724d9a29e0554e2ab23793ca1988ac3fe91c24d4ede9c14656bf02d09f10cb651b6f556d172b9d09a3870f0f6ba1d6a SHA512 60088584125cb5184500f4621f42891ba48c0a4e0b423dcf8379fc7a5034332c5ef4b5e9edf372caa048573d21301dd050b29ff2df9607e20b5ac6311330f2b3
 MISC metadata.xml 719 BLAKE2B 91253f71648b48cd344267e189fed4f77c1fbe2e8f218ea7751502ed419f1ee7d97fd881234a99368aaf888b6b550325c054f5d65e9cb007735e25ffebb24366 SHA512 1afb4311878a3eef4d13d7fa6c670f2b1b23e0e89d9c50694668cb36c0d05f529da37af25469b3e4ffc34d25780be7f710e82e87c1962056aef9e4e924d1e868
diff --git a/net-libs/onion/onion-0.8.ebuild b/net-libs/onion/onion-0.8.ebuild
index cf77737da1a3..5c53165dda44 100644
--- a/net-libs/onion/onion-0.8.ebuild
+++ b/net-libs/onion/onion-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ fi
 inherit ${SCM} cmake-utils
 
 DESCRIPTION="C library to create simple HTTP servers and Web Applications"
-HOMEPAGE="http://www.coralbits.com/libonion/ https://github.com/davidmoreno/onion"
+HOMEPAGE="https://www.coralbits.com/libonion/ https://github.com/davidmoreno/onion"
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	KEYWORDS=""
diff --git a/net-libs/onion/onion-9999.ebuild b/net-libs/onion/onion-9999.ebuild
index 88e7246cecfe..b1275f87292e 100644
--- a/net-libs/onion/onion-9999.ebuild
+++ b/net-libs/onion/onion-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ fi
 inherit ${SCM} cmake-utils
 
 DESCRIPTION="C library to create simple HTTP servers and Web Applications"
-HOMEPAGE="http://www.coralbits.com/libonion/ https://github.com/davidmoreno/onion"
+HOMEPAGE="https://www.coralbits.com/libonion/ https://github.com/davidmoreno/onion"
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	KEYWORDS=""
diff --git a/net-libs/pacparser/Manifest b/net-libs/pacparser/Manifest
index d5f3b5fcfe73..eec2ffb2e914 100644
--- a/net-libs/pacparser/Manifest
+++ b/net-libs/pacparser/Manifest
@@ -1,3 +1,3 @@
 DIST pacparser-1.3.7.tar.gz 905596 BLAKE2B 122127b6e1d8f68fde4c5ca98207bf2a0fa2a081dbb60aaf34126700a3de9d861e7b5f881e78d3eefdd2a9af97a9ba677339ca2b2a0b4459d26e60a62226e839 SHA512 979238204cd352ecf502a5a6216a35d7c47e82a173c32c6f0a5166f1fe790c66ac74ec1d9d0a58b54038d19e893f8b365ed868664f84ab9d5e653584bf20130b
-EBUILD pacparser-1.3.7.ebuild 1585 BLAKE2B 90bc726da44eb9fd7c04bfb36fd0de568b11b50c7396edddeaf7e3c6ccb87eb9f94650cba67be00a9cdbfa8047e0f581c2f696f6193f454ec0a23e6f5527324f SHA512 d124e088d3a287597457d97a929a0e0ae95fabc25d24700da5dd7c681b8d00af0fa2f1e9cf61c5aefcac592c49b22f759d1138467db62a9439f11dd89d27ccdd
+EBUILD pacparser-1.3.7-r1.ebuild 1728 BLAKE2B d1c1c44630135ead39670630770fb257bdd6b983db7f7901cd40e21b846a0c5783c9766c0ea5e2bee88dba6808237599ca680545c48b13154d89e36008a615dc SHA512 b325c72de1cdbc2ec72a33a2bfe9e3f3492b494c46e368eb0cb93424e51af7b566a9dfd1ffaf3cb3f40fe7b68810bd9b768f8e2cdbb57c8a259351cfd8ec857b
 MISC metadata.xml 1156 BLAKE2B 6c4e195b94172823c0dc6bbf426c2d8a31d83a0bb7044efa92b9f07f846fa7a2e0ecd4f49678eb517ddeaca43f18942ca9256bc92909cbd1242ed2cfbdbc39de SHA512 e391221061937896f5f27a4d77f959756afdfd1c58f47f4ac5d27e2f289ca70bd7907c86efc6114ec02d03b6f5a88fd3b8d5755bf97dae6e613d7835f2c71704
diff --git a/net-libs/pacparser/pacparser-1.3.7.ebuild b/net-libs/pacparser/pacparser-1.3.7-r1.ebuild
index f3f2162bb12b..ce0df21ea837 100644
--- a/net-libs/pacparser/pacparser-1.3.7.ebuild
+++ b/net-libs/pacparser/pacparser-1.3.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit eutils python-r1 toolchain-funcs
 
@@ -39,7 +39,9 @@ src_compile() {
 	emake -C src spidermonkey/js/src
 	sed -e '/CC = gcc/d' \
 		-i src/spidermonkey/js/src/config/Linux_All.mk || die
-	emake -j1 -C src
+	# Upstream parallel compilation bug, do that first to work around
+	emake -C src/spidermonkey
+	emake -C src
 	use python && python_foreach_impl emake -C src pymod
 }
 
@@ -50,9 +52,11 @@ src_test() {
 src_install() {
 	emake DESTDIR="${ED}" LIB_PREFIX="${ED}/usr/$(get_libdir)" -C src install
 	dodoc README.md
-	use python && python_foreach_impl \
-		emake DESTDIR="${D}" \
-		LIB_PREFIX="${D}/usr/$(get_libdir)" -C src install-pymod
+	if use python; then
+		python_foreach_impl emake DESTDIR="${D}" \
+			LIB_PREFIX="${D}/usr/$(get_libdir)" -C src install-pymod
+		python_foreach_impl python_optimize
+	fi
 	if use doc; then
 		docompress -x /usr/share/doc/${PF}/{html,examples}
 	else
diff --git a/net-libs/quasselc/Manifest b/net-libs/quasselc/Manifest
deleted file mode 100644
index f6cec5b9c360..000000000000
--- a/net-libs/quasselc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST quasselc-0_p20170111.zip 39051 BLAKE2B 7c0d6353b130e3cfcf21591044347888fd0cd6ffe5f798232286df1b6c0690eacc03b33fbc252c6d956eb08d783a330a544154f4cf34255f89fa5f3495023327 SHA512 bf2aa58953778c340408de45ddacdd47e862a431a4ee7384d595b6635954b3f705c4b51b56811f2f4c6b5b603d237512638613c912d48daed9a3cb55952d314b
-EBUILD quasselc-0_p20170111.ebuild 942 BLAKE2B e77dbc0f590548eaf8783c7cff383f0ed9420a227b76bc20c4bf1b7f490b8597e33ce2e9c37a22c482106f41d47b366d92ae531846a8960001e7cb650b05a976 SHA512 e49c00a358603f8a0e774ae414e7a1c5390bf81b401eb74aeb6f1f531304f6d95b448cc53057960a6b3517a79ab7a4b33dc8256df92f89895f2f7cb14b0771e7
-MISC metadata.xml 400 BLAKE2B 28ec14b9edcd90e1564c8561fcee37b92965140037fb08b8a0f608982275d31ade0735be7bf5291411ce6b199c527354fd63a6eb898e22e3fc394ee8f64a842b SHA512 1e9f3df62d5d4f2d5e6ac57b5b6804c194827a45ef7eb599c59295d1785c6edae3b170ef1eb4accf7e6b34edd4381652cd8a0bc4d5ce3083c28495ea37edbfd5
diff --git a/net-libs/quasselc/metadata.xml b/net-libs/quasselc/metadata.xml
deleted file mode 100644
index 9aa43a392f2f..000000000000
--- a/net-libs/quasselc/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">phhusson/QuasselC</remote-id>
-		<bugs-to>https://github.com/phhusson/QuasselC/issues</bugs-to>
-	</upstream>
-	<longdescription lang="en">API to access a Quassel Core in pure C.</longdescription>
-</pkgmetadata>
diff --git a/net-libs/quasselc/quasselc-0_p20170111.ebuild b/net-libs/quasselc/quasselc-0_p20170111.ebuild
deleted file mode 100644
index 96e2e94dad8a..000000000000
--- a/net-libs/quasselc/quasselc-0_p20170111.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-# Commit Date: Wed Jan 11 18:27:31 2017 +0100
-COMMIT="a0a1e6bd87d3eac68b5369972d1c2035cfe47e94"
-
-DESCRIPTION="API for accessing Quassel using C"
-HOMEPAGE="https://github.com/phhusson/QuasselC"
-SRC_URI="https://github.com/phhusson/QuasselC/archive/${COMMIT}.zip -> ${PF}.zip"
-
-LICENSE="GPL-3 LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/QuasselC-${COMMIT}"
-
-src_prepare() {
-	default
-
-	# Makefile hardcodes much
-	sed -e '/^CFLAGS/d' -i Makefile || die
-	local includes=$($(tc-getPKG_CONFIG) glib-2.0 --cflags)
-	append-cflags "${includes} -fPIC -std=gnu11"
-}
-
-src_compile() {
-	tc-export CC
-	export prefix="${ROOT}usr" libdir="${ROOT}usr/$(get_libdir)"
-	default
-}
-
-src_install() {
-	default
-	dosym "libquasselc.so.0" "/usr/$(get_libdir)/libquasselc.so"
-}
diff --git a/net-libs/qxmpp/Manifest b/net-libs/qxmpp/Manifest
index 1be5dbbe503f..4e50439c6267 100644
--- a/net-libs/qxmpp/Manifest
+++ b/net-libs/qxmpp/Manifest
@@ -1,6 +1,4 @@
-DIST qxmpp-0.9.3.tar.gz 300764 BLAKE2B a98d9bd9ab9c84ce6ac90722cd1f1b1609d345daa0b4e690e44b845408753b006261b293898bf419bea011005558584de24090ac1c8809845ec6f8a5c8bb05b1 SHA512 c6ada4398468b9ce84955ab3a1ca155afe3098dfe39dc952c3675be1a1e3a4f118f8b1e251567bc124faa645d2654252d3e32d94e21aae79547056a10a2d6a71
 DIST qxmpp-1.2.0.tar.gz 310801 BLAKE2B a3d1c708fe33e6ecd226e867fc030c6cddb5009c90db46544a0081e1198f69b609239304f56aec00c7b399e7f74fa9bed82eb38db3439e092719a7a68b440a14 SHA512 9b9541dd2ffc689877969bdd1063e7ab21761e5feb7bf911acba3b0a0d953199b8bc08a1ad8c2031b0e135af7a127cbbc108bb3e8dbf1b7712ab8dc8f4cbd371
-EBUILD qxmpp-0.9.3-r2.ebuild 1839 BLAKE2B 59c6021302117272c43f63ff6f372f4248224c58b50c1376b8ebe4e44242f351462ecb9b8feb3455e47e2b230f8692063b3608270c0723c45146b38f1098d280 SHA512 1c2aa58ce0dc71faf748032fa82bfdfed962a8d8bcad1fa36db786d4e82b0b191779ff1c84ea1a3509198afb5f5ab3df1c6d20bdfa3c4b3b1d1e1172e3f8eede
-EBUILD qxmpp-1.2.0.ebuild 1305 BLAKE2B 46506d14b2e5a1f1fd297272fd56163f70e5a2fe3bb8e637a82dda32247ca5aa0157c40ac95a5ee8dbb5c90510b7a8f0e2c9127a4a8c0ecb498994ed09a20e14 SHA512 bf3df082bfbfb9add07cbc8e6e7e53cea9f66e5f57cf8b21e8bc7327477a8162421f09e3eedc0277a38e4472662d497ad9076f8dcd4153c76a2b00f2a7fe776b
+EBUILD qxmpp-1.2.0.ebuild 1304 BLAKE2B b09eb5906fd02de48d40125dd6dfd33f4b7ca2f3b8e08fa9f9612051bc56e779a226a2b2b61dba3199a719cc81397886891c8df0fa6c77fc5c3c8396b8795d70 SHA512 ffe1fd8357e4fade7a76fda1131db43cc86a43c51378c9dd82b56906bed9e3dd3444d8458efea489efb373fe2d54a584a247983b0753d0ae7c7fba9145e53ac4
 EBUILD qxmpp-9999.ebuild 1271 BLAKE2B a5446fa77dc46c67ba1d0dce9dcaf06cc839b9b34bf4ad8824fee44c65141eccad0f07991055102e1b21c0fd4d62166633fde5d0d3a90744044e0b1daee7aa29 SHA512 cc44511dcc23f008226b1088a504b06e00e77684c013dd8a5a2217dfcabe9d54f30e14b34355fd6d1833fb1320d20eca0b814e12d0d25165304ad3779b54ed76
 MISC metadata.xml 710 BLAKE2B c162e3ff5798eaac98ead84af9bd40273b056e88b7061a00c9e52010d3f250998e3aad86aee59f2cb92bd3b4108ef365b1bd238750886292c882efe96f94643f SHA512 fd8ffbbd483fc453197c278622d316d59b1ee947b0ad4cbb9fa25760a84644b56f3582933363f2b55d7806521bc98bb0ccf6021d346fc98dc84887652f1f1426
diff --git a/net-libs/qxmpp/qxmpp-0.9.3-r2.ebuild b/net-libs/qxmpp/qxmpp-0.9.3-r2.ebuild
deleted file mode 100644
index 9a67cc314b2c..000000000000
--- a/net-libs/qxmpp/qxmpp-0.9.3-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework"
-HOMEPAGE="https://github.com/qxmpp-project/qxmpp/"
-SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="debug doc opus +speex test theora vpx"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtxml:5
-	opus? ( media-libs/opus )
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora )
-	vpx? ( media-libs/libvpx:= )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-
-src_prepare() {
-	default
-
-	if ! use doc; then
-		sed -e '/SUBDIRS/s/doc//' \
-			-e '/INSTALLS/d' \
-			-i qxmpp.pro || die "failed to remove docs"
-	fi
-	if ! use test; then
-		sed -e '/SUBDIRS/s/tests//' \
-			-i qxmpp.pro || die "failed to remove tests"
-	else
-		# requires network connection, bug #623708
-		sed -e "/qxmppiceconnection/d" \
-			-i tests/tests.pro || die "failed to drop single test"
-	fi
-	# There is no point in building examples. Also, they require dev-qt/qtgui
-	sed -e '/SUBDIRS/s/examples//' \
-		-i qxmpp.pro || die "sed for removing examples failed"
-}
-
-src_configure() {
-	eqmake5 "${S}"/qxmpp.pro \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="$(get_libdir)" \
-		QXMPP_USE_OPUS=$(usex opus 1 '') \
-		QXMPP_USE_SPEEX=$(usex speex 1 '') \
-		QXMPP_USE_THEORA=$(usex theora 1 '') \
-		QXMPP_USE_VPX=$(usex vpx 1 '')
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-	if use doc; then
-		# Use proper path for documentation
-		mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die "doc mv failed"
-	fi
-}
-
-src_test() {
-	MAKEOPTS="-j1" # random tests fail otherwise
-	default_src_test
-}
diff --git a/net-libs/qxmpp/qxmpp-1.2.0.ebuild b/net-libs/qxmpp/qxmpp-1.2.0.ebuild
index 05ba6ca7a0b0..ee138b7ec58f 100644
--- a/net-libs/qxmpp/qxmpp-1.2.0.ebuild
+++ b/net-libs/qxmpp/qxmpp-1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug doc opus +speex test theora vpx"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index 6711c01488e3..0331f3515776 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -1,5 +1,5 @@
 DIST rpcsvc-proto-1.4.1.tar.gz 61724 BLAKE2B 4fd04b36d30561edf3bbc9f565b07a8f1450ca28d7489b63d241f0b7eb2b98640d2dc2d798b1469460f682c0774fc99a995239d7e0fe2f244852b2561b37a0fb SHA512 a75546255bc5c553ec12dc0844783907b70499eb65ea6fb9de7c0a0f669e4ef0caa717c0cbe9ba8651dc7acfb0c9c4e0fc644ebf12e0a704819fa47e6c65b8b7
 EBUILD rpcsvc-proto-0.ebuild 478 BLAKE2B c7c8e675ea6a1fab782b3b8da093eada21de0ddda0835aeedf0e3aa39828df23b7f6b797c4178f9eccb676ffb45dc059d48b07e88488d7f4771202154d36c67e SHA512 30964ff01fa3043f9719bebce15d3b64d26dd77fa71375db16bc59ba7308d8db5861d2f8619bdbea425576f714ed428587288774c872a53ee1268f304d0abbd2
-EBUILD rpcsvc-proto-1.4.1-r1.ebuild 946 BLAKE2B 91ece062544c6daaa92b52a52aeee51f0f007695c298043a31cc71eb56accf081a3ceeb9a3eb6672119a5c6d47c98741e279616648085b31c3d5a95a94909002 SHA512 7a207992ebe9c185b6044679e05f1bd9d3ad48c4bc50aa8a7c247886944338bfcfbab3a2291b18b051b1eaccc4023e7eac7ca932689c3ad01398d932b553a821
+EBUILD rpcsvc-proto-1.4.1-r1.ebuild 945 BLAKE2B b37c837ee226bf9208107c89c2b66b6e7209ff2226cd73c41f76a711959f3aee7188c53262c37dfd409c9968ed27d79db92c6d1c2fc480912fcbe7397b3aa59f SHA512 8d4078193d552d75b6666ea25c4ca1c03a71ab28236bf35609fa08a902cbd23e6e40f5b17f6e867bb83077c70b24fe8e0de74af52d28c67b230a9072eadae8a6
 EBUILD rpcsvc-proto-1.4.1.ebuild 739 BLAKE2B 36d56f5bc792dbcd995fe3181f0a1793c115141f9790edda01935a7bc0ff00cba7792485314448b9b4f0a36caec70990655df1898b92bc5275af85c0f66e0d2d SHA512 f8b0768a5b6cb398eb24cdb9c8841af7114bd1f3d4377ccd143b7199a1403d9e6724717579e9103aaccb200d97ac84d0c8c913cc5f9b55deb2eda6bc165b8b0b
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1-r1.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1-r1.ebuild
index 9e60b7f9d8f7..a07ee40040e2 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1-r1.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1+ BSD"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
 
 # sys-devel/gettext is only for libintl detection macros.
diff --git a/net-libs/signond/Manifest b/net-libs/signond/Manifest
index 19b4d90ae350..9729444a1921 100644
--- a/net-libs/signond/Manifest
+++ b/net-libs/signond/Manifest
@@ -1,5 +1,8 @@
 AUX signond-8.60-buildsystem.patch 1306 BLAKE2B 5cf758cd974d54fa39e42291f6d4969f341d37970948d0e1bb6f74367a5a77e5b0be8c7a435af2f7474d9ff8ab6f8352a7ddd83e772b792bb8db97032db2b8ba SHA512 ec69a845da1019c7517ca1163bd09fab2cf1f4e1e8faf27c2baa1ae0da5c5b4689b7fadc4207f744224deff7b99eaada6d41af4c451962bc07c9920d1559ba1f
 AUX signond-8.60-consistent-paths.patch 10565 BLAKE2B 09024a3a877d965ad037f3e77add52589e230b2fdeb133960192b6f26d4272395230621625a78633d084f863fd3aa0c931011f47134587a44e1a27a20ca04e91 SHA512 e3731e360c208c75de3634e507c81be94da29df7592ae90c192a30ef727cdf1c86e939a6d27ddd5b227a7655630dc7320c7181f644721e8b59b37501dc34e2fb
+AUX signond-8.60-crashfix.patch 5228 BLAKE2B 713fe5b5fe6c806fc09bf1710e5a5c8872b7bc80e55d328d6301fa0040bf3750b33891d1e2ce42cab45622b9633fb93e29277889ce27fb54a98fb44bc022124a SHA512 25ef43ed61f8d422882e944600e2571108927920493558904c039a06af7091ec8fdcdcf030cb4e59ebf53d934aa67265d073084b3d280b204f24f74620e764b9
+AUX signond-8.60-unused-dep.patch 254 BLAKE2B 65f6157833a139b72d4fdb07b3877948ce7d7f327e457c0c2391d715475a7110c5e793f02c950b4a7b289ecca2c387ce6133af3d51c7f0d96b3910795abd4ed9 SHA512 21cb1ee319b3219ac46e6b61eec04d93262a3108311e141fee25fb1280fd6673d5ffac0f7b444a9131d5f8a6b255ba8189a75dec83004680d48eae5776404778
 DIST signond-8.60.tar.gz 281359 BLAKE2B 3ecd8048d8c5551c3611e48091c35a9f0fe4c972e6b4730fe1f610b4870fe86911dee04c331847deee2a50f4a04acd5a8a0d1c605d1f4f0a24272d44c289a6d3 SHA512 fb3ccc99c692506ca29d5bae39bc375ff97057734fac1551ea39105d5f8e78f3df23e01a286f73be3a606c54b40f957c3c0d985484926e57f354218e4137ff3c
 EBUILD signond-8.60-r1.ebuild 1622 BLAKE2B ed235128e02a9d93fde9848d2feff85e1ddfe29cc3b5cc97e63cc04630a898a34722750ead88faa5940bd6983fb193911b588a27fdf022ad1fb3fb88211d9570 SHA512 4b5cca985c36a579420153441d4d75e1ef879262b21145385079e9be8244d2442678b4c742d7b2fe9453d2cb97411190bd01ea03fcf6a96887bf09bc3bc575e0
+EBUILD signond-8.60-r2.ebuild 2166 BLAKE2B a01bf96f0641b976263523f5e09052b129554401577c403f1ff0b57d32586d98dc79aef05ec9d369ecb2589c190f317a5f8727face1aaacb2aeae02be8bd5fdc SHA512 f9bb80adb2d4e0790448d7f31afe40f064be2e2d671d97267e0d842471ae354669a9b26f57a9acf93d352473489f1aaf3f8e0e8e847df9dbd2d0d45cd9159a14
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/signond/files/signond-8.60-crashfix.patch b/net-libs/signond/files/signond-8.60-crashfix.patch
new file mode 100644
index 000000000000..8cfc79ac431e
--- /dev/null
+++ b/net-libs/signond/files/signond-8.60-crashfix.patch
@@ -0,0 +1,160 @@
+From ab9fab9763277783363f8c6d4b62405c3b0b0413 Mon Sep 17 00:00:00 2001
+From: Chris Adams <chris.adams@jollamobile.com>
+Date: Wed, 31 Jul 2019 12:45:14 +1000
+Subject: [PATCH] Don't emit QObject::destroyed() within Identity::destroy()
+
+QObject::destroyed() should not be emitted manually, as that can
+cause unwanted side effects.
+
+Specifically, in this case, the
+QDBusConnectionPrivate::objectDestroyed() slot was invoked with
+invalidated object parameter (perhaps due to duplicate invocation)
+resulting in a warning in QObject::disconnect().
+
+Instead, ensure the object is unregistered from DBus immediately.
+---
+ src/signond/signondaemonadaptor.cpp | 29 ++++++++++++++++++++++++++++-
+ src/signond/signondaemonadaptor.h   |  3 +++
+ src/signond/signonidentity.cpp      | 13 ++++++++-----
+ src/signond/signonidentity.h        |  1 +
+ 4 files changed, 40 insertions(+), 6 deletions(-)
+
+diff --git a/src/signond/signondaemonadaptor.cpp b/src/signond/signondaemonadaptor.cpp
+index 8b35e4bd..abd8fd3a 100644
+--- a/src/signond/signondaemonadaptor.cpp
++++ b/src/signond/signondaemonadaptor.cpp
+@@ -29,6 +29,13 @@
+ 
+ namespace SignonDaemonNS {
+ 
++struct RegisteredIdentity {
++    RegisteredIdentity(const QDBusConnection &connection, QObject *identity)
++        : conn(connection), ident(identity) {}
++    QDBusConnection conn;
++    QObject *ident = nullptr;
++};
++
+ SignonDaemonAdaptor::SignonDaemonAdaptor(SignonDaemon *parent):
+     QDBusAbstractAdaptor(parent),
+     m_parent(parent)
+@@ -38,6 +45,7 @@ SignonDaemonAdaptor::SignonDaemonAdaptor(SignonDaemon *parent):
+ 
+ SignonDaemonAdaptor::~SignonDaemonAdaptor()
+ {
++    qDeleteAll(m_registeredIdentities);
+ }
+ 
+ void SignonDaemonAdaptor::registerNewIdentity(const QString &applicationContext,
+@@ -46,7 +54,10 @@ void SignonDaemonAdaptor::registerNewIdentity(const QString &applicationContext,
+     Q_UNUSED(applicationContext);
+ 
+     QObject *identity = m_parent->registerNewIdentity();
+-    objectPath = registerObject(parentDBusContext().connection(), identity);
++    QDBusConnection dbusConnection(parentDBusContext().connection());
++    objectPath = registerObject(dbusConnection, identity);
++    m_registeredIdentities.append(new RegisteredIdentity(dbusConnection, identity));
++    connect(identity, SIGNAL(unregistered()), this, SLOT(onIdentityUnregistered()));
+ 
+     SignonDisposable::destroyUnused();
+ }
+@@ -130,6 +141,22 @@ void SignonDaemonAdaptor::getIdentity(const quint32 id,
+     SignonDisposable::destroyUnused();
+ }
+ 
++void SignonDaemonAdaptor::onIdentityUnregistered()
++{
++    QObject *ident = sender();
++    if (!ident) {
++        return;
++    }
++
++    for (int i = 0; i < m_registeredIdentities.size(); ++i) {
++        if (m_registeredIdentities[i]->ident == ident) {
++            m_registeredIdentities[i]->conn.unregisterObject(ident->objectName());
++            delete m_registeredIdentities.takeAt(i);
++            return;
++        }
++    }
++}
++
+ void SignonDaemonAdaptor::onIdentityAccessReplyFinished()
+ {
+     SignOn::AccessReply *reply = qobject_cast<SignOn::AccessReply*>(sender());
+diff --git a/src/signond/signondaemonadaptor.h b/src/signond/signondaemonadaptor.h
+index db8d875f..1c20cac3 100644
+--- a/src/signond/signondaemonadaptor.h
++++ b/src/signond/signondaemonadaptor.h
+@@ -34,6 +34,7 @@
+ namespace SignonDaemonNS {
+ 
+ typedef QList<QVariantMap> MapList;
++class RegisteredIdentity;
+ 
+ class SignonDaemonAdaptor: public QDBusAbstractAdaptor
+ {
+@@ -74,10 +75,12 @@ private:
+                                    QObject *object);
+ 
+ private Q_SLOTS:
++    void onIdentityUnregistered();
+     void onIdentityAccessReplyFinished();
+     void onAuthSessionAccessReplyFinished();
+ 
+ private:
++    QList<RegisteredIdentity*> m_registeredIdentities;
+     SignonDaemon *m_parent;
+ }; //class SignonDaemonAdaptor
+ 
+diff --git a/src/signond/signonidentity.cpp b/src/signond/signonidentity.cpp
+index ce1ecfb0..a143c223 100644
+--- a/src/signond/signonidentity.cpp
++++ b/src/signond/signonidentity.cpp
+@@ -84,7 +84,8 @@ private:
+ SignonIdentity::SignonIdentity(quint32 id, int timeout,
+                                SignonDaemon *parent):
+     SignonDisposable(timeout, parent),
+-    m_pInfo(NULL)
++    m_pInfo(NULL),
++    m_destroyed(false)
+ {
+     m_id = id;
+ 
+@@ -112,7 +113,10 @@ SignonIdentity::SignonIdentity(quint32 id, int timeout,
+ 
+ SignonIdentity::~SignonIdentity()
+ {
+-    emit unregistered();
++    if (!m_destroyed) {
++        m_destroyed = true;
++        Q_EMIT unregistered();
++    }
+ 
+     delete m_signonui;
+     delete m_pInfo;
+@@ -125,9 +129,8 @@ SignonIdentity *SignonIdentity::createIdentity(quint32 id, SignonDaemon *parent)
+ 
+ void SignonIdentity::destroy()
+ {
+-    /* Emitting the destroyed signal makes QDBusConnection unregister the
+-     * object */
+-    Q_EMIT destroyed();
++    m_destroyed = true;
++    Q_EMIT unregistered();
+     deleteLater();
+ }
+ 
+diff --git a/src/signond/signonidentity.h b/src/signond/signonidentity.h
+index 9ec9be4e..f6321f30 100644
+--- a/src/signond/signonidentity.h
++++ b/src/signond/signonidentity.h
+@@ -96,6 +96,7 @@ private:
+     quint32 m_id;
+     SignonUiAdaptor *m_signonui;
+     SignonIdentityInfo *m_pInfo;
++    bool m_destroyed;
+ }; //class SignonDaemon
+ 
+ } //namespace SignonDaemonNS
+-- 
+2.26.2
+
diff --git a/net-libs/signond/files/signond-8.60-unused-dep.patch b/net-libs/signond/files/signond-8.60-unused-dep.patch
new file mode 100644
index 000000000000..dd32af041d4d
--- /dev/null
+++ b/net-libs/signond/files/signond-8.60-unused-dep.patch
@@ -0,0 +1,10 @@
+--- a/tests/signond-tests/signond-tests.pri	2020-06-07 10:57:19.327456979 +0200
++++ b/tests/signond-tests/signond-tests.pri	2020-06-07 11:00:39.866322814 +0200
+@@ -6,7 +6,6 @@
+ QT += core \
+     sql \
+     testlib \
+-    xml \
+     network \
+     dbus
+ 
diff --git a/net-libs/signond/signond-8.60-r2.ebuild b/net-libs/signond/signond-8.60-r2.ebuild
new file mode 100644
index 000000000000..c775677aaaa5
--- /dev/null
+++ b/net-libs/signond/signond-8.60-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+DESCRIPTION="Signon daemon for libaccounts-glib"
+HOMEPAGE="https://gitlab.com/accounts-sso"
+SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VERSION_${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
+IUSE="doc test"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	net-libs/libproxy
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-buildsystem.patch"
+	"${FILESDIR}/${P}-consistent-paths.patch" # bug 701142
+	"${FILESDIR}/${P}-crashfix.patch"
+	"${FILESDIR}/${P}-unused-dep.patch" # bug 727346
+)
+
+S="${WORKDIR}/${PN}-VERSION_${PV}"
+
+src_prepare() {
+	default
+
+	# install docs to correct location
+	sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" \
+		-i doc/doc.pri || die
+	sed -e "/^documentation.path = /c\documentation.path = \$\${INSTALL_PREFIX}/share/doc/${PF}/\$\${TARGET}/" \
+		-i lib/plugins/doc/doc.pri || die
+	sed -e "/^documentation.path = /c\documentation.path = \$\${INSTALL_PREFIX}/share/doc/${PF}/libsignon-qt/" \
+		-i lib/SignOn/doc/doc.pri || die
+
+	# std flags
+	sed -e "/CONFIG += c++11/d" \
+		-i common-project-config.pri || die "failed fixing CXXFLAGS"
+
+	# fix runtime failures
+	sed -e "/fno-rtti/d" \
+		-i common-project-config.pri src/plugins/plugins.pri \
+		src/{remotepluginprocess/remotepluginprocess,extensions/cryptsetup/cryptsetup}.pro \
+		tests/{signond-tests/signond-tests,extensions/extensions}.pri \
+		tests/{passwordplugintest/passwordplugintest,libsignon-qt-tests/libsignon-qt-tests}.pro \
+		|| die "failed disabling -fno-rtti"
+
+	use doc || sed -e "/include(\s*doc\/doc.pri\s*)/d" \
+		-i signon.pro lib/SignOn/SignOn.pro lib/plugins/plugins.pro || die
+
+	use test || sed -e '/^SUBDIRS/s/tests//' \
+		-i signon.pro || die "couldn't disable tests"
+}
+
+src_configure() {
+	eqmake5 PREFIX="${EPREFIX}"/usr LIBDIR=$(get_libdir)
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index ff747b66a109..283f68b66aa1 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -4,7 +4,9 @@ AUX tox-bootstrapd.conf 2397 BLAKE2B 336317dc2b2a7958420164d3ef3197ea2aefbb51822
 AUX tox-bootstrapd.service 365 BLAKE2B f17891d280007180811414f85f1f8a4defd85436410113f11cffd60dd14a02cd24a0637c347a75ea11322c050e4030702e9f95f02810705aef512df6558e66d5 SHA512 d565430c53b91343d57b6db573884c9f11aaf8bbddfd70bf3a46a6dede91c01ab8f1371ae052b4dd529cc521bef28924069fc7f4bc3d610c01cbd6d6569707f8
 DIST c-toxcore-0.2.10.tar.gz 515842 BLAKE2B 8e79f9a5045b5fef7825e5eb21644625607d86e472ec75ff45ff826712efa515682f9439181d52444b2a6a21472c6e78a3bea5bb7e356373faf733e2644a315d SHA512 8a6a78c52a67be0b727d0d3a8d1cece20ad716a2e694df0aa747eee7764f64c957458584f59db5e727a9803ed7b21adc1ad8d7e80fd6651e7774ca3504b38fc7
 DIST c-toxcore-0.2.11.tar.gz 507476 BLAKE2B 67e86a5e5c8da1c387a319e6726eaccec28608f165f0b165d12e379cc7d8080baf9b89f438804ab8e59a8690a11bebba7f2ef689554800312fe039da77e70cac SHA512 616b30423a170463b4445f6940e038fd9af820946c970260fcf72cc54d08d2615364b9f086869180e3ae26154ea92fea6e9a602366306bc40c3e1575e86350df
+DIST c-toxcore-0.2.12.tar.gz 504832 BLAKE2B 625713142cc1e4b6583879144c05d47a40a1d98031a8a2bf0deec85a199f816a0ff6df5c76e9487a526d7c1c1650b37a10ed81be8233eaa1395707851378474f SHA512 c22f139cfff3a5aedf5fb08c33cae0dae3d6fbceec87867c81290e3bf9d2e13466a0e2bad8378a7a7ba1e9b7b9ad756712963461ae248102e4cab7d4691228d8
 EBUILD tox-0.2.10.ebuild 3119 BLAKE2B 4eb4584d7ebc7dcb4e365ef3baff2a2bff5546c37051511f36987abf38f0b2c9b82937d9f33f0efc99697e7c84195eb94f6eb6bf1f57747a80fe386308d636e4 SHA512 bc52cd62f1165d7659adad3e46bf79d7caa708495cc9695205048a16a831cda41cd9799056edef2c7f459b3f33109ae648f36c9f1b7eece3dc5e6c82519975d9
 EBUILD tox-0.2.11.ebuild 3185 BLAKE2B 075ab6798fa2b54f4b5241acb85f9c3c66d97721151b4f95ae4bd342a1023f92167b85aeff0dd28949d0ab21d4d183fbac9e96c863cffed4fa1b20f703711ac6 SHA512 0a2a65759bd61ae3b8efae10e8c6b9fb875fba5b4d968b11485a6a13c6a95263176f3b5bcd8298222928b35e6393e8990a50ea2d609cc105c7db227b14eb3294
+EBUILD tox-0.2.12.ebuild 2844 BLAKE2B 6a7a2ea6a10b3750c095937ab6e9b9ecd4fe6202281d1b6610b16a452a57f879131d5133654df3713f6e38bfbf2bb012344501f8ef08a810e357af167863aad2 SHA512 995e516b90b21e943fbc5b5731a14b533e180e13becd887bf3de590953df2b0d3279267b03cef62f7ccc67a1df6ecc2a3856d2839b83fb19f7a79c294c3176c2
 EBUILD tox-9999.ebuild 3060 BLAKE2B ee68a7b8141408b59296d0ad7c14ea69d082ae31a736ea4405d10c35414ae91146ac8442dc242a86ee4aa79aa2652dee975d79f9905dd420263d670ee39981af SHA512 3f45c8b5d5e16c9fb52a895b15ba65036bbcae0e8086eac804aa6dd8cbdea4cb1dc3b2402e69c960444dd0ecedae28c2bf3cab716d9867ab97403e976eae1ec3
 MISC metadata.xml 870 BLAKE2B fe6cd17ce54fce4f002d1952694a0f3b6cbfc55be321de1256590721aa6d2e248bf8e9b080708c6cf06bbf8cccba327dc71a18223500d1a0910d1c6edb9ffc55 SHA512 7600b6b0558499e346cec1d6f5ddfadfa7a9fa97187737febe8076379af759f30f7ba90c46f38c70b69a91b39a365c7deb04182f6cc77ba54da9bd792ceb2025
diff --git a/net-libs/tox/tox-0.2.12.ebuild b/net-libs/tox/tox-0.2.12.ebuild
new file mode 100644
index 000000000000..f6c830c2713e
--- /dev/null
+++ b/net-libs/tox/tox-0.2.12.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+MY_P="c-toxcore-${PV}"
+DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
+HOMEPAGE="https://tox.chat https://github.com/TokTok/c-toxcore"
+SRC_URI="https://github.com/TokTok/c-toxcore/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/0.2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn static-libs test"
+
+REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn )
+		daemon? ( dht-node )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	>dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]
+	av? (
+		media-libs/libvpx:=
+		media-libs/opus
+	)
+	daemon? ( dev-libs/libconfig )"
+RDEPEND="
+	${DEPEND}
+	daemon? (
+		acct-group/tox
+		acct-user/tox
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	cmake_src_prepare
+	#remove faulty tests
+	for testname in lan_discovery save_compatibility; do
+		sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
+	done
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAUTOTEST=$(usex test)
+		-DBOOTSTRAP_DAEMON=$(usex daemon)
+		-DBUILD_MISC_TESTS=$(usex test)
+		-DBUILD_TOXAV=$(usex av)
+		-DDHT_BOOTSTRAP=$(usex dht-node)
+		-DENABLE_SHARED=ON
+		-DENABLE_STATIC=$(usex static-libs)
+		-DMUST_BUILD_TOXAV=$(usex av))
+	if use test; then
+		mycmakeargs+=(
+			-DTEST_TIMEOUT_SECONDS=120
+			-DUSE_IPV6=$(usex ipv6))
+	else
+		mycmakeargs+=(-DUSE_IPV6=OFF)
+	fi
+
+	if use log-trace; then
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="TRACE")
+	elif use log-debug; then
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="DEBUG")
+	elif use log-info; then
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="INFO")
+	elif use log-warn; then
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="WARNING")
+	elif use log-error; then
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="ERROR")
+	else
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="")
+		einfo "Logging disabled"
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use daemon; then
+		newinitd "${FILESDIR}"/initd tox-dht-daemon
+		newconfd "${FILESDIR}"/confd tox-dht-daemon
+		insinto /etc
+		doins "${FILESDIR}"/tox-bootstrapd.conf
+		systemd_dounit "${FILESDIR}"/tox-bootstrapd.service
+	fi
+}
+
+pkg_postinst() {
+	if use dht-node; then
+		ewarn "The QA notice regarding libmisc_tools.so is known by the upstream"
+		ewarn "developers and is on their TODO list. For more information,"
+		ewarn "please see 'https://github.com/toktok/c-toxcore/issues/1144'"
+		ewarn ""
+		ewarn "There is currently an unresolved issue with tox DHT Bootstrap node"
+		ewarn "that causes the program to be built with a null library reference."
+		ewarn "This causes an infinite loop for certain revdep-rebuild commands."
+		ewarn "If you aren't running a node, please consider disabling the dht-node use flag."
+	fi
+}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 0e623388230e..1d7c7e35f003 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -12,5 +12,5 @@ DIST webkitgtk-2.26.4.tar.xz 19329636 BLAKE2B 9dc88bf9e2bec4f3ccc316f4967e991595
 DIST webkitgtk-2.28.2.tar.xz 21427772 BLAKE2B 0749ffac526ae90ffb8af3fbf8f9ce87db80f229b96e2daa435f9bd6e6e985bbb8c33011976213b2e4ce286c9f1d38f0b85279507cdc9c52b95fbeb32c9f676c SHA512 c7c0c55b1ebc61c0ec9cd9af96a12058a96ba9b011330b12c7c2776685736e0edf604f5eee639637cb50b2967d77c2db4dea15050a575fd34a1f6f0a8b8c56f8
 EBUILD webkit-gtk-2.24.4.ebuild 8444 BLAKE2B 0e07771b88a5956fb5b824d3713d6e2ffcf3e6abc0238efe8059bfae5d799e2198174b0ac015b57f8688b9055992730892e05bbaf106eb7f0df98d6088a5d481 SHA512 76d4910adc9c2a69a589e1261eccd7188aecb890cd818271e31a5c44bdfeddea82ef14ff1e513d8c35d9560b9b9460598d574dc55eb60eddb1679335f9e82b13
 EBUILD webkit-gtk-2.26.4-r1.ebuild 8749 BLAKE2B f470ee46cd08ca1a210ac35c0dbbc7c8df2b62ba2cdd775a903c3d7289df8b556259c3b4456d4612efcd3e5ec6fa8d31b03221fbe1d9af4faf9bd7b283797435 SHA512 1e589c989cd9badd30b113550cd7d984b8e4a7da122c15c4df9c0e57de2076ea14ab3f4887981aaa43003c3a9960374f396b0ff5e920266ce724dc01179f1ae5
-EBUILD webkit-gtk-2.28.2.ebuild 9142 BLAKE2B 9a8478488a0bbf4c7247ecefdddd7454789bfeafd3e86b38f53ba49131ecdf7fffd4d6ad4a5ddbf6377d684152dd85a86b5f72ce246caf50cf8c66b2e26f4842 SHA512 3cd9026118609768b8584137bbf4ee47c8e60f1d678df653d7985e336d530af5767af819e34a5663ee4ee4d0fd9cdddc989489f217e469e92780ca3ded8b1e56
+EBUILD webkit-gtk-2.28.2.ebuild 9147 BLAKE2B 05dc2471e1b80aafa769e3d3252b3fe96490212f8420ad02a5d77532387145bff45fca06a4233e4ae9048a7d7dc34d0aae957af7bb327881ee91e0a073d103c5 SHA512 2c02215bf2697cc35b49bd02d069af8fa376357f69060335977a5eabd46d1e889f74af32461f02cca3fe9a84963b002db01e9ce0cbf5623472a1e5f0dd5e0e99
 MISC metadata.xml 760 BLAKE2B b6b93a6f66b0145a6cc95f62d9f4a19e6d69c337c6be1ab8aa6c2a2a5de5bed19466f388908bed34bc77b90285297f8dc2f332f70abcf70fea81a2aac8288c99 SHA512 849039d811ebc06003b7dfe505c6cf809b3feb95dd7965dfef41aa8c9ce2dfd773d019741fc66e784bdcde5f91c216e0f96f887647f3723778a21e500dded8f2
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
index bfb9e1492a69..d8c2b014eb30 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc x86"
 
 IUSE="aqua +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
author	V3n3RiX <venerix@redcorelinux.org>	2020-06-13 10:39:22 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-06-13 10:39:22 +0100
commit	9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch)
tree	8ac67e26b45f34d71c5aab3621813b100a0d5f00 /net-libs
parent	f516638b7fe9592837389826a6152a7e1b251c54 (diff)