gentoo resync : 21.06.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-06-21 17:50:24 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-06-21 17:50:24 +0100
commit: feb0daf81d888e9160f9f94502de09b66f2a63fd (patch)
tree: b6e5c40ce2abef3da27ed50a023153f475e0ddef /net-libs
parent: 9452a6e87b6c2c70513bc47a2470bf9f1168920e (diff)
70 files changed, 795 insertions, 316 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index c3a929ac702c..bc3154bd8722 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/axtls/Manifest b/net-libs/axtls/Manifest
index 882e560715ad..bf342dfd632b 100644
--- a/net-libs/axtls/Manifest
+++ b/net-libs/axtls/Manifest
@@ -3,5 +3,6 @@ AUX axhttpd.initd 515 BLAKE2B cd09293cd4741269493860cf9e18feb23f1ee496eb23145674
 AUX config 3064 BLAKE2B baedffe4b9e8696a0f933ba761db3f3b8d4d2cf4b910c22077857a43ebcd31ad388423a8c12257a41481a63466d3d4ca85ecd05c75dfa1c9552d17ade2834aaa SHA512 6589e3912ba9231db660b8afe71a6e233807108a8662860667dcae3b6cc4d77fa405503d6eb9d520669cd26fb67f418095b6174b88527c290818fc6400cb65b0
 AUX explicit-libdir-r1.patch 1578 BLAKE2B 1495850dff9ad1dab1e4820158cff5f706ea3420d664ae2fcb7ae9200790e52fbac093ac510812b80d0eaa177a5d210b6b9c43e80d0317ae4621fe3c18b65c01 SHA512 8e10b10eb6959e309e504a0ff2c16795e258f0fab57b97ffb3b64a6c3b84de8e782cc1697983ed7ff0a05a211e43146ecf39588782e8d3c813a4aa053d94557a
 DIST axTLS-2.1.5.tar.gz 1318286 BLAKE2B a4f7cb551f3569fbc9a3a7e0e8faa929a5310fdb412283487fedd4a58e36a65529ebd9aec859027ca6df8e69db85b9f908b56f8d37284548b3984da10774ca3d SHA512 d208b174c31a144a779185e77834a34b0fdd15e8cadf4665b8fd76dcb3207955ed687f3d86d1e60f85d108ecccfd900a76e6d045d16a7182001e0b58da09be18
+EBUILD axtls-2.1.5-r1.ebuild 4675 BLAKE2B eeddaafa76e3155baf6c6940811d9bac60ecbec9b7d2bda46af24940c83d69c3d487286d3b96850ecda9e919b94e7742909e14c6de74f57ca64bafe6012c4071 SHA512 8b45815c9363c09be8f6c669a456f04d2a21c3b482bedfedaada9b44d3c77a0c76e36f51268e0147c9e149f59f35cb521ef99db8df0db77c3631ace87a1e67cb
 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-2.1.5-r1.ebuild b/net-libs/axtls/axtls-2.1.5-r1.ebuild
new file mode 100644
index 000000000000..894290b4d927
--- /dev/null
+++ b/net-libs/axtls/axtls-2.1.5-r1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+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=\"${LDFLAGS}\":" \
+		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/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index 4574bc421cc8..6fb601393b03 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -1,4 +1,3 @@
-AUX courier-authlib-r1 985 BLAKE2B cc970ee300a367c6c742a8fc4266bf0a1c3113e7bd16c8ab4a73d49cde013fcc8500ca1288c81f530edaca96ad0fb79a2b15d471cb3e0fea5af814064202b820 SHA512 ff5022dcc50c9bd9c112cac0ac3a47b37d496603aaef4db2cdd1b96236b5c3deff085e742301a9144dd8113cf5b51d0ee32b4a50e574274855fc1614f4769cd3
 AUX courier-authlib-r2 978 BLAKE2B e49effed437cc9fd76404054e014a87bf2a207c68c1a440293d73da748d423aca137031a2b043e832f5009f2384f3f7ae352c2d10dfccfeb6082fd42aa1513bb SHA512 8681f041431150027f41058ae8dd5fb2105a74caecb096aef42b1f0e255026c2f8509d9f688f2725ab1e12b792604cb481a95a6eeb177967c16ae5e3390f44d4
 DIST courier-authlib-0.69.0.tar.bz2 2197718 BLAKE2B 63c273a85983ce7bd57496eeefac51107e3132dc9eb372f199530dbf6c5a5ddde7f8ee285aa54a096002f9058dc7e1cd9eb1194e3d512ea19882f93b1147345a SHA512 c3806aa50d7ff13f75536064ec46028db3d5e1f4ef64692b5ece64810b4042ae0840bb346c73ae9d36f6113173f0e5e922356a178c10815640a26caa921e1614
 DIST courier-authlib-0.70.0.tar.bz2 2183323 BLAKE2B ebf58f8c4e7b58766edc684ced590ea7bfa692eff19a483f4ab7748a73e96e1c66858985ac89e281205838660a72e9a33e3b3c28fce3f94d981b61ca56b1e2b1 SHA512 61ce62860cc7ceb51f255a0659bf9b8f4172d0c1c8aee06d9821144330f9526f54e6bdb0158f2fd754d6ad92fd4cc84306b949d46c92e8aed47a397023b36b65
diff --git a/net-libs/courier-authlib/files/courier-authlib-r1 b/net-libs/courier-authlib/files/courier-authlib-r1
deleted file mode 100644
index 5730139a02af..000000000000
--- a/net-libs/courier-authlib/files/courier-authlib-r1
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-	provide authdaemond
-}
-
-checkconfig() {
-	if [ ! -e /etc/courier/authlib/authdaemonrc ] ; then
-		eerror "You need an /etc/courier/authlib/authdaemonrc file to run authdaemon"
-		return 1
-	fi
-}
-
-setauth() {
-	. /etc/courier/authlib/authdaemonrc
-	AUTHLIB="/usr/lib/courier/courier-authlib"
-	AUTHDAEMOND="authdaemond"
-	pidfile="/var/run/authdaemon.pid"
-	logger="/usr/sbin/courierlogger"
-	export DEBUG_LOGIN DEFAULTOPTIONS LOGGEROPTS
-}
-
-start() {
-	checkconfig || return 1
-	setauth
-	ebegin "Starting courier-authlib: ${AUTHDAEMOND}"
-	start-stop-daemon --quiet --start --pidfile "${pidfile}" --exec \
-		/usr/bin/env ${logger} -- ${LOGGEROPTS} -pid="${pidfile}" -start "${AUTHLIB}/${AUTHDAEMOND}" 
-	eend $?
-}
-
-stop() {
-	setauth
-	ebegin "Stopping courier-authlib: ${AUTHDAEMOND}"
-	start-stop-daemon --quiet --stop --pidfile "${pidfile}"
-	eend $?
-}
diff --git a/net-libs/czmq/Manifest b/net-libs/czmq/Manifest
index 3547a5118163..dccf06ad8e9e 100644
--- a/net-libs/czmq/Manifest
+++ b/net-libs/czmq/Manifest
@@ -4,5 +4,5 @@ DIST czmq-3.0.2.tar.gz 818110 BLAKE2B da6da496f50374cdd7daf7978529baa1e1d3fbe51a
 DIST czmq-4.2.0.tar.gz 1522824 BLAKE2B 2b2ec308f37a122d5478f63ed029c5ac01d8da40e676e812ec321e039839c7d364fef3eef67df928e6514f0fd2cd65ae35ba89347ead2b44c610812a012364dd SHA512 a3716efbece193196355fb7055b7e81067d29551765de2533178804ca5d85f98cd8cd01f88b4eecbea905adf3b7513e3b8a7e78e350adf1a6e69edbea5f6260c
 EBUILD czmq-2.2.0-r2.ebuild 851 BLAKE2B 9c1d2e55956627e066c785d2a053c47b51a9978db6c1ba62b39b37cd94895d178f40f1b6457a0e911a58d5e76073e3030b7ca8773f010fbcb1d03d9026ea03aa SHA512 6205a1ad6bed9903a6c9f4702776cd71a7f2f61e8d27dd720f6f6fa731ed2119bcf7d73c053484c636b980f0037dd797a95bd2b71e1b8d7812b2ca3ffbc77d1e
 EBUILD czmq-3.0.2-r1.ebuild 1079 BLAKE2B 8127f13ec7c13caa5e8705036c5d504c7fe79c5871e6c588808f643d51ef42adc00440be0ef67d1ecc82df58afb655ecd054bb1eafcd2b81cd8a840860037518 SHA512 a2309b95dbbe8469bef2042bfde990e9df4ef6597158029be92f05880c23df6b5eb3c14b0dd252e1c16245b7b72760b2c32511b3df53227a9e6a567434384478
-EBUILD czmq-4.2.0.ebuild 1190 BLAKE2B 5531af752b48a92fe0c17e04ec486d64c93a7d13e97f32be50e3f0228da6b8176193872ae08dbf0e1fde9eb977ab3beee37bf4e1b1711ed57423777a3ff32299 SHA512 0f95448d8c2c4f7ffeaf70370c88480621e540f4776413a0a3fb00181d80fb87063d8eacfd496eabda2fbd062fadb57b64659080fed45a285671cc02018b1c05
+EBUILD czmq-4.2.0.ebuild 1189 BLAKE2B fdf5f11e18555c547ea793f48a32ec1a74054d6972dcd50433399c5bf89f3e36a1522de99ad6bfb258632112c71c23bc0974d9abc76bc619a7a9baea26547cd8 SHA512 c4255c7a812d27f8c93ce32d1be01f0e231de0a4ff5e90e4ca6b35c66107d9069bc62b301218628c2018ab6c6734fb885e1cacd4baae9632c1071ed08da379e2
 MISC metadata.xml 762 BLAKE2B 70c22120197d94a5d2530f89e677c7ea6cd26a7615bbfd5128ad57ec2f2d09aeb118dbf65870f0c50315f4a71cfe5e0c541fd00dc6a30d914ea0adacb608354d SHA512 6d3c401c144f61c7cfb45cdf9badc09b0af97f70f58d151825623b4ab2ad90df8e9cb9438901a9287f0a969090995a5c6302143540502a03a11a319931ad5ebd
diff --git a/net-libs/czmq/czmq-4.2.0.ebuild b/net-libs/czmq/czmq-4.2.0.ebuild
index 77ee24c0d326..7eeb28134531 100644
--- a/net-libs/czmq/czmq-4.2.0.ebuild
+++ b/net-libs/czmq/czmq-4.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zeromq/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa x86"
 IUSE="curl drafts http-client http-server lz4 static-libs systemd +uuid"
 
 BDEPEND="app-text/asciidoc
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 2d8f7a9361f6..b22789c778ee 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,9 +1,9 @@
 DIST glib-networking-2.60.4.tar.xz 185628 BLAKE2B b10fecb88f09c4c33718a923f6ae5790baada485b4dd3637b0ae9bf5f831b74ac4b87fc398eed4c4a88b7069e4c5bc9a58c04ccbffc056648baa58b43d4489a3 SHA512 db1019c0fc712c0702679146bdd9490101cec63796792a33c7fc7fe26a85d343cfb11f718601a8d3bd91167505bbe60333cc01999a0496826c31681bb8dd4032
 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
-DIST glib-networking-2.64.2.tar.xz 189680 BLAKE2B efadec24a601b2a93a720444e328e31308ed8e72a96638514d5f8510f8fa9a88b1e58809f4a610baf0c17ff1eccc84cb0e30e12753fa27ecc7b80d03fe2b4967 SHA512 b796d3ef82f7ceea1c69a1d4ef7cf09e88ff8e702e93abd37cca4ea2f09650c1bdfdf8d8c57360a4bbafdd8d3cf5f88f0aad668b5ce77b92b60c08b7456ffa12
-EBUILD glib-networking-2.60.4.ebuild 1767 BLAKE2B 2333935562c3520aecac692b63c22d5693322ef3c823678349c48895a6835e239259ffc1ff7e733838c8c48edd385411ace855e845ea454e41a1c828abdacfd2 SHA512 1b4a8e165182cb3ceea9587fcb18747cb9a33fb01571767918ec313e06c7161eb5a9553327aaa648827c6b338fc7612823d3ad31c729b8f0ffafef30b231d723
-EBUILD glib-networking-2.62.3.ebuild 1768 BLAKE2B a20ee582cf6f490f2893adefc764980a986a735930a59c0f394fbd6131515eb9a22edc8f158fe9af4f8a229852358d8b81fcedb088937ac9b55489b7552079a4 SHA512 eca650e4eecea3cdbe7be74bd14bdd887d3726ae242fca8e9a13826a000de3da6d3223ae05bee9d3179579361b3d22dae78a24a52f26a4108c9f5abeb7cc6973
-EBUILD glib-networking-2.64.0.ebuild 1776 BLAKE2B 86f26398b596fc5ea94ed0bdb750523fcb3daeba92d8fa6425b97195477932aba70f8d31379bfbd4e12f2c30f1bf83547849042858072f0e49bc2149cb5cb4c9 SHA512 e8221e8d4c0cddcca0dff06fee174d300836ce549f0f9b4d75e9a9e9a658c5a75479379123b5c520e606ee6b958df515b67a2e8875fa3583f71647d8a7ed6822
-EBUILD glib-networking-2.64.2.ebuild 1776 BLAKE2B 86f26398b596fc5ea94ed0bdb750523fcb3daeba92d8fa6425b97195477932aba70f8d31379bfbd4e12f2c30f1bf83547849042858072f0e49bc2149cb5cb4c9 SHA512 e8221e8d4c0cddcca0dff06fee174d300836ce549f0f9b4d75e9a9e9a658c5a75479379123b5c520e606ee6b958df515b67a2e8875fa3583f71647d8a7ed6822
+DIST glib-networking-2.62.4.tar.xz 186004 BLAKE2B 0fbf41cc916a76d23382eb6ae84316e5328c682c4e440f304a978be897f81778e96a201a19dfdc4bd912c144d4013b4cb6344a2a0031fc2898f4af31ef0b43fa SHA512 cd233eeed7ffb8458f4e0316a08927713899e64ce2654aa34f267ccf09d2516e7dee79012dd9e1488d3e8c0e1795c3525523bf8dc5f82a71c1b202942c38363a
+DIST glib-networking-2.64.3.tar.xz 189760 BLAKE2B 5f067aacd0d7724367eabf961d81fba9d77a7057cc60ffc7bada0f55a7eff0bcc2388e8298792636c77252b9494a6a7d36bcfd227bdfbbf66e5d45cf77dfc1bb SHA512 01251f7f95d1c331e883d5ee7857bad0c0d6308991e437ff54ed63e718bb30a12e872755e0611e2bf6ccb2a01c52ba865fe0d94ac69dbab37d74afe063a0590d
+EBUILD glib-networking-2.60.4.ebuild 1740 BLAKE2B d65dee0b496a05fe5b2bd03832b468ee32d231bd52d3da7fc7edf4f1ac719ccb4c8b6a8c56bfae26da440183b811cf543063a48445cacaada5215b6aecf324c4 SHA512 69ac85ff2d13946cca07d72f7f11e882392e849dddd93a5742d60cb4a01db852cb47764a739a0865a6cafa9c313cc9ea1e4d6d19f137a6da104ae16ab0ca3b18
+EBUILD glib-networking-2.62.3.ebuild 1741 BLAKE2B 865829aa214cc59e38f8e4d97cdbee37451a5bf3498069a84a19455ea15c6a73cc5121fb58fc758b33891790becad8ac34e942974782132440822c1f6a4edd1b SHA512 b82e1d1e698d0ac5fec5ab569622dcf0fc63431fe8cd4167675f90ca82591b44f4277509e4bb59e6b8e645e4151bb51647666e442a303f6d7b112332f194de15
+EBUILD glib-networking-2.62.4.ebuild 1740 BLAKE2B ac40d8d2c90eb77fda52322bdf85449b5329f65bbac4f87330e1370eceb03bc0418a810deb32b86b816d3c31f32dab1a09f1d9521edfa4c74202d9dc4ee19deb SHA512 a7f8feaf0c269a4f4093da2d51f866199aad8ec5487ce6eb4b340674d26f7aaaf2db737faa7635e343a2e253b2b22f63b641e2505d603c784d8780df3fab9d44
+EBUILD glib-networking-2.64.3.ebuild 1749 BLAKE2B 1d4bd3b903527d8e6037faa1f3d1bfdc9d2b7a03e0e5752e3c13edadb70399b02c5a4bd4d66cd737704a5fb3cce87f7e80fb05d16321879389f1266cf8b8e4eb SHA512 ff8885a83761acb80e6089af3c85b29b5dcdd5c9dca0b1e5a7c8c71d7298c6d67d3aa772ab80eeae4f3bb2b0a57a90aa892f367e9a215831c2e04a7ac751f649
 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 e58e9fbfb911..3755ec84df2b 100644
