Merge branch 'edge' into next

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-30 12:37:28 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-30 12:37:28 +0100
commit: be9d77d3ac6af8f4ead98d89706f356b65578c93 (patch)
tree: f82923fbca262493e83dd1382e561a2fae24cc46 /net-libs
parent: 7ec0832ab5dafbf70de83e0c2f3ee740416a0950 (diff)
parent: 6faaec2b812feecd9c8751b8a19004da4a17ea5b (diff)
117 files changed, 878 insertions, 1463 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 410cb4eb4207..e672e3b4dd41 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/axtls/Manifest b/net-libs/axtls/Manifest
index 6963c9539c0e..882e560715ad 100644
--- a/net-libs/axtls/Manifest
+++ b/net-libs/axtls/Manifest
@@ -2,12 +2,6 @@ AUX axhttpd.confd 181 BLAKE2B 9b4bc5cd02058c206f62186d3b6c1678d540312780fae595a9
 AUX axhttpd.initd 515 BLAKE2B cd09293cd4741269493860cf9e18feb23f1ee496eb2314567465ea7412b4f82e5d837c7dd08f96d9bce354cfdc31ff615e798598bed823734add8cfaeccb5805 SHA512 8d538a03b9102b28aeb539714b5b886b9d7e5ad0496641e40a9c72c85bb4dc96f51f56482c346a0b2386e4fe5b1e34500f78bfc605fa4f8a968d487bbe534015
 AUX config 3064 BLAKE2B baedffe4b9e8696a0f933ba761db3f3b8d4d2cf4b910c22077857a43ebcd31ad388423a8c12257a41481a63466d3d4ca85ecd05c75dfa1c9552d17ade2834aaa SHA512 6589e3912ba9231db660b8afe71a6e233807108a8662860667dcae3b6cc4d77fa405503d6eb9d520669cd26fb67f418095b6174b88527c290818fc6400cb65b0
 AUX explicit-libdir-r1.patch 1578 BLAKE2B 1495850dff9ad1dab1e4820158cff5f706ea3420d664ae2fcb7ae9200790e52fbac093ac510812b80d0eaa177a5d210b6b9c43e80d0317ae4621fe3c18b65c01 SHA512 8e10b10eb6959e309e504a0ff2c16795e258f0fab57b97ffb3b64a6c3b84de8e782cc1697983ed7ff0a05a211e43146ecf39588782e8d3c813a4aa053d94557a
-DIST axTLS-1.5.3.tar.gz 1309853 BLAKE2B 8a7db4df4775dc73e35c3a9b2a7bbee783d96f36c122393b72b47a4ed4e66f41e4736dcb7ed8eee4d756760957feafc113a5a4c6df58847b94721b1fb8560196 SHA512 d37fb1341259b079ed234512a96656d67e005c50d9f8e0c856fb140c9da35267624e065134e0cc8310f70e5cf5d196c7dd34f01e2a7a5cc29e77e7ca46c25281
-DIST axTLS-2.1.3.tar.gz 1316776 BLAKE2B f60502d34a9d23ac772e1bbe05dc9350ab2385fb3c42480117120923647f122ef7a955289b656b8a70b3ac9817b1bcf947f541739b8d01ebe1eb4340f8d9cf38 SHA512 aa116b671bf0fa059cb77f9e5c0307c48ab476b7ce7017f1d4b2e6362d9d527e534908cb30ec3667eec8c49566f950de3ae4ec0adf5b603fb4efb571eaffc596
-DIST axTLS-2.1.4.tar.gz 1316768 BLAKE2B 3ff302c59313ee80d18a0d5390c591e6259625e62707cc0c7c677add1f7fddffa5b4dc46860ee18dd96fcc227b3cac1179ab290f8af50ac91fe2841fff977cd4 SHA512 ce301719a12f5b836e3c67a169119d2836382b7b97d39f4010b8b8a644a6751b9f948a6c91f8dc6c39d19f5723311af7aca8958f9052e72cb38a9907247af3e6
 DIST axTLS-2.1.5.tar.gz 1318286 BLAKE2B a4f7cb551f3569fbc9a3a7e0e8faa929a5310fdb412283487fedd4a58e36a65529ebd9aec859027ca6df8e69db85b9f908b56f8d37284548b3984da10774ca3d SHA512 d208b174c31a144a779185e77834a34b0fdd15e8cadf4665b8fd76dcb3207955ed687f3d86d1e60f85d108ecccfd900a76e6d045d16a7182001e0b58da09be18
-EBUILD axtls-1.5.3.ebuild 4648 BLAKE2B 015fd92687701d440e34b919c3aa2fcc6c44f1ce8bdb74527a9e489a40ae307ee293f11013f05ef9a2dc99a90ebac6667c0a7e5a63a893c1d4f66f9e86420e3e SHA512 e37dd43f7f73cf284e01d89413de6989c43168abc961c6854d9994bc2e704f07c79cd2b2f151788fb48c671738e18cbc3c5931f36b59d85792909c19310691f5
-EBUILD axtls-2.1.3.ebuild 4670 BLAKE2B 04885486d07d580daed57d66feb02495ca08e9493f047fc5c162b60521cb94020642488406425fe83869a6d8bff6e68222835f44a447ebb0e367387fed4637da SHA512 691d01cfb57df53516cdc699eb3a87844064335e2c212fec1f36ebfc52779378a6a3501706a84980280216025ffa56ad362d6f393259df10fc8bfb30c18c1f44
-EBUILD axtls-2.1.4.ebuild 4677 BLAKE2B 25e88d8ee91fcebd1388ebb6e0ee36be17f973b962da0d5e0b448ccaff9bc34833561fbee78b3400ff57981f7425a46c88cb42019a038b07e065d060776194d4 SHA512 a5f5b59c5a6984c187cf3b8938bf1ad4a657dd776922c46f04c78c990dd74e3d23ee03777e74620ae06b0c29aa67c472dccf3d9fa93544723ed684dfa4332aa7
-EBUILD axtls-2.1.5.ebuild 4674 BLAKE2B 7557b02e15493c9ebe89d3cea24e6f5c75b56e45b3a10e3e723a3e835d20c04e225df68ff03f795439b78ca5e8abbd63d6963fd6e2707bf933887d0eef35d083 SHA512 0307a9e39243546b616f2709635ea11834805108edf0f8912d295bdc19d0700a3db08b6f2c4cdd86f6f4eefb6896664156667adfad3b09708bb24b4543bd7143
+EBUILD axtls-2.1.5.ebuild 4669 BLAKE2B 6f3c57e1af7475993d2231bbad8bae78db869fe4ab407dbb1bb341777e3a1cd5329ed8eef31836180d3d71851790de40a1061a8bad73ea8928eb7c5e2d10f799 SHA512 3ee92c1b81cb20f9a51569931102ce04ff24e7cc2400c53b90939b080c3b92c621f24d426967b171c86e5a83cc74acc32913a3a2e079195e790fe6f945684f51
 MISC metadata.xml 632 BLAKE2B b83cd23e97a4fdd09ea7354c1245dd65e54c50b418538c2ef71ae9054626861b6516268fcd37485ba19d1981024c47d869cdce00b276473200a7352c29072b1a SHA512 bfd387d998bcf2a457ff01752b553307b0de430cb9372115b366ab80a10866ede54b8ee149c726aba6f12c8cc3c5ea089dc5b25083e95594d8912e181a8626b0
diff --git a/net-libs/axtls/axtls-1.5.3.ebuild b/net-libs/axtls/axtls-1.5.3.ebuild
deleted file mode 100644
index 1f02d467d121..000000000000
--- a/net-libs/axtls/axtls-1.5.3.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib multilib-minimal savedconfig toolchain-funcs user
-
-################################################################################
-# axtls CONFIG MINI-HOWTO
-#
-# Note: axtls is highly configurable and uses mconf, like the linux kernel.
-# You can configure it in a couple of ways:
-#
-# 1) USE="-savedconfig" and set/unset the remaining flags to obtain the features
-# you want, and possibly a lot more.
-#
-# 2) You can create your own configuration file by doing
-#
-#	FEATURES="keepwork" USE="savedconfig -*" emerge axtls
-#	cd /var/tmp/portage/net-libs/axtls*/work/axTLS
-#	make menuconfig
-#
-# Now configure axtls as you want.  Finally save your config file:
-#
-#	cp config/.config /etc/portage/savedconfig/net-libs/axtls-${PV}
-#
-# where ${PV} is the current version.  You can then run emerge again with
-# your configuration by doing
-#
-#	USE="savedconfig" emerge axtls
-#
-################################################################################
-
-MY_PN=${PN/tls/TLS}
-
-DESCRIPTION="Embedded client/server TLSv1 SSL library and small HTTP(S) server"
-HOMEPAGE="http://axtls.sourceforge.net/"
-SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-code"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 x86"
-
-IUSE="httpd cgi-lua cgi-php static static-libs doc"
-
-# TODO: add ipv6, and c#, java, lua, perl bindings
-# Currently these all have some issue
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND="
-	httpd? (
-		cgi-lua? ( dev-lang/lua )
-		cgi-php? ( dev-lang/php[cgi] )
-	)"
-
-#Note1: static, cgi-* makes no sense if httpd is not given
-REQUIRED_USE="
-	static? ( httpd )
-	cgi-lua? ( httpd )
-	cgi-php? ( httpd )"
-
-AXTLS_GROUP="axtls"
-AXTLS_USER="axtls"
-
-pkg_setup() {
-	use httpd && {
-		ebegin "Creating axtls user and group"
-		enewgroup ${AXTLS_GROUP}
-		enewuser ${AXTLS_USER} -1 -1 -1 ${AXTLS_GROUP}
-	}
-}
-
-src_prepare() {
-	tc-export AR CC
-
-	epatch "${FILESDIR}/explicit-libdir-r1.patch"
-
-	#We want CONFIG_DEBUG to avoid stripping
-	#but not for debugging info
-	sed -i -e 's: -g::' config/Rules.mak || die
-	sed -i -e 's: -g::' config/makefile.conf || die
-
-	multilib_copy_sources
-}
-
-use_flag_config() {
-	cp "${FILESDIR}"/config config/.config || die
-
-	#Respect CFLAGS/LDFLAGS
-	sed -i -e "s:^CONFIG_EXTRA_CFLAGS_OPTIONS.*$:CONFIG_EXTRA_CFLAGS_OPTIONS=\"${CFLAGS}\":" \
-		config/.config || die
-	sed -i -e "s:^CONFIG_EXTRA_LDFLAGS_OPTIONS.*$:CONFIG_EXTRA_LDFLAGS_OPTIONS=\"${LDLAGS}\":" \
-		config/.config || die
-
-	#The logic is that the default config file enables everything and we disable
-	#here with sed unless a USE flags says to keep it
-	if use httpd; then
-		if ! use static; then
-			sed -i -e 's:^CONFIG_HTTP_STATIC_BUILD:# CONFIG_HTTP_STATIC_BUILD:' \
-				config/.config || die
-		fi
-		if ! use cgi-php && ! use cgi-lua; then
-			sed -i -e 's:^CONFIG_HTTP_HAS_CGI:# CONFIG_HTTP_HAS_CGI:' \
-				config/.config || die
-		fi
-		if ! use cgi-php; then
-			sed -i -e 's:,.php::' config/.config || die
-		fi
-		if ! use cgi-lua; then
-			sed -i -e 's:\.lua,::' \
-				-e 's:lua:php:' \
-				-e 's:^CONFIG_HTTP_ENABLE_LUA:# CONFIG_HTTP_ENABLE_LUA:' \
-				config/.config || die
-		fi
-	else
-		sed -i -e 's:^CONFIG_AXHTTPD:# CONFIG_AXHTTPD:' \
-			config/.config || die
-	fi
-
-	emake -j1 oldconfig < <(yes n) > /dev/null
-}
-
-multilib_src_configure() {
-	#Per-ABI substitutions.
-	sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \
-		Makefile || die
-
-	#Use CC as the host compiler for mconf
-	sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \
-		config/Rules.mak || die
-
-	if use savedconfig; then
-		restore_config config/.config
-		if [[ -f config/.config ]]; then
-			ewarn "Using saved config, all other USE flags ignored"
-		else
-			ewarn "No saved config, seeding with the default"
-			cp "${FILESDIR}"/config config/.config || die
-		fi
-		emake -j1 oldconfig < <(yes '') > /dev/null
-	else
-		use_flag_config
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi && use savedconfig; then
-		save_config config/.config
-	fi
-
-	emake PREFIX="${ED}/usr" install
-
-	if ! use static-libs; then
-		rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a || die
-	fi
-
-	# The build system needs to install before it builds docs
-	if multilib_is_native_abi && use doc; then
-		emake docs
-		dodoc -r docsrc/html
-	fi
-}
-
-multilib_src_install_all() {
-	if [[ -f "${ED}"/usr/bin/htpasswd ]]; then
-		mv "${ED}"/usr/bin/{,ax}htpasswd || die
-	fi
-
-	if use httpd; then
-		newinitd "${FILESDIR}"/axhttpd.initd axhttpd
-		newconfd "${FILESDIR}"/axhttpd.confd axhttpd
-	fi
-
-	docompress -x /usr/share/doc/${PF}/README
-	dodoc README
-}
diff --git a/net-libs/axtls/axtls-2.1.3.ebuild b/net-libs/axtls/axtls-2.1.3.ebuild
deleted file mode 100644
index b856997fc616..000000000000
--- a/net-libs/axtls/axtls-2.1.3.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib multilib-minimal savedconfig toolchain-funcs user
-
-################################################################################
-# axtls CONFIG MINI-HOWTO
-#
-# Note: axtls is highly configurable and uses mconf, like the linux kernel.
-# You can configure it in a couple of ways:
-#
-# 1) USE="-savedconfig" and set/unset the remaining flags to obtain the features
-# you want, and possibly a lot more.
-#
-# 2) You can create your own configuration file by doing
-#
-#	FEATURES="keepwork" USE="savedconfig -*" emerge axtls
-#	cd /var/tmp/portage/net-libs/axtls*/work/axTLS
-#	make menuconfig
-#
-# Now configure axtls as you want.  Finally save your config file:
-#
-#	cp config/.config /etc/portage/savedconfig/net-libs/axtls-${PV}
-#
-# where ${PV} is the current version.  You can then run emerge again with
-# your configuration by doing
-#
-#	USE="savedconfig" emerge axtls
-#
-################################################################################
-
-MY_PN=${PN/tls/TLS}
-
-DESCRIPTION="Embedded client/server TLSv1 SSL library and small HTTP(S) server"
-HOMEPAGE="http://axtls.sourceforge.net/"
-SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-code"
-
-LICENSE="BSD GPL-2"
-SLOT="0/1"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 s390 ~sparc x86"
-
-IUSE="httpd cgi-lua cgi-php static static-libs doc"
-
-# TODO: add ipv6, and c#, java, lua, perl bindings
-# Currently these all have some issue
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND="
-	httpd? (
-		cgi-lua? ( dev-lang/lua )
-		cgi-php? ( dev-lang/php[cgi] )
-	)"
-
-#Note1: static, cgi-* makes no sense if httpd is not given
-REQUIRED_USE="
-	static? ( httpd )
-	cgi-lua? ( httpd )
-	cgi-php? ( httpd )"
-
-AXTLS_GROUP="axtls"
-AXTLS_USER="axtls"
-
-pkg_setup() {
-	use httpd && {
-		ebegin "Creating axtls user and group"
-		enewgroup ${AXTLS_GROUP}
-		enewuser ${AXTLS_USER} -1 -1 -1 ${AXTLS_GROUP}
-	}
-}
-
-src_prepare() {
-	tc-export AR CC
-
-	eapply "${FILESDIR}/explicit-libdir-r1.patch"
-
-	#We want CONFIG_DEBUG to avoid stripping
-	#but not for debugging info
-	sed -i -e 's: -g::' config/Rules.mak || die
-	sed -i -e 's: -g::' config/makefile.conf || die
-
-	eapply_user
-
-	multilib_copy_sources
-}
-
-use_flag_config() {
-	cp "${FILESDIR}"/config config/.config || die
-
-	#Respect CFLAGS/LDFLAGS
-	sed -i -e "s:^CONFIG_EXTRA_CFLAGS_OPTIONS.*$:CONFIG_EXTRA_CFLAGS_OPTIONS=\"${CFLAGS}\":" \
-		config/.config || die
-	sed -i -e "s:^CONFIG_EXTRA_LDFLAGS_OPTIONS.*$:CONFIG_EXTRA_LDFLAGS_OPTIONS=\"${LDLAGS}\":" \
-		config/.config || die
-
-	#The logic is that the default config file enables everything and we disable
-	#here with sed unless a USE flags says to keep it
-	if use httpd; then
-		if ! use static; then
-			sed -i -e 's:^CONFIG_HTTP_STATIC_BUILD:# CONFIG_HTTP_STATIC_BUILD:' \
-				config/.config || die
-		fi
-		if ! use cgi-php && ! use cgi-lua; then
-			sed -i -e 's:^CONFIG_HTTP_HAS_CGI:# CONFIG_HTTP_HAS_CGI:' \
-				config/.config || die
-		fi
-		if ! use cgi-php; then
-			sed -i -e 's:,.php::' config/.config || die
-		fi
-		if ! use cgi-lua; then
-			sed -i -e 's:\.lua,::' \
-				-e 's:lua:php:' \
-				-e 's:^CONFIG_HTTP_ENABLE_LUA:# CONFIG_HTTP_ENABLE_LUA:' \
-				config/.config || die
-		fi
-	else
-		sed -i -e 's:^CONFIG_AXHTTPD:# CONFIG_AXHTTPD:' \
-			config/.config || die
-	fi
-
-	emake -j1 oldconfig < <(yes n) > /dev/null
-}
-
-multilib_src_configure() {
-	#Per-ABI substitutions.
-	sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \
-		Makefile || die
-
-	#Use CC as the host compiler for mconf
-	sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \
-		config/Rules.mak || die
-
-	if use savedconfig; then
-		restore_config config/.config
-		if [[ -f config/.config ]]; then
-			ewarn "Using saved config, all other USE flags ignored"
-		else
-			ewarn "No saved config, seeding with the default"
-			cp "${FILESDIR}"/config config/.config || die
-		fi
-		emake -j1 oldconfig < <(yes '') > /dev/null
-	else
-		use_flag_config
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi && use savedconfig; then
-		save_config config/.config
-	fi
-
-	emake PREFIX="${ED}/usr" install
-
-	if ! use static-libs; then
-		rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a || die
-	fi
-
-	# The build system needs to install before it builds docs
-	if multilib_is_native_abi && use doc; then
-		emake docs
-		dodoc -r docsrc/html
-	fi
-}
-
-multilib_src_install_all() {
-	if [[ -f "${ED}"/usr/bin/htpasswd ]]; then
-		mv "${ED}"/usr/bin/{,ax}htpasswd || die
-	fi
-
-	if use httpd; then
-		newinitd "${FILESDIR}"/axhttpd.initd axhttpd
-		newconfd "${FILESDIR}"/axhttpd.confd axhttpd
-	fi
-
-	docompress -x /usr/share/doc/${PF}/README
-	dodoc README
-}
diff --git a/net-libs/axtls/axtls-2.1.4.ebuild b/net-libs/axtls/axtls-2.1.4.ebuild
deleted file mode 100644
index dcd2852e8235..000000000000
--- a/net-libs/axtls/axtls-2.1.4.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib multilib-minimal savedconfig toolchain-funcs user
-
-################################################################################
-# axtls CONFIG MINI-HOWTO
-#
-# Note: axtls is highly configurable and uses mconf, like the linux kernel.
-# You can configure it in a couple of ways:
-#
-# 1) USE="-savedconfig" and set/unset the remaining flags to obtain the features
-# you want, and possibly a lot more.
-#
-# 2) You can create your own configuration file by doing
-#
-#	FEATURES="keepwork" USE="savedconfig -*" emerge axtls
-#	cd /var/tmp/portage/net-libs/axtls*/work/axTLS
-#	make menuconfig
-#
-# Now configure axtls as you want.  Finally save your config file:
-#
-#	cp config/.config /etc/portage/savedconfig/net-libs/axtls-${PV}
-#
-# where ${PV} is the current version.  You can then run emerge again with
-# your configuration by doing
-#
-#	USE="savedconfig" emerge axtls
-#
-################################################################################
-
-MY_PN=${PN/tls/TLS}
-
-DESCRIPTION="Embedded client/server TLSv1 SSL library and small HTTP(S) server"
-HOMEPAGE="http://axtls.sourceforge.net/"
-SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-code"
-
-LICENSE="BSD GPL-2"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-IUSE="httpd cgi-lua cgi-php static static-libs doc"
-
-# TODO: add ipv6, and c#, java, lua, perl bindings
-# Currently these all have some issue
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND="
-	httpd? (
-		cgi-lua? ( dev-lang/lua )
-		cgi-php? ( dev-lang/php[cgi] )
-	)"
-
-#Note1: static, cgi-* makes no sense if httpd is not given
-REQUIRED_USE="
-	static? ( httpd )
-	cgi-lua? ( httpd )
-	cgi-php? ( httpd )"
-
-AXTLS_GROUP="axtls"
-AXTLS_USER="axtls"
-
-pkg_setup() {
-	use httpd && {
-		ebegin "Creating axtls user and group"
-		enewgroup ${AXTLS_GROUP}
-		enewuser ${AXTLS_USER} -1 -1 -1 ${AXTLS_GROUP}
-	}
-}
-
-src_prepare() {
-	tc-export AR CC
-
-	eapply "${FILESDIR}/explicit-libdir-r1.patch"
-
-	#We want CONFIG_DEBUG to avoid stripping
-	#but not for debugging info
-	sed -i -e 's: -g::' config/Rules.mak || die
-	sed -i -e 's: -g::' config/makefile.conf || die
-
-	eapply_user
-
-	multilib_copy_sources
-}
-
-use_flag_config() {
-	cp "${FILESDIR}"/config config/.config || die
-
-	#Respect CFLAGS/LDFLAGS
-	sed -i -e "s:^CONFIG_EXTRA_CFLAGS_OPTIONS.*$:CONFIG_EXTRA_CFLAGS_OPTIONS=\"${CFLAGS}\":" \
-		config/.config || die
-	sed -i -e "s:^CONFIG_EXTRA_LDFLAGS_OPTIONS.*$:CONFIG_EXTRA_LDFLAGS_OPTIONS=\"${LDLAGS}\":" \
-		config/.config || die
-
-	#The logic is that the default config file enables everything and we disable
-	#here with sed unless a USE flags says to keep it
-	if use httpd; then
-		if ! use static; then
-			sed -i -e 's:^CONFIG_HTTP_STATIC_BUILD:# CONFIG_HTTP_STATIC_BUILD:' \
-				config/.config || die
-		fi
-		if ! use cgi-php && ! use cgi-lua; then
-			sed -i -e 's:^CONFIG_HTTP_HAS_CGI:# CONFIG_HTTP_HAS_CGI:' \
-				config/.config || die
-		fi
-		if ! use cgi-php; then
-			sed -i -e 's:,.php::' config/.config || die
-		fi
-		if ! use cgi-lua; then
-			sed -i -e 's:\.lua,::' \
-				-e 's:lua:php:' \
-				-e 's:^CONFIG_HTTP_ENABLE_LUA:# CONFIG_HTTP_ENABLE_LUA:' \
-				config/.config || die
-		fi
-	else
-		sed -i -e 's:^CONFIG_AXHTTPD:# CONFIG_AXHTTPD:' \
-			config/.config || die
-	fi
-
-	emake -j1 oldconfig < <(yes n) > /dev/null
-}
-
-multilib_src_configure() {
-	#Per-ABI substitutions.
-	sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \
-		Makefile || die
-
-	#Use CC as the host compiler for mconf
-	sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \
-		config/Rules.mak || die
-
-	if use savedconfig; then
-		restore_config config/.config
-		if [[ -f config/.config ]]; then
-			ewarn "Using saved config, all other USE flags ignored"
-		else
-			ewarn "No saved config, seeding with the default"
-			cp "${FILESDIR}"/config config/.config || die
-		fi
-		emake -j1 oldconfig < <(yes '') > /dev/null
-	else
-		use_flag_config
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi && use savedconfig; then
-		save_config config/.config
-	fi
-
-	emake PREFIX="${ED}/usr" install
-
-	if ! use static-libs; then
-		rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a || die
-	fi
-
-	# The build system needs to install before it builds docs
-	if multilib_is_native_abi && use doc; then
-		emake docs
-		dodoc -r docsrc/html
-	fi
-}
-
-multilib_src_install_all() {
-	if [[ -f "${ED}"/usr/bin/htpasswd ]]; then
-		mv "${ED}"/usr/bin/{,ax}htpasswd || die
-	fi
-
-	if use httpd; then
-		newinitd "${FILESDIR}"/axhttpd.initd axhttpd
-		newconfd "${FILESDIR}"/axhttpd.confd axhttpd
-	fi
-
-	docompress -x /usr/share/doc/${PF}/README
-	dodoc README
-}
diff --git a/net-libs/axtls/axtls-2.1.5.ebuild b/net-libs/axtls/axtls-2.1.5.ebuild
index 674385dd40d6..a90dcc9ac7df 100644
--- a/net-libs/axtls/axtls-2.1.5.ebuild
+++ b/net-libs/axtls/axtls-2.1.5.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="7"
@@ -40,7 +40,7 @@ S="${WORKDIR}/${PN}-code"
 
 LICENSE="BSD GPL-2"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 
 IUSE="httpd cgi-lua cgi-php static static-libs doc"
 
diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index 7ca17ba3969b..5630e0ddf47b 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -5,7 +5,7 @@ DIST courier-authlib-0.66.4.tar.bz2 2192331 BLAKE2B 8fd68153b2defb63bbafb44b34c0
 DIST courier-authlib-0.67.0.tar.bz2 2194546 BLAKE2B 2ccb6ed15c2f02d206606f8bba04c9f2da415da3d739e456914e44010c955c9aaeae1f1c0746c8812f5165eb8db1997284e1c378132a6144da2b8f77d77a6eff SHA512 6e3da28d555761177727c44b1422bf5baf6ffbf28f53cea89a4a8e13daa5433803deba1614295d9679c41b5be4750f464e7869a2d3ecbfd91ae84e7281c4f3ef
 DIST courier-authlib-0.68.0.tar.bz2 2194982 BLAKE2B e463390b49bb3ca147467d3054a83d5a8ce96b604bde0b624c4d7ce81235c6f747e5d847dde794c81c4ad36aeef49bdd27cf904142b4542df833484c5eb7a57e SHA512 5c4adaf0fd69f4b9e780962aa3f9eeac6b15cea3f302288ff4549ce2b0be9ea0808b4501670ef3c4e0419c3d27505c256c082f795dea4683dd5265fd7dcab93b
 DIST courier-authlib-0.69.0.tar.bz2 2197718 BLAKE2B 63c273a85983ce7bd57496eeefac51107e3132dc9eb372f199530dbf6c5a5ddde7f8ee285aa54a096002f9058dc7e1cd9eb1194e3d512ea19882f93b1147345a SHA512 c3806aa50d7ff13f75536064ec46028db3d5e1f4ef64692b5ece64810b4042ae0840bb346c73ae9d36f6113173f0e5e922356a178c10815640a26caa921e1614