--- a/net-libs/glib-networking/glib-networking-2.60.4.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.60.4.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	>=sys-devel/gettext-0.19.8
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	test? ( sys-apps/dbus )
 "
 
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 402238e5e1d0..1bc616f05a71 100644
--- a/net-libs/glib-networking/glib-networking-2.62.3.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.62.3.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	>=sys-devel/gettext-0.19.8
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	test? ( sys-apps/dbus )
 "
 
diff --git a/net-libs/glib-networking/glib-networking-2.64.2.ebuild b/net-libs/glib-networking/glib-networking-2.62.4.ebuild
index f4858b4fe70d..3c7092bef4e7 100644
--- a/net-libs/glib-networking/glib-networking-2.64.2.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.62.4.ebuild
@@ -12,19 +12,19 @@ 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.64.0:2[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.60.0:2[${MULTILIB_USEDEP}]
 	libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
-	>=net-libs/gnutls-3.6.5:=[${MULTILIB_USEDEP}]
+	>=net-libs/gnutls-3.4.6:=[${MULTILIB_USEDEP}]
 	ssl? ( app-misc/ca-certificates )
 	gnome? ( gnome-base/gsettings-desktop-schemas )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
 	>=sys-devel/gettext-0.19.8
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	test? ( sys-apps/dbus )
 "
 
diff --git a/net-libs/glib-networking/glib-networking-2.64.0.ebuild b/net-libs/glib-networking/glib-networking-2.64.3.ebuild
index f4858b4fe70d..133f9d9bc174 100644
--- a/net-libs/glib-networking/glib-networking-2.64.0.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.64.3.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	>=sys-devel/gettext-0.19.8
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	test? ( sys-apps/dbus )
 "
 
diff --git a/net-libs/gssdp/Manifest b/net-libs/gssdp/Manifest
index 5c2b68132035..a9f3dbd339d0 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 1477 BLAKE2B 9892f7fe3a4511d65909051c21f106b1e82ee664d5a515ce4c0a1a9b7711a7a0d278d1184a6e722e75a8c2dcb32fd3f65517227dbc9d7105c2e40d6ba3e5213d SHA512 f15c0fc98b494e73f221562a83312f3263dc5ed4f25815f03a42f19940242f7c76065069e7aac11905b6e751487d2965c2deaf87ccaacdbc6fa41a80f939f0d7
+EBUILD gssdp-1.0.3.ebuild 1390 BLAKE2B e976444c3ac2fa6dcc4f680abb1715ed4c4c8198f1ff5dd77914380d5cf7fe8a5f592c6cb3eb6d98a6a59d16148dc722dc72905d486aa344bc15d72d1525fd5d SHA512 26a7e121088e3b4293c798b07a83010095eb7b9a7e7e3ccbec774139d3cfa0b93a51dfaf1d5012b79cfd1c254d9659965fa27e3a9893f802bb75019072120311
+EBUILD gssdp-1.2.2.ebuild 1450 BLAKE2B 36af250637e0c8b2c3e13c642a4c6d053c7a1a3df86e3b71829557d1d9f5cb44b0375d038f9fc45effd164793091105f8f29e207fcd37dbe4fe612dfc6fa7d92 SHA512 1a5d04d7d613103cde06b1409607613b35a32f091a23c6b30dd390064c46619ce55b835aadc665a82cd85f830dc084f7250b8c9989a95484a24ecbebd5fa4e13
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gssdp/gssdp-1.0.3.ebuild b/net-libs/gssdp/gssdp-1.0.3.ebuild
index 04abee1942cc..a5f6b160c168 100644
--- a/net-libs/gssdp/gssdp-1.0.3.ebuild
+++ b/net-libs/gssdp/gssdp-1.0.3.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.14
 	sys-devel/gettext
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 "
 
 src_prepare() {
diff --git a/net-libs/gssdp/gssdp-1.2.2.ebuild b/net-libs/gssdp/gssdp-1.2.2.ebuild
index d7d1dca09cee..4590776d84b4 100644
--- a/net-libs/gssdp/gssdp-1.2.2.ebuild
+++ b/net-libs/gssdp/gssdp-1.2.2.ebuild
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	gtk-doc? ( >=dev-util/gtk-doc-1.14
 		app-text/docbook-xml-dtd:4.1.2 )
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	vala? (
 		$(vala_depend)
 		net-libs/libsoup:2.4[vala]
diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
index 3e52b51b519d..c683ca0a6922 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 1457 BLAKE2B e93ff3f559fbebb9e84800c6f48850f0970b96921396b48ee893af4c283567249b280e21f81ba400a9157d8bb490feb25a06eb6db48bbd718de31e5877b57b23 SHA512 7df87ecbc205765250386137fa5bed23323008b5aca991cb8b5ff7fe137f70c13d910c1b75fa792c36b232964d9a9ebc3d9217146fe9081bb3347ba5b8e9bd72
-EBUILD gupnp-igd-0.2.5.ebuild 1195 BLAKE2B da2b4bd36ddac42b51ec0aa59cf07038e71f59819262abb21191c93c66d90978de7d21650df65a146aa15d7de4ffedc1eddee7c6047b1ad5ada50d89d32255da SHA512 e34a657520c195b9b50d9586b4f79196074d139045418a0d88a90b38d4bd87cffb809ce6d299541a7bf7c3ca4e376c247e33e0364de06756adf5850c73b4c1bc
+EBUILD gupnp-igd-0.2.5-r10.ebuild 1430 BLAKE2B e8ae3e32363644ce7c8f4988ec44b2b9d1aee5df419c344cc00b4c8e6a9611d4db105d59a8cd1598d87451bbf5271e4d419da9d82dfdf76dee0785d0d91acab1 SHA512 f74bda750feb5939a6175c96f689a6baea353ca1c2c16d719835569c2314e0a05c9390ba19cffad973cad1dac2ea9e5fd1ccec6b03bf41965f09dbcf9e58cf6e
+EBUILD gupnp-igd-0.2.5.ebuild 1168 BLAKE2B e7dc68304f082cb2502639cdc38b8bf9ffb2b2cf33dc762e1944be76b38af60fc6d659b030998a174120803755f8a566de9f8847a607c37438d4250bb9d1013e SHA512 f2e0b0f2b630b1a5e1356dd0a1291921e9d4c475e206ad547dc66a67c0713a644b72554286e55c6618326101da204e4a949177721e2b145120d09bfadada8f43
 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 756607d9a69e..dccc1aa812e6 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
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.10
 	sys-devel/gettext
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 "
 
 # The only existing test is broken
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild
index 68eefd20d9ac..c8dee50645bb 100644
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild
+++ b/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.10
 	sys-devel/gettext
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 "
 
 # The only existing test is broken
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index fe3bab03db5a..14a35afe3264 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,6 +1,6 @@
 AUX 1.2.2-build-manpage.patch 1447 BLAKE2B b876a44ac3930f087e3c00530d0b5cba2d2836b9b968c4cc34500e6a11a5b04b432c5e8dac1addff6cea85feeab5bf3fe2027b3d87fe2e861a4b9aec2e3e349b SHA512 e232ee5bdb2ae1fcd9b44c63942d1bef9d610e90135ec4fa3224716ca632d513f099638eea58fa67f39d7d80a507db1f7788af5712749417d2c576c8868521ab
 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 2409 BLAKE2B ae08a58c780fb8905d610a32e37f054f202dac91eab9de0318509220010f77fbf0e7bfb0e92a2e95f17bda672ed69d039e96aaec802f92e432d7098d2551f450 SHA512 521a369deb7b1d4c198e73f5bec5ade78ef304a28ee4269ddb112c6c49c383d2686d160e88880a68ed0187d5645d684e78b93966b63d6c464049446e43e025e3
+EBUILD gupnp-1.0.4.ebuild 1936 BLAKE2B 0bd2a5783fe11eb5948b39ab91eae9b8055227add4186eb39f2c25291bb8979d807765d521e617d2cf1eed5621dea26eecd79f8b262b482efba6bd30eea0ee84 SHA512 4d5ca071142bcac84c1c907894d4f8b5c67d7a77c1ad58801ecbac4a4104711eda25cdc19394d51c10ace1d75bc18b3a2f68b35dd96b5c3452217a7d5b85338b
+EBUILD gupnp-1.2.2.ebuild 2382 BLAKE2B e0c3a459602fd8eda64aba8116369a3abb9db1f13c5b367ed4ecd2464f6cd3416a6c54696de17fc6c942c988704aca199c80087def6a5753b2e79f32445d87a4 SHA512 d33f989487371960f7e419d3f8bdd3b14687286aae6741238ae93dbacd14cef28e993c237a380ce7f39ed8d2c013a70f230b7a22c4e40fbc7d58eac78bb9112b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp/gupnp-1.0.4.ebuild b/net-libs/gupnp/gupnp-1.0.4.ebuild
index a9bc2db8bed5..21d5109ef959 100644
--- a/net-libs/gupnp/gupnp-1.0.4.ebuild
+++ b/net-libs/gupnp/gupnp-1.0.4.ebuild
@@ -38,7 +38,7 @@ DEPEND="${RDEPEND}
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.14
 	sys-devel/gettext
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 "
 
 src_prepare() {
diff --git a/net-libs/gupnp/gupnp-1.2.2.ebuild b/net-libs/gupnp/gupnp-1.2.2.ebuild
index 5f5d8143a021..b73234a91a5a 100644
--- a/net-libs/gupnp/gupnp-1.2.2.ebuild
+++ b/net-libs/gupnp/gupnp-1.2.2.ebuild
@@ -37,7 +37,7 @@ BDEPEND="
 		app-text/docbook-xml-dtd:4.2 )
 	dev-libs/libxslt
 	app-text/docbook-xsl-stylesheets
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	!connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) )
 	vala? ( $(vala_depend)
 		>=net-libs/gssdp-1.1.3:0[vala]
diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest
index cc5cc4d99ac3..5660c9829b37 100644
--- a/net-libs/libbitcoinconsensus/Manifest
+++ b/net-libs/libbitcoinconsensus/Manifest
@@ -1,7 +1,10 @@
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
 DIST bitcoin-0.19.1.knots20200304.patches.tar.xz 399864 BLAKE2B de5591072b62c65c8a0fdcee7a7ed4b74d13614e47b679a05f272207b9ca0a09d476aa8ecb66321f39953a320f4d47f7d2aa62848192d493de02525c3d5abdfa SHA512 3b08023f0788535dc5943e47a595da5637172263ac8c2ad97d42c0707da7468a9843efbf90a2eb6ac99db65e362e99cbe9209ab64785c79de908e20801ba4fe5
+DIST bitcoin-0.20.0.knots20200614.patches.tar.xz 392356 BLAKE2B 17c5d5c89e279c870492ac4f98cfde6545fa3c4b5169f42c020e45ca14c133673e271b248e90286ae875aaef6b031e578d14554777a89dca5366aa4bda079012 SHA512 208234b2e7fa46e19da9954dab9828993aa62a7623d85de8e7d43ffd4b367c5e8641e82154357526a11b95c0426ec16039d2910dbbe9187daba9d14a3b2fda92
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
 DIST bitcoin-v0.19.1.tar.gz 6660702 BLAKE2B 93ed83f663a833f6be40195ddaf62a8ef9fcd86c3f983fe0cf1e75eaf9ae54cdc88fcdfc36d798842f29636dc8037af5b67e82643c90a6c276fa504ed022f863 SHA512 bc1afad7de5b43042d24780b07e3faf73dda69af9ef0c75fa1a32bd25b0b37e315955614ffbb2864fe827b77b63446fd88cae22da3d0706ff73df495a519ba5d
+DIST bitcoin-v0.20.0.tar.gz 6984988 BLAKE2B 2c189826b7171276df62fb8cbf713d8b4cb4307de413247f2951950ec173d069930447d7d420d1c73ba0abc97fd613a05fc527bcc796e5e2d2f3dfb57fb29b80 SHA512 7628efb70bf51e4165605d9e77f6119b855994e99d8cb6653dfbd89628304862f3a98cfe352aa8b435913000e74d297565d8a7e3f22a23006d1779b70d04a8cd
 EBUILD libbitcoinconsensus-0.16.3.ebuild 2339 BLAKE2B 297cd6c0adafbb99a5b3da6f8a34171fc32b72de86800a4c0f1401906d25e62db6cf7d9f2446dfe2db7d18e7c776fa5fe738d95cc55f21ef1a12124e869dba4d SHA512 a412a06ed2725a8b86adb5b9c245c3b041a2e3fc38c8a4104c8f808aa7877c0343a9159efdb5f4021f13ecd6a923480332fc7150b7acd6b595353d40deb21b59
 EBUILD libbitcoinconsensus-0.19.1.ebuild 2388 BLAKE2B 58146351171676bddb3744b2cc1dda21d552a0302e8007dc8f828fe1ac89430d4eed2189c8d945acb5f8f85ff080da1e08af1b8798532221d46b9380473950ac SHA512 54804c8e95c92b3b057a817d681a24211196f2f2b18eafa8defe159aa41ca71140a430edcd4c400fccb0d6656b1661ca9c7fafa6169aaa9c4664f50d2aba3b6b
+EBUILD libbitcoinconsensus-0.20.0.ebuild 2431 BLAKE2B caa4cc6dd6fb317b2710f59076e7da0a72617a08aa7b0154372a169447e9f87e0e02dba6d610047a124e1d266fc51eac04baf09dbb927aa39f56d3dedc5229a8 SHA512 317c2502ab76b070e4afb9f4708c3da46f89cfd4b2a7e1b3de5e51d18127bae34b53693596d7f7e9642d22e5d5524d43efe37d126b0b2043273970e602f6541c
 MISC metadata.xml 679 BLAKE2B 5283fe5aba24ba5d425e68ee4f6b1059378027c116c675d94ffdd44fab28c68ea52434df749a3a906121e2a044e296e8a26975f9653b93e693f3815bddf98d9d SHA512 3a9ccff97c3e952ec4c321184144be64daf4d9a1c03d21cc8aa454162ad1c1d133382cbbf5d21a873ea3bf746ec68c4ed0be0b81e2b562724ca9bd05f481d665
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.0.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.0.ebuild
new file mode 100644
index 000000000000..0f5c0bfb4ec2
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+BITCOINCORE_COMMITHASH="a62f0ed64f8bbbdfe6467ac5ce92ef5b5222d1bd"
+KNOTS_PV="${PV}.knots20200614"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Bitcoin Core consensus library"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+	https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+asm knots libressl"
+
+DEPEND="
+	>dev-libs/libsecp256k1-0.1_pre20170321:=[recovery]
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=sys-devel/autoconf-2.69
+	>=sys-devel/automake-1.13
+"
+
+DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		elog "You are building ${PN} from Bitcoin Knots."
+		elog "For more information, see:"
+		elog "https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+	else
+		elog "You are building ${PN} from Bitcoin Core."
+		elog "For more information, see:"
+		elog "https://bitcoincore.org/en/2020/06/03/release-${PV}/"
+	fi
+}
+
+src_prepare() {
+	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+	if use knots; then
+		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+	fi
+
+	eapply_user
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		$(use_enable asm)
+		--without-qtdbus
+		--without-qrencode
+		--without-miniupnpc
+		--disable-tests
+		--disable-wallet
+		--disable-zmq
+		--with-libs
+		--disable-util-cli
+		--disable-util-tx
+		--disable-util-wallet
+		--disable-bench
+		--without-daemon
+		--without-gui
+		--disable-fuzz
+		--disable-ccache
+		--disable-static
+		--with-system-libsecp256k1
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libdom/Manifest b/net-libs/libdom/Manifest
index bfbd2e245881..f6d62ec18ab5 100644
--- a/net-libs/libdom/Manifest
+++ b/net-libs/libdom/Manifest
@@ -1,5 +1,7 @@
 DIST libdom-0.3.3-src.tar.gz 870035 BLAKE2B 6dc77fe0ef31e491810243b461e6e7fbab2d6d2bb56e68730497ed9e0e1acf9dfcc29be024bd0010292e57d25849124153772c24503012fbdf38d24363f35a05 SHA512 3b08b20976b36adf441f088e9feb756b9ce6a43133e57b90fa6d6b8809d74c6d500c7d2a883dd19d520c6ef71d9e04685d9765e6c6a00677a412265ecc6273a8
 DIST libdom-0.4.0-src.tar.gz 871499 BLAKE2B e0ab1a1cf14b532eec1bd68c3ee2557a720a984232ede2f9b0e1d4c68299cc8b39b3d83fa1ff77233d07b8148188ec3012dca64787cfe476b4eb6990f1c71629 SHA512 4d3acb6520619c6c28f20c9fef72b19a879070d0e65d896212c557ada44d35c1fcae4712b901db720ddeb3b1b90832005d63075dcafaddb5f4ba2088fa7a9eef
+DIST libdom-0.4.1-src.tar.gz 872954 BLAKE2B 7a6d15fbb4bb7046b8ee9670a14c89f5da2ea0eac10631274d9b47eb0ee1181a85eb62aea326d293c407a006091452fba174dddfbb8cd0297a224850159ff9b1 SHA512 8927b294c98dcb424a454036b20981963ba9982c1aad95b07fc0ca1efc58756b7d85373ed4cde0dcff6281b518a2b5993358494f432d85f7ac7ebd51230a6c22
 EBUILD libdom-0.3.3-r1.ebuild 1219 BLAKE2B ee68ac1d36b1ab0949c4cde6b48f2401295a0511ee1a5cb3290a3e4dc6e9fdff9b0b046fbff6baac0716b62331fe43dd36864d555aa72a7083c0cca6deff45a8 SHA512 5866280d5f86a4ccfa9484093c32850476ebabc9c945902c398813e23869ee1f9291f07df48d5aa9ca57df1ff43053cfc0685ea9f9183b58cb60615a929d665b
 EBUILD libdom-0.4.0.ebuild 1201 BLAKE2B 1f326a228e12011d1a0bbb73b1f98dbe5a5728fe2cb7b5284151d07318c4da23e5964442f58d734f83d57bf223e8b18c3d6ee4efac1da275e43a8415529fb759 SHA512 477fdd247ba7a130992a0735c4a40a5c3a6baeb6d6880a3a82886ff9937b2fa561ae7dde3d95b7a54f245c917289d35c8ae6924565684f51b2bf82ca1a895abc
+EBUILD libdom-0.4.1.ebuild 1200 BLAKE2B f22cc4bba353a01f67c821d7cd0e0d2d82967aae2d2e5db4afec42823cd50d607ded0463597a619a02c6e447fc4e564e55b07239f0dd678f6932cec2feea571f SHA512 1b5ffc5789981f645c6850eb41ca22e3e49a5e7ed35e3bbea15f82d5b4f1d16f33dc15a890135059ba18fe86cb7880f5b591dbc2c04f57a2345fbe9ef92d4bad
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-libs/libdom/libdom-0.4.1.ebuild b/net-libs/libdom/libdom-0.4.1.ebuild
new file mode 100644
index 000000000000..cdf28536a5dc
--- /dev/null
+++ b/net-libs/libdom/libdom-0.4.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="implementation of the W3C DOM, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
+IUSE="expat test xml"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libparserutils
+	dev-libs/libwapcaplet
+	net-libs/libhubbub
+	xml? (
+		expat? ( >=dev-libs/expat-2.1.0-r3 )
+		!expat? ( >=dev-libs/libxml2-2.9.1-r4 )
+	)"
+DEPEND="${RDEPEND}
+	test? (
+		dev-perl/XML-XPath
+		dev-perl/libxml-perl
+		dev-perl/Switch
+	)"
+BDEPEND="
+	dev-util/netsurf-buildsystem
+	virtual/pkgconfig"
+
+REQUIRED_USE="test? ( xml )"
+
+_emake() {
+	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+	netsurf_define_makeconf
+	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared \
+		WITH_EXPAT_BINDING=$(usex xml $(usex expat yes no) no) \
+		WITH_LIBXML_BINDING=$(usex xml $(usex expat no yes) no) \
+		$@
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake test
+}
+
+src_install() {
+	_emake DESTDIR="${D}" install
+}
diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest
index 3ccc47699440..cff556a86fef 100644
--- a/net-libs/libhubbub/Manifest
+++ b/net-libs/libhubbub/Manifest
@@ -1,9 +1,5 @@
 AUX libhubbub-0.3.6-json-c.patch 860 BLAKE2B a70a81eb2e8a1c3c61f8990e80c000d7047dada87e6721e50309c0d81ee411dadd3840bce2c72dc019aa1c7804801eafa387aead11b820b203de901f1dd4253e SHA512 ecd28b596cbdd01029b299d0f378e85f854205abd7bfb592061576dde35195dcc84b37f7aafe5127f76fb22b633f9f4ba13ef7158c58a021067cb7502effbc14
-DIST libhubbub-0.3.3-src.tar.gz 783945 BLAKE2B 826b089708dea8a88a522f9889f81e420feb6c616ef7ad826303eca3ab39d4940cbc8bcbfcf61c979dc488d77b4d32fb24c0602b73ed28ea4e8076f369c93388 SHA512 28a5668257eda8cf1ca0395505522eb0f847a4cceee46de067fcfb171baa114876156a7e2671fff93602b2de63c640095e1a940e4725afb24bd14b4fd5f64526
-DIST libhubbub-0.3.5-src.tar.gz 784526 BLAKE2B a7ba1be85ab01761894a1f2904fbcfbada0280c06ad0834288366f9ce42407a61978bbd775367cc064e367ad78bc792db66ad0e034ae6903c8ad5b44a1fc4d08 SHA512 57feb6ae74381e6b2c5c8a82aef7bcc5faf4a8303e41e39f4ba081a198c6f1225ec9952734ec97f20ba1b4fa3830543e43f4c2d2715b7a8467c19224a968073b
 DIST libhubbub-0.3.6-src.tar.gz 784692 BLAKE2B a24b2c7b33849d6f4b25867f8b801d157f19257a055dd9a5a6c49de6c2fbd3f234f648d542b7938fab249e14bb6839997530c47b931379a94ab85ccd750b71e0 SHA512 6ccf9d9bbe8fc8de21570994c4a2f6f6c6943d2b00b8939d0ec9ec72cb3d653c40b58f509a1a81a5500fc8d3b4c49595aec509129bc993208b51b29486d0c14f
-DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
-EBUILD libhubbub-0.3.3.ebuild 813 BLAKE2B 50d1b0f9d5a81647359ad8c0c43cfd1752fe70ebd4663f6d33122b23061ed72a6cb563eaedb42a01b0ff2a925da2f305b29892917ea78c09a4465712ff99cb76 SHA512 e73c622d5df44f6447bf9bb499a0bb513c9156b40f67ba04fa2a08f0aa1c36c333cec9d2454de35d3d0d3620bfb5aa27c51e9974e1f7f00b440a1674aed42f64
-EBUILD libhubbub-0.3.5-r1.ebuild 1140 BLAKE2B 4c92376ec7450896597e8b582ede11da5ca8ab72590741404b3c79f5fbcbc55b72a8371c0a4e18400185cf79c0799a9fb1cc9dd986366f01b5085de15c20e010 SHA512 fdada0957a19b27dd8b76c807f7308db5976f09f81e026d5bc1df83749abf969121c6c1dfa690b9fe5ffc524e47e13d97b05aecb933710855221474056cafb63
+EBUILD libhubbub-0.3.6-r1.ebuild 1261 BLAKE2B d87a370618d95268d7b3dc9b5c02dddfb580ee8b5ac3aa925bef47dcaeb3117778e8be6a322a349ed35206102c5c4a9c91b0f0f406583eb84f60f04912ce3b4e SHA512 ef93f90d5f1fb78bee0b891fc9e9516f8313ee669205b75aa92d9c2aef23641f764c608826fdb393869bc1a964d06609b0f902448affe826637f5b71ae1d418e
 EBUILD libhubbub-0.3.6.ebuild 1184 BLAKE2B 46be9c562a28e3ee7f93a54b108a745fdfe8ebdee68c1927a810a0016b8f68c2acae92b27953abee7251cc274c3d8513139e2faabb475b983d8d49f805963505 SHA512 bd94104437b4b4799115d15e2b36c3684c235773bc3bbd2b8b4fed74fc9ef987e0510a51e860ebbe99c292c2c54ceb2f7476e2ae4681299a7954540166f6288e
 MISC metadata.xml 357 BLAKE2B 34eb2ba7fee2d2df8540a6fb2b5407ec249e1a983e348951dc002373288643cc06b7ceb4cd84de8ae770b9e0ced10892fc08fb6d415d803365f60bfcf6948b0b SHA512 40cc14c2f673767be159cadd8da258d273d99e38d96ccd2c2139f8fa424b30c8878ad6aa7d061c76e52cdd77ea42e58c9018e27849887882e9bcb7cd70827e64
diff --git a/net-libs/libhubbub/libhubbub-0.3.3.ebuild b/net-libs/libhubbub/libhubbub-0.3.3.ebuild
deleted file mode 100644
index 7c1047c179c8..000000000000
--- a/net-libs/libhubbub/libhubbub-0.3.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-NETSURF_BUILDSYSTEM=buildsystem-1.5
-inherit netsurf
-
-DESCRIPTION="HTML5 compliant parsing library, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~ppc x86 ~m68k-mint"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/libparserutils-0.2.1-r1[static-libs?,${MULTILIB_USEDEP}]
-	!net-libs/hubbub"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-lang/perl
-		>=dev-libs/json-c-0.10-r1[${MULTILIB_USEDEP}] )"
-
-DOCS=( README docs/{Architecture,Macros,Todo,Treebuilder,Updated} )
-
-src_prepare() {
-	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
-		-i test/tree2.c || die
-
-	netsurf_src_prepare
-}
diff --git a/net-libs/libhubbub/libhubbub-0.3.5-r1.ebuild b/net-libs/libhubbub/libhubbub-0.3.6-r1.ebuild
index 1ac38dd958a4..758a9a08d909 100644
--- a/net-libs/libhubbub/libhubbub-0.3.5-r1.ebuild
+++ b/net-libs/libhubbub/libhubbub-0.3.6-r1.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,27 +6,26 @@ EAPI=7
 inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="HTML5 compliant parsing library, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/"
+HOMEPAGE="https://www.netsurf-browser.org/projects/hubbub/"
 SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~m68k-mint"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~m68k-mint"
 IUSE="doc test"
-RESTRICT="!test? ( test )"
 
-RDEPEND="
-	>=dev-libs/libparserutils-0.2.1-r1
-	!net-libs/hubbub"
-DEPEND="${RDEPEND}
+BDEPEND="
 	dev-util/netsurf-buildsystem
 	virtual/pkgconfig
-	test? (
-		dev-lang/perl
-		<dev-libs/json-c-0.13
-	)"
+	test? ( dev-lang/perl )
+"
+RDEPEND="dev-libs/libparserutils:="
+DEPEND="${RDEPEND}
+	test? ( dev-libs/json-c )"
+RESTRICT="!test? ( test )"
 
 DOCS=( README docs/{Architecture,Macros,Todo,Treebuilder,Updated} )
+PATCHES=( "${FILESDIR}/libhubbub-0.3.6-json-c.patch" )
 
 src_prepare() {
 	default
@@ -43,6 +42,7 @@ _emake() {
 
 src_compile() {
 	_emake
+	use doc && _emake docs
 }
 
 src_test() {
@@ -50,5 +50,7 @@ src_test() {
 }
 
 src_install() {
-	_emake DESTDIR="${ED}" install
+	_emake DESTDIR="${D}" install
+	use doc && HTML_DOCS=( docs/html/. )
+	einstalldocs
 }
diff --git a/net-libs/libnetfilter_queue/Manifest b/net-libs/libnetfilter_queue/Manifest
index c4e3a144b25e..b64521b492f4 100644
--- a/net-libs/libnetfilter_queue/Manifest
+++ b/net-libs/libnetfilter_queue/Manifest
@@ -1,5 +1,7 @@
 DIST libnetfilter_queue-1.0.3.tar.bz2 314857 BLAKE2B c25b0395b13af3cecb960c39bcbc4f10a3f203aad7acaeb277346423310700d9abb5b8a65f27b008e5f45194aa6e0fd6a99c8ad25a1e3200904be70c5c6ddaa4 SHA512 1d9e0202878bc0ae26ceecd0f4fa4c21f89056e5671d46949f92f21c155d589958b7775760fc837547da34eb9a81e537e95c770d25c166e709dad16de4ca452e
 DIST libnetfilter_queue-1.0.4.tar.bz2 312699 BLAKE2B 29d553c36af551cbaa3b1b4382ad38d6ea7402efafa5ff4ae99c6f05d0ddd15d24b007a4ccdcbc21b8bd9cea28859668a27a6fae4e6534f68dea79d6d0a02789 SHA512 5d81d8e8190a80c9b42bc851a87cc4f749709803b8c9964508013bafb033f1b51b65222a244885f321a2be90517c6a636533ff72b653935a2b8d819560a51187
+DIST libnetfilter_queue-1.0.5.tar.bz2 313856 BLAKE2B 0d7806fd23961f6b80f6ef63faf0fe10307a34495337a7f6dd4f0eb76b5ba8a96292b86285e0740f83414417810e47f47b1400c7d83fb4d8fc6f58954f4bd9df SHA512 732a44b602e5efaa4f5582ea25ff8f5ec8f4dca5c0e725cd93fe2d441db80416b25c6018147be90acb262d7428eb5b21b3f7b5920e612d115061ec6a19d67f85
 EBUILD libnetfilter_queue-1.0.3.ebuild 724 BLAKE2B 4ef7a43fa54add5f2b3b664434927a160778721eee0e98949eebe08a6253f8eac08b42e6ebee68122a947fdd023abc0d6de8bf5fa3855f17d8e61a495590f63a SHA512 6604f86cd9bf16b5fbf347219dcb2613e1ad47c83939976abf29703783ca961f6daaa140ed772dcf076f9ceedf735c4ab5fa6ada96018a2807a38aea7570042f
 EBUILD libnetfilter_queue-1.0.4.ebuild 895 BLAKE2B 2839c19ee5ebbe3dd18348ed49cd88843fab057bf878a5b860d5374d4bff43133ca94cbbcc9b4892471632716f46bf3484073ba6edd8211ab24ef280a696924c SHA512 b4bf7aca2998a878e8c71fa7f6cd3f8bd45f66735503f4dd523dabe937cd988ed56a6ac2a7ecbcef6b4f9918cc9872810bb2b60986ed464fc78005672176288a
+EBUILD libnetfilter_queue-1.0.5.ebuild 892 BLAKE2B 131ebfb7c570074c333edf31c8f6cb708bf543ed393eb8a8011722a3fadf33079758c5cd90c2f5ef5b3859de7ed534bf5f7c97f106db11aafde6791b19a35140 SHA512 e2ed77b7d7a0fec547b74f1119c00b3f073ac02454a1d06eb9aed142d1411ef89ab2b9ab60f31dd35391dba7cd18187146a8e884db5cadc7a70e1e6e40f3bac4
 MISC metadata.xml 370 BLAKE2B 5ffcfd5d89a391b532e7d64188fe64b9a99a72c9072aa8bea89157a3b322b0f1ee0edab1ba3d2b088857748ab2e5402dc6ba0db514e9c1ba465bf0b6716b6fc9 SHA512 d81ab4bbba709f4b4dd90ba5029ed20471230817f7c538e502ce3cd533e1439326d101e8e7a34e81c8714699d87f195dd95c2157216f9926baafe7b5c8aeb213
diff --git a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild
new file mode 100644
index 000000000000..4a7992f51bb4
--- /dev/null
+++ b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit linux-info
+
+DESCRIPTION="API to packets that have been queued by the kernel packet filter"
+HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_queue/"
+SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+	>=net-libs/libmnl-1.0.3
+	>=net-libs/libnfnetlink-0.0.41
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+"
+CONFIG_CHECK="~NETFILTER_NETLINK_QUEUE"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	kernel_is lt 2 6 14 && ewarn "requires at least 2.6.14 kernel version"
+}
+
+src_configure() {
+	econf $(use_with doc doxygen)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libnice/Manifest b/net-libs/libnice/Manifest
index b1f711ea99f3..1dfe34b95811 100644
--- a/net-libs/libnice/Manifest
+++ b/net-libs/libnice/Manifest
@@ -2,6 +2,6 @@ AUX libnice-0.1.13-gstreamer.patch 1195 BLAKE2B 26ef177454864e7757768cdfb51f8a4d
 AUX libnice-0.1.15-libressl.patch 1961 BLAKE2B 7e06399def0beb5c744d97fc6ed3a73eb9f5e5ec005339aac12ef5de7d0a2fd32efa146c9fbc5c542fc870e406d250c6c80a21e8c262092012a1db7049e0fd19 SHA512 745db3ad3c7a3fa855587ba4848549578e327a7741c2e3c6731c2a15852d9385f17c92ae98a3ddd0485f371eea070c527a63a20ba86424bf37ca2f690cc0f409
 DIST libnice-0.1.13.tar.gz 912374 BLAKE2B ae8ac3af7b5f355e3c7b961bfa60759ba71c8cc6ddb6cb5faaf1c6fe347785f36340a9f8977a1689595c265349a1b34305f41288cf951fa938b0411cec3acc0d SHA512 c9bb81e8cd0b4e3673dba07ce08a16dd8821831339b44f1006510cdc09f9ae4c6eb7d43230711a2509867acb8d7df71821c411830dbf71c5a5d7e802f14a32c1
 DIST libnice-0.1.15.tar.gz 1064100 BLAKE2B 81f06ba599b01084586a8d904b9ae513d6bc3531ec42674648fda320eea6cd9348acf423571922bab4e338bf135f85b292046352ed6f5e4fefba736d787b1ff1 SHA512 60a8bcca06c0ab300dfabbf13e45aeac2085d553c420c5cc4d2fdeb46b449b2b9c9aee8015b0662c16bd1cecf5a49824b7e24951a8a0b66a87074cb00a619c0c
-EBUILD libnice-0.1.13.ebuild 1574 BLAKE2B 5e5d75959760dd820bb657c102ea305c98d1d0ac2957ec713af516af91a6ad32e02e8b57e064a09c0d6c5a12fb23e09eb7fb3b09a9bb5a0502812d51a6141391 SHA512 7a43625ac18178f7ef98899700512f4bdd22aaaa0bb60853a7b6a657bfaba8d257769c3fde90c6c8a5e0b3ceba13201922ef685a6e3d999633e11ab74efae7da
-EBUILD libnice-0.1.15.ebuild 1758 BLAKE2B 532d01a9e18beb9fa1e0c3ddb2748426de0f9a5884029042edc46995bf620621deba38b8606cb043a8487a4492952ee7a174ebf0de13ae7ee6f47a68632d1986 SHA512 dce86fa239e9dbd41b36933e3f56a3b8ce7bf04d7f1ade3226a3cc909ea9971a4687fc0efd759f2a4d4744558488ee7fdb7aa30cda147ccb5b380211842115df
+EBUILD libnice-0.1.13.ebuild 1547 BLAKE2B 721277dcd43e033c1b65a54a4ca9fdd20c11b883c442633d482fa4adb3b121e64c118937b0fc2228f98091e8efb5970a0ab56a52dbd6c8c0a13d917728eb9938 SHA512 ebe57f2a4fb3ef3cd0d2c45e469a713df9ab3f90505459896436fceb1d35ba7ee9dfda31b3b1d3ce18a44e1e38c269ec5ba400cc86337f836b82b62256056bda
+EBUILD libnice-0.1.15.ebuild 1731 BLAKE2B ebe8951c87907b194caeae729d9b0f9f1322ccd2cdbf900b88128e53fdf10d61774c04b4606e89a81f1ae4fe41b491759987a4f8f89e4f24b820ccefe76c0059 SHA512 43e9631557a43a744bc058abbce38ecfc18165244fc194e51ff91a321f9fdabefea0819b52c6e427ae7527161d8771b2ace3c9e4d68e13d41f44673ec507f0b3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libnice/libnice-0.1.13.ebuild b/net-libs/libnice/libnice-0.1.13.ebuild
index ac0b799fafc3..bca6e1f8abfd 100644
--- a/net-libs/libnice/libnice-0.1.13.ebuild
+++ b/net-libs/libnice/libnice-0.1.13.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 "
 
 # Many tests fail from time to time, for example:
diff --git a/net-libs/libnice/libnice-0.1.15.ebuild b/net-libs/libnice/libnice-0.1.15.ebuild
index 0ee77232e83e..9c8fb774645b 100644
--- a/net-libs/libnice/libnice-0.1.15.ebuild
+++ b/net-libs/libnice/libnice-0.1.15.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.10
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 "
 
 PATCHES=( "${FILESDIR}/${P}-libressl.patch" ) # https://gitlab.freedesktop.org/libnice/libnice/merge_requests/50
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index fa0a6a02fc52..ce37551ccb7b 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -3,8 +3,8 @@ AUX libpcap-1.9.0-pcap-config-includedir.patch 907 BLAKE2B 7d616edbc6bd129bbe73c
 AUX libpcap-1.9.1-pcap-config.patch 1005 BLAKE2B 27f06af3f6634e25bc7eb017923a174191e13d28658e380baa2d48f828736a0ff176de4b5fdaa7c0bf42c36509dfffd0c6d49cec45669d03201fad8efaf90c75 SHA512 57f51c1f2fc093bacf43a96c7156e82946a3f11025b3afe3c24c2704fb4a9a7750e0526d41a17d52d649f55b44d642d5daa3a76f0ae18aaca582591f20acd1c1
 AUX libpcap-9999-prefix-darwin.patch 358 BLAKE2B cd2d0dc64fa49fa91451fb668a85684770d43cea038cd59d6e6e6b6b59e29fe258741ecb2aa8bca5621a4042b786ac5944700df40d6d52cb25fdb7fff27f713f SHA512 c3b3d90ad0641bec86bbd8a07e4eb35dc49a6b9f99bf5cccdb6b9134b75e9e6b78649073e69291683de581d1b40ba8c3079a86ec7a621a1fcf33f8a1cf818f75
 DIST libpcap-1.9.1.tar.gz 849407 BLAKE2B 700d8b3d25c036033c4f9b652cec6a30d4a45aa418c2ec45698018b3d3fe8d0a61f6759f5734e2c7ff9a8f42cce65fbd8b3e1b1efd44776e53674fbc609da59d SHA512 9ab9da20194e0dfb105daa28c8841118118f5a7f68b5e30e31da6c56eec91430c8ee481f1f9d20aec4d33d7ee9e6fb0b5e08a90a8d7e5ace8e6210e29e7eab0f
-EBUILD libpcap-1.9.1-r2.ebuild 1887 BLAKE2B 298ac2583dcc7762e11970fd9b4f1bb0d18c3e6c43b5958b969ed84975a651aa6916cf977034350417236144c3278489a38ca0a2398e7cd52be8dfff5e6bac88 SHA512 b941d6c617d2a2ce8ea58b4629c3cec12ae41fd68312d92472b8f1c123be276cb55b019dc24fd5c7b74401ec502d3a871571eb482bc6df60411d6c2d7a61fa7e
-EBUILD libpcap-1.9.1-r3.ebuild 1912 BLAKE2B 03b6cb289b6b15e761a0e6c2493366dad67b5fdecb725a40efcb8b77ef5d02016117a838675d5a1ad88cd75f84d1207a996506762f1e1217fa943faefb140ec1 SHA512 5bad2ba3dbb50790e19c0d2949fcb21e1e0ba52bf1b137fb9d534d7f1ca0d3f9c2dbac2b20fa645596f0037618cb9a40adba45762d476d3b07e31bb311ebb725
-EBUILD libpcap-1.9.1.ebuild 1760 BLAKE2B d1eee576e952119dbd28f101cbc69be84d143f4e9058fc161a9f18490b7bab4c2ad4cecd154af392559d0ce838250f67606afd807deb64a853b862ba9930cc82 SHA512 2f8ee85eb5200067a006398abe7dae56dab1ff6e7579522722bbc9c567ebedd6bb9dc29f9d83d6ea389c1b97039f32a4d8edd5f5996eac1854774602c8a58aa3
-EBUILD libpcap-9999.ebuild 1689 BLAKE2B fe3e9048f399aa9fccd6d70bc15522e103b59277a69bda73c72d106b9a5451d793d9bf4ebbefdf13071d3488ae0b715432f15958bda5f167b8da1587e7257766 SHA512 6e2c1bff6a7519578a17035b17460935bee69b3521141e2848a524b4af3d9e3dd02cc3afbf4f16096b5e9bbbb53f4d5cc6209a61713958af8d35e15d3e6d7e75
+EBUILD libpcap-1.9.1-r2.ebuild 1867 BLAKE2B 32e905fdcb957e8c7687bfb90e3434b02dd65aae3f43d4995ec9b6950cdbc1b60e741ed383423701e6d7081500f2d39f2f170d8a05a3925da9c15e38dceb007f SHA512 27f5ce94122fff4e77b2a5bd74e24952e855e84cdb3e36b3dce1e3585813821ec9cce21d53c28983d5e2765ef118fddbaee2aa57250f6b40b4f792a696627f4d
+EBUILD libpcap-1.9.1-r3.ebuild 1892 BLAKE2B 004dd5e00ef7d759aeacc8206afdfa6737e467807a254654ba893a0a50eaf51a4ed752de797533ad921bffe102587b5e6cfb664a4eebea5bacae89cfcf75b205 SHA512 9503cc9cd34519965ebb3a70a3917bf207edb1ffd85c9e0edb7b2fabd99b902894e7afcfcb73752f75cd78800435b6be3a7e9eaff262c645526f8b1ddfdb756d
+EBUILD libpcap-1.9.1.ebuild 1740 BLAKE2B fe8f2ffdb8548719fa379514c6deb9753c7f9d49b26fbdd2f54ec3f922c7b2ae166449883bd85695dd1b397bacdf108b3996e20d4c62a3bf336dcbd1c09c6cf0 SHA512 12b202747893fdf2170caf1ef1355046dd388162bec8790fa638e6ecc7f6819bb19b1d41b5246899cb28214ee8cfa50e799d0d51457a857e32f1daaef5022d91
+EBUILD libpcap-9999.ebuild 1669 BLAKE2B 20026176a3a00d3a6aeeff34b8e42d9d3ff2c5309fbec222bafd73d9b8191eef1164a482f1a439c78c3edb255fbc6446ccc41933ea6d905d6c3a36c63d7a131b SHA512 1d26c8816891fbd0031e45a56cb648a6dbd7d675adfebb3225dbe2be58431128d3b72faba7d6883689dfc255aab9ec536ca797642767614350742482c51ecedd
 MISC metadata.xml 829 BLAKE2B e5d6efa30353d6468e2900a2e3b5eb9fad0f1037c5757b791a787d7db88d48261b8237cee5b8d8e9b327c2bc24697d2456216e4a2aa76601d540e3203d7e6515 SHA512 0bfc965079e819a9cb84f3d8eebea92e975dbfabb751979b1c64edd61b07e6508fd52ac64abea5d10305864afcc7c581a29d6f4e6fe8cfb77940ea326ba2f4b2
diff --git a/net-libs/libpcap/libpcap-1.9.1-r2.ebuild b/net-libs/libpcap/libpcap-1.9.1-r2.ebuild
index 47631759bbe8..89890d0941fb 100644
--- a/net-libs/libpcap/libpcap-1.9.1-r2.ebuild
+++ b/net-libs/libpcap/libpcap-1.9.1-r2.ebuild
@@ -28,7 +28,7 @@ DEPEND="
 	${RDEPEND}
 	sys-devel/flex
 	virtual/yacc
-	dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	dbus? ( virtual/pkgconfig )
 "
 
 S=${WORKDIR}/${PN}-${P/_}
diff --git a/net-libs/libpcap/libpcap-1.9.1-r3.ebuild b/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
index 0f687314ce41..eb184a07121e 100644
--- a/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
+++ b/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
@@ -29,7 +29,7 @@ DEPEND="
 	${RDEPEND}
 	sys-devel/flex
 	virtual/yacc
-	dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	dbus? ( virtual/pkgconfig )
 "
 
 S=${WORKDIR}/${PN}-${P/_}
diff --git a/net-libs/libpcap/libpcap-1.9.1.ebuild b/net-libs/libpcap/libpcap-1.9.1.ebuild
index c07bb80e0971..4775c7d9c5b4 100644
--- a/net-libs/libpcap/libpcap-1.9.1.ebuild
+++ b/net-libs/libpcap/libpcap-1.9.1.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 	${RDEPEND}
 	sys-devel/flex
 	virtual/yacc
-	dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	dbus? ( virtual/pkgconfig )
 "
 
 S=${WORKDIR}/${PN}-${P/_}
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index 6ff5bf8f081d..5ad21ee77a4e 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 	${RDEPEND}
 	sys-devel/flex
 	virtual/yacc
-	dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	dbus? ( virtual/pkgconfig )
 "
 
 PATCHES=(
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index b9ba464f8344..322c2ca5359b 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -6,5 +6,5 @@ AUX libproxy-0.4.15-mozjs-52-2.patch 847 BLAKE2B 0b6b408b6745c6b4bf277549a8682db
 AUX libproxy-0.4.15-python-3.7.patch 774 BLAKE2B fedb3b9c1f003a24706a8b9b66d70f3abe01dd26bdd25eacf7685247d262e02ae0b406d0a2871f12d8d1b92df5abcdf207d940fec91c964fb33d38b454a91d82 SHA512 4330e9043ed767accea8f6f74b6999017633c51d615b229e7a43e9ed468630c630653c6917a4196e8f05d285df383de3bb269a79db127d902d1c960f29d39246
 AUX proxy.1 681 BLAKE2B 14db05aa4282661bf4148af6187f8d3f2b9cefaa439851c5086b397f1b6972b8f28027aeb9ad7ac801d616f5b46f19b050642f0e754a63bd6aca1354aa2bad5c SHA512 57074dde3303d8775cb842fee5a6dde22f1c14d9e30af16f018e81fa87585c6e5b12edc1453cf8135624b4ac49568aebfdeaf634782307d6776c4cf2c5f8f96f
 DIST libproxy-0.4.15.tar.gz 93084 BLAKE2B 9aa86403eaf4e1791958013c2739e251c61f11da40e66b3296b33a7f380828895f621175add5efb3cd17222ff016941801c25c2d70c19ef3a6652510268a0b3d SHA512 8f68bd56e44aeb3f553f4657bef82a5d14302780508dafa32454d6f724b724c884ceed6042f8df53a081d26ea0b05598cf35eab44823257c47c5ef8afb36442b
-EBUILD libproxy-0.4.15-r1.ebuild 2730 BLAKE2B a4b5185d80761a70f8052ceeab5387339a8f9f5cf7140e86750baaf26c5548f622e54be3b73d62d405e6c9abb315d173da58a824da751312822372b13fc2164a SHA512 3a05503b93d5ae2c40e45e505710163ba62fc0c3d53d51226ee508da96aec0c78464562308a043b7f398ed7ddb21ed375c8d2670018c1e821ce4f510ae480bb0
+EBUILD libproxy-0.4.15-r1.ebuild 2708 BLAKE2B a2f4f66d4fb604cf4d3bbd2ab3f7cc336f36152f00ce82028a677e9d269755f75dc118976394e0ad0fbf594f1d1e9d3f2445eeafd3fb7b61854e4a4c5ce4573f SHA512 774fe0a0356d7975a010667270923726a645dd9cd803fcb112e600e0de069282a5cd625f00f196e7112ac24b68e914e62baab5e09c9a9521dac0f540932aecac
 MISC metadata.xml 691 BLAKE2B fc4bcbf2660517674f65be0e28ee44bb1ad5958b2ab8bfc52ec071e46dd75b2ab7317f73644403c5fcc81bdb390afbad5da72763268bbbbe4bb50d077c1aa303 SHA512 d9405961f0cf0cc796948bacb020668a1a0d5b0e0690d9473029d3835dc51fed3d131b7e3da215419a2489bec21d95576fd4592a58aa46bb76114d985a981f7f
diff --git a/net-libs/libproxy/libproxy-0.4.15-r1.ebuild b/net-libs/libproxy/libproxy-0.4.15-r1.ebuild
index 735c770babe5..ea1e91bfaa25 100644
--- a/net-libs/libproxy/libproxy-0.4.15-r1.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.15-r1.ebuild
@@ -18,7 +18,7 @@ IUSE="gnome kde mono networkmanager spidermonkey test webkit"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
-	virtual/pkgconfig:0[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 "
 DEPEND="
 	gnome? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 89b6ee82b1a5..a9bd4785779c 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -4,7 +4,7 @@ AUX disable-apache-tests.patch 1318 BLAKE2B d922d5613241c96fed46c746dcd0fde70409
 DIST libsoup-2.62.3.tar.xz 1851780 BLAKE2B e3a3518f485d4ab1fe133f5b382d32e4b949e720005c4fdbbe963ba68030d5fcfb11deb5103843f47f221b540e96c5d5ea0f7c52f898617dca37d8df9faec669 SHA512 88354728b1da10288472c7380f166263b64d979df3e6e70ebdbc7b61f3c8eb1dc1205d5b1ead16243c6d304940a4dd4e3a9f3b2ce3e1422a1c5032220b16c73b
 DIST libsoup-2.66.4.tar.xz 1451200 BLAKE2B 4ee37592beb9227eb5a61901e4b100b613fef2be512b7c61052a8df17184783e4b6e4e898893d6f63f1fa32b97fac935ad0f4b4d5ae1c56fedd62c0c8f41a8ea SHA512 c1d57c6c5099ac345373409dd3f384dd454e47218cc6bd8be1c6b2de967d7753bfcc3010836f7131f049b1ab9c49318d6ae5203be0bcc0ca5d4b62a0c64f27ad
 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 3028 BLAKE2B b71ddbb144d811a76a755b8b30d1d67063440d02012b09eabcd7fa67e29241aadcf69af274cc3a853ca2e67790087c6273c3938aca0145b71b6ad06121fd0bca SHA512 6c1e4075b5f75ad9f7ade2c8abd4485f910fd2f3aef4cf53237b6c9dca14ba221b5c9757c121f662b2db16f9a493f38f33370ad3900bafa9812f0f84ac602cbc
+EBUILD libsoup-2.62.3.ebuild 2890 BLAKE2B 9d9c0060aa274b1d5e67abea2b35a24fb07bbd4b30a629cb81c4e1a77ac386ead50cdb3df7b0cdd18b94a21a40b3249701bada618d59b0e53e4e768f20cdad15 SHA512 73eadf836142720a6c10a9dc0ceb6ec69e2f6ca74d0bc7e0cb40e64e97fbce029f0f09e37a834616d883d9b10434c8aea716f4497afa78fd96360fb4c5bc2c4a
+EBUILD libsoup-2.66.4.ebuild 2749 BLAKE2B d7fbea04e4fc751be302bdfb40c653ef81fcb7cdbe2b07feeaeb217d408b95695946456db1d3a14671ae856c547daf9c9caf1dea275d6b5324f7d1eadcc25ef6 SHA512 7cab373bd4c67b4014207b02ca57be02fdd2b070cdeb646aa26b8826487dee7a992837e81839ca9755584a3a9add95b0c2650586f34e653799b26de34f8066d8
+EBUILD libsoup-2.70.0.ebuild 3001 BLAKE2B 0fcd4079ca32abd96900a964a05b0cc842ce3871081f022d144c680d593dee02b4e5ed3568ddbd05ba72557f096c15c2418bb3ffdda417374d5fab6f8d262eb7 SHA512 fdd5a70067ec1e47073e84ad384f1793e643627ef22ce5e8272b9e1761d54abe0043350be527c90af8ac200052a1e9a9d84d6a26d4e57939ec5092594a4515a7
 MISC metadata.xml 467 BLAKE2B d794fe938763955e050add0d57db197ff4445a7b9d6467cdf0f47ab46ca26e1b9cf4fcebbe0e90df798ab08c8a4d7cdc5b547b347e6caa2f5c83f9be698d0396 SHA512 287cf2cc758d653374e5b58aeab4a96fa45ee0846e902cbc5c7f051e31a6b9300aa4e27814b4a2eb27d6386a2bf0a57cf7032dcac081749141bac1f98851487c
diff --git a/net-libs/libsoup/libsoup-2.62.3.ebuild b/net-libs/libsoup/libsoup-2.62.3.ebuild
index 46a37bc45006..d55643d5a8f3 100644
--- a/net-libs/libsoup/libsoup-2.62.3.ebuild
+++ b/net-libs/libsoup/libsoup-2.62.3.ebuild
@@ -35,7 +35,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.20
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	test? ( >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] )
 	vala? ( $(vala_depend) )
 "
diff --git a/net-libs/libsoup/libsoup-2.66.4.ebuild b/net-libs/libsoup/libsoup-2.66.4.ebuild
index a43fd5fe6a7d..c26cf2bfb52c 100644
--- a/net-libs/libsoup/libsoup-2.66.4.ebuild
+++ b/net-libs/libsoup/libsoup-2.66.4.ebuild
@@ -35,7 +35,7 @@ BDEPEND="
 	gtk-doc? ( >=dev-util/gtk-doc-1.20
 		app-text/docbook-xml-dtd:4.1.2 )
 	>=sys-devel/gettext-0.19.8
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	vala? ( $(vala_depend) )
 "
 #	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
diff --git a/net-libs/libsoup/libsoup-2.70.0.ebuild b/net-libs/libsoup/libsoup-2.70.0.ebuild
index 4edf27d7e113..9d39df972428 100644
--- a/net-libs/libsoup/libsoup-2.70.0.ebuild
+++ b/net-libs/libsoup/libsoup-2.70.0.ebuild
@@ -38,7 +38,7 @@ BDEPEND="
 	gtk-doc? ( >=dev-util/gtk-doc-1.20
 		app-text/docbook-xml-dtd:4.1.2 )
 	>=sys-devel/gettext-0.19.8
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	vala? ( $(vala_depend) )
 "
 #	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index 31b708defa58..eedc34ea1ff4 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -3,6 +3,6 @@ AUX libtirpc-1.2.5-endian.h.patch 754 BLAKE2B 7ccb2c99a77757f02b7633246431a104e3
 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
+EBUILD libtirpc-1.2.5.ebuild 1645 BLAKE2B de2dec6ee157550e17fe25cf3e45fd3837c956753f7ec6c19d562ccaf014411959c3e7706582383d63fbe970c6e41e6cdde06fe687193681f0930853c7e3cd69 SHA512 c8cbe135c3ed50e0e77b59a6a7c93019fabccbc0105d941abe42c75e3313c47f990d64d83167603c8c4fdab7bf989bf1868ed9aa312c12bbd14f77ec98f5aac5
+EBUILD libtirpc-1.2.6.ebuild 1502 BLAKE2B 9753af0afa16b59eae8ab760084398a43d08ca23bf0fd2ff9b238fcd5f47079de41878e014d3cff2642dd24f557df4350da0c92ad1abf9a798d7205dca7b5741 SHA512 353ad95d991a705bd37c759dfc253aad64bb5f461c80473c129f34dbc877155d1280ee4c9f65e0bc67f3acde992376f5a906f68e61d5142f85767871ce85b6d9
 MISC metadata.xml 404 BLAKE2B fb708c5f3f1f4112708810b7fefe2bd1b0d20a15864d730e43cf42480c91d35984238352b419c3bd4b8f3ef831340a781af8b61a857bd6ff36f7521c5dd3c044 SHA512 9fbf0b58cc794cb08cc5075df5ca801d50c2724ca0826700bc18ac8a4a0c0d7231abd1aee8ec6de674b7cf7aa69cd80e7e6b3be90e9aeca36334c11b728db4fa
diff --git a/net-libs/libtirpc/libtirpc-1.2.5.ebuild b/net-libs/libtirpc/libtirpc-1.2.5.ebuild
index fe70ea837553..632193139a10 100644
--- a/net-libs/libtirpc/libtirpc-1.2.5.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.2.5.ebuild
@@ -20,7 +20,7 @@ DEPEND="${RDEPEND}
 	elibc_musl? ( sys-libs/queue-standalone )"
 BDEPEND="
 	app-arch/xz-utils
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+	virtual/pkgconfig"
 
 src_prepare() {
 	cp -r "${WORKDIR}"/tirpc "${S}"/ || die
diff --git a/net-libs/libtirpc/libtirpc-1.2.6.ebuild b/net-libs/libtirpc/libtirpc-1.2.6.ebuild
index 46c7e4093d96..b10ca76d3ce2 100644
--- a/net-libs/libtirpc/libtirpc-1.2.6.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.2.6.ebuild
@@ -20,7 +20,7 @@ DEPEND="${RDEPEND}
 	elibc_musl? ( sys-libs/queue-standalone )"
 BDEPEND="
 	app-arch/xz-utils
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+	virtual/pkgconfig"
 
 src_prepare() {
 	cp -r "${WORKDIR}"/tirpc "${S}"/ || die
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index 0338a96b5325..3b8a6c85d2bf 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,4 +1,3 @@
-AUX libupnp-1.12.0-cxx-compat.patch 1023 BLAKE2B b45c64616d1b812d203df768e095dbc69c5388988bd4d3d67187effa88fbbc17d34deda58a4d29c4f7d162614d783c0caf22fcd7afa6752549144597850710a8 SHA512 099bf2443e81ae096a7647891a021ed6d5543aadbcb665bc1466f5eb92b4e5ed515a83507902c20635f839d5f76265d99ccfdafca634d4ed6d6b71626e13a514
 AUX libupnp-1.6.19-docs-install.patch 387 BLAKE2B 0b9718be9e26b2e72b5c276d851ce6c4f66d2e41863569ac0ff49ddee95a4858f2f60d4c792439aeb3969bec83f0dede2631298cb6c6d46a76b317282f967d77 SHA512 b9c3ff0014f3b0d4f62b4b52948356581e09b5beefa548ddbe9a93084d2df0708557c22fafe919c867a9e48e5c19d09bfdded2619c8dde67cc44a3c12721671c
 AUX libupnp-1.6.21-cflags.patch 905 BLAKE2B 576747e560b4612fbd3432187c9fe8106bbbca2d8f19eb4b76315809dfe77e492570058997e39cbb530069013f01c5683c1beb63436142c3ed4733526a6e4d7c SHA512 3ecc83863e4cf35b9f0ba10b7982aaa103bb2eea7e0f256757fc5ef6a912a57dfdc237e6b20f29cc948f38816f1a57aff88aa0da7d7263658f584eb27ef7c8fe
 DIST libupnp-1.12.1.tar.gz 786818 BLAKE2B e44847dda5a7aeabb22a5b76cdc48d1dc69e70f7ecac85824199bf8d6e9b802cb717f2959f70690cc00babf1b554a0cb031995f80c28246b9eec670ebe7aaa90 SHA512 e4741f9245378529a15b8be7acec5af52d802ce84b82f110dab44c30da65fc2514d51d3bee6311643eb28146ea90bb3c97f44f800edb4f3ccccc1681f3e70f80
diff --git a/net-libs/libupnp/files/libupnp-1.12.0-cxx-compat.patch b/net-libs/libupnp/files/libupnp-1.12.0-cxx-compat.patch
deleted file mode 100644
index cbb844952be6..000000000000
--- a/net-libs/libupnp/files/libupnp-1.12.0-cxx-compat.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 5a8e93f1a57cce5cead5c8c566a75f7c7c294c97 Mon Sep 17 00:00:00 2001
-From: Ian Whyman <v00d00@v00d00.net>
-Date: Mon, 27 Jan 2020 21:46:47 +0000
-Subject: [PATCH] List: Add extern C for C++ users
-
----
- upnp/inc/list.h | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/upnp/inc/list.h b/upnp/inc/list.h
-index 214a53e5..0fbe7efc 100644
---- a/upnp/inc/list.h
-+++ b/upnp/inc/list.h
-@@ -40,6 +40,10 @@
- 
- #include "UpnpGlobal.h"
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */
-+
- /** List anchor structure. This should be the *first* entry in list
-  *  member objects, except if you want to do member offset arithmetic
-  *  instead of simple casts (look up "containerof"). The list code itself 
-@@ -71,4 +75,8 @@ EXPORT_SPEC UpnpListIter UpnpListInsert(UpnpListHead *list, UpnpListIter pos,
- /** Erase element at pos, return next one, or end()*/
- EXPORT_SPEC UpnpListIter UpnpListErase(UpnpListHead *list, UpnpListIter pos);
- 
-+#ifdef __cplusplus
-+}
-+#endif /* __cplusplus */
-+
- #endif /* _UPNPLISTH_ */
diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest
index f670c88ee54f..b095fb204c54 100644
--- a/net-libs/libvncserver/Manifest
+++ b/net-libs/libvncserver/Manifest
@@ -8,5 +8,7 @@ AUX libvncserver-0.9.12-libgcrypt.patch 1526 BLAKE2B 83e042ff875844cced2cb141647
 AUX libvncserver-0.9.12-pkgconfig-libdir.patch 1241 BLAKE2B 7ac16afc86204a320253c4b0b819e4c66c44c6112ac5a9bfbae13bd567391f137d1c4f786f43e5023663fcccb7d45aed628459301dd0859361a7b01f41a98d29 SHA512 37d15eb01f6c89d012c47fff885c2405ead2b7e18798b3fa68fb72bffff9caf084652e1d29fbb11263800c69e875d9442fdef660ea69b146361690820035f056
 AUX libvncserver-0.9.12-sparc-unaligned.patch 1463 BLAKE2B 66ab54a68026de0c9ce5eb04333b24ae104bc24b2fcacf5c1aad2a7d019f94feef46b4588166d8063bd3e5c616b40092309306600328eb8e7597efba5e35952e SHA512 c2d26ca2a570de3fdbabef723cfe3cb6208aabe9d7222feb6f0128fba55370e0dff0b520ac84abdc6d1dc6c0762092d36dea21eccff68432cb1c6e5b1e3b79df
 DIST LibVNCServer-0.9.12.tar.gz 2237447 BLAKE2B 583500c0bcfb6e9e3a02a33fb2701113b164851f0906fcc4845de7c7d82d4f7f65f5edd6c9a672348ee1deeefc65c1b0a257da024254598ba86d121d424f027e SHA512 60ff1cc93a937d6f8f97449bc58b763095846207112f7b1b3c43eb2d74448b595d6da949903a764bd484ee54e38ff6277e882adbe965dd6d26ba15ef6ff6fcb8
+DIST LibVNCServer-0.9.13.tar.gz 567491 BLAKE2B 138c7ca63f8cd30a21dc1b58aafa744e12a1a9eca503ffec18a63d18791d7a5df4eef176d7e4e797a2aadda1dd04d1b051abfd76bf5c6806d558c09ffee78cce SHA512 18b0a1698d32bbdbfe6f65f76130b2a95860e3cc76e8adb904269663698c7c0ae982f451fda1f25e5461f096045d40a89d9014258f439366d5b4feaa4999d643
 EBUILD libvncserver-0.9.12-r5.ebuild 2343 BLAKE2B 9c344e34f6774f49fd93013c88dc2b64c6d0c62beebc7e31c9ebae1a587b9da3dfe29a3cd6b05b671fcb33f9f0925e65b73b82dab7e34eb866c5a2dd9795d610 SHA512 419c2a377644d3997c315a6e4e3e68f7ec52773eea06be9b8f7b8fc2b91cc6129f263b7b151f91b76892eced64af26997ad84c73ef8f59871217814418202406
-MISC metadata.xml 994 BLAKE2B 3c12097d08f89fadac86ad92efccccbb533c1ac018cf426aae4a45bbea33ae227dfaec320a7710eabff7da96d22229997dee72b2c84b1aedc575e21e0a5decff SHA512 0ca13849ab948490b862838bf3c2b87cb97ce1739369d23426e518197a786cf24fc79967c01072b710d37c298c792c45e61a55e558d692087800e834f93003e2
+EBUILD libvncserver-0.9.13.ebuild 2044 BLAKE2B 97b48ab16cdbe30eaa9b55ae75ecb0ccca7af5ab2a098b21cd8990d823e14b0cd7be384604fd08d5563a2ae61c0e398eb127e445fbf02c92f732f3b2e3ad2951 SHA512 7d26b8df9881233a7bafba8eab51c1309770e935efad8280771c3e62de6c3ed0acce0649aab61e0e758c4f9617a668abcda7908d0ef3017632aa576e1a591ac0
+MISC metadata.xml 1047 BLAKE2B 28c16623c5e871d4099bc17de390cfce4b791c88884e0acdb22d31e6b05e164427d133dd22159778a50117cb41cf0008916c8dd899afa1aef03656b8adaf809e SHA512 3284ae298ac2262fd92d24aee84bee384d149ee7b6929738c0c5fab5ff41f9a1d72605bc26178339c2aec3b91b2aada2654f2daa5d495a158ea2d495d21d4927
diff --git a/net-libs/libvncserver/libvncserver-0.9.13.ebuild b/net-libs/libvncserver/libvncserver-0.9.13.ebuild
new file mode 100644
index 000000000000..6a10ad068579
--- /dev/null
+++ b/net-libs/libvncserver/libvncserver-0.9.13.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_P="LibVNCServer-${PV}"
+
+DESCRIPTION="library for creating vnc servers"
+HOMEPAGE="https://libvnc.github.io/"
+SRC_URI="https://github.com/LibVNC/${PN}/archive/${MY_P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+# common/d3des.*: https://github.com/LibVNC/libvncserver/issues/88
+LICENSE="GPL-2 GPL-2+ LGPL-2.1+ BSD MIT"
+# no sub slot wanted (yet), see #578958
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+24bpp +filetransfer gcrypt gnutls ipv6 +jpeg libressl lzo +png sasl ssl systemd +threads +zlib"
+# https://bugs.gentoo.org/690202
+# https://bugs.gentoo.org/435326
+# https://bugs.gentoo.org/550916
+REQUIRED_USE="
+	filetransfer? ( threads )
+	jpeg? ( zlib )
+	png? ( zlib )
+	ssl? ( !gnutls? ( threads ) )
+"
+
+DEPEND="
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0= )
+	ssl? (
+		!gnutls? (
+			!libressl? ( >=dev-libs/openssl-1.0.2:0= )
+			libressl? ( >=dev-libs/libressl-2.7.0:0= )
+		)
+		gnutls? ( >=net-libs/gnutls-2.12.23-r6:0= )
+	)
+	jpeg? ( >=virtual/jpeg-0-r2:0 )
+	lzo? ( dev-libs/lzo )
+	png? ( >=media-libs/libpng-1.6.10:0= )
+	sasl? ( dev-libs/cyrus-sasl )
+	systemd? ( sys-apps/systemd:= )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1:0= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS.md README.md TODO.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_FFMPEG=OFF
+		-DWITH_GTK=OFF
+		-DWITH_SDL=OFF
+		-DWITH_24BPP=$(usex 24bpp ON OFF)
+		-DWITH_TIGHTVNC_FILETRANSFER=$(usex filetransfer ON OFF)
+		-DWITH_GCRYPT=$(usex gcrypt ON OFF)
+		-DWITH_GNUTLS=$(usex gnutls $(usex ssl ON OFF) OFF)
+		-DWITH_IPv6=$(usex ipv6 ON OFF)
+		-DWITH_JPEG=$(usex jpeg ON OFF)
+		-DWITH_LZO=$(usex lzo ON OFF)
+		-DWITH_OPENSSL=$(usex gnutls OFF $(usex ssl ON OFF))
+		-DWITH_PNG=$(usex png ON OFF)
+		-DWITH_SASL=$(usex sasl ON OFF)
+		-DWITH_SYSTEMD=$(usex systemd ON OFF)
+		-DWITH_THREADS=$(usex threads ON OFF)
+		-DWITH_ZLIB=$(usex zlib ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/net-libs/libvncserver/metadata.xml b/net-libs/libvncserver/metadata.xml
index 3d5cd2b505d6..c968122e3601 100644
--- a/net-libs/libvncserver/metadata.xml
+++ b/net-libs/libvncserver/metadata.xml
@@ -15,7 +15,8 @@
 	</longdescription>
 	<use>
 		<flag name="24bpp">Enable 24bpp support</flag>
-		<flag name="gcrypt">Enable support for additional authentication methods via <pkg>dev-libs/libgcrypt</pkg></flag>
+		<flag name="filetransfer">Enable support for TightVNC's file transfer protocol</flag>
+		<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> as crypto backend</flag>
 		<flag name="lzo">Enable LZO support via <pkg>dev-libs/lzo</pkg> instead of using internal miniLZO implementation</flag>
 	</use>
 	<upstream>
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 6e1dccbca758..be1f2986b153 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.7.tar.gz 12337469 BLAKE2B 0ca58050e60afb4fcb349a8035afa629fb2d4645d7413cbaf7f1cf6cae8c5606de2aa72f1dc78778ba00c0fe723dd4aab55cd03c0a96122a1e4ff7d3cdf66644 SHA512 14b2f762db220fd6003d04c05566786b292913bfc71667327b17e8a357f4a7b5b0a09f246fc9ed527f7db106586c567345200120d32428183d39e16ae5a6287e
+DIST libwebsockets-4.0.10.tar.gz 12337448 BLAKE2B 91c38703e6cb98c66fb4e5fd6939c98d98c076b5a4ebd931a23da20e834de54cd61f4e8c121245970a34210d2e8720c0c7429846101ad6f4c4d3fd9a23fcf993 SHA512 25857c03d02c0c55dea1095fd64e1df112e938e975f04d8a28b56b4899a5cce900d500a139e9353ba548b0c59a23bad982dac0e0e0621e869b78e1e130c33cfe
 EBUILD libwebsockets-3.2.1.ebuild 2227 BLAKE2B 7af189cdcf997b5c2bff16260316e8e3e9b9d003663a08e52800afa46fe0ca8a59f72e5fdf0a193ebc9b8cedfb39329fa01735382e000c2c3eefe06e9ef40d5d SHA512 947a42364b9b48d99c4d0fc8043538561ad4deaba34a5d8e1fc5154110aff5a2948e5a6e49f66064a0e2cb541d2d436d14db8163f6fc8cdee4e9d6dc73bb389f
-EBUILD libwebsockets-4.0.7.ebuild 2309 BLAKE2B 3f0e70cccc43a31cb5e92c49b38307dca75b88b0993ddd237e75777b0666b57931df9e642a6b14538bfb806a392c96bb38717cf89b3627ed39c388e3f1a64739 SHA512 7d7d77884f1c1fa5514e5b98f21902fe3013663d15fcd470520bdbfdfa96c98fa6352c0ea914d3079687f8160bfd2d3c8990c473b5ff55efb9beadfb64d6ca39
+EBUILD libwebsockets-4.0.10.ebuild 2322 BLAKE2B 8434b787b61b29e870364156786e796325e8def159828a9acb425f4b1503063295c942c1b3726d6de1aebf0957291aee1a9fb46d2ab38f0c9a4b9be7f89c3763 SHA512 4964d57cac2322f37dee0187cd636682985a534e4151f9004fe785cf681318a501713413fdcb1e8ce92e226b31292e620c76417110d8d35c45d55b71c15f5960
 MISC metadata.xml 1894 BLAKE2B e0ad4c00319acf9e3680273380ccba89cc5cf79c893f53bc4c3e6633f1a35f25a771c0d7f1b3516e162e4606d13d84b6a3f9461fe0c576b8c86e9adad2dd3993 SHA512 1fac29b1da39acea4a90ab64594f6c47c2afd6bcc10b8af1f858af191abdaa69125d11983ef69b98655a4dd6d53a992eedb08a1e8ebee5a8dd81ad6b0a39f71c
diff --git a/net-libs/libwebsockets/libwebsockets-4.0.7.ebuild b/net-libs/libwebsockets/libwebsockets-4.0.10.ebuild
index 313e5908bc07..b0fe7aa758df 100644
--- a/net-libs/libwebsockets/libwebsockets-4.0.7.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.0.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake
+inherit cmake flag-o-matic
 
 DESCRIPTION="A flexible pure-C library for implementing network protocols"
 HOMEPAGE="https://libwebsockets.org/"
diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
index 14dff2fac2ab..948968bae0c7 100644
--- a/net-libs/neon/Manifest
+++ b/net-libs/neon/Manifest
@@ -1,7 +1,9 @@
 DIST neon-0.30.2.tar.gz 932779 BLAKE2B 0536e4f1c8634ede9a1806180c315772a65b9cb1ead0ae3674d58aba855905b6a7c7684ef930ca1998c1163c662d642a687cc704922981dbc4a89efaa83f4cd9 SHA512 634caf87522e0bd2695c6fba39cae2465e403f9fbd8007eb10e4e035c765d24cb8da932c67bfa35c34aa51b90c7bc7037ebebaa1ec43259366d5d07233efc631
 DIST neon-0.31.0.tar.gz 867476 BLAKE2B 84981d0fcca97bfa495f9e8cbf060a06e04c931ce3b5eca41ff1d76a47fd863139b8bf3e102c5e4e8d22d5cffcebc64cee9b8f746f8d6669f0cbccf124fed9cc SHA512 62c55e16609d657ac56bb4a2fd32a10ffa72d5694aa1369be533491a6683034ed42843d5f19ed06cf8c1b7b8ba11b74f9839cdfeef4afc3b2d7b11372ed85cd2
 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
+DIST neon-0.31.2.tar.gz 867914 BLAKE2B 8ae1301dd5f9ac1a6b518f99919a1b7e7b7c6499413b523ff82e00d364d6d9c5ad96875795330e2fd9c42a42b073e3eea51b6cc0ee9e9a21850763f0cdd0b97e SHA512 1e402b40a0445f68ed24d2697ee60d21636f61ebc98edcde37ff9e26c54430acabf3969ac22a942d1dd51bddee0f312c04073b423b0af3a3e7c9bf60cd53e48c
+EBUILD neon-0.30.2.ebuild 3384 BLAKE2B 40efcf9e37b5d3ca1c7e1776e27539a0c234fff5893fb1d790e635c5641efdda825d4e3b5eac0ab97689b020df2bcad84b44146d0efc1bf8a6972b0afe605766 SHA512 a55b598f86bc68aecae3911ed788aa828b6cea7ab91ab584dc83bfb2ef4ebc5bd2a1f7e28fbf67012b5999641deba292dddbc8290ca0394a8570d6fcd7945a32
+EBUILD neon-0.31.0.ebuild 3393 BLAKE2B e242b67cea6c7c0991c296631e08b3ad40ed9a9c33a15a9493ea459538f68fef7bd64c2b880298d25b7ec7cccdf4a26e298cdf9362316ff88aff60374a2eee2c SHA512 f845fddbd642ea4db2000b3e0cb217488ee89c7861ce0e2057026ee89e7c4f76e8e5b15e8f7bde42f615849ba518da94c0f3cbdc88785b829341badccfa07ef1
+EBUILD neon-0.31.1.ebuild 3400 BLAKE2B c5684a22e53c3e1377508e40c916f8303a84087bfd9fbabec8c4fd72f0df2cc2e8df89609f97acc8961721f074653b88bd864c2ad1ba7ea6bdb20211343ce144 SHA512 4b322f0fe5e82cdeb50c06d75abe84c9206a69d779379ddbb3604bc46300019c986acb12e3c6d8f7b37bc2f9a1b119d3368d7dd6dff2c9b6bd00ff16c8663d9a
+EBUILD neon-0.31.2.ebuild 3400 BLAKE2B c5684a22e53c3e1377508e40c916f8303a84087bfd9fbabec8c4fd72f0df2cc2e8df89609f97acc8961721f074653b88bd864c2ad1ba7ea6bdb20211343ce144 SHA512 4b322f0fe5e82cdeb50c06d75abe84c9206a69d779379ddbb3604bc46300019c986acb12e3c6d8f7b37bc2f9a1b119d3368d7dd6dff2c9b6bd00ff16c8663d9a
 MISC metadata.xml 1417 BLAKE2B 5feada9aceaed7ca6c5db29a993c24f049469f2d7d1ed57db5ddce3277e575a850ccc45700bd620ee503f3cb1abe7a9b333066b7be50bb7fd5f40f558dcfb0d1 SHA512 cef52cfe791a0b561a2c4472fb3d7ff5e878f8bc7fecf4095568b215724ce16edd866a6033d4be730d22b1297615119ae17bdeb09dfcc8555496a610270cfb97
diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild
index 6e4e2fc96974..fca4daa7349d 100644
--- a/net-libs/neon/neon-0.30.2.ebuild
+++ b/net-libs/neon/neon-0.30.2.ebuild
@@ -33,7 +33,7 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
 	)
 	zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+	virtual/pkgconfig"
 
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/neon-config
diff --git a/net-libs/neon/neon-0.31.0.ebuild b/net-libs/neon/neon-0.31.0.ebuild
index f038f33ba546..a13f5f590f94 100644
--- a/net-libs/neon/neon-0.31.0.ebuild
+++ b/net-libs/neon/neon-0.31.0.ebuild
@@ -33,7 +33,7 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
 	)
 	zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+	virtual/pkgconfig"
 
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/neon-config
diff --git a/net-libs/neon/neon-0.31.1.ebuild b/net-libs/neon/neon-0.31.1.ebuild
index 11cf88702f22..d3724b859dbb 100644
--- a/net-libs/neon/neon-0.31.1.ebuild
+++ b/net-libs/neon/neon-0.31.1.ebuild
@@ -33,7 +33,7 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
 	)
 	zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+	virtual/pkgconfig"
 
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/neon-config
diff --git a/net-libs/neon/neon-0.31.2.ebuild b/net-libs/neon/neon-0.31.2.ebuild
new file mode 100644
index 000000000000..d3724b859dbb
--- /dev/null
+++ b/net-libs/neon/neon-0.31.2.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_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/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 08e163da7d5f..5bda44bf28e4 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,6 +1,4 @@
-DIST nghttp2-1.40.0.tar.xz 1637004 BLAKE2B 7735ba06cd0655450a6379ea33cc79e557f73b5b4b2ba746564a53e6c305aa656b62da7c3b00dbb70472dffc471271f73af0bcbfadab99406d217d1989ad052a SHA512 3f9b989c4bd9571b11bb9d59fe2dfd5596ba3962babfc836587d5047e780400a6cf46e43c602caa25ca83c03b84a1629953140d45223099b193df54a719745ce
 DIST nghttp2-1.41.0.tar.xz 1640712 BLAKE2B 8dbd5f80bb9617d792e2eece09f6cae82907ad3a14a90084578b213191015c32ac38de87d9a39246651087b5d0e9c6c624ff806a0690973b5faa8624ee033d8f SHA512 c92e8022ccc876fa311f21bc5bf5af75feff8232efb56a4b2ab198031e974d15b67c16c046188cc76552f75a1b2e7115925d6ce1e42d6f94ae482fe69727466d
-EBUILD nghttp2-1.40.0.ebuild 1969 BLAKE2B 559beb9693a6fb4df96d19a57fae0884776a53673c8721b8502a72f0854133167ce42f136fdf3ad0a6366f3996f17b8b168d9f44f43d4584f6400a4c9d975e27 SHA512 6caec7f67d01715604b67a1ca1bf668490ae28e0c4b8d5d8a4606e8a92b212288e63279b04ee7fe49e44752e63a8f2965a62319f4511df505c9804b0595b501f
 EBUILD nghttp2-1.41.0.ebuild 1969 BLAKE2B 559beb9693a6fb4df96d19a57fae0884776a53673c8721b8502a72f0854133167ce42f136fdf3ad0a6366f3996f17b8b168d9f44f43d4584f6400a4c9d975e27 SHA512 6caec7f67d01715604b67a1ca1bf668490ae28e0c4b8d5d8a4606e8a92b212288e63279b04ee7fe49e44752e63a8f2965a62319f4511df505c9804b0595b501f
 EBUILD nghttp2-9999.ebuild 1978 BLAKE2B 3681270a1343a533630adecc2b1edb7b32cef71368da48df558e5587d3ac85364a5e556409a920b9a0c695667b0e3bac9da1410ad1319e69d832d8a21a3fd13c SHA512 99ca054a9bf82567ce3620831b7eb42e6283545c62f8c333a5c876962fbf6f1a5b7b4acc1d9decf9307d2a6bcc25ddaaeee83b5c3f25e51a256ee3a4a2df3eed
 MISC metadata.xml 492 BLAKE2B 76628f4a35c08fe73292c1c50fc6bc90dd44527ee36fb44ff4630a606fe27d9a950afe412fe1565c9eb85355c6fff13400ecb1da5d8c5de8a4765d40b23686f3 SHA512 0e67d6891d7fef473f906db3456a34b4c61f762bf87af6583ce1d477ff090cb69c749669e5cc1a3ef21ee9de3484ea1a094a5971c539edd32a0ab810a4867dcf
diff --git a/net-libs/nghttp2/nghttp2-1.40.0.ebuild b/net-libs/nghttp2/nghttp2-1.40.0.ebuild
deleted file mode 100644
index c0d775bb37c8..000000000000
--- a/net-libs/nghttp2/nghttp2-1.40.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=7
-
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-fi
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-
-LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
-IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
-
-RESTRICT="!test? ( test )"
-
-SSL_DEPEND="
-	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	cxx? (
-		${SSL_DEPEND}
-		dev-libs/boost:=[${MULTILIB_USEDEP},threads]
-	)
-	hpack-tools? ( >=dev-libs/jansson-2.5 )
-	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
-	utils? (
-		${SSL_DEPEND}
-		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
-		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
-		net-dns/c-ares:=[${MULTILIB_USEDEP}]
-	)
-	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-examples
-		--disable-failmalloc
-		--disable-python-bindings
-		--disable-werror
-		--without-cython
-		$(use_enable cxx asio-lib)
-		$(use_enable debug)
-		$(multilib_native_use_enable hpack-tools)
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		$(multilib_native_use_enable utils app)
-		$(multilib_native_use_with jemalloc)
-		$(multilib_native_use_with xml libxml2)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}"/usr -name '*.la' -delete || die
-	fi
-}
diff --git a/net-libs/rest/Manifest b/net-libs/rest/Manifest
index fdf6d31c279b..1f3a1a5062ae 100644
--- a/net-libs/rest/Manifest
+++ b/net-libs/rest/Manifest
@@ -1,3 +1,3 @@
 DIST rest-0.8.1.tar.xz 333376 BLAKE2B 595576f29ebe35121b7a896086abd3411ac3b2d324d2e50d646274c4060cfaffbd3b701eaae80afdc60d52c77bb5076135064648536378f2562f27c79c5738b7 SHA512 824a341db3827e4360abe03e33735918c68913c70d797699ef74271080a1985872006ec70fd994dc8fa3fbfef417e6fe979883c11286512d0ce623b8368e40c3
-EBUILD rest-0.8.1.ebuild 1533 BLAKE2B bf6c28bfdf25513445316d726148ff595b584cb8c866863050f839b75c96f19cb2e9fcfa1b481309f99b07a5e5064f7a83681088cfc23f53260e42664f89925c SHA512 95e7d8598b2b0827cef026d6747cbd95f0ea8cf82029c0f810cd341859c4c9a986bc564de0091e795754b422948bc40b98337e7ffaf441ba964c9afd770cd779
+EBUILD rest-0.8.1.ebuild 1513 BLAKE2B c3c195049728b7e6aa2dd8c5dd48c1691374e4a836192af5172561299942218b7365f6f4296f016dd13438aa370127d65df3273615a1e557b79375208be425fd SHA512 26f91b1249aae43357fbf13f5764931b252c0d53a9a694dfd25e8eba35c15c1a3617581769779fd61d87d8686c364a80c783bf1cc3229717b1bbb12658193c5b
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/net-libs/rest/rest-0.8.1.ebuild b/net-libs/rest/rest-0.8.1.ebuild
index 541ab5c65511..76001caf195d 100644
--- a/net-libs/rest/rest-0.8.1.ebuild
+++ b/net-libs/rest/rest-0.8.1.ebuild
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.13
 	>=dev-util/intltool-0.40
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	test? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 "
 
diff --git a/net-libs/ripe-atlas-sagan/Manifest b/net-libs/ripe-atlas-sagan/Manifest
deleted file mode 100644
index 7557c56133e7..000000000000
--- a/net-libs/ripe-atlas-sagan/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ripe.atlas.sagan-1.1.11.tar.gz 102136 BLAKE2B 21ca1745daa4073d392a50630355bf793e656efb24bb8c529222a5ce20ae209b886781fc51aff8b25b832e1d804ef10d55f8cb8d504021add93d0d23900a9489 SHA512 4c2ba0774be46cf9dc9eafe5904dd7915f21bfa047fcf5867d6e1a41a4370f70cc837d398368efa2f4b24750f655514287dcd5b97a1b47e725fba3f17f49d477
-EBUILD ripe-atlas-sagan-1.1.11.ebuild 867 BLAKE2B f148cb50493aac6c973b6b511eddf189dccb2aa6d40bdf0ae439283f2cbf601acfcfca36132be922ac287f8e20441f00b5fb620518c89e86c405ac9d3e829b92 SHA512 54b7100bc17a1222941108ad20b165b229fe879ce09de53fedb8d52d34c5ecc70a4b4e6267d9c27041ab3b58bbf77bb31dd1203e6c823123bab684faa9089e32
-MISC metadata.xml 245 BLAKE2B 8861d59570b93b8a74d1547866a7bc2fe18de2b72b16cac928c367570770a591ba1b288080c32f0d6228628974fe707c80c5f236317b4c8d2681d496625b8897 SHA512 a18c8deae207bd61184671671720a29b821623c050edf253b37cdebb500ea1ee84f219baa503cee046b76fb6a8d5ad1ca18cbf646754490aadb040d9b32bdf96
diff --git a/net-libs/ripe-atlas-sagan/metadata.xml b/net-libs/ripe-atlas-sagan/metadata.xml
deleted file mode 100644
index 9d97478d9317..000000000000
--- a/net-libs/ripe-atlas-sagan/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="pypi">ripe.atlas.sagan</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.11.ebuild b/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.11.ebuild
deleted file mode 100644
index 1d8425e5b9b2..000000000000
--- a/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.11.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/.}
-DESCRIPTION="A parsing library for RIPE Atlas result strings"
-HOMEPAGE="https://atlas.ripe.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/ripe.atlas.sagan/ripe.atlas.sagan-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-DOCS=( CHANGES.rst README.rst )
-
-S="${WORKDIR}/${MY_PN}-${PVR}"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/ujson[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests --verbose || die "Tests failed with ${EPYTHON}"
-}
diff --git a/net-libs/xrootd-ceph/Manifest b/net-libs/xrootd-ceph/Manifest
index 8c9bf316d52b..6ed94890401b 100644
--- a/net-libs/xrootd-ceph/Manifest
+++ b/net-libs/xrootd-ceph/Manifest
@@ -1,3 +1,5 @@
 DIST xrootd-ceph-4.12.0.tar.gz 80601 BLAKE2B 05e31ec3a03d50f36f7ef368705ca8ad064d1d9da4fc3815aaf96ce358da07348aaea264d82884da2782cf7c1069b584269fff9f2a3140057b2d4d2929639f77 SHA512 de55cc923bad3629de6428dbc4e7c7e2cb802512f03f49bcfc79f12221828cd9702f1c9a1bc28b599dce801c937146cf381dfd589c85f4f5721c4fbf13f6ad34
+DIST xrootd-ceph-4.12.3.tar.gz 80615 BLAKE2B d7040be47fe3f9283036f1d56f509860c6a56f29f68835d1469f3ee48377dd90e1c76b28c65b1dab24b64e00083368e1242bd4988f15b6b9df50a0c7715d9f00 SHA512 8df64c33b97cb9d92bc0a962c34c82d789551d76a3450b56125f2924357ee46c51513f992809357a217890d1d261144a92ee1b95f075b2c8081d4646402467b0
 EBUILD xrootd-ceph-4.12.0.ebuild 680 BLAKE2B dffac256f61140144d51cbfc72d4c996273be0fa1f55685138d040e3acde5f46ba50b07ed601c5c06cac56c944ea1c22e506f350acbaab33e17b0a77486adc86 SHA512 9f014c81e32d0936307d9c000fb69ab7d992cb14e22a9d111ae582cfd3fa946241108d3ab915f92fdce9bfc4b7f1f8ef50130ca753f86d8f101a3407eddba5cc
+EBUILD xrootd-ceph-4.12.3.ebuild 680 BLAKE2B dffac256f61140144d51cbfc72d4c996273be0fa1f55685138d040e3acde5f46ba50b07ed601c5c06cac56c944ea1c22e506f350acbaab33e17b0a77486adc86 SHA512 9f014c81e32d0936307d9c000fb69ab7d992cb14e22a9d111ae582cfd3fa946241108d3ab915f92fdce9bfc4b7f1f8ef50130ca753f86d8f101a3407eddba5cc
 MISC metadata.xml 496 BLAKE2B e2a202798936cfc2061b2660ab7ad32a4a4c02aab9789e46bdd5981795815505da531ab2891c9022447d2154b6070ddba3e1daa68f25b2373757cbe17d960a6c SHA512 43fa4446767cb279125fdedcaf415af260c42871460fd1144aff7bf47769070da9e9c4fc0e8b32c87fdd879f8dca24586a0764f0ad8a3ba715e1d95e07d60f70