-EBUILD courier-authlib-0.66.4.ebuild 4501 BLAKE2B 30c2baf02cf1e778a277badd62d51fb9b49e67b7bebd4f36becffc6c4d52e76836d46995c35d68c056f1eaf3f678afbc793625e9b8eff6a258a227c0aecfcc3a SHA512 8dd7214a34b8ea4792717e2af63463c1d535737baf5972b3e07af0c6f48f57e9f1eafbad7342281365c175eeb06b3c1f24213ba0c3cdfd447767c91a4b055dc7
+EBUILD courier-authlib-0.66.4.ebuild 4503 BLAKE2B cc679d46a105e4d742b55b58b77cb7d715285152594c7d1d697225ce43f6ee6afa2436fde30baf55ee6f65191739342e2b6a587e409fcd027ff101ff02a9bb1a SHA512 4528aff79b4d93870ee6b0287cf372d4dfcabffdafbc40de3a95bf7742895d75b4d61575a02dc90f97cf7d81ab779a567f0de9eec6667e3cc8d85fc35f14a3bc
 EBUILD courier-authlib-0.67.0.ebuild 4552 BLAKE2B 4acc4f0c9cd88ac6f9b73c8e622c857293e675f558a3807fd28b0c7915b3f632c1ccd51b7f4e989478e4bc48d041a247ede0793e24b0a1dbf5fd3d1ca471eae9 SHA512 ecf9bdeb1c617107802ed934f2c28152e87fbd24f00d4e0cd347c923f465e581c69d8b875cb586d6823a5b08cfad51af7dd3326b1efe77137e393018a0f77669
 EBUILD courier-authlib-0.68.0-r1.ebuild 4553 BLAKE2B ad2f819f14aeb2c7f4dcfd051d55105742d3fd50cf7fd630a471b7b507debf8000c05b7099b1fdde010fa34b8b34ba366f4acc331625b1f3b9cbfe4fb79a29bf SHA512 b14a3afb99fe0bc003b8cd021178d1a9e4d8306d51bce4dfd977875a718f42649144f980ed0da4553ba17738bba8c13aebf10eb5ed1e29897393845e59a799aa
 EBUILD courier-authlib-0.69.0-r1.ebuild 4511 BLAKE2B 2dd9250efd5570d1b7daccf670648bff90301c57df511503058dec0585601a954cb8ed5a58121ac32dd4c0410854148e25ce45f871ce47333595ada90aa878fe SHA512 76786b563120a896110e987b86587a80211cb49f84af86861bfafa301134d13f16997d7411da6caad0466a63ecddcccfaff5cd6e71110766413128f808098180
diff --git a/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild b/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
index 915013de6864..db15b6b47224 100644
--- a/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils flag-o-matic multilib user
 
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86"
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
diff --git a/net-libs/daq/Manifest b/net-libs/daq/Manifest
index 61581b1c021c..7f48f01d954e 100644
--- a/net-libs/daq/Manifest
+++ b/net-libs/daq/Manifest
@@ -1,5 +1,7 @@
 AUX daq-2.0.6-parallel-grammar.patch 560 BLAKE2B 73cae026bca21c573a3871b1a7d97d3fce93f0d66328a840003b0b538792bd8439745081bbda3742d59b5f0880a4a844e919b6db6a19601bebababfe138d1ebe SHA512 d22182c91be6283a057f7f33ea093ba064f8a880fbebc3342ae0ab2d2923fee2fbb2ef1ec69b144b0dfb2fbca09c0f6a6421a961a88832d7b952907e6c2e2665
 AUX daq-2.0.6-static-libs.patch 5093 BLAKE2B a374f1d8aa237f55a102dff62084ff3cf62b9672f72448af4f6a1c29aff1f3453e0a49bd4d6c8b209d928425f71bf21d2272a9f6733fb72cc31e52f7ffdc04d2 SHA512 ef793b31c2759366f9890afb8229ce6e47552d4634ea3ae05c77dd55eb674be5e35a9443d271414671945b85dfb7f316a347df94ffea687a382f0b562b191102
 DIST daq-2.0.6.tar.gz 518013 BLAKE2B 702ab20c776b9047230bb1ac36574068e461a850ed5d15959c314d62b0b828c792cf23d19cdb411ba8c067348ae74dd2f011376ccbe0376c44536ad58fa1bba9 SHA512 61dd5408c587e57999445b9549ac539ffc5bb16ddc179601de1065fc5e251c1893536d8aa2251096e34b54093529d3578e7b5d97e3514cb2bbf4de113639b08c
+DIST daq-2.0.7.tar.gz 520287 BLAKE2B 799a8e240c9e359a08ac74ef4fe0d92882d4635f270beaf5f5077bb20cc200d6cf8c55e2c68a59ecabac361ce00619d66ddeb4d7e9a25094b16b3a858673099f SHA512 9bedddbc2d952526ab4e1d65f4507eb914507f8b3b5702ecf7137f8a210c690703469162a117a76cb8376a5639db46bd767fc48789ba7294a0bad26d4cd0ede2
 EBUILD daq-2.0.6-r1.ebuild 2053 BLAKE2B d47824d0990ffbf3d91ab7af37b72716983bf491f465c48169b6cb87bd3ebcb4b08a25514262dc207b6bcc68586119c84ae63f9d1274d09d75197a9a521edf35 SHA512 2131265fcf2b167b6d8b2f51edcf614cae22090feda1e44bb42167ad3f5b5b6f81c8892a0d3dac7bcdb75c187caa156eab8e17232268c668c33c510f43b490ef
+EBUILD daq-2.0.7.ebuild 2055 BLAKE2B 0590830a5cb57f6c89cbda9d8de1cc239a2eb7b42d05c27ca03b640529659681d0e4f912649b49f5d681f6275e4e158cc2987bdb2e18c5083b8e14ee7a8b4f62 SHA512 8dbbd565bb209bad4cb947ae6534529a8212769420cd6a81d3cf06ca19d9db5aa36a78a75ad5cef7a7c08b082487b00b09fec1f51d45d537acdf666f0ccc1066
 MISC metadata.xml 1416 BLAKE2B 33ab28e9bac28d75031405b2ce3b47f2b797d244853bef86f586330a1bc7558a21edf325297e0aeccce08e5eefdd29fad45cb50da6f6e6d62ee82c56d7c17b81 SHA512 77a8d9f238958948d3582b3d9a9bf859c03bae5d544728270a18a5db1c221745c4fa7044fb1959e4b0811864f33de5f9bae67bcd25aa6c74d3ca74f386e6bdaa
diff --git a/net-libs/daq/daq-2.0.7.ebuild b/net-libs/daq/daq-2.0.7.ebuild
new file mode 100644
index 000000000000..9abd84733239
--- /dev/null
+++ b/net-libs/daq/daq-2.0.7.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit autotools multilib
+
+DESCRIPTION="Data Acquisition library, for packet I/O"
+HOMEPAGE="https://www.snort.org/"
+SRC_URI="https://www.snort.org/downloads/snort/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 +afpacket +dump +pcap nfq ipq static-libs"
+
+PCAP_DEPEND=">=net-libs/libpcap-1.0.0"
+IPT_DEPEND="
+	>=net-firewall/iptables-1.4.10
+	dev-libs/libdnet
+	net-libs/libnetfilter_queue
+
+"
+DEPEND="
+	dump? ( ${PCAP_DEPEND} )
+	ipq? ( ${IPT_DEPEND} )
+	nfq? ( ${IPT_DEPEND} )
+	pcap? ( ${PCAP_DEPEND} )
+"
+RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.6-parallel-grammar.patch #673390
+	"${FILESDIR}"/${PN}-2.0.6-static-libs.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# We forced libpcap to 1.x, so we can set this cache var so
+	# cross-compiling doesn't break on us.
+	daq_cv_libpcap_version_1x=yes \
+	econf \
+		$(use_enable afpacket afpacket-module) \
+		$(use_enable dump dump-module) \
+		$(use_enable ipq ipq-module) \
+		$(use_enable ipv6) \
+		$(use_enable nfq nfq-module) \
+		$(use_enable pcap pcap-module) \
+		$(use_enable static-libs static) \
+		--disable-bundled-modules \
+		--disable-ipfw-module \
+		--enable-shared
+}
+
+DOCS=( ChangeLog README )
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	# If not using static-libs don't install the static libraries
+	# This has been bugged upstream
+	if ! use static-libs; then
+		for z in libdaq_static libdaq_static_modules; do
+			rm "${D}"/usr/$(get_libdir)/${z}.a
+		done
+	fi
+}
+
+pkg_postinst() {
+	einfo "The Data Acquisition library (DAQ) for packet I/O replaces direct"
+	einfo "calls to PCAP functions with an abstraction layer that facilitates"
+	einfo "operation on a variety of hardware and software interfaces without"
+	einfo "requiring changes to application such as Snort."
+	einfo
+	einfo "Please see the README file for DAQ for information about specific"
+	einfo "DAQ modules."
+}
diff --git a/net-libs/dleyna-connector-dbus/Manifest b/net-libs/dleyna-connector-dbus/Manifest
index c058d717f1d2..f85476c319c7 100644
--- a/net-libs/dleyna-connector-dbus/Manifest
+++ b/net-libs/dleyna-connector-dbus/Manifest
@@ -1,5 +1,5 @@
 DIST dleyna-connector-dbus-0.2.0.tar.gz 324464 BLAKE2B f97452490787180f51054c32894ce876b5cc500f39dfc11c8c63052c9eed53ce9bb049e1b725a729e1598b162baecc39d19660616c78823d9f7edf90b4955e30 SHA512 0a1fc71fe299b295e86e47f2e356c89abc77f710e84bebe0f26fdb2ccbba5e693d5c8fc73133d46d902ba700f4369ade988f571ae7475f3325d5d5cce382f1d2
 DIST dleyna-connector-dbus-0.3.0.tar.gz 17306 BLAKE2B b019066f31d6e050b130164e9b3a9dd8e29317db1f93e85c257e1f6f6af7c3310d2fb685d99f12d6eaa00ba983e6e1e88b6d6ae2bf533b117bde16b6d36bde32 SHA512 f1edba6a835575daadb0cc544e0ce5e89bde278d2fbb6802211d3e064e478a3dcb88a2b6d6cbc6b2794a63daf64d33f50795ec67bcd8f00281dbcabcbdbc0468
 EBUILD dleyna-connector-dbus-0.2.0.ebuild 555 BLAKE2B 4d35e80fbd1409d9c636f4941a61337a12a5814c7a9042b01a9949ae580959ab919c990bb913a0c365c76864339cc51aa6c5556ac3f1099070832da4c94cb262 SHA512 55edda4d376d71c7998e38d4ded73383755c7ca35f527d58dd75e10cb19d00221a72e36a77d37570e14466a7adff93d3469752bf28f1b2a8f1285e59f40e66c2