diff --git a/net-libs/xrootd-ceph/xrootd-ceph-4.12.3.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-4.12.3.ebuild
new file mode 100644
index 000000000000..f701427b94c7
--- /dev/null
+++ b/net-libs/xrootd-ceph/xrootd-ceph-4.12.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="xrootd OSS plug-in for interfacing with Ceph storage platform"
+HOMEPAGE="https://xrootd.slac.stanford.edu/"
+SRC_URI="https://github.com/xrootd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux"
+
+DEPEND="net-libs/xrootd
+	!<net-libs/xrootd-4.10.0[rbd]
+	sys-cluster/ceph"
+RDEPEND="${DEPEND}"
+
+# xrootd plugins are not intended to be linked with,
+# they are to be loaded at runtime by xrootd,
+# see https://github.com/xrootd/xrootd/issues/447
+QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1).so"
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index 0340e38c00ad..353b0aeb5a7c 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -8,9 +8,11 @@ AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae27327
 DIST xrootd-4.11.1.tar.gz 2549971 BLAKE2B e131769291d33d2198c4afdedd0d9f9a0eac9459654277763554d2dfba211b7123f3d0dfc90fe365c7f4da2590d9bec6daf994ee7ae241897aa10b4500362c3c SHA512 7853de40d40f28177f70a18f17ee99f83c8b6c6ddf0b5e7ef64df83c5457bad11e6249c75f985c207c3292fab73a2181730ce9c8bf11979535a566c5364de8a1
 DIST xrootd-4.12.0.tar.gz 2564041 BLAKE2B 6ea9c379aa482c81279168baa3e1381e880d34014fb3516c96961da64d54faf649295f024313ece445df9a62b6b5c818b7aa8a987025d3cd969188de072648c9 SHA512 5338c4fb5461918473dd4f41f4d29fae09a8fc6a9e2d8f00bb74d929dc5396fef73643462d1a4f1ba71ffe5cf92a1695a167ca3a766c674a9377dcf99aaa1778
 DIST xrootd-4.12.1.tar.gz 2564202 BLAKE2B df6334884d12ea68d98f5e8d1c83bb44d9a7d9232f1350323beff8de3815fd24711a90b5180824c9a9fd3f9e4f45ad3448bb32cde57efd646343bf2fd202237e SHA512 8d5c7029ccad8cb898ff41671e6f360154549df926b1fb5e7747503bed477f7bf1daec7addbc5a832b76f0f5c40ef8fdcda708907389fa790c3b87a944af4d93
+DIST xrootd-4.12.3.tar.gz 2574996 BLAKE2B 1ba6ecdee473fbe1f6367459dfe8324f38e2d72aa64ed349ccdcaa7616a3d70f0b647d2eac6babbcc0e1b673ff44a050c05f23e80fb89161f121fa6dd3484311 SHA512 e4f4ad744a71a7fc69a16f2114b6d5962ddf0b22bd86f7eb19703313d55242813f13be1a1f23c541b966674bdb4854f955843322525f37bc83647e8f2fbe076d
 DIST xrootd-4.8.3.tar.gz 2390520 BLAKE2B 1b97225c41f6a3a751f55a4d357f53fac2e4cc24f2456962a6d6282b78faaeb844db5d69bff34437acd2c015dbff4a2a5047d6295770abd200d3e5bedd89d4fe SHA512 6f605131be18f35115bf7cf5d829dfd5a36e004ac69aa77dd0cb34ab70f2b89ff07e7b3e3259fe672d81b6241596c78a537de02e5abad4537dc92ae745ae8911
 EBUILD xrootd-4.11.1.ebuild 2516 BLAKE2B fda9ae309307fbdc7c6b2996ecc305d310e1750e47f044744e9fc1f15b45b452c0c7b4b1e49f33c15346cc6458462a9b3a19e3af6a72b3e55cb61cf467c3ac8e SHA512 8d386d956d6c323bf54f07d7c02065cb477ff3b2f77fa40f3d894e6a8aa767133c5fec7ee879de530ec6478e8f9bd3ce45b47fb8d13db3c267333f088a8b19dc
 EBUILD xrootd-4.12.0.ebuild 2529 BLAKE2B 0106134cbcaa6578797f4a1f9ab36bc6897ecdf8c6769a8abe2883167f2c06cc659715961159f450c352e7dacbcfdba5e707665e5975414c6601fda53242be1a SHA512 58ccd291ebef8ce57ed499d00e22a463c430e884f5e18b36f671918924e4ceee38267c8e3d3b87f70fd420f5135941e29508289051e20dd3dd9b87eaa141c29e
 EBUILD xrootd-4.12.1.ebuild 2529 BLAKE2B 0106134cbcaa6578797f4a1f9ab36bc6897ecdf8c6769a8abe2883167f2c06cc659715961159f450c352e7dacbcfdba5e707665e5975414c6601fda53242be1a SHA512 58ccd291ebef8ce57ed499d00e22a463c430e884f5e18b36f671918924e4ceee38267c8e3d3b87f70fd420f5135941e29508289051e20dd3dd9b87eaa141c29e