-EBUILD dleyna-connector-dbus-0.3.0.ebuild 639 BLAKE2B f2ea636111735e778446961f6ccf68f333e122bdd93db8bcd59430fb5c86c094cad862bd775cbfb167bf0a23a4f536ecd852b614d6d868343fa3852c901bf1d4 SHA512 5fa2dd05cbf5727d7c8864b3fae468390460817ebea7a632a48af3a6366ca97189bd1a1cd9143374bfa932a85e811b65b3ba37b42f046368e85d3d331370db50
+EBUILD dleyna-connector-dbus-0.3.0.ebuild 637 BLAKE2B 0df025f36e2e539eab70fe9295ecacfaad743b4944359d49a85e32e17055bdfaeb15eda6aef63fcc706e5c6510850f142ad34b12832afe7c0873ce81c78dc3d5 SHA512 f190860df4b26ee67acf494256493de0fe71031b249624c627df4f27512c0de5f22cd4a21e78f3c8cc532cb5b627104b8349e9f174fc4f05eb8d47352ee95c36
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.3.0.ebuild b/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.3.0.ebuild
index a43e8f618081..db2518f7e13c 100644
--- a/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.3.0.ebuild
+++ b/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar_2.gz -> ${
 
 LICENSE="LGPL-2.1"
 SLOT="1.0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-libs/dleyna-core/Manifest b/net-libs/dleyna-core/Manifest
index 5a96e3eabf56..c1e65672915b 100644
--- a/net-libs/dleyna-core/Manifest
+++ b/net-libs/dleyna-core/Manifest
@@ -2,5 +2,5 @@ AUX 0.6.0-gupnp-1.2.patch 2499 BLAKE2B 70528c690f684bc14ee39c256fa315407628f9aa7
 DIST dleyna-core-0.5.0.tar.gz 337307 BLAKE2B fc2b342d1cfd3b132f10bea55b386f7fc0fb31cb541272c5cc002c985b2830c9ac425c497feeb62ebc2bdad76d91f9123408dbd00b24080d1a3b1902e8743727 SHA512 8611ae61482dcb0ca55513ed4ce7cae9372f88d710033e5abbaeb3c06533a7b2ac143757776bf9ced0dd3f0149ee9f2e42e90fac3ecbbeb42f38d13aeae7849f
 DIST dleyna-core-0.6.0.tar.gz 30821 BLAKE2B f97ef825ef28efd58877487074c0146f8c8425b000537a2281ab44465829030ba9b837f95ad16b56044837a3e571a0ce54a8126ddafc2dda551dbf1d8b11a79e SHA512 cda3f3ee2bea860b06447ab79d8ca62a29c8d26215774c44adb05e57316b95acd4df6ee4ecdd731574b6da5b3aef1c08977a649288004a62a88af38a83157b57
 EBUILD dleyna-core-0.5.0.ebuild 535 BLAKE2B 3d2379127ad4b6d79b666822f1761c2da5689c41a9d2de43ad89c9c98ee45b98735c2386692623f8a7bd312c9e25897d0ad68eadd5c6edb7c6ae310106d3c991 SHA512 06077ab0daed7261b0fc4a33101b1b9eec748cbede503c78194aa914b98de47dcd69d43f728ce1448280f692e3f42980e77418abaa0a14124cce24c35b651ee3
-EBUILD dleyna-core-0.6.0.ebuild 670 BLAKE2B 7eea5157042c64aedd7349c3f5b30432f65b4857e5ba3d05d2aca09c6d0ededcbd1d1e7b144d967e3b081ca0fabb11ced61fb728e77b7523bbc3c411225c4386 SHA512 a436bfcead55112a25a5c3852029222dc0ff43c279c8a4e4d559e644a0b08b6a099a3a69da9565367a0e3789602f1a85d8305c1ac071a3b34f093f05d5fc8744
+EBUILD dleyna-core-0.6.0.ebuild 668 BLAKE2B b05d36f6c169d9fc68410241948844d1ea23be45009564e40b0ce88bc5b6455e97e9a290ec48c83ea95705bc4f3d5fe37f7fca706bbfd1f0b798a747bd14e4b8 SHA512 5d903a4aadee9e075903d75f0a4aba11beaced0ea7a5d03120fddc08b321175640785e5b0a6b3848cac1a81e26b5c0471ae17556b69df49f894eb4d6cc43e5dc
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-libs/dleyna-core/dleyna-core-0.6.0.ebuild b/net-libs/dleyna-core/dleyna-core-0.6.0.ebuild
index d60cf90fb902..14d487b56a91 100644
--- a/net-libs/dleyna-core/dleyna-core-0.6.0.ebuild
+++ b/net-libs/dleyna-core/dleyna-core-0.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar_3.gz -> ${
 
 LICENSE="LGPL-2.1"
 SLOT="1.0/4"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-libs/dleyna-renderer/Manifest b/net-libs/dleyna-renderer/Manifest
index f11b55d0df06..9a6f79081e19 100644
--- a/net-libs/dleyna-renderer/Manifest
+++ b/net-libs/dleyna-renderer/Manifest
@@ -2,5 +2,5 @@ AUX 0.6.0-gupnp-1.2.patch 27528 BLAKE2B c9c872faac1fb257aad958d167627b38557455cd
 DIST dleyna-renderer-0.5.0.tar.gz 378208 BLAKE2B 4a1b9e28310c2dd13baa9dccc1f35b2190b6af852da5a3a7ee77766affd7c52312e68b34a881652f3dbf6f71f0e25a69988ed2ff6ce897dc4f74c60793e06359 SHA512 28802057d6e0b7da24fd8abb11748faeb78ea6ef15ce85d83907497ff252c86cec1072a919e64bab6df0a375e0092c1281569802515fb87d9dc083098f1d4820
 DIST dleyna-renderer-0.6.0.tar.gz 65566 BLAKE2B cfd2b5a08b2e5c6e15006e722c4878281bf7f4b6d8a9bd317ec5b27fc1568a2ca891af2ac2fc3c230f65e9920bd524b4fbaf43631192b079b2aea051783d2b8a SHA512 f4cb6c658bfaf620962eb6b84ab6b41be1bb8455ac1ff358db7fcf3db7f5c4e2130bb7b0e5201005c738e892aabf25b3cf2a3e1cc1f4a9ef9d834789b87c0183
 EBUILD dleyna-renderer-0.5.0.ebuild 782 BLAKE2B 7f81aacd9026c61e430e155020ffcec8073db3a1c499ed76e552701ec38358da81e4b2daebbf7e1ca21754f8ec2e23ba47114b3c4421f6f22ac1ed79b4f9c10c SHA512 ecd401208c765811d463ad81c886518f1a1339660e83f5495b1de343d53650de18e0f0eb9d9c9c30af8cdd41b45cd36d3162f62c16d792277c3f370a1ee3a6d1
-EBUILD dleyna-renderer-0.6.0.ebuild 876 BLAKE2B d68b6f44b7bc2c899f37bae971357bcf02809f7a56eb8475404bab3ec7b8b14a22a0d1aed267a4be7ecb3b8ccb001ccacdf6a4f1d5f5f3418f77a7f004235e45 SHA512 4701cdb56bb0cf119025d56eb34d6bb5dada81bf55b0a54697aa05a9842d87b434219d007f586ac1858f42f1165ea69b549469de1ce004e99670de6faae56495
+EBUILD dleyna-renderer-0.6.0.ebuild 875 BLAKE2B 371fd80bffb2c8c939716c2923509d7b37e593676d48057706807b523f5fc8d0cbb03521546f41142f384dcf5c997fd7913342bef40729975b17bc3c3c0f12e1 SHA512 163e8fd9f330902f44ccd9b817b686368a39b4f6eb112f0d88e02fbde088a2757b51eea24e787ef3c40fed5350a92ebe8512be897351e93806c8b36c62481bae
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-libs/dleyna-renderer/dleyna-renderer-0.6.0.ebuild b/net-libs/dleyna-renderer/dleyna-renderer-0.6.0.ebuild
index d8d20888cdb8..57b99c96aed7 100644
--- a/net-libs/dleyna-renderer/dleyna-renderer-0.6.0.ebuild
+++ b/net-libs/dleyna-renderer/dleyna-renderer-0.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar_2.gz -> ${
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 DEPEND="
diff --git a/net-libs/farstream/Manifest b/net-libs/farstream/Manifest
index 11e1c6555ab9..5db3263efe97 100644
--- a/net-libs/farstream/Manifest
+++ b/net-libs/farstream/Manifest
@@ -1,4 +1,4 @@
 AUX farstream-0.2.8-make43.patch 1959 BLAKE2B d7c18eaf156a6cca991014dc512898cf93f1b67b10c78f28bf6cebf772d4a8974daba1305f06d7087f43fd766218d49724dca471835fcfe5dff06a105f40bb53 SHA512 c577c5f9fb384f93ce7e36cff117d3c2dea92dc7b15064dfed19d18fc5d8658044df19e2f0cc112cd347e35c6038501e0b05a1f97c95b0f43f776aabd8fba01b
 DIST farstream-0.2.8.tar.gz 1315548 BLAKE2B 3f90e6150fd13d02369837b019ad3b935165130b8396133697d0819861f5a5ed79c6eab3efdc3bcc5a6887807285bece21f188bc756ec3cd64a57f5682f5b348 SHA512 7ec5c57f8778f4107cb628dbf411e38b726152cf78920127dff4423239ff7e4980b6b4f938abba2aa21ab984b1e3053e7e648611322a0ce94df0af576df99a7e
-EBUILD farstream-0.2.8-r2.ebuild 1953 BLAKE2B e9c9f5de6b43a6247c4baccce3efb5479800fa644c00101006f23f736a9da3bf6d3094bd19d884ba7080eba6282cc188738316926e892bec56d105005b229433 SHA512 12809e87540775ebfcafff08e2ba0a87f068cb17bf03f013886c3db8a13d38412c7a5e944f168aa11baf045ef81b55dd2abba7da635346886c7f2a5c49804882
+EBUILD farstream-0.2.8-r2.ebuild 1946 BLAKE2B 8da038d48c83edc62bd767a6618ff2738e076993fb9059fcc555cf54e8e4b96569112925005df63305e60e3d2db2557fb1ec6b4168a9587e89dbb36c1d67941c SHA512 bb0969dfb2719affdd18236701b3366c8b5dffc043dae9b171fc59fb80d747d546b11bfa723fe39ce09226699d909ff6eafb2f88b754d6a4af59627f1218e62b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/farstream/farstream-0.2.8-r2.ebuild b/net-libs/farstream/farstream-0.2.8-r2.ebuild
index 6f6083115146..2325786f6d30 100644
--- a/net-libs/farstream/farstream-0.2.8-r2.ebuild
+++ b/net-libs/farstream/farstream-0.2.8-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/Farstream"
 SRC_URI="https://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+introspection test upnp"
 SLOT="0.2/5" # .so version
 
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 17e1d47fc749..791ec2521232 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -3,7 +3,7 @@ DIST glib-networking-2.60.4.tar.xz 185628 BLAKE2B b10fecb88f09c4c33718a923f6ae57
 DIST glib-networking-2.62.3.tar.xz 183996 BLAKE2B 3841a355fe485f30970ab571fbe7ae73c8351cdcdad5021809fcac4663bca31b309a0921d07b2551c428ac154da2290e377da0299e66b2b099dfb556f387d18b SHA512 6bcf7584a4d97745e980598eb9182ba2e416471455d9c3debc4cbaea07250e395f6d7001af544ce0114a26d726e71e9b420d9756508cda09499016e89f4a6da1
 DIST glib-networking-2.64.0.tar.xz 187708 BLAKE2B c80a575a48bd5fd77a53a823e0a1ad98f63f75a1f83990a9ba28bd35b401f867b5be0afb3ce2650855b34e6d5a043b354086620c6c1caeb93feeeddab92292e1 SHA512 c5788167c114ab69812d4784912e0e468086f1ba1a8037dffc98466605af3f7a77f7a2666176da260669640bfbdf94ee959878c6297d93fe078d22fc6ff0584c
 EBUILD glib-networking-2.60.3.ebuild 1767 BLAKE2B 2333935562c3520aecac692b63c22d5693322ef3c823678349c48895a6835e239259ffc1ff7e733838c8c48edd385411ace855e845ea454e41a1c828abdacfd2 SHA512 1b4a8e165182cb3ceea9587fcb18747cb9a33fb01571767918ec313e06c7161eb5a9553327aaa648827c6b338fc7612823d3ad31c729b8f0ffafef30b231d723
-EBUILD glib-networking-2.60.4.ebuild 1769 BLAKE2B 0b367e7a9a067c8142a9c7973b34b3130c179c3f6796f0ab4754629f53a3100466c3af381ba84d80eaf29cd226b4b19127edf50779a2eff909948d88a7e1337b SHA512 aa6d7172e9f785e08e9c02e0eb6508ea584bc1c3498b4872a3a11fe7ee429c707329d32a88455a9d2ef30ddd52ec9372fdabe9930e706d9989d35568864e03d1
-EBUILD glib-networking-2.62.3.ebuild 1776 BLAKE2B 6602ebf3b51f128e82f741912e308c60d6752391c2366e8e0c83a221b86953a5f43b51ab4896ac067efbb29f8277482fed3924e8d1fd6ed9428678b36f6165fd SHA512 32584107b3d4679f1bc4f469de74b55728332852bf3b8d8776724e17d69df70276c54a0366933831e7a4c575634095b8c8688b6c1dd32ac53d21b4e7f3ab67cb
+EBUILD glib-networking-2.60.4.ebuild 1768 BLAKE2B 538b73f3333222d08f6372ea0ee3786e815fdf2254536dc96394843086b4736fe242b7fc9b5d45f517894967b1996fd86d0314d7b47b8795d2f1e6ac34f1283b SHA512 18b10cbc2faad2bde904c6a2a8f560d341b98293dac97a8c27d1b8b738531d624f571c2a6481db66f0e7ddd2a46ebd1b391e62ba06ead6e6510c340ddb888673
+EBUILD glib-networking-2.62.3.ebuild 1771 BLAKE2B 3052d0f77c4472f791a37a8bc32fa4a883abac831d6046c89ddfd22a4e4aee6bbbefae85efc2541f1ce54bbf01603e4dd408d334a2faae8a8999dbc1cfe42e05 SHA512 0725e3e7941bab3ee2f76122aaf5941453b858099f40463cc6ad92b0fa61ee28634f4b27b4ff346209ddc144837e24b148138e0001b14dd159db45966f91afc6
 EBUILD glib-networking-2.64.0.ebuild 1776 BLAKE2B 86f26398b596fc5ea94ed0bdb750523fcb3daeba92d8fa6425b97195477932aba70f8d31379bfbd4e12f2c30f1bf83547849042858072f0e49bc2149cb5cb4c9 SHA512 e8221e8d4c0cddcca0dff06fee174d300836ce549f0f9b4d75e9a9e9a658c5a75479379123b5c520e606ee6b958df515b67a2e8875fa3583f71647d8a7ed6822
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/glib-networking-2.60.4.ebuild b/net-libs/glib-networking/glib-networking-2.60.4.ebuild
index 1f70d0a88eb3..2bd43c09e4d7 100644
--- a/net-libs/glib-networking/glib-networking-2.60.4.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.60.4.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.55.1:2[${MULTILIB_USEDEP}]
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 ed132f187d7f..52b1087ad343 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 2e0095c9192f..fdaff3527b51 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,5 +1,5 @@
 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 2072 BLAKE2B bac9a62f53a529c293150b5e8e39f5fcd4dd73a219794696b61f894c8ebfd8154a633491a10aa2ed6a2d7c879f5cd89b00b76057f80dbaa677749fc2343566a0 SHA512 c0c577d896ea31d6eca8a1bfb7ce3eed02310ddf6caefda8aede69852d08553076ae4c27e14c4ddb4d83064a8042f6774ea86c4728d4ceb4a2661f8d1db2092c
-EBUILD gnome-online-accounts-3.34.1.ebuild 2068 BLAKE2B 41cb7bd8ad404bb3d89ca0fd868aa1811d2bec5ae683cfa57e1c397f910fc00aca5f02e59cc6e929e134a462429ce19b760743c91e37ee2ebc87246d859fd55b SHA512 f2de4e3d6ab1d663d31ceea79880f44b1dbbe51f1e4318e2e7f14b88c91e9856d7a00c1295c43c4ff2b8e535d085c3a7ac27eaf1bba9e10b6cd3f3781715cf93
+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
 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
index 3c1547f7abea..603ccca0aba2 100644
--- 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
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
 
 LICENSE="LGPL-2+"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~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/gnome-online-accounts/gnome-online-accounts-3.34.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.34.1.ebuild
index f2f39420fa86..2463c4054f59 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 ~ia64 ~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/grpc/Manifest b/net-libs/grpc/Manifest
index b260265ca33d..3682c2b465c9 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1,16 +1,10 @@
-AUX grpc-1.11.0-pkgconfig-libdir.patch 2295 BLAKE2B 9e9cfb9f150c30bf55a5443e387c9d0e8f3507fdaba56c2ab5cc318f51959e45bda8e0cee39487d8116b76c15da1a7ca9da1e02a5e29bdbc7edf85d508e5e857 SHA512 4648fceb8a6b8a364126ba20ef2cc2f5b4baddfb4f622de93f377714eff793e05062f5bb02b39e2699b00f3cce309fb23a9ea35a9fef3a1df4e3682bd707e8d5
 AUX grpc-1.21.0-fix-host-ar-handling.patch 1827 BLAKE2B f85c3c291f6a62b1b8edd4995bd3870ff8f7aac309d72842ab0e8a3bada377b049422e00d95e420b466fe64d2fe6e6ec44d87d0878805111e87cb2d603e909bd SHA512 2c54890e7c167359c2ff40541d3d071edf0775bcc14594c0ad132d17715bc75d2f9e946751f082dab0e9ff0ee73a9650f6bbd850bd34b2162254bec524d10493
 AUX grpc-1.22.0-cxx_arg_list_too_long_forloop.patch 1850 BLAKE2B b0a681c79bb4ee7cdb686718b4a789ef9aa63d342d5c2ae97beb648da7e1c393c5085def5594ec3361b50e79cf158fe3c557c6da1d979fa42e07fc482e683133 SHA512 3149797334f06b79fccb11ab9c4b18a5c5c4263ba36b01d3edb29981f562937fd3b4cf90ecc34188798da5ea6ae564a34161819e499b665425aadcd3995209e5
-AUX grpc-1.22.1-glibc-2.30-compat.patch 3169 BLAKE2B 35e3631c607994ee8519c2794f75f3e2a33f6b65aefcea508f15ba5e22fbf4fe8e0d3df6f5eae4cf08357b5f231db926b525c38b714b3fb7f5916c3ccc262b87 SHA512 cd9f507d6101e356f1fa5d5f502f49ab3c3988acdaea68de5359cbb0de4f4d50983b084cd0612cb5f1a27319076a87252328fcafb0dc47160914be8833d28d9e
 AUX grpc-1.25.0-pkgconfig-libdir.patch 2199 BLAKE2B 4625e03eeeab9235fa1615bdfc485a5a0f0304ce4613b3f0ec0d0edf0d12d04d48a34fd30e680ff48bc1a7a7838d1b1b51ce58921a20472b5be0ad60dbce23e2 SHA512 93077a0cd6fd48694238b42fc60c2c986232ff863b09d068aac3f813733de5a7b4d3ac32929ad4e58e93e2990d5903cdf0b7491a0ea924402262d04b75fdb57a
 AUX grpc-1.3.0-Don-t-run-ldconfig.patch 1957 BLAKE2B 945ca98ffe0a55bd6e277d3c6d967014d77df8fdf7c708fa275e003df6fda5ce32206069a9a173c41f1d77d8eec38444190bdf15cdd5891142ec5d632bf9af8b SHA512 8e691f56cf6ac348d2516ffe022216fe92132c4266bdc55989238fca37ef3e4cb8c08f261ea41a3c4cd36b5e6dbd20122d75cff77a3924959b5e2e9302a494be
-DIST grpc-1.22.1.tar.gz 15083781 BLAKE2B 5f1bc2fc638cfa2f97df9dfba3c927ae0c7871b9e56f8012795000c30f20fa4d5c1bad37d117cf8ea54fb372b8b02702a866c027c6e0a467f276a752ee9d17c6 SHA512 086ceb7a4fc1439bd23a2cab8c90ba2542491d5a9c278a0ff6e1b3ad623cf7725b2a7310bb793d9b36882bd9394d02a3616331ac26c78d822e68b305c2ae27f6
-DIST grpc-1.23.0.tar.gz 15212436 BLAKE2B 119a62e6573a1c7785934f7752d9bf2fc0f503a268e439ce143d6730994e3fc154ffd558a2fb3776a77f5f36798baac334f50d1c612ae5564c3c2f110df8b42c SHA512 4770651bd73b71735152155327c44d59125442b405157ffea8fb80b6f16406dd388474394e44ef620e2a777018121988a3a7a552a42141650d7cac263ab499a0
-DIST grpc-1.24.3.tar.gz 15364420 BLAKE2B 7a1262ee931c2578399e7373e25fefb7a4329a2c0f139b17fbd4073406a931730393016455ff3ddee8b686ebb7903a898ca532972f57369c7658c68643b6d715 SHA512 19afa8b1fd64c429317c85d8cf42d01af0ac6aec82508740c176e1fd4f92dea9531ea9812523215ed67466bae93a75e14dc34cd9cce5987a13c0104e0313c69c
 DIST grpc-1.26-fix-odr-violation.patch.bz2 6320 BLAKE2B d7551a54c7a846cd8545a9cb0204e28f1d94b6a0a28b9093be1337127e76256c29e2ff9739ef1791740371d4b30520305c3c5908216030f4b23488c250248256 SHA512 c020eb40a3a494f8ef4a0ab6efc7a832c844c365d006a1d9512f0451af4ff33a11a185cd0ecd1afa0c546b190efcf8a0fef9e543f8fac35e65da10a2df34cd61
 DIST grpc-1.26.0.tar.gz 16673794 BLAKE2B f72d1997366e5e6e8b6b554149f90a187cbaea65da0070f4525739db38c053c6b280509f2faf2ec0e283ab9b7d000efda46b90b18143cd5ef8c1ec0881e00d3d SHA512 4f7d067c582d0a9be7b7d4dd1e08acdbe6ff0686dfe92b5db5b7927f779410a4237acfd1c61d9f79eb2d00f86cf93cc7492fa372c1877e57c1aa23e9bb2648bb
-EBUILD grpc-1.22.1.ebuild 2639 BLAKE2B a915221d71d7290199f338ab2ab0d797dd9732890b16f38105e520fb1d6c6fbc11a8cea56e3d6bdd7d212bca80f7d6c6258f9e7b2d10e9a201663afbfd767a90 SHA512 61ea5fd71406acba3e8b7b2fabecbdecd2d9f03fe0a0562d5be8beb3c178f5e76a947821192943ba2b7568cf2ad1ff2bd2c0dfce8cf550ca727c3dfd3401dfe4
-EBUILD grpc-1.23.0.ebuild 2639 BLAKE2B a915221d71d7290199f338ab2ab0d797dd9732890b16f38105e520fb1d6c6fbc11a8cea56e3d6bdd7d212bca80f7d6c6258f9e7b2d10e9a201663afbfd767a90 SHA512 61ea5fd71406acba3e8b7b2fabecbdecd2d9f03fe0a0562d5be8beb3c178f5e76a947821192943ba2b7568cf2ad1ff2bd2c0dfce8cf550ca727c3dfd3401dfe4
-EBUILD grpc-1.24.3.ebuild 2546 BLAKE2B e674d2495e07f5eb4f210dd1bcec87549987460a4340723160c5e04c8b8874b17b9a39d8c890c602eef96d82853e98c7effac8e9766cd196df6c6116145e81ae SHA512 94dab7dafaea4f86de5609d912616033ce9cee674e430af358b2c94d2415f8f008141b523039b8252c1864e72792b837c30782f1c874dbbbd9c5582e2e38bbb0
+DIST grpc-1.28.1.tar.gz 6888015 BLAKE2B 92d6f4a655183d34979c668bb7f4187a6670aa8ff5609df7b19fc7cadb57756fdc2322e57ef328623b1d91e63d8891ec0154ccef827c0302c14d986c6d9d179f SHA512 5cc4993470e2df21447d032ddeb65ab4175bb8acad5a06fdd22564068b80a5be255ef0e44d36732642d39dc3eaec02a93d2aaf6e369ad5dc43ff99b5023f357b
 EBUILD grpc-1.26.0-r1.ebuild 2685 BLAKE2B d2b51dc050788e587b9e0b631db41f0706cc1f0366b44bf5492fa6131fa8bac0866340cb60a6f83c7356e99a9faacc7174c49681a24bd8b3f0f38ac10c11c8c9 SHA512 95bde11e513f1ffe08969c8a50e8354ce41423fd08f7f659ba2024defe2311caa0878a7aebc1d421b77e1ae1ff48ed0e41b3df7aa42518765e20b5f31275d618
+EBUILD grpc-1.28.1-r1.ebuild 1649 BLAKE2B feee01d962a31f7942b7673b9464f88542553ab8a4159cfac58e7158271979b13931d82cf19a7346d75b952637e16abc763904f4de239f44c4738ec67919c5b0 SHA512 533987b156f6dbd7f69c0eee45fd24de0f59ccd8babdcd0467d424137536a86afcb62584c3e6314e91f4e413c49f65faf9833f4940419b4bc5498016a0bc9e89
 MISC metadata.xml 630 BLAKE2B 1798e243492198d1a5df8cd8928ce592e243bdac8d68cf7089af016b0c7579d8e89ca90f81cda221a33d60f224d51e93b4cdb1464f8ed64cfefd3e1dccc695ef SHA512 f7c2aa3e76f18e30872d2ee9154290509b7d946d388bbf767505dfdb87dce9716b19cdbf53f2fc72dfcb79cc809b843b2660b6828682aa9f887cfba8c623fd93
diff --git a/net-libs/grpc/files/grpc-1.11.0-pkgconfig-libdir.patch b/net-libs/grpc/files/grpc-1.11.0-pkgconfig-libdir.patch
deleted file mode 100644
index 257bef8aa140..000000000000
--- a/net-libs/grpc/files/grpc-1.11.0-pkgconfig-libdir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/Makefile	2018-05-28 17:59:34.631540261 +0800
-+++ b/Makefile	2018-05-28 18:01:31.266936000 +0800
-@@ -460,11 +460,11 @@
- CACHE_MK += HAS_PKG_CONFIG = true,
- endif
- 
--CORE_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CORE_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
-+CORE_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CORE_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
- 
--CPP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CPP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
-+CPP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CPP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
- 
--CSHARP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CSHARP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
-+CSHARP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CSHARP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
- 
- ifeq ($(SYSTEM),MINGW32)
- EXECUTABLE_SUFFIX = .exe
diff --git a/net-libs/grpc/files/grpc-1.22.1-glibc-2.30-compat.patch b/net-libs/grpc/files/grpc-1.22.1-glibc-2.30-compat.patch
deleted file mode 100644
index 90bd9115893f..000000000000
--- a/net-libs/grpc/files/grpc-1.22.1-glibc-2.30-compat.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From d1d017390b799c59d6fdf7b8afa6136d218bdd61 Mon Sep 17 00:00:00 2001
-From: Benjamin Peterson <benjamin@dropbox.com>
-Date: Fri, 3 May 2019 08:11:00 -0700
-Subject: [PATCH] Rename gettid() functions.
-
-glibc 2.30 will declare its own gettid; see https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92. Rename the grpc versions to avoid naming conflicts.
----
- src/core/lib/gpr/log_linux.cc          | 4 ++--
- src/core/lib/gpr/log_posix.cc          | 4 ++--
- src/core/lib/iomgr/ev_epollex_linux.cc | 4 ++--
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc
-index 561276f0c20..8b597b4cf2f 100644
---- a/src/core/lib/gpr/log_linux.cc
-+++ b/src/core/lib/gpr/log_linux.cc
-@@ -40,7 +40,7 @@
- #include <time.h>
- #include <unistd.h>
- 
--static long gettid(void) { return syscall(__NR_gettid); }
-+static long sys_gettid(void) { return syscall(__NR_gettid); }
- 
- void gpr_log(const char* file, int line, gpr_log_severity severity,
-              const char* format, ...) {
-@@ -70,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) {
-   gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME);
-   struct tm tm;
-   static __thread long tid = 0;
--  if (tid == 0) tid = gettid();
-+  if (tid == 0) tid = sys_gettid();
- 
-   timer = static_cast<time_t>(now.tv_sec);
-   final_slash = strrchr(args->file, '/');
-diff --git a/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc
-index b6edc14ab6b..2f7c6ce3760 100644
---- a/src/core/lib/gpr/log_posix.cc
-+++ b/src/core/lib/gpr/log_posix.cc
-@@ -31,7 +31,7 @@
- #include <string.h>
- #include <time.h>
- 
--static intptr_t gettid(void) { return (intptr_t)pthread_self(); }
-+static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); }
- 
- void gpr_log(const char* file, int line, gpr_log_severity severity,
-              const char* format, ...) {
-@@ -86,7 +86,7 @@ void gpr_default_log(gpr_log_func_args* args) {
-   char* prefix;
-   gpr_asprintf(&prefix, "%s%s.%09d %7" PRIdPTR " %s:%d]",
-                gpr_log_severity_string(args->severity), time_buffer,
--               (int)(now.tv_nsec), gettid(), display_file, args->line);
-+               (int)(now.tv_nsec), sys_gettid(), display_file, args->line);
- 
-   fprintf(stderr, "%-70s %s\n", prefix, args->message);
-   gpr_free(prefix);
-diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc
-index 08116b3ab53..76f59844312 100644
---- a/src/core/lib/iomgr/ev_epollex_linux.cc
-+++ b/src/core/lib/iomgr/ev_epollex_linux.cc
-@@ -1102,7 +1102,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker,
- }
- 
- #ifndef NDEBUG
--static long gettid(void) { return syscall(__NR_gettid); }
-+static long sys_gettid(void) { return syscall(__NR_gettid); }
- #endif
- 
- /* pollset->mu lock must be held by the caller before calling this.
-@@ -1122,7 +1122,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset,
- #define WORKER_PTR (&worker)
- #endif
- #ifndef NDEBUG
--  WORKER_PTR->originator = gettid();
-+  WORKER_PTR->originator = sys_gettid();
- #endif
-   if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) {
-     gpr_log(GPR_INFO,
diff --git a/net-libs/grpc/grpc-1.22.1.ebuild b/net-libs/grpc/grpc-1.22.1.ebuild
deleted file mode 100644
index ac5d817126d8..000000000000
--- a/net-libs/grpc/grpc-1.22.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_PV="${PV//_pre/-pre}"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="examples doc perftools systemtap static-libs"
-
-DEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist]
-	>=dev-libs/protobuf-3.7.0:=
-	>=net-dns/c-ares-1.15.0:=
-	sys-libs/zlib:=
-	perftools? ( dev-util/google-perftools:= )
-	systemtap? ( dev-util/systemtap )
-"
-
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-# requires network
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/grpc-1.21.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
-	"${FILESDIR}/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch" # https://github.com/grpc/grpc/issues/14844
-	"${FILESDIR}/grpc-1.22.1-glibc-2.30-compat.patch" # https://github.com/grpc/grpc/pull/18950
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	rm -r third_party/cares || die
-	sed -i 's:-Werror::g' Makefile || die
-	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
-
-	default
-}
-
-src_compile() {
-	tc-export CC CXX PKG_CONFIG
-
-	local myemakeargs=(
-		V=1
-		prefix=/usr
-		INSTALL_LIBDIR="$(get_libdir)"
-		AR="$(tc-getAR)"
-		AROPTS="rcs"
-		CFLAGS="${CFLAGS}"
-		CXXFLAGS="${CXXFLAGS}"
-		LD="${CC}"
-		LDXX="${CXX}"
-		STRIP=/bin/true
-		HOST_AR="$(tc-getBUILD_AR)"
-		HOST_CC="$(tc-getBUILD_CC)"
-		HOST_CXX="$(tc-getBUILD_CXX)"
-		HOST_LD="$(tc-getBUILD_CC)"
-		HOST_LDXX="$(tc-getBUILD_CXX)"
-		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
-		HAS_SYSTEMTAP="$(usex systemtap true false)"
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	local myemakeargs=(
-		V=1
-		prefix="${ED}"/usr
-		INSTALL_LIBDIR="$(get_libdir)"
-		STRIP=/bin/true
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use examples; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use doc; then
-		find doc -name '.gitignore' -delete || die
-		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 1.16.0; then
-			ewarn "python bindings and tools moved to separate independent packages"
-			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
-		fi
-	done
-
-}
diff --git a/net-libs/grpc/grpc-1.23.0.ebuild b/net-libs/grpc/grpc-1.23.0.ebuild
deleted file mode 100644
index ac5d817126d8..000000000000
--- a/net-libs/grpc/grpc-1.23.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_PV="${PV//_pre/-pre}"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="examples doc perftools systemtap static-libs"
-
-DEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist]
-	>=dev-libs/protobuf-3.7.0:=
-	>=net-dns/c-ares-1.15.0:=
-	sys-libs/zlib:=
-	perftools? ( dev-util/google-perftools:= )
-	systemtap? ( dev-util/systemtap )
-"
-
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-# requires network
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/grpc-1.21.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
-	"${FILESDIR}/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch" # https://github.com/grpc/grpc/issues/14844
-	"${FILESDIR}/grpc-1.22.1-glibc-2.30-compat.patch" # https://github.com/grpc/grpc/pull/18950
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	rm -r third_party/cares || die
-	sed -i 's:-Werror::g' Makefile || die
-	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
-
-	default
-}
-
-src_compile() {
-	tc-export CC CXX PKG_CONFIG
-
-	local myemakeargs=(
-		V=1
-		prefix=/usr
-		INSTALL_LIBDIR="$(get_libdir)"
-		AR="$(tc-getAR)"
-		AROPTS="rcs"
-		CFLAGS="${CFLAGS}"
-		CXXFLAGS="${CXXFLAGS}"
-		LD="${CC}"
-		LDXX="${CXX}"
-		STRIP=/bin/true
-		HOST_AR="$(tc-getBUILD_AR)"
-		HOST_CC="$(tc-getBUILD_CC)"
-		HOST_CXX="$(tc-getBUILD_CXX)"
-		HOST_LD="$(tc-getBUILD_CC)"
-		HOST_LDXX="$(tc-getBUILD_CXX)"
-		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
-		HAS_SYSTEMTAP="$(usex systemtap true false)"
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	local myemakeargs=(
-		V=1
-		prefix="${ED}"/usr
-		INSTALL_LIBDIR="$(get_libdir)"
-		STRIP=/bin/true
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use examples; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use doc; then
-		find doc -name '.gitignore' -delete || die
-		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 1.16.0; then
-			ewarn "python bindings and tools moved to separate independent packages"
-			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
-		fi
-	done
-
-}
diff --git a/net-libs/grpc/grpc-1.24.3.ebuild b/net-libs/grpc/grpc-1.24.3.ebuild
deleted file mode 100644
index ee95dff335a2..000000000000
--- a/net-libs/grpc/grpc-1.24.3.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_PV="${PV//_pre/-pre}"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="examples doc perftools systemtap static-libs"
-
-DEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist]
-	>=dev-libs/protobuf-3.7.0:=
-	>=net-dns/c-ares-1.15.0:=
-	sys-libs/zlib:=
-	perftools? ( dev-util/google-perftools:= )
-	systemtap? ( dev-util/systemtap )
-"
-
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-# requires network
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/grpc-1.21.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
-	"${FILESDIR}/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch" # https://github.com/grpc/grpc/issues/14844
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	rm -r third_party/cares || die
-	sed -i 's:-Werror::g' Makefile || die
-	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
-
-	default
-}
-
-src_compile() {
-	tc-export CC CXX PKG_CONFIG
-
-	local myemakeargs=(
-		V=1
-		prefix=/usr
-		INSTALL_LIBDIR="$(get_libdir)"
-		AR="$(tc-getAR)"
-		AROPTS="rcs"
-		CFLAGS="${CFLAGS}"
-		CXXFLAGS="${CXXFLAGS}"
-		LD="${CC}"
-		LDXX="${CXX}"
-		STRIP=/bin/true
-		HOST_AR="$(tc-getBUILD_AR)"
-		HOST_CC="$(tc-getBUILD_CC)"
-		HOST_CXX="$(tc-getBUILD_CXX)"
-		HOST_LD="$(tc-getBUILD_CC)"
-		HOST_LDXX="$(tc-getBUILD_CXX)"
-		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
-		HAS_SYSTEMTAP="$(usex systemtap true false)"
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	local myemakeargs=(
-		V=1
-		prefix="${ED}"/usr
-		INSTALL_LIBDIR="$(get_libdir)"
-		STRIP=/bin/true
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use examples; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use doc; then
-		find doc -name '.gitignore' -delete || die
-		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 1.16.0; then
-			ewarn "python bindings and tools moved to separate independent packages"
-			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
-		fi
-	done
-
-}
diff --git a/net-libs/grpc/grpc-1.28.1-r1.ebuild b/net-libs/grpc/grpc-1.28.1-r1.ebuild
new file mode 100644
index 000000000000..3619635f8bca
--- /dev/null
+++ b/net-libs/grpc/grpc-1.28.1-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_PV="${PV//_pre/-pre}"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="https://www.grpc.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc examples libressl"
+
+DEPEND="
+	=dev-cpp/abseil-cpp-20200225*:=
+	>=dev-libs/protobuf-3.11.2:=
+	>=net-dns/c-ares-1.15.0:=
+	sys-libs/zlib:=
+	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+"
+
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+# requires git checkouts of google tools
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# un-hardcode libdir
+	sed -i "s@lib/pkgconfig@$(get_libdir)/pkgconfig@" CMakeLists.txt || die
+	sed -i "s@/lib@/$(get_libdir)@" cmake/pkg-config-template.pc.in || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DgRPC_INSTALL=ON
+		-DgRPC_ABSL_PROVIDER=package
+		-DgRPC_CARES_PROVIDER=package
+		-DgRPC_INSTALL_CMAKEDIR="$(get_libdir)/cmake/${PN}"
+		-DgRPC_INSTALL_LIBDIR="$(get_libdir)"
+		-DgRPC_PROTOBUF_PROVIDER=package
+		-DgRPC_SSL_PROVIDER=package
+		-DgRPC_ZLIB_PROVIDER=package
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use doc; then
+		find doc -name '.gitignore' -delete || die
+		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
+	fi
+
+	einstalldocs
+}
diff --git a/net-libs/gssdp/Manifest b/net-libs/gssdp/Manifest
index 148554e0c7a8..7e7d77b7c49e 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 1481 BLAKE2B e811e5597edbc1f4fc80e228e06cbe597d63f0bae0d63064a18597035e37b9d9fb46894f8ba4b5e796c903ac28327edba1171896d3c181ec210268cbbebf1096 SHA512 6210dd03acdff231e83ddbb8595b265b9d338f136238106e9eda5a4be10fb6dfd226f76faff4493523b0e1ccb290a5ca98445bb0b100d0086806705165aa69d3
+EBUILD gssdp-1.2.2.ebuild 1478 BLAKE2B f5480c7a27b165feba3c44a56a5b4384aebc8f90c87fc6ae6e42e1c9a5ca344c913b6088b3d0c8df4d57c046a2b1f7d2b2e38eb57df1c64754d0a74b20fc9e08 SHA512 a5220cea4e096de3b6deb4271ea0d56d83d3dd6f997a116e3c4d0e595388355ba8f49f131b9373d30c442bbd77babbe3ef0a26cb2dc88b515ec802b3cc51eaba
 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 1b098110d25b..b4fddf4dd85f 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 16cd2eb16576..fdc7dbffe4e6 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 1461 BLAKE2B 779d595be3346606cb33e81747bbcfbb1b814a5541a3f3bad2a9adb84fe6eb614498e4d1bee0baf0f2dcc6652f53ed59bdd0cbd17f5bac5116ce583ca83bb645 SHA512 6e47772cc91d76bcc18e20b3b4c3bf9a8791ed28d01b883df39e5a1a6d06c772a80059a106abaa44d1c1ccdf7e1716fc34e93aa351f2dcda7afaf2f7f2e5079a
+EBUILD gupnp-igd-0.2.5-r10.ebuild 1458 BLAKE2B 43e5cfac05b6e6bb445155bd3b61cddad30995f9f5ea70baab4c3968cd7a035cfcb4e0fa9a7255e0dc9079d81d9beaca7cfc0c89a6f570781a4f6fa99456e4f0 SHA512 2fcf2b460ecc2bd5094349dd2aaef41e4067541358168e384fbd2380424b7578a65fe58ab8a8f09deaa2941e06b961723c1d142fc74152ca0b5c5f2e3141fb0b
 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 a413d8fcbaec..fc0f99501c5e 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 da965411e449..6a1576d70800 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 2413 BLAKE2B b34cfc02dafb7294fed57fc3229667c4226aad7ccc17b9db161ca2c8957d1b6026360c795c128892521d7ceaced1e5176cc83f2df98bb60f57fc6a71e521aea2 SHA512 c385bf2dafe03ce757bd3d356de4667f2e222b3940b8e0737919748207b2f758b8aaceb26807cff7e8dd17df9de0a88336540d838ccbfdfc86c698cc6e96d955
+EBUILD gupnp-1.2.2.ebuild 2410 BLAKE2B dcc7398f9dd52d5be647ac4904abeb0a218f1fba8706c6cf917f1e94f8c900482e4a0132a092185c0fe6262869c83c36f65b5140c1b37a4bb07076cac667e160 SHA512 cbe73061e571c580e26d69bf754f6fb80f9d20c753a458b7e41cd5c6fff4d63210c24e0e043ef825df9c441be4b06d309188836cb8212ac2ebb98d1629fad8f7
 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 3e6efc11b133..367abaf8e512 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/ldns/Manifest b/net-libs/ldns/Manifest
index cb2ee63253dc..67369afefecb 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -4,5 +4,5 @@ AUX ldns-1.7.1-Makefile.patch 1020 BLAKE2B f49a397df95bfcc0ee2eba4cb3f7aa9202d8b
 DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
 EBUILD ldns-1.7.0-r2.ebuild 2249 BLAKE2B 9e2df8aee72acc1adab2f9ae23edf8538881e97d2d15a092ebb83af1479f24d460e5dbc4c02dd31708dc3d12e5b860b25e93b855b63747e9555d06dd6782a565 SHA512 30dc0b7d5b0f8d8e644ca66f8ab4870dc6b3bb60baa90e243297dd6480817028a5ea783a8e20088f50d72c659c279ebf7c8a75becbae725566c22e8e17c7cd08
-EBUILD ldns-1.7.1-r1.ebuild 2758 BLAKE2B 036f72618120bbfda4b8700cde764bc2764096f9119f32f3a253fdf93f04c1c034162391818360633e2990b91018ef420c0454f01632af3557e87d5848e860f0 SHA512 043baded9f86526febe1b97a85f3f86f592f93c3d8b44f17e3a712d202f87a36c693467472f8104cc9efa8599303d292a511ff8bb22f88a2c6efc15c4f2f5998
+EBUILD ldns-1.7.1-r1.ebuild 2760 BLAKE2B 9fbd65c2863f21ac0c81f23511d332d979a09afeb91c3931dabb16fbb37cea3c761f26dfc2edb69a3d40daa4c4f3e4ec8d38e9ab2a9ca5dc28bd5c17244fdf9a SHA512 17f01f1e1652bb4cdea6dfcfcd5996d0e877af4f0f64a495a5d9f825806a8caf789031b977d53f854429070abc7075591727313147804fe1eb3466785c9197f8
 MISC metadata.xml 849 BLAKE2B 5a0c468d958b8be1956d1b1e27d19d4c278064083a0be71de56189b6a185625b2cb5752030ff0100faccc131e37593952e7c8fc68c975548fef944f0360cbf61 SHA512 af85a3ec41e590ff505fd78ff53f716ff0d6cd70dd4a603a37f7fb32487370dccdf893bdf3aa6ad0a1cb835ca1d30b7a78124ca12328526f4abf2ee55d7e4e85
diff --git a/net-libs/ldns/ldns-1.7.1-r1.ebuild b/net-libs/ldns/ldns-1.7.1-r1.ebuild
index 9c697a8881f0..edf493040f58 100644
--- a/net-libs/ldns/ldns-1.7.1-r1.ebuild
+++ b/net-libs/ldns/ldns-1.7.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 inherit eutils ltprune multilib-minimal python-single-r1
 
 DESCRIPTION="a library with the aim to simplify DNS programming in C"
diff --git a/net-libs/libaccounts-glib/Manifest b/net-libs/libaccounts-glib/Manifest
index 35bb6228d543..55f00e8f09f4 100644
--- a/net-libs/libaccounts-glib/Manifest
+++ b/net-libs/libaccounts-glib/Manifest
@@ -1,3 +1,5 @@
 DIST libaccounts-glib-1.24.tar.gz 116578 BLAKE2B d3569ee9d4b92f285f20ab7bc285c62c9817a16f632ad9da83a86ab69e7e3ded74afbcb1307deee788a74796372c0011563ecd293cba4b0e81d15252eae4cf50 SHA512 d4e6906f642c7a196cb42172f31345f58037d528950bee3af2b8cb388aea386056cbaa22f0e7c604a4e00038b231e9ee455f6a1d48f82344cfc0037ad7251b7c
+DIST libaccounts-glib-1.25.tar.gz 117337 BLAKE2B 72e6e15b63eea4d5b2a3e994779a4636bee859c6d395c8c9f65120cfee1c25a5708971b438010f668eefee20735b01e9f9f4e1ac4cb55495a06143d20198e422 SHA512 cc8b493d246f99300ee614fed93258378ecdbe9c518a958a59827ee8f74559b1ee3683acfb85f59aa91390275497fb35041da2be47f27f24f96e1efd5d6d2e20
 EBUILD libaccounts-glib-1.24-r1.ebuild 1224 BLAKE2B 182cab44010e82d4f03117ac6389bb342dc6be98480d1971f4574b240401b94d978e9867e70bb99fc05520b15319afcedf9405c7dc9ba90b8949b44722a65490 SHA512 abf2db02a4678f7968568dc510f64c40e6f6c7c1dd673208b81c0c7b989036dd03c65ad4f0580cc86351b904349071ad145559a8b9f3546ce8da12767303e6f7
+EBUILD libaccounts-glib-1.25-r1.ebuild 1313 BLAKE2B 76bcf2dc17771aadb53d91c7c54ac9d9f4bc6277d13ba46e37bea1829b1480aee6029f993330c9811557c51525d42656d1b49cb8f681a1da786765efeaa290f3 SHA512 db0734f8442ee6c7b5b3db028b040fb23c91c5824f901d61d34cfaae49d14a90828a465ae31b79e5321dcb9b07e741aa6fb209ca8ea3ae611cfeeb510964d093
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libaccounts-glib/libaccounts-glib-1.25-r1.ebuild b/net-libs/libaccounts-glib/libaccounts-glib-1.25-r1.ebuild
new file mode 100644
index 000000000000..4e1911060109
--- /dev/null
+++ b/net-libs/libaccounts-glib/libaccounts-glib-1.25-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit meson python-r1 vala
+
+DESCRIPTION="Accounts SSO (Single Sign-On) management library for GLib applications"
+HOMEPAGE="https://gitlab.com/accounts-sso/libaccounts-glib"
+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"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/gobject-introspection:=
+	dev-libs/libxml2
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(vala_depend)
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-libs/check
+	doc? ( dev-util/gtk-doc )
+"
+
+# fails
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-VERSION_${PV}"
+
+src_prepare() {
+	default
+
+	vala_src_prepare --ignore-use
+
+	use doc || sed -e "/^subdir('docs')$/d" -i meson.build || die
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir meson_src_configure
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir meson_src_compile
+}
+
+src_install() {
+	einstalldocs
+	python_foreach_impl run_in_build_dir meson_src_install
+	python_foreach_impl python_optimize
+}
diff --git a/net-libs/libmicrodns/Manifest b/net-libs/libmicrodns/Manifest
index 3f12c65418a9..21b20533d07f 100644
--- a/net-libs/libmicrodns/Manifest
+++ b/net-libs/libmicrodns/Manifest
@@ -1,7 +1,4 @@
-AUX libmicrodns-0.0.9-null-addr-fix.patch 945 BLAKE2B 40b777b9d0d1a781d1ee3ff82a2370d0ca414c687d665b0df1aa9750e9bde79c027e661c9ead963edb366858c46f6118139903f77d8d4ef99df99b8c28d28268 SHA512 83ef122e8192f34608965e9d6a479ce73abf98c28028f5749e0c53cc677225fae25f501573b671425754b14fb1b871a29caff6e116ed19700cae464b4b7b4236
-DIST libmicrodns-0.0.9.tar.gz 57333 BLAKE2B a9e1d099d4588863dee3c2735a2e3f9cd46212729c342e06cccad1a8e997e85964e7f917ce97f50c0cccd21c1662ef9baf7392333ea666ff65b0577f57bab692 SHA512 6f7dbf1a324fed847131745498895ab0773dfc3c7bb96a05bf0fd3df0c0ce19d7f607789f7a5350d34e91e7ba323ee57196eb37ce351f83a9faa82c5fc8d89a8
 DIST microdns-0.1.2.tar.xz 49420 BLAKE2B 247a82c3bb038487390ba967387e9d4cec638ee5315290387c5b8863afbd45cc0700a3ee6c0308db253a161b5c1d345f77808de96df3f31bfaa2ff74e8fa3c05 SHA512 a6b15c65c74560fdba8973c63ffae9cdde4445f54196bb2d7d6348f6c15f8f162ef0a4e91b969ea3f2a60c701c3cc72799fcfba2fbf08c37f71ba8d5e3409702
-EBUILD libmicrodns-0.0.9.ebuild 623 BLAKE2B e2ccbc10fbb88ce50c749c541ed0f2121f155574b7d6f271c4da066b68456383974aeb8afe29c3647fde4e0739e201cb18ce3d5591aca776102d8ef298f03136 SHA512 d8544763e8ac77dc829bab6b04f4b6b886ef4922c4f2c4fe16d0f10a494a02be6cb8f7cf0a977fe6971eebfd2e82277fad167daf580f24612f9cee37db5a6e6c
-EBUILD libmicrodns-0.1.2.ebuild 730 BLAKE2B fc009b288958e4452ae2ce696582b16852f47ead90c13f8626a316b3eb67eac6f85ab784fa3ce10267befe6bdc12bbbd17b3958c55707a63da0fa86471e4726b SHA512 7438da9899534764cd8325b80b54be10107162663426ad072f6aaeda422f9a22bcd8353fcb27c6aa33ac6aa59f1cff6cf4b06b26ea5d1f02afce76e6efca839b
+EBUILD libmicrodns-0.1.2.ebuild 725 BLAKE2B dd81aad3f6e4d6522791f1e0fa7860f6caeefa713ebf2535f39c5dca977e8fd283f0f66f778159e128ee74ed04b53c40a875e054a56a4aeed5b1d5c2f76baad4 SHA512 1423533662f14484827d02c23392e5df339f9474f14ac106ea380a8b54b7ba2370062a2014d783358850fb4a7502a2494c40db397e68d288987d5888508874b6
 EBUILD libmicrodns-9999.ebuild 730 BLAKE2B fc009b288958e4452ae2ce696582b16852f47ead90c13f8626a316b3eb67eac6f85ab784fa3ce10267befe6bdc12bbbd17b3958c55707a63da0fa86471e4726b SHA512 7438da9899534764cd8325b80b54be10107162663426ad072f6aaeda422f9a22bcd8353fcb27c6aa33ac6aa59f1cff6cf4b06b26ea5d1f02afce76e6efca839b
 MISC metadata.xml 430 BLAKE2B 94c8e7b19ca9899428db5b67c33d492423ab83f354e878271bdc6ce9b6602c78892b5069ce38032e837e68285c2979bfb43ea11650d734ae6061089a3f2d1232 SHA512 7ca90565928898c788ac8b87abff3909c5d1c0947c57e4ba30b0929a794ac943c20f2002601d2614dca35c2e3b09432653378bd66eaa6f53881c8cc6f86b892c
diff --git a/net-libs/libmicrodns/files/libmicrodns-0.0.9-null-addr-fix.patch b/net-libs/libmicrodns/files/libmicrodns-0.0.9-null-addr-fix.patch
deleted file mode 100644
index e2bb711c7c10..000000000000
--- a/net-libs/libmicrodns/files/libmicrodns-0.0.9-null-addr-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From efdf2754f9f8b801048b8fdae2b269f091128193 Mon Sep 17 00:00:00 2001
-From: Jean-Baptiste Kempf <jb@videolan.org>
-Date: Thu, 1 Mar 2018 02:58:13 +0100
-Subject: [PATCH] Fix more of the same crash
-
----
- src/mdns.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/mdns.c b/src/mdns.c
-index 132beef..55c5cb4 100644
---- a/src/mdns.c
-+++ b/src/mdns.c
-@@ -117,7 +117,9 @@ mdns_list_interfaces(multicast_if** pp_intfs, size_t* p_nb_intf, int ai_family)
-                 return (MDNS_ERROR);
-         }
-         for (c = ifs; c != NULL; c = c->ifa_next) {
--                if (c->ifa_addr->sa_family != ai_family || !mdns_is_interface_valuable(c))
-+                if (c->ifa_addr == NULL ||
-+                    c->ifa_addr->sa_family != ai_family ||
-+                    !mdns_is_interface_valuable(c))
-                         continue;
-                 memcpy(intfs, c->ifa_addr, sizeof(*intfs));
-                 intfs++;
diff --git a/net-libs/libmicrodns/libmicrodns-0.0.9.ebuild b/net-libs/libmicrodns/libmicrodns-0.0.9.ebuild
deleted file mode 100644
index c19ecde564f8..000000000000
--- a/net-libs/libmicrodns/libmicrodns-0.0.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Minimal mDNS resolver (and announcer) library"
-HOMEPAGE="https://videolabs.io"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/videolabs/${PN}"
-else
-	SRC_URI="https://github.com/videolabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.0.9-null-addr-fix.patch" )
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/net-libs/libmicrodns/libmicrodns-0.1.2.ebuild b/net-libs/libmicrodns/libmicrodns-0.1.2.ebuild
index 0e1d2c1f619f..bcc2e9b5a6df 100644
--- a/net-libs/libmicrodns/libmicrodns-0.1.2.ebuild
+++ b/net-libs/libmicrodns/libmicrodns-0.1.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/videolabs/${PN}"
 else
 	SRC_URI="https://github.com/videolabs/${PN}/releases/download/${PV}/${P/lib/}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
 	S="${WORKDIR}/${P/lib/}"
 fi
 
diff --git a/net-libs/libmnl/Manifest b/net-libs/libmnl/Manifest
index e9c94048cf43..257e460eee21 100644
--- a/net-libs/libmnl/Manifest
+++ b/net-libs/libmnl/Manifest
@@ -1,5 +1,5 @@
 DIST libmnl-1.0.3.tar.bz2 337375 BLAKE2B 7054b5f2eaff639bcf0bb836ce16d7787ea88422326d2faa5959b47e4652cd9d2d8d6ea94e2f9addeb87f8c018392de0eca08343ed201895dc8c2d6974435779 SHA512 c47b76a6125271ef9dce13bc8bebd415d2bbd79b6d50491d8ba23344e7e6fe0c1413fe055913ab9444203f0d73166b79f0d4b532b13b62feecde3e5a8cd442a7
 DIST libmnl-1.0.4.tar.bz2 301270 BLAKE2B e24ae3e7a8bcfe35a04256c495bb3e9a5ec41b6bea9b7ffa0a8ebc82ce847921d4a44e5be3558239fee5008c10541a9ac3614d1a6b80d280b632a76da16be5e8 SHA512 e2bbfb688fe41913d53c74ba7ec95b4e88ee2c52b556b8608185f2fcbd629665423a3b37f877f84426ba257cf6040fa701539d67166b00b8e3e2dfde6831a2f9
-EBUILD libmnl-1.0.3-r1.ebuild 767 BLAKE2B 0e1a0ee9df14248c6408f541d83d5e3ac58bacc11936dddb2808deaae5e5e82112fb91282ff636641614445d2a46612e75bb4c4a9ffa1853578c83a5c433f25d SHA512 86ba1ac11109e4cf9dff9a50f497514fce81cd5608c6eeaa9b33c5afcb6b51b4efedd7f17386e61129608dc6f770e98a239e559b1520d96af3033959b9390ef9
-EBUILD libmnl-1.0.4.ebuild 780 BLAKE2B fabf6d66e02d340b8443d8357d33ece48cac4acb6913c80da4db743ef80014a13c03ea0332862f1397c61c97f8adee003a874ae21587938f2a3766480f436097 SHA512 3f841e30a5e6a26a0c80795e3eb324aa046dffbbc8613b4a69ce6d1fdd81b624d30ccfb11e11c11f91aaf5bf9a08dc6595cbaedc4847d9eb453c6289c3f0463a
+EBUILD libmnl-1.0.3-r1.ebuild 768 BLAKE2B a995a82179da7bc3cbd24f39a7afbea5528d3e00d83288b1c05f2f887dac267f2f39a10ea545ba9de065121e9edb600dc7d496c2a50b2f9394e2dac7a8fdf7cf SHA512 7c60a0ceaad682fa1d047752ae2d10181ec540885a6874d22e7b7a3be482715e3c34b262b57957054c4eefc10d34c69f31c7dc3894f4aaf3ce7ef5d0543d56ee
+EBUILD libmnl-1.0.4.ebuild 781 BLAKE2B 1355365da2195e799a0a2c42e8795c1ffad286b2ffb25f4fcedc89ef6306bba6b4325a14208c3ea3e8b287b1e77b9afdda834c613276edc10ab4143b2ed387c8 SHA512 15824488dd41d504aa6eaa77b0c353c06e1ab42e6a66ddd7885bebddf37f9140a047a7c06e554f25fdaecfb2a8bef30b758ba408842b4b78811612eb5baaa3f6
 MISC metadata.xml 746 BLAKE2B ee4224d1afd9af317a58360a189e8d3d97b2199c01b35883fb1644fc42518a7c79f0900d10aad99287a47e77767564f83e18ea3fa45e0678bf25f9b1e8588ad9 SHA512 f7e4824b61e60bdfa64e4d9db37051ac3240c6ce66518a2f74d643b49b2cd206daedd088eb9eba974b6a51f5195c8281742398428b1103a3b83beba869347bb1
diff --git a/net-libs/libmnl/libmnl-1.0.3-r1.ebuild b/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
index b08773947c8a..85cfa4db0e48 100644
--- a/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
+++ b/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux"
 IUSE="examples static-libs"
 
 src_configure() {
diff --git a/net-libs/libmnl/libmnl-1.0.4.ebuild b/net-libs/libmnl/libmnl-1.0.4.ebuild
index ec39aecd65af..21669afa725a 100644
--- a/net-libs/libmnl/libmnl-1.0.4.ebuild
+++ b/net-libs/libmnl/libmnl-1.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/0.2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux"
 IUSE="examples static-libs"
 
 src_configure() {
diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest
index 73ccb4430f80..4ef01914cfd9 100644
--- a/net-libs/libnetfilter_conntrack/Manifest
+++ b/net-libs/libnetfilter_conntrack/Manifest
@@ -1,7 +1,7 @@
 DIST libnetfilter_conntrack-1.0.6.tar.bz2 422998 BLAKE2B 7153593e2b6f5e03a5f4579948b0d28e9ab88d39ebe08e97fe8be0eb3f10f64b36d0f85e9e35408019ab22404b3452e4c6d7b2812ea316031f3e0c4367c23019 SHA512 05b3b63928d46ed114048848c48094a762c6a7acc93fcdbe9473e82cc67851ef1a0d33b68b8fd388271b76b519c4d2ac93fd802043fa9a9da46cda5b262a1fc7
 DIST libnetfilter_conntrack-1.0.7.tar.bz2 346219 BLAKE2B 85388bb2b185fa04ce697b07675cfbd84836873a9d09092b16bba318e93da56085ea5a4726a908ed5d1974aa524bee0f912e2be23f6a4c9e9e46641baf0c6a18 SHA512 5be5ed5daba385d11123a4e497c6334c6bb7e668594e667f85596619afe607f8783c088934098a4c07557d86f9b9157ff67d28541c8f4a80a5454307b979c22b
 DIST libnetfilter_conntrack-1.0.8.tar.bz2 331750 BLAKE2B 614f8d80863d6f7d8110b5faf68debe3a9ba0c6737f02fa0de9d0e53d30771581becb052e7cd990b0632e9264cb9cdeb2af26a41e2b1ab9421218ec616e1f8d8 SHA512 ddc70e7e3f2d764ed1e115e4a03fe8848b8c04bd69eea0952e63131dd4dae3c23f33b8be518673e1ec3b5dbf708f5f86eac97be46fe265d95386a5e902bd0b82
-EBUILD libnetfilter_conntrack-1.0.6.ebuild 964 BLAKE2B 1df389b4f2f437d0fecff44404e78dcdd896a680e3b223d24db16692e77d4bce83506f658f19901a23040df2aaa89e0c903a6086916d53cdfbc0a8878822aa90 SHA512 a0f79a9b5a9f9681685d532a0bbdc8d59ee563e9100a82f149ccee0794d680d6cb00f09c8e9f4a1e6aa308ccc3996ededa7119aa40228e14cdfa86b10d70edb1
+EBUILD libnetfilter_conntrack-1.0.6.ebuild 965 BLAKE2B 39bc7b3a97f5c168c0a2cae3d0902574664e3efc336dcc1ffb13907bba694461fa1083591f0db167df8ba2c3989003fc948638ae55da77ef9ec9ba8e073a135b SHA512 2645afdb633fcc5d3d3b7e0204a24bf5eae0dfcf9eae4a145326d1e07468dfed04465dcfb8824b1729ada64cc4f9ecccabcfb3fc67cbadb0574f5579812a7d4d
 EBUILD libnetfilter_conntrack-1.0.7.ebuild 978 BLAKE2B 8412b207cbb247db8298720d4b92e55bc30af494932b3566fb69e0f2e02cdf55559500cc6c3c44a9a545b8916d60e9674eeb0e8a2368a21dbbd1ba6f55155ec4 SHA512 ecb63afe7bdb5e53678472912bd8edb0950b57827ee8544e326128ec7271cce6bee15f876fbca7c3c6e8effe5ab617591887cd9561ac2b722c46eeed4039a54e
 EBUILD libnetfilter_conntrack-1.0.8.ebuild 981 BLAKE2B 998db28a854065c2084713fbb5263a249f878f77c6da7396ab4cd199fff1afc8e21ee68d5e2d7a4ca2bdc1ecdbe19919e8fa3eefb3b8f944e153e893be0226eb SHA512 2cc5d3cf9a016cc269e824b543c56e707253b2389b2e634d23a19003efb5f16ea1917d5d1e44205e5c459d2f9337723b130153d052701086d29a19477a21874d
 MISC metadata.xml 374 BLAKE2B 6717c595149f5ba96cab007d61021da51fa93da6cadc277ebe48cf56c89d0dc78a97b099084cb00879d5650993f1fef5bb57a591629d6773d572be065c75dc3b SHA512 25429c178b3bcac4773cb679c5609a97afbead92eb09292c174964ee6122593f16bf2aa586f5f70fec6dc47d1facb1f4b6f739c81439afac48f401eab0802c1b
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild
index 0f532366ed34..ae46400e1ebc 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild
@@ -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 ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-libs/libnfnetlink/Manifest b/net-libs/libnfnetlink/Manifest
index 85ddd1285ee2..d097fd6145c1 100644
--- a/net-libs/libnfnetlink/Manifest
+++ b/net-libs/libnfnetlink/Manifest
@@ -1,4 +1,4 @@
 DIST 04aef8a4dedf267dd5744afb134ef8046e77f613-musl-fix-includes.patch 677 BLAKE2B 189c57ffc8eeb6a83e46fd1d53390e977294f7d3a269d3ffab07e1fce04083a7b4b956e93e02f4f81ce6db4ec5be785b16d1c75ed7e0b4fef9883154d9407e18 SHA512 fc452e2924fa4de66e104229bc05a663c253148fb1c0bd62e5454a907877ffb084ba6a04e38bf4ef71a4e58041f4a242001a8029aefbe97ccc00e3bfcb7bba41
 DIST libnfnetlink-1.0.1.tar.bz2 320641 BLAKE2B 18d6f702afffa1bf2cb6978426f4a1aeab8692a288686c099eb7dfabff23648b4b0f1ac14b4661f16e3d50b6e7d29090d58ce715dac107acb12648e93c5df4f3 SHA512 2ec2cd389c04e21c8a02fb3f6d6f326fc33ca9589577f1739c23d883fe2ee9feaa16e83b6ed09063ad886432e49565dc3256277d035260aca5aab17954b46104
-EBUILD libnfnetlink-1.0.1.ebuild 1433 BLAKE2B 370a8c06cc77e48851e5e398a328785feaef7491c8e1e967abaeda6dad003f129d84c2557468303fe05b6ffc42718e23496b9a670c4e4153eb4c86556068a3ac SHA512 b07909ba12bc88425d50de77bb2ae79637b60113503ebec75a970e0f6fd72037e237e1dfeba6690b8f68a57fd750cc4c47df961f4ee482cd9c81dd4df8fe460b
+EBUILD libnfnetlink-1.0.1.ebuild 1434 BLAKE2B 4db3b2ad7f66e59bbcc26ca2fe6a4537ce86e213d4302828ea872d6ef06c4a1a1b43d9ef868df9bcf2f9d760d3f42b644a386751efa829bd467908b3698fb52f SHA512 facb95e6c98e46028492c3dc30b013838a3b0748b33b8eb062f63272d80c0249269739cb410049629f962fb785e9988664b3273960c77d265cd7d76f1fde91c4
 MISC metadata.xml 364 BLAKE2B 688c9d5bb9c4fe16699fd7535d4201c069573e833f805a8321a30aed5d51cc988439d463d9b780387c641bdf477798673fdf3a92153b9f61760f5de79cad3843 SHA512 cde7260e5a76b9e921692fd265f3e5da028492bb920db58ef3b12dab29cfa402cab322b4f5f48f1949e37941a6d6065039f371861e5fa7fd1de56feff62c97bb
diff --git a/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild b/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
index cb7b05971db1..cc2a2bae0666 100644
--- a/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
+++ b/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-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"
 
 PATCHES=( "${DISTDIR}/${PATCH_FN}" )
 
diff --git a/net-libs/libnfsidmap/Manifest b/net-libs/libnfsidmap/Manifest
index b83e9fe40d40..e7346973f3b2 100644
--- a/net-libs/libnfsidmap/Manifest
+++ b/net-libs/libnfsidmap/Manifest
@@ -1,5 +1,5 @@
 AUX libnfsidmap-0.21-headers.patch 438 BLAKE2B 0ef48276188f4142b2c85cb3cf326d37aee270f7a4b1442c41678792d071d528e83b41c4cc7ea253fa2e43efca788903c37a52540bffa0fc8199203954d62c1e SHA512 55cc2dce6df5c215d2ba270324a2dabdd7c798d88dfe1f6ac01a7bfcddc1b9a23bc031fac2006682596f3984f0ce9782c8584e3b8e02a1b491ac978a69aca926
 AUX libnfsidmap-0.27-getgrouplist.patch 3467 BLAKE2B 595045c93b897fd51a8ee4b039fe8b8732e78fc203cf6ab4ad138feaf35c408698ba4571477115ddf03d73ba20a9fa8623af43e6adf9c5a51a8577710e5a4c1d SHA512 3bf266ddeed306981cf7724032a59118ec93e34974b79fc93966f3494acef1855ce7bdf4e88ac12b0d435a5b2380e1570243c746bd05dc19a65d40517f6f2462
 DIST libnfsidmap-0.27.tar.bz2 303900 BLAKE2B c6cb8d81042426552fd3cde9dfd26f805d3c92281a65c3ca2d12671477eb697f3cd51a6d8313a658eb70232136e5615e0cb9ad090a92e747e245f49e60cfcf8a SHA512 0698079abb4bb9ebeaccbcabca725b022c1daaa3d287944d9c4c2a2134489b649b44fcbcd9916e91dd6d91cdc67d267adf5741c5404150c66cc8243b9f15970d
-EBUILD libnfsidmap-0.27.ebuild 1308 BLAKE2B a2d430303aacb2f0a63bbf27edf422382ec038da566db4f1d7b6d2d24da2f227e609144f737d735210a70d416f96994f8ae46d0f3529d922ca8f5ee0007b2775 SHA512 739f4641b8bef09e55de8430e2e69e21cd2faae80b76403b4ae8547746e2f0805fb926380c2676f2f1cfd42bad3fb463af76cbf892578764166a6e68fe61f262
+EBUILD libnfsidmap-0.27.ebuild 1309 BLAKE2B 1749d8d20d0b0e536702ab897c3130b92fef4ff40d83b4f79b14274aaa2575f0585fcf07e8e96bfe80f757a6db024711ac63add7fcc78f4679939f888503c2aa SHA512 2672cf2028428a30de4632a2bd5108fbe031ea55d31f404bae642f448af754ab7c913be691419a8e0b018af26f86ce43cd8d3e27b98c5cb2358fce99190ec294
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
index 0af1ee54e6ec..1f5d6cc7faac 100644
--- a/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
+++ b/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fedorapeople.org/~steved/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="ldap static-libs"
 
 DEPEND="ldap? ( net-nds/openldap )"
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 12d6bde09e3c..b279bdf5a424 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -5,6 +5,6 @@ DIST libnftnl-1.1.5.tar.bz2 373930 BLAKE2B cfd06084fb7de5dd6120a22faa43ac578f170
 DIST libnftnl-1.1.6.tar.bz2 376340 BLAKE2B b5ca243af71462f7c91cae3f368bca7ba19151f5e14bdc459efc136cbf1d6f0234a097337dcee2a2e733a173c72c71496f34222dbd217e79b2a5b614315e6b30 SHA512 3de13cb667060f0942c8dd9e139ee8c7aff1854c544793774a827c01d06e432a4ce05d54846e1062aa620b5e54533da09daa9588467866c82c9119ef4cfbb57d
 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 1256 BLAKE2B dccd0085e1c108b4a377a5e14f252dad6429bc8907ab5415fdc70959d38569355f2e02110b36e4f67c641768c5520298b15dfe37b9699899ee4e48738189a000 SHA512 d7287b303119dcee21127ca3e253976bd986975f9e6ef5944ca50a2cdfd70f830f90ad49cc5524cb1fe040ac231e66717aa60e39a1b25e130928416e24b36e62
+EBUILD libnftnl-1.1.5.ebuild 1255 BLAKE2B f0a32d76a4cc25ccb33e16c1f9b0544f4b94da741fb335f7978ecffcb7e3289a42917773b293dcf383b77a72840d5a65cb21f21b502bba0c4f846309600d346e SHA512 dd42cb3ea1475d8f39034a7365c90f7e976f3cbc6f11020ccc7915c0d8bd27fe04dd2f7d784c1d08a8abaab02045119c705d10a802f3ff9a736a098fa6d5d615
 EBUILD libnftnl-1.1.6.ebuild 1200 BLAKE2B af974af8061f7789020a3efc449416e43af663ff1b8b098f820e5aff395bb25f9d99228bf363b5da8b5a32b8d38275564374f59088c24d0f11ac213d98e32590 SHA512 c6ee6faec8cab4159745be8665ad7363addc99f07d7a70b1c2e23337041ab2e5ff2b3262d9f13f946abda41c092482632249968c91fd6a31a4dd4005c551518c
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnftnl/libnftnl-1.1.5.ebuild b/net-libs/libnftnl/libnftnl-1.1.5.ebuild
index f3d8044e0da7..8b55096564bb 100644
--- a/net-libs/libnftnl/libnftnl-1.1.5.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.1.5.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="examples static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libnma/Manifest b/net-libs/libnma/Manifest
new file mode 100644
index 000000000000..5e59fec8503e
--- /dev/null
+++ b/net-libs/libnma/Manifest
@@ -0,0 +1,2 @@
+EBUILD libnma-1.8.24.ebuild 585 BLAKE2B 14955a958ecb2ef65e729f46dc4cabbedf020ca1ede426efd0291101fed11d8dc5ef70051143c4ea5f638cc1a08aeca5426f09595fcdc67d8127228c98af247e SHA512 e67925f59d07a5cba47cb44ec50721e8c365b5ec9d73882b31c2ddfa82ee5daee1241e152a7f2fe7a7f4035a8aa9ea563594d8722ed3e0bc340c9c8fe8e15c95
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-libs/libnma/libnma-1.8.24.ebuild b/net-libs/libnma/libnma-1.8.24.ebuild
new file mode 100644
index 000000000000..d088541fa525
--- /dev/null
+++ b/net-libs/libnma/libnma-1.8.24.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="NetworkManager GUI library"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+introspection"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
+
+# This is a transitional package for 1.8.24, but 1.16 version will be a real one split out of nm-applet by upstream
+RDEPEND="~gnome-extra/nm-applet-${PV}[introspection?]"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}"
+
+src_unpack() { :; }
+src_install() { :; }
diff --git a/net-libs/libnma/metadata.xml b/net-libs/libnma/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/net-libs/libnma/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest
index e5fc618725fc..d584ea02ec35 100644
--- a/net-libs/libnsl/Manifest
+++ b/net-libs/libnsl/Manifest
@@ -1,4 +1,4 @@
 DIST libnsl-1.2.0.tar.gz 209188 BLAKE2B 4249cfbf0b5391790f5e5f81e4eb0be963e5fdc0c32a9400d4128e717d93da49f8751caf8de3bb4ba1a23b8670a0e4f8e750f38f4612dd0cc97db4c157421a06 SHA512 30115aa679a04ad01f55cff9dd1890b4c41c730a9bac2adab5add9ae03a0b4687c5f4b6e3b8652ecbb074eefac8faee3f1f13ea60d42cf4432db8a575ca72cd8
-EBUILD libnsl-0-r1.ebuild 563 BLAKE2B 325c98382e7856ed41ac658faa1c04929efdc4d76b3d1322c205ab2b444b8ba50221eaad6f978ce30c559abe1fadf340275d7b8af7d1288530884dd3fd19bcd5 SHA512 31c4acc1d8dae45d91487347ce12fdb5a810da3a5dab1314d8e7109a99f160b966623cbf0c0abe8032715000458924e63d1247d3b06adae2aa2b3ce190611744
-EBUILD libnsl-1.2.0.ebuild 912 BLAKE2B 2c54230426a08b3386164f648d13544d9d36a527d7833939d4d5e50378d13ea91244eb2c96fc412d9910405ca9fd0c8fb6e5aa369bdb1ef0ca53777162bcab7d SHA512 ba5ace865d7579200347b521c997f7c53438a6107b1a3b477a99c9d8afe07ff3c0e2af1b9f00a7d79d7c08379509904d7b37786ba52aa8bc727097902929797b
+EBUILD libnsl-0-r1.ebuild 564 BLAKE2B 20dd0a9847b571117f74664778ef7b21906c5f7b822af15f05644789e41cc33b7fd924b5dc6bb76e98811148d8d592da75d805ff6610d712ed898ecb1662de19 SHA512 c243edc4f9f9ed5e7a98b7063dc8401495e5f9f821b5ae13008ce05cebdc4ffb79f5ed1a8dd8b0a13dd55e74f62f18c9566e74a3a09418647c2285c2519fb707
+EBUILD libnsl-1.2.0.ebuild 913 BLAKE2B 08008eda655addd24960dff1e696c186a11cd428594e4b71c68bb3e48494a84eda582e5857d4578fb7cf50fb20c1e7840db47ac991934740f7efd27a8b985fd3 SHA512 1883e47e564865ba5018fe8fa905c641b389d35c4da3323319be151c778aac9abf25e97695ca6aaa5901412950b50a18abe313e7bc94fe757612cef11df980f6
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/libnsl/libnsl-0-r1.ebuild b/net-libs/libnsl/libnsl-0-r1.ebuild
index c88ba31c3c3e..ae0c841aa3e9 100644
--- a/net-libs/libnsl/libnsl-0-r1.ebuild
+++ b/net-libs/libnsl/libnsl-0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/thkukuk/libnsl"
 
 SLOT="0/1"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 
diff --git a/net-libs/libnsl/libnsl-1.2.0.ebuild b/net-libs/libnsl/libnsl-1.2.0.ebuild
index 5b773a32bc35..6a446af1826e 100644
--- a/net-libs/libnsl/libnsl-1.2.0.ebuild
+++ b/net-libs/libnsl/libnsl-1.2.0.ebuild
@@ -13,7 +13,7 @@ SLOT="0/2"
 LICENSE="LGPL-2.1+"
 
 # Stabilize together with glibc-2.26!
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 
diff --git a/net-libs/libpri/Manifest b/net-libs/libpri/Manifest
index 678155aba690..3fb0f8ae4f9a 100644
--- a/net-libs/libpri/Manifest
+++ b/net-libs/libpri/Manifest
@@ -3,4 +3,4 @@ AUX libpri-1.4.13-no-static-lib.patch 1252 BLAKE2B 07df96fe923d1e95eaa9041239e70
 AUX libpri-1.6.0-respect-user-flags.patch 1626 BLAKE2B ec91c7cb1b2e2cecc8f97dc9ff2275527372e670ccb23f2daa3339fdae67aa4f065fc5e5dfa224710fb32e271cf2f6279c44fe999040d13b954418c3627d63e5 SHA512 69bb194721741613ec9e4c6da9d19154dfdb2ed56b2b964e09e888bd0dedd104501f3a51f0bb57587d1c15dafeeacf790ea122bc1c2a8edfeccb2f7d9252519e
 DIST libpri-1.6.0.tar.gz 340578 BLAKE2B abef8004601ea6f2c48c23b7b9e5fe3b231e6b00b0389d0baa8cd8bd2b772bcece52b1e3cc98acb44f47fb4dabfaac30d59a638bf021c5fe66bc49209d942cfe SHA512 3eb876477cdd27c88f274e4a2e35a67f660b8d8eed140e56c40769982a58f1cdd4e5be352f8f220dc100eedf1ad09286c578430a52d9abe326440c8cbf517fa5
 EBUILD libpri-1.6.0.ebuild 734 BLAKE2B 71e6d9b61b87df3ec13166d8a217a4f7ae9a5fd8b3d5144b2e6a2e45f47ecd51e20025a91d79390f55893fb96aa73ed62519f617d9f4e959db5a0525e0989715 SHA512 7cffae1730136be08fb3757a6d60ce5e8f3898c84aaa0f8b85f8b4b708af03e4b257c0a59cea0f409ce8b928e108dd7509b537fdec18eb0af39c352d435f2006
-MISC metadata.xml 251 BLAKE2B d6cd51cc02ac1322483c5ab4655173de8b1c64bac285b55a47fa3a35d3995eef653829b7cb110488c156247cff12381888fcd3b1fe248c8f5e3feb059c490b9f SHA512 7ea734b9e52a4e36b11e004da4a8178aa529574adee2129ba57b1ce75fd5017431fdfffe7a4a536c798ae645497a44b07c748d77308325cf4d6af070ff167edd
+MISC metadata.xml 357 BLAKE2B 34eb2ba7fee2d2df8540a6fb2b5407ec249e1a983e348951dc002373288643cc06b7ceb4cd84de8ae770b9e0ced10892fc08fb6d415d803365f60bfcf6948b0b SHA512 40cc14c2f673767be159cadd8da258d273d99e38d96ccd2c2139f8fa424b30c8878ad6aa7d061c76e52cdd77ea42e58c9018e27849887882e9bcb7cd70827e64
diff --git a/net-libs/libpri/metadata.xml b/net-libs/libpri/metadata.xml
index 5087760546f6..64b17e08bff5 100644
--- a/net-libs/libpri/metadata.xml
+++ b/net-libs/libpri/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>jaco@uls.co.za</email>
+		<name>Jaco Kroon</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index c923f8d4b73a..13de7c9a8519 100644
--- a/net-libs/libpsl/Manifest
+++ b/net-libs/libpsl/Manifest
@@ -1,5 +1,3 @@
-DIST libpsl-0.20.2.tar.gz 9228099 BLAKE2B d53b8a036ba557704c4d3a498b35fd25e3dfc466d5161040d02b7d8d47af2138cce2bdbb8203fca0591408440f1b4cfab776fe0d2ecd68959f426d903cab08d4 SHA512 fa9f6f7f0447d9fe00f5dfca5262c56ff26217eea44d0f7fc1e5d982224c41874e753f0aa06dd9e5d7d03d4f04e3dacd4f36034cc8dd0fc6e2c28b49a23e62fe
 DIST libpsl-0.21.0.tar.gz 9217951 BLAKE2B fd93b71ae4969bb920af26e10e0e419dab62db37197046b0f4e4a0e009a150582df6d4c8fe33218fa8be869e6ad9688d3c325c3f635da5560e29269daa461668 SHA512 165c4f0b0640a813d512bd916e1532e32e43c8c81a5efd048f3a5b07b1b3c9129b4c4b5008b8b11a7c1b3914caea17564321389cd350bf1d687d53a97f2afa4d
-EBUILD libpsl-0.20.2.ebuild 1465 BLAKE2B c4a6222de8dfb1bbe040d557fa5993ce0e4589932b2ecbf2b8dd2555fc34d3ac52c7be7107907c99c69e2eb72ee4641238c75667a714e945a87325b36e12250c SHA512 51bfda0c75541704bc96d684e6a588c87f858fc86f27a005e8d0a59b31a7b16a8f893acc5a4a3a75261244262dd5e3fb6109d1ce754ecbae8c65711558a3f486
-EBUILD libpsl-0.21.0.ebuild 1475 BLAKE2B 9831172d536f0634d4925c7931fc53cec63946c1576908f61513171462ebafee034deb502645eb166594ed948fc606ce3c6b7802bce311b004aeeb64fee5850a SHA512 13cf6d1c670232b2cdd64693d53ea3ab45b22ecc110d0d8306cd7c8ecd741bfa24be4919a8c72658b3b799bbf230836392b367822371b755b93df67fc952c2ce
+EBUILD libpsl-0.21.0.ebuild 1471 BLAKE2B e47eecfd4d43860a67c74646a52eb91e065bcbd40dcb5904a469dac61cce5a174053cb0cd35b6c494ad39c2d5aec6e824a6e77b24a14e14949e40dadaebfae43 SHA512 8ca2066bce3f979d9d63a175fb1fdf75b66ef222051b868f09d0e7ee08719231169bb16ce04e500e4cd95dbc3f1ac19370e062b22c9a4d12930f823705a7d44f
 MISC metadata.xml 404 BLAKE2B 8a6b54d64c66fe2ec363e4e801973851cf7f3566b4db1752bc63f1f75d4ce7d7fbb04ecb5804e848c5fd97df9eaa55479127239e3320f49dd9db33710a015035 SHA512 7886a14efd3a12c844752f1bb2af9c72963b1e68bf2a7bb2ed7368f6df89f8f0c240aec5dfec7f40d25c1c2c7771060dc013e2032e972f45cb7d86f458c4c004
diff --git a/net-libs/libpsl/libpsl-0.20.2.ebuild b/net-libs/libpsl/libpsl-0.20.2.ebuild
deleted file mode 100644
index 77d9d740faae..000000000000
--- a/net-libs/libpsl/libpsl-0.20.2.ebuild
+++ /dev/null
@@ -1,74 +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})
-
-inherit multilib-minimal python-any-r1
-
-DESCRIPTION="C library for the Public Suffix List"
-HOMEPAGE="https://github.com/rockdaboot/libpsl"
-SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${P}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="icu +idn +man"
-
-RDEPEND="
-	icu? ( !idn? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) )
-	idn? (
-		dev-libs/libunistring[${MULTILIB_USEDEP}]
-		net-dns/libidn2:=[${MULTILIB_USEDEP}]
-	)
-"
-
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/gtk-doc-am
-	sys-devel/gettext
-	virtual/pkgconfig
-	man? ( dev-libs/libxslt )
-"
-
-pkg_pretend() {
-	if use icu && use idn ; then
-		ewarn "\"icu\" and \"idn\" USE flags are enabled."
-		ewarn "Using \"idn\"."
-	fi
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-asan
-		--disable-cfi
-		--disable-ubsan
-		$(use_enable man)
-	)
-
-	# Prefer idn even if icu is in USE as well
-	if use idn ; then
-		myeconfargs+=(
-			--enable-builtin=libidn2
-			--enable-runtime=libidn2
-		)
-	elif use icu ; then
-		myeconfargs+=(
-			--enable-builtin=libicu
-			--enable-runtime=libicu
-		)
-	else
-		myeconfargs+=( --disable-runtime )
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	default
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/net-libs/libpsl/libpsl-0.21.0.ebuild b/net-libs/libpsl/libpsl-0.21.0.ebuild
index 973bf4d107b2..2db775b91e56 100644
--- a/net-libs/libpsl/libpsl-0.21.0.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.0.ebuild
@@ -2,16 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python3_{6,7})
 
+PYTHON_COMPAT=(python3_{6,7,8})
 inherit multilib-minimal python-any-r1
 
 DESCRIPTION="C library for the Public Suffix List"
 HOMEPAGE="https://github.com/rockdaboot/libpsl"
 SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${P}/${P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
-
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86"
 IUSE="icu +idn +man"
 
@@ -22,12 +22,8 @@ RDEPEND="
 		net-dns/libidn2:=[${MULTILIB_USEDEP}]
 	)
 "
-
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	${PYTHON_DEPS}
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
 	dev-util/gtk-doc-am
 	sys-devel/gettext
 	virtual/pkgconfig
diff --git a/net-libs/libslirp/Manifest b/net-libs/libslirp/Manifest
new file mode 100644
index 000000000000..a8ef17bb8106
--- /dev/null
+++ b/net-libs/libslirp/Manifest
@@ -0,0 +1,3 @@
+DIST libslirp-4.3.0.tar.gz 126721 BLAKE2B 407e9b29c107edefd9c8609a16d763e159c2e8624469e49a7408c4edb8fe07940bfce748bd8e4ac2a92ed09a0be283f75337d12475c06ad778b4bb5cc56df180 SHA512 24c5a6c60e0a08674353db1050a6a6b6cd7633e7cb691a3380b7acc6f0bb65d8aa52a076623d4615f63c7b5e96e600b99b56d2f14772fafe132afb1f0102a993
+EBUILD libslirp-4.3.0.ebuild 612 BLAKE2B b49953205e42924c91aa82bd1f0b45b7f24f16abd5365caad7de84bf7de284cf981a4cb0be3e08366d60aa393a75b89465007dfbafde9bccf0e36aaff96ab740 SHA512 6adcfcf2e57c4ab3021bf57e3deadd53f23c1e93e0f1620d79aa9b0e6515612a093edb00df1d1b736d78090211ffe4fb41cae82940539ea1b612fd20d06693b3
+MISC metadata.xml 346 BLAKE2B f8c280b0fc3fadde1f7d8524d281b6c818d0489c98a3d54e9bcb54cf576bf34648041ddd2a9635544378e18fff67d34036626ae4f74ddc8a850347858137b458 SHA512 b237a26cef7a0e4e023b953ad63505c00338d7aab0434bdb346ac3e9810f81813a3567f7dbc2d13b03e0c63d50b9f151a9ece7051a90a0568281e410da2ba9da
diff --git a/net-libs/libslirp/libslirp-4.3.0.ebuild b/net-libs/libslirp/libslirp-4.3.0.ebuild
new file mode 100644
index 000000000000..011abdb103be
--- /dev/null
+++ b/net-libs/libslirp/libslirp-4.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+KEYWORDS="~amd64"
+MY_P="${PN}-v${PV}"
+SRC_URI="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="A general purpose TCP-IP emulator used by virtual machine hypervisors to provide virtual networking services."
+HOMEPAGE="https://gitlab.freedesktop.org/slirp/libslirp"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="dev-libs/glib:="
+
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+	echo "${PV}" > .tarball-version || die
+}
diff --git a/net-libs/libslirp/metadata.xml b/net-libs/libslirp/metadata.xml
new file mode 100644
index 000000000000..8830eef1af11
--- /dev/null
+++ b/net-libs/libslirp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<name>Zac Medico</name>
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">gitlab.freedesktop.org/slirp/libslirp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 79a157db9b05..876620d06245 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 3035 BLAKE2B e7c51e9ddb4c08f0f5617a26505455d5d5b3c7a8ab9cb8b0c6ef09a685683327bf4d7e2416ef5b4d66ae7f5c394f9f260ebcd8d65d567dfd7a604d6548adeb4d SHA512 2a801d22d8f0e62a2de19d2ddc57fcb106b40f85551d6943845db30f6f2bc45af7bb4d9e7406436c22c8c1b82443d4bd646acdd0e730d22fcdf102d784fd346c
+EBUILD libsoup-2.70.0.ebuild 3030 BLAKE2B 414552c85bd72c8a65cd165a6a0b6d4dd1680da27a4e57773d9dd4560a21cbdc880070b335a4689aa82e737b38c3160997c9c01b2d95b1077c09fdfe21fa5db0 SHA512 81c8f85c6ceca2300ed702bf6dc456ccc431356e02619d3a2151dda400928a4a8b864831deebc739bd58432cb51f714b65536f87e90ee7d9ea4633145b5be13e
 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 2583e7984519..23a4e7177708 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/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index 57ed5efdd4f4..31b708defa58 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -1,6 +1,8 @@
 AUX libtirpc-1.2.5-avoid-multiple-definition.patch 1041 BLAKE2B 2fd918dad5c759b49f07335685d01bef8bd1c0127647e097a5fbd58f9ddcfbe1179bedd306917755ce39428fcb4c130f9b628f60233dc2464da96c748fcf96ae SHA512 dd72fdc6fd457d89780c4784772c372eb493df3deac928a7c06709cd3517be5586584751a2a9324fc90157838a6fe594ffe91b4f8baebd6115482d76e94985ca
 AUX libtirpc-1.2.5-endian.h.patch 754 BLAKE2B 7ccb2c99a77757f02b7633246431a104e326cafc4261f4ca214ca4c5f0a6c3426502b6b31888e99f5c1e9cad9ffae2fd189a5b6970b8f7f0bb01d449aef68df4 SHA512 c91cb5b516d97b5349aee4ee3ddcd2cef7283adb7316a731c7c86332baa79e8c5e5d60d045360023886b75e2f55d72b0a778a595a363f5757df3781c1aa27c4b
 DIST libtirpc-1.2.5.tar.bz2 513146 BLAKE2B 732e4832f3440d9fa08c45c01c56135ff1b96564c55d33e9b3f16c8361a4f02e49a35638b73110bb72da4bfb78107ccb1b4d475d1ecbdd62dcc156529a372c3e SHA512 d31cd4e22301abe1baddd7e8f45aaaf056a40799e961646691d071084fed50563b5eecdd9b78062fe378be8db7a6d4b87597e21cb81ac925e447148684a2b002
+DIST libtirpc-1.2.6.tar.bz2 513150 BLAKE2B 81ca8d1897b84897b31bd81c17e446213b798e00de80f03736f73eaf6b2e9e436b1569243bf9a8c5ad22de7da51339432decd2a8d3f1b8135151fd7e0f703e54 SHA512 bcb6b5c062c1301aa1246ec93ae0a5c1d221b8421126d020863517cb814b43ed038fb6c0c2faf4e68ff133b69abefe4f4d42bfc870671da6c27ca941a30b155a
 DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba
 EBUILD libtirpc-1.2.5.ebuild 1672 BLAKE2B bf1a679d379e7b7b7d18cc63ed401237e86d46d565586825aaa73bf6d5d3488183d56848938e91bf7312e7b00862c8f650cb8c6db6d84641a501046f8ca8f109 SHA512 cd058d4716bb1dfb418030a6576041c17ff4b91bb5f5f66a569341c7826709a705a3d6928d38dfb31fdf0131d2a2cf3dbe927dede95f4d24adc60178bcfef4b5
+EBUILD libtirpc-1.2.6.ebuild 1529 BLAKE2B 278c86dafe61e2ecd44d8728cf688b8295d9d7f9286463d8580cae972e48a4dd5c5385749e4b84b002962c27587e09dfee4b0d0e6ee6321b821d5021ee03a56d SHA512 70f54351e251df937143783d62309ec3a061fa650844a474c57749557b72f090313a2084ea0c73ec1320147ba71fdbbfbd3d7fe62ac063bf384b2c1e9b7f75d3
 MISC metadata.xml 404 BLAKE2B fb708c5f3f1f4112708810b7fefe2bd1b0d20a15864d730e43cf42480c91d35984238352b419c3bd4b8f3ef831340a781af8b61a857bd6ff36f7521c5dd3c044 SHA512 9fbf0b58cc794cb08cc5075df5ca801d50c2724ca0826700bc18ac8a4a0c0d7231abd1aee8ec6de674b7cf7aa69cd80e7e6b3be90e9aeca36334c11b728db4fa
diff --git a/net-libs/libtirpc/libtirpc-1.2.6.ebuild b/net-libs/libtirpc/libtirpc-1.2.6.ebuild
new file mode 100644
index 000000000000..46c7e4093d96
--- /dev/null
+++ b/net-libs/libtirpc/libtirpc-1.2.6.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs usr-ldscript
+
+DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
+HOMEPAGE="https://sourceforge.net/projects/libtirpc/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	mirror://gentoo/${PN}-glibc-nfs.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/3" # subslot matches SONAME major
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="ipv6 kerberos static-libs"
+
+RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )"
+BDEPEND="
+	app-arch/xz-utils
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	cp -r "${WORKDIR}"/tirpc "${S}"/ || die
+	default
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable ipv6)
+		$(use_enable kerberos gssapi)
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	# libtirpc replaces rpc support in glibc, so we need it in /
+	gen_usr_ldscript -a tirpc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc
+	doins doc/netconfig
+
+	insinto /usr/include/tirpc
+	doins -r "${WORKDIR}"/tirpc/*
+
+	# makes sure that the linking order for nfs-utils is proper, as
+	# libtool would inject a libgssglue dependency in the list.
+	if ! use static-libs ; then
+		find "${ED}" -name "*.la" -delete || die
+	fi
+}
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index b242fd239fce..93907c8233f8 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -3,9 +3,11 @@ DIST libtorrent-rasterbar-1.1.14.tar.gz 4040571 BLAKE2B 38ea1a71e46bf18c9beeb869
 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 2352 BLAKE2B b1b274c01f49cd03d919bfe038352e51db8eb4279a2454e911632e621c370a49109803e9f2eaa1e7836f885043bcd5d9ad488a564bcd93b9d2a97043d27dc9bb SHA512 f7015e3325fed2f39ccf5a4d2258b36524939237dd6606021be20e865d8d462e5b830f108cbf6e8870df0c2d2e9721a89e8b9f2d9b90c1dbdcef7a887baf9c3d
 EBUILD libtorrent-rasterbar-1.1.14.ebuild 2354 BLAKE2B c934e84456e6a15d3dbc7298bb6a04f7a2577d12f853053675d47cd38b280b5f71808e5b9153c7a3b705574bfe01f82b6f28280230f721061f04317bc6ede5af SHA512 ced4871e896e046b29de877c321da6f91f31e205f8df9ae5b18322ee827a97001f30d4d8810478ce5f7262b8e3934109eda549a0fd5de7a0eec2fb6b33712b61
 EBUILD libtorrent-rasterbar-1.2.3.ebuild 2535 BLAKE2B e0beb6044f4f8caf995a9ad6f102bd8f6de66e9d350f64f565bc23aa8f6bbc1a2e54f4687708ecc83839fe159454ffd4f7fac3ca273b4c1db3d0f456c05088a1 SHA512 f64f2de0c4d0f45321e5d859d6025593ac8ec28988a571307327aab0c870cc1cd03cb42eaf836414663b8bdb59a66d6cc3c292307e1a326cb8f109bccd623111
 EBUILD libtorrent-rasterbar-1.2.4.ebuild 2505 BLAKE2B 35494a15034d186dcd00704a72db167389986a2e2be4dcd4db3b1e3e09ee71700b725bd82752a385bcd9ab7c87b78f136c7e2f01adc4c26439ac08bce0469676 SHA512 7b6aa95fd0e16fb3c0b7aeb98b5d99abe7ee8b3d4c6190f8cc95477b3a9b0c3e0ee477dfaf1c562738d7537711e3ccd691233fbd9dd278f8c487767449408030
-EBUILD libtorrent-rasterbar-1.2.5.ebuild 2527 BLAKE2B 39e1bb8b364ba6686e8deebb3d00624e6dac5547ea209d447ce447512a1393d22ad596edf7a03ac87c4442e4c88501b37ee32b58f1b0748386c031b39d85d8f5 SHA512 3505acc8a8d7597b1e9d678d84ebd3bf34cc25c8c70dda6cac9e3c65fca14d9f10249c095f5b73e02c92cd97816e284f2fb2e7e89d1390e64daf6374fc10ca28
+EBUILD libtorrent-rasterbar-1.2.5.ebuild 2529 BLAKE2B d7e9956570a1d916a7d69ce1989efd24879cef06ff0d9f4454fa2bdd82ac966643caf1357c652c2b5eaa00d6e9742caa154a06ad957416595b5c78483abed767 SHA512 7f77b3512366ca5396dedc4ccc917943729a470b752eb8ea2aa917b68c9fc639128285d954a3f25eb822984a601c629097da550eba83f45c11833967a77f2f83
+EBUILD libtorrent-rasterbar-1.2.6.ebuild 2527 BLAKE2B f49a84bf30b047dce6d7c14b6b9bce3f9a666ccd64d2cf6f6da875a1069b83110c0ee38da46b351fd2f1005feb15d45f76bb335ca784ab70d03280e47ecb1039 SHA512 5905fcc3edb79876b75096218db5981542a9e49495af44bd77533214f44f20c5bd8239f4803a5b32af09073a17a272b15f084a59e0256c08616ce0fcdeccae67
 MISC metadata.xml 524 BLAKE2B cb56b15139e8d52871acb1f2979178e182c385658d3fb59025e3f19e1844deb4c0442c12ad490c645d456ec09dd68c268fd6863a205f30a0c241a3d02f10a45b SHA512 47c117d10a88cd13375fa10bfaaa827012d0451713bfff80c587295f68f1243051c477611d9b830a7b525ff2bd77d38c2a45f172ecbe18ba66827e3e6ca664f3
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.5.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.5.ebuild
index 7a7fa09895ce..11c321e78751 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.5.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+)"
 DISTUTILS_OPTIONAL=true
 DISTUTILS_IN_SOURCE_BUILD=true
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6.ebuild
new file mode 100644
index 000000000000..bdee60520d4a
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+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/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index ea3f77c93542..ff4b39df4092 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,7 +1,7 @@
 AUX libwebsockets-3.2.0-check_chown_result.patch 706 BLAKE2B dece41b49946d138a441c389ff57b5d1814174c90f2e3aea8f269a08c84035fd6853283a47a5eb48dae36ac2c7adc1dfbb85b985a62b2158c87c43c24acf2170 SHA512 79977a3e9142ea4c295a2b3a35f9e902d36fa032ff3ae1f13e6980eb9fa260239205f1b9b5998379a4b56f53e25af72e07c9973d1c67da2cadb254296f964fc4
 AUX libwebsockets-3.2.1-socks5-noclient-compilefailure.patch 943 BLAKE2B 2d5660b54633f4f1c855b0d72ec11763af5b6a550708491a837542978b0a3b2607027c2c5f85375c71ed92f4f3726e10732010bf04565feea5ce765d89cb36ef SHA512 375a5ae24f3399406628fb604ac84670e1a2fb4ae08a4525da721a589e7e06f1265c1d906a037e0e20bca5d88785125f3d831eb853b79e286495ec0e32a22e9d
 DIST libwebsockets-3.2.1.tar.gz 9868342 BLAKE2B d822552c611f7cd0ee416bf9b9576c6052e196c1aa68b12c46a00865d3dcd131840218394317f191485fc61d8f3b7654d4a652a47f11d279a555522df84a2350 SHA512 a2d30a7a0416a26484743efdaa8635542480a74b0ef0f6e172dab5de4688486efb13457fc8a884d9916f76322cab0cbc9ab675f496558edd1dd9b833d087207d
-DIST libwebsockets-4.0.0.tar.gz 12330114 BLAKE2B 4c845b02793853e349df311f1772fc6988876dc21a262d952b41a1742f59c9d9d0f9a8f28ce8fa9cdc36e3342022dc46836b359b2a11dfd6ac3f39f8c3c1fc9e SHA512 9d15d708ea399ea50502c97d4689b987e28222c81c6ca499969821532490b4eb19b67bab6b431081888c34f36d41d4f74e3611bd2103eecc31d5c6a559bcdf84
+DIST libwebsockets-4.0.1.tar.gz 12332611 BLAKE2B bc5aaede801b61c389928b41e091a7b84fb24a73a64aa3dc2ba7a1370e146f5c98ede9489ed81fd274884c772de3fa93a9f5b7e3c88be4e28c092a045b7d5e72 SHA512 33eced9690e54106afb63ac58eb25b1eefd7998074d042209c97177f95c14c4aa97c41303918d7b0649863865d85d9579693762b8215df54879621778ffabdf4
 EBUILD libwebsockets-3.2.1.ebuild 2227 BLAKE2B 7af189cdcf997b5c2bff16260316e8e3e9b9d003663a08e52800afa46fe0ca8a59f72e5fdf0a193ebc9b8cedfb39329fa01735382e000c2c3eefe06e9ef40d5d SHA512 947a42364b9b48d99c4d0fc8043538561ad4deaba34a5d8e1fc5154110aff5a2948e5a6e49f66064a0e2cb541d2d436d14db8163f6fc8cdee4e9d6dc73bb389f
-EBUILD libwebsockets-4.0.0.ebuild 2158 BLAKE2B b938465ea3cd827241f4cdfef782248bc7dcbe1083df9301ea8ae0229555aaa69db89cebd0de8010730e0239edca5b7ddce13f911d2583cb556769146bcb405d SHA512 cb9e3ff4ae75c6bef52cbd58c07570cf0cf75189c251fd0384fd1270a355962398c283444c8b33609741f09d4d728d94d4c7c170127276fdf6ca564b99b49cf9
-MISC metadata.xml 1606 BLAKE2B 5e364abce43549abfa07179a757c2455ee2edc3d99d37c08d6f0d6f1df87d571e8f912672f2225175969ddc228abd25b7ab3218021857759b3f2d42792db5dad SHA512 9c38e83966d1a70197c0777fc15b7788c3c65420f38131bf8ef977601855710e9288dcc19cf2f63ffa2d34234d0b9b2d10e0259489581ca947139036c53b1644
+EBUILD libwebsockets-4.0.1.ebuild 2153 BLAKE2B 40ba09541f4ace3f8b5bb78f8c554939758cbf443b3e6bdb0be300c47fb2e38d9e8cdcca8a29f1279cef0e5abb1f1c29bb70244c84dff1e03c15fde34eda8a11 SHA512 584389e98a84aab0af30e3e93d2b36e11086115e09dc627ffcf4ffdf1e668ff666d4936ff43f987275b904eb2518329f240db8dac7d007dbf75e85d1d060a15f
+MISC metadata.xml 1828 BLAKE2B 5a0de78137a46817ca3d7388b6841a05b90b9a5cdb7991fdbdff62fa2404049314767dfc12c6575e9217c46027b8e63075c9aa487f764c82875fb1e0beffddd2 SHA512 9f0f17269b446ae8b521d1c50f3f23d19b14b7f261c38e1be57cdcc11bdce107ada5cdcae087136e4ea4bcaec040ac3c7f8423bbbf7c7ec16f3b85b1f1082db1
diff --git a/net-libs/libwebsockets/libwebsockets-4.0.0.ebuild b/net-libs/libwebsockets/libwebsockets-4.0.1.ebuild
index baeee47a7b27..7620aaaa0249 100644
--- a/net-libs/libwebsockets/libwebsockets-4.0.0.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.0.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A flexible pure-C library for implementing network protocols"
 HOMEPAGE="https://libwebsockets.org/"
 SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="LGPL-2.1"
+LICENSE="MIT"
 SLOT="0/16" # libwebsockets.so.16
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6
diff --git a/net-libs/libwebsockets/metadata.xml b/net-libs/libwebsockets/metadata.xml
index 66a43eaafee6..6aa0f75c8847 100644
--- a/net-libs/libwebsockets/metadata.xml
+++ b/net-libs/libwebsockets/metadata.xml
@@ -5,6 +5,14 @@
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>luka.perkov@sartura.hr</email>
+		<name>Luka Perkov</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/net-libs/libzapojit/Manifest b/net-libs/libzapojit/Manifest
index 374989e1db11..ef5dde5b0afc 100644
--- a/net-libs/libzapojit/Manifest
+++ b/net-libs/libzapojit/Manifest
@@ -1,3 +1,3 @@
 DIST libzapojit-0.0.3.tar.xz 272108 BLAKE2B 7bd606b01cb9b92c844a35d4229e52347c5193033c4fe483eb2fcf5bf76c9773cc26741d7eed8d52c1352767c65055088335ffb0779d390988292956b367584f SHA512 8dc1006db515a4b2971ebccdcf167930566a11bfe74f545e3a9647ff061be4ac2781faf1adbf6e6107b4ff2e08f16b9ad1f96f9b8e4f0eba87601fdc1c35eaa3
-EBUILD libzapojit-0.0.3.ebuild 843 BLAKE2B 5d3f53e1bf9a8c73c540b033436d99181a02fed49f8dc8ab793bdca1084bafc331765b90e09784d3d7fdb16f33ae1c55f0b06f25af27604d1761705a881d3f8f SHA512 0522ff656b1b7ecb4fc329f24ea7f6ff4aac84cd7ad88bcddd092e7c24cbe841ab309feec8ef2288f9c80be3dbb67c79990d346e1f3a2673557afb10cd051425
+EBUILD libzapojit-0.0.3.ebuild 837 BLAKE2B 26095429bdb74a2c3ff64045ec52d1d1582113bd28924f0adcafd733b268845826deb8c1e0988e700700b70d0345ed291a58f0eeb89cfdf0b31278ea94d79ff6 SHA512 3a43299a066ae69e70c5011b4137bd10001a5bcbcdc4d533bb674cf3599a4f46567559fee2e124081505e409cda30cef1a897178c0834a9c4d2eb4f5cf980f5c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libzapojit/libzapojit-0.0.3.ebuild b/net-libs/libzapojit/libzapojit-0.0.3.ebuild
index b8b46a6153c1..5cf2bbcbcbc5 100644
--- a/net-libs/libzapojit/libzapojit-0.0.3.ebuild
+++ b/net-libs/libzapojit/libzapojit-0.0.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/libzapojit"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="+introspection"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.28:2
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 097f44babf57..80a4147fb7dd 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -2,8 +2,11 @@ AUX mbedtls-2.19.1-zlib.patch 1163 BLAKE2B a5b44c2af4d9e7dd37a004063b69ae9878bf2
 AUX mbedtls-dont-overwrite-headers.patch 2183 BLAKE2B 1353eb9c929e4d79bc1f4eecd671c9b6602917198724b42e1b43153a4751cd5a36737fd706f97e933beb857a246dc16574f4d989cc674661dd774f7df9d1c3a3 SHA512 19dec50ce70821b0c94e7bd9c50c1f8ebd7d7abc087cb91a637e5349ac938b4b07236f7fc4580e4a348ecb9de68d4b0b45cdced6e5103ce94178be710b2563a3
 AUX mbedtls-un-pebcak-705038-wrong-file.patch 2766 BLAKE2B df7ef73f53f4a2b69cc8b435d21decffb580d28e75b9ec52620c305dfc395cc088cf7e4bbcaad381a3c9f8587b1678700d8df1cd65ceeef8079e4ed250ec9ec7 SHA512 376a5c7009122b60345b9edc3ce8a2f765d1c7ef11f6a398a9b9fe1c6e4a9d36d62483f036a6c77e21fc86f2900d9d3a7c477582463a80121097a56cb08a0515
 DIST mbedcrypto-2.0.0.tar.gz 3001813 BLAKE2B 35a01b7cb11a94cb5ef333f5939945b40ecd0da482959980931e389ac5aec3c1c1b2f40970bbde4587454aee5957dce220593bfc31943ec3deddfa70d2386a25 SHA512 3a8fa6b7160065ef175139ba9cb4c8599be11f9d0df5fd60f9f96c425400a0a40eaa31d571ce61d4a00e3b10c1e2b81756c1ad31df6fc32777f40ade7806948a
-DIST mbedtls-2.17.0.tar.gz 2738368 BLAKE2B efcf2a6c84a85afdca0205bd9e8bcf039074c5e6f40e0814f835cf26c2d13dce87bd140aa0b803eea6a683e31b79680a3ea8ba72417e7ec26f206e0b027b014a SHA512 6ab52d116cb9f755871f2fd196ec1b352dbbe59f2ecedeb5551237e4e672da77205ef0c2f80ec746ba1fd94cab1995ab1729c8adb0f29d10f3c74a67f5327493
+DIST mbedcrypto-3.1.0.tar.gz 3055269 BLAKE2B 50089999c8c5c768f266894c4d0f45ce596acf3295ddd2f851be52486eef8bd9d5a12a9a5beacef9527c5bba36de90550a707c1adebd65cc853f4a55419e0bd0 SHA512 718d4193feeae9e598d068e959b6f6781d68512e59edfadbde9adb7356063a13fd3d6d9d88f94488ce6bc56faae2b55c001411df12420923a528316eaa422837
+DIST mbedtls-2.16.6.tar.gz 2603563 BLAKE2B a4011bb2b7e3eca554cded05c4650fc16b48d86ae1ac7fefe29df6b29e38c1e76c880f082be83759b4dddd96f831a1238c2df41671bd9794b028402b3dd63f60 SHA512 a4c2e70c0cc6b1f1571a9f2ec27ede2620eb1937361599cab0e05b807068397d25695d5cd23931fd0f4cc051de6367c2b6c77f3507ed8b33cd492589c51eebac
 DIST mbedtls-2.19.1.tar.gz 1165843 BLAKE2B c8e6764b493a6ca011e74d7b297d5ae5140d7bdf17c1cfd5b9d37913d615ad3c5a6dbf71d44cbf14c938646e51bbf04cd63cc1657eb3775addb2dee3ee94c587 SHA512 07ec1cdf98e51ed35bb2940e485d7d8422e9fd440d2077d5cd4c80781d73848228386fe9064773ef8bb1a02c1bc060185b9c8310349d695926bd2c9b7cf6582b
-EBUILD mbedtls-2.17.0.ebuild 2449 BLAKE2B f9d80604358d3bf39fadc6f112c8aa82e9b879a917f059b27d912f705316cfd9bc45c936ab8926ab19509fa397848e824883eebe993d4ecd550e48a539170ba3 SHA512 128290aaa41701422296ef214b0a21f295d5207b5ce562de7e9c3603eeb6e0595993bd9545c9cfefeb2f64ed351fa30497bcfbfd55916a40253fda8b597b65d9
-EBUILD mbedtls-2.19.1-r2.ebuild 2835 BLAKE2B 239727e104e5c40ee3e958a7ca9c908800b32b4b6e0e46914c7a3e15105f92bad560ebc39bccc349ce2fd7be6fab6c91767d8d9a6b7e0ebd2a15b6616a93a753 SHA512 d63cd1e267786b5c6c7c4187078ecccb1403ee553f231c509035d9139104076f6d6f038f029e6cf798e8ca9881f4df000a572525a0f55349425a95eb0396c3b8
+DIST mbedtls-2.22.0.tar.gz 3822997 BLAKE2B 0857479e89f9850f611cb8c946c489f715a83edba88673b874cd3e6530a7f72c48671e02435087a48aa9a550d0901a5fd2990f9b3a4d69edceecf1fa01772ab6 SHA512 391b99a59ed4edf9625e71e610ea71c6cefa4ea1210d306eb595d85f7408d5decf5fc995d4a411698f1536651ee1230b305dd354df15dbeef9469aa6a7980e09
+EBUILD mbedtls-2.16.6.ebuild 2457 BLAKE2B f07512c5fe48afeb90f1d169fe407a1d1566dc4eff45f283673c3c7699d3cfe4058d92c8b04ed14e1b4b371705419a37650c18a9dfff614575ded93a42c047be SHA512 f503651e8e2837fb885eae3ba80e54b5145fd11b79d6e63d60775b7417d099e7198c06e4dd5de8185f8596c2ae4b84a2aed056b61d433a8e8fec47c6bfbb393d
+EBUILD mbedtls-2.19.1-r2.ebuild 2848 BLAKE2B f20b47e615ee152e8b3e444cf5e2fb113eb2e4d32b9d904dd7e797c8cdb842fc0e50b1db4a2ae24cb3751bf8358713c40bd10943229f9607b32c20a9143e398a SHA512 bfdfbc437b6fea7e3f9737a5b78ff69f4ec7c3a05a773d1f396b052cc54f88dc6eef5ae6587cd6d61e765bd7b202904d0b55e0a3ecf47e90d12e9775c425d17c
+EBUILD mbedtls-2.22.0.ebuild 2807 BLAKE2B fee0f5c7ce99d500bd04440b56acdbd4e4c978d0a2ea41b78df2f028666644621ea3e9c067a02b49b7df1e4d4e8ddba3e69cfeb39012ddca80e8733664ade563 SHA512 c398ff4cf05807e109d8be72ea273e3b4135c44c441ff96a7621a78e40e22a78a447ea083902b0351504709db9e5c1def8164b5fa00b316fc9ad44747a0e86d1
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/mbedtls-2.17.0.ebuild b/net-libs/mbedtls/mbedtls-2.16.6.ebuild
index ffb19c04d7a4..1493f3c36061 100644
--- a/net-libs/mbedtls/mbedtls-2.17.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.16.6.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/12" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
 RESTRICT="!test? ( test )"
 
@@ -60,7 +60,7 @@ multilib_src_configure() {
 
 multilib_src_compile() {
 	cmake-utils_src_compile
-	use doc && multilib_is_native_abi && emake apidoc
+	use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
 }
 
 multilib_src_test() {
diff --git a/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild b/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild
index 6e33b2b74111..f8d6153e9705 100644
--- a/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild
@@ -72,7 +72,7 @@ multilib_src_configure() {
 
 multilib_src_compile() {
 	cmake-utils_src_compile
-	use doc && multilib_is_native_abi && emake apidoc
+	use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
 }
 
 multilib_src_test() {
diff --git a/net-libs/mbedtls/mbedtls-2.22.0.ebuild b/net-libs/mbedtls/mbedtls-2.22.0.ebuild
new file mode 100644
index 000000000000..9ff412a556dc
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-2.22.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="https://tls.mbed.org/"
+CRYPTO_SUBMODULE="mbedcrypto-3.1.0"
+SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz
+	https://github.com/ARMmbed/mbed-crypto/archive/${CRYPTO_SUBMODULE}.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="Apache-2.0"
+SLOT="0/13" # slot for libmbedtls.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	programs? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen media-gfx/graphviz )
+	test? ( dev-lang/perl )"
+
+enable_mbedtls_option() {
+	local myopt="$@"
+	# check that config.h syntax is the same at version bump
+	sed -i \
+		-e "s://#define ${myopt}:#define ${myopt}:" \
+		include/mbedtls/config.h || die
+}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-dont-overwrite-headers.patch
+	"${FILESDIR}"/${PN}-un-pebcak-705038-wrong-file.patch
+)
+
+src_prepare() {
+	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
+	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
+	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
+
+	# pretend to be git submodule
+	rmdir "${S}"/crypto
+	mv "${WORKDIR}"/mbed-crypto-${CRYPTO_SUBMODULE} "${S}"/crypto
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
+		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
+		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
+		-DENABLE_TESTING=$(usex test)
+		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
+		-DINSTALL_MBEDTLS_HEADERS=ON
+		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+	use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+		cmake-utils_src_test
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+	use doc && HTML_DOCS=( apidoc )
+
+	einstalldocs
+
+	if use programs ; then
+		# avoid file collisions with sys-apps/coreutils
+		local p e
+		for p in "${ED}"/usr/bin/* ; do
+			if [[ -x "${p}" && ! -d "${p}" ]] ; then
+				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
+			fi
+		done
+		for e in aes hash pkey ssl test ; do
+			docinto "${e}"
+			dodoc programs/"${e}"/*.c
+			dodoc programs/"${e}"/*.txt
+		done
+	fi
+}
diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
index 07a320078b7a..14dff2fac2ab 100644
--- a/net-libs/neon/Manifest
+++ b/net-libs/neon/Manifest
@@ -1,5 +1,7 @@
 DIST neon-0.30.2.tar.gz 932779 BLAKE2B 0536e4f1c8634ede9a1806180c315772a65b9cb1ead0ae3674d58aba855905b6a7c7684ef930ca1998c1163c662d642a687cc704922981dbc4a89efaa83f4cd9 SHA512 634caf87522e0bd2695c6fba39cae2465e403f9fbd8007eb10e4e035c765d24cb8da932c67bfa35c34aa51b90c7bc7037ebebaa1ec43259366d5d07233efc631
 DIST neon-0.31.0.tar.gz 867476 BLAKE2B 84981d0fcca97bfa495f9e8cbf060a06e04c931ce3b5eca41ff1d76a47fd863139b8bf3e102c5e4e8d22d5cffcebc64cee9b8f746f8d6669f0cbccf124fed9cc SHA512 62c55e16609d657ac56bb4a2fd32a10ffa72d5694aa1369be533491a6683034ed42843d5f19ed06cf8c1b7b8ba11b74f9839cdfeef4afc3b2d7b11372ed85cd2
-EBUILD neon-0.30.2.ebuild 3397 BLAKE2B 42a0b46c7daad4186abdd2e58546e563d62b7d585f9a2d67fcc8fa78341ef5305034cbf5a7dd0d2b189fe01d5fde416d8951875a02781ba6f7faef7e17ebb34b SHA512 1aa07f7cca4b68ac00f535546843905bd6b0b1ab919f97bbc8de89e66b01246ee9965616b979c7855f17843c05b93cb5881387caf7d73471b1c92a0d6bbb5a5c
-EBUILD neon-0.31.0.ebuild 3406 BLAKE2B 89a40fca0d41610c0a4cc7a982aa00a4e694eefd74a865cde7267a437f0c982046fa6bb97e16701bcff457fee65989ba2531e0654ca6be6fc2504d872fef99b4 SHA512 ee8c451b6c87dd6e7d6c912a081595130e9f01bed672013b964967264504c119d3c18c5184b87b80a0cddd78b79f5881bdb7fc67a7d9c425ad351c91d029dc0a
-MISC metadata.xml 1341 BLAKE2B c2bec964f34a0d9be01935bd3d78d3e4afcc0101f9d31eefa44106c13d3e8c1f91b227b5f15449d71785a889dfe801768c8b2aee361b919aede85e0d41602a17 SHA512 9b40394e7a103b87d61c0ac004dbb7294bc977ccb69d2669f186ceb1980fca2e2def5ac097ae2364c4e2c762e5170d06a5b281bbd870ebe00559cb5cb17d87f8
+DIST neon-0.31.1.tar.gz 867810 BLAKE2B 7b7d0c8ab635446c98f3db7072f1dabbb74ad9f579086f209bb3af5460363520be38886a299d22dc0f27a091f322c6d5972a00d4e6c612c710dca12e7620f850 SHA512 00d7297c102ee828d84eb28c9b6a57e66290904acf5327f8a6d3d1759ffacf88329bb2157dcef418c69e93d1370ccbd591829da06c01c3f44aea6c7b92462c13
+EBUILD neon-0.30.2.ebuild 3404 BLAKE2B c2eb86b8bf6381be8c39120ebfddcdbc2909c23bbf56550adf5283c1aa7b415ab8c6406d40e4c8616b657e9346015898bca269fb3689300d088b42b13a8e1c00 SHA512 a64f9ed28745bded709b483a1d25c3b8dd4749671cbc629f9b009743678cd015bbfdfd2c23c63a89dd22adc12ffbdf2121bd156dfe54caab728883dc346eb06e
+EBUILD neon-0.31.0.ebuild 3413 BLAKE2B e812c4975d2adf03124c2f55aca6f86a7c83e13194c8147e134b60ed634bfb518727ee0b568205032e3290f06170b0fa80534be6afc7f4f117031954a84fd62a SHA512 40b5521f79d78f0d200a5f96f7350f8e07e3b4128702e19a1bfd3e7f35d5472202c6c180c44d64f154f305cb4fb0bc426b22613957708d29787c8b4c11e6261a
+EBUILD neon-0.31.1.ebuild 3420 BLAKE2B 9c7e377e9ea9e21bed8263539fba9ec9e900750b837ed82a3af327d7f135248deba39c1fe88ebf3513006e79854e08e5bf8d3f0f925d613afbd2ea6f2f955dd2 SHA512 4a1d387fb944d6850293cdd929fc9bf10c94b75bd0c5008b50bcabab247946b2c18405b55b58a8ae442730f25251cae80990ba03710c94b0805adf686c59545d
+MISC metadata.xml 1417 BLAKE2B 5feada9aceaed7ca6c5db29a993c24f049469f2d7d1ed57db5ddce3277e575a850ccc45700bd620ee503f3cb1abe7a9b333066b7be50bb7fd5f40f558dcfb0d1 SHA512 cef52cfe791a0b561a2c4472fb3d7ff5e878f8bc7fecf4095568b215724ce16edd866a6033d4be730d22b1297615119ae17bdeb09dfcc8555496a610270cfb97
diff --git a/net-libs/neon/metadata.xml b/net-libs/neon/metadata.xml
index 78e276ad6748..4059f5b77bc9 100644
--- a/net-libs/neon/metadata.xml
+++ b/net-libs/neon/metadata.xml
@@ -26,4 +26,7 @@
 		<flag name="libproxy">Add support for <pkg>net-libs/libproxy</pkg></flag>
 		<flag name="pkcs11">Add support for PKCS#11 using <pkg>dev-libs/pakchois</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="github">notroj/neon</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild
index 6ff38ebbff6f..6e4e2fc96974 100644
--- a/net-libs/neon/neon-0.30.2.ebuild
+++ b/net-libs/neon/neon-0.30.2.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 inherit autotools libtool multilib-minimal
 
 DESCRIPTION="HTTP and WebDAV client library"
-HOMEPAGE="http://webdav.org/neon/"
+HOMEPAGE="https://notroj.github.io/neon/"
 SRC_URI="http://webdav.org/neon/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-libs/neon/neon-0.31.0.ebuild b/net-libs/neon/neon-0.31.0.ebuild
index 0be8adfc1aef..f038f33ba546 100644
--- a/net-libs/neon/neon-0.31.0.ebuild
+++ b/net-libs/neon/neon-0.31.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools libtool multilib-minimal
 
 DESCRIPTION="HTTP and WebDAV client library"
-HOMEPAGE="http://webdav.org/neon/"
+HOMEPAGE="https://notroj.github.io/neon/"
 SRC_URI="http://webdav.org/neon/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-libs/neon/neon-0.31.1.ebuild b/net-libs/neon/neon-0.31.1.ebuild
new file mode 100644
index 000000000000..11cf88702f22
--- /dev/null
+++ b/net-libs/neon/neon-0.31.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2001-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool multilib-minimal
+
+DESCRIPTION="HTTP and WebDAV client library"
+HOMEPAGE="https://notroj.github.io/neon/"
+SRC_URI="https://notroj.github.io/neon/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/27"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"
+RESTRICT="test"
+
+RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
+	!expat? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
+	libproxy? ( net-libs/libproxy:0=[${MULTILIB_USEDEP}] )
+	nls? ( virtual/libintl:0=[${MULTILIB_USEDEP}] )
+	ssl? (
+		gnutls? (
+			app-misc/ca-certificates
+			net-libs/gnutls:0=[${MULTILIB_USEDEP}]
+		)
+		!gnutls? (
+			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		)
+		pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
+	)
+	zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/neon-config
+)
+
+src_prepare() {
+	# Use CHOST-prefixed version of xml2-config for cross-compilation.
+	sed -e "s/AC_CHECK_PROG(XML2_CONFIG,/AC_CHECK_TOOL(XML2_CONFIG,/" -i macros/neon-xml-parser.m4 || die "sed failed"
+
+	# Fix compatibility with OpenSSL >=1.1.
+	sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed"
+
+	if has_version "<dev-libs/libressl-3.0.0"; then
+		# Support LibreSSL.
+		# Functions RSA_meth_get0_app_data() and RSA_meth_set0_app_data() are not implemented in LibreSSL 2.9.2.
+		sed -e "1202s/#if OPENSSL_VERSION_NUMBER < 0x10100000L/& || defined(LIBRESSL_VERSION_NUMBER)/" -i src/ne_openssl.c || die "sed failed"
+		sed -e "97a #if defined(LIBRESSL_VERSION_NUMBER)\nstatic void *RSA_meth_get0_app_data(const RSA_METHOD *meth)\n{\n    return meth->app_data;\n}\nstatic int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data)\n{\n    meth->app_data = app_data;\n    return 1;\n}\n#endif" -i src/ne_pkcs11.c || die "sed failed"
+	fi
+
+	eapply_user
+
+	AT_M4DIR="macros" eautoreconf
+
+	elibtoolize
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	if has_version sys-libs/glibc; then
+		einfo "Enabling SSL library thread-safety using POSIX threads..."
+		myconf+=(--enable-threadsafe-ssl=posix)
+	fi
+
+	if use expat; then
+		myconf+=(--with-expat)
+	else
+		myconf+=(--with-libxml2)
+	fi
+
+	if use ssl; then
+		if use gnutls; then
+			myconf+=(--with-ssl=gnutls --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt")
+		else
+			myconf+=(--with-ssl=openssl)
+		fi
+	fi
+
+	econf \
+		--enable-shared \
+		$(use_with kerberos gssapi) \
+		$(use_with libproxy) \
+		$(use_enable nls) \
+		$(use_with pkcs11 pakchois) \
+		$(use_enable static-libs static) \
+		$(use_with zlib) \
+		"${myconf[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install-{config,headers,lib,man,nls}
+
+	if multilib_is_native_abi && use doc; then
+		(
+			docinto html
+			dodoc -r doc/html/*
+		)
+	fi
+}
+
+multilib_src_install_all() {
+	find "${D}" -name "*.la" -type f -delete || die
+
+	dodoc AUTHORS BUGS NEWS README.md THANKS TODO
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 52a0178eafd5..5f922cba1e0e 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -3,20 +3,18 @@ AUX nodejs-13.2.0-paxmarking.patch 2714 BLAKE2B 56371f934f40772845f2a7fb873d5952
 AUX nodejs-13.8.0-paxmarking.patch 4213 BLAKE2B 4235139400e33fbc0e9f9f965953ed1603283d86cea879b5bb67c60686b45ee26237970a13466d2f5392ee463660b318e53061701f916c4f2f2cc15756f21444 SHA512 c738c9ab15b0ce9b2356827a63d2d35eb1ddf9441b4fc7e9e3e07ed30bf7a6eec680cb3901ab8de6ca9a9377e6a04a520b6a88a08ff5cb2673ed50ae737e066d
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
 DIST node-v10.19.0.tar.xz 21906168 BLAKE2B 395504ef3befa47d8b967114e019e6a76c799871e7eb21e2c6c0453655ffa07f17f42209daddeb5417342cfbad71ba1a35ae15a2d210b692bc60be270c2fc415 SHA512 512efc58415ed789938c434af131d76bdd51772cac9f7e380afaa79d83cc9c433a979068fc7272adba6ba6551d195267978e1fc819236926b0d1fd6cf91c5eee
-DIST node-v10.20.0.tar.xz 21945800 BLAKE2B af767add881976a648129a999c81bea7e74c2a59ce951cc3cd448e7576782fe8219d67427187a5e5c2bdf684aaddf918bf712ac11f8153cbd511b9d9b7ed3182 SHA512 0472b0d595f8c1dc941612161215e60879dedfe22659878a1c68146c12d92945245135ca951eb84f6c3d16e9a01d084b027903451f7754a7f2028b024c388ebd
+DIST node-v10.20.1.tar.xz 21947588 BLAKE2B 6078e29a125fc1020de7b62c97174d82273af5f6def1dbd2be7968227400735d62f8427811cced69f6365f3232d8800cad388853c34dc6620dfbbc5a27d7f716 SHA512 be2f87e1089be37caa87f5c109121f3f054ffc5a66c4d468f631fa718e461425fbb2dc397459e252eb66c11a06b60659a449dcdcd9d44506732f3703660b597b
 DIST node-v12.16.1.tar.xz 23481768 BLAKE2B 29371b952c14907778c064269108f1da5e3818c32773e73090c61edcd07190c418189db6a505987ca71f99bb868880e297de5d2181b9a880774eaaf515985f26 SHA512 fe1e9fabb6fe52e3bc4275b33e6c5e4a761550b04964c0ae7dbef7172f5d415207bb2985751d068e357ce45a0ba414b07c0abd1531ef839b9463e98eeae8f9a4
 DIST node-v12.16.2.tar.xz 23654020 BLAKE2B aa4bb764a8731e32ce07d03d96d573632bbf9af79b127c2acec48fcf335c01ea0ea99532670a46befac42e2e1ce5a4dbd2e4cf0d068bac05749d87af59bb80fa SHA512 81688468bc6e20d83f7f58f0c15f9291a801eb2acc8ba7279e65d81f3eb4ea95e3b6cee0d09738c0d0fa35226ae3d52f2bad5da63a20a3edc9129197d42d000d
-DIST node-v13.10.1.tar.xz 32812128 BLAKE2B 2dc0e1de269a898f57e9fb91d5b3161d43baa89c8617faffa9998b3244354619a5b78e39500bf02b90fbc2587b8477fbd86850141ec7665690040d6920c50fef SHA512 30b7b58c87021be3e0b909bae476c6191eb72722ed00e51716d7eb0793aeb29c05b088c195ffd69a40dd42423ceba20350f6379c11d276eb3398abfc4cdf340c
-DIST node-v13.11.0.tar.xz 32812056 BLAKE2B 0c3975721916f4594515b37b093fb0640785212b455c3687d63a89bb8c6930ce59c74f8ccedab3579d88bedabb881264725d93e43a384b851897bbb94a5a52ac SHA512 cfe8b46d9cf5c7c10f7099bcf1d3a3ec8ac5d70038c6b33009d0815d68e8c1d2a28cd80a16ef1473eba3927360903bcf6a74e8d5f71f09b5ff7919d908545211
-DIST node-v13.12.0.tar.xz 32841080 BLAKE2B 64687e8d5b768f4571b53542bcf5d023953069eba5fdfb746a8dd29e4542141a9b57fc0524429cde9a3c2e579dd47128e06d46d1f3ae1a35326f8b69a750118f SHA512 3166da61a3d84fa9d4cbfc473df7441a6f7e648ad92b095cc357c2440214ddde117fb220270db8e0736eea3b715742f0d73666bba25724770e7e8f6071495d57
+DIST node-v13.13.0.tar.xz 32862040 BLAKE2B de2802543421049d225b9eab5f1edd3f3d483cf50839fd646cc5756f272b42baaf56c58c3c31c498cb79abf8ed678cd5dbe6c5622b6dd4564ed22dbde11ce1ae SHA512 344d364fd39c9497ff7d2829b271b572f3f997fc3eb01744c9ba533b4ba1e8a1fbd08ad28909e74504f4bf84de95d0197a0b5e8b9cf07180a1457fdd2e95775e
+DIST node-v14.0.0.tar.xz 32850900 BLAKE2B ef24e6559246f64d9a54d1e6c9ac390bb416af2ac494547f4171db014e2213cd0b11a482ab611865ca3f61a60a9d793207c53f1779d687a7ba7a32fc4d9f29cc SHA512 030dff2bc46594e5e86e0383185030980ae486bbdab2fd2cf65e591c80a9426cf4e6f16c384d36e6094b8a58e8511d7019bef379c44650507d1352a680505710
 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.0.ebuild 6361 BLAKE2B 347a4d538848e42a071ecab801743002b1a2c979dfbf67be153024541b53ab7ad9814d25bdeb31ee13a659a24470c6a73fefcecd7b1175836506bb25681ff4cf SHA512 6858af544698d7b343bc41b0c6a57956cdff1602d0018b00662d0ceb4b619e821fd14dcef67573b96c680e1584714745e007088dbeda9f5f410937892260186e
+EBUILD nodejs-10.20.1.ebuild 6361 BLAKE2B 347a4d538848e42a071ecab801743002b1a2c979dfbf67be153024541b53ab7ad9814d25bdeb31ee13a659a24470c6a73fefcecd7b1175836506bb25681ff4cf SHA512 6858af544698d7b343bc41b0c6a57956cdff1602d0018b00662d0ceb4b619e821fd14dcef67573b96c680e1584714745e007088dbeda9f5f410937892260186e
 EBUILD nodejs-12.16.1.ebuild 6199 BLAKE2B 401807f39cc6cb178a532cb99f73558c47916f766a45184ce63cd0260605d2977a164cafa8a1197b7177da6b8198ba3224e2ca96733b47e8ea104fe1d6465a4c SHA512 7ce5fd34dc047875994da88d022c693e599b379bd9bcd98ecaecd99dd8eb45e7bfafc303f4d328e5cd241e5486a015a29197df0a905bb67e84c6b943930e229c
 EBUILD nodejs-12.16.2.ebuild 6203 BLAKE2B 013443da57ae66e7a58247e7ab3599d72fbfcb1a62f9bf6d06b4412a5bae1372eefd7e8cbc68aed2d97b72734c60ce3a38effb34b6961872c946bfa4c5bba4b6 SHA512 9b56e373305402bd499d09b04f748f555f6e1966bbc5c112ddb0e1a372615c89b58850bc802b86f9e0b06942d6707095f156a05b15ad9c01b55c4c23c1301d53
-EBUILD nodejs-13.10.1.ebuild 6224 BLAKE2B 40bc5dfe6a7eda8e41f2c962498649ac26fc458ac81a33b876b14e28d3b250494fb0cc990b4a4327e22f339f2501158dd7095a1c62e8922cd280c55670f375fe SHA512 eb4f5617092802663a269b2b4adb0dbca6c67cdfc771149aab29d2aad6f290735bab403afa8944e925444df60ad135265fb37076bafd96cc0cf4a05db4aa7f62
-EBUILD nodejs-13.11.0.ebuild 6224 BLAKE2B 40bc5dfe6a7eda8e41f2c962498649ac26fc458ac81a33b876b14e28d3b250494fb0cc990b4a4327e22f339f2501158dd7095a1c62e8922cd280c55670f375fe SHA512 eb4f5617092802663a269b2b4adb0dbca6c67cdfc771149aab29d2aad6f290735bab403afa8944e925444df60ad135265fb37076bafd96cc0cf4a05db4aa7f62
-EBUILD nodejs-13.12.0.ebuild 6224 BLAKE2B 255424238dfffc7fbc372c553c2d4999bcb2ecb03ade1d0afd519b9b7bcb81b1029512167271bbd79dc901b4f2c8a19f44c7ed01412071b29063daafd3fd981f SHA512 4e06fe7a67ec3b98cd8f1f4f2be14c38401234f0aab81ff7447b7193f7aa663fc94bec24351c05d517b889d84c2880bd2b0746e1a7374676e70e1b46e9a707be
+EBUILD nodejs-13.13.0.ebuild 6226 BLAKE2B a4cac1ba7c751e335fd5f50eaf40577b710866d01f3a86f49792fc2ebe3618775c82ab9ff86dfd1bec21395689a6d6181ac77841fbb6e6957a59b2672e6650ee SHA512 7aa41240ca1e735fd6690e6416931c2632e84d0eb0b15a15bece4a6a4454dfd42f7d1e17076bc9f75e739c6443f83883cf55815e927c24fb5548c3ea79492a00
+EBUILD nodejs-14.0.0.ebuild 6224 BLAKE2B 5b71661be87f90968b995bd9ea2a2dda2a4a59abae05538c5a282135bfae47bbabbf72b33f61049172abd71c7dfc01d1be16132fd037e20d31e347e3f0a5c26f SHA512 852f73d60bac059a05b1049146f720b8f85b1fed4e28a1d20dace21e9051f1c5c53767709671f5f7324da687a511e98ed9543451c9a84c947d71dea87fe964dc
 EBUILD nodejs-8.12.0.ebuild 6352 BLAKE2B 15a9b98d89d83fb5959b3b2582cea6a430e9dad5ac6033d7ea32647122ed8cf6a093f7dd90abb93f8585c7c1506d2c801bd439651a447b366fbe75a43259fa55 SHA512 df0848a3e96a62d6191ff0dbcf7ce55eb8da34913c39960e8eb02eb2b3c6d6f6d2202e884c77612b93048c85e6079cc95469c17e8357690936ea92eba400ba7c
-EBUILD nodejs-99999999.ebuild 6140 BLAKE2B 3aee0007d3eb0fe6705452a9ef8c99437a11466afbe8669cf720d88788057b52d5e023c363bc185de34d3e882204e524429f39e94d644a3eaf76195bbc406b98 SHA512 ab3643572c01ac72fe0fd493b2a1fab6f10dabe9f169ffa4842c491cec0cac4f11fa2aea0ea575b23073628a74e5e902cb100517286df002d67b536358a35f0e
+EBUILD nodejs-99999999.ebuild 6142 BLAKE2B 41273a7cb4e6a77242201d3fcebfed64ce7720555502fafb5df7a0de16f13598f94dad73669180c778e3013876c5c9f9f61001ee03d23fb3cc32ffeb5c12a53a SHA512 3fdd9d6c46061a1bf9b7f149f20ec07f8ce30b3669efcc439bb778f0fd34dfa2a7e1c53799c162454127479e2a912a4b5dad9174903803cf079aa0c82598518e
 MISC metadata.xml 628 BLAKE2B 0276a9cc8a0c7a08efb17e5635f561b50dec54e41ee239d96c026bc9609826a8f544faa43eb1b7244cffbdc052ca969b51b0540c08cc8276142dc8305eab2d00 SHA512 619954806c55cb873fd460bcf2f1edb4e4c2064dc60286cfb3292f3a583f5ca8d1d65d9fe0575ef3ed4148d73da817ee589750daf4b5a0147d276240db39ce87
diff --git a/net-libs/nodejs/nodejs-10.20.0.ebuild b/net-libs/nodejs/nodejs-10.20.1.ebuild
index 1f645e5535ca..1f645e5535ca 100644
--- a/net-libs/nodejs/nodejs-10.20.0.ebuild
+++ b/net-libs/nodejs/nodejs-10.20.1.ebuild
diff --git a/net-libs/nodejs/nodejs-13.10.1.ebuild b/net-libs/nodejs/nodejs-13.10.1.ebuild
deleted file mode 100644
index 00513e8978c4..000000000000
--- a/net-libs/nodejs/nodejs-13.10.1.ebuild
+++ /dev/null
@@ -1,209 +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(+)"
-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.34.2:=
-	>=net-dns/c-ares-1.15.0
-	>=net-libs/nghttp2-1.40.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-64.2:= )
-	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 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
-}
-
-pkg_postinst() {
-	elog "The global npm config lives in /etc/npm. This deviates slightly"
-	elog "from upstream which otherwise would have it live in /usr/etc/."
-	elog ""
-	elog "Protip: When using node-gyp to install native modules, you can"
-	elog "avoid having to download extras by doing the following:"
-	elog "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-13.12.0.ebuild b/net-libs/nodejs/nodejs-13.13.0.ebuild
index 3bd32e160d50..a0ae896ce423 100644
--- a/net-libs/nodejs/nodejs-13.12.0.ebuild
+++ b/net-libs/nodejs/nodejs-13.13.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,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
 
diff --git a/net-libs/nodejs/nodejs-13.11.0.ebuild b/net-libs/nodejs/nodejs-14.0.0.ebuild
index 00513e8978c4..c79054a7d7e8 100644
--- a/net-libs/nodejs/nodejs-13.11.0.ebuild
+++ b/net-libs/nodejs/nodejs-14.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,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
 
@@ -23,11 +23,11 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.34.2:=
+	>=dev-libs/libuv-1.37.0:=
 	>=net-dns/c-ares-1.15.0
 	>=net-libs/nghttp2-1.40.0
 	sys-libs/zlib
-	icu? ( >=dev-libs/icu-64.2:= )
+	icu? ( >=dev-libs/icu-65:= )
 	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 "
 BDEPEND="
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index f2c3b912ddaf..e7be7ae9d90d 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+)"
 inherit bash-completion-r1 eutils flag-o-matic git-r3 pax-utils python-any-r1 toolchain-funcs xdg-utils
 
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index ba6ca596a747..e7cf4ec90940 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -7,6 +7,6 @@ DIST pjproject-2.7.1.tar.bz2 4880007 BLAKE2B 33fca89f07abc0b9662b1070c96b903c236
 DIST pjproject-2.7.2.tar.bz2 4994233 BLAKE2B 44ecaf0997d5dd9b18e0b811cead7c9104e63894fa06fb1d64e79b60fa4210968fd90ef47e5f5be3629675363c8756ce3bc1834caa9700654ab4c53efe676ee7 SHA512 3d355ffcbbeed62cfc711e574a987dc06043ccf4f2625820adffa89167022b8306fcee3fada71d3d45e7b902fc9c65ac8221de101cbafed25362a3921f702afd
 DIST pjproject-2.9.tar.bz2 5009546 BLAKE2B 853f86e57c0f58943e977856bebc7dc20684ac4a6a16a55f3fe4ddf58ca58187bdc1011c5df2bc72de690f1695484012b582e56dd0e88a624ef319a5f3623772 SHA512 a65823a86ad0cd76890cf7dd2485f7547fd90aea2ef631c5420c009b35f39eda3b78551a42fc2816c2470de9eb728c26497774a8494824472ecaa1d2889cc20b
 EBUILD pjproject-2.7.1.ebuild 2614 BLAKE2B 10ee58a83d0ebce1fe52bfe395bd319e08a4128364f7fbf889d0d089daef222859992b12786bf0796d6bf77f599a9dcc9dc9800253d4e781069a9587efe07259 SHA512 2bd916ffdc6449e3fc62fd4aa1d3dee7634a97351b369e896384b46316e089185121c39efb8fa30143745c6c91ccd001c797cd0f13020481769dc3bf0e196e8f
-EBUILD pjproject-2.7.2-r1.ebuild 2751 BLAKE2B 63fde0f71193c7a94b7707767b820a450bfcef5b6c75ea17c642c7be63e116382fd553e7f1bed20e62385eeadecf9c4671e657e6c169dbd877047cf41749b000 SHA512 2d83d25ea6b0bc39f1a67c1599fe95c31bd36aa7e4b092434027a65b72bcc34023645ed1206823163785fe7f651869e997e4dbddb2f69e1a132883a546847078
+EBUILD pjproject-2.7.2-r1.ebuild 2750 BLAKE2B a39f5f56c17f7c5df9e6564b80c9edc61b2b0bb9b0c64af3ab31f91b74558da2265a94fdccf208bb99f5d0f67324a9d33f30413405c73b926615d8eef6f711de SHA512 d73c298e1a098390a3e68f5c9b756373489a62753487539f659d98fcd59f7161a2bb490c7e8adc9c30cd073ba139c375036133dd358858ffd7eb7be3e59df9af
 EBUILD pjproject-2.9-r1.ebuild 3027 BLAKE2B 07645f7555e389c0cbb749f790363cc00dbe649e4a64e6d1ae86d03e4f6249971f0326414f4673cf06917eb68d4dea0b5e7640f6343bd025ab0346b44320b498 SHA512 a8ff33d4ac36bca70ef47d6ba76330c29e033c901bbb40c868bcd1bf002c81e7376dd711b8ce93b7c7d68a9a49ce90b50d23a590da8e3c37a97b04fc4bc16004
 MISC metadata.xml 1275 BLAKE2B 6d833264ab353a9393a577f50a5241948bffe17ecfa551aebd4736fef54e7ef316c481faee27ddde3a5aab327a22bd38520e781aaeefc5a2c14cb2fd08dcf608 SHA512 563deb2cb83e6a638d9cc99b912c4ca907acd0ea133168a33d452f29d856b27ee38ee73bf27ed6147b6decfb6b4a74ef1ea40b1742e201408916fdeca9400771
diff --git a/net-libs/pjproject/pjproject-2.7.2-r1.ebuild b/net-libs/pjproject/pjproject-2.7.2-r1.ebuild
index 75aeb487eb5b..e272ba0b04f5 100644
--- a/net-libs/pjproject/pjproject-2.7.2-r1.ebuild
+++ b/net-libs/pjproject/pjproject-2.7.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic
 DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
 HOMEPAGE="https://www.pjsip.org/"
 SRC_URI="https://www.pjsip.org/release/${PV}/${P}.tar.bz2"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index 80ce33583989..fb85b309c302 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -1,7 +1,8 @@
 AUX rpcsvc-proto-1.4-external-libintl.patch 1718 BLAKE2B 9484dd528679c3cac286ae0aaea7491bbb54f00df14bbc7891809684d48eda81441745bf1d822c96775f02519de0f4e98ffd9f99cac86954874420586fbe35bf SHA512 92c1d8048e28ced24bae24e0bb7001cf65e6c8274b67a3ed4a1015e094201a812aa85d75ed280fca40b94a1b5c61b657dbf0afd538d7c59219abdf51c5af3f29
 DIST rpcsvc-proto-1.4.1.tar.gz 61724 BLAKE2B 4fd04b36d30561edf3bbc9f565b07a8f1450ca28d7489b63d241f0b7eb2b98640d2dc2d798b1469460f682c0774fc99a995239d7e0fe2f244852b2561b37a0fb SHA512 a75546255bc5c553ec12dc0844783907b70499eb65ea6fb9de7c0a0f669e4ef0caa717c0cbe9ba8651dc7acfb0c9c4e0fc644ebf12e0a704819fa47e6c65b8b7
 DIST rpcsvc-proto-1.4.tar.gz 59127 BLAKE2B 484c04d6a0f86d37c0057693771b7fe502166504fc419bce4dd182f76e349cf226307814a2c51b27fa0bc09e270b883cb40ae821f8bd7d7e0c9a120c4962ae34 SHA512 a29d7761ec9cca4d7d7aa6943a243771a6c7f35d303f01af84f390c8395dc5e543fad7ea28fec1be2f6ee8f2853bf22a157ad3b020057040685b6cbce9b09415
-EBUILD rpcsvc-proto-0.ebuild 477 BLAKE2B 3b41e6f21dff0388ec6db147a24b5a9294bde8676c7f4fd9178add053277e018ebbe68565eb702c58ea81d98954182e669f5ae73d7ce302c25f88cff48d35c47 SHA512 a9f8d371e81f61d357ad3833050a88d7f048cf68fe61d59b9f0d56e7c6551dea9d59fcd762906375800883d4bf2467a8e559384178dfd14369f132f1503f5099
+EBUILD rpcsvc-proto-0.ebuild 478 BLAKE2B c7c8e675ea6a1fab782b3b8da093eada21de0ddda0835aeedf0e3aa39828df23b7f6b797c4178f9eccb676ffb45dc059d48b07e88488d7f4771202154d36c67e SHA512 30964ff01fa3043f9719bebce15d3b64d26dd77fa71375db16bc59ba7308d8db5861d2f8619bdbea425576f714ed428587288774c872a53ee1268f304d0abbd2
 EBUILD rpcsvc-proto-1.4-r1.ebuild 792 BLAKE2B e10068094ccb624584282d9a0244582da2d647ac01d3188e97007aa6b50555336e03ade606e5c8524d9a1adf3d04f0b94204d96c16bfe219753a8a96ae866c0b SHA512 279a0cd728c900657e5f9455fc707a49dd2ef26f5356dd0c8c6ec3275a001328ccb7fc4261e9726b242664e8e9f1bc2e1bb4c833b6025544fd7402565147f794
+EBUILD rpcsvc-proto-1.4.1-r1.ebuild 954 BLAKE2B 38ec166200ca7b5173de5c5be6782339ea52c55f9a3717cb1d9af091bd0ac9cecfcd45c6e1a767632b82b108d2549d7defa8946c88d0e95645f760c07344681a SHA512 e0be6fac36dd860fbb9f407ee37f5e2f81885ef70c330315976e223b669f38368d7622c9585b330b6509235b0ffea20b8196277f94e2b50fe8225a9aed9da609
 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-0.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
index 6155980f7935..9c6d2e074dce 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto"
 
 SLOT="0"
 LICENSE="LGPL-2.1+ BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="elibc_glibc? ( sys-libs/glibc[rpc(-)] )"
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
new file mode 100644
index 000000000000..d7df5d09a441
--- /dev/null
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="rpcsvc protocol definitions from glibc"
+HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto"
+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"
+IUSE=""
+
+# sys-devel/gettext is only for libintl detection macros.
+DEPEND="sys-devel/gettext"
+RDEPEND="
+	!<sys-libs/glibc-2.26
+	virtual/libintl
+"
+
+src_prepare() {
+	default
+	eautoreconf
+
+	# Use ${CHOST}-cpp, not 'cpp': bug #718138
+	# Ideally we should use @CPP@ but rpcgen makes it hard to use '${CHOST}-gcc -E'
+	sed -i -s "s/CPP = \"cpp\";/CPP = \"${CHOST}-cpp\";/" rpcgen/rpc_main.c || die
+}
+
+src_install() {
+	default
+
+	# provided by sys-fs/quota[rpc]
+	rm "${ED}"/usr/include/rpcsvc/rquota.{x,h} || die
+}
diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest
index 08889e2c6d19..96642e375046 100644
--- a/net-libs/srt/Manifest
+++ b/net-libs/srt/Manifest
@@ -2,8 +2,8 @@ AUX srt-always-GNUInstallDirs.patch 875 BLAKE2B 22aac6b20131ff48c4f9809de288d3be
 DIST srt-1.3.2.tar.gz 812053 BLAKE2B 97e9053fb80da967d0ce90b0276f37d23c93b8c9847910559a12f672c1f224b9069955f57b920417b205374e921f7dbdabf96a66f5cad59e14e85506e5d19d89 SHA512 7cd8b64fafe99c47f82ba3b0c34436353161cd829bbe639038e995a0a39557f9c754a3dcadf4cf7ca587779ce185325ba88e391a058818b84b9ed32212a88817
 DIST srt-1.4.0.tar.gz 1293647 BLAKE2B 93edaa8b1d2b59776bc3efc851a5216e0acef3766b47100646306bb04e3054d4cdf612da07bc5d1124380abe595733393d7e47f1885282a75e24f34b688ddb1e SHA512 b22e7c98b3a5f8ad9647f03bc697254f0f3637716a84b077307f894a193bcf0348c9c10bf09e2ae197f5c721bd6118e2b6134d6770f80eb440783c2d87dd5248
 DIST srt-1.4.1.tar.gz 1316195 BLAKE2B 1831494c9817d03b7f69e46344b41ace13c22e1817aced2fdeef715ecc7da9e3cf421c399951177ce052328e5baa56445b66769b7a9e4762efee3394c43568a4 SHA512 ff30b7e413c4b9f0b5076d9ebf5f0942b5d802773a27ed1f7b886a12eb01eec0148d1c305e933d4f54ee1b451a445a48cba582111eb2057326c0f61fab097f94
-EBUILD srt-1.3.2.ebuild 1249 BLAKE2B 39bbdf7d0b084a4ac565f40f3bb319cc45c22e8dfb56ed20bd1151b2fc0b8d3bedfd15a4cb2fc833a560f20ce80f1f47dafc06b04ffb9440800c5aba0ca854d0 SHA512 c68706435da477b271334d4489b76ca8ae0fedd01f0dd780c1dfe668c510185fbb12e5608dfabae6bd313ef4a71249e87f20eda8557f95538df6792ddbc6b634
-EBUILD srt-1.4.0.ebuild 1254 BLAKE2B 377d38e6480cd261ea5106b8a735f343850ca52b525ce685bff11a0a1d15462b534f0c12c7aeff804cad91ac3d8ddb4c26c8a08847c9d443638cf06cc145f3b9 SHA512 8cf2d9f7162b27435b6474b57196624c4dc948abfbc4fb06bdc9ad644f8c87b1180783bf464db93018134ab08f86402caaa6ef407c0961ca64c22ec015eb1801
-EBUILD srt-1.4.1.ebuild 1254 BLAKE2B 6597b3e6ab38d5b8a0108b71a7a0ad95966a09119eb4be270f6bf7473a21f79f968f7515f9557f3652cd0ecbcd6f9c4e39fd0c008ad2072e223b8e7818426536 SHA512 cb585df5671adb3414c7344830ae9d1dc7bd85912a9f075a37b2b764a8a677d379524d187018902d20047995be583315fc6d4817a0ac095da218365d90834301
-EBUILD srt-9999.ebuild 1348 BLAKE2B 211466b0989c4a1ba51cd329746bb80410bcc922a30c800333e7dcb34762bf0752ae16847949d6d6b7acc49364b333070becb4e8bdcf205d7d5761f1d2d80f5c SHA512 99b05466a3a7e6809c1a79c07486ba2dafad524cec4e01617f026f2c9f463f079ed2557822477dbb33cb9541e075e892045a1aff7b0ec24148b8f0eef41c8448
+EBUILD srt-1.3.2-r1.ebuild 1161 BLAKE2B 315d7a893f0d09fbbe35d2fba5be996b6683632a29dbaa298cd9a135dddd1875606324bac9358d1e1e58296461b88d0fadb81f8250f9e8071cc56f563746609f SHA512 5dd656492e3526b4dc0ec25e7b6285b5acee7a822c921d20126549cc5bdc7033c1564b52de5e7df8d71399b0747be1edda5b6cec0261af8bf1e4706cb9d13240
+EBUILD srt-1.4.0-r1.ebuild 1173 BLAKE2B 963c7591dd13a141cddd8dca02770248e696b0c73c99d5248c887a96d1b02a55032f3cf4f0237bcf6bf66be5ba0b9f1c45194ada04d1af4263b96c25ec54412c SHA512 c55cdc6dd42ce965194243f4c99c3d7e55a3ffc8825befe8c3296edcaf4ff3049a9fa71fd9851ed3c5e912be206c522368ad52ff73f448b037fb68b639c50f9c
+EBUILD srt-1.4.1-r1.ebuild 1173 BLAKE2B 963c7591dd13a141cddd8dca02770248e696b0c73c99d5248c887a96d1b02a55032f3cf4f0237bcf6bf66be5ba0b9f1c45194ada04d1af4263b96c25ec54412c SHA512 c55cdc6dd42ce965194243f4c99c3d7e55a3ffc8825befe8c3296edcaf4ff3049a9fa71fd9851ed3c5e912be206c522368ad52ff73f448b037fb68b639c50f9c
+EBUILD srt-9999.ebuild 1260 BLAKE2B e4709688a87c70842f35920686c734ca636f22ed6c3f29075328678dd0845a3f299fd5bf3a619a21ff1654c418a4c6b3a39de035c1025f11c981758ec8d8abc5 SHA512 0707bda54bd42edead963231bf48017ab0c524578f7ce4c70709c36a2b0564ab8dfb258e81e85472e6715691fab6d5bea8ba17f8e4db05c07c964ae110a1a366
 MISC metadata.xml 429 BLAKE2B d4e74c1d35b8fe63e3c0380392f846d303d57992f17345ae5adfd859c6079d5e493e231fa33bd564df9c5832e180365c2fdcf4603689aabcfa8d3bef18d45e29 SHA512 146f7efe7d26123367b77a484f372e4e146f821b3b359d06056c319440b02389b337e98e7f4ee921f2420c8f852cc46b2cef55abc7ea1f91f336d81a14278bd0
diff --git a/net-libs/srt/srt-1.3.2.ebuild b/net-libs/srt/srt-1.3.2-r1.ebuild
index 6e2cd2ff5ef9..864f007208ac 100644
--- a/net-libs/srt/srt-1.3.2.ebuild
+++ b/net-libs/srt/srt-1.3.2-r1.ebuild
@@ -32,20 +32,18 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-DOCS=( README.md )
-
 PATCHES=(
 	"${FILESDIR}/${PN}-always-GNUInstallDirs.patch"
 )
 
 src_prepare() {
 	cmake-utils_src_prepare
-	sed -i -e "s:hcrypt_ut.c::" "${S}"/haicrypt/*.maf || die
-	sed -i -e 's:DESTINATION lib:DESTINATION lib${LIB_SUFFIX}:' CMakeLists.txt || die
+	sed -i -e "s:hcrypt_ut.c::" haicrypt/*.maf || die
 }
 
 src_configure() {
 	local mycmakeargs=(
+		-DENABLE_STATIC=OFF
 		-DUSE_GNUTLS=$(usex gnutls)
 	)
 	cmake-multilib_src_configure
diff --git a/net-libs/srt/srt-1.4.1.ebuild b/net-libs/srt/srt-1.4.0-r1.ebuild
index 715e4cbdfed9..7a9dff6b43c1 100644
--- a/net-libs/srt/srt-1.4.1.ebuild
+++ b/net-libs/srt/srt-1.4.0-r1.ebuild
@@ -32,8 +32,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-DOCS=( README.md )
-
 PATCHES=(
 	"${FILESDIR}/${PN}-always-GNUInstallDirs.patch"
 )
@@ -41,11 +39,11 @@ PATCHES=(
 src_prepare() {
 	cmake-utils_src_prepare
 	sed -i -e "s:hcrypt_ut.c::" "${S}"/haicrypt/*.maf || die
-	sed -i -e 's:DESTINATION lib:DESTINATION lib${LIB_SUFFIX}:' CMakeLists.txt || die
 }
 
 src_configure() {
 	local mycmakeargs=(
+		-DENABLE_STATIC=OFF
 		-DUSE_GNUTLS=$(usex gnutls)
 	)
 	cmake-multilib_src_configure
diff --git a/net-libs/srt/srt-1.4.0.ebuild b/net-libs/srt/srt-1.4.1-r1.ebuild
index 7188ae1c913e..7a9dff6b43c1 100644
--- a/net-libs/srt/srt-1.4.0.ebuild
+++ b/net-libs/srt/srt-1.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2019 Gentoo Authors
+# Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,8 +32,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-DOCS=( README.md )
-
 PATCHES=(
 	"${FILESDIR}/${PN}-always-GNUInstallDirs.patch"
 )
@@ -41,11 +39,11 @@ PATCHES=(
 src_prepare() {
 	cmake-utils_src_prepare
 	sed -i -e "s:hcrypt_ut.c::" "${S}"/haicrypt/*.maf || die
-	sed -i -e 's:DESTINATION lib:DESTINATION lib${LIB_SUFFIX}:' CMakeLists.txt || die
 }
 
 src_configure() {
 	local mycmakeargs=(
+		-DENABLE_STATIC=OFF
 		-DUSE_GNUTLS=$(usex gnutls)
 	)
 	cmake-multilib_src_configure
diff --git a/net-libs/srt/srt-9999.ebuild b/net-libs/srt/srt-9999.ebuild
index 05f29c86c32e..283aff3244f8 100644
--- a/net-libs/srt/srt-9999.ebuild
+++ b/net-libs/srt/srt-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2019 Gentoo Authors
+# Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,20 +36,18 @@ DEPEND="${RDEPEND}
 
 RESTRICT="!test? ( test )"
 
-DOCS=( README.md )
-
 PATCHES=(
 	"${FILESDIR}/${PN}-always-GNUInstallDirs.patch"
 )
 
 src_prepare() {
 	cmake-utils_src_prepare
-	sed -i -e "s:hcrypt_ut.c::" "${S}"/haicrypt/*.maf || die
-	sed -i -e 's:DESTINATION lib:DESTINATION lib${LIB_SUFFIX}:' CMakeLists.txt || die
+	sed -i -e "s:hcrypt_ut.c::" haicrypt/*.maf || die
 }
 
 src_configure() {
 	local mycmakeargs=(
+		-DENABLE_STATIC=OFF
 		-DUSE_GNUTLS=$(usex gnutls)
 		-DENABLE_UNITTESTS=$(usex test)
 	)
diff --git a/net-libs/telepathy-farstream/Manifest b/net-libs/telepathy-farstream/Manifest
index e72b792ce0c9..018de54c1384 100644
--- a/net-libs/telepathy-farstream/Manifest
+++ b/net-libs/telepathy-farstream/Manifest
@@ -1,3 +1,3 @@
 DIST telepathy-farstream-0.6.2.tar.gz 601409 BLAKE2B 0e130f657fe888e7be732aff2d14782f9b650a004aff1962f0df99f88537a9425acc88764b1945c6fef1e6e53edfafce08c3e1f81530a3703f9c09bc61e6ca2c SHA512 ef9c07df607add411df404f5e2dfbf92afde8387291980e59f9e0b85d6edf0904582f10491316ae01349fe242d44a3579a27663127d5a91cb7b06ad163b6e4a6
-EBUILD telepathy-farstream-0.6.2.ebuild 1138 BLAKE2B 879cc4d9963577f5c4c1131a985b14a9fd4fb9e726a6ed6715f75243fc966d515b73ea9c3294d9c6991e8d7b917048be8561e59f692d5b677b510c08b771476d SHA512 d7541d0760e9282c1edf2734174a2141078aa9ebaddc3114117fce6452649c3e884639b7f02c0b1f26f5c8c9ce3c4dfcc7d80364b660f3c1877d143bc16cedcd
+EBUILD telepathy-farstream-0.6.2.ebuild 1131 BLAKE2B fe40813a3f1a9e35be75b2256e910c1cafd2d690df54d0a415653bf269a2cfb15fa39eeb6b920678e12159471a22d53ae2f0a13a537b3c9effb5fb94a2588274 SHA512 c59d4f59d53953ab94c289243edbf97a90408ead02526414473ec2686cafc4e86383f78321ec02522791e63e91ca4bb5d6a4f7d7933f175ca0a5f4b9917cbd2b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/telepathy-farstream/telepathy-farstream-0.6.2.ebuild b/net-libs/telepathy-farstream/telepathy-farstream-0.6.2.ebuild
index 258733ee6ce2..2ab4a5ca8854 100644
--- a/net-libs/telepathy-farstream/telepathy-farstream-0.6.2.ebuild
+++ b/net-libs/telepathy-farstream/telepathy-farstream-0.6.2.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 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="examples +introspection"
 
 RDEPEND="
diff --git a/net-libs/telepathy-glib/Manifest b/net-libs/telepathy-glib/Manifest
index 25c1558d1962..9211efdf4731 100644
--- a/net-libs/telepathy-glib/Manifest
+++ b/net-libs/telepathy-glib/Manifest
@@ -1,3 +1,3 @@
 DIST telepathy-glib-0.24.1.tar.gz 3898149 BLAKE2B a4bc704b5b98c9e6df656833eec38b5f69a0b5d2621a6816ffa6c7da64f2c512cb992ffadd2ec2ac89a1b8cf6581c28aedad6b4019b3d16d9165c7d874370eb6 SHA512 2fed94f76a19d6069f671cdd45d2fd8a4b4ad27c4601aff66041ca205456be397c76a86f92cc9bf20fa4eb6d4c15a67ed8196644c143c37e945f382229a63335
-EBUILD telepathy-glib-0.24.1-r1.ebuild 1485 BLAKE2B 4dd404d1cc06092d2bd6a831ee7cf46572ad3289991367927566126afa8a9682127a4a694e2885d35f24855de583e94e979a60eeb02465ec8130322206293a0c SHA512 0b8e5f85908d52f2e0c39c05f57f417aaf4e4ec2377db281845a2f3ae9a7a097762170902e501d00ed9a32ab53140150e473ecc6f6c46c3370a6fb960ab4ee6e
+EBUILD telepathy-glib-0.24.1-r1.ebuild 1487 BLAKE2B becbcd6ff2fabc0146ded361b70d81090bbbeaa4b421c79b4e75a5d72e621c395dbb3ae02664e115bdb5efe99c26ca3f37ac34bf6d851af1e73fec5dbf87d8cf SHA512 a90c0a84af253204302230782829704ed64a5280ad6a67a6262f0b6d150c9b357cf595ac6150ccd07ec97f394c699d2457dba42933f7f1eba245ed889777f719
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild
index 91712ab80a5c..621f4b91637e 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 VALA_MIN_API_VERSION="0.18"
 VALA_USE_DEPEND="vapigen"
 
diff --git a/net-libs/telepathy-qt/Manifest b/net-libs/telepathy-qt/Manifest
index dcb3bbb8f601..fb1daf41d10c 100644
--- a/net-libs/telepathy-qt/Manifest
+++ b/net-libs/telepathy-qt/Manifest
@@ -1,4 +1,4 @@
 DIST telepathy-qt-0.9.8.tar.gz 6448686 BLAKE2B 7554b812c35a09aabc0ff92fea43f633b5c2f87784c8e7b387545b31c1c92eb02f9e416930c635202fe0205c4e26c1fd63c3b4a668cf0ceeb602d8a777891cd9 SHA512 fad662c02417c8e4e239d438ea3549226e589442aea8418c8922a6b78ff88422a36c1cc0d2e3591240fac115390a7fbdb1b4deea98187051cc811175b60b9e8b
-EBUILD telepathy-qt-0.9.8.ebuild 1464 BLAKE2B a6ceb45fd0549a6c27be49421d7b1e21d09b92022f5141a5cc2d4b139bafff8a29b38b3d8264bccdecee0f01322141ac90caef22c376f91e9e6c6c6f741d5bcb SHA512 4e9feaae5a2827ff27cf4604ad98ba4f273973c7e0da9cb2c697ecf49294cefce305d56aa95c6f960021da9ffd85bdbaf677abfc661403e54b28241cfda2d996
-EBUILD telepathy-qt-9999.ebuild 1607 BLAKE2B 45c28da9a88a5289302901f8fbca6ac04b370c6c09e386bafa0d0a732ad148fa330f4296302c7c2ed8cd56ba73f121e54f5ae5e848a4389d2215839b04ce696b SHA512 c46bf6f4586c45c688c6ebeaba735a5b1e69df54264f08daba5ab2f9c1b92948a841bb86d47899eaa5549c9b892b7748136c775e2a478e456b234c0e5de5dad0
+EBUILD telepathy-qt-0.9.8.ebuild 1467 BLAKE2B bec28b1b700900200632854620eba4948b546472eac720af3a2f72e7051dfcb77a298be6d40289992c878978dbdb95d7978945de1888cfcba426cd78032e4f56 SHA512 42effa89fbc610d03646549005151324f61f3b632e62924a080fef3f8b00c35114fe847affe4870bc374c327bc4b54393271ebc73c0073b926427e83edd33479
+EBUILD telepathy-qt-9999.ebuild 1595 BLAKE2B fba8fae8f79b5f74704dca13130427fa81b039257bbc369e2aa43972bb8fb508b0163e9a9747e76a5bb8bec72322e962489270e25b87e49ba3e7f2d64572bfe7 SHA512 389a5a74c5064b95018f6d1f0353b759748099d01daaf01c1f7b4335f0b086ef7960a39a5514aca6a7d18f007af557ba8c73df780e2103cbebb904426672b7d4
 MISC metadata.xml 691 BLAKE2B 6539a5f9248a6f49fe13ba408b6c04a54f212c684e0dae59cbc6b510e4ddb0440dd74f9afa0540308f1c1239fcf044531d8a088b7cb98da39896a54e6c82b848 SHA512 9fd71fef229868f3b0495ad64e5845420258b92f4773da7a74e45d3c5f0d23ae738cb219bb5050c68223950652f32ed6e31ccd580f732ebc26700cda64b44891
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild
index 12ca100f7091..021e7a634ee6 100644
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit python-any-r1 cmake virtualx
 
 DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol"
@@ -17,6 +17,8 @@ IUSE="debug farstream test"
 
 REQUIRED_USE="test? ( farstream )"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -43,7 +45,6 @@ BDEPEND="${PYTHON_DEPS}
 		')
 	)
 "
-RESTRICT="!test? ( test )"
 
 python_check_deps() {
 	use test || return 0
diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
index 84ab23609aac..6b31f2462dc0 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,11 +6,11 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 
 if [[ ${PV} = *9999* ]]; then
-    EGIT_REPO_URI=( "https://gitlab.freedesktop.org/telepathy/${PN}" )
-    inherit git-r3
+	EGIT_REPO_URI=( "https://gitlab.freedesktop.org/telepathy/${PN}" )
+	inherit git-r3
 else
-    SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
-    KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 inherit python-any-r1 cmake virtualx
 
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 546c38cd2395..39776036eeb3 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -4,7 +4,8 @@ AUX webkit-gtk-2.24.4-eglmesaext-include.patch 467 BLAKE2B 10bcb2f1b0eda42c6d7e7
 AUX webkit-gtk-2.24.4-icu-65.patch 1991 BLAKE2B e69612d43f66e9e31190c3b35e5ea2581ce3726c685e719b4040e670dc7ae236f6a024b5d33659ccac172a9eef442eddf35f4ebfcabc7cfdfd1cfde217f341e1 SHA512 8eab3ddf0dea73f2ba41c3c1ff7f9643334ad52ac61adcb86d1352b9367b03f0ffd072b8f910aaf875134d3f09d1106db7e44f38c8c4756555c0e5fbfe6a53cf
 DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2 SHA512 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112
 DIST webkitgtk-2.26.4.tar.xz 19329636 BLAKE2B 9dc88bf9e2bec4f3ccc316f4967e991595fa17151ad74781ea514e72700f2bd1f3ed32c5ee662eb1d04fa023e7c33ad1215078415b67c939ee0d4f6d55358d4a SHA512 b4d96672d0a41fb7591dd312254fc1b7a85e632923bf2d954d79d395306db96d5a6b4f85e24ea4ba0a447e45e29a41882249c26f6b2d6d572225abefcf28a474
+DIST webkitgtk-2.28.1.tar.xz 21427628 BLAKE2B 58f19d68598ed1aee58f9f700c84e76c9c58980e39d7fe1883c3be991f575074db3156b9a7a041bb3d59130d87d37b1bdee9cf6c122c4f0b0ba6637d66534c32 SHA512 30cfe63d202673d1f0b0ab32e062eab225e51b993d9bb0f51c02d0497423e1591b5a2e943c30d1c9ee6d9073dfbd13b8ec24bca94f380fe8886019e8185628b8
 EBUILD webkit-gtk-2.24.4.ebuild 8444 BLAKE2B 0e07771b88a5956fb5b824d3713d6e2ffcf3e6abc0238efe8059bfae5d799e2198174b0ac015b57f8688b9055992730892e05bbaf106eb7f0df98d6088a5d481 SHA512 76d4910adc9c2a69a589e1261eccd7188aecb890cd818271e31a5c44bdfeddea82ef14ff1e513d8c35d9560b9b9460598d574dc55eb60eddb1679335f9e82b13
-EBUILD webkit-gtk-2.26.4-r1.ebuild 8758 BLAKE2B 0779af3f244bd5d36866c79e97150c17a714f5f3469bc33e1bbecd9078f91f4a3ab699147ddd9819df5122e4e60bef2e35f0a7890872ecf7972f086aa3469791 SHA512 67cf5221da862dbada5d2bbc88a2a587674f9233dd44553b84cea3939db495647878bb910a34ff8d240d680b804761d554ef012d5fad20e409216d065cb4d626
-EBUILD webkit-gtk-2.26.4.ebuild 8755 BLAKE2B 8b2c147789ae8e0e71f5051f5cb48334e73c1d2ef3d73a1f229700661c24c6cfe3485003dcf8dd8c5d3dc57c35ae724537fb9fcb598c5090a39e90af62986195 SHA512 caaf03779f43c9cd402b4118f75adf26563b7a112b7111a7bc2aac5d639575bad780db2612857f38f2f80d4adf0b563e98050b7df55ebf4f773b62abde038306
+EBUILD webkit-gtk-2.26.4-r1.ebuild 8749 BLAKE2B f470ee46cd08ca1a210ac35c0dbbc7c8df2b62ba2cdd775a903c3d7289df8b556259c3b4456d4612efcd3e5ec6fa8d31b03221fbe1d9af4faf9bd7b283797435 SHA512 1e589c989cd9badd30b113550cd7d984b8e4a7da122c15c4df9c0e57de2076ea14ab3f4887981aaa43003c3a9960374f396b0ff5e920266ce724dc01179f1ae5
+EBUILD webkit-gtk-2.28.1.ebuild 8734 BLAKE2B e45a6631cb74a277f24c997b3076553735724ad3e3175a4a5c0d05049f7fc23faaa098866d5ff131ca5cd6444acad3f8fc8ef2166c54ad6058f5751692ea808c SHA512 f649ad4de4fa66baf48de88fd422b477050e90a69ebde01ede9e43a8d073fcd85151a1efc0b61e3e492a24cfc68c328bea40fce342143555dfc03c1fe67b6811
 MISC metadata.xml 760 BLAKE2B b6b93a6f66b0145a6cc95f62d9f4a19e6d69c337c6be1ab8aa6c2a2a5de5bed19466f388908bed34bc77b90285297f8dc2f332f70abcf70fea81a2aac8288c99 SHA512 849039d811ebc06003b7dfe505c6cf809b3feb95dd7965dfef41aa8c9ce2dfd773d019741fc66e784bdcde5f91c216e0f96f887647f3723778a21e500dded8f2
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
index 83663f86017f..b9b0a863feac 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.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 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~sparc x86"
 
 IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.1.ebuild
index 48c9e084906f..4780125bbb3f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.1.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 ~ia64 ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~sparc ~x86"
 
 IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 
@@ -64,7 +64,7 @@ RDEPEND="
 	gnome-keyring? ( app-crypt/libsecret )
 	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
 	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:= )
+	spell? ( >=app-text/enchant-0.22:2 )
 	gstreamer? (
 		>=media-libs/gstreamer-1.14:1.0
 		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?]
@@ -87,6 +87,8 @@ RDEPEND="
 	gles2-only? ( media-libs/mesa[gles2] )
 	opengl? ( virtual/opengl )
 	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
 		opengl? ( ${wpe_depend} )
 		gles2-only? ( ${wpe_depend} )
 	)
@@ -145,7 +147,7 @@ pkg_pretend() {
 
 	if ! use opengl && ! use gles2-only; then
 		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles-only) completely."
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
 		ewarn "This is an unsupported configuration meant for very specific embedded"
 		ewarn "use cases, where there truly is no GL possible (and even that use case"
 		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
@@ -164,7 +166,6 @@ pkg_setup() {
 
 src_prepare() {
 	eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
-	eapply "${FILESDIR}"/2.26.2-fix-arm-non-unified-build.patch # bug 704194
 	eapply "${FILESDIR}"/2.26.3-fix-gtk-doc.patch # bug 704550 - retest without it once we can depend on >=gtk-doc-1.32
 	cmake-utils_src_prepare
 	gnome2_src_prepare
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-30 12:37:28 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-30 12:37:28 +0100
commit	be9d77d3ac6af8f4ead98d89706f356b65578c93 (patch)
tree	f82923fbca262493e83dd1382e561a2fae24cc46 /net-libs
parent	7ec0832ab5dafbf70de83e0c2f3ee740416a0950 (diff)
parent	6faaec2b812feecd9c8751b8a19004da4a17ea5b (diff)