+EBUILD xrootd-4.12.3.ebuild 2529 BLAKE2B 0106134cbcaa6578797f4a1f9ab36bc6897ecdf8c6769a8abe2883167f2c06cc659715961159f450c352e7dacbcfdba5e707665e5975414c6601fda53242be1a SHA512 58ccd291ebef8ce57ed499d00e22a463c430e884f5e18b36f671918924e4ceee38267c8e3d3b87f70fd420f5135941e29508289051e20dd3dd9b87eaa141c29e
 EBUILD xrootd-4.8.3.ebuild 2672 BLAKE2B 6d7ca5ca0dde690749a3f704935c2ea93ab7323fc2bb55a63fd5b4b595f11f2829440e690b2b5decb2fa576926e05901c6b42144914cb4fa369007bd25e3c603 SHA512 7f368cc50498ac135739a2b51dfa13a2501cfc9421dc9f7d92f09fdce1e3868a87b4ac1c68459dfb467bfb2f9f4798ee4eafc2f9b6c19e0609c1a4a0ef7252af
 MISC metadata.xml 934 BLAKE2B f490ed604e1135f4440e805a5c7e6ee239326ea716074f1952361efc95d1763ab1ed7e3d9ed883f801430986181104313560092a329994b4a5caf478efec72e9 SHA512 44828821d0307904163a2a818855efc7c68029be18aa0e11ea07bd99d794c433888bcf74a19632a7e3b68494192e6d8c2b9d30b9c33aea748e8b03ebd44efb25
diff --git a/net-libs/xrootd/xrootd-4.12.3.ebuild b/net-libs/xrootd/xrootd-4.12.3.ebuild
new file mode 100644
index 000000000000..6acdc5a472ee
--- /dev/null
+++ b/net-libs/xrootd/xrootd-4.12.3.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=( python2_7 python3_{6,7,8} )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="Extended ROOT remote file server"
+HOMEPAGE="http://xrootd.org/"
+SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples fuse http kerberos python readline ssl test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="acct-group/xrootd
+	acct-user/xrootd
+	sys-libs/zlib
+	fuse? ( sys-fs/fuse:= )
+	kerberos? ( virtual/krb5 )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="${CDEPEND}"
+BDEPEND="
+	doc? (
+		app-doc/doxygen[dot]
+		python? ( dev-python/sphinx )
+	)
+	test? ( dev-util/cppunit )
+"
+RDEPEND="${CDEPEND}
+	dev-lang/perl
+"
+REQUIRED_USE="
+	http? ( kerberos ssl )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+PATCHES=( "${FILESDIR}"/xrootd-4.8.3-crc32.patch )
+
+# xrootd plugins are not intended to be linked with,
+# they are to be loaded at runtime by xrootd,
+# see https://github.com/xrootd/xrootd/issues/447
+QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1).so"
+
+pkg_setup() {
+	use python && python_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CRYPTO=$(usex ssl)
+		-DENABLE_FUSE=$(usex fuse)
+		-DENABLE_HTTP=$(usex http)
+		-DENABLE_KRB5=$(usex kerberos)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_READLINE=$(usex readline)
+		-DENABLE_TESTS=$(usex test)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc; then
+		doxygen Doxyfile || die
+		if use python; then
+			emake -C bindings/python/docs html
+		fi
+	fi
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doxydoc/html/. )
+	dodoc docs/ReleaseNotes.txt
+	cmake-utils_src_install
+	find "${D}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die
+
+	# base configs
+	insinto /etc/xrootd
+	doins packaging/common/*.cfg
+
+	fowners root:xrootd /etc/xrootd
+	keepdir /var/log/xrootd
+	fowners xrootd:xrootd /var/log/xrootd
+
+	local i
+	for i in cmsd frm_purged frm_xfrd xrootd; do
+		newinitd "${FILESDIR}"/${i}.initd ${i}
+	done
+	# all daemons MUST use single master config file
+	newconfd "${FILESDIR}"/xrootd.confd xrootd
+
+	if use python; then
+		python_optimize "${D}/$(python_get_sitedir)"
+
+		if use doc; then
+			docinto python
+			docompress -x "/usr/share/doc/${PF}/python/html"
+			dodoc -r bindings/python/docs/build/html
+		fi
+		if use examples; then
+			docinto python
+			dodoc -r bindings/python/examples
+		fi
+	fi
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-06-21 17:50:24 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-06-21 17:50:24 +0100
commit	feb0daf81d888e9160f9f94502de09b66f2a63fd (patch)
tree	b6e5c40ce2abef3da27ed50a023153f475e0ddef /net-libs
parent	9452a6e87b6c2c70513bc47a2470bf9f1168920e (diff)